summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/kexec.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-14 13:29:31 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-14 13:29:31 -0700
commitd985524680b77a1cf90738db9a2d72065a746afa (patch)
tree101857c3e59f9238b0c7d4bbbf58e46476957387 /arch/arm/include/asm/kexec.h
parent2007eafd9df71375d443192bbbe7aa2175992477 (diff)
parentef954844c7ace62f773f4f23e28d2d915adc419f (diff)
downloadlinux-d985524680b77a1cf90738db9a2d72065a746afa.tar.bz2
Merge 4.13-rc5 into char-misc-next
We want the firmware, and other changes, in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/include/asm/kexec.h')
-rw-r--r--arch/arm/include/asm/kexec.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/asm/kexec.h b/arch/arm/include/asm/kexec.h
index 1869af6bac5c..25021b798a1e 100644
--- a/arch/arm/include/asm/kexec.h
+++ b/arch/arm/include/asm/kexec.h
@@ -19,6 +19,11 @@
#ifndef __ASSEMBLY__
+#define ARCH_HAS_KIMAGE_ARCH
+struct kimage_arch {
+ u32 kernel_r2;
+};
+
/**
* crash_setup_regs() - save registers for the panic kernel
* @newregs: registers are saved here