diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/ia64/kernel/smpboot.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
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 de100aa7ff03..e5230b2ff2c5 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c | |||
| @@ -44,7 +44,6 @@ | |||
| 44 | #include <asm/cache.h> | 44 | #include <asm/cache.h> |
| 45 | #include <asm/current.h> | 45 | #include <asm/current.h> |
| 46 | #include <asm/delay.h> | 46 | #include <asm/delay.h> |
| 47 | #include <asm/ia32.h> | ||
| 48 | #include <asm/io.h> | 47 | #include <asm/io.h> |
| 49 | #include <asm/irq.h> | 48 | #include <asm/irq.h> |
| 50 | #include <asm/machvec.h> | 49 | #include <asm/machvec.h> |
| @@ -443,10 +442,6 @@ smp_callin (void) | |||
| 443 | calibrate_delay(); | 442 | calibrate_delay(); |
| 444 | local_cpu_data->loops_per_jiffy = loops_per_jiffy; | 443 | local_cpu_data->loops_per_jiffy = loops_per_jiffy; |
| 445 | 444 | ||
| 446 | #ifdef CONFIG_IA32_SUPPORT | ||
| 447 | ia32_gdt_init(); | ||
| 448 | #endif | ||
| 449 | |||
| 450 | /* | 445 | /* |
| 451 | * Allow the master to continue. | 446 | * Allow the master to continue. |
| 452 | */ | 447 | */ |