RISC-V: Rename im_okay_therefore_i_am to found_boot_cpu

palmer-dabbelt · palmer-dabbelt · commit 177fae451588 · 2018-10-22T17:03:36.000-07:00
The old name was a bit odd.

Signed-off-by: Palmer Dabbelt &lt;palmer@sifive.com&gt;
Signed-off-by: Atish Patra &lt;atish.patra@wdc.com&gt;
Reviewed-by: Christoph Hellwig &lt;hch@lst.de&gt;
Signed-off-by: Palmer Dabbelt &lt;palmer@sifive.com&gt;
diff --git a/arch/riscv/kernel/smpboot.c b/arch/riscv/kernel/smpboot.c
@@ -50,21 +50,22 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 void __init setup_smp(void)
 {
 	struct device_node *dn = NULL;
-	int hart, im_okay_therefore_i_am = 0;
+	int hart;
+	bool found_boot_cpu = false;
 
 	while ((dn = of_find_node_by_type(dn, "cpu"))) {
 		hart = riscv_of_processor_hartid(dn);
 		if (hart >= 0) {
 			set_cpu_possible(hart, true);
 			set_cpu_present(hart, true);
 			if (hart == smp_processor_id()) {
-				BUG_ON(im_okay_therefore_i_am);
-				im_okay_therefore_i_am = 1;
+				BUG_ON(found_boot_cpu);
+				found_boot_cpu = true;
 			}
 		}
 	}
 
-	BUG_ON(!im_okay_therefore_i_am);
+	BUG_ON(!found_boot_cpu);
 }
 
 int __cpu_up(unsigned int cpu, struct task_struct *tidle)

Original file line number	Diff line number	Diff line change
`@@ -50,21 +50,22 @@ void __init smp_prepare_cpus(unsigned int max_cpus)`
`50`	`50`	`void __init setup_smp(void)`
`51`	`51`	`{`
`52`	`52`	`struct device_node *dn = NULL;`
`53`		`- int hart, im_okay_therefore_i_am = 0;`
	`53`	`+ int hart;`
	`54`	`+ bool found_boot_cpu = false;`
`54`	`55`
`55`	`56`	`while ((dn = of_find_node_by_type(dn, "cpu"))) {`
`56`	`57`	`hart = riscv_of_processor_hartid(dn);`
`57`	`58`	`if (hart >= 0) {`
`58`	`59`	`set_cpu_possible(hart, true);`
`59`	`60`	`set_cpu_present(hart, true);`
`60`	`61`	`if (hart == smp_processor_id()) {`
`61`		`- BUG_ON(im_okay_therefore_i_am);`
`62`		`- im_okay_therefore_i_am = 1;`
	`62`	`+ BUG_ON(found_boot_cpu);`
	`63`	`+ found_boot_cpu = true;`
`63`	`64`	`}`
`64`	`65`	`}`
`65`	`66`	`}`
`66`	`67`
`67`		`- BUG_ON(!im_okay_therefore_i_am);`
	`68`	`+ BUG_ON(!found_boot_cpu);`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`int __cpu_up(unsigned int cpu, struct task_struct *tidle)`