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

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

[PATCH] ppc32: fix CONFIG_TASK_SIZE handling on 40x 



This patch is virtually identical to my previous 44x one.  It removes
0x8000'0000 TASK_SIZE hardcoded assumption from head_4xx.S.

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 a1604f91

arch/ppc/kernel/head_4xx.S

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

	 * kernel page tables.

	 */

	andis.	r11, r10, 0x8000

	beq	3f

	lis	r11, TASK_SIZE@h

	cmplw	r10, r11

	blt+	3f

	lis	r11, swapper_pg_dir@h

	ori	r11, r11, swapper_pg_dir@l

	li	r9, 0
@@ -479,8 +480,9 @@ label: 
	/* If we are faulting a kernel address, we have to use the

	 * kernel page tables.

	 */

	andis.	r11, r10, 0x8000

	beq	3f

	lis	r11, TASK_SIZE@h

	cmplw	r10, r11

	blt+	3f

	lis	r11, swapper_pg_dir@h

	ori	r11, r11, swapper_pg_dir@l

	li	r9, 0
@@ -578,8 +580,9 @@ label: 
	/* If we are faulting a kernel address, we have to use the

	 * kernel page tables.

	 */

	andis.	r11, r10, 0x8000

	beq	3f

	lis	r11, TASK_SIZE@h

	cmplw	r10, r11

	blt+	3f

	lis	r11, swapper_pg_dir@h

	ori	r11, r11, swapper_pg_dir@l

	li	r9, 0