Subject: [PATCH next&mainline] oprofile: fix build when CONFIG_PM is disabled

From: Randy Dunlap <[email-masked]>
Date: Wed, 1 Sep 2010 09:41:32 -0700

From: Randy Dunlap <[email-masked]>

Using do/while for a function-returning-a-value does not
make gcc happy, so change it to a static inline function.
(happens when CONFIG_PM is not enabled)

arch/x86/oprofile/nmi_int.c:784: error: expected expression before 'do'

Signed-off-by: Randy Dunlap <[email-masked]>
---
 arch/x86/oprofile/nmi_int.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- linux-next-20100901.orig/arch/x86/oprofile/nmi_int.c
+++ linux-next-20100901/arch/x86/oprofile/nmi_int.c
@@ -585,7 +585,10 @@ static void exit_sysfs(void)
 }
 
 #else
-#define init_sysfs() do { } while (0)
+static inline int init_sysfs(void)
+{
+	return 0;
+}
 #define exit_sysfs() do { } while (0)
 #endif /* CONFIG_PM */