Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e22057c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'stable/for-linus-3.4-tag-two' of... 

Merge tag 'stable/for-linus-3.4-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

Pull more xen updates from Konrad Rzeszutek Wilk:
 "One tiny feature that accidentally got lost in the initial git pull:
   * Add fast-EOI acking of interrupts (clear a bit instead of
     hypercall)
  And bug-fixes:
   * Fix CPU bring-up code missing a call to notify other subsystems.
   * Fix reading /sys/hypervisor even if PVonHVM drivers are not loaded.
   * In Xen ACPI processor driver: remove too verbose WARN messages, fix
     up the Kconfig dependency to be a module by default, and add
     dependency on CPU_FREQ.
   * Disable CPU frequency drivers from loading when booting under Xen
     (as we want the Xen ACPI processor to be used instead).
   * Cleanups in tmem code."

* tag 'stable/for-linus-3.4-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/acpi: Fix Kconfig dependency on CPU_FREQ
  xen: initialize platform-pci even if xen_emul_unplug=never
  xen/smp: Fix bringup bug in AP code.
  xen/acpi: Remove the WARN's as they just create noise.
  xen/tmem: cleanup
  xen: support pirq_eoi_map
  xen/acpi-processor: Do not depend on CPU frequency scaling drivers.
  xen/cpufreq: Disable the cpu frequency scaling drivers from loading.
  provide disable_cpufreq() function to disable the API.
parents 496b919b df7a3ee2

arch/x86/xen/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/pm.h>

#include <linux/memblock.h>

#include <linux/cpuidle.h>

#include <linux/cpufreq.h>



#include <asm/elf.h>

#include <asm/vdso.h>
@@ -420,6 +421,7 @@ void __init xen_arch_setup(void) 
	boot_cpu_data.hlt_works_ok = 1;

#endif

	disable_cpuidle();

	disable_cpufreq();

	WARN_ON(set_pm_idle_to_default());

	fiddle_vdso();

}

arch/x86/xen/smp.c

+6 −0
Original line number Diff line number Diff line
@@ -75,8 +75,14 @@ static void __cpuinit cpu_bringup(void) 


	xen_setup_cpu_clockevents();



	notify_cpu_starting(cpu);



	ipi_call_lock();

	set_cpu_online(cpu, true);

	ipi_call_unlock();



	this_cpu_write(cpu_state, CPU_ONLINE);



	wmb();



	/* We can take interrupts now: we're officially "up". */

drivers/block/xen-blkfront.c

+3 −0
Original line number Diff line number Diff line
@@ -1475,6 +1475,9 @@ static int __init xlblk_init(void) 
	if (!xen_domain())

		return -ENODEV;



	if (!xen_platform_pci_unplug)

		return -ENODEV;



	if (register_blkdev(XENVBD_MAJOR, DEV_NAME)) {

		printk(KERN_WARNING "xen_blk: can't get major %d with name %s\n",

		       XENVBD_MAJOR, DEV_NAME);

drivers/net/xen-netfront.c

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include <xen/xenbus.h>

#include <xen/events.h>

#include <xen/page.h>

#include <xen/platform_pci.h>

#include <xen/grant_table.h>



#include <xen/interface/io/netif.h>
@@ -1964,6 +1965,9 @@ static int __init netif_init(void) 
	if (xen_initial_domain())

		return 0;



	if (!xen_platform_pci_unplug)

		return -ENODEV;



	printk(KERN_INFO "Initialising Xen virtual ethernet driver.\n");



	return xenbus_register_frontend(&netfront_driver);

drivers/xen/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -180,9 +180,8 @@ config XEN_PRIVCMD 


config XEN_ACPI_PROCESSOR

	tristate "Xen ACPI processor"

	depends on XEN && X86 && ACPI_PROCESSOR

	default y if (X86_ACPI_CPUFREQ = y || X86_POWERNOW_K8 = y)

	default m if (X86_ACPI_CPUFREQ = m || X86_POWERNOW_K8 = m)

	depends on XEN && X86 && ACPI_PROCESSOR && CPU_FREQ

	default m

	help

          This ACPI processor uploads Power Management information to the Xen hypervisor.