diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 16:48:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 16:48:59 -0700 |
| commit | ce4b61f5e2fab568f90adf79642cbfc49aac5bba (patch) | |
| tree | 51155f2bacade594b1cb6731f334263a91e1fc68 /arch | |
| parent | e95206ab2c8cd6ea11318a5fe96b4ace534be750 (diff) | |
| parent | 4d1efed540df1ccd3077df6f2bffba9d506b7d7b (diff) | |
| download | kernel-crypto-ce4b61f5e2fab568f90adf79642cbfc49aac5bba.tar.gz kernel-crypto-ce4b61f5e2fab568f90adf79642cbfc49aac5bba.tar.xz kernel-crypto-ce4b61f5e2fab568f90adf79642cbfc49aac5bba.zip | |
Merge branch 'release' of ssh://master.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of ssh://master.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Fix build for CONFIG_SMP=n
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/kernel/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 777c8d8bd5e..c5cfcfa4c87 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c @@ -869,6 +869,7 @@ cpu_init (void) void *cpu_data; cpu_data = per_cpu_init(); +#ifdef CONFIG_SMP /* * insert boot cpu into sibling and core mapes * (must be done after per_cpu area is setup) @@ -877,6 +878,7 @@ cpu_init (void) cpu_set(0, per_cpu(cpu_sibling_map, 0)); cpu_set(0, cpu_core_map[0]); } +#endif /* * We set ar.k3 so that assembly code in MCA handler can compute |