git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
process.c
diff --git
a/arch/alpha/kernel/process.c
b/arch/alpha/kernel/process.c
index
3ec3506
..
838eac1
100644
(file)
--- a/
arch/alpha/kernel/process.c
+++ b/
arch/alpha/kernel/process.c
@@
-121,7
+121,7
@@
common_shutdown_1(void *generic_ptr)
/* Wait for the secondaries to halt. */
set_cpu_present(boot_cpuid, false);
set_cpu_possible(boot_cpuid, false);
- while (cpu
s_weight(cpu_present_map
))
+ while (cpu
mask_weight(cpu_present_mask
))
barrier();
#endif