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

Commit 26ceb127 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 

Pull ARM updates from Russell King:
 "The major updates included in this update are:

   - Clang compatible stack pointer accesses by Behan Webster.
   - SA11x0 updates from Dmitry Eremin-Solenikov.
   - kgdb handling of breakpoints with read-only text/modules
   - Support for Privileged-no-execute feature on ARMv7 to prevent
     userspace code execution by the kernel.
   - AMBA primecell bus handling of irq-safe runtime PM
   - Unwinding support for memset/memzero/memmove/memcpy functions
   - VFP fixes for Krait CPUs and improvements in detecting the VFP
     architecture
   - A number of code cleanups (using pr_*, removing or reducing the
     severity of a couple of kernel messages, splitting ftrace asm code
     out to a separate file, etc.)
   - Add machine name to stack dump output"

* 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (62 commits)
  ARM: 8247/2: pcmcia: sa1100: make use of device clock
  ARM: 8246/2: pcmcia: sa1111: provide device clock
  ARM: 8245/1: pcmcia: soc-common: enable/disable socket clocks
  ARM: 8244/1: fbdev: sa1100fb: make use of device clock
  ARM: 8243/1: sa1100: add a clock alias for sa1111 pcmcia device
  ARM: 8242/1: sa1100: add cpu clock
  ARM: 8221/1: PJ4: allow building in Thumb-2 mode
  ARM: 8234/1: sa1100: reorder IRQ handling code
  ARM: 8233/1: sa1100: switch to hwirq usage
  ARM: 8232/1: sa1100: merge GPIO multiplexer IRQ to "normal" irq domain
  ARM: 8231/1: sa1100: introduce irqdomains support
  ARM: 8230/1: sa1100: shift IRQs by one
  ARM: 8229/1: sa1100: replace irq numbers with names in irq driver
  ARM: 8228/1: sa1100: drop entry-macro.S
  ARM: 8227/1: sa1100: switch to MULTI_IRQ_HANDLER
  ARM: 8241/1: Update processor_modes for hyp and monitor mode
  ARM: 8240/1: MCPM: document mcpm_sync_init()
  ARM: 8239/1: Introduce {set,clear}_pte_bit
  ARM: 8238/1: mm: Refine set_memory_* functions
  ARM: 8237/1: fix flush_pfn_alias
  ...
parents 8d140667 e9f2d6d6

Documentation/arm/memory.txt

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ fffe8000 fffeffff DTCM mapping area for platforms with 
fffe0000	fffe7fff	ITCM mapping area for platforms with

				ITCM mounted inside the CPU.



ffc00000	ffdfffff	Fixmap mapping region.  Addresses provided

ffc00000	ffefffff	Fixmap mapping region.  Addresses provided

				by fix_to_virt() will be located here.



fee00000	feffffff	Mapping of PCI I/O space. This is a static

Documentation/power/runtime_pm.txt

+4 −0
Original line number Diff line number Diff line
@@ -468,6 +468,10 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h: 
    - set the power.irq_safe flag for the device, causing the runtime-PM

      callbacks to be invoked with interrupts off



  bool pm_runtime_is_irq_safe(struct device *dev);

    - return true if power.irq_safe flag was set for the device, causing

      the runtime-PM callbacks to be invoked with interrupts off



  void pm_runtime_mark_last_busy(struct device *dev);

    - set the power.last_busy field to the current time

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -687,7 +687,9 @@ config ARCH_SA1100 
	select CPU_SA1100

	select GENERIC_CLOCKEVENTS

	select HAVE_IDE

	select IRQ_DOMAIN

	select ISA

	select MULTI_IRQ_HANDLER

	select NEED_MACH_MEMORY_H

	select SPARSE_IRQ

	help

arch/arm/common/sa1111.c

+6 −7
Original line number Diff line number Diff line
@@ -282,8 +282,8 @@ static int sa1111_retrigger_lowirq(struct irq_data *d) 
	}



	if (i == 8)

		printk(KERN_ERR "Danger Will Robinson: failed to "

			"re-trigger IRQ%d\n", d->irq);

		pr_err("Danger Will Robinson: failed to re-trigger IRQ%d\n",

		       d->irq);

	return i == 8 ? -1 : 0;

}
@@ -384,8 +384,8 @@ static int sa1111_retrigger_highirq(struct irq_data *d) 
	}



	if (i == 8)

		printk(KERN_ERR "Danger Will Robinson: failed to "

			"re-trigger IRQ%d\n", d->irq);

		pr_err("Danger Will Robinson: failed to re-trigger IRQ%d\n",

		       d->irq);

	return i == 8 ? -1 : 0;

}
@@ -740,9 +740,8 @@ static int __sa1111_probe(struct device *me, struct resource *mem, int irq) 
		goto err_unmap;

	}



	printk(KERN_INFO "SA1111 Microprocessor Companion Chip: "

		"silicon revision %lx, metal revision %lx\n",

		(id & SKID_SIREV_MASK)>>4, (id & SKID_MTREV_MASK));

	pr_info("SA1111 Microprocessor Companion Chip: silicon revision %lx, metal revision %lx\n",

		(id & SKID_SIREV_MASK) >> 4, id & SKID_MTREV_MASK);



	/*

	 * We found it.  Wake the chip up, and initialise.

arch/arm/include/asm/cacheflush.h

+10 −0
Original line number Diff line number Diff line
@@ -487,6 +487,16 @@ int set_memory_rw(unsigned long addr, int numpages); 
int set_memory_x(unsigned long addr, int numpages);

int set_memory_nx(unsigned long addr, int numpages);



#ifdef CONFIG_DEBUG_RODATA

void mark_rodata_ro(void);

void set_kernel_text_rw(void);

void set_kernel_text_ro(void);

#else

static inline void set_kernel_text_rw(void) { }

static inline void set_kernel_text_ro(void) { }

#endif



void flush_uprobe_xol_access(struct page *page, unsigned long uaddr,

			     void *kaddr, unsigned long len);



#endif