Merge branch 'x86/vmware' into x86/trampoline

diff --combined Documentation/kernel-parameters.txt
index 8dd7248508a9e12ac8908c24fb4a3649f157697a,582409801a41801a2b6b47c054080c710f44c59e..281c70b94089ac841a8b3c6b61f9e507a48c7585
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -455,7 -455,7 +455,7 @@@ and is between 256 and 4096 characters
                        [ARM] imx_timer1,OSTS,netx_timer,mpu_timer2,
                                pxa_timer,timer3,32k_counter,timer0_1
                        [AVR32] avr32
-                       [X86-32] pit,hpet,tsc,vmi-timer;
+                       [X86-32] pit,hpet,tsc;
                                scx200_hrt on Geode; cyclone on IBM x440
                        [MIPS] MIPS
                        [PARISC] cr16
@@@ -1974,18 -1974,15 +1974,18 @@@
                force   Enable ASPM even on devices that claim not to support it.
                        WARNING: Forcing ASPM on may cause system lockups.
  
 +      pcie_ports=     [PCIE] PCIe ports handling:
 +              auto    Ask the BIOS whether or not to use native PCIe services
 +                      associated with PCIe ports (PME, hot-plug, AER).  Use
 +                      them only if that is allowed by the BIOS.
 +              native  Use native PCIe services associated with PCIe ports
 +                      unconditionally.
 +              compat  Treat PCIe ports as PCI-to-PCI bridges, disable the PCIe
 +                      ports driver.
 +
        pcie_pme=       [PCIE,PM] Native PCIe PME signaling options:
 -                      Format: {auto|force}[,nomsi]
 -              auto    Use native PCIe PME signaling if the BIOS allows the
 -                      kernel to control PCIe config registers of root ports.
 -              force   Use native PCIe PME signaling even if the BIOS refuses
 -                      to allow the kernel to control the relevant PCIe config
 -                      registers.
                nomsi   Do not use MSI for native PCIe PME signaling (this makes
 -                      all PCIe root ports use INTx for everything).
 +                      all PCIe root ports use INTx for all services).
  
        pcmv=           [HW,PCMCIA] BadgePAD 4
  
@@@ -2632,10 -2629,8 +2632,10 @@@
                        aux-ide-disks -- unplug non-primary-master IDE devices
                        nics -- unplug network devices
                        all -- unplug all emulated devices (NICs and IDE disks)
 -                      ignore -- continue loading the Xen platform PCI driver even
 -                              if the version check failed
 +                      unnecessary -- unplugging emulated devices is
 +                              unnecessary even if the host did not respond to
 +                              the unplug protocol
 +                      never -- do not unplug even if version check succeeds
  
        xirc2ps_cs=     [NET,PCMCIA]
                        Format:

diff --combined arch/x86/kernel/Makefile
index fedf32a8c3ecdd7a1aaed41b2884d2c9b10bf033,801127cd97542edcabd77cc483bf877b7494694d..d9ce7a926e70804357cd86ec665c6c83800d0d9a
--- 1/arch/x86/kernel/Makefile
--- 2/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@ -11,8 -11,6 +11,8 @@@ ifdef CONFIG_FUNCTION_TRACE
  CFLAGS_REMOVE_tsc.o = -pg
  CFLAGS_REMOVE_rtc.o = -pg
  CFLAGS_REMOVE_paravirt-spinlocks.o = -pg
 +CFLAGS_REMOVE_pvclock.o = -pg
 +CFLAGS_REMOVE_kvmclock.o = -pg
  CFLAGS_REMOVE_ftrace.o = -pg
  CFLAGS_REMOVE_early_printk.o = -pg
  endif
@@@ -93,7 -91,6 +93,6 @@@ obj-$(CONFIG_K8_NB)           += k8.
  obj-$(CONFIG_DEBUG_RODATA_TEST)       += test_rodata.o
  obj-$(CONFIG_DEBUG_NX_TEST)   += test_nx.o
  
- obj-$(CONFIG_VMI)             += vmi_32.o vmiclock_32.o
  obj-$(CONFIG_KVM_GUEST)               += kvm.o
  obj-$(CONFIG_KVM_CLOCK)               += kvmclock.o
  obj-$(CONFIG_PARAVIRT)                += paravirt.o paravirt_patch_$(BITS).o