Merge branch 'perf/urgent' into perf/core, to pick up dependency (bc06f00d) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/block/queue-sysfs.txt

+18 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,12 @@ add_random (RW)
		This file allows to turn off the disk entropy contribution. Default
		value of this file is '1'(on).

		dax (RO)
		--------
		This file indicates whether the device supports Direct Access (DAX),
		used by CPU-addressable storage to bypass the pagecache. It shows '1'
		if true, '0' if not.

		discard_granularity (RO)
		-----------------------
		This shows the size of internal allocation of the device in bytes, if
		@@ -46,6 +52,12 @@ hw_sector_size (RO)
		-------------------
		This is the hardware sector size of the device, in bytes.

		io_poll (RW)
		------------
		When read, this file shows the total number of block IO polls and how
		many returned success. Writing '0' to this file will disable polling
		for this device. Writing any non-zero value will enable this feature.

		iostats (RW)
		-------------
		This file is used to control (on/off) the iostats accounting of the
		@@ -151,5 +163,11 @@ device state. This means that it might not be safe to toggle the
		setting from "write back" to "write through", since that will also
		eliminate cache flushes issued by the kernel.

		write_same_max_bytes (RO)
		-------------------------
		This is the number of bytes the device can write in a single write-same
		command. A value of '0' means write-same is not supported by this
		device.


		Jens Axboe <jens.axboe@oracle.com>, February 2009

+1 −0

Original line number	Diff line number	Diff line
		@@ -1004,6 +1004,7 @@ N: meson
		ARM/Annapurna Labs ALPINE ARCHITECTURE
		M: Tsahee Zidenberg <tsahee@annapurnalabs.com>
		M: Antoine Tenart <antoine.tenart@free-electrons.com>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		F: arch/arm/mach-alpine/
		F: arch/arm/boot/dts/alpine*

+1 −8

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 8
		SUBLEVEL = 0
		EXTRAVERSION = -rc1
		EXTRAVERSION = -rc2
		NAME = Psychotic Stoned Sheep

		# DOCUMENTATION
		@@ -635,13 +635,6 @@ endif
		# Tell gcc to never replace conditional load with a non-conditional one
		KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0)

		PHONY += gcc-plugins
		gcc-plugins: scripts_basic
		ifdef CONFIG_GCC_PLUGINS
		$(Q)$(MAKE) $(build)=scripts/gcc-plugins
		endif
		@:

		include scripts/Makefile.gcc-plugins

		ifdef CONFIG_READABLE_ASM

+2 −0

Original line number	Diff line number	Diff line
		@@ -260,12 +260,14 @@ machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
		platdirs := $(patsubst %,arch/arm/plat-%/,$(sort $(plat-y)))

		ifneq ($(CONFIG_ARCH_MULTIPLATFORM),y)
		ifneq ($(CONFIG_ARM_SINGLE_ARMV7M),y)
		ifeq ($(KBUILD_SRC),)
		KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(machdirs) $(platdirs))
		else
		KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs))
		endif
		endif
		endif

		export TEXT_OFFSET GZFLAGS MMUEXT

+4 −5

Original line number	Diff line number	Diff line
		@@ -70,13 +70,12 @@
		* associativity as these may be erroneously set
		* up by boot loader(s).
		*/
		cache-size = <1048576>; // 1MB
		cache-sets = <4096>;
		cache-size = <131072>; // 128KB
		cache-sets = <512>;
		cache-line-size = <32>;
		arm,parity-disable;
		arm,tag-latency = <1>;
		arm,data-latency = <1 1>;
		arm,dirty-latency = <1>;
		arm,tag-latency = <1 1 1>;
		arm,data-latency = <1 1 1>;
		};

		scu: scu@1f000000 {