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

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

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm 

Pull ARM fixes from Russell King:
 "A small number of fixes for stuff from the last merge window, and in
  one case (IRQ time accounting) the previous merge window."

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: 7720/1: ARM v6/v7 cmpxchg64 shouldn't clear upper 32 bits of the old/new value
  ARM: 7715/1: MCPM: adapt to GIC changes after upstream merge
  ARM: 7714/1: mmc: mmci: Ensure return value of regulator_enable() is checked
  ARM: 7712/1: Remove trailing whitespace in arch/arm/Makefile
  ARM: 7711/1: dove: fix Dove cpu type from V7 to PJ4
  ARM: finally enable IRQ time accounting config
parents 109c3c02 6eabb330

arch/arm/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ config ARM 
	select HAVE_GENERIC_HARDIRQS

	select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7))

	select HAVE_IDE if PCI || ISA || PCMCIA

	select HAVE_IRQ_TIME_ACCOUNTING

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_LZO
@@ -488,7 +489,7 @@ config ARCH_IXP4XX 
config ARCH_DOVE

	bool "Marvell Dove"

	select ARCH_REQUIRE_GPIOLIB

	select CPU_V7

	select CPU_PJ4

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_PCI

	select PINCTRL

arch/arm/common/mcpm_platsmp.c

+0 −3
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
#include <linux/smp.h>

#include <linux/spinlock.h>



#include <linux/irqchip/arm-gic.h>



#include <asm/mcpm.h>

#include <asm/smp.h>

#include <asm/smp_plat.h>
@@ -49,7 +47,6 @@ static int __cpuinit mcpm_boot_secondary(unsigned int cpu, struct task_struct *i 
static void __cpuinit mcpm_secondary_init(unsigned int cpu)

{

	mcpm_cpu_powered_up();

	gic_secondary_init(0);

}



#ifdef CONFIG_HOTPLUG_CPU

arch/arm/include/asm/cmpxchg.h

+4 −4
Original line number Diff line number Diff line
@@ -233,15 +233,15 @@ static inline unsigned long __cmpxchg_local(volatile void *ptr, 
	((__typeof__(*(ptr)))atomic64_cmpxchg(container_of((ptr),	\

						atomic64_t,		\

						counter),		\

					      (unsigned long)(o),	\

					      (unsigned long)(n)))

					      (unsigned long long)(o),	\

					      (unsigned long long)(n)))



#define cmpxchg64_local(ptr, o, n)					\

	((__typeof__(*(ptr)))local64_cmpxchg(container_of((ptr),	\

						local64_t,		\

						a),			\

					     (unsigned long)(o),	\

					     (unsigned long)(n)))

					     (unsigned long long)(o),	\

					     (unsigned long long)(n)))



#endif	/* __LINUX_ARM_ARCH__ >= 6 */

drivers/mmc/host/mmci.c

+7 −2
Original line number Diff line number Diff line
@@ -1130,6 +1130,7 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
	struct variant_data *variant = host->variant;

	u32 pwr = 0;

	unsigned long flags;

	int ret;



	pm_runtime_get_sync(mmc_dev(mmc));
@@ -1161,8 +1162,12 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
		break;

	case MMC_POWER_ON:

		if (!IS_ERR(mmc->supply.vqmmc) &&

		    !regulator_is_enabled(mmc->supply.vqmmc))

			regulator_enable(mmc->supply.vqmmc);

		    !regulator_is_enabled(mmc->supply.vqmmc)) {

			ret = regulator_enable(mmc->supply.vqmmc);

			if (ret < 0)

				dev_err(mmc_dev(mmc),

					"failed to enable vqmmc regulator\n");

		}



		pwr |= MCI_PWR_ON;

		break;

arch/arm/Makefile

+1 −1

File changed.

Contains only whitespace changes.