From 4e35caf4641e0acca28df4eb153e0c6279fb9bbe Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Mon, 24 Sep 2012 11:31:29 -0500 Subject: [PATCH] LINUX: Avoid 'wakeup' define Make 'wakeup' a static inline function instead of redefining 'wakeup', so we can use the keyword 'wakeup' elsewhere. Specifically, 'wakeup' is used in some Linux kernel structures, so redefining it can confuse some things. Reviewed-on: http://gerrit.openafs.org/8149 Reviewed-by: Derrick Brashear Tested-by: BuildBot (cherry picked from commit 94115df4352b872ae096977d9a77fad935864688) Change-Id: I6dadad579bf62677c76fd72be6a4ebe7e66a5c60 Reviewed-on: https://gerrit.openafs.org/12366 Tested-by: BuildBot Reviewed-by: Michael Meffie Reviewed-by: Mark Vitale Reviewed-by: Stephan Wiesand --- src/afs/LINUX/osi_machdep.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/afs/LINUX/osi_machdep.h b/src/afs/LINUX/osi_machdep.h index a64a0c8462..54efc99b62 100644 --- a/src/afs/LINUX/osi_machdep.h +++ b/src/afs/LINUX/osi_machdep.h @@ -111,7 +111,12 @@ static inline time_t osi_Time(void) { #define VN_RELE(V) iput((V)) #define afs_suser(x) capable(CAP_SYS_ADMIN) -#define wakeup afs_osi_Wakeup +extern int afs_osi_Wakeup(void *event); +static inline void +wakeup(void *event) +{ + afs_osi_Wakeup(event); +} #define vType(V) ((AFSTOV((V)))->i_mode & S_IFMT) #define vSetType(V, type) AFSTOV((V))->i_mode = ((type) | (AFSTOV((V))->i_mode & ~S_IFMT)) /* preserve mode */