kernel: bump 4.14 to 4.14.166

Refreshed all patches.

Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
Koen Vandeputte
2020-01-20 12:23:38 +01:00
parent 6cc7498daa
commit ac050025a5
3 changed files with 4 additions and 4 deletions

View File

@@ -285,7 +285,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
#define PAGE_NONE __pgprot(((_PAGE_DEFAULT) & ~PTE_VALID) | PTE_PROT_NONE | PTE_RDONLY | PTE_NG | PTE_PXN | PTE_UXN)
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
@@ -356,6 +356,11 @@ static inline int pmd_protnone(pmd_t pmd
@@ -357,6 +357,11 @@ static inline int pmd_protnone(pmd_t pmd
__pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_DEVICE_nGnRnE) | PTE_PXN | PTE_UXN)
#define pgprot_writecombine(prot) \
__pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_NORMAL_NC) | PTE_PXN | PTE_UXN)

View File

@@ -123,7 +123,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
static struct kset *iommu_group_kset;
static DEFINE_IDA(iommu_group_ida);
@@ -989,6 +990,26 @@ struct iommu_group *pci_device_group(str
@@ -990,6 +991,26 @@ struct iommu_group *pci_device_group(str
return iommu_group_alloc();
}