Skip to contentSkip to conversation

oprofile, x86: fix init_sysfs() function stub

PATCH New Robert Richter 1 participant 1 message Sep 1, 2010 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 =E2=80=98op_nmi_init=E2=
=80=99:
.../linux/arch/x86/oprofile/nmi_int.c:784: error: expected expression be=
fore =E2=80=98do=E2=80=99
make[2]: *** [arch/x86/oprofile/nmi_int.o] Error 1
make[1]: *** [arch/x86/oprofile] Error 2

This patch fixes this.

---
 arch/x86/oprofile/nmi_int.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
arch/x86/oprofile/nmi_int.c +0 -0
index 73a41d3..cfe4faa 100644
@@ -585,8 +585,10 @@ static void exit_sysfs(void)
 }

=20
#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 */
=20
static int __init p4_init(char **cpu_type)
--=20
1.7.1.1

--=20
Advanced Micro Devices, Inc.
Operating System Research Center