aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/acpi/sleep.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-07-17 11:29:24 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-07-17 11:29:24 -0700
commit4fdf08b5bf8d449cc9897395895157c6ff8ddc41 (patch)
tree1f4cac0e1d7ef89bf24ba3fc9c0676f679aaaf4c /arch/x86/kernel/acpi/sleep.c
parent5b664cb235e97afbf34db9c4d77f08ebd725335e (diff)
downloadmrst-s0i3-test-4fdf08b5bf8d449cc9897395895157c6ff8ddc41.tar.gz
mrst-s0i3-test-4fdf08b5bf8d449cc9897395895157c6ff8ddc41.tar.xz
mrst-s0i3-test-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/kernel/acpi/sleep.c')
-rw-r--r--arch/x86/kernel/acpi/sleep.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index 868de3d5c39..a3ddad18aaa 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -9,6 +9,7 @@
#include <linux/bootmem.h>
#include <linux/dmi.h>
#include <linux/cpumask.h>
+#include <asm/segment.h>
#include "realmode/wakeup.h"
#include "sleep.h"
@@ -23,15 +24,6 @@ static unsigned long acpi_realmode;
static char temp_stack[10240];
#endif
-/* XXX: this macro should move to asm-x86/segment.h and be shared with the
- boot code... */
-#define GDT_ENTRY(flags, base, limit) \
- (((u64)(base & 0xff000000) << 32) | \
- ((u64)flags << 40) | \
- ((u64)(limit & 0x00ff0000) << 32) | \
- ((u64)(base & 0x00ffffff) << 16) | \
- ((u64)(limit & 0x0000ffff)))
-
/**
* acpi_save_state_mem - save kernel state
*