Commit 805f53f0 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branches 'armv7', 'at91', 'misc' and 'omap' into devel

parents 23688e99 b85fe927 c5f12503 cc150b03

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/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) };



/*

arch/arm/kernel/module.c

+2 −2
Original line number Diff line number Diff line
@@ -116,8 +116,8 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex, 


			offset += sym->st_value - loc;

			if (offset & 3 ||

			    offset <= (s32)0xfc000000 ||

			    offset >= (s32)0x04000000) {

			    offset <= (s32)0xfe000000 ||

			    offset >= (s32)0x02000000) {

				printk(KERN_ERR

				       "%s: relocation out of range, section "

				       "%d reloc %d sym '%s'\n", module->name,

CRA Git | Maintained and supported by SUSTech CRA and CCSE