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

Commit 9f04012c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 329f7dba 72274c9e

arch/arm/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -356,6 +356,16 @@ config HOTPLUG_CPU 
	  Say Y here to experiment with turning CPUs off and on.  CPUs

	  can be controlled through /sys/devices/system/cpu.



config LOCAL_TIMERS

	bool "Use local timer interrupts"

	depends on SMP && n

	default y

	help

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

	  legacy IPI broadcast method.  Local timers allows the system

	  accounting to be spread across the timer interval, preventing a

	  "thundering herd" at every timer tick.



config PREEMPT

	bool "Preemptible Kernel (EXPERIMENTAL)"

	depends on EXPERIMENTAL

arch/arm/boot/compressed/misc.c

+6 −0
Original line number Diff line number Diff line
@@ -283,8 +283,14 @@ void flush_window(void) 
	putstr(".");

}



#ifndef arch_error

#define arch_error(x)

#endif



static void error(char *x)

{

	arch_error(x);



	putstr("\n\n");

	putstr(x);

	putstr("\n\n -- System halted");

arch/arm/common/scoop.c

+0 −6
Original line number Diff line number Diff line
@@ -19,12 +19,6 @@ 


#define SCOOP_REG(d,adr) (*(volatile unsigned short*)(d +(adr)))



/* PCMCIA to Scoop linkage structures for pxa2xx_sharpsl.c

   There is no easy way to link multiple scoop devices into one

   single entity for the pxa2xx_pcmcia device */

int scoop_num;

struct scoop_pcmcia_dev *scoop_devs;



struct  scoop_dev {

	void  *base;

	spinlock_t scoop_lock;

arch/arm/kernel/armksyms.c

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */

#include <linux/module.h>

#include <linux/string.h>

#include <linux/cryptohash.h>

#include <linux/delay.h>

#include <linux/in6.h>

#include <linux/syscalls.h>
@@ -126,6 +127,9 @@ EXPORT_SYMBOL(__put_user_2); 
EXPORT_SYMBOL(__put_user_4);

EXPORT_SYMBOL(__put_user_8);



	/* crypto hash */

EXPORT_SYMBOL(sha_transform);



	/* gcc lib functions */

EXPORT_SYMBOL(__ashldi3);

EXPORT_SYMBOL(__ashrdi3);

arch/arm/kernel/entry-armv.S

+7 −0
Original line number Diff line number Diff line
@@ -47,6 +47,13 @@ 
	movne	r0, sp

	adrne	lr, 1b

	bne	do_IPI



#ifdef CONFIG_LOCAL_TIMERS

	test_for_ltirq r0, r6, r5, lr

	movne	r0, sp

	adrne	lr, 1b

	bne	do_local_timer

#endif

#endif



	.endm