x86/cpu change for v3.7

GIT PULL Ingo Molnar 1 participant 1 message Oct 1, 2012 x86

lore

Share & tools

lore

Ingo Molnar

author

2012-10-01 13:41 UTC #0 lore raw

Linus,

Please pull the latest x86-cpu-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-cpu-for-linus

HEAD: dec08a837fda146fee498ffc5ecd0d2eeeacd025 x86: Remove the useless branch in c_start()

One small cleanup.

Thanks,

Ingo

------------------>
Michael Wang (1):
x86: Remove the useless branch in c_start()

 arch/x86/kernel/cpu/proc.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

arch/x86/kernel/cpu/proc.c +1 -4

index 8022c66..fbd8955 100644
@@ -140,10 +140,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 
 static void *c_start(struct seq_file *m, loff_t *pos)
 {
-	if (*pos == 0)	/* just in case, cpu 0 is not the first */
-		*pos = cpumask_first(cpu_online_mask);
-	else
-		*pos = cpumask_next(*pos - 1, cpu_online_mask);
+	*pos = cpumask_next(*pos - 1, cpu_online_mask);
 	if ((*pos) < nr_cpu_ids)
 		return &cpu_data(*pos);
 	return NULL;