Skip to contentSkip to conversation

fix ppc compile

PATCH Dave Jones 2 participants 2 messages Mar 16, 2004

lore
Share & tools
lore

Dave Jones

author
#0 lore raw

2.6.5rc1 changes this function, but there is no 'dev' argument there. This makes it look a little more sane, but I've no hardware to test it on.

Dave

arch/ppc/syslib/indirect_pci.c renamed from arch/ppc/syslib/indirect_pci.c~ +2 -2
@@ -44,8 +44,8 @@
 			cfg_type = 1;
 
 	PCI_CFG_OUT(hose->cfg_addr, 					 
-		 (0x80000000 | ((dev->bus->number - hose->bus_offset) << 16) 
-		  | (dev->devfn << 8) | ((offset & 0xfc) | cfg_type)));	
+		 (0x80000000 | ((bus->number - hose->bus_offset) << 16) 
+		  | (devfn << 8) | ((offset & 0xfc) | cfg_type)));	
 
 	/*
 	 * Note: the caller has already checked that offset is
#1 lore raw
Quoted 8 lines · Dave Jones

2.6.5rc1 changes this function, but there is no 'dev' argument there. This makes it look a little more sane, but I've no hardware to test it on.

Dave

arch/ppc/syslib/indirect_pci.c line 51

Quoted 10 lines
arch/ppc/syslib/indirect_pci.c renamed from arch/ppc/syslib/indirect_pci.c~ +2 -2
@@ -44,8 +44,8 @@
 			cfg_type = 1;
 
 	PCI_CFG_OUT(hose->cfg_addr, 					 
-		 (0x80000000 | ((dev->bus->number - hose->bus_offset) << 16) 
-		  | (dev->devfn << 8) | ((offset & 0xfc) | cfg_type)));	
+		 (0x80000000 | ((bus->number - hose->bus_offset) << 16) 
+		  | (devfn << 8) | ((offset & 0xfc) | cfg_type)));	
 
 	/*
 	 * Note: the caller has already checked that offset is

There's this problem in 2 places. I've sent akpm a patch already that fixes 'em both.

Signature · 2 lines
Tom Rini
http://gate.crashing.org/~trini/