diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-03 10:34:18 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-03 10:34:18 -0500 |
| commit | 0a135ba14d71fb84c691a5386aff5049691fe6d7 (patch) | |
| tree | adb1de887dd6839d69d2fc16ffa2a10ff63298fa /arch/microblaze | |
| parent | 4850f524b2c4c8a4e9f8ef4dd9c7c4afde2f2b2c (diff) | |
| parent | a29d8b8e2d811a24bbe49215a0f0c536b72ebc18 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
percpu: add __percpu sparse annotations to what's left
percpu: add __percpu sparse annotations to fs
percpu: add __percpu sparse annotations to core kernel subsystems
local_t: Remove leftover local.h
this_cpu: Remove pageset_notifier
this_cpu: Page allocator conversion
percpu, x86: Generic inc / dec percpu instructions
local_t: Move local.h include to ringbuffer.c and ring_buffer_benchmark.c
module: Use this_cpu_xx to dynamically allocate counters
local_t: Remove cpu_local_xx macros
percpu: refactor the code in pcpu_[de]populate_chunk()
percpu: remove compile warnings caused by __verify_pcpu_ptr()
percpu: make accessors check for percpu pointer in sparse
percpu: add __percpu for sparse.
percpu: make access macros universal
percpu: remove per_cpu__ prefix.
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/include/asm/entry.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/entry.h b/arch/microblaze/include/asm/entry.h index 61abbd232640..ec89f2ad0fe1 100644 --- a/arch/microblaze/include/asm/entry.h +++ b/arch/microblaze/include/asm/entry.h | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | * places | 21 | * places |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #define PER_CPU(var) per_cpu__##var | 24 | #define PER_CPU(var) var |
| 25 | 25 | ||
| 26 | # ifndef __ASSEMBLY__ | 26 | # ifndef __ASSEMBLY__ |
| 27 | DECLARE_PER_CPU(unsigned int, KSP); /* Saved kernel stack pointer */ | 27 | DECLARE_PER_CPU(unsigned int, KSP); /* Saved kernel stack pointer */ |