diff options
author | Laura Abbott <labbott@redhat.com> | 2017-05-08 18:58:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-08 20:15:13 -0400 |
commit | 74d86a70636a0a5eec76efcff24bee9681e01804 (patch) | |
tree | e05d56848a20e949116611bf0147d4e212ffdcfb | |
parent | 299878bac326c890699c696ebba26f56fe93fc75 (diff) |
arm: use set_memory.h header
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly
Link: http://lkml.kernel.org/r/1488920133-27229-3-git-send-email-labbott@redhat.com
Signed-off-by: Laura Abbott <labbott@redhat.com>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/arm/kernel/ftrace.c | 1 | ||||
-rw-r--r-- | arch/arm/kernel/machine_kexec.c | 1 | ||||
-rw-r--r-- | arch/arm/mm/pageattr.c | 1 | ||||
-rw-r--r-- | arch/arm/net/bpf_jit_32.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c index 3f1759411d51..dea3e965fe88 100644 --- a/arch/arm/kernel/ftrace.c +++ b/arch/arm/kernel/ftrace.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <asm/opcodes.h> | 21 | #include <asm/opcodes.h> |
22 | #include <asm/ftrace.h> | 22 | #include <asm/ftrace.h> |
23 | #include <asm/insn.h> | 23 | #include <asm/insn.h> |
24 | #include <asm/set_memory.h> | ||
24 | 25 | ||
25 | #ifdef CONFIG_THUMB2_KERNEL | 26 | #ifdef CONFIG_THUMB2_KERNEL |
26 | #define NOP 0xf85deb04 /* pop.w {lr} */ | 27 | #define NOP 0xf85deb04 /* pop.w {lr} */ |
diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c index b18c1ea56bed..15495887ca14 100644 --- a/arch/arm/kernel/machine_kexec.c +++ b/arch/arm/kernel/machine_kexec.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <asm/mach-types.h> | 18 | #include <asm/mach-types.h> |
19 | #include <asm/smp_plat.h> | 19 | #include <asm/smp_plat.h> |
20 | #include <asm/system_misc.h> | 20 | #include <asm/system_misc.h> |
21 | #include <asm/set_memory.h> | ||
21 | 22 | ||
22 | extern void relocate_new_kernel(void); | 23 | extern void relocate_new_kernel(void); |
23 | extern const unsigned int relocate_new_kernel_size; | 24 | extern const unsigned int relocate_new_kernel_size; |
diff --git a/arch/arm/mm/pageattr.c b/arch/arm/mm/pageattr.c index 3b69f2642513..1403cb4a0c3d 100644 --- a/arch/arm/mm/pageattr.c +++ b/arch/arm/mm/pageattr.c | |||
@@ -15,6 +15,7 @@ | |||
15 | 15 | ||
16 | #include <asm/pgtable.h> | 16 | #include <asm/pgtable.h> |
17 | #include <asm/tlbflush.h> | 17 | #include <asm/tlbflush.h> |
18 | #include <asm/set_memory.h> | ||
18 | 19 | ||
19 | struct page_change_data { | 20 | struct page_change_data { |
20 | pgprot_t set_mask; | 21 | pgprot_t set_mask; |
diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c index 93d0b6d0b63e..d5b9fa19b684 100644 --- a/arch/arm/net/bpf_jit_32.c +++ b/arch/arm/net/bpf_jit_32.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/if_vlan.h> | 18 | #include <linux/if_vlan.h> |
19 | 19 | ||
20 | #include <asm/cacheflush.h> | 20 | #include <asm/cacheflush.h> |
21 | #include <asm/set_memory.h> | ||
21 | #include <asm/hwcap.h> | 22 | #include <asm/hwcap.h> |
22 | #include <asm/opcodes.h> | 23 | #include <asm/opcodes.h> |
23 | 24 | ||