diff options
| author |   Christophe Leroy <christophe.leroy@c-s.fr> | 2019-03-22 08:08:43 +0000 |
|---|---|---|
| committer |   Michael Ellerman <mpe@ellerman.id.au> | 2019-05-03 01:58:11 +1000 |
| commit | b5064efee2211f83b98a6a69e7319257c8411221 (patch) | |
| tree | e7831bf2e9dc8990eeaf7474446f4f8284017c1b /arch/powerpc/kernel/setup-common.c | |
| parent | powerpc/setup: Remove unnecessary #ifdef CONFIG_ALTIVEC (diff) | |
| download | wireguard-linux-b5064efee2211f83b98a6a69e7319257c8411221.tar.xz wireguard-linux-b5064efee2211f83b98a6a69e7319257c8411221.zip | |
powerpc/setup: cleanup ifdef mess in check_cache_coherency()
Use IS_ENABLED() instead of #ifdefs
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to '')
| -rw-r--r-- | arch/powerpc/kernel/setup-common.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 3cb3774f380a..6d3ebc40d21c 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -737,23 +737,19 @@ void __init setup_panic(void) * BUG() in that case. */ -#ifdef CONFIG_NOT_COHERENT_CACHE -#define KERNEL_COHERENCY 0 -#else -#define KERNEL_COHERENCY 1 -#endif +#define KERNEL_COHERENCY (!IS_ENABLED(CONFIG_NOT_COHERENT_CACHE)) static int __init check_cache_coherency(void) { struct device_node *np; const void *prop; - int devtree_coherency; + bool devtree_coherency; np = of_find_node_by_path("/"); prop = of_get_property(np, "coherency-off", NULL); of_node_put(np); - devtree_coherency = prop ? 0 : 1; + devtree_coherency = prop ? false : true; if (devtree_coherency != KERNEL_COHERENCY) { printk(KERN_ERR |