diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 16:31:11 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 16:31:11 +1100 |
| commit | f84cbf9bf91974f6098c4e1c2b293462a2b8797d (patch) | |
| tree | c05b0486c370e1ec79f9899c6a27d7fa6dd543bb /arch/mn10300 | |
| parent | 03af16e069bc949aaab3afe0c8d80cf0af58826a (diff) | |
| parent | b9ec40af0e18fb7d02106be148036c2ea490fdf9 (diff) | |
Merge remote-tracking branch 'percpu/for-next'
Conflicts:
arch/x86/kernel/vmlinux.lds.S
Diffstat (limited to 'arch/mn10300')
| -rw-r--r-- | arch/mn10300/kernel/vmlinux.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/vmlinux.lds.S b/arch/mn10300/kernel/vmlinux.lds.S index febbeee7f2f5..968bcd2cb022 100644 --- a/arch/mn10300/kernel/vmlinux.lds.S +++ b/arch/mn10300/kernel/vmlinux.lds.S @@ -70,7 +70,7 @@ SECTIONS .exit.text : { EXIT_TEXT; } .exit.data : { EXIT_DATA; } - PERCPU(PAGE_SIZE) + PERCPU(32, PAGE_SIZE) . = ALIGN(PAGE_SIZE); __init_end = .; /* freed after init ends here */ |