Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
Linus Torvalds [Fri, 23 Jun 2006 14:52:36 +0000 (07:52 -0700)]
* '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

14 files changed:
1  2 
Documentation/kernel-parameters.txt
arch/i386/kernel/acpi/boot.c
arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
arch/ia64/Kconfig
arch/ia64/hp/common/sba_iommu.c
arch/ia64/kernel/acpi.c
arch/x86_64/Kconfig
drivers/acpi/Kconfig
drivers/acpi/pci_link.c
drivers/acpi/processor_core.c
include/acpi/platform/aclinux.h
include/acpi/processor.h
include/linux/cpufreq.h

Simple merge
Simple merge
@@@ -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);
@@@ -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;
   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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
  
  #ifdef __KERNEL__
  
 -#include <linux/config.h>
  #include <linux/string.h>
  #include <linux/kernel.h>
+ #include <linux/module.h>
  #include <linux/ctype.h>
  #include <asm/system.h>
  #include <asm/atomic.h>
@@@ -2,6 -2,8 +2,7 @@@
  #define __ACPI_PROCESSOR_H
  
  #include <linux/kernel.h>
 -#include <linux/config.h>
+ #include <linux/cpu.h>
  
  #include <asm/acpi.h>
  
Simple merge