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

Commit 3b5fdc0c authored by Alex Shi's avatar Alex Shi
Browse files

Merge tag 'v3.18.41' into linux-linaro-lsk-v3.18 

 This is the 3.18.41 stable release
parents e8aab86f e9e1b43e

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 18

SUBLEVEL = 40

SUBLEVEL = 41

EXTRAVERSION =

NAME = Diseased Newt

arch/arc/include/asm/entry.h

+10 −7
Original line number Diff line number Diff line
@@ -143,8 +143,6 @@ 
	POP	r13

.endm



#define OFF_USER_R25_FROM_R24	(SZ_CALLEE_REGS + SZ_PT_REGS - 8)/4



/*--------------------------------------------------------------

 * Collect User Mode callee regs as struct callee_regs - needed by

 * fork/do_signal/unaligned-access-emulation.
@@ -157,12 +155,13 @@ 
 *-------------------------------------------------------------*/

.macro SAVE_CALLEE_SAVED_USER



	mov	r12, sp		; save SP as ref to pt_regs

	SAVE_R13_TO_R24



#ifdef CONFIG_ARC_CURR_IN_REG

	; Retrieve orig r25 and save it on stack

	ld.as   r12, [sp, OFF_USER_R25_FROM_R24]

	st.a    r12, [sp, -4]

	; Retrieve orig r25 and save it with rest of callee_regs

	ld	r12, [r12, PT_user_r25]

	PUSH	r12

#else

	PUSH	r25

#endif
@@ -209,12 +208,16 @@ 
.macro RESTORE_CALLEE_SAVED_USER



#ifdef CONFIG_ARC_CURR_IN_REG

	ld.ab   r12, [sp, 4]

	st.as   r12, [sp, OFF_USER_R25_FROM_R24]

	POP	r12

#else

	POP	r25

#endif

	RESTORE_R24_TO_R13



	; SP is back to start of pt_regs

#ifdef CONFIG_ARC_CURR_IN_REG

	st	r12, [sp, PT_user_r25]

#endif

.endm



/*--------------------------------------------------------------

arch/arc/include/asm/irqflags.h

+1 −1
Original line number Diff line number Diff line
@@ -159,10 +159,10 @@ static inline int arch_irqs_disabled(void) 
.endm



.macro IRQ_ENABLE  scratch

	TRACE_ASM_IRQ_ENABLE

	lr	\scratch, [status32]

	or	\scratch, \scratch, (STATUS_E1_MASK | STATUS_E2_MASK)

	flag	\scratch

	TRACE_ASM_IRQ_ENABLE

.endm



#endif	/* __ASSEMBLY__ */

arch/arc/include/uapi/asm/elf.h

+9 −2
Original line number Diff line number Diff line
@@ -13,8 +13,15 @@ 


/* Machine specific ELF Hdr flags */

#define EF_ARC_OSABI_MSK	0x00000f00

#define EF_ARC_OSABI_ORIG	0x00000000   /* MUST be zero for back-compat */

#define EF_ARC_OSABI_CURRENT	0x00000300   /* v3 (no legacy syscalls) */



#define EF_ARC_OSABI_V3		0x00000300   /* v3 (no legacy syscalls) */

#define EF_ARC_OSABI_V4		0x00000400   /* v4 (64bit data any reg align) */



#if __GNUC__ < 6

#define EF_ARC_OSABI_CURRENT	EF_ARC_OSABI_V3

#else

#define EF_ARC_OSABI_CURRENT	EF_ARC_OSABI_V4

#endif



typedef unsigned long elf_greg_t;

typedef unsigned long elf_fpregset_t;

arch/arc/kernel/arcksyms.c

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ extern void __muldf3(void); 
extern void __divdf3(void);

extern void __floatunsidf(void);

extern void __floatunsisf(void);

extern void __udivdi3(void);



EXPORT_SYMBOL(__ashldi3);

EXPORT_SYMBOL(__ashrdi3);
@@ -45,6 +46,7 @@ EXPORT_SYMBOL(__muldf3); 
EXPORT_SYMBOL(__divdf3);

EXPORT_SYMBOL(__floatunsidf);

EXPORT_SYMBOL(__floatunsisf);

EXPORT_SYMBOL(__udivdi3);



/* ARC optimised assembler routines */

EXPORT_SYMBOL(memset);