diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-16 18:23:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-16 18:23:02 -0700 |
| commit | d528ae0d3dfedea553812c957a6ed1e87feeed8a (patch) | |
| tree | bb535047ccdfde275315091bd9eba0ee6ad0ba08 /drivers | |
| parent | d11507e197242aaab172d7f1d0fe4771fbffa530 (diff) | |
| parent | 15c9e10d9ad4d41d076148bbff1de7f659f68852 (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton:
"6 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
drivers core: remove assert_held_device_hotplug()
mm: add private lock to serialize memory hotplug operations
mm: don't warn when vmalloc() fails due to a fatal signal
mm, x86: fix native_pud_clear build error
kasan: add a prototype of task_struct to avoid warning
z3fold: fix spinlock unlocking in page reclaim
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/core.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 684bda4d14a1..6bb60fb6a30b 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -639,11 +639,6 @@ int lock_device_hotplug_sysfs(void) return restart_syscall(); } -void assert_held_device_hotplug(void) -{ - lockdep_assert_held(&device_hotplug_lock); -} - #ifdef CONFIG_BLOCK static inline int device_is_not_partition(struct device *dev) { |