Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2665f92 authored by Matt Porter's avatar Matt Porter Committed by Linus Torvalds
Browse files

[PATCH] ppc32: fix CONFIG_TASK_SIZE handling on 44x 



This patch fixed CONFIG_TASK_SIZE handling on 44x.  Currently head_44x.S
hardcodes 0x80000000, which breaks if user chooses to change TASK_SIZE
(e.g.  for 3G user-space).  Tested on Ocotea in 3G/1G configuration.

Signed-off-by: default avatarEugene Surovegin <ebs@ebshome.net>
Signed-off-by: default avatarMatt Porter <mporter@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7f8cd80f

arch/ppc/kernel/head_44x.S

+9 −6
Original line number Original line Diff line number Diff line
@@ -330,8 +330,9 @@ interrupt_base: 
	/* If we are faulting a kernel address, we have to use the

	/* If we are faulting a kernel address, we have to use the

	 * kernel page tables.

	 * kernel page tables.

	 */

	 */

	andis.	r11, r10, 0x8000

	lis	r11, TASK_SIZE@h

	beq	3f

	cmplw	r10, r11

	blt+	3f

	lis	r11, swapper_pg_dir@h

	lis	r11, swapper_pg_dir@h

	ori	r11, r11, swapper_pg_dir@l

	ori	r11, r11, swapper_pg_dir@l
@@ -464,8 +465,9 @@ interrupt_base: 
	/* If we are faulting a kernel address, we have to use the

	/* If we are faulting a kernel address, we have to use the

	 * kernel page tables.

	 * kernel page tables.

	 */

	 */

	andis.	r11, r10, 0x8000

	lis	r11, TASK_SIZE@h

	beq	3f

	cmplw	r10, r11

	blt+	3f

	lis	r11, swapper_pg_dir@h

	lis	r11, swapper_pg_dir@h

	ori	r11, r11, swapper_pg_dir@l

	ori	r11, r11, swapper_pg_dir@l
@@ -533,8 +535,9 @@ interrupt_base: 
	/* If we are faulting a kernel address, we have to use the

	/* If we are faulting a kernel address, we have to use the

	 * kernel page tables.

	 * kernel page tables.

	 */

	 */

	andis.	r11, r10, 0x8000

	lis	r11, TASK_SIZE@h

	beq	3f

	cmplw	r10, r11

	blt+	3f

	lis	r11, swapper_pg_dir@h

	lis	r11, swapper_pg_dir@h

	ori	r11, r11, swapper_pg_dir@l

	ori	r11, r11, swapper_pg_dir@l