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

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

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] Fix some section mismatch warnings
  [ARM] 4417/1: Serial: Fix AMBA drivers locking
  [ARM] 4394/1: ARMv7: Add the TLB range operations
  [ARM] 4410/1: Remove extern declarations in coyote/ixdpg425-pci.c
  [ARM] 4416/1: NWFPE: fix undeclared symbols
  [ARM] 4415/1: AML5900: fix sparse warnings from map_io
  [ARM] 4414/1: S3C2443: sparse fix for clock.c
  [ARM] 4412/1: S3C2412: reset errata fix
  [ARM] 4411/1: KS8695: Another serial driver fix
  [ARM] oprofile: avoid lockdep warnings on mpcore oprofile init
  [ARM] Fix stacktrace FP range checking
  [ARM] use __used attribute
  [ARM] enable arbitary speed tty ioctls and split input/output speed
  [ARM] remove unused header file: arch/arm/mach-s3c2410/bast.h
  [ARM] 4406/1: Trivial NSLU2 / NAS-100D header & setup code cleanup
  [ARM] 4405/1: NSLU2, DSM-G600 frequency fixup code
  [ARM] 4404/1: Trivial IXP42x Kconfig cleanup
  [ARM] 4403/1: Make the PXA-I2C driver work with lockdep validator
  [ARM] 4402/1: S3C2443: Add physical address of HSMMC controller
  [ARM] 4401/1: S3C2443: Add definitions for port GPIOJ
parents aa2d3322 cdea4606

arch/arm/kernel/armksyms.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ extern void fp_enter(void); 
#define EXPORT_SYMBOL_ALIAS(sym,orig)		\

 EXPORT_CRC_ALIAS(sym)				\

 static const struct kernel_symbol __ksymtab_##sym	\

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

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

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



/*

arch/arm/kernel/stacktrace.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ int walk_stackframe(unsigned long fp, unsigned long low, unsigned long high, 
		/*

		 * Check current frame pointer is within bounds

		 */

		if ((fp - 12) < low || fp + 4 >= high)

		if (fp < (low + 12) || fp + 4 >= high)

			break;



		frame = (struct stackframe *)(fp - 12);

arch/arm/mach-at91/board-dk.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static struct mtd_partition __initdata dk_nand_partition[] = { 
	},

};



static struct mtd_partition *nand_partitions(int size, int *num_partitions)

static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)

{

	*num_partitions = ARRAY_SIZE(dk_nand_partition);

	return dk_nand_partition;

arch/arm/mach-at91/board-kb9202.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static struct mtd_partition __initdata kb9202_nand_partition[] = { 
	},

};



static struct mtd_partition *nand_partitions(int size, int *num_partitions)

static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)

{

	*num_partitions = ARRAY_SIZE(kb9202_nand_partition);

	return kb9202_nand_partition;

arch/arm/mach-at91/board-sam9261ek.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static struct mtd_partition __initdata ek_nand_partition[] = { 
	},

};



static struct mtd_partition *nand_partitions(int size, int *num_partitions)

static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)

{

	*num_partitions = ARRAY_SIZE(ek_nand_partition);

	return ek_nand_partition;