diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2010-05-21 11:49:57 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2010-05-21 11:49:57 -0400 |
| commit | ff5f149b6aec8edbfa3698721667acd043009a33 (patch) | |
| tree | d052553eb296dfee3f01b1cb2b717cb7ccf3127a /arch/xtensa | |
| parent | f0218b3e9974f06014b61be8987159f4a20e011e (diff) | |
| parent | 580d607cd666dfabfc1c7b0fb08c8ac690c7c87f (diff) | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-7
Conflicts:
include/linux/ftrace_event.h
include/trace/ftrace.h
kernel/trace/trace_event_perf.c
kernel/trace/trace_kprobe.c
kernel/trace/trace_syscalls.c
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'arch/xtensa')
| -rw-r--r-- | arch/xtensa/include/asm/atomic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/include/asm/atomic.h b/arch/xtensa/include/asm/atomic.h index 22d6dde42619..a96a0619d0b7 100644 --- a/arch/xtensa/include/asm/atomic.h +++ b/arch/xtensa/include/asm/atomic.h | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | * | 46 | * |
| 47 | * Atomically reads the value of @v. | 47 | * Atomically reads the value of @v. |
| 48 | */ | 48 | */ |
| 49 | #define atomic_read(v) ((v)->counter) | 49 | #define atomic_read(v) (*(volatile int *)&(v)->counter) |
| 50 | 50 | ||
| 51 | /** | 51 | /** |
| 52 | * atomic_set - set atomic variable | 52 | * atomic_set - set atomic variable |