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

Commit 43231b5b authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge commit '71856843' into omap-for-v3.10/timer 

Conflicts:
	arch/arm/plat-omap/dmtimer.c

Resolve merge conflict in omap_device.c as per
Lothar Waßmann <LW@KARO-electronics.de>.
parents 10561248 71856843

arch/arm/kernel/entry-armv.S

+6 −7
Original line number Diff line number Diff line
@@ -562,21 +562,21 @@ ENDPROC(__und_usr) 
	@ Fall-through from Thumb-2 __und_usr

	@

#ifdef CONFIG_NEON

	get_thread_info r10			@ get current thread

	adr	r6, .LCneon_thumb_opcodes

	b	2f

#endif

call_fpe:

	get_thread_info r10			@ get current thread

#ifdef CONFIG_NEON

	adr	r6, .LCneon_arm_opcodes

2:

	ldr	r7, [r6], #4			@ mask value

	cmp	r7, #0				@ end mask?

	beq	1f

	and	r8, r0, r7

2:	ldr	r5, [r6], #4			@ mask value

	ldr	r7, [r6], #4			@ opcode bits matching in mask

	cmp	r5, #0				@ end mask?

	beq	1f

	and	r8, r0, r5

	cmp	r8, r7				@ NEON instruction?

	bne	2b

	get_thread_info r10

	mov	r7, #1

	strb	r7, [r10, #TI_USED_CP + 10]	@ mark CP#10 as used

	strb	r7, [r10, #TI_USED_CP + 11]	@ mark CP#11 as used
@@ -586,7 +586,6 @@ call_fpe: 
	tst	r0, #0x08000000			@ only CDP/CPRT/LDC/STC have bit 27

	tstne	r0, #0x04000000			@ bit 26 set on both ARM and Thumb-2

	moveq	pc, lr

	get_thread_info r10			@ get current thread

	and	r8, r0, #0x00000f00		@ mask out CP number

 THUMB(	lsr	r8, r8, #8		)

	mov	r7, #1

arch/arm/kernel/process.c

+7 −6
Original line number Diff line number Diff line
@@ -459,15 +459,16 @@ unsigned long arch_randomize_brk(struct mm_struct *mm) 
 * atomic helpers and the signal restart code. Insert it into the

 * gate_vma so that it is visible through ptrace and /proc/<pid>/mem.

 */

static struct vm_area_struct gate_vma;

static struct vm_area_struct gate_vma = {

	.vm_start	= 0xffff0000,

	.vm_end		= 0xffff0000 + PAGE_SIZE,

	.vm_flags	= VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC,

	.vm_mm		= &init_mm,

};



static int __init gate_vma_init(void)

{

	gate_vma.vm_start	= 0xffff0000;

	gate_vma.vm_end		= 0xffff0000 + PAGE_SIZE;

	gate_vma.vm_page_prot = PAGE_READONLY_EXEC;

	gate_vma.vm_flags	= VM_READ | VM_EXEC |

				  VM_MAYREAD | VM_MAYEXEC;

	return 0;

}

arch_initcall(gate_vma_init);

arch/arm/mach-integrator/integrator_ap.c

+2 −4
Original line number Diff line number Diff line
@@ -536,15 +536,13 @@ static void __init ap_init_of(void) 
					   'A' + (ap_sc_id & 0x0f));



	soc_dev = soc_device_register(soc_dev_attr);

	if (IS_ERR_OR_NULL(soc_dev)) {

	if (IS_ERR(soc_dev)) {

		kfree(soc_dev_attr->revision);

		kfree(soc_dev_attr);

		return;

	}



	parent = soc_device_to_device(soc_dev);



	if (!IS_ERR_OR_NULL(parent))

	integrator_init_sysfs(parent, ap_sc_id);



	of_platform_populate(root, of_default_bus_match_table,

arch/arm/mach-integrator/integrator_cp.c

+2 −5
Original line number Diff line number Diff line
@@ -360,17 +360,14 @@ static void __init intcp_init_of(void) 
					   'A' + (intcp_sc_id & 0x0f));



	soc_dev = soc_device_register(soc_dev_attr);

	if (IS_ERR_OR_NULL(soc_dev)) {

	if (IS_ERR(soc_dev)) {

		kfree(soc_dev_attr->revision);

		kfree(soc_dev_attr);

		return;

	}



	parent = soc_device_to_device(soc_dev);



	if (!IS_ERR_OR_NULL(parent))

	integrator_init_sysfs(parent, intcp_sc_id);



	of_platform_populate(root, of_default_bus_match_table,

			intcp_auxdata_lookup, parent);

}

arch/arm/mach-omap2/board-omap3beagle.c

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ static int __init beagle_opp_init(void) 


	/* Initialize the omap3 opp table if not already created. */

	r = omap3_opp_init();

	if (IS_ERR_VALUE(r) && (r != -EEXIST)) {

	if (r < 0 && (r != -EEXIST)) {

		pr_err("%s: opp default init failed\n", __func__);

		return r;

	}