diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-ppc64/elf.h | 3 | ||||
-rw-r--r-- | include/asm-ppc64/mmu.h | 2 | ||||
-rw-r--r-- | include/asm-ppc64/thread_info.h | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/include/asm-ppc64/elf.h b/include/asm-ppc64/elf.h index c919a89343db..e27c2942953c 100644 --- a/include/asm-ppc64/elf.h +++ b/include/asm-ppc64/elf.h | |||
@@ -5,6 +5,7 @@ | |||
5 | #include <asm/ptrace.h> | 5 | #include <asm/ptrace.h> |
6 | #include <asm/cputable.h> | 6 | #include <asm/cputable.h> |
7 | #include <asm/auxvec.h> | 7 | #include <asm/auxvec.h> |
8 | #include <asm/page.h> | ||
8 | 9 | ||
9 | /* PowerPC relocations defined by the ABIs */ | 10 | /* PowerPC relocations defined by the ABIs */ |
10 | #define R_PPC_NONE 0 | 11 | #define R_PPC_NONE 0 |
@@ -146,7 +147,7 @@ typedef elf_vrreg_t elf_vrregset_t32[ELF_NVRREG32]; | |||
146 | #define elf_check_arch(x) ((x)->e_machine == ELF_ARCH) | 147 | #define elf_check_arch(x) ((x)->e_machine == ELF_ARCH) |
147 | 148 | ||
148 | #define USE_ELF_CORE_DUMP | 149 | #define USE_ELF_CORE_DUMP |
149 | #define ELF_EXEC_PAGESIZE 4096 | 150 | #define ELF_EXEC_PAGESIZE PAGE_SIZE |
150 | 151 | ||
151 | /* This is the location that an ET_DYN program is loaded if exec'ed. Typical | 152 | /* This is the location that an ET_DYN program is loaded if exec'ed. Typical |
152 | use of this is to invoke "./ld.so someprog" to test out a new version of | 153 | use of this is to invoke "./ld.so someprog" to test out a new version of |
diff --git a/include/asm-ppc64/mmu.h b/include/asm-ppc64/mmu.h index 737e85a5ce3c..d2b0b796d35e 100644 --- a/include/asm-ppc64/mmu.h +++ b/include/asm-ppc64/mmu.h | |||
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | /* Location of cpu0's segment table */ | 31 | /* Location of cpu0's segment table */ |
32 | #define STAB0_PAGE 0x6 | 32 | #define STAB0_PAGE 0x6 |
33 | #define STAB0_PHYS_ADDR (STAB0_PAGE<<PAGE_SHIFT) | 33 | #define STAB0_PHYS_ADDR (STAB0_PAGE<<12) |
34 | 34 | ||
35 | #ifndef __ASSEMBLY__ | 35 | #ifndef __ASSEMBLY__ |
36 | extern char initial_stab[]; | 36 | extern char initial_stab[]; |
diff --git a/include/asm-ppc64/thread_info.h b/include/asm-ppc64/thread_info.h index 0494df6fca74..71244d8a427d 100644 --- a/include/asm-ppc64/thread_info.h +++ b/include/asm-ppc64/thread_info.h | |||
@@ -54,9 +54,9 @@ struct thread_info { | |||
54 | 54 | ||
55 | /* thread information allocation */ | 55 | /* thread information allocation */ |
56 | 56 | ||
57 | #define THREAD_ORDER 2 | 57 | #define THREAD_SHIFT 14 |
58 | #define THREAD_SIZE (PAGE_SIZE << THREAD_ORDER) | 58 | #define THREAD_ORDER (THREAD_SHIFT - PAGE_SHIFT) |
59 | #define THREAD_SHIFT (PAGE_SHIFT + THREAD_ORDER) | 59 | #define THREAD_SIZE (1 << THREAD_SHIFT) |
60 | #ifdef CONFIG_DEBUG_STACK_USAGE | 60 | #ifdef CONFIG_DEBUG_STACK_USAGE |
61 | #define alloc_thread_info(tsk) \ | 61 | #define alloc_thread_info(tsk) \ |
62 | ({ \ | 62 | ({ \ |