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

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

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

parents aac372de 3a8f675c

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ tune-$(CONFIG_CPU_ARM926T) :=-mtune=arm9tdmi 
tune-$(CONFIG_CPU_SA110)	:=-mtune=strongarm110

tune-$(CONFIG_CPU_SA1100)	:=-mtune=strongarm1100

tune-$(CONFIG_CPU_XSCALE)	:=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale

tune-$(CONFIG_CPU_V6)		:=-mtune=strongarm

tune-$(CONFIG_CPU_V6)		:=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)



# Need -Uarm for gcc < 3.x

CFLAGS_ABI	:=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,)

arch/arm/kernel/armksyms.c

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ extern void fp_enter(void); 


#define EXPORT_SYMBOL_ALIAS(sym,orig)		\

 EXPORT_CRC_ALIAS(sym)				\

 const struct kernel_symbol __ksymtab_##sym	\

  __attribute__((section("__ksymtab"))) =	\

 static const struct kernel_symbol __ksymtab_##sym	\

  __attribute_used__ __attribute__((section("__ksymtab"))) =	\

    { (unsigned long)&orig, #sym };



/*

arch/arm/kernel/entry-common.S

+1 −6
Original line number Diff line number Diff line
@@ -106,15 +106,10 @@ ENTRY(ret_from_fork) 
	.endm



.Larm700bug:

	ldr	r0, [sp, #S_PSR]		@ Get calling cpsr

	sub	lr, lr, #4

	str	lr, [r8]

	msr	spsr_cxsf, r0

	ldmia	sp, {r0 - lr}^			@ Get calling r0 - lr

	mov	r0, r0

	ldr	lr, [sp, #S_PC]			@ Get PC

	add	sp, sp, #S_FRAME_SIZE

	movs	pc, lr

	subs	pc, lr, #4

#else

	.macro	arm710_bug_check, instr, temp

	.endm

arch/arm/mach-s3c2410/mach-anubis.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static int external_map[] = { 2 }; 
static int chip0_map[]      = { 0 };

static int chip1_map[]      = { 1 };



struct mtd_partition anubis_default_nand_part[] = {

static struct mtd_partition anubis_default_nand_part[] = {

	[0] = {

		.name	= "Boot Agent",

		.size	= SZ_16K,

arch/arm/mach-s3c2410/mach-bast.c

+2 −2
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static int chip0_map[] = { 1 }; 
static int chip1_map[] = { 2 };

static int chip2_map[] = { 3 };



struct mtd_partition bast_default_nand_part[] = {

static struct mtd_partition bast_default_nand_part[] = {

	[0] = {

		.name	= "Boot Agent",

		.size	= SZ_16K,
@@ -340,7 +340,7 @@ static struct resource bast_dm9k_resource[] = { 
 * better IO routines can be written and tested

*/



struct dm9000_plat_data bast_dm9k_platdata = {

static struct dm9000_plat_data bast_dm9k_platdata = {

	.flags		= DM9000_PLATF_16BITONLY

};