tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

Pull percpu updates from Tejun Heo:
"Two trivial percpu patches for v4.5-rc1"

* 'for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
percpu: remove PERCPU_ENOUGH_ROOM which is stale definition
percpu: Remove unneeded return from void function

Linus Torvalds 367262c1 0f8c7901

+1 -9
-2
arch/ia64/include/asm/percpu.h
··· 6 6 * David Mosberger-Tang <davidm@hpl.hp.com> 7 7 */ 8 8 9 - #define PERCPU_ENOUGH_ROOM PERCPU_PAGE_SIZE 10 - 11 9 #ifdef __ASSEMBLY__ 12 10 # define THIS_CPU(var) (var) /* use this to mark accesses to per-CPU variables... */ 13 11 #else /* !__ASSEMBLY__ */
+1 -1
include/linux/percpu-refcount.h
··· 116 116 */ 117 117 static inline void percpu_ref_kill(struct percpu_ref *ref) 118 118 { 119 - return percpu_ref_kill_and_confirm(ref, NULL); 119 + percpu_ref_kill_and_confirm(ref, NULL); 120 120 } 121 121 122 122 /*
-6
include/linux/percpu.h
··· 18 18 #define PERCPU_MODULE_RESERVE 0 19 19 #endif 20 20 21 - #ifndef PERCPU_ENOUGH_ROOM 22 - #define PERCPU_ENOUGH_ROOM \ 23 - (ALIGN(__per_cpu_end - __per_cpu_start, SMP_CACHE_BYTES) + \ 24 - PERCPU_MODULE_RESERVE) 25 - #endif 26 - 27 21 /* minimum unit size, also is the maximum supported allocation size */ 28 22 #define PCPU_MIN_UNIT_SIZE PFN_ALIGN(32 << 10) 29 23