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

Commit 52b920ef authored by minz1's avatar minz1
Browse files

Merge tag 'v3.10.86' into cm-14.1 

This is the 3.10.86 stable release
parents 0f23201b 78fb9f42

Makefile

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

PATCHLEVEL = 10

SUBLEVEL = 85

SUBLEVEL = 86

EXTRAVERSION =

NAME = TOSSUG Baby Fish

arch/arc/include/asm/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ struct callee_regs { 
	long r13;

};



#define instruction_pointer(regs)	((regs)->ret)

#define instruction_pointer(regs)	(unsigned long)((regs)->ret)

#define profile_pc(regs)		instruction_pointer(regs)



/* return 1 if user mode or 0 if kernel mode */

arch/s390/kernel/sclp.S

+4 −0
Original line number Diff line number Diff line
@@ -276,6 +276,8 @@ ENTRY(_sclp_print_early) 
	jno	.Lesa2

	ahi	%r15,-80

	stmh	%r6,%r15,96(%r15)		# store upper register halves

	basr	%r13,0

	lmh	%r0,%r15,.Lzeroes-.(%r13)	# clear upper register halves

.Lesa2:

#endif

	lr	%r10,%r2			# save string pointer
@@ -299,6 +301,8 @@ ENTRY(_sclp_print_early) 
#endif

	lm	%r6,%r15,120(%r15)		# restore registers

	br	%r14

.Lzeroes:

	.fill	64,4,0



.LwritedataS4:

	.long	0x00760005			# SCLP command for write data

arch/tile/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -1064,7 +1064,7 @@ static void __init load_hv_initrd(void) 


void __init free_initrd_mem(unsigned long begin, unsigned long end)

{

	free_bootmem(__pa(begin), end - begin);

	free_bootmem_late(__pa(begin), end - begin);

}



#else

arch/x86/boot/compressed/head_32.S

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ ENTRY(efi_pe_entry) 
	call	reloc

reloc:

	popl	%ecx

	subl	reloc, %ecx

	subl	$reloc, %ecx

	movl	%ecx, BP_code32_start(%eax)



	sub	$0x4, %esp