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

Commit 932c37c3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (28 commits)
  ARM: OMAP: Fix GCC-reported compile time bug
  ARM: OMAP: restore CONFIG_GENERIC_TIME
  ARM: OMAP: partial LED fixes
  ARM: OMAP: add SoSSI clock (call propagate_rate for childrens)
  ARM: OMAP: FB sync with N800 tree (support for dynamic SRAM allocations)
  ARM: OMAP: Sync framebuffer headers with N800 tree
  ARM: OMAP: Mostly cosmetic to sync up with linux-omap tree
  ARM: OMAP: Fix gpmc header
  ARM: OMAP: Add mailbox support for IVA
  [ARM] armv7: add Makefile and Kconfig entries
  [ARM] armv7: add support for asid-tagged VIVT I-cache
  [ARM] armv7: add dedicated ARMv7 barrier instructions
  [ARM] armv7: Add ARMv7 cacheid macros
  [ARM] armv7: add support for ARMv7 cores.
  [ARM] Fix ARM branch relocation range
  [ARM] 4363/1: AT91: Remove legacy PIO definitions
  [ARM] 4361/1: AT91: Build error
  ARM: OMAP: Sync core code with linux-omap
  ARM: OMAP: Sync headers with linux-omap
  ARM: OMAP: h4 must have blinky leds!!
  ...
parents c855ff37 805f53f0

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -354,6 +354,7 @@ config ARCH_SA1100 
config ARCH_S3C2410

	bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443"

	select GENERIC_GPIO

	select GENERIC_TIME

	help

	  Samsung S3C2410X CPU based systems, such as the Simtec Electronics

	  BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or

arch/arm/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -47,8 +47,13 @@ comma = , 
# Note that GCC does not numerically define an architecture version

# macro, but instead defines a whole series of macros which makes

# testing for a specific architecture or later rather impossible.

arch-$(CONFIG_CPU_32v7)		:=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7a,-march=armv5t -Wa$(comma)-march=armv7a)

arch-$(CONFIG_CPU_32v6)		:=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6)

# Only override the compiler option if ARMv6. The ARMv6K extensions are

# always available in ARMv7

ifeq ($(CONFIG_CPU_32v6),y)

arch-$(CONFIG_CPU_32v6K)	:=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6k,-march=armv5t -Wa$(comma)-march=armv6k)

endif

arch-$(CONFIG_CPU_32v5)		:=-D__LINUX_ARM_ARCH__=5 $(call cc-option,-march=armv5te,-march=armv4t)

arch-$(CONFIG_CPU_32v4T)	:=-D__LINUX_ARM_ARCH__=4 -march=armv4t

arch-$(CONFIG_CPU_32v4)		:=-D__LINUX_ARM_ARCH__=4 -march=armv4

arch/arm/kernel/head-nommu.S

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
 * numbers for r1.

 *

 */

	__INIT

	.section ".text.head", "ax"

	.type	stext, %function

ENTRY(stext)

	msr	cpsr_c, #PSR_F_BIT | PSR_I_BIT | SVC_MODE @ ensure svc mode

arch/arm/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
 * crap here - that's what the boot loader (or in extreme, well justified

 * circumstances, zImage) is for.

 */

	__INIT

	.section ".text.head", "ax"

	.type	stext, %function

ENTRY(stext)

	msr	cpsr_c, #PSR_F_BIT | PSR_I_BIT | SVC_MODE @ ensure svc mode

arch/arm/kernel/init_task.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ EXPORT_SYMBOL(init_mm); 
 * The things we do for performance..

 */

union thread_union init_thread_union

	__attribute__((__section__(".init.task"))) =

	__attribute__((__section__(".data.init_task"))) =

		{ INIT_THREAD_INFO(init_task) };



/*