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

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

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

parents 9d149c27 c2e26114

arch/arm/kernel/module.c

+2 −0
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex, 
			break;



		case R_ARM_PC24:

		case R_ARM_CALL:

		case R_ARM_JUMP24:

			offset = (*(u32 *)loc & 0x00ffffff) << 2;

			if (offset & 0x02000000)

				offset -= 0x04000000;

arch/arm/mach-pxa/pm.c

+5 −4
Original line number Diff line number Diff line
@@ -155,19 +155,20 @@ int pxa_pm_enter(suspend_state_t state) 
	PSPR = 0;



	/* restore registers */

	RESTORE_GPLEVEL(0); RESTORE_GPLEVEL(1); RESTORE_GPLEVEL(2);

	RESTORE(GPDR0); RESTORE(GPDR1); RESTORE(GPDR2);

	RESTORE(GAFR0_L); RESTORE(GAFR0_U);

	RESTORE(GAFR1_L); RESTORE(GAFR1_U);

	RESTORE(GAFR2_L); RESTORE(GAFR2_U);

	RESTORE_GPLEVEL(0); RESTORE_GPLEVEL(1); RESTORE_GPLEVEL(2);

	RESTORE(GPDR0); RESTORE(GPDR1); RESTORE(GPDR2);

	RESTORE(GRER0); RESTORE(GRER1); RESTORE(GRER2);

	RESTORE(GFER0); RESTORE(GFER1); RESTORE(GFER2);

	RESTORE(PGSR0); RESTORE(PGSR1); RESTORE(PGSR2);



#ifdef CONFIG_PXA27x

	RESTORE(MDREFR);

	RESTORE(GAFR3_L); RESTORE(GAFR3_U); RESTORE_GPLEVEL(3);

	RESTORE(GPDR3); RESTORE(GRER3); RESTORE(GFER3); RESTORE(PGSR3);

	RESTORE_GPLEVEL(3); RESTORE(GPDR3);

	RESTORE(GAFR3_L); RESTORE(GAFR3_U);

	RESTORE(GRER3); RESTORE(GFER3); RESTORE(PGSR3);

	RESTORE(PWER); RESTORE(PCFR); RESTORE(PRER);

	RESTORE(PFER); RESTORE(PKWR);

#endif

include/asm-arm/elf.h

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ typedef unsigned long elf_freg_t[3]; 
#define R_ARM_NONE	0

#define R_ARM_PC24	1

#define R_ARM_ABS32	2

#define R_ARM_CALL	28

#define R_ARM_JUMP24	29



#define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t))

typedef elf_greg_t elf_gregset_t[ELF_NGREG];