Commit a9dd3bc1 authored by Robert Richter's avatar Robert Richter Committed by Greg Kroah-Hartman

oprofile, x86: fix init_sysfs() function stub

commit 269f45c2 upstream.

The use of the return value of init_sysfs() with commit

 10f0412f 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: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b250d8d2
......@@ -535,8 +535,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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment