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

Commit 0b9466cc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: 6482/2: Fix find_next_zero_bit and related assembly
  ARM: 6490/1: MM: bugfix: initialize spinlock for init_mm.context
  ARM: avoid annoying <4>'s in printk output
  SCSI: arm fas216: fix missing ';'
  ARM: avoid marking decompressor .stack section as having contents
  ARM: 6489/1: thumb2: fix incorrect optimisation in usracc
  ARM: 6488/1: nomadik: prevent sched_clock() wraparound
  ARM: 6484/1: fix compile warning in mm/init.c
  ARM: 6473/1: Small update to ux500 specific L2 cache code
  ARM: improve compiler's ability to optimize page tables
  mx25: fix spi device registration typo
  ARM i.MX27 eukrea: Fix compilation
  ARM i.MX spi: fix compilation for i.MX21
  ARM i.MX pcm037 eet: compile fixes
  ARM i.MX: sdma is merged, so remove #ifdef SDMA_IS_MERGED
  ARM mx3fb: check for DMA engine type
  mach-pcm037_eet: Fix section mismatch for eet_init_devices()
parents e5fa5061 0e91ec0c

arch/arm/boot/compressed/head.S

+1 −1
Original line number Diff line number Diff line
@@ -1084,6 +1084,6 @@ memdump: mov r12, r0 
reloc_end:



		.align

		.section ".stack", "w"

		.section ".stack", "aw", %nobits

user_stack:	.space	4096

user_stack_end:

arch/arm/boot/compressed/vmlinux.lds.in

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ SECTIONS 
  .bss			: { *(.bss) }

  _end = .;



  .stack (NOLOAD)	: { *(.stack) }

  .stack		: { *(.stack) }



  .stab 0		: { *(.stab) }

  .stabstr 0		: { *(.stabstr) }

arch/arm/include/asm/assembler.h

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ 
	@ Slightly optimised to avoid incrementing the pointer twice

	usraccoff \instr, \reg, \ptr, \inc, 0, \cond, \abort

	.if	\rept == 2

	usraccoff \instr, \reg, \ptr, \inc, 4, \cond, \abort

	usraccoff \instr, \reg, \ptr, \inc, \inc, \cond, \abort

	.endif



	add\cond \ptr, #\rept * \inc

arch/arm/include/asm/mmu.h

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ typedef struct { 


#ifdef CONFIG_CPU_HAS_ASID

#define ASID(mm)	((mm)->context.id & 255)



/* init_mm.context.id_lock should be initialized. */

#define INIT_MM_CONTEXT(name)                                                 \

	.context.id_lock    = __SPIN_LOCK_UNLOCKED(name.context.id_lock),

#else

#define ASID(mm)	(0)

#endif

arch/arm/include/asm/pgtable.h

+3 −0
Original line number Diff line number Diff line
@@ -374,6 +374,9 @@ static inline pte_t *pmd_page_vaddr(pmd_t pmd) 


#define pmd_page(pmd)		pfn_to_page(__phys_to_pfn(pmd_val(pmd)))



/* we don't need complex calculations here as the pmd is folded into the pgd */

#define pmd_addr_end(addr,end)	(end)



/*

 * Conversion functions: convert a page and protection to a page entry,

 * and a page entry and page directory to the page they refer to.