Skip to content

Commit

Permalink
kobject.h: fix build when CONFIG_HOTPLUG is disabled
Browse files Browse the repository at this point in the history
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@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Randy Dunlap authored and Greg Kroah-Hartman committed Feb 18, 2011
1 parent 781a739 commit b38360a
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions include/linux/kobject.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit b38360a

Please sign in to comment.