Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 180289
b: refs/heads/master
c: 2938429
h: refs/heads/master
i:
  180287: a173cef
v: v3
  • Loading branch information
Stephen Rothwell authored and Linus Torvalds committed Feb 5, 2010
1 parent 9e0f3c9 commit 1864a4f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cbee4751f612692c1de3b8e420ebcb0fb16c7c56
refs/heads/master: 2938429501b73f6aeb312236eac7ed0416a07cd5
2 changes: 2 additions & 0 deletions trunk/include/linux/compiler.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# define __acquire(x) __context__(x,1)
# define __release(x) __context__(x,-1)
# define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
# define __percpu __attribute__((noderef, address_space(3)))
extern void __chk_user_ptr(const volatile void __user *);
extern void __chk_io_ptr(const volatile void __iomem *);
#else
Expand All @@ -32,6 +33,7 @@ extern void __chk_io_ptr(const volatile void __iomem *);
# define __acquire(x) (void)0
# define __release(x) (void)0
# define __cond_lock(x,c) (c)
# define __percpu
#endif

#ifdef __KERNEL__
Expand Down

0 comments on commit 1864a4f

Please sign in to comment.