Commit 65184f2f authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/setup: replace ifdefs by IS_ENABLED() wherever possible. 



Compared to ifdefs, IS_ENABLED() provide a cleaner code and allows
to detect compilation failure regardless of the selected options.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 48018e42

arch/powerpc/kernel/setup-common.c

+18 −21
Original line number Diff line number Diff line
@@ -199,14 +199,15 @@ static void show_cpuinfo_summary(struct seq_file *m) 
{

	struct device_node *root;

	const char *model = NULL;

#if defined(CONFIG_SMP) && defined(CONFIG_PPC32)

	unsigned long bogosum = 0;

	int i;



	if (IS_ENABLED(CONFIG_SMP) && IS_ENABLED(CONFIG_PPC32)) {

		for_each_online_cpu(i)

			bogosum += loops_per_jiffy;

		seq_printf(m, "total bogomips\t: %lu.%02lu\n",

			   bogosum / (500000 / HZ), bogosum / (5000 / HZ) % 100);

#endif /* CONFIG_SMP && CONFIG_PPC32 */

	}

	seq_printf(m, "timebase\t: %lu\n", ppc_tb_freq);

	if (ppc_md.name)

		seq_printf(m, "platform\t: %s\n", ppc_md.name);
@@ -220,11 +221,10 @@ static void show_cpuinfo_summary(struct seq_file *m) 
	if (ppc_md.show_cpuinfo != NULL)

		ppc_md.show_cpuinfo(m);



#ifdef CONFIG_PPC32

	/* Display the amount of memory */

	if (IS_ENABLED(CONFIG_PPC32))

		seq_printf(m, "Memory\t\t: %d MB\n",

			   (unsigned int)(total_memory / (1024 * 1024)));

#endif

}



static int show_cpuinfo(struct seq_file *m, void *v)
@@ -332,11 +332,10 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
	seq_printf(m, "revision\t: %hd.%hd (pvr %04x %04x)\n",

		   maj, min, PVR_VER(pvr), PVR_REV(pvr));



#ifdef CONFIG_PPC32

	seq_printf(m, "bogomips\t: %lu.%02lu\n",

		   loops_per_jiffy / (500000/HZ),

	if (IS_ENABLED(CONFIG_PPC32))

		seq_printf(m, "bogomips\t: %lu.%02lu\n", loops_per_jiffy / (500000 / HZ),

			   (loops_per_jiffy / (5000 / HZ)) % 100);

#endif



	seq_printf(m, "\n");



	/* If this is the last cpu, print the summary */
@@ -934,9 +933,9 @@ void __init setup_arch(char **cmdline_p) 


	early_memtest(min_low_pfn << PAGE_SHIFT, max_low_pfn << PAGE_SHIFT);



#ifdef CONFIG_DUMMY_CONSOLE

	if (IS_ENABLED(CONFIG_DUMMY_CONSOLE))

		conswitchp = &dummy_con;

#endif



	if (ppc_md.setup_arch)

		ppc_md.setup_arch();
@@ -948,10 +947,8 @@ void __init setup_arch(char **cmdline_p) 
	/* Initialize the MMU context management stuff. */

	mmu_context_init();



#ifdef CONFIG_PPC64

	/* Interrupt code needs to be 64K-aligned. */

	if ((unsigned long)_stext & 0xffff)

	if (IS_ENABLED(CONFIG_PPC64) && (unsigned long)_stext & 0xffff)

		panic("Kernelbase not 64K-aligned (0x%lx)!\n",

		      (unsigned long)_stext);

#endif

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE