OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
04d476b
)
powerpc/process: Replace an #ifdef CONFIG_PPC_BOOK3S_64 by IS_ENABLED()
author
Christophe Leroy
<christophe.leroy@csgroup.eu>
Mon, 17 Aug 2020 05:46:42 +0000
(
05:46
+0000)
committer
Michael Ellerman
<mpe@ellerman.id.au>
Tue, 15 Sep 2020 12:13:34 +0000
(22:13 +1000)
This #ifdef CONFIG_PPC_BOOK3S_64 calls preload_new_slb_context()
when radix is not enabled.
radix_enabled() is always defined, and the prototype for
preload_new_slb_context() is always present, so the #ifdef
is unneeded.
Replace it by IS_ENABLED().
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link:
https://lore.kernel.org/r/d31506ca9bac9def68cf7424eded63fdc4fb6660.1597643167.git.christophe.leroy@csgroup.eu
arch/powerpc/kernel/process.c
patch
|
blob
|
history
diff --git
a/arch/powerpc/kernel/process.c
b/arch/powerpc/kernel/process.c
index
59dde9a
..
47c4012
100644
(file)
--- a/
arch/powerpc/kernel/process.c
+++ b/
arch/powerpc/kernel/process.c
@@
-1780,11
+1780,9
@@
void start_thread(struct pt_regs *regs, unsigned long start, unsigned long sp)
#ifdef CONFIG_PPC64
unsigned long load_addr = regs->gpr[2]; /* saved by ELF_PLAT_INIT */
-#ifdef CONFIG_PPC_BOOK3S_64
- if (!radix_enabled())
+ if (IS_ENABLED(CONFIG_PPC_BOOK3S_64) && !radix_enabled())
preload_new_slb_context(start, sp);
#endif
-#endif
/*
* If we exec out of a kernel thread then thread.regs will not be