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

Commit c37d6154 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'disintegrate-asm-generic' of... 

Merge branch 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells/linux-headers into asm-generic

Patches from David Howells <dhowells@redhat.com>:

This is to complete part of the UAPI disintegration for which the
preparatory patches were pulled recently.

Note that there are some fixup patches which are at the base of the
branch aimed at you, plus all arches get the asm-generic branch merged in too.

* 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells/linux-headers

:
  UAPI: (Scripted) Disintegrate include/asm-generic
  UAPI: Fix conditional header installation handling (notably kvm_para.h on m68k)
  c6x: remove c6x signal.h
  UAPI: Split compound conditionals containing __KERNEL__ in Arm64
  UAPI: Fix the guards on various asm/unistd.h files

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e7a570ff 8a1ab315

Documentation/ABI/testing/ima_policy

+21 −4
Original line number Diff line number Diff line
@@ -12,11 +12,14 @@ Description: 
		then closing the file.  The new policy takes effect after

		the file ima/policy is closed.



		IMA appraisal, if configured, uses these file measurements

		for local measurement appraisal.



		rule format: action [condition ...]



		action: measure | dont_measure

		action: measure | dont_measure | appraise | dont_appraise | audit

		condition:= base | lsm

			base:	[[func=] [mask=] [fsmagic=] [uid=]]

			base:	[[func=] [mask=] [fsmagic=] [uid=] [fowner]]

			lsm:	[[subj_user=] [subj_role=] [subj_type=]

				 [obj_user=] [obj_role=] [obj_type=]]
@@ -24,36 +27,50 @@ Description: 
			mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]

			fsmagic:= hex value

			uid:= decimal value

			fowner:=decimal value

		lsm:  	are LSM specific



		default policy:

			# PROC_SUPER_MAGIC

			dont_measure fsmagic=0x9fa0

			dont_appraise fsmagic=0x9fa0

			# SYSFS_MAGIC

			dont_measure fsmagic=0x62656572

			dont_appraise fsmagic=0x62656572

			# DEBUGFS_MAGIC

			dont_measure fsmagic=0x64626720

			dont_appraise fsmagic=0x64626720

			# TMPFS_MAGIC

			dont_measure fsmagic=0x01021994

			dont_appraise fsmagic=0x01021994

			# RAMFS_MAGIC

			dont_measure fsmagic=0x858458f6

			dont_appraise fsmagic=0x858458f6

			# SECURITYFS_MAGIC

			dont_measure fsmagic=0x73636673

			dont_appraise fsmagic=0x73636673



			measure func=BPRM_CHECK

			measure func=FILE_MMAP mask=MAY_EXEC

			measure func=FILE_CHECK mask=MAY_READ uid=0

			appraise fowner=0



		The default policy measures all executables in bprm_check,

		all files mmapped executable in file_mmap, and all files

		open for read by root in do_filp_open.

		open for read by root in do_filp_open.  The default appraisal

		policy appraises all files owned by root.



		Examples of LSM specific definitions:



		SELinux:

			# SELINUX_MAGIC

			dont_measure fsmagic=0xF97CFF8C

			dont_measure fsmagic=0xf97cff8c

			dont_appraise fsmagic=0xf97cff8c



			dont_measure obj_type=var_log_t

			dont_appraise obj_type=var_log_t

			dont_measure obj_type=auditd_log_t

			dont_appraise obj_type=auditd_log_t

			measure subj_user=system_u func=FILE_CHECK mask=MAY_READ

			measure subj_role=system_r func=FILE_CHECK mask=MAY_READ

Documentation/ABI/testing/sysfs-bus-usb

+7 −0
Original line number Diff line number Diff line
@@ -220,3 +220,10 @@ Description: 
		If the device doesn't support LTM, the file will read "no".

		The file will be present for all speeds of USB devices, and will

		always read "no" for USB 1.1 and USB 2.0 devices.



What:		/sys/bus/usb/devices/.../(hub interface)/portX

Date:		August 2012

Contact:	Lan Tianyu <tianyu.lan@intel.com>

Description:

		The /sys/bus/usb/devices/.../(hub interface)/portX

		is usb port device's sysfs directory.

Documentation/ABI/testing/sysfs-class-extcon

+11 −11
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ Description: 
		accessory cables have such capability. For example,

		the 30-pin port of Nuri board (/arch/arm/mach-exynos)

		may have both HDMI and Charger attached, or analog audio,

		video, and USB cables attached simulteneously.

		video, and USB cables attached simultaneously.



		If there are cables mutually exclusive with each other,

		such binary relations may be expressed with extcon_dev's
@@ -35,7 +35,7 @@ Description: 
		The /sys/class/extcon/.../state shows and stores the cable

		attach/detach information of the corresponding extcon object.

		If the extcon object has an optional callback "show_state"

		defined, the showing function is overriden with the optional

		defined, the showing function is overridden with the optional

		callback.



		If the default callback for showing function is used, the
@@ -46,19 +46,19 @@ Description: 
		TA=1

		EAR_JACK=0

		#

		In this example, the extcon device have USB_OTG and TA

		In this example, the extcon device has USB_OTG and TA

		cables attached and HDMI and EAR_JACK cables detached.



		In order to update the state of an extcon device, enter a hex

		state number starting with 0x.

		 echo 0xHEX > state

		state number starting with 0x:

		# echo 0xHEX > state



		This updates the whole state of the extcon dev.

		This updates the whole state of the extcon device.

		Inputs of all the methods are required to meet the

		mutually_exclusive contidions if they exist.

		mutually_exclusive conditions if they exist.



		It is recommended to use this "global" state interface if

		you need to enter the value atomically. The later state

		you need to set the value atomically. The later state

		interface associated with each cable cannot update

		multiple cable states of an extcon device simultaneously.
@@ -73,7 +73,7 @@ What: /sys/class/extcon/.../cable.x/state 
Date:		February 2012

Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>

Description:

		The /sys/class/extcon/.../cable.x/name shows and stores the

		The /sys/class/extcon/.../cable.x/state shows and stores the

		state of cable "x" (integer between 0 and 31) of an extcon

		device. The state value is either 0 (detached) or 1

		(attached).
@@ -83,8 +83,8 @@ Date: December 2011 
Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>

Description:

		Shows the relations of mutually exclusiveness. For example,

		if the mutually_exclusive array of extcon_dev is

		{0x3, 0x5, 0xC, 0x0}, the, the output is:

		if the mutually_exclusive array of extcon device is

		{0x3, 0x5, 0xC, 0x0}, then the output is:

		# ls mutually_exclusive/

		0x3

		0x5

Documentation/ABI/testing/sysfs-class-regulator

+21 −0
Original line number Diff line number Diff line
@@ -349,3 +349,24 @@ Description: 


		This will be one of the same strings reported by

		the "state" attribute.



What:		/sys/class/regulator/.../bypass

Date:		September 2012

KernelVersion:	3.7

Contact:	Mark Brown <broonie@opensource.wolfsonmicro.com>

Description:

		Some regulator directories will contain a field called

		bypass.  This indicates if the device is in bypass mode.



		This will be one of the following strings:



		'enabled'

		'disabled'

		'unknown'



		'enabled' means the regulator is in bypass mode.



		'disabled' means that the regulator is regulating.



		'unknown' means software cannot determine the state, or

		the reported state is invalid.

Documentation/ABI/testing/sysfs-devices-system-cpu

+11 −0
Original line number Diff line number Diff line
@@ -176,3 +176,14 @@ Description: Disable L3 cache indices 
		All AMD processors with L3 caches provide this functionality.

		For details, see BKDGs at

		http://developer.amd.com/documentation/guides/Pages/default.aspx





What:		/sys/devices/system/cpu/cpufreq/boost

Date:		August 2012

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

Description:	Processor frequency boosting control



		This switch controls the boost setting for the whole system.

		Boosting allows the CPU and the firmware to run at a frequency

		beyound it's nominal limit.

		More details can be found in Documentation/cpu-freq/boost.txt