Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc

* 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc:
  eeepc-wmi: include slab.h
  staging/otus: include slab.h from usbdrv.h
  percpu: don't implicitly include slab.h from percpu.h
  kmemcheck: Fix build errors due to missing slab.h
  include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
  iwlwifi: don't include iwl-dev.h from iwl-devtrace.h
  x86: don't include slab.h from arch/x86/include/asm/pgtable_32.h

Fix up trivial conflicts in include/linux/percpu.h due to
is_kernel_percpu_address() having been introduced since the slab.h
cleanup with the percpu_up.c splitup.

diff --cc include/linux/percpu.h
index 11d5f83,c784513..d3a38d6
--- 1/include/linux/percpu.h
--- 2/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@@ -135,10 -135,6 +135,7 @@@ extern int __init pcpu_page_first_chunk
  #define per_cpu_ptr(ptr, cpu) SHIFT_PERCPU_PTR((ptr), per_cpu_offset((cpu)))
  
  extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align);
- extern void __percpu *__alloc_percpu(size_t size, size_t align);
- extern void free_percpu(void __percpu *__pdata);
 +extern bool is_kernel_percpu_address(unsigned long addr);
- extern phys_addr_t per_cpu_ptr_to_phys(void *addr);
  
  #ifndef CONFIG_HAVE_SETUP_PER_CPU_AREA
  extern void __init setup_per_cpu_areas(void);
@@@ -148,33 -144,6 +145,12 @@@
  
  #define per_cpu_ptr(ptr, cpu) ({ (void)(cpu); (ptr); })
  
- static inline void __percpu *__alloc_percpu(size_t size, size_t align)
- {
-       /*
-        * Can't easily make larger alignment work with kmalloc.  WARN
-        * on it.  Larger alignment should only be used for module
-        * percpu sections on SMP for which this path isn't used.
-        */
-       WARN_ON_ONCE(align > SMP_CACHE_BYTES);
-       return kzalloc(size, GFP_KERNEL);
- }
- 
- static inline void free_percpu(void __percpu *p)
- {
-       kfree(p);
- }
- 
 +/* can't distinguish from other static vars, always false */
 +static inline bool is_kernel_percpu_address(unsigned long addr)
 +{
 +      return false;
 +}
 +
- static inline phys_addr_t per_cpu_ptr_to_phys(void *addr)
- {
-       return __pa(addr);
- }
- 
  static inline void __init setup_per_cpu_areas(void) { }
  
  static inline void *pcpu_lpage_remapped(void *kaddr)

diff --cc kernel/lockdep.c
Simple merge