aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2010-09-01 08:50:50 -0400
committerRobert Richter <robert.richter@amd.com>2010-09-01 15:23:01 -0400
commit269f45c25028c75fe10e6d9be86e7202ab461fbc (patch)
tree24cb24316d73ce1b643f25ede33d1059ff6d759c /arch
parent10f0412f57f2a76a90eff4376f59cbb0a39e4e18 (diff)
oprofile, x86: fix init_sysfs() function stub
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> Cc: stable@kernel.org Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/oprofile/nmi_int.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index 73a41d3c6c09..cfe4faabb0f6 100644
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -585,8 +585,10 @@ static void exit_sysfs(void)
585} 585}
586 586
587#else 587#else
588#define init_sysfs() do { } while (0) 588
589#define exit_sysfs() do { } while (0) 589static inline int init_sysfs(void) { return 0; }
590static inline void exit_sysfs(void) { }
591
590#endif /* CONFIG_PM */ 592#endif /* CONFIG_PM */
591 593
592static int __init p4_init(char **cpu_type) 594static int __init p4_init(char **cpu_type)