diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-29 13:51:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-29 13:51:52 -0700 |
| commit | 4f23460cfa867aa560119e18a73616e784d3cd66 (patch) | |
| tree | d06395e994c3c72d2ff686d1f369a8c9507e2b19 | |
| parent | ef4531be685f238594877a8e28e65544d5a022d7 (diff) | |
| parent | ba051f097fc30b00f6b66044386901141351a557 (diff) | |
| download | linux-4f23460cfa867aa560119e18a73616e784d3cd66.tar.bz2 | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
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()
| -rw-r--r-- | arch/arm64/kernel/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 061f60fe452f..bb813d06114a 100644 --- 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) |