[PATCH 1/8] Guard linkstation_physmap_partitions.

Subsystems: linux for powerpc (32-bit and 64-bit), the rest

STALE6580d

19 messages, 6 authors, 2008-08-01 · open the first message on its own page

[PATCH 1/8] Guard linkstation_physmap_partitions.

From: Tony Breeds <hidden>
Date: 2008-07-31 03:51:44

linkstation_physmap_partitions is only used when CONFIG_MTD_PHYSMAP is
defined, so likewise guard the declaration.

Signed-off-by: Tony Breeds <redacted>
---
 arch/powerpc/platforms/embedded6xx/linkstation.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c
index eb5d74e..bec68af 100644
--- a/arch/powerpc/platforms/embedded6xx/linkstation.c
+++ b/arch/powerpc/platforms/embedded6xx/linkstation.c

@@ -21,6 +21,7 @@
 
 #include "mpc10x.h"
 
+#ifdef CONFIG_MTD_PHYSMAP
 static struct mtd_partition linkstation_physmap_partitions[] = {
 	{
 		.name   = "mtd_firmimg",

@@ -53,6 +54,7 @@ static struct mtd_partition linkstation_physmap_partitions[] = {
 		.size   = 0x0f0000,
 	},
 };
+#endif /* CONFIG_MTD_PHYSMAP */
 
 static int __init linkstation_add_bridge(struct device_node *dev)
 {

-- 
1.5.6.3

[PATCH 5/8] Silence warning in arch/powerpc/mm/ppc_mmu_32.c

From: Tony Breeds <hidden>
Date: 2008-07-31 03:51:44

total_memory is a 'phys_addr_t', cast to unsigned long to silence
warning.

Signed-off-by: Tony Breeds <redacted>
---
 arch/powerpc/mm/ppc_mmu_32.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c
index c53145f..9c19655 100644
--- a/arch/powerpc/mm/ppc_mmu_32.c
+++ b/arch/powerpc/mm/ppc_mmu_32.c

@@ -237,7 +237,7 @@ void __init MMU_init_hw(void)
 	Hash_end = (struct hash_pte *) ((unsigned long)Hash + Hash_size);
 
 	printk("Total memory = %ldMB; using %ldkB for hash table (at %p)\n",
-	       total_memory >> 20, Hash_size >> 10, Hash);
+	       (unsigned long)total_memory >> 20, Hash_size >> 10, Hash);
 
 
 	/*

-- 
1.5.6.3

[PATCH 3/8] Silennce warning in arch/powerpc/mm/mem.c

From: Tony Breeds <hidden>
Date: 2008-07-31 03:51:44

Explicitly cast to unsigned long long, rather than u64.

Signed-off-by: Tony Breeds <redacted>
---
 arch/powerpc/mm/mem.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 702691c..1c93c25 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c

@@ -311,7 +311,7 @@ void __init paging_init(void)
 #endif /* CONFIG_HIGHMEM */
 
 	printk(KERN_DEBUG "Top of RAM: 0x%llx, Total RAM: 0x%lx\n",
-	       (u64)top_of_ram, total_ram);
+	       (unsigned long long)top_of_ram, total_ram);
 	printk(KERN_DEBUG "Memory hole size: %ldMB\n",
 	       (long int)((top_of_ram - total_ram) >> 20));
 	memset(max_zone_pfns, 0, sizeof(max_zone_pfns));

-- 
1.5.6.3

[PATCH 4/8] Silence warnings in arch/powerpc/platforms/52xx/mpc52xx_pci.c

From: Tony Breeds <hidden>
Date: 2008-07-31 03:51:44

Explicitly cast resource fields to unsigned long long, and match format
specifier.

Signed-off-by: Tony Breeds <redacted>
---
 arch/powerpc/platforms/52xx/mpc52xx_pci.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
index 5a382bb..b49a185 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c

@@ -265,8 +265,11 @@ mpc52xx_pci_setup(struct pci_controller *hose,
 	/* Memory windows */
 	res = &hose->mem_resources[0];
 	if (res->flags) {
-		pr_debug("mem_resource[0] = {.start=%x, .end=%x, .flags=%lx}\n",
-		         res->start, res->end, res->flags);
+		pr_debug("mem_resource[0] = "
+		         "{.start=%llx, .end=%llx, .flags=%llx}\n",
+		         (unsigned long long)res->start,
+			 (unsigned long long)res->end,
+			 (unsigned long long)res->flags);
 		out_be32(&pci_regs->iw0btar,
 		         MPC52xx_PCI_IWBTAR_TRANSLATION(res->start, res->start,
 		                  res->end - res->start + 1));

@@ -297,9 +300,11 @@ mpc52xx_pci_setup(struct pci_controller *hose,
 		printk(KERN_ERR "%s: Didn't find IO resources\n", __FILE__);
 		return;
 	}
-	pr_debug(".io_resource={.start=%x,.end=%x,.flags=%lx} "
+	pr_debug(".io_resource={.start=%llx,.end=%llx,.flags=%llx} "
 	         ".io_base_phys=0x%p\n",
-	         res->start, res->end, res->flags, (void*)hose->io_base_phys);
+	         (unsigned long long)res->start,
+		 (unsigned long long)res->end,
+		 (unsigned long long)res->flags, (void*)hose->io_base_phys);
 	out_be32(&pci_regs->iw2btar,
 	         MPC52xx_PCI_IWBTAR_TRANSLATION(hose->io_base_phys,
 	                                        res->start,

-- 
1.5.6.3

[PATCH 2/8] Guard htab_dt_scan_hugepage_blocks appropriately

From: Tony Breeds <hidden>
Date: 2008-07-31 03:51:44

htab_dt_scan_hugepage_blocks is only used when CONFIG_HUGETLB_PAGE is
defined, likewise guard the declaration.

Signed-off-by: Tony Breeds <redacted>
---
 arch/powerpc/mm/hash_utils_64.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 5ce5a4d..fa58777 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c

@@ -329,6 +329,7 @@ static int __init htab_dt_scan_page_sizes(unsigned long node,
 	return 0;
 }
 
+#ifdef CONFIG_HUGETLB_PAGE
 /* Scan for 16G memory blocks that have been set aside for huge pages
  * and reserve those blocks for 16G huge pages.
  */

@@ -366,6 +367,7 @@ static int __init htab_dt_scan_hugepage_blocks(unsigned long node,
 	add_gpage(phys_addr, block_size, expected_pages);
 	return 0;
 }
+#endif /* CONFIG_HUGETLB_PAGE */
 
 static void __init htab_init_page_sizes(void)
 {

-- 
1.5.6.3

[PATCH 7/8] Guard from_rtc_time() in arch/powerpc/platforms/powermac/time.c

From: Tony Breeds <hidden>
Date: 2008-07-31 03:51:44

from_rtc_time() is only called when one of 3 CONFIG options are defined.
Guard the declaration appropriately.

Signed-off-by: Tony Breeds <redacted>
---
 arch/powerpc/platforms/powermac/time.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/platforms/powermac/time.c b/arch/powerpc/platforms/powermac/time.c
index bbbefd6..59eb840 100644
--- a/arch/powerpc/platforms/powermac/time.c
+++ b/arch/powerpc/platforms/powermac/time.c

@@ -93,11 +93,14 @@ static void to_rtc_time(unsigned long now, struct rtc_time *tm)
 }
 #endif
 
+#if defined(CONFIG_ADB_CUDA) || defined(CONFIG_ADB_PMU) || \
+    defined(CONFIG_PMAC_SMU)
 static unsigned long from_rtc_time(struct rtc_time *tm)
 {
 	return mktime(tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
 		      tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
+#endif
 
 #ifdef CONFIG_ADB_CUDA
 static unsigned long cuda_get_time(void)

-- 
1.5.6.3

[PATCH 8/8] Enable -Werror in arch/powerpc/{kernel,lib,mm,platforms}

From: Tony Breeds <hidden>
Date: 2008-07-31 03:51:44

Signed-off-by: Tony Breeds <redacted>
---
 arch/powerpc/kernel/Makefile                |    1 +
 arch/powerpc/lib/Makefile                   |    1 +
 arch/powerpc/mm/Makefile                    |    1 +
 arch/powerpc/platforms/40x/Makefile         |    2 ++
 arch/powerpc/platforms/44x/Makefile         |    2 ++
 arch/powerpc/platforms/512x/Makefile        |    2 ++
 arch/powerpc/platforms/52xx/Makefile        |    4 +++-
 arch/powerpc/platforms/82xx/Makefile        |    2 ++
 arch/powerpc/platforms/83xx/Makefile        |    2 ++
 arch/powerpc/platforms/85xx/Makefile        |    2 ++
 arch/powerpc/platforms/86xx/Makefile        |    1 +
 arch/powerpc/platforms/8xx/Makefile         |    2 ++
 arch/powerpc/platforms/Makefile             |    1 +
 arch/powerpc/platforms/cell/Makefile        |    2 ++
 arch/powerpc/platforms/chrp/Makefile        |    2 ++
 arch/powerpc/platforms/embedded6xx/Makefile |    2 ++
 arch/powerpc/platforms/iseries/Makefile     |    2 +-
 arch/powerpc/platforms/maple/Makefile       |    2 ++
 arch/powerpc/platforms/pasemi/Makefile      |    2 ++
 arch/powerpc/platforms/powermac/Makefile    |    2 ++
 arch/powerpc/platforms/ps3/Makefile         |    2 ++
 arch/powerpc/platforms/pseries/Makefile     |    2 ++
 22 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 1a40947..11ba982 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile

@@ -1,6 +1,7 @@
 #
 # Makefile for the linux kernel.
 #
+EXTRA_CFLAGS	:= -Werror
 
 CFLAGS_ptrace.o		+= -DUTS_MACHINE='"$(UTS_MACHINE)"'

diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 2a88e8b..78a3022 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile

@@ -1,6 +1,7 @@
 #
 # Makefile for ppc-specific library files..
 #
+EXTRA_CFLAGS	:= -Werror
 
 ifeq ($(CONFIG_PPC64),y)
 EXTRA_CFLAGS		+= -mno-minimal-toc

diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile
index 1c00e01..c2e44c4 100644
--- a/arch/powerpc/mm/Makefile
+++ b/arch/powerpc/mm/Makefile

@@ -2,6 +2,7 @@
 # Makefile for the linux ppc-specific parts of the memory manager.
 #
 
+EXTRA_CFLAGS	:= -Werror
 ifeq ($(CONFIG_PPC64),y)
 EXTRA_CFLAGS	+= -mno-minimal-toc
 endif

diff --git a/arch/powerpc/platforms/40x/Makefile b/arch/powerpc/platforms/40x/Makefile
index 5533a5c..3788b2e 100644
--- a/arch/powerpc/platforms/40x/Makefile
+++ b/arch/powerpc/platforms/40x/Makefile

@@ -1,3 +1,5 @@
+EXTRA_CFLAGS	:= -Werror
+
 obj-$(CONFIG_KILAUEA)				+= kilauea.o
 obj-$(CONFIG_MAKALU)				+= makalu.o
 obj-$(CONFIG_WALNUT)				+= walnut.o

diff --git a/arch/powerpc/platforms/44x/Makefile b/arch/powerpc/platforms/44x/Makefile
index 8d0b1a1..58cc668 100644
--- a/arch/powerpc/platforms/44x/Makefile
+++ b/arch/powerpc/platforms/44x/Makefile

@@ -1,3 +1,5 @@
+EXTRA_CFLAGS	:= -Werror
+
 obj-$(CONFIG_44x)	:= misc_44x.o idle.o
 obj-$(CONFIG_EBONY)	+= ebony.o
 obj-$(CONFIG_TAISHAN)	+= taishan.o

diff --git a/arch/powerpc/platforms/512x/Makefile b/arch/powerpc/platforms/512x/Makefile
index 90be2f5..8a6141d 100644
--- a/arch/powerpc/platforms/512x/Makefile
+++ b/arch/powerpc/platforms/512x/Makefile

@@ -1,6 +1,8 @@
 #
 # Makefile for the Freescale PowerPC 512x linux kernel.
 #
+EXTRA_CFLAGS	:= -Werror
+
 obj-y				+= clock.o mpc512x_shared.o
 obj-$(CONFIG_MPC5121_ADS)	+= mpc5121_ads.o mpc5121_ads_cpld.o
 obj-$(CONFIG_MPC5121_GENERIC)	+= mpc5121_generic.o

diff --git a/arch/powerpc/platforms/52xx/Makefile b/arch/powerpc/platforms/52xx/Makefile
index daf0e15..2616db3 100644
--- a/arch/powerpc/platforms/52xx/Makefile
+++ b/arch/powerpc/platforms/52xx/Makefile

@@ -1,6 +1,8 @@
 #
 # Makefile for 52xx based boards
 #
+EXTRA_CFLAGS	:= -Werror
+
 ifeq ($(CONFIG_PPC_MERGE),y)
 obj-y				+= mpc52xx_pic.o mpc52xx_common.o
 obj-$(CONFIG_PCI)		+= mpc52xx_pci.o

@@ -15,4 +17,4 @@ ifeq ($(CONFIG_PPC_LITE5200),y)
 	obj-$(CONFIG_PM)	+= lite5200_sleep.o lite5200_pm.o
 endif
 
-obj-$(CONFIG_PPC_MPC5200_GPIO)	+= mpc52xx_gpio.o

\ No newline at end of file
+obj-$(CONFIG_PPC_MPC5200_GPIO)	+= mpc52xx_gpio.o

diff --git a/arch/powerpc/platforms/82xx/Makefile b/arch/powerpc/platforms/82xx/Makefile
index 6cd5cd5..f88fb41 100644
--- a/arch/powerpc/platforms/82xx/Makefile
+++ b/arch/powerpc/platforms/82xx/Makefile

@@ -1,6 +1,8 @@
 #
 # Makefile for the PowerPC 82xx linux kernel.
 #
+EXTRA_CFLAGS	:= -Werror
+
 obj-$(CONFIG_MPC8272_ADS) += mpc8272_ads.o
 obj-$(CONFIG_CPM2) += pq2.o
 obj-$(CONFIG_PQ2_ADS_PCI_PIC) += pq2ads-pci-pic.o

diff --git a/arch/powerpc/platforms/83xx/Makefile b/arch/powerpc/platforms/83xx/Makefile
index ba5028e..523c03d 100644
--- a/arch/powerpc/platforms/83xx/Makefile
+++ b/arch/powerpc/platforms/83xx/Makefile

@@ -1,6 +1,8 @@
 #
 # Makefile for the PowerPC 83xx linux kernel.
 #
+EXTRA_CFLAGS	:= -Werror
+
 obj-y				:= misc.o usb.o
 obj-$(CONFIG_SUSPEND)		+= suspend.o suspend-asm.o
 obj-$(CONFIG_MPC831x_RDB)	+= mpc831x_rdb.o

diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
index cb3054e..0767384 100644
--- a/arch/powerpc/platforms/85xx/Makefile
+++ b/arch/powerpc/platforms/85xx/Makefile

@@ -1,6 +1,8 @@
 #
 # Makefile for the PowerPC 85xx linux kernel.
 #
+EXTRA_CFLAGS	:= -Werror
+
 obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o
 obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o
 obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o

diff --git a/arch/powerpc/platforms/86xx/Makefile b/arch/powerpc/platforms/86xx/Makefile
index 8fee37d..24c58e1 100644
--- a/arch/powerpc/platforms/86xx/Makefile
+++ b/arch/powerpc/platforms/86xx/Makefile

@@ -1,6 +1,7 @@
 #
 # Makefile for the PowerPC 86xx linux kernel.
 #
+EXTRA_CFLAGS	:= -Werror
 
 obj-y				:= pic.o
 obj-$(CONFIG_SMP)		+= mpc86xx_smp.o

diff --git a/arch/powerpc/platforms/8xx/Makefile b/arch/powerpc/platforms/8xx/Makefile
index 7b71d9c..fdccd47 100644
--- a/arch/powerpc/platforms/8xx/Makefile
+++ b/arch/powerpc/platforms/8xx/Makefile

@@ -1,6 +1,8 @@
 #
 # Makefile for the PowerPC 8xx linux kernel.
 #
+EXTRA_CFLAGS	:= -Werror
+
 obj-$(CONFIG_PPC_8xx)	  += m8xx_setup.o
 obj-$(CONFIG_MPC885ADS)   += mpc885ads_setup.o
 obj-$(CONFIG_MPC86XADS)   += mpc86xads_setup.o

diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index 423a023..bc9e246 100644
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile

@@ -1,3 +1,4 @@
+EXTRA_CFLAGS	:= -Werror
 
 obj-$(CONFIG_FSL_ULI1575)	+= fsl_uli1575.o

diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index 7fd8308..2366dd1 100644
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile

@@ -1,3 +1,5 @@
+EXTRA_CFLAGS	:= -Werror
+
 obj-$(CONFIG_PPC_CELL_NATIVE)		+= interrupt.o iommu.o setup.o \
 					   cbe_regs.o spider-pic.o \
 					   pervasive.o pmu.o io-workarounds.o \

diff --git a/arch/powerpc/platforms/chrp/Makefile b/arch/powerpc/platforms/chrp/Makefile
index 4b3bfad..6282c65 100644
--- a/arch/powerpc/platforms/chrp/Makefile
+++ b/arch/powerpc/platforms/chrp/Makefile

@@ -1,3 +1,5 @@
+EXTRA_CFLAGS	:= -Werror
+
 obj-y				+= setup.o time.o pegasos_eth.o pci.o
 obj-$(CONFIG_SMP)		+= smp.o
 obj-$(CONFIG_NVRAM)		+= nvram.o

diff --git a/arch/powerpc/platforms/embedded6xx/Makefile b/arch/powerpc/platforms/embedded6xx/Makefile
index 0773c08..919cc1a 100644
--- a/arch/powerpc/platforms/embedded6xx/Makefile
+++ b/arch/powerpc/platforms/embedded6xx/Makefile

@@ -1,6 +1,8 @@
 #
 # Makefile for the 6xx/7xx/7xxxx linux kernel.
 #
+EXTRA_CFLAGS	:= -Werror
+
 obj-$(CONFIG_MPC7448HPC2)	+= mpc7448_hpc2.o
 obj-$(CONFIG_LINKSTATION)	+= linkstation.o ls_uart.o
 obj-$(CONFIG_STORCENTER)	+= storcenter.o

diff --git a/arch/powerpc/platforms/iseries/Makefile b/arch/powerpc/platforms/iseries/Makefile
index cc7161f..2602d1b 100644
--- a/arch/powerpc/platforms/iseries/Makefile
+++ b/arch/powerpc/platforms/iseries/Makefile

@@ -1,4 +1,4 @@
-EXTRA_CFLAGS	+= -mno-minimal-toc
+EXTRA_CFLAGS	+= -mno-minimal-toc -Werror
 
 extra-y += dt.o

diff --git a/arch/powerpc/platforms/maple/Makefile b/arch/powerpc/platforms/maple/Makefile
index 1be1a99..c073d91 100644
--- a/arch/powerpc/platforms/maple/Makefile
+++ b/arch/powerpc/platforms/maple/Makefile

@@ -1 +1,3 @@
+EXTRA_CFLAGS	:= -Werror
+
 obj-y	+= setup.o pci.o time.o

diff --git a/arch/powerpc/platforms/pasemi/Makefile b/arch/powerpc/platforms/pasemi/Makefile
index ce6d789..acc25d3 100644
--- a/arch/powerpc/platforms/pasemi/Makefile
+++ b/arch/powerpc/platforms/pasemi/Makefile

@@ -1,3 +1,5 @@
+EXTRA_CFLAGS	:= -Werror
+
 obj-y	+= setup.o pci.o time.o idle.o powersave.o iommu.o dma_lib.o misc.o
 obj-$(CONFIG_PPC_PASEMI_MDIO)	+= gpio_mdio.o
 obj-$(CONFIG_PPC_PASEMI_CPUFREQ) += cpufreq.o

diff --git a/arch/powerpc/platforms/powermac/Makefile b/arch/powerpc/platforms/powermac/Makefile
index 8977417..6ec9314 100644
--- a/arch/powerpc/platforms/powermac/Makefile
+++ b/arch/powerpc/platforms/powermac/Makefile

@@ -1,3 +1,5 @@
+EXTRA_CFLAGS	:= -Werror
+
 CFLAGS_bootx_init.o  		+= -fPIC
 
 ifdef CONFIG_FTRACE

diff --git a/arch/powerpc/platforms/ps3/Makefile b/arch/powerpc/platforms/ps3/Makefile
index ac1bdf8..16b00f3 100644
--- a/arch/powerpc/platforms/ps3/Makefile
+++ b/arch/powerpc/platforms/ps3/Makefile

@@ -1,3 +1,5 @@
+EXTRA_CFLAGS	:= -Werror
+
 obj-y += setup.o mm.o time.o hvcall.o htab.o repository.o
 obj-y += interrupt.o exports.o os-area.o
 obj-y += system-bus.o

diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
index dfe574a..2e122e9 100644
--- a/arch/powerpc/platforms/pseries/Makefile
+++ b/arch/powerpc/platforms/pseries/Makefile

@@ -1,3 +1,5 @@
+EXTRA_CFLAGS	:= -Werror
+
 ifeq ($(CONFIG_PPC64),y)
 EXTRA_CFLAGS		+= -mno-minimal-toc
 endif

-- 
1.5.6.3

[PATCH 6/8] Explictly undefine DEBUG in arch/powerpc/platforms/pseries/eeh_driver.c

From: Tony Breeds <hidden>
Date: 2008-07-31 03:51:44

print_device_node_tree() is guarded by DEBUG but even when declared, it
isn't called.  Explicitly undefine DEBUG as you'll need to modify this
file anyway to use print_device_node_tree().

Signed-off-by: Tony Breeds <redacted>
---
 arch/powerpc/platforms/pseries/eeh_driver.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c
index 8c1ca47..2f18380 100644
--- a/arch/powerpc/platforms/pseries/eeh_driver.c
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c

@@ -22,6 +22,9 @@
  *
  * Send comments and feedback to Linas Vepstas <linas@austin.ibm.com>
  */
+
+#undef DEBUG
+
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>

-- 
1.5.6.3

Re: [PATCH 4/8] Silence warnings in arch/powerpc/platforms/52xx/mpc52xx_pci.c

From: Jon Smirl <hidden>
Date: 2008-07-31 04:08:06

There are some warnings in mpc5200 spi that I haven't looked at....

drivers/spi/mpc52xx_psc_spi.c: In function 'mpc52xx_psc_spi_activate_cs':
drivers/spi/mpc52xx_psc_spi.c:111: warning: passing argument 1 of
'in_be16' from incompatible pointer type
drivers/spi/mpc52xx_psc_spi.c:117: warning: passing argument 1 of
'out_be16' from incompatible pointer type
drivers/spi/mpc52xx_psc_spi.c: In function 'mpc52xx_psc_spi_port_config':
drivers/spi/mpc52xx_psc_spi.c:350: warning: passing argument 1 of
'out_be16' from incompatible pointer type


-- 
Jon Smirl
jonsmirl@gmail.com

Re: [PATCH 4/8] Silence warnings in arch/powerpc/platforms/52xx/mpc52xx_pci.c

From: Tony Breeds <hidden>
Date: 2008-07-31 04:21:57

On Thu, Jul 31, 2008 at 12:08:04AM -0400, Jon Smirl wrote:

There are some warnings in mpc5200 spi that I haven't looked at....

drivers/spi/mpc52xx_psc_spi.c: In function 'mpc52xx_psc_spi_activate_cs':
drivers/spi/mpc52xx_psc_spi.c:111: warning: passing argument 1 of
'in_be16' from incompatible pointer type
drivers/spi/mpc52xx_psc_spi.c:117: warning: passing argument 1 of
'out_be16' from incompatible pointer type
drivers/spi/mpc52xx_psc_spi.c: In function 'mpc52xx_psc_spi_port_config':
drivers/spi/mpc52xx_psc_spi.c:350: warning: passing argument 1 of
'out_be16' from incompatible pointer type

Right drivers/* is harder, and wont be affected by the addition of
-Werror in arch/powerpc

We'll get there eventiually.

Yours Tony

  linux.conf.au    http://www.marchsouth.org/
  Jan 19 - 24 2009 The Australian Linux Technical Conference!

Re: [PATCH 6/8] Explictly undefine DEBUG in arch/powerpc/platforms/pseries/eeh_driver.c

From: Michael Ellerman <hidden>
Date: 2008-07-31 04:53:30

On Thu, 2008-07-31 at 13:51 +1000, Tony Breeds wrote:

print_device_node_tree() is guarded by DEBUG but even when declared, it
isn't called.  Explicitly undefine DEBUG as you'll need to modify this
file anyway to use print_device_node_tree().

Please don't, it breaks CONFIG_PPC_PSERIES_DEBUG.

cheers

/me refrains from ranting about stupid -Werror

-- 
Michael Ellerman
OzLabs, IBM Australia Development Lab

wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person

Re: [PATCH 5/8] Silence warning in arch/powerpc/mm/ppc_mmu_32.c

From: Stephen Rothwell <hidden>
Date: 2008-07-31 05:21:39

Hi Tony,

On Thu, 31 Jul 2008 13:51:43 +1000 (EST) Tony Breeds [off-list ref] wrote:

quoted hunk

total_memory is a 'phys_addr_t', cast to unsigned long to silence
warning.

Signed-off-by: Tony Breeds <redacted>
---
 arch/powerpc/mm/ppc_mmu_32.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c
index c53145f..9c19655 100644
--- a/arch/powerpc/mm/ppc_mmu_32.c
+++ b/arch/powerpc/mm/ppc_mmu_32.c

@@ -237,7 +237,7 @@ void __init MMU_init_hw(void)
 	Hash_end = (struct hash_pte *) ((unsigned long)Hash + Hash_size);
 
 	printk("Total memory = %ldMB; using %ldkB for hash table (at %p)\n",
-	       total_memory >> 20, Hash_size >> 10, Hash);
+	       (unsigned long)total_memory >> 20, Hash_size >> 10, Hash);

Will this ever be built with CONFIG_PHYS_64BIT?

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

Re: [PATCH 4/8] Silence warnings in arch/powerpc/platforms/52xx/mpc52xx_pci.c

From: Grant Likely <hidden>
Date: 2008-07-31 05:27:56

On Wed, Jul 30, 2008 at 10:08 PM, Jon Smirl [off-list ref] wrote:

There are some warnings in mpc5200 spi that I haven't looked at....

drivers/spi/mpc52xx_psc_spi.c: In function 'mpc52xx_psc_spi_activate_cs':
drivers/spi/mpc52xx_psc_spi.c:111: warning: passing argument 1 of
'in_be16' from incompatible pointer type
drivers/spi/mpc52xx_psc_spi.c:117: warning: passing argument 1 of
'out_be16' from incompatible pointer type
drivers/spi/mpc52xx_psc_spi.c: In function 'mpc52xx_psc_spi_port_config':
drivers/spi/mpc52xx_psc_spi.c:350: warning: passing argument 1 of
'out_be16' from incompatible pointer type

I've got a patch for these already in my tree.

g.

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

Re: [PATCH 5/8] Silence warning in arch/powerpc/mm/ppc_mmu_32.c

From: Milton Miller <hidden>
Date: 2008-07-31 06:54:16

On Thu Jul 31 at 15:21:25 EST in 2008, Stephen Rothwell wrote:

On Thu, 31 Jul 2008 13:51:43 +1000 (EST) Tony Breeds <tony at 
bakeyournoodle.com> wrote:

quoted

total_memory is a 'phys_addr_t', cast to unsigned long to silence
warning.

diff --git a/arch/powerpc/mm/ppc_mmu_32.c

b/arch/powerpc/mm/ppc_mmu_32.c
index c53145f..9c19655 100644

--- a/arch/powerpc/mm/ppc_mmu_32.c
+++ b/arch/powerpc/mm/ppc_mmu_32.c

@@ -237,7 +237,7 @@ void __init MMU_init_hw(void)
      Hash_end = (struct hash_pte *) ((unsigned long)Hash +

Hash_size);

      printk("Total memory = %ldMB; using %ldkB for hash table (at 
%p)\n",
-            total_memory >> 20, Hash_size >> 10, Hash);
+            (unsigned long)total_memory >> 20, Hash_size >> 10, 
Hash);

Will this ever be built with CONFIG_PHYS_64BIT?

I think that is how warning originates.

But please, cast the result of the shift.  Otherwise it will print 0MB 
instead of 4096MB.

The patches for 4G ram are in on one platform and in progress on a 
second.

milton

[PATCH v2] Guard print_device_node_tree() if #if 0.

From: Tony Breeds <hidden>
Date: 2008-07-31 06:54:23

Currently print_device_node_tree() isn't called but it can be usful for
debuging.  Leave the function there but hide it behind '#if 0' to save
it being rewritten.  If you want to call it you're already editing this
file anyway ;P

Signed-off-by: Tony Breeds <redacted>
---
Changes since v1:
 - No longer breaks CONFIG_PPC_PSERIES_DEBUG.

 arch/powerpc/platforms/pseries/eeh_driver.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c
index 8c1ca47..0ad56ff 100644
--- a/arch/powerpc/platforms/pseries/eeh_driver.c
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c

@@ -41,7 +41,7 @@ static inline const char * pcid_name (struct pci_dev *pdev)
 	return "";
 }
 
-#ifdef DEBUG
+#if 0
 static void print_device_node_tree(struct pci_dn *pdn, int dent)
 {
 	int i;

-- 
1.5.6.3

[PATCH v2] Force printing of 'total_memory' to unsigned long long in ppc_mmu_32.c

From: Tony Breeds <hidden>
Date: 2008-07-31 06:57:45

total_memory is a 'phys_addr_t', Which can be either 64 or 32 bits.
Force printing as unsigned long long to silence the warning.

Signed-off-by: Tony Breeds <redacted>
---
Changes since v1:
 - correctly use 64bit type as phys_addr_t wont always be 32bits.  Thanks to sfr for showing me the error of my ways ;P

 arch/powerpc/mm/ppc_mmu_32.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c
index c53145f..07473e0 100644
--- a/arch/powerpc/mm/ppc_mmu_32.c
+++ b/arch/powerpc/mm/ppc_mmu_32.c

@@ -236,8 +236,8 @@ void __init MMU_init_hw(void)
 
 	Hash_end = (struct hash_pte *) ((unsigned long)Hash + Hash_size);
 
-	printk("Total memory = %ldMB; using %ldkB for hash table (at %p)\n",
-	       total_memory >> 20, Hash_size >> 10, Hash);
+	printk("Total memory = %lldMB; using %ldkB for hash table (at %p)\n",
+	       (unsigned long long)total_memory >> 20, Hash_size >> 10, Hash);
 
 
 	/*

-- 
1.5.6.3

Re: [PATCH 5/8] Silence warning in arch/powerpc/mm/ppc_mmu_32.c

From: Tony Breeds <hidden>
Date: 2008-07-31 06:58:48

On Thu, Jul 31, 2008 at 03:21:25PM +1000, Stephen Rothwell wrote:

Hi Tony,

Rusty has forever ruined 'Hi $name' ;P

<snip>

Will this ever be built with CONFIG_PHYS_64BIT?

Updated patch follows.

Yours Tony

  linux.conf.au    http://www.marchsouth.org/
  Jan 19 - 24 2009 The Australian Linux Technical Conference!

[PATCH v3] Force printing of 'total_memory' to unsigned long long in ppc_mmu_32.c

From: Tony Breeds <hidden>
Date: 2008-08-01 01:38:40

total_memory is a 'phys_addr_t', Which can be either 64 or 32 bits.
Force printing as unsigned long long to silence the warning.

Signed-off-by: Tony Breeds <redacted>
---
Changes since v1:
 - correctly use 64bit type as phys_addr_t wont always be 32bits.  Thanks to
   sfr for showing me the error of my ways ;P

Changes since v2:
 - correctly cast the result of the shift NOT just total_memory.  Thanks Milton
   for catching that.

 arch/powerpc/mm/ppc_mmu_32.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c
index c53145f..6aa1208 100644
--- a/arch/powerpc/mm/ppc_mmu_32.c
+++ b/arch/powerpc/mm/ppc_mmu_32.c

@@ -236,8 +236,8 @@ void __init MMU_init_hw(void)
 
 	Hash_end = (struct hash_pte *) ((unsigned long)Hash + Hash_size);
 
-	printk("Total memory = %ldMB; using %ldkB for hash table (at %p)\n",
-	       total_memory >> 20, Hash_size >> 10, Hash);
+	printk("Total memory = %lldMB; using %ldkB for hash table (at %p)\n",
+	       (unsigned long long)(total_memory >> 20), Hash_size >> 10, Hash);
 
 
 	/*

-- 
1.5.6.3

Re: [PATCH 5/8] Silence warning in arch/powerpc/mm/ppc_mmu_32.c

From: Tony Breeds <hidden>
Date: 2008-08-01 01:40:29

On Thu, Jul 31, 2008 at 01:54:13AM -0500, Milton Miller wrote:

But please, cast the result of the shift.  Otherwise it will print 0MB 
instead of 4096MB.

Done, patch (v3) on the way.  One day I'll get better at this "trivial"
stuff.

Yours Tony

  linux.conf.au    http://www.marchsouth.org/
  Jan 19 - 24 2009 The Australian Linux Technical Conference!

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help