fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / alpha / kernel / sys_nautilus.c

diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c
index fcf04ed..e7594a7 100644 (file)
--- a/arch/alpha/kernel/sys_nautilus.c
+++ b/arch/alpha/kernel/sys_nautilus.c
@@ -32,12 +32,12 @@
 #include <linux/init.h>
 #include <linux/reboot.h>
 #include <linux/bootmem.h>
+#include <linux/bitops.h>
 
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/mmu_context.h>
 #include <asm/io.h>
 #include <asm/pci.h>
@@ -124,8 +124,7 @@ naut_sys_machine_check(unsigned long vector, unsigned long la_ptr,
    in the system.  They are analysed separately but all starts here.  */
 
 void
-nautilus_machine_check(unsigned long vector, unsigned long la_ptr,
-                      struct pt_regs *regs)
+nautilus_machine_check(unsigned long vector, unsigned long la_ptr)
 {
        char *mchk_class;
 
@@ -165,7 +164,7 @@ nautilus_machine_check(unsigned long vector, unsigned long la_ptr,
        else if (vector == SCB_Q_SYSMCHK)
                mchk_class = "Fatal";
        else {
-               ev6_machine_check(vector, la_ptr, regs);
+               ev6_machine_check(vector, la_ptr);
                return;
        }
 
@@ -173,7 +172,7 @@ nautilus_machine_check(unsigned long vector, unsigned long la_ptr,
                         "[%s System Machine Check (NMI)]\n",
               vector, mchk_class);
 
-       naut_sys_machine_check(vector, la_ptr, regs);
+       naut_sys_machine_check(vector, la_ptr, get_irq_regs());
 
        /* Tell the PALcode to clear the machine check */
        draina();
@@ -201,7 +200,7 @@ nautilus_init_pci(void)
        bus = pci_scan_bus(0, alpha_mv.pci_ops, hose);
        hose->bus = bus;
 
-       irongate = pci_find_slot(0, 0);
+       irongate = pci_get_bus_and_slot(0, 0);
        bus->self = irongate;
        bus->resource[1] = &irongate_mem;
 
@@ -250,7 +249,6 @@ struct alpha_machine_vector nautilus_mv __initmv = {
        DO_EV6_MMU,
        DO_DEFAULT_RTC,
        DO_IRONGATE_IO,
-       DO_IRONGATE_BUS,
        .machine_check          = nautilus_machine_check,
        .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
        .min_io_address         = DEFAULT_IO_BASE,