tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'for-2.6.24' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc

* 'for-2.6.24' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc:
[POWERPC] Fix swapper_pg_dir size when CONFIG_PTE_64BIT=y on FSL_BOOKE

Linus Torvalds 09f3eca2 e1b7361f

+10 -6
+1 -2
arch/powerpc/kernel/asm-offsets.c
··· 326 326 DEFINE(VMALLOC_START_VSID, KERNEL_VSID(VMALLOC_START)); 327 327 #endif 328 328 329 - #ifdef CONFIG_PPC64 330 329 DEFINE(PGD_TABLE_SIZE, PGD_TABLE_SIZE); 331 - #endif 330 + 332 331 return 0; 333 332 }
+1 -1
arch/powerpc/kernel/head_32.S
··· 1311 1311 1312 1312 .globl swapper_pg_dir 1313 1313 swapper_pg_dir: 1314 - .space 4096 1314 + .space PGD_TABLE_SIZE 1315 1315 1316 1316 .globl intercept_table 1317 1317 intercept_table:
+1 -1
arch/powerpc/kernel/head_40x.S
··· 994 994 .space 4096 995 995 .globl swapper_pg_dir 996 996 swapper_pg_dir: 997 - .space 4096 997 + .space PGD_TABLE_SIZE 998 998 999 999 1000 1000 /* Stack for handling critical exceptions from kernel mode */
+1 -1
arch/powerpc/kernel/head_44x.S
··· 722 722 */ 723 723 .globl swapper_pg_dir 724 724 swapper_pg_dir: 725 - .space 8192 725 + .space PGD_TABLE_SIZE 726 726 727 727 /* Reserved 4k for the critical exception stack & 4k for the machine 728 728 * check stack per CPU for kernel mode exceptions */
+1 -1
arch/powerpc/kernel/head_fsl_booke.S
··· 1035 1035 .space 4096 1036 1036 .globl swapper_pg_dir 1037 1037 swapper_pg_dir: 1038 - .space 4096 1038 + .space PGD_TABLE_SIZE 1039 1039 1040 1040 /* Reserved 4k for the critical exception stack & 4k for the machine 1041 1041 * check stack per CPU for kernel mode exceptions */
+5
include/asm-powerpc/pgtable-ppc32.h
··· 86 86 * entries per page directory level: our page-table tree is two-level, so 87 87 * we don't really have any PMD directory. 88 88 */ 89 + #ifndef __ASSEMBLY__ 90 + #define PTE_TABLE_SIZE (sizeof(pte_t) << PTE_SHIFT) 91 + #define PGD_TABLE_SIZE (sizeof(pgd_t) << (32 - PGDIR_SHIFT)) 92 + #endif /* __ASSEMBLY__ */ 93 + 89 94 #define PTRS_PER_PTE (1 << PTE_SHIFT) 90 95 #define PTRS_PER_PMD 1 91 96 #define PTRS_PER_PGD (1 << (32 - PGDIR_SHIFT))