Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668',... (ec28dcc6) · Commits · 戴 / test

.gitignore

+12 −7

Original line number	Diff line number	Diff line
		@@ -34,13 +34,18 @@ modules.builtin
		#
		# Top-level generic files
		#
		tags
		TAGS
		vmlinux
		vmlinuz
		System.map
		Module.markers
		Module.symvers
		/tags
		/TAGS
		/linux
		/vmlinux
		/vmlinuz
		/System.map
		/Module.markers
		/Module.symvers

		#
		# git files that we don't want to ignore even it they are dot-files
		#
		!.gitignore
		!.mailmap

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		What: /sys/devices/system/node/nodeX
		Date: October 2002
		Contact: Linux Memory Management list <linux-mm@kvack.org>
		Description:
		When CONFIG_NUMA is enabled, this is a directory containing
		information on node X such as what CPUs are local to the
		node.

+6 −6

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ Description:
		lsm: [[subj_user=] [subj_role=] [subj_type=]
		[obj_user=] [obj_role=] [obj_type=]]

		base: func:= [BPRM_CHECK][FILE_MMAP][INODE_PERMISSION]
		base: func:= [BPRM_CHECK][FILE_MMAP][FILE_CHECK]
		mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]
		fsmagic:= hex value
		uid:= decimal value
		@@ -40,11 +40,11 @@ Description:

		measure func=BPRM_CHECK
		measure func=FILE_MMAP mask=MAY_EXEC
		measure func=INODE_PERM mask=MAY_READ uid=0
		measure func=FILE_CHECK mask=MAY_READ uid=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 inode_permission.
		open for read by root in do_filp_open.

		Examples of LSM specific definitions:

		@@ -54,8 +54,8 @@ Description:

		dont_measure obj_type=var_log_t
		dont_measure obj_type=auditd_log_t
		measure subj_user=system_u func=INODE_PERM mask=MAY_READ
		measure subj_role=system_r func=INODE_PERM mask=MAY_READ
		measure subj_user=system_u func=FILE_CHECK mask=MAY_READ
		measure subj_role=system_r func=FILE_CHECK mask=MAY_READ

		Smack:
		measure subj_user=_ func=INODE_PERM mask=MAY_READ
		measure subj_user=_ func=FILE_CHECK mask=MAY_READ

+14 −0

Original line number	Diff line number	Diff line
		@@ -128,3 +128,17 @@ Description:
		preferred request size for workloads where sustained
		throughput is desired. If no optimal I/O size is
		reported this file contains 0.

		What: /sys/block/<disk>/queue/nomerges
		Date: January 2010
		Contact:
		Description:
		Standard I/O elevator operations include attempts to
		merge contiguous I/Os. For known random I/O loads these
		attempts will always fail and result in extra cycles
		being spent in the kernel. This allows one to turn off
		this behavior on one of two ways: When set to 1, complex
		merge checks are disabled, but the simple one-shot merges
		with the previous I/O request are enabled. When set to 2,
		all merge tries are disabled. The default value is 0 -
		which enables all types of merge tries.

+11 −0

Original line number	Diff line number	Diff line
		@@ -159,3 +159,14 @@ Description:
		device. This is useful to ensure auto probing won't
		match the driver to the device. For example:
		# echo "046d c315" > /sys/bus/usb/drivers/foo/remove_id

		What: /sys/bus/usb/device/.../avoid_reset
		Date: December 2009
		Contact: Oliver Neukum <oliver@neukum.org>
		Description:
		Writing 1 to this file tells the kernel that this
		device will morph into another mode when it is reset.
		Drivers will not use reset for error handling for
		such devices.
		Users:
		usb_modeswitch