diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:58:44 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:58:44 -0500 |
| commit | 25d3f1622fdbc73db3f6860961b5fb3035a39f32 (patch) | |
| tree | f4eef88bc0083f282c64c14e81c0ecc95e5f2b43 /arch/ia64/ia32/ia32priv.h | |
| parent | dc3edd5412341b02d84144ddfd5bf6ccaaeeb1ac (diff) | |
| parent | 0e670506668a43e1355b8f10c33d081a676bd521 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 |