From: robert.richter@amd.com (Robert Richter)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] oprofile, x86: fix init_sysfs error handling
Date: Wed, 1 Sep 2010 15:07:48 +0200 [thread overview]
Message-ID: <20100901130748.GK22783@erda.amd.com> (raw)
In-Reply-To: <20100901095117.GA4246@elte.hu>
On 01.09.10 05:51:17, Ingo Molnar wrote:
> > @@ -774,7 +781,10 @@ int __init op_nmi_init(struct oprofile_operations *ops)
> >
> > mux_init(ops);
> >
> > - init_sysfs();
> > + ret = init_sysfs();
>
> FYI, this causes a build error if CONFIG_PM is off:
>
> arch/x86/oprofile/nmi_int.c:784: error: expected expression before ?do?
>
> Due to this assymetric form of the wrapper:
>
> #define init_sysfs() do { } while (0)
>
> The wrapper should be changed to return 0 i suspect, via something like
> this:
>
> static inline int init_sysfs(void) { return 0; }
>
> (untested)
Ingo, thanks for catching this, fix below.
-Robert
--
WARNING: multiple messages have this Message-ID (diff)
From: Robert Richter <robert.richter@amd.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: Will Deacon <will.deacon@arm.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
Matt Fleming <matt@console-pimps.org>,
Peter Zijlstra <peterz@infradead.org>
Subject: Re: [PATCH] oprofile, x86: fix init_sysfs error handling
Date: Wed, 1 Sep 2010 15:07:48 +0200 [thread overview]
Message-ID: <20100901130748.GK22783@erda.amd.com> (raw)
In-Reply-To: <20100901095117.GA4246@elte.hu>
On 01.09.10 05:51:17, Ingo Molnar wrote:
> > @@ -774,7 +781,10 @@ int __init op_nmi_init(struct oprofile_operations *ops)
> >
> > mux_init(ops);
> >
> > - init_sysfs();
> > + ret = init_sysfs();
>
> FYI, this causes a build error if CONFIG_PM is off:
>
> arch/x86/oprofile/nmi_int.c:784: error: expected expression before ‘do’
>
> Due to this assymetric form of the wrapper:
>
> #define init_sysfs() do { } while (0)
>
> The wrapper should be changed to return 0 i suspect, via something like
> this:
>
> static inline int init_sysfs(void) { return 0; }
>
> (untested)
Ingo, thanks for catching this, fix below.
-Robert
--
>From 3f60c6b21399280c4ab079deefb794253becdaca Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@amd.com>
Date: Wed, 1 Sep 2010 14:50:50 +0200
Subject: [PATCH] oprofile, x86: fix init_sysfs() function stub
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The use of the return value of init_sysfs() with commit
10f0412 oprofile, x86: fix init_sysfs error handling
discovered the following build error for !CONFIG_PM:
.../linux/arch/x86/oprofile/nmi_int.c: In function ‘op_nmi_init’:
.../linux/arch/x86/oprofile/nmi_int.c:784: error: expected expression before ‘do’
make[2]: *** [arch/x86/oprofile/nmi_int.o] Error 1
make[1]: *** [arch/x86/oprofile] Error 2
This patch fixes this.
Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Robert Richter <robert.richter@amd.com>
---
arch/x86/oprofile/nmi_int.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index 73a41d3..cfe4faa 100644
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -585,8 +585,10 @@ static void exit_sysfs(void)
}
#else
-#define init_sysfs() do { } while (0)
-#define exit_sysfs() do { } while (0)
+
+static inline int init_sysfs(void) { return 0; }
+static inline void exit_sysfs(void) { }
+
#endif /* CONFIG_PM */
static int __init p4_init(char **cpu_type)
--
1.7.1.1
--
Advanced Micro Devices, Inc.
Operating System Research Center
next prev parent reply other threads:[~2010-09-01 13:07 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-29 18:51 [PATCH 0/3] stop OProfile calling arch_exit when arch_init fails Will Deacon
2010-08-29 18:51 ` Will Deacon
2010-08-29 18:51 ` [PATCH 1/3] oprofile: don't call arch exit code from init code on failure Will Deacon
2010-08-29 18:51 ` Will Deacon
2010-08-29 18:52 ` [PATCH 2/3] ARM: oprofile: fix and simplify init/exit functions Will Deacon
2010-08-29 18:52 ` Will Deacon
2010-08-29 18:52 ` [PATCH 3/3] x86: oprofile: fix oprofile_arch_init behaviour on failure Will Deacon
2010-08-29 18:52 ` Will Deacon
2010-08-30 9:09 ` Robert Richter
2010-08-30 9:09 ` Robert Richter
2010-08-31 8:54 ` Will Deacon
2010-08-31 8:54 ` Will Deacon
2010-08-31 9:05 ` Robert Richter
2010-08-31 9:05 ` Robert Richter
2010-08-31 9:31 ` Will Deacon
2010-08-31 9:31 ` Will Deacon
2010-08-31 9:47 ` Robert Richter
2010-08-31 9:47 ` Robert Richter
2010-08-31 10:30 ` [PATCH] oprofile, x86: fix init_sysfs error handling Robert Richter
2010-08-31 10:30 ` Robert Richter
2010-09-01 9:51 ` Ingo Molnar
2010-09-01 9:51 ` Ingo Molnar
2010-09-01 13:07 ` Robert Richter [this message]
2010-09-01 13:07 ` Robert Richter
2010-08-31 11:01 ` [PATCH 0/3] stop OProfile calling arch_exit when arch_init fails Robert Richter
2010-08-31 11:01 ` Robert Richter
-- strict thread matches above, loose matches on Subject: below --
2010-08-30 8:56 [PATCH] oprofile, x86: fix init_sysfs error handling Robert Richter
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=20100901130748.GK22783@erda.amd.com \
--to=robert.richter@amd.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.