From 9255d6af509bfb0eef54c6398e18498c394fd285 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sun, 18 Jan 2004 18:14:52 -0800 Subject: [PATCH] [PATCH] ppc64: iSeries fixups, from Stephen Rothwel From: Anton Blanchard iSeries fixups, from Stephen Rothwel --- arch/ppc64/kernel/LparData.c | 4 ++-- arch/ppc64/kernel/XmPciLpEvent.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/ppc64/kernel/LparData.c b/arch/ppc64/kernel/LparData.c index 813780e2bd74c..d93cb38993a32 100644 --- a/arch/ppc64/kernel/LparData.c +++ b/arch/ppc64/kernel/LparData.c @@ -71,7 +71,7 @@ struct HvReleaseData hvReleaseData = { 6, /* TEMP: This allows non-GA driver */ 4, /* We are v5r2m0 */ 3, /* Min supported PLIC = v5r1m0 */ - 3, /* Min usuable PLIC = v5r1m0 */ + 3, /* Min usable PLIC = v5r1m0 */ { 0xd3, 0x89, 0x95, 0xa4, /* "Linux 2.4 "*/ 0xa7, 0x40, 0xf2, 0x4b, 0xf4, 0x4b, 0xf6, 0xf4 }, @@ -175,7 +175,7 @@ struct ItVpdAreas itVpdAreas = { 0, 0, 26, /* # VPD array entries */ 10, /* # DMA array entries */ - MAX_PROCESSORS*2, maxPhysicalProcessors, /* Max logical, physical procs */ + NR_CPUS*2, maxPhysicalProcessors, /* Max logical, physical procs */ offsetof(struct ItVpdAreas,xPlicDmaToks),/* offset to DMA toks */ offsetof(struct ItVpdAreas,xSlicVpdAdrs),/* offset to VPD addrs */ offsetof(struct ItVpdAreas,xPlicDmaLens),/* offset to DMA lens */ diff --git a/arch/ppc64/kernel/XmPciLpEvent.c b/arch/ppc64/kernel/XmPciLpEvent.c index 92ab43a76e340..60bc5ae1a8501 100644 --- a/arch/ppc64/kernel/XmPciLpEvent.c +++ b/arch/ppc64/kernel/XmPciLpEvent.c @@ -20,13 +20,13 @@ #include #include -long Pci_Interrupt_Count = 0; -long Pci_Event_Count = 0; +static long Pci_Interrupt_Count; +static long Pci_Event_Count; enum XmPciLpEvent_Subtype { XmPciLpEvent_BusCreated = 0, // PHB has been created XmPciLpEvent_BusError = 1, // PHB has failed - XmPciLpEvent_BusFailed = 2, // Msg to Seconday, Primary failed bus + XmPciLpEvent_BusFailed = 2, // Msg to Secondary, Primary failed bus XmPciLpEvent_NodeFailed = 4, // Multi-adapter bridge has failed XmPciLpEvent_NodeRecovered = 5, // Multi-adapter bridge has recovered XmPciLpEvent_BusRecovered = 12, // PHB has been recovered @@ -90,7 +90,7 @@ static void XmPciLpEvent_handler( struct HvLpEvent* eventParm, struct pt_regs* r break; } } - else if (event) { + else if (eventParm) { printk(KERN_ERR "XmPciLpEvent.c: Unrecognized PCI event type 0x%x\n",(int)eventParm->xType); } else { -- 2.53.0