diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-06 12:27:09 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-06 12:27:09 -0800 |
commit | 09f3eca2b7e2762e223fdd359f9d0f6303a85f6c (patch) | |
tree | 03ba6cd7357ba1054f874b12db44b838806e316d /arch/powerpc/kernel/asm-offsets.c | |
parent | e1b7361f32fdf60f575566ddef8a36b33086631d (diff) | |
parent | bee86f14d51a5a9a3b1897e301da1e415df0ba23 (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/asm-offsets.c')
-rw-r--r-- | arch/powerpc/kernel/asm-offsets.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c index d67bcd84f32..ed083feaf6f 100644 --- a/arch/powerpc/kernel/asm-offsets.c +++ b/arch/powerpc/kernel/asm-offsets.c @@ -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; } |