Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

torvalds · torvalds · commit 4f23460cfa86 · 2020-05-29T13:51:52.000-07:00
Pull arm64 fix from Catalin Marinas:
 "Ensure __cpu_up() returns an error if cpu_online() is false after
  waiting for completion on cpu_running"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64/kernel: Fix return value when cpu_online() fails in __cpu_up()
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
@@ -176,7 +176,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle)
 		panic("CPU%u detected unsupported configuration\n", cpu);
 	}
 
-	return ret;
+	return -EIO;
 }
 
 static void init_gic_priority_masking(void)

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle)`
`176`	`176`	`panic("CPU%u detected unsupported configuration\n", cpu);`
`177`	`177`	`}`
`178`	`178`
`179`		`- return ret;`
	`179`	`+ return -EIO;`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`static void init_gic_priority_masking(void)`