diff options
author | Thomas Renninger <trenn@suse.de> | 2006-06-27 00:06:37 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-06-27 00:06:37 -0400 |
commit | d7fa2589bbe7ab53fd5eb20e8c7e388d5aff6f16 (patch) | |
tree | e3481b52e4d950ffa4580680b11d9815d5c7e60b /drivers | |
parent | 6468463abd7051fcc29f3ee7c931f9bbbb26f5a4 (diff) | |
parent | 46f18e3a28295a9e11a6ffa4478241c19bc93735 (diff) |
Pull bugzilla-5737 into release branch
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/processor_perflib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c index 8bd7500c6121..5c24ac45717c 100644 --- a/drivers/acpi/processor_perflib.c +++ b/drivers/acpi/processor_perflib.c | |||
@@ -691,12 +691,12 @@ int acpi_processor_preregister_performance( | |||
691 | /* Validate the Domain info */ | 691 | /* Validate the Domain info */ |
692 | count_target = pdomain->num_processors; | 692 | count_target = pdomain->num_processors; |
693 | count = 1; | 693 | count = 1; |
694 | if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ALL || | 694 | if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ALL) |
695 | pdomain->coord_type == DOMAIN_COORD_TYPE_HW_ALL) { | ||
696 | pr->performance->shared_type = CPUFREQ_SHARED_TYPE_ALL; | 695 | pr->performance->shared_type = CPUFREQ_SHARED_TYPE_ALL; |
697 | } else if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ANY) { | 696 | else if (pdomain->coord_type == DOMAIN_COORD_TYPE_HW_ALL) |
697 | pr->performance->shared_type = CPUFREQ_SHARED_TYPE_HW; | ||
698 | else if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ANY) | ||
698 | pr->performance->shared_type = CPUFREQ_SHARED_TYPE_ANY; | 699 | pr->performance->shared_type = CPUFREQ_SHARED_TYPE_ANY; |
699 | } | ||
700 | 700 | ||
701 | for_each_possible_cpu(j) { | 701 | for_each_possible_cpu(j) { |
702 | if (i == j) | 702 | if (i == j) |