Commit 9d588f63 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 's390-5.6-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 fixes from Vasily Gorbik:

 - Fix panic in gup_fast on large pud by providing an implementation of
   pud_write. This has been overlooked during migration to common gup
   code.

 - Fix unexpected write combining on PCI stores.

* tag 's390-5.6-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/pci: Fix unexpected write combine on resource
  s390/mm: fix panic in gup_fast on large pud
parents 5236647a df057c91
...@@ -752,6 +752,12 @@ static inline int pmd_write(pmd_t pmd) ...@@ -752,6 +752,12 @@ static inline int pmd_write(pmd_t pmd)
return (pmd_val(pmd) & _SEGMENT_ENTRY_WRITE) != 0; return (pmd_val(pmd) & _SEGMENT_ENTRY_WRITE) != 0;
} }
#define pud_write pud_write
static inline int pud_write(pud_t pud)
{
return (pud_val(pud) & _REGION3_ENTRY_WRITE) != 0;
}
static inline int pmd_dirty(pmd_t pmd) static inline int pmd_dirty(pmd_t pmd)
{ {
return (pmd_val(pmd) & _SEGMENT_ENTRY_DIRTY) != 0; return (pmd_val(pmd) & _SEGMENT_ENTRY_DIRTY) != 0;
......
...@@ -424,7 +424,7 @@ static void zpci_map_resources(struct pci_dev *pdev) ...@@ -424,7 +424,7 @@ static void zpci_map_resources(struct pci_dev *pdev)
if (zpci_use_mio(zdev)) if (zpci_use_mio(zdev))
pdev->resource[i].start = pdev->resource[i].start =
(resource_size_t __force) zdev->bars[i].mio_wb; (resource_size_t __force) zdev->bars[i].mio_wt;
else else
pdev->resource[i].start = (resource_size_t __force) pdev->resource[i].start = (resource_size_t __force)
pci_iomap_range_fh(pdev, i, 0, 0); pci_iomap_range_fh(pdev, i, 0, 0);
...@@ -531,7 +531,7 @@ static int zpci_setup_bus_resources(struct zpci_dev *zdev, ...@@ -531,7 +531,7 @@ static int zpci_setup_bus_resources(struct zpci_dev *zdev,
flags |= IORESOURCE_MEM_64; flags |= IORESOURCE_MEM_64;
if (zpci_use_mio(zdev)) if (zpci_use_mio(zdev))
addr = (unsigned long) zdev->bars[i].mio_wb; addr = (unsigned long) zdev->bars[i].mio_wt;
else else
addr = ZPCI_ADDR(entry); addr = ZPCI_ADDR(entry);
size = 1UL << zdev->bars[i].size; size = 1UL << zdev->bars[i].size;
......
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