diff --git a/[refs] b/[refs] index 04e1007b77c4..e98668249002 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7bd5469cd938eec6a76b3135e6becd9b5e096e98 +refs/heads/master: 4ba67c1d48aeedcc31630bb40b6179fc7d360f90 diff --git a/trunk/Documentation/perf_counter/perf.h b/trunk/Documentation/perf_counter/perf.h index fb1423072286..6fa3656399f4 100644 --- a/trunk/Documentation/perf_counter/perf.h +++ b/trunk/Documentation/perf_counter/perf.h @@ -26,20 +26,14 @@ static inline unsigned long long rdclock(void) #define __user #define asmlinkage -#ifdef __x86_64__ -#define __NR_perf_counter_open 298 -#define rmb() asm volatile("lfence" ::: "memory") -#define cpu_relax() asm volatile("rep; nop" ::: "memory"); -#endif - -#ifdef __i386__ -#define __NR_perf_counter_open 336 +#if defined(__x86_64__) || defined(__i386__) +#include "../../arch/x86/include/asm/unistd.h" #define rmb() asm volatile("lfence" ::: "memory") #define cpu_relax() asm volatile("rep; nop" ::: "memory"); #endif #ifdef __powerpc__ -#define __NR_perf_counter_open 319 +#include "../../arch/powerpc/include/asm/unistd.h" #define rmb() asm volatile ("sync" ::: "memory") #define cpu_relax() asm volatile ("" ::: "memory"); #endif