diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-11 22:13:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-11 22:13:56 -0500 |
| commit | 367262c1be4bbf23938175a93eb573b289a00027 (patch) | |
| tree | 198e9f873d8f877b39106e6f1ef695693ac8f68c /arch/ia64 | |
| parent | 0f8c7901039f8b1366ae364462743c8f4125822e (diff) | |
| parent | 18fc93fd64129c96432812cb44f59c963871889b (diff) | |
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/ia64')
| -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 @@ | |||
| 6 | * David Mosberger-Tang <davidm@hpl.hp.com> | 6 | * David Mosberger-Tang <davidm@hpl.hp.com> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #define PERCPU_ENOUGH_ROOM PERCPU_PAGE_SIZE | ||
| 10 | |||
| 11 | #ifdef __ASSEMBLY__ | 9 | #ifdef __ASSEMBLY__ |
| 12 | # define THIS_CPU(var) (var) /* use this to mark accesses to per-CPU variables... */ | 10 | # define THIS_CPU(var) (var) /* use this to mark accesses to per-CPU variables... */ |
| 13 | #else /* !__ASSEMBLY__ */ | 11 | #else /* !__ASSEMBLY__ */ |