parisc: fix compilation when KEXEC=n and KEXEC_FILE=y

PATCH New Sven Schnelle 1 participant 1 message Dec 15, 2019 PA-RISC architecture

lore

Share & tools

lore

Sven Schnelle

author

2019-12-15 19:58 UTC #0 lore raw

PATCH 1/1 parisc: fix compilation when KEXEC=n and KEXEC_FILE=y

Fix compilation when the CONFIG_KEXEC_FILE=y and
CONFIG_KEXEC=n.

Reported-by kbuild test robot <[email protected]>

Signed-off-by Sven Schnelle <[email protected]>

---
 arch/parisc/include/asm/kexec.h | 4 ----
 arch/parisc/kernel/Makefile     | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

arch/parisc/include/asm/kexec.h +0 -4

index a99ea747d7ed..87e174006995 100644
@@ -2,8 +2,6 @@
 #ifndef _ASM_PARISC_KEXEC_H
 #define _ASM_PARISC_KEXEC_H
 
-#ifdef CONFIG_KEXEC
-
 /* Maximum physical address we can use pages from */
 #define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)
 /* Maximum address we can reach in physical address mode */

@@ -32,6 +30,4 @@ static inline void crash_setup_regs(struct pt_regs *newregs,
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* CONFIG_KEXEC */
-
 #endif /* _ASM_PARISC_KEXEC_H */

arch/parisc/kernel/Makefile +1 -1

index 2663c8f8be11..068d90950d93 100644
@@ -37,5 +37,5 @@ obj-$(CONFIG_FUNCTION_GRAPH_TRACER)	+= ftrace.o
 obj-$(CONFIG_JUMP_LABEL)		+= jump_label.o
 obj-$(CONFIG_KGDB)			+= kgdb.o
 obj-$(CONFIG_KPROBES)			+= kprobes.o
-obj-$(CONFIG_KEXEC)			+= kexec.o relocate_kernel.o
+obj-$(CONFIG_KEXEC_CORE)		+= kexec.o relocate_kernel.o
 obj-$(CONFIG_KEXEC_FILE)		+= kexec_file.o

Signature · 1 line

2.24.0