1 files changed, 15 insertions, 16 deletions

diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index 442b5508893f..151ace69a5aa 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -403,7 +403,15 @@ static DECLARE_WAIT_QUEUE_HEAD(apm_waitqueue);
 static DECLARE_WAIT_QUEUE_HEAD(apm_suspend_waitqueue);
 static struct apm_user *user_list;
 static DEFINE_SPINLOCK(user_list_lock);
-static const struct desc_struct bad_bios_desc = { { { 0, 0x00409200 } } };
+
+/*
+ * Set up a segment that references the real mode segment 0x40
+ * that extends up to the end of page zero (that we have reserved).
+ * This is for buggy BIOS's that refer to (real mode) segment 0x40
+ * even though they are called in protected mode.
+ */
+static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
+                        (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
 
 static const char driver_version[] = "1.16ac";  /* no spaces */
 
@@ -2332,15 +2340,6 @@ static int __init apm_init(void)
         pm_flags |= PM_APM;
 
         /*
-         * Set up a segment that references the real mode segment 0x40
-         * that extends up to the end of page zero (that we have reserved).
-         * This is for buggy BIOS's that refer to (real mode) segment 0x40
-         * even though they are called in protected mode.
-         */
-        set_base(bad_bios_desc, __va((unsigned long)0x40 << 4));
-        _set_limit((char *)&bad_bios_desc, 4095 - (0x40 << 4));
-
-        /*
          * Set up the long jump entry point to the APM BIOS, which is called
          * from inline assembly.
          */
@@ -2358,12 +2357,12 @@ static int __init apm_init(void)
          * code to that CPU.
          */
         gdt = get_cpu_gdt_table(0);
-        set_base(gdt[APM_CS >> 3],
-                 __va((unsigned long)apm_info.bios.cseg << 4));
-        set_base(gdt[APM_CS_16 >> 3],
-                 __va((unsigned long)apm_info.bios.cseg_16 << 4));
-        set_base(gdt[APM_DS >> 3],
-                 __va((unsigned long)apm_info.bios.dseg << 4));
+        set_desc_base(&gdt[APM_CS >> 3],
+                 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
+        set_desc_base(&gdt[APM_CS_16 >> 3],
+                 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
+        set_desc_base(&gdt[APM_DS >> 3],
+                 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
 
         proc_create("apm", 0, NULL, &apm_file_ops);