Skip to contentSkip to conversation

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

PATCH New Stephen Rothwell 2 participants 7 messages Jul 1, 2011 – Jul 6, 2011

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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.

Signature · 2 lines
Cheers,
Stephen Rothwell                    [email protected]
#1 lore raw
Quoted 12 lines · 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)

Quoted 2 lines

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

I think the following patch will fix this.

Thanks.

---

arch/powerpc/kernel/rtas.c +1 -0
index 271ff63..0e0ea94 100644
@@ -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>
#2 lore raw

Hi,

Quoted 13 lines · On Fri, 01 Jul 2011 13:32:04 +0800 Cong Wang <[email protected]> wrote:
Quoted 11 lines · 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)

Quoted 4 lines
Quoted 2 lines

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).

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#3 lore raw
Quoted 16 lines · Stephen Rothwell

Hi,

Quoted 13 lines · On Fri, 01 Jul 2011 13:32:04 +0800 Cong Wang<[email protected]> wrote:
Quoted 11 lines · 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)

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

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.

#4 lore raw

Hi,

Quoted 20 lines · On Fri, 01 Jul 2011 18:10:30 +0800 Cong Wang <[email protected]> wrote:
Quoted 18 lines · Stephen Rothwell
Quoted 16 lines · On Fri, 01 Jul 2011 13:32:04 +0800 Cong Wang<[email protected]> wrote:
Quoted 13 lines · 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").

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

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.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#5 lore raw
Quoted 29 lines · Stephen Rothwell

Hi,

Quoted 26 lines · On Fri, 01 Jul 2011 18:10:30 +0800 Cong Wang<[email protected]> wrote:
Quoted 23 lines · Stephen Rothwell
Quoted 13 lines · On Fri, 01 Jul 2011 13:32:04 +0800 Cong Wang<[email protected]> wrote:
Quoted 11 lines · 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)

Quoted 4 lines
Quoted 2 lines

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).

Quoted 8 lines
Quoted 1 line

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.

#6 lore raw

PATCH 1/1 powerpc: fix build errors due to the movement of reboot events

In reply to Stephen Rothwell

Hi, Andrew,

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

With this patch applied, make allyesconfig succeeds on ppc64.

Thanks!

arch/powerpc/kernel/rtas.c +1 -0
index 271ff63..0e0ea94 100644
@@ -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>
arch/powerpc/kernel/rtas_flash.c +1 -0
index bf5f5ce..e037c74 100644
@@ -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>