[PATCH] x86: GDT alignment fix

[net-next-2.6.git] / arch / i386 / kernel / apm.c

diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
index 003548b8735f961b24794da2306bff45944ee63e..6c8e483ce9e40af033e3cbc063db9442c90b3a75 100644 (file)
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
@@ -218,6 +218,7 @@
 #include <linux/time.h>
 #include <linux/sched.h>
 #include <linux/pm.h>
+#include <linux/pm_legacy.h>
 #include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/smp.h>
@@ -2316,6 +2317,8 @@ static int __init apm_init(void)
 
        for (i = 0; i < NR_CPUS; i++) {
                struct desc_struct *gdt = get_cpu_gdt_table(i);
+               if (!gdt)
+                       continue;
                set_base(gdt[APM_CS >> 3],
                         __va((unsigned long)apm_info.bios.cseg << 4));
                set_base(gdt[APM_CS_16 >> 3],