Merge "Merge google common 'android-3.18' into 'msm-3.18'" (cf231180) · Commits · e / devices / android_kernel_xiaomi_markw

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 3
		PATCHLEVEL = 18
		SUBLEVEL = 98
		SUBLEVEL = 100
		EXTRAVERSION =
		NAME = Diseased Newt

arch/arm/mach-mvebu/Kconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ config MACH_ARMADA_370
		config MACH_ARMADA_375
		bool "Marvell Armada 375 boards" if ARCH_MULTI_V7
		select ARM_ERRATA_720789
		select ARM_ERRATA_753970
		select PL310_ERRATA_753970
		select ARM_GIC
		select ARMADA_375_CLK
		select HAVE_ARM_SCU
		@@ -52,7 +52,7 @@ config MACH_ARMADA_375
		config MACH_ARMADA_38X
		bool "Marvell Armada 380/385 boards" if ARCH_MULTI_V7
		select ARM_ERRATA_720789
		select ARM_ERRATA_753970
		select PL310_ERRATA_753970
		select ARM_GIC
		select ARMADA_38X_CLK
		select HAVE_ARM_SCU

arch/mips/kernel/smp-bmips.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -159,11 +159,11 @@ static void bmips_prepare_cpus(unsigned int max_cpus)
		return;
		}

		if (request_irq(IPI0_IRQ, bmips_ipi_interrupt, IRQF_PERCPU,
		"smp_ipi0", NULL))
		if (request_irq(IPI0_IRQ, bmips_ipi_interrupt,
		IRQF_PERCPU \| IRQF_NO_SUSPEND, "smp_ipi0", NULL))
		panic("Can't request IPI0 interrupt");
		if (request_irq(IPI1_IRQ, bmips_ipi_interrupt, IRQF_PERCPU,
		"smp_ipi1", NULL))
		if (request_irq(IPI1_IRQ, bmips_ipi_interrupt,
		IRQF_PERCPU \| IRQF_NO_SUSPEND, "smp_ipi1", NULL))
		panic("Can't request IPI1 interrupt");
		}

arch/x86/kernel/cpu/mcheck/mce.c

+21 −1

Original line number	Diff line number	Diff line
		@@ -56,6 +56,9 @@ static DEFINE_MUTEX(mce_chrdev_read_mutex);
		rcu_read_lock_sched_held() \|\| \
		lockdep_is_held(&mce_chrdev_read_mutex))

		/* sysfs synchronization */
		static DEFINE_MUTEX(mce_sysfs_mutex);

		#define CREATE_TRACE_POINTS
		#include <trace/events/mce.h>

		@@ -2183,6 +2186,7 @@ static ssize_t set_ignore_ce(struct device *s,
		if (kstrtou64(buf, 0, &new) < 0)
		return -EINVAL;

		mutex_lock(&mce_sysfs_mutex);
		if (mca_cfg.ignore_ce ^ !!new) {
		if (new) {
		/* disable ce features */
		@@ -2195,6 +2199,8 @@ static ssize_t set_ignore_ce(struct device *s,
		on_each_cpu(mce_enable_ce, (void *)1, 1);
		}
		}
		mutex_unlock(&mce_sysfs_mutex);

		return size;
		}

		@@ -2207,6 +2213,7 @@ static ssize_t set_cmci_disabled(struct device *s,
		if (kstrtou64(buf, 0, &new) < 0)
		return -EINVAL;

		mutex_lock(&mce_sysfs_mutex);
		if (mca_cfg.cmci_disabled ^ !!new) {
		if (new) {
		/* disable cmci */
		@@ -2218,6 +2225,8 @@ static ssize_t set_cmci_disabled(struct device *s,
		on_each_cpu(mce_enable_ce, NULL, 1);
		}
		}
		mutex_unlock(&mce_sysfs_mutex);

		return size;
		}

		@@ -2225,8 +2234,19 @@ static ssize_t store_int_with_restart(struct device *s,
		struct device_attribute *attr,
		const char *buf, size_t size)
		{
		ssize_t ret = device_store_int(s, attr, buf, size);
		unsigned long old_check_interval = check_interval;
		ssize_t ret = device_store_ulong(s, attr, buf, size);

		if (check_interval == old_check_interval)
		return ret;

		if (check_interval < 1)
		check_interval = 1;

		mutex_lock(&mce_sysfs_mutex);
		mce_restart();
		mutex_unlock(&mce_sysfs_mutex);

		return ret;
		}

arch/x86/kernel/machine_kexec_64.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -516,6 +516,7 @@ int arch_kexec_apply_relocations_add(const Elf64_Ehdr *ehdr,
		goto overflow;
		break;
		case R_X86_64_PC32:
		case R_X86_64_PLT32:
		value -= (u64)address;
		(u32 )location = value;
		break;