i386 Apm seg in gdt
PATCH 3/21 i386 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 <[email protected]>
arch/i386/kernel/head.S +5 -4
@@ -510,13 +510,14 @@ ENTRY(cpu_gdt_table) .quad 0x0080920000000000 /* 0xa0 16-bit data */ .quad 0x0080920000000000 /* 0xa8 16-bit data */ .quad 0x0080920000000000 /* 0xb0 16-bit data */ + /* * The APM segments have byte granularity and their bases - * and limits are set at run time. + * are set at run time. All have 64k limits. */ - .quad 0x00409a0000000000 /* 0xb8 APM CS code */ - .quad 0x00009a0000000000 /* 0xc0 APM CS 16 code (16 bit) */ - .quad 0x0040920000000000 /* 0xc8 APM DS data */ + .quad 0x00409a000000ffff /* 0xb8 APM CS code */ + .quad 0x00009a000000ffff /* 0xc0 APM CS 16 code (16 bit) */ + .quad 0x004092000000ffff /* 0xc8 APM DS data */ .quad 0x0000920000000000 /* 0xd0 - ESPFIX 16-bit SS */ .quad 0x0000000000000000 /* 0xd8 - unused */
arch/i386/kernel/apm.c +0 -6
@@ -2305,12 +2305,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);