From: Randy Dunlap <randy.dunlap@oracle•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Robert Richter <robert.richter@amd•com>
Cc: linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>,
Ingo Molnar <mingo@elte•hu>
Subject: [PATCH next&mainline] oprofile: fix build when CONFIG_PM is disabled
Date: Wed, 1 Sep 2010 09:41:32 -0700 [thread overview]
Message-ID: <20100901094132.e734ad94.randy.dunlap@oracle.com> (raw)
In-Reply-To: <20100901133614.2580f238.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle•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@oracle•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 */
next prev parent reply other threads:[~2010-09-01 16:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-01 3:36 linux-next: Tree for September 1 Stephen Rothwell
2010-09-01 16:41 ` Randy Dunlap [this message]
2010-09-01 16:50 ` [PATCH next&mainline] oprofile: fix build when CONFIG_PM is disabled Robert Richter
2010-09-01 16:57 ` Randy Dunlap
2010-09-01 19:33 ` Robert Richter
2010-09-01 16:52 ` Ingo Molnar
2010-09-02 1:38 ` linux-next: Tree for September 1 David Miller
2010-09-02 3:33 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100901094132.e734ad94.randy.dunlap@oracle.com \
--to=randy.dunlap@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=robert.richter@amd$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox