[ACPI] merge 3549 4320 4485 4588 4980 5483 5651 acpica asus fops pnpacpi branches...

Signed-off-by: Len Brown <len.brown@intel.com>

diff --cc Documentation/kernel-parameters.txt
index 1cbcf65b764b47137b0db013654e55f224c3c32c,a482fde09bbbe01756627bffb4ce3cd98ebbeed5,5dffcfefc3c715698eca24b519df8eab6d8a799d,5dffcfefc3c715698eca24b519df8eab6d8a799d,5dffcfefc3c715698eca24b519df8eab6d8a799d,2ad64efdf1833a2f28368d7fc016ee037f743c37,5dffcfefc3c715698eca24b519df8eab6d8a799d,5dffcfefc3c715698eca24b519df8eab6d8a799d,a482fde09bbbe01756627bffb4ce3cd98ebbeed5,5dffcfefc3c715698eca24b519df8eab6d8a799d,a482fde09bbbe01756627bffb4ce3cd98ebbeed5,a482fde09bbbe01756627bffb4ce3cd98ebbeed5..84370363da809a67733cd346e429af2e56bef91c
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
--- 3/Documentation/kernel-parameters.txt
--- 4/Documentation/kernel-parameters.txt
--- 5/Documentation/kernel-parameters.txt
--- 6/Documentation/kernel-parameters.txt
--- 7/Documentation/kernel-parameters.txt
--- 8/Documentation/kernel-parameters.txt
--- 9/Documentation/kernel-parameters.txt
--- 10/Documentation/kernel-parameters.txt
--- 11/Documentation/kernel-parameters.txt
--- 12/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@@@@@@@@@@@ -712,17 -711,9 -703,9 -703,9 -703,9 -708,9 -703,9 -703,9 -711,9 -703,9 -711,9 -711,9 +717,17 @@@@@@@@@@@@@ running once the system is up
                load_ramdisk=   [RAM] List of ramdisks to load from floppy
                                See Documentation/ramdisk.txt.
            
 -----------    lockd.udpport=  [NFS]
 +++++++++++    lockd.nlm_grace_period=P  [NFS] Assign grace period.
 +++++++++++                    Format: <integer>
 +++++++++++
 +++++++++++    lockd.nlm_tcpport=N     [NFS] Assign TCP port.
 +++++++++++                    Format: <integer>
 ++++ ++++++
     -          lockd.tcpport=  [NFS]
 +++++++++++    lockd.nlm_timeout=T     [NFS] Assign timeout value.
 +++++++++++                    Format: <integer>
     +      
 ---- ------    lockd.tcpport=  [NFS]
 +++++++++++    lockd.nlm_udpport=M     [NFS] Assign UDP port.
 +++++++++++                    Format: <integer>
            
                logibm.irq=     [HW,MOUSE] Logitech Bus Mouse Driver
                                Format: <irq>

diff --cc arch/i386/kernel/acpi/boot.c
Simple merge

diff --cc arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
index 7975e79d5fa4e6e607117bc7b5b2fbd7e0e37389,871366b83b3f40cbc38ee91ec099e6cf3e5e15d0,871366b83b3f40cbc38ee91ec099e6cf3e5e15d0,871366b83b3f40cbc38ee91ec099e6cf3e5e15d0,871366b83b3f40cbc38ee91ec099e6cf3e5e15d0,871366b83b3f40cbc38ee91ec099e6cf3e5e15d0,8a5e159d81855f6326c900bc5ad29148de9318b6,871366b83b3f40cbc38ee91ec099e6cf3e5e15d0,871366b83b3f40cbc38ee91ec099e6cf3e5e15d0,871366b83b3f40cbc38ee91ec099e6cf3e5e15d0,871366b83b3f40cbc38ee91ec099e6cf3e5e15d0,871366b83b3f40cbc38ee91ec099e6cf3e5e15d0..3852d0a4c1b5e2f35dc168399d12b97882ca8938
--- 1/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
--- 2/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
--- 3/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
--- 4/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
--- 5/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
--- 6/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
--- 7/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
--- 8/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
--- 9/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
--- 10/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
--- 11/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
--- 12/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@@@@@@@@@@@@ -365,16 -367,15 -367,15 -367,15 -367,15 -367,15 -305,8 -367,15 -367,15 -367,15 -367,15 -367,15 +303,9 @@@@@@@@@@@@@ acpi_cpufreq_cpu_init 
                unsigned int            cpu = policy->cpu;
                struct cpufreq_acpi_io  *data;
                unsigned int            result = 0;
 ----- -----
 ----- -----    union acpi_object               arg0 = {ACPI_TYPE_BUFFER};
 ----- -----    u32                             arg0_buf[3];
 ----- -----    struct acpi_object_list         arg_list = {1, &arg0};
 +++++++++++    struct cpuinfo_x86 *c = &cpu_data[policy->cpu];
            
-               union acpi_object               arg0 = {ACPI_TYPE_BUFFER};
-               u32                             arg0_buf[3];
-               struct acpi_object_list         arg_list = {1, &arg0};
-           
                dprintk("acpi_cpufreq_cpu_init\n");
------ -----    /* setup arg_list for _PDC settings */
------ -----        arg0.buffer.length = 12;
------ -----        arg0.buffer.pointer = (u8 *) arg0_buf;
            
                data = kzalloc(sizeof(struct cpufreq_acpi_io), GFP_KERNEL);
                if (!data)

diff --cc arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
Simple merge

diff --cc arch/ia64/pci/pci.c
Simple merge

diff --cc arch/x86_64/kernel/io_apic.c
Simple merge

diff --cc drivers/acpi/Kconfig
Simple merge

diff --cc drivers/acpi/ec.c
Simple merge

diff --cc drivers/acpi/osl.c
Simple merge

diff --cc drivers/acpi/pci_irq.c
Simple merge

diff --cc drivers/acpi/processor_core.c
Simple merge

diff --cc drivers/acpi/processor_idle.c
index cc049338e418b5b968888faafd22a85492752bab,552420e1f890182ff7a04d66c7bd8a37e0144b72,5f51057518b04abd45d10d465ee8c5e95abb4254,40c9f9ca5965c789096eedbde292e7f55af73739,807b0df308f18d6a31fccb0a806cd7c03195c9f7,70d8a6ec0920f1589525395a1550360a26cbd54f,1915c377bfc6be87529ccf74542b213150451ae1,70d8a6ec0920f1589525395a1550360a26cbd54f,807b0df308f18d6a31fccb0a806cd7c03195c9f7,807b0df308f18d6a31fccb0a806cd7c03195c9f7,807b0df308f18d6a31fccb0a806cd7c03195c9f7,807b0df308f18d6a31fccb0a806cd7c03195c9f7..be2dae52f6fa47a6b74dbca63c47a553236cfd27
--- 1/drivers/acpi/processor_idle.c
--- 2/drivers/acpi/processor_idle.c
--- 3/drivers/acpi/processor_idle.c
--- 4/drivers/acpi/processor_idle.c
--- 5/drivers/acpi/processor_idle.c
--- 6/drivers/acpi/processor_idle.c
--- 7/drivers/acpi/processor_idle.c
--- 8/drivers/acpi/processor_idle.c
--- 9/drivers/acpi/processor_idle.c
--- 10/drivers/acpi/processor_idle.c
--- 11/drivers/acpi/processor_idle.c
--- 12/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@@@@@@@@@@@@ -274,19 -309,19 -274,18 -278,18 -274,19 -278,8 -278,8 -278,8 -274,19 -274,19 -274,19 -274,19 +309,19 @@@@@@@@@@@@@ static void acpi_processor_idle(void
                        }
                }
            
  --            cx->usage++;
  --        
     +++    #ifdef CONFIG_HOTPLUG_CPU
     +++        /*
     +++         * Check for P_LVL2_UP flag before entering C2 and above on
     +++         * an SMP system. We do it here instead of doing it at _CST/P_LVL
     +++         * detection phase, to work cleanly with logical CPU hotplug.
     +++         */
     +++        if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) && 
  --                !pr->flags.has_cst && acpi_fadt.plvl2_up)
  --                    cx->type = ACPI_STATE_C1;
  ++ +++            !pr->flags.has_cst && !acpi_fadt.plvl2_up)
  ++ +++                cx = &pr->power.states[ACPI_STATE_C1];
     +++    #endif
  ++ +++    
  ++            cx->usage++;
  ++        
                /*
                 * Sleep:
                 * ------
@@@@@@@@@@@@@ -556,20 -591,20 -546,20 -536,14 -556,20 -528,11 -528,11 -528,11 -556,20 -556,20 -556,20 -556,20 +589,14 @@@@@@@@@@@@@ static int acpi_processor_get_power_inf
                pr->power.states[ACPI_STATE_C2].type = ACPI_STATE_C2;
                pr->power.states[ACPI_STATE_C3].type = ACPI_STATE_C3;
            
--- --------    /* the C0 state only exists as a filler in our array,
--- --------     * and all processors need to support C1 */
--- --------    pr->power.states[ACPI_STATE_C0].valid = 1;
--- --------    pr->power.states[ACPI_STATE_C1].valid = 1;
--- -   ----
     +++    #ifndef CONFIG_HOTPLUG_CPU
     +++        /*
     +++         * Check for P_LVL2_UP flag before entering C2 and above on
     +++         * an SMP system. 
     +++         */
  --            if ((num_online_cpus() > 1) && acpi_fadt.plvl2_up)
  ++ +++        if ((num_online_cpus() > 1) && !acpi_fadt.plvl2_up)
     +++                return_VALUE(-ENODEV);
     +++    #endif
            
                /* determine C2 and C3 address from pblk */
                pr->power.states[ACPI_STATE_C2].address = pr->pblk + 4;
@@@@@@@@@@@@@ -723,11 -758,11 -713,11 -702,11 -723,11 -686,11 -686,11 -686,11 -723,11 -723,11 -723,11 -723,11 +755,11 @@@@@@@@@@@@@ static int acpi_processor_get_power_inf
                }
            
                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found %d power states\n",
--- --------                      pr->power.count));
+++ ++++++++                      current_count));
            
                /* Validate number of power states discovered */
--- --------    if (pr->power.count < 2)
     ---                status = -ENODEV;
+++ ++++++++    if (current_count < 2)
     +++                status = -EFAULT;
            
                  end:
                acpi_os_free(buffer.pointer);
@@@@@@@@@@@@@ -892,12 -912,12 -867,12 -856,13 -877,12 -840,12 -840,12 -840,12 -877,12 -877,12 -877,12 -877,12 +924,13 @@@@@@@@@@@@@ static int acpi_processor_get_power_inf
                /* NOTE: the idle thread may not be running while calling
                 * this function */
            
+++ ++++++++    /* Adding C1 state */
+++ ++++++++    acpi_processor_get_power_info_default_c1(pr);
                result = acpi_processor_get_power_info_cst(pr);
     ---        if ((result) || (acpi_processor_power_verify(pr) < 2)) {
     ---                result = acpi_processor_get_power_info_fadt(pr);
     ---                if ((result) || (acpi_processor_power_verify(pr) < 2))
     ---                        result = acpi_processor_get_power_info_default_c1(pr);
     ---        }
     +++        if (result == -ENODEV)
--- -   ----            result = acpi_processor_get_power_info_fadt(pr);
+++ ++++++++            acpi_processor_get_power_info_fadt(pr);
     +++    
--- -   ----    if ((result) || (acpi_processor_power_verify(pr) < 2))
--- -   ----            result = acpi_processor_get_power_info_default_c1(pr);
+++ ++++++++    pr->power.count = acpi_processor_power_verify(pr);
            
                /*
                 * Set Default Policy

diff --cc drivers/acpi/processor_perflib.c
Simple merge

diff --cc drivers/acpi/scan.c
Simple merge

diff --cc include/acpi/processor.h
Simple merge

diff --cc include/linux/kernel.h
Simple merge

diff --cc kernel/power/disk.c
index e24446f8d8cde234357837f7bbf9b740b3a88b34,e24446f8d8cde234357837f7bbf9b740b3a88b34,f2cd279d07c79c8b9ee0988490887e3eb85416a4,027322a564f48ac2c79c08ab9240a5db7b42751f,027322a564f48ac2c79c08ab9240a5db7b42751f,027322a564f48ac2c79c08ab9240a5db7b42751f,027322a564f48ac2c79c08ab9240a5db7b42751f,027322a564f48ac2c79c08ab9240a5db7b42751f,e24446f8d8cde234357837f7bbf9b740b3a88b34,027322a564f48ac2c79c08ab9240a5db7b42751f,e24446f8d8cde234357837f7bbf9b740b3a88b34,e24446f8d8cde234357837f7bbf9b740b3a88b34..e03d85e55291c89632d02d3f6880e584e810ab1e
--- 1/kernel/power/disk.c
--- 2/kernel/power/disk.c
--- 3/kernel/power/disk.c
--- 4/kernel/power/disk.c
--- 5/kernel/power/disk.c
--- 6/kernel/power/disk.c
--- 7/kernel/power/disk.c
--- 8/kernel/power/disk.c
--- 9/kernel/power/disk.c
--- 10/kernel/power/disk.c
--- 11/kernel/power/disk.c
--- 12/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@@@@@@@@@@@@ -95,16 -95,16 -119,9 -119,16 -119,16 -119,16 -119,16 -119,16 -95,16 -119,16 -95,16 -95,16 +95,9 @@@@@@@@@@@@@ static int prepare_processes(void
                        goto thaw;
                }
            
-- ---------    if (pm_disk_mode == PM_DISK_PLATFORM) {
-- ---------            if (pm_ops && pm_ops->prepare) {
-- ---------                    if ((error = pm_ops->prepare(PM_SUSPEND_DISK)))
-- ---------                            goto thaw;
-- ---------            }
-- ---------    }
-- ---------
                /* Free memory before shutting down devices. */
  ------ -      free_some_memory();
  ------ -      return 0;
  ++++++ +      if (!(error = swsusp_shrink_memory()))
  ++++++ +              return 0;
            thaw:
                thaw_processes();
                enable_nonboot_cpus();

diff --cc kernel/sys.c
Simple merge