Commit ada8d309 authored by Richard Russon's avatar Richard Russon

Merge flatcap.org:/home/flatcap/backup/bk/ntfs-2.6

into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6-devel
parents 3a155b7e 8b5915b0
...@@ -373,7 +373,10 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max ...@@ -373,7 +373,10 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max
child->bridge_ctl = bctl; child->bridge_ctl = bctl;
cmax = pci_scan_child_bus(child); cmax = pci_scan_child_bus(child);
if (cmax > max) max = cmax; if (cmax > max)
max = cmax;
if (child->subordinate > max)
max = child->subordinate;
} else { } else {
/* /*
* We need to assign a number to this bus which we always * We need to assign a number to this bus which we always
......
...@@ -40,6 +40,8 @@ static inline void clear_user_highpage(struct page *page, unsigned long vaddr) ...@@ -40,6 +40,8 @@ static inline void clear_user_highpage(struct page *page, unsigned long vaddr)
void *addr = kmap_atomic(page, KM_USER0); void *addr = kmap_atomic(page, KM_USER0);
clear_user_page(addr, vaddr, page); clear_user_page(addr, vaddr, page);
kunmap_atomic(addr, KM_USER0); kunmap_atomic(addr, KM_USER0);
/* Make sure this page is cleared on other CPU's too before using it */
smp_wmb();
} }
static inline void clear_highpage(struct page *page) static inline void clear_highpage(struct page *page)
...@@ -73,6 +75,8 @@ static inline void copy_user_highpage(struct page *to, struct page *from, unsign ...@@ -73,6 +75,8 @@ static inline void copy_user_highpage(struct page *to, struct page *from, unsign
copy_user_page(vto, vfrom, vaddr, to); copy_user_page(vto, vfrom, vaddr, to);
kunmap_atomic(vfrom, KM_USER0); kunmap_atomic(vfrom, KM_USER0);
kunmap_atomic(vto, KM_USER1); kunmap_atomic(vto, KM_USER1);
/* Make sure this page is cleared on other CPU's too before using it */
smp_wmb();
} }
static inline void copy_highpage(struct page *to, struct page *from) static inline void copy_highpage(struct page *to, struct page *from)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment