summaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/smpboot.c
diff options
context:
space:
mode:
authorPaul Mackerras2006-02-28 06:35:24 +0100
committerPaul Mackerras2006-02-28 06:35:24 +0100
commit6749c5507388f3fc3719f57a54b540ee83f6661a (patch)
treec069f990f86b020a14b50759d0c75475eedde186 /arch/i386/kernel/smpboot.c
parentpowerpc: Export variables used in conversions to/from cputime_t (diff)
parent[PATCH] powerpc/iseries: Fix double phys_to_abs bug in htab_bolt_mapping (diff)
downloadkernel-qcow2-linux-6749c5507388f3fc3719f57a54b540ee83f6661a.tar.gz
kernel-qcow2-linux-6749c5507388f3fc3719f57a54b540ee83f6661a.tar.xz
kernel-qcow2-linux-6749c5507388f3fc3719f57a54b540ee83f6661a.zip
Merge ../powerpc-merge
Diffstat (limited to 'arch/i386/kernel/smpboot.c')
-rw-r--r--arch/i386/kernel/smpboot.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index fb00ab7b7612..eba7f53f8b4a 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -898,12 +898,6 @@ static int __devinit do_boot_cpu(int apicid, int cpu)
unsigned long start_eip;
unsigned short nmi_high = 0, nmi_low = 0;
- if (!cpu_gdt_descr[cpu].address &&
- !(cpu_gdt_descr[cpu].address = get_zeroed_page(GFP_KERNEL))) {
- printk("Failed to allocate GDT for CPU %d\n", cpu);
- return 1;
- }
-
++cpucount;
/*