aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/head_44x.S
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-06 15:27:09 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-06 15:27:09 -0500
commit09f3eca2b7e2762e223fdd359f9d0f6303a85f6c (patch)
tree03ba6cd7357ba1054f874b12db44b838806e316d /arch/powerpc/kernel/head_44x.S
parente1b7361f32fdf60f575566ddef8a36b33086631d (diff)
parentbee86f14d51a5a9a3b1897e301da1e415df0ba23 (diff)
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
Diffstat (limited to 'arch/powerpc/kernel/head_44x.S')
-rw-r--r--arch/powerpc/kernel/head_44x.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S
index 409db6123924..56aba84c1f6e 100644
--- a/arch/powerpc/kernel/head_44x.S
+++ b/arch/powerpc/kernel/head_44x.S
@@ -722,7 +722,7 @@ empty_zero_page:
722 */ 722 */
723 .globl swapper_pg_dir 723 .globl swapper_pg_dir
724swapper_pg_dir: 724swapper_pg_dir:
725 .space 8192 725 .space PGD_TABLE_SIZE
726 726
727/* Reserved 4k for the critical exception stack & 4k for the machine 727/* Reserved 4k for the critical exception stack & 4k for the machine
728 * check stack per CPU for kernel mode exceptions */ 728 * check stack per CPU for kernel mode exceptions */