diff for duplicates of <20100901130748.GK22783@erda.amd.com> diff --git a/a/1.txt b/N1/1.txt index e9818a1..9d2c356 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,7 +8,7 @@ On 01.09.10 05:51:17, Ingo Molnar wrote: > > FYI, this causes a build error if CONFIG_PM is off: > -> arch/x86/oprofile/nmi_int.c:784: error: expected expression before ?do? +> arch/x86/oprofile/nmi_int.c:784: error: expected expression before ‘do’ > > Due to this assymetric form of the wrapper: > @@ -26,3 +26,55 @@ 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 diff --git a/a/content_digest b/N1/content_digest index 8358c95..bcfba5b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,10 +8,15 @@ "ref\01283247089.4063.2.camel@e102144-lin.cambridge.arm.com\0" "ref\020100831103001.GC22783@erda.amd.com\0" "ref\020100901095117.GA4246@elte.hu\0" - "From\0robert.richter@amd.com (Robert Richter)\0" - "Subject\0[PATCH] oprofile, x86: fix init_sysfs error handling\0" + "From\0Robert Richter <robert.richter@amd.com>\0" + "Subject\0Re: [PATCH] oprofile, x86: fix init_sysfs error handling\0" "Date\0Wed, 1 Sep 2010 15:07:48 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Ingo Molnar <mingo@elte.hu>\0" + "Cc\0Will 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>\0" "\00:1\0" "b\0" "On 01.09.10 05:51:17, Ingo Molnar wrote:\n" @@ -24,7 +29,7 @@ "> \n" "> FYI, this causes a build error if CONFIG_PM is off:\n" "> \n" - "> arch/x86/oprofile/nmi_int.c:784: error: expected expression before ?do?\n" + "> arch/x86/oprofile/nmi_int.c:784: error: expected expression before \342\200\230do\342\200\231\n" "> \n" "> Due to this assymetric form of the wrapper:\n" "> \n" @@ -41,6 +46,58 @@ "\n" "-Robert\n" "\n" - -- + "--\n" + "\n" + ">From 3f60c6b21399280c4ab079deefb794253becdaca Mon Sep 17 00:00:00 2001\n" + "From: Robert Richter <robert.richter@amd.com>\n" + "Date: Wed, 1 Sep 2010 14:50:50 +0200\n" + "Subject: [PATCH] oprofile, x86: fix init_sysfs() function stub\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "\n" + "The use of the return value of init_sysfs() with commit\n" + "\n" + " 10f0412 oprofile, x86: fix init_sysfs error handling\n" + "\n" + "discovered the following build error for !CONFIG_PM:\n" + "\n" + " .../linux/arch/x86/oprofile/nmi_int.c: In function \342\200\230op_nmi_init\342\200\231:\n" + " .../linux/arch/x86/oprofile/nmi_int.c:784: error: expected expression before \342\200\230do\342\200\231\n" + " make[2]: *** [arch/x86/oprofile/nmi_int.o] Error 1\n" + " make[1]: *** [arch/x86/oprofile] Error 2\n" + "\n" + "This patch fixes this.\n" + "\n" + "Reported-by: Ingo Molnar <mingo@elte.hu>\n" + "Signed-off-by: Robert Richter <robert.richter@amd.com>\n" + "---\n" + " arch/x86/oprofile/nmi_int.c | 6 ++++--\n" + " 1 files changed, 4 insertions(+), 2 deletions(-)\n" + "\n" + "diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c\n" + "index 73a41d3..cfe4faa 100644\n" + "--- a/arch/x86/oprofile/nmi_int.c\n" + "+++ b/arch/x86/oprofile/nmi_int.c\n" + "@@ -585,8 +585,10 @@ static void exit_sysfs(void)\n" + " }\n" + " \n" + " #else\n" + "-#define init_sysfs() do { } while (0)\n" + "-#define exit_sysfs() do { } while (0)\n" + "+\n" + "+static inline int init_sysfs(void) { return 0; }\n" + "+static inline void exit_sysfs(void) { }\n" + "+\n" + " #endif /* CONFIG_PM */\n" + " \n" + " static int __init p4_init(char **cpu_type)\n" + "-- \n" + "1.7.1.1\n" + "\n" + "\n" + "-- \n" + "Advanced Micro Devices, Inc.\n" + Operating System Research Center -58d889a0a3c2b6e88b1de0030dd2ae32318a0709c418a0d9c1bd4dc4614d89d0 +c0b831924da6da1fc5dff215612ff6b3388d8d687a9a95ca47b0e044a85b9ec6
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.