Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+8
-2
+6
arch/s390/include/asm/pgtable.h
+6
arch/s390/include/asm/pgtable.h
···
752
752
return (pmd_val(pmd) & _SEGMENT_ENTRY_WRITE) != 0;
753
753
}
754
754
755
+
#define pud_write pud_write
756
+
static inline int pud_write(pud_t pud)
757
+
{
758
+
return (pud_val(pud) & _REGION3_ENTRY_WRITE) != 0;
759
+
}
760
+
755
761
static inline int pmd_dirty(pmd_t pmd)
756
762
{
757
763
return (pmd_val(pmd) & _SEGMENT_ENTRY_DIRTY) != 0;
+2
-2
arch/s390/pci/pci.c
+2
-2
arch/s390/pci/pci.c
···
424
424
425
425
if (zpci_use_mio(zdev))
426
426
pdev->resource[i].start =
427
-
(resource_size_t __force) zdev->bars[i].mio_wb;
427
+
(resource_size_t __force) zdev->bars[i].mio_wt;
428
428
else
429
429
pdev->resource[i].start = (resource_size_t __force)
430
430
pci_iomap_range_fh(pdev, i, 0, 0);
···
531
531
flags |= IORESOURCE_MEM_64;
532
532
533
533
if (zpci_use_mio(zdev))
534
-
addr = (unsigned long) zdev->bars[i].mio_wb;
534
+
addr = (unsigned long) zdev->bars[i].mio_wt;
535
535
else
536
536
addr = ZPCI_ADDR(entry);
537
537
size = 1UL << zdev->bars[i].size;