Skip to content

Commit e16260c

Browse files
Sven Schnellehdeller
authored andcommitted
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]> Signed-off-by: Helge Deller <[email protected]>
1 parent e42617b commit e16260c

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

arch/parisc/include/asm/kexec.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
#ifndef _ASM_PARISC_KEXEC_H
33
#define _ASM_PARISC_KEXEC_H
44

5-
#ifdef CONFIG_KEXEC
6-
75
/* Maximum physical address we can use pages from */
86
#define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)
97
/* Maximum address we can reach in physical address mode */
@@ -32,6 +30,4 @@ static inline void crash_setup_regs(struct pt_regs *newregs,
3230

3331
#endif /* __ASSEMBLY__ */
3432

35-
#endif /* CONFIG_KEXEC */
36-
3733
#endif /* _ASM_PARISC_KEXEC_H */

arch/parisc/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o
3737
obj-$(CONFIG_JUMP_LABEL) += jump_label.o
3838
obj-$(CONFIG_KGDB) += kgdb.o
3939
obj-$(CONFIG_KPROBES) += kprobes.o
40-
obj-$(CONFIG_KEXEC) += kexec.o relocate_kernel.o
40+
obj-$(CONFIG_KEXEC_CORE) += kexec.o relocate_kernel.o
4141
obj-$(CONFIG_KEXEC_FILE) += kexec_file.o

0 commit comments

Comments
 (0)