linux-next: build failure after merge of the akpm tree

linux-next: build failure after merge of the akpm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 780 bytes --]

Hi Andrew,

After merging the akpm tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

arch/powerpc/kernel/rtas.c: In function 'rtas_restart':
arch/powerpc/kernel/rtas.c:655:24: error: 'SYS_RESTART' undeclared (first use in this function)
arch/powerpc/kernel/rtas.c: In function 'rtas_power_off':
arch/powerpc/kernel/rtas.c:664:24: error: 'SYS_POWER_OFF' undeclared (first use in this function)
arch/powerpc/kernel/rtas.c: In function 'rtas_halt':
arch/powerpc/kernel/rtas.c:674:24: error: 'SYS_HALT' undeclared (first use in this function)

Caused by commit ac050ff2a176 ("It is not necessary to share the same
notifier.h").

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the akpm tree

[Cong Wang]

[-- Attachment #1: Type: text/plain, Size: 833 bytes --]

于 2011年07月01日 13:19, Stephen Rothwell 写道:
> Hi Andrew,
>
> After merging the akpm tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> arch/powerpc/kernel/rtas.c: In function 'rtas_restart':
> arch/powerpc/kernel/rtas.c:655:24: error: 'SYS_RESTART' undeclared (first use in this function)
> arch/powerpc/kernel/rtas.c: In function 'rtas_power_off':
> arch/powerpc/kernel/rtas.c:664:24: error: 'SYS_POWER_OFF' undeclared (first use in this function)
> arch/powerpc/kernel/rtas.c: In function 'rtas_halt':
> arch/powerpc/kernel/rtas.c:674:24: error: 'SYS_HALT' undeclared (first use in this function)
>
> Caused by commit ac050ff2a176 ("It is not necessary to share the same
> notifier.h").

I think the following patch will fix this.

Thanks.

---

Signed-off-by: WANG Cong <amwang@redhat.com>

[-- Attachment #2: patch.diff --]
[-- Type: text/plain, Size: 340 bytes --]

diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 271ff63..0e0ea94 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -24,6 +24,7 @@
 #include <linux/cpumask.h>
 #include <linux/memblock.h>
 #include <linux/slab.h>
+#include <linux/reboot.h>
 
 #include <asm/prom.h>
 #include <asm/rtas.h>

Re: linux-next: build failure after merge of the akpm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1097 bytes --]

Hi,

On Fri, 01 Jul 2011 13:32:04 +0800 Cong Wang <amwang@redhat.com> wrote:
>
> 于 2011年07月01日 13:19, Stephen Rothwell 写道:
> >
> > After merging the akpm tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> >
> > arch/powerpc/kernel/rtas.c: In function 'rtas_restart':
> > arch/powerpc/kernel/rtas.c:655:24: error: 'SYS_RESTART' undeclared (first use in this function)
> > arch/powerpc/kernel/rtas.c: In function 'rtas_power_off':
> > arch/powerpc/kernel/rtas.c:664:24: error: 'SYS_POWER_OFF' undeclared (first use in this function)
> > arch/powerpc/kernel/rtas.c: In function 'rtas_halt':
> > arch/powerpc/kernel/rtas.c:674:24: error: 'SYS_HALT' undeclared (first use in this function)
> >
> > Caused by commit ac050ff2a176 ("It is not necessary to share the same
> > notifier.h").
> 
> I think the following patch will fix this.

Please find all the other files that need that include as well (there is
at least one more).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the akpm tree

[Cong Wang]

于 2011年07月01日 15:08, Stephen Rothwell 写道:
> Hi,
>
> On Fri, 01 Jul 2011 13:32:04 +0800 Cong Wang<amwang@redhat.com>  wrote:
>>
>> 于 2011年07月01日 13:19, Stephen Rothwell 写道:
>>>
>>> After merging the akpm tree, today's linux-next build (powerpc
>>> ppc64_defconfig) failed like this:
>>>
>>> arch/powerpc/kernel/rtas.c: In function 'rtas_restart':
>>> arch/powerpc/kernel/rtas.c:655:24: error: 'SYS_RESTART' undeclared (first use in this function)
>>> arch/powerpc/kernel/rtas.c: In function 'rtas_power_off':
>>> arch/powerpc/kernel/rtas.c:664:24: error: 'SYS_POWER_OFF' undeclared (first use in this function)
>>> arch/powerpc/kernel/rtas.c: In function 'rtas_halt':
>>> arch/powerpc/kernel/rtas.c:674:24: error: 'SYS_HALT' undeclared (first use in this function)
>>>
>>> Caused by commit ac050ff2a176 ("It is not necessary to share the same
>>> notifier.h").
>>
>> I think the following patch will fix this.
>
> Please find all the other files that need that include as well (there is
> at least one more).
>

Ok, I will do a cross-compilation.

Thanks.

Re: linux-next: build failure after merge of the akpm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1639 bytes --]

Hi,

On Fri, 01 Jul 2011 18:10:30 +0800 Cong Wang <amwang@redhat.com> wrote:
>
> 于 2011年07月01日 15:08, Stephen Rothwell 写道:
> >
> > On Fri, 01 Jul 2011 13:32:04 +0800 Cong Wang<amwang@redhat.com>  wrote:
> >>
> >> 于 2011年07月01日 13:19, Stephen Rothwell 写道:
> >>>
> >>> After merging the akpm tree, today's linux-next build (powerpc
> >>> ppc64_defconfig) failed like this:
> >>>
> >>> arch/powerpc/kernel/rtas.c: In function 'rtas_restart':
> >>> arch/powerpc/kernel/rtas.c:655:24: error: 'SYS_RESTART' undeclared (first use in this function)
> >>> arch/powerpc/kernel/rtas.c: In function 'rtas_power_off':
> >>> arch/powerpc/kernel/rtas.c:664:24: error: 'SYS_POWER_OFF' undeclared (first use in this function)
> >>> arch/powerpc/kernel/rtas.c: In function 'rtas_halt':
> >>> arch/powerpc/kernel/rtas.c:674:24: error: 'SYS_HALT' undeclared (first use in this function)
> >>>
> >>> Caused by commit ac050ff2a176 ("It is not necessary to share the same
> >>> notifier.h").
> >>
> >> I think the following patch will fix this.
> >
> > Please find all the other files that need that include as well (there is
> > at least one more).
> >
> 
> Ok, I will do a cross-compilation.

Well, really any file that references any of those defines should be
including linux/reboot.h, now - whether a compilation gets errors or
not.  A change in CONFIG options or different platforms/architectures can
change what file get implictly included.

See Rule 1 in Documentation/SubmitChecklist.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the akpm tree

[Cong Wang]

于 2011年07月01日 18:37, Stephen Rothwell 写道:
> Hi,
>
> On Fri, 01 Jul 2011 18:10:30 +0800 Cong Wang<amwang@redhat.com>  wrote:
>>
>> 于 2011年07月01日 15:08, Stephen Rothwell 写道:
>>>
>>> On Fri, 01 Jul 2011 13:32:04 +0800 Cong Wang<amwang@redhat.com>   wrote:
>>>>
>>>> 于 2011年07月01日 13:19, Stephen Rothwell 写道:
>>>>>
>>>>> After merging the akpm tree, today's linux-next build (powerpc
>>>>> ppc64_defconfig) failed like this:
>>>>>
>>>>> arch/powerpc/kernel/rtas.c: In function 'rtas_restart':
>>>>> arch/powerpc/kernel/rtas.c:655:24: error: 'SYS_RESTART' undeclared (first use in this function)
>>>>> arch/powerpc/kernel/rtas.c: In function 'rtas_power_off':
>>>>> arch/powerpc/kernel/rtas.c:664:24: error: 'SYS_POWER_OFF' undeclared (first use in this function)
>>>>> arch/powerpc/kernel/rtas.c: In function 'rtas_halt':
>>>>> arch/powerpc/kernel/rtas.c:674:24: error: 'SYS_HALT' undeclared (first use in this function)
>>>>>
>>>>> Caused by commit ac050ff2a176 ("It is not necessary to share the same
>>>>> notifier.h").
>>>>
>>>> I think the following patch will fix this.
>>>
>>> Please find all the other files that need that include as well (there is
>>> at least one more).
>>>
>>
>> Ok, I will do a cross-compilation.
>
> Well, really any file that references any of those defines should be
> including linux/reboot.h, now - whether a compilation gets errors or
> not.  A change in CONFIG options or different platforms/architectures can
> change what file get implictly included.
>
> See Rule 1 in Documentation/SubmitChecklist.

Yeah, I did allyesconfig test on x86. Fortunately there are few
files that needs to be fixed since they include reboot.h implicitly.

Thanks.

[Patch] powerpc: fix build errors due to the movement of reboot events

[Cong Wang]

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

Hi, Andrew,

Please fold this patch into notifiers-sys-move-reboot-notifiers-into-rebooth.patch.

With this patch applied, make allyesconfig succeeds on ppc64.

Signed-off-by: WANG Cong <amwang@redhat.com>

Thanks!

[-- Attachment #2: ppc-build-fix.diff --]
[-- Type: text/plain, Size: 725 bytes --]

diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 271ff63..0e0ea94 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -24,6 +24,7 @@
 #include <linux/cpumask.h>
 #include <linux/memblock.h>
 #include <linux/slab.h>
+#include <linux/reboot.h>
 
 #include <asm/prom.h>
 #include <asm/rtas.h>
diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c
index bf5f5ce..e037c74 100644
--- a/arch/powerpc/kernel/rtas_flash.c
+++ b/arch/powerpc/kernel/rtas_flash.c
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
+#include <linux/reboot.h>
 #include <asm/delay.h>
 #include <asm/uaccess.h>
 #include <asm/rtas.h>