projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v5.7-rc7' into perf/core, to pick up fixes
[linux-2.6-microblaze.git]
/
arch
/
x86
/
mm
/
mmio-mod.c
diff --git
a/arch/x86/mm/mmio-mod.c
b/arch/x86/mm/mmio-mod.c
index
109325d
..
43fd19b
100644
(file)
--- a/
arch/x86/mm/mmio-mod.c
+++ b/
arch/x86/mm/mmio-mod.c
@@
-372,7
+372,7
@@
static void enter_uniprocessor(void)
int cpu;
int err;
int cpu;
int err;
- if (
downed_cpus == NULL
&&
+ if (
!cpumask_available(downed_cpus)
&&
!alloc_cpumask_var(&downed_cpus, GFP_KERNEL)) {
pr_notice("Failed to allocate mask\n");
goto out;
!alloc_cpumask_var(&downed_cpus, GFP_KERNEL)) {
pr_notice("Failed to allocate mask\n");
goto out;
@@
-402,7
+402,7
@@
static void leave_uniprocessor(void)
int cpu;
int err;
int cpu;
int err;
- if (
downed_cpus == NULL
|| cpumask_weight(downed_cpus) == 0)
+ if (
!cpumask_available(downed_cpus)
|| cpumask_weight(downed_cpus) == 0)
return;
pr_notice("Re-enabling CPUs...\n");
for_each_cpu(cpu, downed_cpus) {
return;
pr_notice("Re-enabling CPUs...\n");
for_each_cpu(cpu, downed_cpus) {