From: Linus Torvalds Date: Fri, 23 Jun 2006 14:52:36 +0000 (-0700) Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux... X-Git-Tag: v2.6.18-rc1~1081^2~19 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=37224470c8c6d90a4062e76a08d4dc1fcf91fc89;p=linux-2.6-omap-h63xx.git Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (65 commits) ACPI: suppress power button event on S3 resume ACPI: resolve merge conflict between sem2mutex and processor_perflib.c ACPI: use for_each_possible_cpu() instead of for_each_cpu() ACPI: delete newly added debugging macros in processor_perflib.c ACPI: UP build fix for bugzilla-5737 Enable P-state software coordination via _PDC P-state software coordination for speedstep-centrino P-state software coordination for acpi-cpufreq P-state software coordination for ACPI core ACPI: create acpi_thermal_resume() ACPI: create acpi_fan_suspend()/acpi_fan_resume() ACPI: pass pm_message_t from acpi_device_suspend() to root_suspend() ACPI: create acpi_device_suspend()/acpi_device_resume() ACPI: replace spin_lock_irq with mutex for ec poll mode ACPI: Allow a WAN module enable/disable on a Thinkpad X60. sem2mutex: acpi, acpi_link_lock ACPI: delete unused acpi_bus_drivers_lock sem2mutex: drivers/acpi/processor_perflib.c ACPI add ia64 exports to build acpi_memhotplug as a module ACPI: asus_acpi_init(): propagate correct return value ... Manual resolve of conflicts in: arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c include/acpi/processor.h --- 37224470c8c6d90a4062e76a08d4dc1fcf91fc89 diff --cc arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c index 1a7bdcef192,11da3ca237e..05668e3598c --- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c +++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c @@@ -195,21 -174,14 +174,13 @@@ acpi_processor_set_performance udelay(10); } } else { - value = (u32) data->acpi_data.states[state].status; - i = 0; + value = (u32) perf->states[state].status; } - /* notify cpufreq */ - cpufreq_notify_transition(&cpufreq_freqs, CPUFREQ_POSTCHANGE); - - if (unlikely(value != (u32) data->acpi_data.states[state].status)) { - unsigned int tmp = cpufreq_freqs.new; - cpufreq_freqs.new = cpufreq_freqs.old; - cpufreq_freqs.old = tmp; - cpufreq_notify_transition(&cpufreq_freqs, CPUFREQ_PRECHANGE); - cpufreq_notify_transition(&cpufreq_freqs, CPUFREQ_POSTCHANGE); + if (unlikely(value != (u32) perf->states[state].status)) { printk(KERN_WARNING "acpi-cpufreq: Transition failed\n"); retval = -ENODEV; - goto migrate_end; + return (retval); } dprintk("Transition successful after %d microseconds\n", i * 10); diff --cc arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c index f1a82c5de1b,4535ca0fe0c..31c3a5baaa7 --- a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c +++ b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c @@@ -361,15 -394,20 +390,20 @@@ static int centrino_cpu_init_acpi(struc unsigned long cur_freq; int result = 0, i; unsigned int cpu = policy->cpu; + struct acpi_processor_performance *p; + + p = acpi_perf_data[cpu]; /* register with ACPI core */ - if (acpi_processor_register_performance(&p, cpu)) { - dprintk("obtaining ACPI data failed\n"); + if (acpi_processor_register_performance(p, cpu)) { - dprintk(KERN_INFO PFX "obtaining ACPI data failed\n"); ++ dprintk(PFX "obtaining ACPI data failed\n"); return -EIO; } + policy->cpus = p->shared_cpu_map; + policy->shared_type = p->shared_type; /* verify the acpi_data */ - if (p.state_count <= 1) { + if (p->state_count <= 1) { dprintk("No P-States\n"); result = -ENODEV; goto err_unreg; @@@ -460,8 -498,8 +494,8 @@@ err_kfree: kfree(centrino_model[cpu]); err_unreg: - acpi_processor_unregister_performance(&p, cpu); - dprintk("invalid ACPI data\n"); + acpi_processor_unregister_performance(p, cpu); - dprintk(KERN_INFO PFX "invalid ACPI data\n"); ++ dprintk(PFX "invalid ACPI data\n"); return (result); } #else diff --cc include/acpi/platform/aclinux.h index 3c6a6205853,b5655a665ba..277d35bced0 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h @@@ -49,8 -49,10 +49,9 @@@ #ifdef __KERNEL__ -#include #include #include + #include #include #include #include diff --cc include/acpi/processor.h index ef7d83a4147,0c46d1b3dda..77371b3cdc4 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@@ -2,6 -2,8 +2,7 @@@ #define __ACPI_PROCESSOR_H #include -#include + #include #include