Hi all,
Today's linux-next merge of the tip tree got a conflict in
include/linux/percpu.h between commit
6fc80ef491b981f59233beaf6aeaccc0c947031d ("percpu: use percpu allocator
on UP too") from the slab tree and commit
8b8e2ec1eeca7f6941bc81cefc9663018d6ceb57 ("percpu: Add {get,put}
_cpu_ptr") from the tip tree.
Just context changes. 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 aeeeef1,0eb5083..0000000
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@@ -39,8 -39,19 +39,17 @@@
preempt_enable(); \
} while (0)
+ #define get_cpu_ptr(var) ({ \
+ preempt_disable(); \
+ this_cpu_ptr(var); })
+
+ #define put_cpu_ptr(var) do { \
+ (void)(var); \
+ preempt_enable(); \
+ } while (0)
+
-#ifdef CONFIG_SMP
-
/* minimum unit size, also is the maximum supported allocation size */
-#define PCPU_MIN_UNIT_SIZE PFN_ALIGN(64 << 10)
+#define PCPU_MIN_UNIT_SIZE PFN_ALIGN(32 << 10)
/*
* Percpu allocator can serve percpu allocations before slab is
--
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
