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

Commit d16c995f authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'irqchip-for-4.8-rc4' of... 

Merge tag 'irqchip-for-4.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent

Pull genirq/irqchip fixes for 4.8-rc4 from Marc Zygnier

- A critical fix for chained irqchip where we failed to configure
  the cascade interrupt trigger
- A GIC fix for self-IPI in SMP-on-UP configurations
- A PM fix for GICv3
- A initialization fix the the GICv3 ITS, triggered by kexec
parents f3b0946d 7611da86

Documentation/block/queue-sysfs.txt

+18 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,12 @@ add_random (RW) 
This file allows to turn off the disk entropy contribution. Default

This file allows to turn off the disk entropy contribution. Default

value of this file is '1'(on).

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)

discard_granularity (RO)

-----------------------

-----------------------

This shows the size of internal allocation of the device in bytes, if

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.

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)

iostats (RW)

-------------

-------------

This file is used to control (on/off) the iostats accounting of the

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

setting from "write back" to "write through", since that will also

eliminate cache flushes issued by the kernel.

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
 
Jens Axboe <jens.axboe@oracle.com>, February 2009

MAINTAINERS

+1 −0
Original line number Original line Diff line number Diff line
@@ -1004,6 +1004,7 @@ N: meson 
ARM/Annapurna Labs ALPINE ARCHITECTURE

ARM/Annapurna Labs ALPINE ARCHITECTURE

M:	Tsahee Zidenberg <tsahee@annapurnalabs.com>

M:	Tsahee Zidenberg <tsahee@annapurnalabs.com>

M:	Antoine Tenart <antoine.tenart@free-electrons.com>

M:	Antoine Tenart <antoine.tenart@free-electrons.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

S:	Maintained

F:	arch/arm/mach-alpine/

F:	arch/arm/mach-alpine/

F:	arch/arm/boot/dts/alpine*

F:	arch/arm/boot/dts/alpine*

Makefile

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

VERSION = 4

PATCHLEVEL = 8

PATCHLEVEL = 8

SUBLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc1

EXTRAVERSION = -rc2

NAME = Psychotic Stoned Sheep

NAME = Psychotic Stoned Sheep





# *DOCUMENTATION*

# *DOCUMENTATION*
@@ -635,13 +635,6 @@ endif 
# Tell gcc to never replace conditional load with a non-conditional one

# Tell gcc to never replace conditional load with a non-conditional one

KBUILD_CFLAGS	+= $(call cc-option,--param=allow-store-data-races=0)

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

include scripts/Makefile.gcc-plugins





ifdef CONFIG_READABLE_ASM

ifdef CONFIG_READABLE_ASM

arch/arm/Makefile

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

platdirs := $(patsubst %,arch/arm/plat-%/,$(sort $(plat-y)))





ifneq ($(CONFIG_ARCH_MULTIPLATFORM),y)

ifneq ($(CONFIG_ARCH_MULTIPLATFORM),y)

ifneq ($(CONFIG_ARM_SINGLE_ARMV7M),y)

ifeq ($(KBUILD_SRC),)

ifeq ($(KBUILD_SRC),)

KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(machdirs) $(platdirs))

KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(machdirs) $(platdirs))

else

else

KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs))

KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs))

endif

endif

endif

endif

endif





export	TEXT_OFFSET GZFLAGS MMUEXT

export	TEXT_OFFSET GZFLAGS MMUEXT

arch/arm/boot/dts/arm-realview-pbx-a9.dts

+4 −5
Original line number Original line Diff line number Diff line
@@ -70,13 +70,12 @@ 
		 * associativity as these may be erroneously set

		 * associativity as these may be erroneously set

		 * up by boot loader(s).

		 * up by boot loader(s).

		 */

		 */

		cache-size = <1048576>; // 1MB

		cache-size = <131072>; // 128KB

		cache-sets = <4096>;

		cache-sets = <512>;

		cache-line-size = <32>;

		cache-line-size = <32>;

		arm,parity-disable;

		arm,parity-disable;

		arm,tag-latency = <1>;

		arm,tag-latency = <1 1 1>;

		arm,data-latency = <1 1>;

		arm,data-latency = <1 1 1>;

		arm,dirty-latency = <1>;

	};

	};





	scu: scu@1f000000 {

	scu: scu@1f000000 {