diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 10:14:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 10:14:46 -0800 |
| commit | d03ab7ff335b7fbf48d0fd28ead5d7957798510b (patch) | |
| tree | 5a1080b6f51a51fd515a61c518d46f7f2676c139 /arch/ia64/kernel/smpboot.c | |
| parent | 8098a7ef8946169cf8ffeb6f4d8130fc3651192e (diff) | |
| parent | 4d86e1b18d6de8446aa424b615b34e436d42c241 (diff) | |
| download | op-kernel-dev-d03ab7ff335b7fbf48d0fd28ead5d7957798510b.zip op-kernel-dev-d03ab7ff335b7fbf48d0fd28ead5d7957798510b.tar.gz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] wrong attribute of HUB chip written in uv_setup()
[IA64] remove trailing space in messages
[IA64] use asm-generic/scatterlist.h
[IA64] build arch/ia64/kernel/acpi-ext.o when CONFIG_ACPI
[IA64] Only build arch/ia64/kernel/acpi.o when CONFIG_ACPI
[IA64] Remove COMPAT_IA32 support
Diffstat (limited to 'arch/ia64/kernel/smpboot.c')
| -rw-r--r-- | arch/ia64/kernel/smpboot.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index de100aa..e5230b2 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c @@ -44,7 +44,6 @@ #include <asm/cache.h> #include <asm/current.h> #include <asm/delay.h> -#include <asm/ia32.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/machvec.h> @@ -443,10 +442,6 @@ smp_callin (void) calibrate_delay(); local_cpu_data->loops_per_jiffy = loops_per_jiffy; -#ifdef CONFIG_IA32_SUPPORT - ia32_gdt_init(); -#endif - /* * Allow the master to continue. */ |
