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

Commit 09f3eca2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e1b7361f bee86f14

arch/powerpc/kernel/asm-offsets.c

+1 −2
Original line number Diff line number Diff line
@@ -326,8 +326,7 @@ int main(void) 
	DEFINE(VMALLOC_START_VSID, KERNEL_VSID(VMALLOC_START));

#endif



#ifdef CONFIG_PPC64

	DEFINE(PGD_TABLE_SIZE, PGD_TABLE_SIZE);

#endif



	return 0;

}

arch/powerpc/kernel/head_32.S

+1 −1
Original line number Diff line number Diff line
@@ -1311,7 +1311,7 @@ empty_zero_page: 


	.globl	swapper_pg_dir

swapper_pg_dir:

	.space	4096

	.space	PGD_TABLE_SIZE



	.globl intercept_table

intercept_table:

arch/powerpc/kernel/head_40x.S

+1 −1
Original line number Diff line number Diff line
@@ -994,7 +994,7 @@ empty_zero_page: 
	.space	4096

	.globl	swapper_pg_dir

swapper_pg_dir:

	.space	4096

	.space	PGD_TABLE_SIZE





/* Stack for handling critical exceptions from kernel mode */

arch/powerpc/kernel/head_44x.S

+1 −1
Original line number Diff line number Diff line
@@ -722,7 +722,7 @@ empty_zero_page: 
 */

	.globl	swapper_pg_dir

swapper_pg_dir:

	.space	8192

	.space	PGD_TABLE_SIZE



/* Reserved 4k for the critical exception stack & 4k for the machine

 * check stack per CPU for kernel mode exceptions */

arch/powerpc/kernel/head_fsl_booke.S

+1 −1
Original line number Diff line number Diff line
@@ -1035,7 +1035,7 @@ empty_zero_page: 
	.space	4096

	.globl	swapper_pg_dir

swapper_pg_dir:

	.space	4096

	.space	PGD_TABLE_SIZE



/* Reserved 4k for the critical exception stack & 4k for the machine

 * check stack per CPU for kernel mode exceptions */