s390 updates for 5.6-rc5
- 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. -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEE3QHqV+H2a8xAv27vjYWKoQLXFBgFAl5jmrQACgkQjYWKoQLX FBi/iQf9E50AKMRH7x0CNdzItCC3owNT/t06IPxJP397OmKafXI2Ke9a6Xya/LpT C68ndxxMVd4RuYhLc1aOtW2Jo04Owc9E/wWdQVuIO7joK/evZj9JNR3jb6f4HhXc PXPs432LfYPTrCmC4JvDW7PQXuhKAcjav8iqwE9nlyTvGFOaBupuB+1qum0wIUeE bDvdkEgzRirWrK7TOqB680e+hRmBqeoy/HBSrmP30yxjv/9xv6C2VGiPajH4mOhU Cw6lY7G/qLNUUvANBREKLhIXlI+PuApn/zFBbb6iqihd67wQ+v8lun2kA2Anyvv8 j0evq/fLXFwCYFGnJWiYzVody8ak0A== =vECk -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
9d588f6360
|
@ -752,6 +752,12 @@ static inline int pmd_write(pmd_t pmd)
|
|||
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)
|
||||
{
|
||||
return (pmd_val(pmd) & _SEGMENT_ENTRY_DIRTY) != 0;
|
||||
|
|
|
@ -424,7 +424,7 @@ static void zpci_map_resources(struct pci_dev *pdev)
|
|||
|
||||
if (zpci_use_mio(zdev))
|
||||
pdev->resource[i].start =
|
||||
(resource_size_t __force) zdev->bars[i].mio_wb;
|
||||
(resource_size_t __force) zdev->bars[i].mio_wt;
|
||||
else
|
||||
pdev->resource[i].start = (resource_size_t __force)
|
||||
pci_iomap_range_fh(pdev, i, 0, 0);
|
||||
|
@ -531,7 +531,7 @@ static int zpci_setup_bus_resources(struct zpci_dev *zdev,
|
|||
flags |= IORESOURCE_MEM_64;
|
||||
|
||||
if (zpci_use_mio(zdev))
|
||||
addr = (unsigned long) zdev->bars[i].mio_wb;
|
||||
addr = (unsigned long) zdev->bars[i].mio_wt;
|
||||
else
|
||||
addr = ZPCI_ADDR(entry);
|
||||
size = 1UL << zdev->bars[i].size;
|
||||
|
|
Loading…
Reference in a new issue