Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 187845
b: refs/heads/master
c: da7196e
h: refs/heads/master
i:
  187843: 2e02e2e
v: v3
  • Loading branch information
Will Deacon authored and Ingo Molnar committed Mar 4, 2010
1 parent ebdbd3d commit 872e77b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4f16d4e0c9a4b20d9f0db365587b96d6001efd7d
refs/heads/master: da7196e1f986c846ffa8b2ec385223fad38e8518
4 changes: 1 addition & 3 deletions trunk/tools/perf/perf.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@
* Use the __kuser_memory_barrier helper in the CPU helper page. See
* arch/arm/kernel/entry-armv.S in the kernel source for details.
*/
#define rmb() asm volatile("mov r0, #0xffff0fff; mov lr, pc;" \
"sub pc, r0, #95" ::: "r0", "lr", "cc", \
"memory")
#define rmb() ((void(*)(void))0xffff0fa0)()
#define cpu_relax() asm volatile("":::"memory")
#endif

Expand Down

0 comments on commit 872e77b

Please sign in to comment.