diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-07-12 04:05:30 (GMT) |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-07-12 04:05:30 (GMT) |
| commit | e3ab478de140512b21b8b081fb20874478b9599d (patch) | |
| tree | 97267fbae2d7a4bf7493246b2b81020e8675fc55 /arch/arm64/kernel | |
| parent | 78278fb152735c686cb13e1ae3bcee78fc2cd154 (diff) | |
| parent | 9f86f302ec0e37e84617481c587e11c47a397e3f (diff) | |
| download | linux-e3ab478de140512b21b8b081fb20874478b9599d.tar.xz | |
Merge tag 'v4.9.36' into linux-linaro-lsk-v4.9
This is the 4.9.36 stable release
Diffstat (limited to 'arch/arm64/kernel')
| -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 11f2890..d1e6b51 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -1010,7 +1010,7 @@ static bool have_cpu_die(void) #ifdef CONFIG_HOTPLUG_CPU int any_cpu = raw_smp_processor_id(); - if (cpu_ops[any_cpu]->cpu_die) + if (cpu_ops[any_cpu] && cpu_ops[any_cpu]->cpu_die) return true; #endif return false; |