diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-01-29 09:41:18 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-01-29 09:41:18 +0100 |
commit | 76b36fa896a2db64582690e085f36adc76604134 (patch) | |
tree | 78007f123ead6f96cdee6ba98ac3c289c706cc39 /arch/ia64/include/asm/percpu.h | |
parent | x86/asm: Remove unused L3_PAGE_OFFSET (diff) | |
parent | Linux 4.5-rc1 (diff) | |
download | linux-76b36fa896a2db64582690e085f36adc76604134.tar.xz linux-76b36fa896a2db64582690e085f36adc76604134.zip |
Merge tag 'v4.5-rc1' into x86/asm, to refresh the branch before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/ia64/include/asm/percpu.h')
-rw-r--r-- | arch/ia64/include/asm/percpu.h | 2 |
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__ */ |