[PATCH -next] kobject.h: fix build when CONFIG_HOTPLUG is disabled

From: Randy Dunlap
Date: Mon Feb 07 2011 - 00:58:03 EST


From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>

When CONFIG_HOTPLUG is not enabled, the inline function add_uevent_var()
needs to have its __attribute__ before the function name/parameters,
otherwise there are syntax errors.

linux-next-20110207/include/linux/kobject.h:232: error: expected ',' or ';' before '{' token

Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
---
include/linux/kobject.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

--- linux/include/linux/kobject.h.ORG 2011-02-06 21:47:23.000000000 -0800
+++ linux/include/linux/kobject.h 2011-02-06 21:44:56.000000000 -0800
@@ -226,9 +226,8 @@
char *envp[])
{ return 0; }

-static inline int add_uevent_var(struct kobj_uevent_env *env,
- const char *format, ...)
- __attribute__((format(printf, 2, 3)))
+static inline __attribute__((format(printf, 2, 3)))
+int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...)
{ return 0; }

static inline int kobject_action_type(const char *buf, size_t count,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/