diff options
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/init-mm.c | 2 | ||||
| -rw-r--r-- | mm/mincore.c | 2 | ||||
| -rw-r--r-- | mm/mprotect.c | 2 | ||||
| -rw-r--r-- | mm/page_reporting.h | 2 | ||||
| -rw-r--r-- | mm/pgtable-generic.c | 6 | ||||
| -rw-r--r-- | mm/zsmalloc.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/mm/init-mm.c b/mm/init-mm.c index 19603302a77f..71eabeca33ef 100644 --- a/mm/init-mm.c +++ b/mm/init-mm.c @@ -9,7 +9,7 @@ #include <linux/atomic.h> #include <linux/user_namespace.h> -#include <asm/pgtable.h> +#include <linux/pgtable.h> #include <asm/mmu.h> #ifndef INIT_MM_CONTEXT diff --git a/mm/mincore.c b/mm/mincore.c index 0e6dd9948f1a..edbcf3d54e4e 100644 --- a/mm/mincore.c +++ b/mm/mincore.c @@ -19,7 +19,7 @@ #include <linux/hugetlb.h> #include <linux/uaccess.h> -#include <asm/pgtable.h> +#include <linux/pgtable.h> static int mincore_hugetlb(pte_t *pte, unsigned long hmask, unsigned long addr, unsigned long end, struct mm_walk *walk) diff --git a/mm/mprotect.c b/mm/mprotect.c index 494192ca954b..1eeb7b3cedf0 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -28,7 +28,7 @@ #include <linux/ksm.h> #include <linux/uaccess.h> #include <linux/mm_inline.h> -#include <asm/pgtable.h> +#include <linux/pgtable.h> #include <asm/cacheflush.h> #include <asm/mmu_context.h> #include <asm/tlbflush.h> diff --git a/mm/page_reporting.h b/mm/page_reporting.h index aa6d37f4dc22..2c385dd4ddbd 100644 --- a/mm/page_reporting.h +++ b/mm/page_reporting.h @@ -7,7 +7,7 @@ #include <linux/page-isolation.h> #include <linux/jump_label.h> #include <linux/slab.h> -#include <asm/pgtable.h> +#include <linux/pgtable.h> #include <linux/scatterlist.h> #define PAGE_REPORTING_MIN_ORDER pageblock_order diff --git a/mm/pgtable-generic.c b/mm/pgtable-generic.c index d18f0e1b6792..9578db83e312 100644 --- a/mm/pgtable-generic.c +++ b/mm/pgtable-generic.c @@ -2,15 +2,15 @@ /* * mm/pgtable-generic.c * - * Generic pgtable methods declared in asm-generic/pgtable.h + * Generic pgtable methods declared in linux/pgtable.h * * Copyright (C) 2010 Linus Torvalds */ #include <linux/pagemap.h> #include <linux/hugetlb.h> +#include <linux/pgtable.h> #include <asm/tlb.h> -#include <asm-generic/pgtable.h> /* * If a p?d_bad entry is found while walking page tables, report @@ -53,7 +53,7 @@ void pmd_clear_bad(pmd_t *pmd) #ifndef __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS /* - * Only sets the access flags (dirty, accessed), as well as write + * Only sets the access flags (dirty, accessed), as well as write * permission. Furthermore, we know it always gets set to a "more * permissive" setting, which allows most architectures to optimize * this. We return whether the PTE actually changed, which in turn diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index f6dc0673e62c..7790cd6a4df2 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -40,7 +40,7 @@ #include <linux/string.h> #include <linux/slab.h> #include <asm/tlbflush.h> -#include <asm/pgtable.h> +#include <linux/pgtable.h> #include <linux/cpumask.h> #include <linux/cpu.h> #include <linux/vmalloc.h> |