diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-05-09 18:24:09 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-05-09 18:24:09 -0400 |
| commit | 1f2ee6496b1f71e9d5aa2448745e65fbafdc3bd5 (patch) | |
| tree | 3f143311afca5e316afd06c2fc4f7d73b19cdcf0 /arch/x86/kernel/setup.c | |
| parent | 5bf6c6e30d8b71d092e8830208e182d84b907fcd (diff) | |
| parent | da109897a142dd017172c0ce7abf0be8646f7109 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index c0c68c18a788..cc6f5eb20b24 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
| @@ -95,7 +95,7 @@ void __init setup_per_cpu_areas(void) | |||
| 95 | 95 | ||
| 96 | /* Copy section for each CPU (we discard the original) */ | 96 | /* Copy section for each CPU (we discard the original) */ |
| 97 | size = PERCPU_ENOUGH_ROOM; | 97 | size = PERCPU_ENOUGH_ROOM; |
| 98 | printk(KERN_INFO "PERCPU: Allocating %lu bytes of per cpu data\n", | 98 | printk(KERN_INFO "PERCPU: Allocating %zd bytes of per cpu data\n", |
| 99 | size); | 99 | size); |
| 100 | 100 | ||
| 101 | for_each_possible_cpu(i) { | 101 | for_each_possible_cpu(i) { |