Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 235456
b: refs/heads/master
c: 9b99b7f
h: refs/heads/master
v: v3
  • Loading branch information
Bart Van Assche authored and Greg Kroah-Hartman committed Feb 3, 2011
1 parent 8e6dbc4 commit b69f29e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d3f70befd9a6ab79413f303109e2c701472e2785
refs/heads/master: 9b99b7f84ea520d2ecaf816bde247a1ad07e454e
7 changes: 5 additions & 2 deletions trunk/include/linux/kobject.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,13 @@ static inline const char *kobject_name(const struct kobject *kobj)
extern void kobject_init(struct kobject *kobj, struct kobj_type *ktype);
extern int __must_check kobject_add(struct kobject *kobj,
struct kobject *parent,
const char *fmt, ...);
const char *fmt, ...)
__attribute__((format(printf, 3, 4)));
extern int __must_check kobject_init_and_add(struct kobject *kobj,
struct kobj_type *ktype,
struct kobject *parent,
const char *fmt, ...);
const char *fmt, ...)
__attribute__((format(printf, 4, 5)));

extern void kobject_del(struct kobject *kobj);

Expand Down Expand Up @@ -226,6 +228,7 @@ static inline int kobject_uevent_env(struct kobject *kobj,

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

static inline int kobject_action_type(const char *buf, size_t count,
Expand Down

0 comments on commit b69f29e

Please sign in to comment.