2004-03-16 21:06:06

by Dave Jones

Subject: fix ppc compile

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

--- linux-2.6.4/arch/ppc/syslib/indirect_pci.c~ 2004-03-16 21:03:20.000000000 +0000
+++ linux-2.6.4/arch/ppc/syslib/indirect_pci.c 2004-03-16 21:03:31.000000000 +0000
@@ -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

2004-03-16 21:21:26

by Tom Rini

Subject: Re: fix ppc compile

On Tue, Mar 16, 2004 at 09:05:40PM +0000, Dave Jones wrote:
> 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
>
> --- linux-2.6.4/arch/ppc/syslib/indirect_pci.c~ 2004-03-16 21:03:20.000000000 +0000
> +++ linux-2.6.4/arch/ppc/syslib/indirect_pci.c 2004-03-16 21:03:31.000000000 +0000
> @@ -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.

--
Tom Rini
http://gate.crashing.org/~trini/