From bdabd2b43c0314d32252e2838d8d323cf3f6e405 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sun, 18 Jan 2004 18:24:18 -0800 Subject: [PATCH] [PATCH] ppc64: Fix a compile error and a warning in the iSeries code, from Stephen Rothwell From: Anton Blanchard Fix a compile error and a warning in the iSeries code, from Stephen Rothwell --- arch/ppc64/kernel/iSeries_pci.c | 2 +- arch/ppc64/kernel/iSeries_setup.c | 1 + arch/ppc64/kernel/pci.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/ppc64/kernel/iSeries_pci.c b/arch/ppc64/kernel/iSeries_pci.c index 7e5ee284418c4..f5bc53b3a8d71 100644 --- a/arch/ppc64/kernel/iSeries_pci.c +++ b/arch/ppc64/kernel/iSeries_pci.c @@ -409,7 +409,7 @@ static int iSeries_Scan_Bridge_Slot(HvBusNumber Bus, iSeries_assign_IRQ(Irq, Bus, 0, EADsIdSel); PPCDBG(PPCDBG_BUSWALK, "PCI:- allocate and assign IRQ 0x%02X.%02X.%02X = 0x%02X\n", - Bus, 0, AgentId, Irq); + Bus, 0, EADsIdSel, Irq); /* * Connect all functions of any device found. diff --git a/arch/ppc64/kernel/iSeries_setup.c b/arch/ppc64/kernel/iSeries_setup.c index 35617a952c98f..bf234f5ec4ce4 100644 --- a/arch/ppc64/kernel/iSeries_setup.c +++ b/arch/ppc64/kernel/iSeries_setup.c @@ -58,6 +58,7 @@ extern void abort(void); extern void ppcdbg_initialize(void); extern void iSeries_pcibios_init(void); +extern void tce_init_iSeries(void); static void build_iSeries_Memory_Map(void); static void setup_iSeries_cache_sizes(void); diff --git a/arch/ppc64/kernel/pci.c b/arch/ppc64/kernel/pci.c index 147dc23d14cb2..2dc7b69b84265 100644 --- a/arch/ppc64/kernel/pci.c +++ b/arch/ppc64/kernel/pci.c @@ -289,6 +289,7 @@ static void __init pcibios_claim_one_bus(struct pci_bus *b) pcibios_claim_one_bus(child_bus); } +#ifndef CONFIG_PPC_ISERIES static void __init pcibios_claim_of_setup(void) { struct list_head *lb; @@ -298,6 +299,7 @@ static void __init pcibios_claim_of_setup(void) pcibios_claim_one_bus(b); } } +#endif static int __init pcibios_init(void) { -- 2.53.0