Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[powerpc.git] / arch / powerpc / kernel / pci_32.c

diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index 704c846..b5431cc 100644 (file)
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -787,7 +787,7 @@ pci_busdev_to_OF_node(struct pci_bus *bus, int devfn)
         * fix has to be done by making the remapping per-host and always
         * filling the pci_to_OF map. --BenH
         */
-       if (_machine == _MACH_Pmac && busnr >= 0xf0)
+       if (machine_is(powermac) && busnr >= 0xf0)
                busnr -= 0xf0;
        else
 #endif
@@ -1113,9 +1113,10 @@ check_for_io_childs(struct pci_bus *bus, struct resource* res, int *found_vga)
        int     i;
        int     rc = 0;
 
-#define push_end(res, size) do { unsigned long __sz = (size) ; \
-       res->end = ((res->end + __sz) / (__sz + 1)) * (__sz + 1) + __sz; \
-    } while (0)
+#define push_end(res, mask) do {               \
+       BUG_ON((mask+1) & mask);                \
+       res->end = (res->end + mask) | mask;    \
+} while (0)
 
        list_for_each_entry(dev, &bus->devices, bus_list) {
                u16 class = dev->class >> 8;
@@ -1653,7 +1654,6 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
                return -EINVAL;
 
        vma->vm_pgoff = offset >> PAGE_SHIFT;
-       vma->vm_flags |= VM_SHM | VM_LOCKED | VM_IO;
        vma->vm_page_prot = __pci_mmap_set_pgprot(dev, rp,
                                                  vma->vm_page_prot,
                                                  mmap_state, write_combine);
@@ -1728,7 +1728,7 @@ long sys_pciconfig_iobase(long which, unsigned long bus, unsigned long devfn)
         * (bus 0 is HT root), we return the AGP one instead.
         */
 #ifdef CONFIG_PPC_PMAC
-       if (_machine == _MACH_Pmac && machine_is_compatible("MacRISC4"))
+       if (machine_is(powermac) && machine_is_compatible("MacRISC4"))
                if (bus == 0)
                        bus = 0xf0;
 #endif /* CONFIG_PPC_PMAC */