diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-05-29 19:54:21 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-05-29 19:54:21 -0700 |
commit | d8f797c60661a90ee26ca9330cf85ede9aa2ec17 (patch) | |
tree | 5038609885fc3e4cb7f329d974875ac4411c6af5 /include/linux/kobject.h | |
parent | Input: tsc2007 - move header file out of I2C realm (diff) | |
parent | Linux 4.12-rc3 (diff) | |
download | linux-dev-d8f797c60661a90ee26ca9330cf85ede9aa2ec17.tar.xz linux-dev-d8f797c60661a90ee26ca9330cf85ede9aa2ec17.zip |
Merge tag 'v4.12-rc3' into next
Sync with mainline to bring in changes in platform drovers dropping
calls to sparse_keymap_free() so that we can remove it for good.
Diffstat (limited to 'include/linux/kobject.h')
-rw-r--r-- | include/linux/kobject.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h index e6284591599e..ca85cb80e99a 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -108,6 +108,8 @@ extern int __must_check kobject_rename(struct kobject *, const char *new_name); extern int __must_check kobject_move(struct kobject *, struct kobject *); extern struct kobject *kobject_get(struct kobject *kobj); +extern struct kobject * __must_check kobject_get_unless_zero( + struct kobject *kobj); extern void kobject_put(struct kobject *kobj); extern const void *kobject_namespace(struct kobject *kobj); |