diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-08-22 14:57:59 -0700 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-08-22 14:57:59 -0700 |
| commit | e3dbc572fe11a5231568e106fa3dcedd1d1bec0f (patch) | |
| tree | 5e15ee35c77e75d51cb550cb3cb0f6ecafa7b508 /include/linux/kobject.h | |
| parent | ce8c669e446371c1eb21b0566f6dfcb70ef3a435 (diff) | |
| parent | c63517c2e3810071359af926f621c1f784388c3f (diff) | |
| download | talos-op-linux-e3dbc572fe11a5231568e106fa3dcedd1d1bec0f.tar.gz talos-op-linux-e3dbc572fe11a5231568e106fa3dcedd1d1bec0f.zip | |
Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue
Patch queue for ppc - 2015-08-22
Highlights for KVM PPC this time around:
- Book3S: A few bug fixes
- Book3S: Allow micro-threading on POWER8
Diffstat (limited to 'include/linux/kobject.h')
| -rw-r--r-- | include/linux/kobject.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h index 2d61b909f414..637f67002c5a 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -80,8 +80,9 @@ struct kobject { extern __printf(2, 3) int kobject_set_name(struct kobject *kobj, const char *name, ...); -extern int kobject_set_name_vargs(struct kobject *kobj, const char *fmt, - va_list vargs); +extern __printf(2, 0) +int kobject_set_name_vargs(struct kobject *kobj, const char *fmt, + va_list vargs); static inline const char *kobject_name(const struct kobject *kobj) { |
