[PATCH] compile fixes

- iovec stuff in linux/uio.h is needed for CONFIG_OSF4_COMPAT;
- pcibios_{read,write}_config_xx has gone - replaced with
  respective pci_bus_xx functions.

Ivan.

diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index 4b3192e17adf6cf393bfbff40da4a75359c074e3..a367cc15662dc6e58bbb31ab7f76a213c7b917b6 100644 (file)
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -34,6 +34,7 @@
 #include <linux/types.h>
 #include <linux/ipc.h>
 #include <linux/namei.h>
+#include <linux/uio.h>
 
 #include <asm/fpu.h>
 #include <asm/io.h>

diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c
index 2780d8e2db87c31815aee4f0541a7da186049c52..4bdd7fc9492019b56f7e635703ef53bcb0a9b2c7 100644 (file)
--- a/arch/alpha/kernel/sys_nautilus.c
+++ b/arch/alpha/kernel/sys_nautilus.c
@@ -76,12 +76,14 @@ nautilus_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 void
 nautilus_kill_arch(int mode)
 {
+       struct pci_bus *bus = pci_isa_hose->bus;
+
        switch (mode) {
        case LINUX_REBOOT_CMD_RESTART:
                if (! alpha_using_srm) {
                        u8 t8;
-                       pcibios_read_config_byte(0, 0x38, 0x43, &t8);
-                       pcibios_write_config_byte(0, 0x38, 0x43, t8 | 0x80);
+                       pci_bus_read_config_byte(bus, 0x38, 0x43, &t8);
+                       pci_bus_write_config_byte(bus, 0x38, 0x43, t8 | 0x80);
                        outb(1, 0x92);
                        outb(0, 0x92);
                        /* NOTREACHED */
@@ -91,7 +93,7 @@ nautilus_kill_arch(int mode)
        case LINUX_REBOOT_CMD_POWER_OFF:
                {
                        u32 pmuport;
-                       pcibios_read_config_dword(0, 0x88, 0x10, &pmuport);
+                       pci_bus_read_config_dword(bus, 0x88, 0x10, &pmuport);
                        pmuport &= 0xfffe;
                        outl(0xffff, pmuport); /* clear pending events */
                        outw(0x2000, pmuport+4); /* power off */

diff --git a/arch/alpha/kernel/sys_sio.c b/arch/alpha/kernel/sys_sio.c
index 8c79f4f4080623db063c24692228f407b6dbe797..f079815b13f9d7b400af1cbbdbe8c411b3d0826b 100644 (file)
--- a/arch/alpha/kernel/sys_sio.c
+++ b/arch/alpha/kernel/sys_sio.c
@@ -77,7 +77,7 @@ alphabook1_init_arch(void)
 static void __init
 sio_pci_route(void)
 {
-       pcibios_write_config_dword(0, PCI_DEVFN(7, 0), 0x60,
+       pci_bus_write_config_dword(pci_isa_hose->bus, PCI_DEVFN(7, 0), 0x60,
                                   alpha_mv.sys.sio.route_tab);
 }