From: Andrew Deason <adeason@sinenomine.net>
Date: Mon, 24 Sep 2012 16:31:29 +0000 (-0500)
Subject: LINUX: Avoid 'wakeup' define
X-Git-Tag: upstream/1.8.0_pre1^2~1971
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=94115df4352b872ae096977d9a77fad935864688;p=packages%2Fo%2Fopenafs.git

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.

Change-Id: I462903099426b4d2e940e749dd958e03a04f7eb1
Reviewed-on: http://gerrit.openafs.org/8149
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
---

diff --git a/src/afs/LINUX/osi_machdep.h b/src/afs/LINUX/osi_machdep.h
index 906f47456..520b93260 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 */