Linus, below is a trivial patch to pci.c, and applies against test12-pre5.
In -test11, tmp was declared. Somehow by 12-pre4, it got lost. This puts
it back. It's needed in the BITS_PER_LONG == 64 case.
Thanks,
Matt Domsch
Dell Enterprise Systems Group
Linux Development Team
diff -burN linux/drivers/pci/pci.c.orig linux/drivers/pci/pci.c
--- linux/drivers/pci/pci.c.orig Tue Dec 5 07:49:28 2000
+++ linux/drivers/pci/pci.c Tue Dec 5 07:49:36 2000
@@ -540,7 +540,7 @@
static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int
rom)
{
unsigned int pos, reg, next;
- u32 l, sz;
+ u32 l, sz, tmp;
struct resource *res;
for(pos=0; pos<howmany; pos = next) {
On Tue, Dec 05, 2000 at 07:55:58AM -0600, [email protected] wrote:
> In -test11, tmp was declared. Somehow by 12-pre4, it got lost. This puts
> it back. It's needed in the BITS_PER_LONG == 64 case.
BITS_PER_LONG == 64 case is broken anyway.
Better fix would be
--- linux/drivers/pci/pci.c.orig Mon Dec 4 12:49:28 2000
+++ linux/drivers/pci/pci.c Tue Dec 5 18:30:45 2000
@@ -573,10 +573,10 @@ static void pci_read_bases(struct pci_de
res->start |= ((unsigned long) l) << 32;
res->end = res->start + sz;
pci_write_config_dword(dev, reg+4, ~0);
- pci_read_config_dword(dev, reg+4, &tmp);
+ pci_read_config_dword(dev, reg+4, &sz);
pci_write_config_dword(dev, reg+4, l);
- if (l)
- res->end = res->start + (((unsigned long) ~l) << 32);
+ if (sz)
+ res->end = res->start + (((unsigned long) ~sz) << 32);
#else
if (l) {
printk(KERN_ERR "PCI: Unable to handle 64-bit address for device %s\n", dev->slot_name);
Ivan.