Hi Tejun,
Today's linux-next merge of the slabh tree got a conflict in
include/linux/percpu.h between commit
10fad5e46f6c7bdfb01b1a012380a38e3c6ab346 ("percpu, module: implement and
use is_kernel/module_percpu_address()") from the percpu tree and commit
d103d3b3e8512312b5254950035366d4422a479a ("percpu: don't implicitly
include slab.h from percpu.h") from the slabh tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc include/linux/percpu.h
index 11d5f83,c784513..0000000
--- a/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)
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
