summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-11-05 00:50:37 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-05 00:50:37 -0500
commite880e87488d5bbf630dd716e6de8a53585614568 (patch)
treecab1f22bdd3adb3141df135f98dcabecabc181b1 /lib
parent118c216e16c5ccb028cd03a0dcd56d17a07ff8d7 (diff)
parentc23fe83138ed7b11ad763cbe8bf98e5378c04bd6 (diff)
Merge tag 'driver-core-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core updates from Greg KH: "Here's the "big" driver core updates for 4.4-rc1. Primarily a bunch of debugfs updates, with a smattering of minor driver core fixes and updates as well. All have been in linux-next for a long time" * tag 'driver-core-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: debugfs: Add debugfs_create_ulong() of: to support binding numa node to specified device in devicetree debugfs: Add read-only/write-only bool file ops debugfs: Add read-only/write-only size_t file ops debugfs: Add read-only/write-only x64 file ops debugfs: Consolidate file mode checks in debugfs_create_*() Revert "mm: Check if section present during memory block (un)registering" driver-core: platform: Provide helpers for multi-driver modules mm: Check if section present during memory block (un)registering devres: fix a for loop bounds check CMA: fix CONFIG_CMA_SIZE_MBYTES overflow in 64bit base/platform: assert that dev_pm_domain callbacks are called unconditionally sysfs: correctly handle short reads on PREALLOC attrs. base: soc: siplify ida usage kobject: move EXPORT_SYMBOL() macros next to corresponding definitions kobject: explain what kobject's sd field is debugfs: document that debugfs_remove*() accepts NULL and error values debugfs: Pass bool pointer to debugfs_create_bool() ACPI / EC: Fix broken 64bit big-endian users of 'global_lock'
Diffstat (limited to 'lib')
-rw-r--r--lib/devres.c2
-rw-r--r--lib/dma-debug.c2
-rw-r--r--lib/kobject.c12
3 files changed, 7 insertions, 9 deletions
diff --git a/lib/devres.c b/lib/devres.c
index f13a2468ff39..8c85672639d3 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -418,7 +418,7 @@ void pcim_iounmap_regions(struct pci_dev *pdev, int mask)
418 if (!iomap) 418 if (!iomap)
419 return; 419 return;
420 420
421 for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { 421 for (i = 0; i < PCIM_IOMAP_MAX; i++) {
422 if (!(mask & (1 << i))) 422 if (!(mask & (1 << i)))
423 continue; 423 continue;
424 424
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index dace71fe41f7..fcb65d2a0b94 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -100,7 +100,7 @@ static LIST_HEAD(free_entries);
100static DEFINE_SPINLOCK(free_entries_lock); 100static DEFINE_SPINLOCK(free_entries_lock);
101 101
102/* Global disable flag - will be set in case of an error */ 102/* Global disable flag - will be set in case of an error */
103static u32 global_disable __read_mostly; 103static bool global_disable __read_mostly;
104 104
105/* Early initialization disable flag, set at the end of dma_debug_init */ 105/* Early initialization disable flag, set at the end of dma_debug_init */
106static bool dma_debug_initialized __read_mostly; 106static bool dma_debug_initialized __read_mostly;
diff --git a/lib/kobject.c b/lib/kobject.c
index 3e3a5c3cb330..055407746266 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -568,6 +568,7 @@ void kobject_del(struct kobject *kobj)
568 kobject_put(kobj->parent); 568 kobject_put(kobj->parent);
569 kobj->parent = NULL; 569 kobj->parent = NULL;
570} 570}
571EXPORT_SYMBOL(kobject_del);
571 572
572/** 573/**
573 * kobject_get - increment refcount for object. 574 * kobject_get - increment refcount for object.
@@ -584,6 +585,7 @@ struct kobject *kobject_get(struct kobject *kobj)
584 } 585 }
585 return kobj; 586 return kobj;
586} 587}
588EXPORT_SYMBOL(kobject_get);
587 589
588static struct kobject * __must_check kobject_get_unless_zero(struct kobject *kobj) 590static struct kobject * __must_check kobject_get_unless_zero(struct kobject *kobj)
589{ 591{
@@ -675,6 +677,7 @@ void kobject_put(struct kobject *kobj)
675 kref_put(&kobj->kref, kobject_release); 677 kref_put(&kobj->kref, kobject_release);
676 } 678 }
677} 679}
680EXPORT_SYMBOL(kobject_put);
678 681
679static void dynamic_kobj_release(struct kobject *kobj) 682static void dynamic_kobj_release(struct kobject *kobj)
680{ 683{
@@ -803,6 +806,7 @@ int kset_register(struct kset *k)
803 kobject_uevent(&k->kobj, KOBJ_ADD); 806 kobject_uevent(&k->kobj, KOBJ_ADD);
804 return 0; 807 return 0;
805} 808}
809EXPORT_SYMBOL(kset_register);
806 810
807/** 811/**
808 * kset_unregister - remove a kset. 812 * kset_unregister - remove a kset.
@@ -815,6 +819,7 @@ void kset_unregister(struct kset *k)
815 kobject_del(&k->kobj); 819 kobject_del(&k->kobj);
816 kobject_put(&k->kobj); 820 kobject_put(&k->kobj);
817} 821}
822EXPORT_SYMBOL(kset_unregister);
818 823
819/** 824/**
820 * kset_find_obj - search for object in kset. 825 * kset_find_obj - search for object in kset.
@@ -1051,10 +1056,3 @@ void kobj_ns_drop(enum kobj_ns_type type, void *ns)
1051 kobj_ns_ops_tbl[type]->drop_ns(ns); 1056 kobj_ns_ops_tbl[type]->drop_ns(ns);
1052 spin_unlock(&kobj_ns_type_lock); 1057 spin_unlock(&kobj_ns_type_lock);
1053} 1058}
1054
1055EXPORT_SYMBOL(kobject_get);
1056EXPORT_SYMBOL(kobject_put);
1057EXPORT_SYMBOL(kobject_del);
1058
1059EXPORT_SYMBOL(kset_register);
1060EXPORT_SYMBOL(kset_unregister);