diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-14 03:16:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-14 04:44:08 -0400 |
| commit | 62395efdb0ef42e664ca81677901268c403a6286 (patch) | |
| tree | 7ce9e6ba8b3fa0c004f852b56966e96ad948d2f8 /arch/x86/include/asm/boot.h | |
| parent | ccd50dfd92ea2c4ba9e39531ac55db53393e783e (diff) | |
| parent | 88200bc28da38bcda1cb1bd218216e83b426d8a8 (diff) | |
Merge branch 'x86/asm' into tracing/syscalls
We need the wider TIF work-mask checks in entry_32.S.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/boot.h')
| -rw-r--r-- | arch/x86/include/asm/boot.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h index 6526cf08b0e4..6ba23dd9fc92 100644 --- a/arch/x86/include/asm/boot.h +++ b/arch/x86/include/asm/boot.h | |||
| @@ -1,10 +1,6 @@ | |||
| 1 | #ifndef _ASM_X86_BOOT_H | 1 | #ifndef _ASM_X86_BOOT_H |
| 2 | #define _ASM_X86_BOOT_H | 2 | #define _ASM_X86_BOOT_H |
| 3 | 3 | ||
| 4 | /* Don't touch these, unless you really know what you're doing. */ | ||
| 5 | #define DEF_SYSSEG 0x1000 | ||
| 6 | #define DEF_SYSSIZE 0x7F00 | ||
| 7 | |||
| 8 | /* Internal svga startup constants */ | 4 | /* Internal svga startup constants */ |
| 9 | #define NORMAL_VGA 0xffff /* 80x25 mode */ | 5 | #define NORMAL_VGA 0xffff /* 80x25 mode */ |
| 10 | #define EXTENDED_VGA 0xfffe /* 80x50 mode */ | 6 | #define EXTENDED_VGA 0xfffe /* 80x50 mode */ |