Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99022c46 authored by Zachary Amsden's avatar Zachary Amsden Committed by Linus Torvalds
Browse files

[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: default avatarZachary Amsden <zach@vmware.com>
Acked-by: default avatar"Seth, Rohit" <rohit.seth@intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3012d2d2

arch/i386/kernel/apm.c

+0 −6
Original line number Diff line number Diff line
@@ -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);

arch/i386/kernel/head.S

+5 −4
Original line number Diff line number Diff line
@@ -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 */