Current powerpc.git build failures

Hi,

Just for fun I tried building all powerpc defconfigs. Fallout as below.


powerpc.cell_defconfig:
ERROR: ".cpufreq_set_policy" [arch/powerpc/platforms/cell/cbe_cpufreq.ko] undefined!
(Should cell move to similar Kconfig options as the other platforms for cpufreq?)

powerpc.mpc8641_hpcn_defconfig:
In file included from include/asm-generic/pgtable-nopmd.h:6,
                 from include/asm/pgtable-ppc32.h:4,
                 from include/asm/pgtable.h:8,
                 from arch/powerpc/platforms/86xx/mpc86xx_smp.c:18:
include/asm-generic/pgtable-nopud.h:13: error: expected specifier-qualifier-list before 'pgd_t'
include/asm-generic/pgtable-nopud.h:25: error: expected ')' before 'pgd'
include/asm-generic/pgtable-nopud.h:26: error: expected ')' before 'pgd'
include/asm-generic/pgtable-nopud.h:27: error: expected ')' before 'pgd'
include/asm-generic/pgtable-nopud.h:28: error: expected ')' before '*' token
include/asm-generic/pgtable-nopud.h:38: error: expected ')' before '*' token
  CC      init/calibrate.o
In file included from include/asm/pgtable.h:12,
                 from arch/powerpc/platforms/86xx/mpc86xx_smp.c:18:
include/asm-generic/pgtable.h: In function 'pgd_none_or_clear_bad':
include/asm-generic/pgtable.h:243: warning: implicit declaration of function 'pgd_none'
include/asm-generic/pgtable.h:245: warning: implicit declaration of function 'pgd_bad'
include/asm-generic/pgtable.h: In function 'pmd_none_or_clear_bad':
include/asm-generic/pgtable.h:265: error: 'pud_t' has no member named 'pgd'
include/asm-generic/pgtable.h:267: error: 'pud_t' has no member named 'pgd'
In file included from include/asm/dma-mapping.h:14,
                 from include/linux/dma-mapping.h:34,
                 from include/asm/pci.h:15,
                 from include/linux/pci.h:755,
                 from include/asm-ppc/pci-bridge.h:6,
                 from include/asm/pci-bridge.h:6,
                 from arch/powerpc/platforms/86xx/mpc86xx_smp.c:20:
include/linux/mm.h: In function 'pud_alloc':
include/linux/mm.h:906: warning: implicit declaration of function 'pud_offset'
include/linux/mm.h:906: warning: pointer/integer type mismatch in conditional expression
arch/powerpc/mm/ppc_mmu_32.c: In function 'hash_preload':
arch/powerpc/mm/ppc_mmu_32.c:188: warning: passing argument 1 of 'pmd_offset' from incompatible pointer type
(Maybe this is already fixed by some of the 32-bit mmu patches posted the last few days)

powerpc.mpc866_ads_defconfig:
arch/powerpc/sysdev/mpc8xx_pic.c:98: error: static declaration of 'mpc8xx_pic' follows non-static declaration
arch/powerpc/sysdev/mpc8xx_pic.h:7: error: previous declaration of 'mpc8xx_pic' was here

powerpc.mpc885_ads_defconfig:
arch/powerpc/sysdev/mpc8xx_pic.c:98: error: static declaration of 'mpc8xx_pic' follows non-static declaration
arch/powerpc/sysdev/mpc8xx_pic.h:7: error: previous declaration of 'mpc8xx_pic' was here

powerpc.ppc64_defconfig:
drivers/pci/hotplug/rpadlpar_sysfs.c:132: error: unknown field 'subsys' specified in initializer
drivers/pci/hotplug/rpadlpar_sysfs.c:132: warning: initialization from incompatible pointer type

powerpc.pseries_defconfig:
drivers/net/ehea/ehea_main.c: In function 'ehea_hash_skb':
drivers/net/ehea/ehea_main.c:1806: error: 'struct sk_buff' has no member named 'nh'
drivers/net/ehea/ehea_main.c:1807: error: 'struct sk_buff' has no member named 'nh'
drivers/net/ehea/ehea_main.c:1807: error: 'struct sk_buff' has no member named 'nh'
drivers/net/ehea/ehea_main.c:1809: error: 'struct sk_buff' has no member named 'nh'
(I believe a fix for this is already on it's way in through jgarzik)

Olof Johansson wrote:

powerpc.mpc8641_hpcn_defconfig:
In file included from include/asm-generic/pgtable-nopmd.h:6,
                 from include/asm/pgtable-ppc32.h:4,
                 from include/asm/pgtable.h:8,
                 from arch/powerpc/platforms/86xx/mpc86xx_smp.c:18:
include/asm-generic/pgtable-nopud.h:13: error: expected specifier-qualifier-list before 'pgd_t'

This must have occurred in the past 24 hours because I built the latest 8641 yesterday 
morning and it worked fine.  mpc86xx_smp.c has not changed since February, so I'm guessing 
that some header file that mpc86xx_smp.c includes no longer includes some other header.

-- 
Timur Tabi
Linux Kernel Developer @ Freescale

On May 8, 2007, at 3:30 PM, Timur Tabi wrote:

Olof Johansson wrote:

quoted

powerpc.mpc8641_hpcn_defconfig:
In file included from include/asm-generic/pgtable-nopmd.h:6,
                 from include/asm/pgtable-ppc32.h:4,
                 from include/asm/pgtable.h:8,
                 from arch/powerpc/platforms/86xx/mpc86xx_smp.c:18:
include/asm-generic/pgtable-nopud.h:13: error: expected specifier- 
qualifier-list before 'pgd_t'

This must have occurred in the past 24 hours because I built the  
latest 8641 yesterday
morning and it worked fine.  mpc86xx_smp.c has not changed since  
February, so I'm guessing
that some header file that mpc86xx_smp.c includes no longer  
includes some other header.

I'm guessing this is from david gibson's  4level-fixup.h for ppc32  
patch.

- k

On Tue, 8 May 2007 14:17:58 -0500
Olof Johansson wrote:

powerpc.mpc866_ads_defconfig:
arch/powerpc/sysdev/mpc8xx_pic.c:98: error: static declaration of
'mpc8xx_pic' follows non-static declaration
arch/powerpc/sysdev/mpc8xx_pic.h:7: error: previous declaration of
'mpc8xx_pic' was here

powerpc.mpc885_ads_defconfig:
arch/powerpc/sysdev/mpc8xx_pic.c:98: error: static declaration of
'mpc8xx_pic' follows non-static declaration
arch/powerpc/sysdev/mpc8xx_pic.h:7: error: previous declaration of
'mpc8xx_pic' was here

These 2 are addressed as a part of pcmcia patch series...

-- 
Sincerely, Vitaly

On Tue, May 08, 2007 at 03:38:35PM -0500, Kumar Gala wrote:

On May 8, 2007, at 3:30 PM, Timur Tabi wrote:

quoted

Olof Johansson wrote:

quoted

powerpc.mpc8641_hpcn_defconfig:
In file included from include/asm-generic/pgtable-nopmd.h:6,
                 from include/asm/pgtable-ppc32.h:4,
                 from include/asm/pgtable.h:8,
                 from arch/powerpc/platforms/86xx/mpc86xx_smp.c:18:
include/asm-generic/pgtable-nopud.h:13: error: expected specifier- 
qualifier-list before 'pgd_t'

This must have occurred in the past 24 hours because I built the  
latest 8641 yesterday
morning and it worked fine.  mpc86xx_smp.c has not changed since  
February, so I'm guessing
that some header file that mpc86xx_smp.c includes no longer  
includes some other header.

I'm guessing this is from david gibson's  4level-fixup.h for ppc32  
patch.

Looks like.  AFAICT, the generic nopud.h and nopmd.h headers expect
page.h to be included before pgtable.h.  I think this patch should fix
the problem, but I don't have a suitable board to test with.

Index: working-2.6/arch/powerpc/platforms/86xx/mpc86xx_smp.c
===================================================================

--- working-2.6.orig/arch/powerpc/platforms/86xx/mpc86xx_smp.c	2007-05-09 11:08:15.000000000 +1000
+++ working-2.6/arch/powerpc/platforms/86xx/mpc86xx_smp.c	2007-05-09 11:08:33.000000000 +1000

@@ -15,8 +15,8 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 
-#include <asm/pgtable.h>
 #include <asm/page.h>
+#include <asm/pgtable.h>
 #include <asm/pci-bridge.h>
 #include <asm-powerpc/mpic.h>
 #include <asm/mpc86xx.h>

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

Looks like.  AFAICT, the generic nopud.h and nopmd.h headers expect
page.h to be included before pgtable.h.  I think this patch should fix
the problem, but I don't have a suitable board to test with.
=20

That would be me.  I'll give it a spin.

Thanks,
Jdl

On Tue, May 08, 2007 at 06:18:29PM -0700, Jon Loeliger wrote:

quoted

Looks like.  AFAICT, the generic nopud.h and nopmd.h headers expect
page.h to be included before pgtable.h.  I think this patch should fix
the problem, but I don't have a suitable board to test with.

That would be me.  I'll give it a spin.

Duh, of course, I wasn't thinking at that point and realizing I could
at least test the build was fixed.  Which I've now done; and found
some other warnings caused by my patch.  Improved fix below.  Unless
you report that it breaks something, I'll ask Paul to pull it.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

On Wed, May 09, 2007 at 11:51:46AM +1000, David Gibson wrote:

On Tue, May 08, 2007 at 06:18:29PM -0700, Jon Loeliger wrote:

quoted

quoted

Looks like.  AFAICT, the generic nopud.h and nopmd.h headers expect
page.h to be included before pgtable.h.  I think this patch should fix
the problem, but I don't have a suitable board to test with.

That would be me.  I'll give it a spin.

Duh, of course, I wasn't thinking at that point and realizing I could
at least test the build was fixed.  Which I've now done; and found
some other warnings caused by my patch.  Improved fix below.  Unless
you report that it breaks something, I'll ask Paul to pull it.

Gah, sorry.  Really below, this time:

Fix missing printk() parameter in physmap_of.c MTD driver

Squashes a compiler warning, and provides more useful information in
the case messed up device tree information.

Signed-off-by: David Gibson <redacted>

Index: working-2.6/drivers/mtd/maps/physmap_of.c
===================================================================

--- working-2.6.orig/drivers/mtd/maps/physmap_of.c	2007-05-07 12:57:07.000000000 +1000
+++ working-2.6/drivers/mtd/maps/physmap_of.c	2007-05-09 11:53:53.000000000 +1000

@@ -186,7 +186,7 @@ static int __devinit of_physmap_probe(st
 	else {
  		if (strcmp(of_probe, "ROM"))
 			dev_dbg(&dev->dev, "map_probe: don't know probe type "
-			"'%s', mapping as rom\n");
+			"'%s', mapping as rom\n", of_probe);
 		info->mtd = do_map_probe("mtd_rom", &info->map);
 	}
 	if (info->mtd == NULL) {

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

On Wed, May 09, 2007 at 11:57:54AM +1000, David Gibson wrote:

On Wed, May 09, 2007 at 11:51:46AM +1000, David Gibson wrote:

quoted

On Tue, May 08, 2007 at 06:18:29PM -0700, Jon Loeliger wrote:

quoted

quoted

Looks like.  AFAICT, the generic nopud.h and nopmd.h headers expect
page.h to be included before pgtable.h.  I think this patch should fix
the problem, but I don't have a suitable board to test with.

That would be me.  I'll give it a spin.

Duh, of course, I wasn't thinking at that point and realizing I could
at least test the build was fixed.  Which I've now done; and found
some other warnings caused by my patch.  Improved fix below.  Unless
you report that it breaks something, I'll ask Paul to pull it.

Gah, sorry.  Really below, this time:

Double gah.  How about the *right* patch this time.

Further fixes for the removal of 4level-fixup hack from ppc32

Commit d1953c8888ef034b912ee33bc2ea2cce6a414402 removed the use of
4level-fixup.h for 32-bit systems under arch/powerpc.  However, I
missed a few things activated on some configurations, resulting in
some warnings (at least with STRICT_MM_TYPECHECKS enabled) and build
errors in some circumstances.  Fixes below.

Signed-off-by: David Gibson <redacted>

Index: working-2.6/arch/powerpc/platforms/86xx/mpc86xx_smp.c
===================================================================

--- working-2.6.orig/arch/powerpc/platforms/86xx/mpc86xx_smp.c	2007-05-09 11:08:15.000000000 +1000
+++ working-2.6/arch/powerpc/platforms/86xx/mpc86xx_smp.c	2007-05-09 11:08:33.000000000 +1000

@@ -15,8 +15,8 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 
-#include <asm/pgtable.h>
 #include <asm/page.h>
+#include <asm/pgtable.h>
 #include <asm/pci-bridge.h>
 #include <asm-powerpc/mpic.h>
 #include <asm/mpc86xx.h>

Index: working-2.6/arch/powerpc/mm/ppc_mmu_32.c
===================================================================

--- working-2.6.orig/arch/powerpc/mm/ppc_mmu_32.c	2007-05-09 11:30:22.000000000 +1000
+++ working-2.6/arch/powerpc/mm/ppc_mmu_32.c	2007-05-09 11:31:09.000000000 +1000

@@ -185,7 +185,7 @@ void hash_preload(struct mm_struct *mm, 
 
 	if (Hash == 0)
 		return;
-	pmd = pmd_offset(pgd_offset(mm, ea), ea);
+	pmd = pmd_offset(pud_offset(pgd_offset(mm, ea), ea), ea);
 	if (!pmd_none(*pmd))
 		add_hash_page(mm->context.id, ea, pmd_val(*pmd));
 }

Index: working-2.6/arch/powerpc/mm/tlb_32.c
===================================================================

--- working-2.6.orig/arch/powerpc/mm/tlb_32.c	2007-05-09 11:31:52.000000000 +1000
+++ working-2.6/arch/powerpc/mm/tlb_32.c	2007-05-09 11:32:17.000000000 +1000

@@ -111,7 +111,7 @@ static void flush_range(struct mm_struct
 	if (start >= end)
 		return;
 	end = (end - 1) | ~PAGE_MASK;
-	pmd = pmd_offset(pgd_offset(mm, start), start);
+	pmd = pmd_offset(pud_offset(pgd_offset(mm, start), start), start);
 	for (;;) {
 		pmd_end = ((start + PGDIR_SIZE) & PGDIR_MASK) - 1;
 		if (pmd_end > end)

@@ -169,7 +169,7 @@ void flush_tlb_page(struct vm_area_struc
 		return;
 	}
 	mm = (vmaddr < TASK_SIZE)? vma->vm_mm: &init_mm;
-	pmd = pmd_offset(pgd_offset(mm, vmaddr), vmaddr);
+	pmd = pmd_offset(pud_offset(pgd_offset(mm, vmaddr), vmaddr), vmaddr);
 	if (!pmd_none(*pmd))
 		flush_hash_pages(mm->context.id, vmaddr, pmd_val(*pmd), 1);
 	FINISH_FLUSH;

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson