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

Commit a41dfe79 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'v4.10-rc2' into devel 

Linux 4.10-rc2
parents 3655a1ca 0c744ea4

Documentation/DocBook/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ DOCBOOKS := z8530book.xml \ 
	    kernel-api.xml filesystems.xml lsm.xml kgdb.xml \

	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \

	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \

	    80211.xml sh.xml regulator.xml w1.xml \

	    sh.xml regulator.xml w1.xml \

	    writing_musb_glue_layer.xml iio.xml



ifeq ($(DOCBOOKS),)

Documentation/unaligned-memory-access.txt

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ bool ether_addr_equal(const u8 *addr1, const u8 *addr2) 
#else

	const u16 *a = (const u16 *)addr1;

	const u16 *b = (const u16 *)addr2;

	return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) != 0;

	return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) == 0;

#endif

}

Makefile

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

PATCHLEVEL = 10

SUBLEVEL = 0

EXTRAVERSION = -rc1

EXTRAVERSION = -rc2

NAME = Roaring Lionus



# *DOCUMENTATION*

arch/arm64/include/asm/asm-uaccess.h

0 → 100644
+65 −0
Original line number Diff line number Diff line 
#ifndef __ASM_ASM_UACCESS_H

#define __ASM_ASM_UACCESS_H



#include <asm/alternative.h>

#include <asm/kernel-pgtable.h>

#include <asm/sysreg.h>

#include <asm/assembler.h>



/*

 * User access enabling/disabling macros.

 */

#ifdef CONFIG_ARM64_SW_TTBR0_PAN

	.macro	__uaccess_ttbr0_disable, tmp1

	mrs	\tmp1, ttbr1_el1		// swapper_pg_dir

	add	\tmp1, \tmp1, #SWAPPER_DIR_SIZE	// reserved_ttbr0 at the end of swapper_pg_dir

	msr	ttbr0_el1, \tmp1		// set reserved TTBR0_EL1

	isb

	.endm



	.macro	__uaccess_ttbr0_enable, tmp1

	get_thread_info \tmp1

	ldr	\tmp1, [\tmp1, #TSK_TI_TTBR0]	// load saved TTBR0_EL1

	msr	ttbr0_el1, \tmp1		// set the non-PAN TTBR0_EL1

	isb

	.endm



	.macro	uaccess_ttbr0_disable, tmp1

alternative_if_not ARM64_HAS_PAN

	__uaccess_ttbr0_disable \tmp1

alternative_else_nop_endif

	.endm



	.macro	uaccess_ttbr0_enable, tmp1, tmp2

alternative_if_not ARM64_HAS_PAN

	save_and_disable_irq \tmp2		// avoid preemption

	__uaccess_ttbr0_enable \tmp1

	restore_irq \tmp2

alternative_else_nop_endif

	.endm

#else

	.macro	uaccess_ttbr0_disable, tmp1

	.endm



	.macro	uaccess_ttbr0_enable, tmp1, tmp2

	.endm

#endif



/*

 * These macros are no-ops when UAO is present.

 */

	.macro	uaccess_disable_not_uao, tmp1

	uaccess_ttbr0_disable \tmp1

alternative_if ARM64_ALT_PAN_NOT_UAO

	SET_PSTATE_PAN(1)

alternative_else_nop_endif

	.endm



	.macro	uaccess_enable_not_uao, tmp1, tmp2

	uaccess_ttbr0_enable \tmp1, \tmp2

alternative_if ARM64_ALT_PAN_NOT_UAO

	SET_PSTATE_PAN(0)

alternative_else_nop_endif

	.endm



#endif

arch/arm64/include/asm/uaccess.h

+0 −64
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#include <asm/kernel-pgtable.h>

#include <asm/sysreg.h>



#ifndef __ASSEMBLY__



/*

 * User space memory access functions

 */
@@ -424,66 +422,4 @@ extern long strncpy_from_user(char *dest, const char __user *src, long count); 
extern __must_check long strlen_user(const char __user *str);

extern __must_check long strnlen_user(const char __user *str, long n);



#else	/* __ASSEMBLY__ */



#include <asm/assembler.h>



/*

 * User access enabling/disabling macros.

 */

#ifdef CONFIG_ARM64_SW_TTBR0_PAN

	.macro	__uaccess_ttbr0_disable, tmp1

	mrs	\tmp1, ttbr1_el1		// swapper_pg_dir

	add	\tmp1, \tmp1, #SWAPPER_DIR_SIZE	// reserved_ttbr0 at the end of swapper_pg_dir

	msr	ttbr0_el1, \tmp1		// set reserved TTBR0_EL1

	isb

	.endm



	.macro	__uaccess_ttbr0_enable, tmp1

	get_thread_info \tmp1

	ldr	\tmp1, [\tmp1, #TSK_TI_TTBR0]	// load saved TTBR0_EL1

	msr	ttbr0_el1, \tmp1		// set the non-PAN TTBR0_EL1

	isb

	.endm



	.macro	uaccess_ttbr0_disable, tmp1

alternative_if_not ARM64_HAS_PAN

	__uaccess_ttbr0_disable \tmp1

alternative_else_nop_endif

	.endm



	.macro	uaccess_ttbr0_enable, tmp1, tmp2

alternative_if_not ARM64_HAS_PAN

	save_and_disable_irq \tmp2		// avoid preemption

	__uaccess_ttbr0_enable \tmp1

	restore_irq \tmp2

alternative_else_nop_endif

	.endm

#else

	.macro	uaccess_ttbr0_disable, tmp1

	.endm



	.macro	uaccess_ttbr0_enable, tmp1, tmp2

	.endm

#endif



/*

 * These macros are no-ops when UAO is present.

 */

	.macro	uaccess_disable_not_uao, tmp1

	uaccess_ttbr0_disable \tmp1

alternative_if ARM64_ALT_PAN_NOT_UAO

	SET_PSTATE_PAN(1)

alternative_else_nop_endif

	.endm



	.macro	uaccess_enable_not_uao, tmp1, tmp2

	uaccess_ttbr0_enable \tmp1, \tmp2

alternative_if ARM64_ALT_PAN_NOT_UAO

	SET_PSTATE_PAN(0)

alternative_else_nop_endif

	.endm



#endif	/* __ASSEMBLY__ */



#endif /* __ASM_UACCESS_H */