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

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

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

* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: pm: ensure ARMv7 CPUs save and restore the TLS register
  ARM: pm: proc-v7: fix missing struct processor pointers for suspend code
  ARM: 6969/1: plat-iop: fix build error
  ARM: 6961/1: zImage: Add build-time check for correctly-sized proc_type entries
  ARM: SMP: wait for CPU to be marked active
  ARM: 6963/1: Thumb-2: Relax relocation requirements for non-function symbols
  ARM: 6962/1: mach-h720x: fix build error
  ARM: 6959/1: SMP build fix for entry-macro-multi.S
parents 9c317b3b 111b20d0

arch/arm/boot/compressed/head.S

+13 −1
Original line number Diff line number Diff line
@@ -597,6 +597,8 @@ __common_mmu_cache_on: 
		sub	pc, lr, r0, lsr #32	@ properly flush pipeline

#endif



#define PROC_ENTRY_SIZE (4*5)



/*

 * Here follow the relocatable cache support functions for the

 * various processors.  This is a generic hook for locating an
@@ -624,7 +626,7 @@ call_cache_fn: adr r12, proc_types 
 ARM(		addeq	pc, r12, r3		) @ call cache function

 THUMB(		addeq	r12, r3			)

 THUMB(		moveq	pc, r12			) @ call cache function

		add	r12, r12, #4*5

		add	r12, r12, #PROC_ENTRY_SIZE

		b	1b



/*
@@ -794,6 +796,16 @@ proc_types: 


		.size	proc_types, . - proc_types



		/*

		 * If you get a "non-constant expression in ".if" statement"

		 * error from the assembler on this line, check that you have

		 * not accidentally written a "b" instruction where you should

		 * have written W(b).

		 */

		.if (. - proc_types) % PROC_ENTRY_SIZE != 0

		.error "The size of one or more proc_types entries is wrong."

		.endif



/*

 * Turn off the Cache and MMU.  ARMv3 does not support

 * reading the control register, but ARMv4 does.

arch/arm/include/asm/assembler.h

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ 
 *  Do not include any C declarations in this file - it is included by

 *  assembler source.

 */

#ifndef __ASM_ASSEMBLER_H__

#define __ASM_ASSEMBLER_H__



#ifndef __ASSEMBLY__

#error "Only include this from assembly code"

#endif
@@ -290,3 +293,4 @@ 
	.macro	ldrusr, reg, ptr, inc, cond=al, rept=1, abort=9001f

	usracc	ldr, \reg, \ptr, \inc, \cond, \rept, \abort

	.endm

#endif /* __ASM_ASSEMBLER_H__ */

arch/arm/include/asm/entry-macro-multi.S

+2 −0
Original line number Diff line number Diff line 
#include <asm/assembler.h>



/*

 * Interrupt handling.  Preserves r7, r8, r9

 */

arch/arm/kernel/module.c

+11 −2
Original line number Diff line number Diff line
@@ -193,8 +193,17 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex, 
				offset -= 0x02000000;

			offset += sym->st_value - loc;



			/* only Thumb addresses allowed (no interworking) */

			if (!(offset & 1) ||

			/*

			 * For function symbols, only Thumb addresses are

			 * allowed (no interworking).

			 *

			 * For non-function symbols, the destination

			 * has no specific ARM/Thumb disposition, so

			 * the branch is resolved under the assumption

			 * that interworking is not required.

			 */

			if ((ELF32_ST_TYPE(sym->st_info) == STT_FUNC &&

				!(offset & 1)) ||

			    offset <= (s32)0xff000000 ||

			    offset >= (s32)0x01000000) {

				pr_err("%s: section %u reloc %u sym '%s': relocation %u out of range (%#lx -> %#x)\n",

arch/arm/kernel/smp.c

+5 −1
Original line number Diff line number Diff line
@@ -318,9 +318,13 @@ asmlinkage void __cpuinit secondary_start_kernel(void) 
	smp_store_cpu_info(cpu);



	/*

	 * OK, now it's safe to let the boot CPU continue

	 * OK, now it's safe to let the boot CPU continue.  Wait for

	 * the CPU migration code to notice that the CPU is online

	 * before we continue.

	 */

	set_cpu_online(cpu, true);

	while (!cpu_active(cpu))

		cpu_relax();



	/*

	 * OK, it's off to the idle thread for us