Merge tag 'pm+acpi-3.15-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...

Pull more ACPI and power management updates from Rafael Wysocki:
 "These are commits that were not quite ready when I sent the original
  pull request for 3.15-rc1 several days ago, but they have spent some
  time in linux-next since then and appear to be good to go.  All of
  them are fixes and cleanups.

  Specifics:

   - Remaining changes from upstream ACPICA release 20140214 that
     introduce code to automatically serialize the execution of methods
     creating any named objects which really cannot be executed in
     parallel with each other anyway (previously ACPICA attempted to
     address that by aborting methods upon conflict detection, but that
     wasn't reliable enough and led to other issues).  From Bob Moore
     and Lv Zheng.

   - intel_pstate fix to use del_timer_sync() instead of del_timer() in
     the exit path before freeing the timer structure from Dirk
     Brandewie (original patch from Thomas Gleixner).

   - cpufreq fix related to system resume from Viresh Kumar.

   - Serialization of frequency transitions in cpufreq that involve
     PRECHANGE and POSTCHANGE notifications to avoid ordering issues
     resulting from race conditions.  From Srivatsa S Bhat and Viresh
     Kumar.

   - Revert of an ACPI processor driver change that was based on a
     specific interpretation of the ACPI spec which may not be correct
     (the relevant part of the spec appears to be incomplete).  From
     Hanjun Guo.

   - Runtime PM core cleanups and documentation updates from Geert
     Uytterhoeven.

   - PNP core cleanup from Michael Opdenacker"

* tag 'pm+acpi-3.15-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: Make cpufreq_notify_transition & cpufreq_notify_post_transition static
  cpufreq: Convert existing drivers to use cpufreq_freq_transition_{begin|end}
  cpufreq: Make sure frequency transitions are serialized
  intel_pstate: Use del_timer_sync in intel_pstate_cpu_stop
  cpufreq: resume drivers before enabling governors
  PM / Runtime: Spelling s/competing/completing/
  PM / Runtime: s/foo_process_requests/foo_process_next_request/
  PM / Runtime: GENERIC_SUBSYS_PM_OPS is gone
  PM / Runtime: Correct documented return values for generic PM callbacks
  PM / Runtime: Split line longer than 80 characters
  PM / Runtime: dev_pm_info.runtime_error is signed
  Revert "ACPI / processor: Make it possible to get APIC ID via GIC"
  ACPICA: Enable auto-serialization as a default kernel behavior.
  ACPICA: Ignore sync_level for methods that have been auto-serialized.
  ACPICA: Add additional named objects for the auto-serialize method scan.
  ACPICA: Add auto-serialization support for ill-behaved control methods.
  ACPICA: Remove global option to serialize all control methods.
  PNP: remove deprecated IRQF_DISABLED

diff --combined Documentation/kernel-parameters.txt
index 2311dad7a57a52f9dcb928d32baf77210e46984a,91f0be8555f58e9db9d9a24d1412af834479450c..bc3478581f67ee05d31a58e73cf6fd3e6fcc2b68
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -229,6 -229,14 +229,14 @@@ bytes respectively. Such letter suffixe
                        use by PCI
                        Format: <irq>,<irq>...
  
+       acpi_no_auto_serialize  [HW,ACPI]
+                       Disable auto-serialization of AML methods
+                       AML control methods that contain the opcodes to create
+                       named objects will be marked as "Serialized" by the
+                       auto-serialization feature.
+                       This feature is enabled by default.
+                       This option allows to turn off the feature.
+ 
        acpi_no_auto_ssdt       [HW,ACPI] Disable automatic loading of SSDT
  
        acpica_no_return_repair [HW, ACPI]
@@@ -306,8 -314,6 +314,6 @@@
        acpi_sci=       [HW,ACPI] ACPI System Control Interrupt trigger mode
                        Format: { level | edge | high | low }
  
-       acpi_serialize  [HW,ACPI] force serialization of AML methods
- 
        acpi_skip_timer_override [HW,ACPI]
                        Recognize and ignore IRQ0/pin2 Interrupt Override.
                        For broken nForce2 BIOS resulting in XT-PIC timer.
@@@ -1019,13 -1025,6 +1025,13 @@@
                        parameter will force ia64_sal_cache_flush to call
                        ia64_pal_cache_flush instead of SAL_CACHE_FLUSH.
  
 +      forcepae [X86-32]
 +                      Forcefully enable Physical Address Extension (PAE).
 +                      Many Pentium M systems disable PAE but may have a
 +                      functionally usable PAE implementation.
 +                      Warning: use of this parameter will taint the kernel
 +                      and may cause unknown problems.
 +
        ftrace=[tracer]
                        [FTRACE] will set and start the specified tracer
                        as early as possible in order to facilitate early
@@@ -2068,8 -2067,8 +2074,8 @@@
                        IOAPICs that may be present in the system.
  
        nokaslr         [X86]
 -                      Disable kernel base offset ASLR (Address Space
 -                      Layout Randomization) if built into the kernel.
 +                      Disable kernel and module base offset ASLR (Address
 +                      Space Layout Randomization) if built into the kernel.
  
        noautogroup     Disable scheduler automatic task group creation.
  
@@@ -3424,24 -3423,14 +3430,24 @@@
                                        of CONFIG_HIGHPTE.
  
        vdso=           [X86,SH]
 -                      vdso=2: enable compat VDSO (default with COMPAT_VDSO)
 -                      vdso=1: enable VDSO (default)
 +                      On X86_32, this is an alias for vdso32=.  Otherwise:
 +
 +                      vdso=1: enable VDSO (the default)
                        vdso=0: disable VDSO mapping
  
 -      vdso32=         [X86]
 -                      vdso32=2: enable compat VDSO (default with COMPAT_VDSO)
 -                      vdso32=1: enable 32-bit VDSO (default)
 -                      vdso32=0: disable 32-bit VDSO mapping
 +      vdso32=         [X86] Control the 32-bit vDSO
 +                      vdso32=1: enable 32-bit VDSO
 +                      vdso32=0 or vdso32=2: disable 32-bit VDSO
 +
 +                      See the help text for CONFIG_COMPAT_VDSO for more
 +                      details.  If CONFIG_COMPAT_VDSO is set, the default is
 +                      vdso32=0; otherwise, the default is vdso32=1.
 +
 +                      For compatibility with older kernels, vdso32=2 is an
 +                      alias for vdso32=0.
 +
 +                      Try vdso32=0 if you encounter an error that says:
 +                      dl_main: Assertion `(void *) ph->p_vaddr == _rtld_local._dl_sysinfo_dso' failed!
  
        vector=         [IA-64,SMP]
                        vector=percpu: enable percpu vector domain