diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-06 16:42:01 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-06 16:42:03 +1100 |
| commit | 9b18d99940e0d1f87f4f7b59814514435484c091 (patch) | |
| tree | 3957a6f2e5934cde5fdc172b7da3172299afa174 /arch/microblaze/include/asm/entry.h | |
| parent | ccfb86835bf05f88a583f2d1a8dd4de792d14ec3 (diff) | |
| parent | dbfc196a3cc1a2514ad0737a82f764de23bd65e6 (diff) | |
Merge remote branch 'percpu/for-next'
Diffstat (limited to 'arch/microblaze/include/asm/entry.h')
| -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 @@ * places */ -#define PER_CPU(var) per_cpu__##var +#define PER_CPU(var) var # ifndef __ASSEMBLY__ DECLARE_PER_CPU(unsigned int, KSP); /* Saved kernel stack pointer */ |