2003-08-03 20:40:25

by Gergely Nagy

Subject: [TRIVIAL] compile fix for arch/ppc/kernel/setup.c

Hi!

I'm posting both to linuxppc-dev and lkml, since the latter is listed in
MAINTAINERS. I've been trying to get my PowerMac 4400 boot with linux
2.6.0-test2(-bk3), but the compile failed quite early in
arch/ppc/kernel/setup.c. After adding an #include <linux/cpu.h>, it
compiled. Patch is included below.

--- arch/ppc/kernel/setup.c.old 2003-08-03 22:35:51.000000000 +0200
+++ arch/ppc/kernel/setup.c 2003-08-03 22:35:41.000000000 +0200
@@ -2,6 +2,7 @@
* Common prep/pmac/chrp boot and setup code.
*/

+#include <linux/config.h>
#include <linux/cpu.h>
#include <linux/module.h>
#include <linux/string.h>


--
Gergely Nagy

2003-08-03 21:49:16

by Miles Lane

Subject: Re: [TRIVIAL] compile fix for arch/ppc/kernel/setup.c

On Sun August 3 2003 1:41 pm, Gergely Nagy wrote:
> Hi!
>
> I'm posting both to linuxppc-dev and lkml, since the latter is listed in
> MAINTAINERS. I've been trying to get my PowerMac 4400 boot with linux
> 2.6.0-test2(-bk3), but the compile failed quite early in
> arch/ppc/kernel/setup.c. After adding an #include <linux/cpu.h>, it
> compiled. Patch is included below.
>
> --- arch/ppc/kernel/setup.c.old 2003-08-03 22:35:51.000000000 +0200
> +++ arch/ppc/kernel/setup.c 2003-08-03 22:35:41.000000000 +0200
> @@ -2,6 +2,7 @@
> * Common prep/pmac/chrp boot and setup code.
> */
>
> +#include <linux/config.h>
> #include <linux/cpu.h>
> #include <linux/module.h>
> #include <linux/string.h>
>
>
> --

Hmm. This doesn't look like the correct patch. This one shows linux/config.h
being added, not linux/cpu.h. How about this one, instead?

--- arch/ppc/kernel/setup.c~ 2003-08-03 10:46:40.000000000 -0700
+++ arch/ppc/kernel/setup.c 2003-08-03 10:48:04.000000000 -0700
@@ -15,6 +15,7 @@
#include <linux/bootmem.h>
#include <linux/seq_file.h>
#include <linux/root_dev.h>
+#include <linux/cpu.h>

#include <asm/residual.h>
#include <asm/io.h>

2003-08-03 21:59:21

by Gergely Nagy

Subject: Re: [TRIVIAL] compile fix for arch/ppc/kernel/setup.c

> Hmm. This doesn't look like the correct patch. This one shows linux/config.h
> being added, not linux/cpu.h. How about this one, instead?

Bah! You're right. Sorry about the foobared patch.