summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-01-12 06:13:56 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-12 06:13:56 +0300
commit367262c1be4bbf23938175a93eb573b289a00027 (patch)
tree198e9f873d8f877b39106e6f1ef695693ac8f68c /arch
parent0f8c7901039f8b1366ae364462743c8f4125822e (diff)
parent18fc93fd64129c96432812cb44f59c963871889b (diff)
downloadlinux-367262c1be4bbf23938175a93eb573b289a00027.tar.xz
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
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/include/asm/percpu.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ia64/include/asm/percpu.h b/arch/ia64/include/asm/percpu.h
index 0ec484d2dcbc..b9295793a5e2 100644
--- a/arch/ia64/include/asm/percpu.h
+++ b/arch/ia64/include/asm/percpu.h
@@ -6,8 +6,6 @@
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
-#define PERCPU_ENOUGH_ROOM PERCPU_PAGE_SIZE
-
#ifdef __ASSEMBLY__
# define THIS_CPU(var) (var) /* use this to mark accesses to per-CPU variables... */
#else /* !__ASSEMBLY__ */