Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b38360a2 authored by Randy Dunlap's avatar Randy Dunlap Committed by Greg Kroah-Hartman
Browse files

kobject.h: fix build when CONFIG_HOTPLUG is disabled 



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: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 781a7395

include/linux/kobject.h

+2 −3
Original line number Diff line number Diff line
@@ -226,9 +226,8 @@ static inline int kobject_uevent_env(struct kobject *kobj, 
				      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,