diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-07-17 11:29:24 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-07-17 11:29:24 -0700 |
| commit | 4fdf08b5bf8d449cc9897395895157c6ff8ddc41 (patch) | |
| tree | 1f4cac0e1d7ef89bf24ba3fc9c0676f679aaaf4c /arch/x86/boot/pm.c | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
| download | linux-3.10-4fdf08b5bf8d449cc9897395895157c6ff8ddc41.tar.gz linux-3.10-4fdf08b5bf8d449cc9897395895157c6ff8ddc41.tar.bz2 linux-3.10-4fdf08b5bf8d449cc9897395895157c6ff8ddc41.zip | |
x86: unify and correct the GDT_ENTRY() macro
Merge the GDT_ENTRY() macro between arch/x86/boot/pm.c and
arch/x86/kernel/acpi/sleep.c and put the new one in
<asm-x86/segment.h>.
While we're at it, correct the bitmasks for the limit and flags. The
new version relies on using ULL constants in order to cause type
promotion rather than explicit casts; this avoids having to include
<linux/types.h> in <asm-x86/segments.h>.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/boot/pm.c')
| -rw-r--r-- | arch/x86/boot/pm.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/boot/pm.c b/arch/x86/boot/pm.c index 328956fdb59..85a1cd8a8ff 100644 --- a/arch/x86/boot/pm.c +++ b/arch/x86/boot/pm.c @@ -98,12 +98,6 @@ static void reset_coprocessor(void) /* * Set up the GDT */ -#define GDT_ENTRY(flags, base, limit) \ - (((u64)(base & 0xff000000) << 32) | \ - ((u64)flags << 40) | \ - ((u64)(limit & 0x00ff0000) << 32) | \ - ((u64)(base & 0x00ffffff) << 16) | \ - ((u64)(limit & 0x0000ffff))) struct gdt_ptr { u16 len; |