diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-07-17 20:29:24 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-07-17 20:29:24 +0200 |
| commit | 4fdf08b5bf8d449cc9897395895157c6ff8ddc41 (patch) | |
| tree | 1f4cac0e1d7ef89bf24ba3fc9c0676f679aaaf4c /include | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-4fdf08b5bf8d449cc9897395895157c6ff8ddc41.tar.xz linux-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 'include')
| -rw-r--r-- | include/asm-x86/segment.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/asm-x86/segment.h b/include/asm-x86/segment.h index dfc8601c0892..646452ea9ea3 100644 --- a/include/asm-x86/segment.h +++ b/include/asm-x86/segment.h @@ -1,6 +1,15 @@ #ifndef _ASM_X86_SEGMENT_H_ #define _ASM_X86_SEGMENT_H_ +/* Constructor for a conventional segment GDT (or LDT) entry */ +/* This is a macro so it can be used in initializers */ +#define GDT_ENTRY(flags, base, limit) \ + ((((base) & 0xff000000ULL) << (56-24)) | \ + (((flags) & 0x0000f0ffULL) << 40) | \ + (((limit) & 0x000f0000ULL) << (48-16)) | \ + (((base) & 0x00ffffffULL) << 16) | \ + (((limit) & 0x0000ffffULL))) + /* Simple and small GDT entries for booting only */ #define GDT_ENTRY_BOOT_CS 2 |