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

Commit 5460afcd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch 'origin/tmp-6f7da290' into msm-next" into msm-next

parents 8ce0be61 a6f38165

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2964,7 +2964,7 @@ F: sound/pci/oxygen/ 


C6X ARCHITECTURE

M:	Mark Salter <msalter@redhat.com>

M:	Aurelien Jacquiot <a-jacquiot@ti.com>

M:	Aurelien Jacquiot <jacquiot.aurelien@gmail.com>

L:	linux-c6x-dev@linux-c6x.org

W:	http://www.linux-c6x.org/wiki/index.php/Main_Page

S:	Maintained

Makefile

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

PATCHLEVEL = 12

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION =

NAME = Fearless Coyote



# *DOCUMENTATION*

arch/arc/include/asm/processor.h

+0 −2
Original line number Diff line number Diff line
@@ -86,8 +86,6 @@ struct task_struct; 
#define TSK_K_BLINK(tsk)	TSK_K_REG(tsk, 4)

#define TSK_K_FP(tsk)		TSK_K_REG(tsk, 0)



#define thread_saved_pc(tsk)	TSK_K_BLINK(tsk)



extern void start_thread(struct pt_regs * regs, unsigned long pc,

			 unsigned long usp);

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1416,6 +1416,7 @@ choice 
	config VMSPLIT_3G

		bool "3G/1G user/kernel split"

	config VMSPLIT_3G_OPT

		depends on !ARM_LPAE

		bool "3G/1G user/kernel split (for full 1G low memory)"

	config VMSPLIT_2G

		bool "2G/2G user/kernel split"

arch/arm/boot/compressed/efi-header.S

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
		@ there.

		.inst	'M' | ('Z' << 8) | (0x1310 << 16)   @ tstne r0, #0x4d000

#else

		W(mov)	r0, r0

 AR_CLASS(	mov	r0, r0		)

  M_CLASS(	nop.w			)

#endif

		.endm