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

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

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

parents 19da9b8b 861e37ad

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ config HOTPLUG_CPU 


config LOCAL_TIMERS

	bool "Use local timer interrupts"

	depends on SMP && n

	depends on SMP && REALVIEW_MPCORE

	default y

	help

	  Enable support for local timers on SMP platforms, rather then the

arch/arm/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ copy_thread(int nr, unsigned long clone_flags, unsigned long stack_start, 
	struct thread_info *thread = p->thread_info;

	struct pt_regs *childregs;



	childregs = ((struct pt_regs *)((unsigned long)thread + THREAD_START_SP)) - 1;

	childregs = (void *)thread + THREAD_START_SP - sizeof(*regs);

	*childregs = *regs;

	childregs->ARM_r0 = 0;

	childregs->ARM_sp = stack_start;

arch/arm/lib/bitops.h

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
	and	r2, r0, #7

	mov	r3, #1

	mov	r3, r3, lsl r2

	save_and_disable_irqs ip, r2

	save_and_disable_irqs ip

	ldrb	r2, [r1, r0, lsr #3]

	\instr	r2, r2, r3

	strb	r2, [r1, r0, lsr #3]
@@ -54,7 +54,7 @@ 
	add	r1, r1, r0, lsr #3

	and	r3, r0, #7

	mov	r0, #1

	save_and_disable_irqs ip, r2

	save_and_disable_irqs ip

	ldrb	r2, [r1]

	tst	r2, r0, lsl r3

	\instr	r2, r2, r0, lsl r3

arch/arm/mach-realview/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -5,3 +5,5 @@ 
obj-y					:= core.o clock.o

obj-$(CONFIG_MACH_REALVIEW_EB)		+= realview_eb.o

obj-$(CONFIG_SMP)			+= platsmp.o headsmp.o

obj-$(CONFIG_HOTPLUG_CPU)		+= hotplug.o

obj-$(CONFIG_LOCAL_TIMERS)		+= localtimer.o

arch/arm/mach-realview/core.c

+1 −1
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ static irqreturn_t realview_timer_interrupt(int irq, void *dev_id, struct pt_reg 


	timer_tick(regs);



#ifdef CONFIG_SMP

#if defined(CONFIG_SMP) && !defined(CONFIG_LOCAL_TIMERS)

	smp_send_timer();

	update_process_times(user_mode(regs));

#endif