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

Commit 19a1166f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: footbridge: fix clock event support
  ARM: footbridge: fix debug macros
  ARM: initrd: disable initrds outside of memory
  ARM: extend Code: line by one 16-bit quantity for Thumb instructions
  ARM: 6955/1: cmpxchg syscall should data abort if page not write
  ARM: 6954/1: zImage: fix Thumb2 breakage
  ARM: 6953/1: DT: don't try to access physical address zero
  ARM: 6949/2: mach-u300: fix compilaton warning in IO accessors
  Revert "ARM: 6944/1: mm: allow ASID 0 to be allocated to tasks"
  Revert "ARM: 6943/1: mm: use TTBR1 instead of reserved context ID"
  davinci: make PCM platform devices static
  arm: davinci: Fix fallout from generic irq chip conversion
  ARM: 6894/1: mmci: trigger card detect IRQs on falling and rising edges
  ARM: 6952/1: fix lockdep warning of "unannotated irqs-off"
  ARM: 6951/1: include .bss in memory layout information
  ARM: 6948/1: Fix .size directives for __arm{7,9}tdmi_proc_info
  ARM: 6947/2: mach-u300: fix compilation error in timer
  ARM: 6946/1: vexpress: move v2m clock init to init_early
  ARM: mx51/sdma: Check the chip revision in run-time
  arm: mxs: include asm/processor.h for cpu_relax()
parents 13fca640 7d7975a0

arch/arm/boot/compressed/head.S

+3 −3
Original line number Diff line number Diff line
@@ -691,9 +691,9 @@ proc_types: 


		.word	0x41069260		@ ARM926EJ-S (v5TEJ)

		.word	0xff0ffff0

		b	__arm926ejs_mmu_cache_on

		b	__armv4_mmu_cache_off

		b	__armv5tej_mmu_cache_flush

		W(b)	__arm926ejs_mmu_cache_on

		W(b)	__armv4_mmu_cache_off

		W(b)	__armv5tej_mmu_cache_flush



		.word	0x00007000		@ ARM7 IDs

		.word	0x0000f000

arch/arm/kernel/devtree.c

+3 −0
Original line number Diff line number Diff line
@@ -76,6 +76,9 @@ struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys) 
	unsigned long dt_root;

	const char *model;



	if (!dt_phys)

		return NULL;



	devtree = phys_to_virt(dt_phys);



	/* check device tree validity */

arch/arm/kernel/entry-armv.S

+5 −1
Original line number Diff line number Diff line
@@ -435,6 +435,10 @@ __irq_usr: 
	usr_entry

	kuser_cmpxchg_check



#ifdef CONFIG_IRQSOFF_TRACER

	bl	trace_hardirqs_off

#endif



	get_thread_info tsk

#ifdef CONFIG_PREEMPT

	ldr	r8, [tsk, #TI_PREEMPT]		@ get preempt count
@@ -453,7 +457,7 @@ __irq_usr: 
#endif



	mov	why, #0

	b	ret_to_user

	b	ret_to_user_from_irq

 UNWIND(.fnend		)

ENDPROC(__irq_usr)

arch/arm/kernel/entry-common.S

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ work_resched: 
ENTRY(ret_to_user)

ret_slow_syscall:

	disable_irq				@ disable interrupts

ENTRY(ret_to_user_from_irq)

	ldr	r1, [tsk, #TI_FLAGS]

	tst	r1, #_TIF_WORK_MASK

	bne	work_pending
@@ -75,6 +76,7 @@ no_work_pending: 
	arch_ret_to_user r1, lr



	restore_user_regs fast = 0, offset = 0

ENDPROC(ret_to_user_from_irq)

ENDPROC(ret_to_user)



/*

arch/arm/kernel/traps.c

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static void dump_instr(const char *lvl, struct pt_regs *regs) 
	fs = get_fs();

	set_fs(KERNEL_DS);



	for (i = -4; i < 1; i++) {

	for (i = -4; i < 1 + !!thumb; i++) {

		unsigned int val, bad;



		if (thumb)
@@ -563,7 +563,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs) 
		if (!pmd_present(*pmd))

			goto bad_access;

		pte = pte_offset_map_lock(mm, pmd, addr, &ptl);

		if (!pte_present(*pte) || !pte_dirty(*pte)) {

		if (!pte_present(*pte) || !pte_write(*pte) || !pte_dirty(*pte)) {

			pte_unmap_unlock(pte, ptl);

			goto bad_access;

		}