From 8591cbee28e170ceb5edaa4953d595cf9b30e634 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 26 Jul 2007 17:35:29 +0100 Subject: [PATCH] --- yaml --- r: 62958 b: refs/heads/master c: c47ffe3d3d841986108a8316f6e01792cb45d0d2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/compiler.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 79053097569d..a68f91762447 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f41bb3a5a24c82900b33071edcedec679b99de7 +refs/heads/master: c47ffe3d3d841986108a8316f6e01792cb45d0d2 diff --git a/trunk/include/linux/compiler.h b/trunk/include/linux/compiler.h index 12a1291855e2..86f9a3a6137d 100644 --- a/trunk/include/linux/compiler.h +++ b/trunk/include/linux/compiler.h @@ -15,8 +15,8 @@ # define __acquire(x) __context__(x,1) # define __release(x) __context__(x,-1) # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0) -extern void __chk_user_ptr(const void __user *); -extern void __chk_io_ptr(const void __iomem *); +extern void __chk_user_ptr(const volatile void __user *); +extern void __chk_io_ptr(const volatile void __iomem *); #else # define __user # define __kernel