[PATCH] kobject.h with HOTPLUG=n

Randy Dunlap
2006-12-18T20:40:56Z

From: Randy Dunlap <randy.dunlap@oracle.com>

Fix inline kobject functions to return 0 when CONFIG_HOTPLUG=n.

include/linux/kobject.h: In function 'kobject_uevent':
include/linux/kobject.h:277: warning: no return statement in function returning non-void
include/linux/kobject.h: In function 'kobject_uevent_env':
include/linux/kobject.h:281: warning: no return statement in function returning non-void
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
include/linux/kobject.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

--- linux-2.6.20-rc1-mm1.orig/include/linux/kobject.h
+++ linux-2.6.20-rc1-mm1/include/linux/kobject.h
@@ -274,11 +274,12 @@ int add_uevent_var(char **envp, int num_
const char *format, ...)
__attribute__((format (printf, 7, 8)));
#else
-static inline int kobject_uevent(struct kobject *kobj, enum kobject_action action) { }
+static inline int kobject_uevent(struct kobject *kobj, enum kobject_action action)
+{ return 0; }
static inline int kobject_uevent_env(struct kobject *kobj,
enum kobject_action action,
char *envp[])
-{ }
+{ return 0; }

static inline int add_uevent_var(char **envp, int num_envp, int *cur_index,
char *buffer, int buffer_size, int *cur_len,

---