4 files changed, 11 insertions, 6 deletions

diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index ffb7d5423cc0..3c10b9a1ddf5 100644
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -516,10 +516,11 @@ sys_pciconfig_iobase(long which, unsigned long bus, unsigned long dfn)
                 if (bus == 0 && dfn == 0) {
                         hose = pci_isa_hose;
                 } else {
-                        dev = pci_find_slot(bus, dfn);
+                        dev = pci_get_bus_and_slot(bus, dfn);
                         if (!dev)
                                 return -ENODEV;
                         hose = dev->sysdata;
+                        pci_dev_put(dev);
                 }
         }
 
diff --git a/arch/alpha/kernel/sys_miata.c b/arch/alpha/kernel/sys_miata.c
index b8b817feb1ee..910b43cd63e8 100644
--- a/arch/alpha/kernel/sys_miata.c
+++ b/arch/alpha/kernel/sys_miata.c
@@ -183,11 +183,15 @@ miata_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 
         if((slot == 7) && (PCI_FUNC(dev->devfn) == 3)) {
                 u8 irq=0;
-
-                if(pci_read_config_byte(pci_find_slot(dev->bus->number, dev->devfn & ~(7)), 0x40,&irq)!=PCIBIOS_SUCCESSFUL)
+                struct pci_dev *pdev = pci_get_slot(dev->bus, dev->devfn & ~7);
+                if(pdev == NULL || pci_read_config_byte(pdev, 0x40,&irq) != PCIBIOS_SUCCESSFUL) {
+                        pci_dev_put(pdev);
                         return -1;
-                else    
+                }
+                else    {
+                        pci_dev_put(pdev);
                         return irq;
+                }
         }
 
         return COMMON_TABLE_LOOKUP;
diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c
index 93744bab73fb..e7594a7cf585 100644
--- a/arch/alpha/kernel/sys_nautilus.c
+++ b/arch/alpha/kernel/sys_nautilus.c
@@ -200,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;
 
diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
index 8871529a34e2..8aa9db834c11 100644
--- a/arch/alpha/mm/fault.c
+++ b/arch/alpha/mm/fault.c
@@ -108,7 +108,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
 
         /* If we're in an interrupt context, or have no user context,
            we must not take the fault.  */
-        if (!mm || in_interrupt())
+        if (!mm || in_atomic())
                 goto no_context;
 
 #ifdef CONFIG_ALPHA_LARGE_VMALLOC