diff options
Diffstat (limited to 'include/linux/cpumask.h')
-rw-r--r-- | include/linux/cpumask.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h index 30d59d1d0626..1b5c98e7fef7 100644 --- a/include/linux/cpumask.h +++ b/include/linux/cpumask.h | |||
@@ -458,13 +458,14 @@ int __next_cpu_nr(int n, const cpumask_t *srcp); | |||
458 | 458 | ||
459 | /* | 459 | /* |
460 | * The following particular system cpumasks and operations manage | 460 | * The following particular system cpumasks and operations manage |
461 | * possible, present and online cpus. Each of them is a fixed size | 461 | * possible, present, active and online cpus. Each of them is a fixed size |
462 | * bitmap of size NR_CPUS. | 462 | * bitmap of size NR_CPUS. |
463 | * | 463 | * |
464 | * #ifdef CONFIG_HOTPLUG_CPU | 464 | * #ifdef CONFIG_HOTPLUG_CPU |
465 | * cpu_possible_map - has bit 'cpu' set iff cpu is populatable | 465 | * cpu_possible_map - has bit 'cpu' set iff cpu is populatable |
466 | * cpu_present_map - has bit 'cpu' set iff cpu is populated | 466 | * cpu_present_map - has bit 'cpu' set iff cpu is populated |
467 | * cpu_online_map - has bit 'cpu' set iff cpu available to scheduler | 467 | * cpu_online_map - has bit 'cpu' set iff cpu available to scheduler |
468 | * cpu_active_map - has bit 'cpu' set iff cpu available to migration | ||
468 | * #else | 469 | * #else |
469 | * cpu_possible_map - has bit 'cpu' set iff cpu is populated | 470 | * cpu_possible_map - has bit 'cpu' set iff cpu is populated |
470 | * cpu_present_map - copy of cpu_possible_map | 471 | * cpu_present_map - copy of cpu_possible_map |
@@ -515,6 +516,7 @@ int __next_cpu_nr(int n, const cpumask_t *srcp); | |||
515 | extern cpumask_t cpu_possible_map; | 516 | extern cpumask_t cpu_possible_map; |
516 | extern cpumask_t cpu_online_map; | 517 | extern cpumask_t cpu_online_map; |
517 | extern cpumask_t cpu_present_map; | 518 | extern cpumask_t cpu_present_map; |
519 | extern cpumask_t cpu_active_map; | ||
518 | 520 | ||
519 | #if NR_CPUS > 1 | 521 | #if NR_CPUS > 1 |
520 | #define num_online_cpus() cpus_weight_nr(cpu_online_map) | 522 | #define num_online_cpus() cpus_weight_nr(cpu_online_map) |
@@ -523,6 +525,7 @@ extern cpumask_t cpu_present_map; | |||
523 | #define cpu_online(cpu) cpu_isset((cpu), cpu_online_map) | 525 | #define cpu_online(cpu) cpu_isset((cpu), cpu_online_map) |
524 | #define cpu_possible(cpu) cpu_isset((cpu), cpu_possible_map) | 526 | #define cpu_possible(cpu) cpu_isset((cpu), cpu_possible_map) |
525 | #define cpu_present(cpu) cpu_isset((cpu), cpu_present_map) | 527 | #define cpu_present(cpu) cpu_isset((cpu), cpu_present_map) |
528 | #define cpu_active(cpu) cpu_isset((cpu), cpu_active_map) | ||
526 | #else | 529 | #else |
527 | #define num_online_cpus() 1 | 530 | #define num_online_cpus() 1 |
528 | #define num_possible_cpus() 1 | 531 | #define num_possible_cpus() 1 |
@@ -530,6 +533,7 @@ extern cpumask_t cpu_present_map; | |||
530 | #define cpu_online(cpu) ((cpu) == 0) | 533 | #define cpu_online(cpu) ((cpu) == 0) |
531 | #define cpu_possible(cpu) ((cpu) == 0) | 534 | #define cpu_possible(cpu) ((cpu) == 0) |
532 | #define cpu_present(cpu) ((cpu) == 0) | 535 | #define cpu_present(cpu) ((cpu) == 0) |
536 | #define cpu_active(cpu) ((cpu) == 0) | ||
533 | #endif | 537 | #endif |
534 | 538 | ||
535 | #define cpu_is_offline(cpu) unlikely(!cpu_online(cpu)) | 539 | #define cpu_is_offline(cpu) unlikely(!cpu_online(cpu)) |