[PATCH] x86: Apm seg in gdt

Since APM BIOS segment limits are now fixed, set them in head.S GDT and don't
use the complicated _set_limit() macro expansion.

Signed-off-by: Zachary Amsden <zach@vmware.com>
Acked-by: "Seth, Rohit" <rohit.seth@intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 0 insertions, 6 deletions

diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
index 0d2981120cd6..45199bb6455b 100644
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
@@ -2325,12 +2325,6 @@ static int __init apm_init(void)
                          __va((unsigned long)apm_info.bios.cseg_16 << 4));
                 set_base(gdt[APM_DS >> 3],
                          __va((unsigned long)apm_info.bios.dseg << 4));
-                /* For ASUS motherboard, Award BIOS rev 110 (and others?) */
-                _set_limit((char *)&gdt[APM_CS >> 3], 64 * 1024 - 1);
-                /* For some unknown machine. */
-                _set_limit((char *)&gdt[APM_CS_16 >> 3], 64 * 1024 - 1);
-                /* For the DEC Hinote Ultra CT475 (and others?) */
-                _set_limit((char *)&gdt[APM_DS >> 3], 64 * 1024 - 1);
         }
 
         apm_proc = create_proc_info_entry("apm", 0, NULL, apm_get_info);