diff options
| author | Laura Abbott <labbott@redhat.com> | 2017-05-08 15:58:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-08 17:15:13 -0700 |
| commit | 74d86a70636a0a5eec76efcff24bee9681e01804 (patch) | |
| tree | e05d56848a20e949116611bf0147d4e212ffdcfb /arch/arm/kernel | |
| parent | 299878bac326c890699c696ebba26f56fe93fc75 (diff) | |
| download | linux-stable-74d86a70636a0a5eec76efcff24bee9681e01804.tar.gz linux-stable-74d86a70636a0a5eec76efcff24bee9681e01804.tar.bz2 linux-stable-74d86a70636a0a5eec76efcff24bee9681e01804.zip | |
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>
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/ftrace.c | 1 | ||||
| -rw-r--r-- | arch/arm/kernel/machine_kexec.c | 1 |
2 files changed, 2 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 @@ #include <asm/opcodes.h> #include <asm/ftrace.h> #include <asm/insn.h> +#include <asm/set_memory.h> #ifdef CONFIG_THUMB2_KERNEL #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 @@ #include <asm/mach-types.h> #include <asm/smp_plat.h> #include <asm/system_misc.h> +#include <asm/set_memory.h> extern void relocate_new_kernel(void); extern const unsigned int relocate_new_kernel_size; |