[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100901094132.e734ad94.randy.dunlap@oracle.com>
Date: Wed, 1 Sep 2010 09:41:32 -0700
From: Randy Dunlap <randy.dunlap@...cle.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>,
Robert Richter <robert.richter@....com>
Cc: linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
Ingo Molnar <mingo@...e.hu>
Subject: [PATCH next&mainline] oprofile: fix build when CONFIG_PM is
disabled
From: Randy Dunlap <randy.dunlap@...cle.com>
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 <randy.dunlap@...cle.com>
---
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 */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists