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

Commit f1dabf0b authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-scan', 'acpi-sysfs', 'acpi-wdat' and 'acpi-tables' 

* acpi-scan:
  ACPI / scan: Prefer devices without _HID/_CID for _ADR matching
  ACPI: Drop misplaced acpi_dma_deconfigure() call from acpi_bind_one()

* acpi-sysfs:
  ACPI / sysfs: Provide quirk mechanism to prevent GPE flooding

* acpi-wdat:
  ACPI / watchdog: Print out error number when device creation fails

* acpi-tables:
  ACPI / DMAR: Avoid passing NULL to acpi_put_table()
parents c2a6bbaf 9c4aa1ee c6e2c1e1 696c7f8e

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/admin-guide/kernel-parameters.txt

+10 −0
Original line number Diff line number Diff line
@@ -106,6 +106,16 @@ 
			use by PCI

			Format: <irq>,<irq>...



	acpi_mask_gpe=  [HW,ACPI]

			Due to the existence of _Lxx/_Exx, some GPEs triggered

			by unsupported hardware/firmware features can result in

                        GPE floodings that cannot be automatically disabled by

                        the GPE dispatcher.

			This facility can be used to prevent such uncontrolled

			GPE floodings.

			Format: <int>

			Support masking of GPEs numbered from 0x00 to 0x7f.



	acpi_no_auto_serialize	[HW,ACPI]

			Disable auto-serialization of AML methods

			AML control methods that contain the opcodes to create

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