Merge tag 'stable/for-linus-3.9-rc2-tag' of... (7946844a) · Commits · 戴 / test

arch/arm/Kconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -1889,8 +1889,9 @@ config XEN_DOM0

		config XEN
		bool "Xen guest support on ARM (EXPERIMENTAL)"
		depends on ARM && OF
		depends on ARM && AEABI && OF
		depends on CPU_V7 && !CPU_V6
		depends on !GENERIC_ATOMIC64
		help
		Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.

+4 −21

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		#define _ASM_ARM_XEN_EVENTS_H

		#include <asm/ptrace.h>
		#include <asm/atomic.h>

		enum ipi_vector {
		XEN_PLACEHOLDER_VECTOR,
		@@ -15,26 +16,8 @@ static inline int xen_irqs_disabled(struct pt_regs *regs)
		return raw_irqs_disabled_flags(regs->ARM_cpsr);
		}

		/*
		* We cannot use xchg because it does not support 8-byte
		* values. However it is safe to use {ldr,dtd}exd directly because all
		* platforms which Xen can run on support those instructions.
		*/
		static inline xen_ulong_t xchg_xen_ulong(xen_ulong_t *ptr, xen_ulong_t val)
		{
		xen_ulong_t oldval;
		unsigned int tmp;

		wmb();
		asm volatile("@ xchg_xen_ulong\n"
		"1: ldrexd %0, %H0, [%3]\n"
		" strexd %1, %2, %H2, [%3]\n"
		" teq %1, #0\n"
		" bne 1b"
		: "=&r" (oldval), "=&r" (tmp)
		: "r" (val), "r" (ptr)
		: "memory", "cc");
		return oldval;
		}
		#define xchg_xen_ulong(ptr, val) atomic64_xchg(container_of((ptr), \
		atomic64_t, \
		counter), (val))

		#endif /* _ASM_ARM_XEN_EVENTS_H */

+2 −2

Original line number	Diff line number	Diff line
		@@ -465,7 +465,7 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)
		return result;
		}

		static int acpi_processor_get_performance_info(struct acpi_processor *pr)
		int acpi_processor_get_performance_info(struct acpi_processor *pr)
		{
		int result = 0;
		acpi_status status = AE_OK;
		@@ -509,7 +509,7 @@ static int acpi_processor_get_performance_info(struct acpi_processor *pr)
		#endif
		return result;
		}

		EXPORT_SYMBOL_GPL(acpi_processor_get_performance_info);
		int acpi_processor_notify_smm(struct module *calling_module)
		{
		acpi_status status;

+4 −4

Original line number	Diff line number	Diff line
		@@ -500,16 +500,16 @@ static int __init xen_acpi_processor_init(void)
		(void)acpi_processor_preregister_performance(acpi_perf_data);

		for_each_possible_cpu(i) {
		struct acpi_processor *pr;
		struct acpi_processor_performance *perf;

		pr = per_cpu(processors, i);
		perf = per_cpu_ptr(acpi_perf_data, i);
		rc = acpi_processor_register_performance(perf, i);
		pr->performance = perf;
		rc = acpi_processor_get_performance_info(pr);
		if (rc)
		goto err_out;
		}
		rc = acpi_processor_notify_smm(THIS_MODULE);
		if (rc)
		goto err_unregister;

		for_each_possible_cpu(i) {
		struct acpi_processor *_pr;

+2 −1

Original line number	Diff line number	Diff line
		@@ -113,6 +113,7 @@ void xen_pcibk_reset_device(struct pci_dev *dev)
		if (dev->msi_enabled)
		pci_disable_msi(dev);
		#endif
		if (pci_is_enabled(dev))
		pci_disable_device(dev);

		pci_write_config_word(dev, PCI_COMMAND, 0);