diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 00:07:46 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 00:07:46 -0500 |
| commit | 783e3385a134305d49d7b431df6e591265e7ec14 (patch) | |
| tree | 7db0b8f854201e2ad343ea5b1c6fab7c3bca5a9b /arch/ia64/ia32/ia32priv.h | |
| parent | fd803241744ad6e4262b6588c6af89e8fb794098 (diff) | |
| parent | 1cf9e8a7865c0ac216034e519cf6b8505055ea50 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/ia64/ia32/ia32priv.h')
| -rw-r--r-- | arch/ia64/ia32/ia32priv.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/ia32/ia32priv.h b/arch/ia64/ia32/ia32priv.h index e3e9290e3ff2..68ceb4e690c7 100644 --- a/arch/ia64/ia32/ia32priv.h +++ b/arch/ia64/ia32/ia32priv.h | |||
| @@ -305,7 +305,6 @@ struct old_linux32_dirent { | |||
| 305 | #define ELF_DATA ELFDATA2LSB | 305 | #define ELF_DATA ELFDATA2LSB |
| 306 | #define ELF_ARCH EM_386 | 306 | #define ELF_ARCH EM_386 |
| 307 | 307 | ||
| 308 | #define IA32_PAGE_OFFSET 0xc0000000 | ||
| 309 | #define IA32_STACK_TOP IA32_PAGE_OFFSET | 308 | #define IA32_STACK_TOP IA32_PAGE_OFFSET |
| 310 | #define IA32_GATE_OFFSET IA32_PAGE_OFFSET | 309 | #define IA32_GATE_OFFSET IA32_PAGE_OFFSET |
| 311 | #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE | 310 | #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE |