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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Sven Schnelle <svens@stackframe.org>
Signed-off-by: Helge Deller <deller@gmx.de>

authored by

Sven Schnelle and committed by

Helge Deller 6 years ago e16260c2 e42617b8

+1 -5

2 changed files

expand all

arch

parisc

include

asm

kexec.h

kernel

Makefile

-4

arch/parisc/include/asm/kexec.h

··· 2 2 #ifndef _ASM_PARISC_KEXEC_H 3 3 #define _ASM_PARISC_KEXEC_H 4 4 5 - #ifdef CONFIG_KEXEC 6 - 7 5 /* Maximum physical address we can use pages from */ 8 6 #define KEXEC_SOURCE_MEMORY_LIMIT (-1UL) 9 7 /* Maximum address we can reach in physical address mode */ ··· 29 31 } 30 32 31 33 #endif /* __ASSEMBLY__ */ 32 - 33 - #endif /* CONFIG_KEXEC */ 34 34 35 35 #endif /* _ASM_PARISC_KEXEC_H */

+1 -1

arch/parisc/kernel/Makefile

··· 37 37 obj-$(CONFIG_JUMP_LABEL) += jump_label.o 38 38 obj-$(CONFIG_KGDB) += kgdb.o 39 39 obj-$(CONFIG_KPROBES) += kprobes.o 40 - obj-$(CONFIG_KEXEC) += kexec.o relocate_kernel.o 40 + obj-$(CONFIG_KEXEC_CORE) += kexec.o relocate_kernel.o 41 41 obj-$(CONFIG_KEXEC_FILE) += kexec_file.o