perf fixes
Subsystems (3)
Linus,
Please pull the latest perf-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf-fixes-for-linus
Thanks,
Ingo
------------------>
Deng-Cheng Zhu (1):
perf, MIPS: Support cross compiling of tools/perf for MIPS
John Blackwood (1):
perf: Fix incorrect copy_from_user() usage
Steven Rostedt (1):
ring-buffer: Fix typo of time extends per page
kernel/perf_event.c | 4 +--- kernel/trace/ring_buffer.c | 2 +- tools/perf/perf.h | 12 ++++++++++++ 3 files changed, 14 insertions(+), 4 deletions(-)
kernel/perf_event.c +1 -3
@@ -2202,15 +2202,13 @@ static void perf_event_for_each(struct perf_event *event,static int perf_event_period (struct perf_event *event,u64 __user *arg) {struct perf_event_context *ctx = event->ctx; -unsigned long size;int ret =0 ;u64 value;if (!event->attr.sample_period)return -EINVAL ; - size =copy_from_user (&value, arg,sizeof (value)); -if (size !=sizeof (value)) +if (copy_from_user (&value, arg,sizeof (value)))return -EFAULT ;if (!value)
kernel/trace/ring_buffer.c +1 -1
@@ -405,7 +405,7 @@ static inline int test_time_stamp(u64 delta)#define BUF_MAX_DATA_SIZE (BUF_PAGE_SIZE - (sizeof(u32) * 2))/* Max number of timestamps that can fit on a page */ -#define RB_TIMESTAMPS_PER_PAGE (BUF_PAGE_SIZE / RB_LEN_TIME_STAMP) +#define RB_TIMESTAMPS_PER_PAGE (BUF_PAGE_SIZE / RB_LEN_TIME_EXTEND)int ring_buffer_print_page_header (struct trace_seq *s) {
tools/perf/perf.h +12 -0
@@ -73,6 +73,18 @@ void get_term_dimensions(struct winsize *ws);#define cpu_relax () asm volatile("":::"memory")#endif +#ifdef __mips__ +#include "../../arch/mips/include/asm/unistd.h" +#define rmb() asm volatile( \ + ".set mips2\n\t" \ + "sync\n\t" \ + ".set mips0" \ + : /* no output */ \ + : /* no input */ \ + : "memory") +#define cpu_relax () asm volatile("" ::: "memory") +#endif +#include <time.h> #include <unistd.h> #include <sys/types.h>