diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 16:21:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 16:21:24 -0400 |
commit | 7110879cf2afbfb7af79675f5ff109e63d631c25 (patch) | |
tree | 2a6c930ae90ad44002d045b91d335df634a26bb4 | |
parent | 99ebcf8285df28f32fd2d1c19a7166e70f00309c (diff) | |
parent | 3baf63a507094992a5bf238ba3bcea71f458b1e8 (diff) |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
m32r: fix build due to notify_cpu_starting() change
powerpc: fix linux-next build failure
-rw-r--r-- | arch/m32r/kernel/smpboot.c | 1 | ||||
-rw-r--r-- | arch/powerpc/include/asm/page.h | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c index fc2994811f1..39cb6da72dc 100644 --- a/arch/m32r/kernel/smpboot.c +++ b/arch/m32r/kernel/smpboot.c | |||
@@ -40,6 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include <linux/module.h> | 42 | #include <linux/module.h> |
43 | #include <linux/cpu.h> | ||
43 | #include <linux/init.h> | 44 | #include <linux/init.h> |
44 | #include <linux/kernel.h> | 45 | #include <linux/kernel.h> |
45 | #include <linux/mm.h> | 46 | #include <linux/mm.h> |
diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h index 64e144505f6..5ac51e6efc1 100644 --- a/arch/powerpc/include/asm/page.h +++ b/arch/powerpc/include/asm/page.h | |||
@@ -10,9 +10,13 @@ | |||
10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #ifndef __ASSEMBLY__ | ||
14 | #include <linux/types.h> | ||
15 | #else | ||
16 | #include <asm/types.h> | ||
17 | #endif | ||
13 | #include <asm/asm-compat.h> | 18 | #include <asm/asm-compat.h> |
14 | #include <asm/kdump.h> | 19 | #include <asm/kdump.h> |
15 | #include <asm/types.h> | ||
16 | 20 | ||
17 | /* | 21 | /* |
18 | * On PPC32 page size is 4K. For PPC64 we support either 4K or 64K software | 22 | * On PPC32 page size is 4K. For PPC64 we support either 4K or 64K software |