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

Commit b83ea91f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' into perf/core, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 8eb22c98 580df49e

Documentation/cgroup-v2.txt

+4 −0
Original line number Diff line number Diff line
@@ -843,6 +843,10 @@ PAGE_SIZE multiple when read back. 
		Amount of memory used to cache filesystem data,

		including tmpfs and shared memory.



	  sock



		Amount of memory used in network transmission buffers



	  file_mapped



		Amount of cached filesystem data mapped with mmap()

Documentation/filesystems/proc.txt

+5 −8
Original line number Diff line number Diff line
@@ -240,8 +240,8 @@ Table 1-2: Contents of the status files (as of 4.1) 
 RssFile                     size of resident file mappings

 RssShmem                    size of resident shmem memory (includes SysV shm,

                             mapping of tmpfs and shared anonymous mappings)

 VmData                      size of data, stack, and text segments

 VmStk                       size of data, stack, and text segments

 VmData                      size of private data segments

 VmStk                       size of stack segments

 VmExe                       size of text segment

 VmLib                       size of shared library code

 VmPTE                       size of page table entries
@@ -356,7 +356,7 @@ address perms offset dev inode pathname 
a7cb1000-a7cb2000 ---p 00000000 00:00 0

a7cb2000-a7eb2000 rw-p 00000000 00:00 0

a7eb2000-a7eb3000 ---p 00000000 00:00 0

a7eb3000-a7ed5000 rw-p 00000000 00:00 0          [stack:1001]

a7eb3000-a7ed5000 rw-p 00000000 00:00 0

a7ed5000-a8008000 r-xp 00000000 03:00 4222       /lib/libc.so.6

a8008000-a800a000 r--p 00133000 03:00 4222       /lib/libc.so.6

a800a000-a800b000 rw-p 00135000 03:00 4222       /lib/libc.so.6
@@ -388,7 +388,6 @@ is not associated with a file: 


 [heap]                   = the heap of the program

 [stack]                  = the stack of the main process

 [stack:1001]             = the stack of the thread with tid 1001

 [vdso]                   = the "virtual dynamic shared object",

                            the kernel system call handler
@@ -396,10 +395,8 @@ is not associated with a file: 


The /proc/PID/task/TID/maps is a view of the virtual memory from the viewpoint

of the individual tasks of a process. In this file you will see a mapping marked

as [stack] if that task sees it as a stack. This is a key difference from the

content of /proc/PID/maps, where you will see all mappings that are being used

as stack by all of those tasks. Hence, for the example above, the task-level

map, i.e. /proc/PID/task/TID/maps for thread 1001 will look like this:

as [stack] if that task sees it as a stack. Hence, for the example above, the

task-level map, i.e. /proc/PID/task/TID/maps for thread 1001 will look like this:



08048000-08049000 r-xp 00000000 03:00 8312       /opt/test

08049000-0804a000 rw-p 00001000 03:00 8312       /opt/test

Documentation/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -1496,6 +1496,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			could change it dynamically, usually by

			/sys/module/printk/parameters/ignore_loglevel.



	ignore_rlimit_data

			Ignore RLIMIT_DATA setting for data mappings,

			print warning at first misuse.  Can be changed via

			/sys/module/kernel/parameters/ignore_rlimit_data.



	ihash_entries=	[KNL]

			Set number of hash buckets for inode cache.

MAINTAINERS

+20 −3
Original line number Diff line number Diff line
@@ -967,6 +967,8 @@ M: Rob Herring <robh@kernel.org> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-highbank/

F:	arch/arm/boot/dts/highbank.dts

F:	arch/arm/boot/dts/ecx-*.dts*



ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT

M:	Krzysztof Halasa <khalasa@piap.pl>
@@ -1042,6 +1044,7 @@ M: Barry Song <baohua@kernel.org> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git

S:	Maintained

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

F:	arch/arm/mach-prima2/

F:	drivers/clk/sirf/

F:	drivers/clocksource/timer-prima2.c
@@ -1143,6 +1146,10 @@ W: http://www.hisilicon.com 
S:	Supported

T:	git git://github.com/hisilicon/linux-hisi.git

F:	arch/arm/mach-hisi/

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

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

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

F:	arch/arm64/boot/dts/hisilicon/



ARM/HP JORNADA 7XX MACHINE SUPPORT

M:	Kristoffer Ericson <kristoffer.ericson@gmail.com>
@@ -1219,6 +1226,7 @@ M: Santosh Shilimkar <ssantosh@kernel.org> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-keystone/

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

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git



ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
@@ -1287,6 +1295,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Maintained

F:	arch/arm/mach-berlin/

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

F:	arch/arm64/boot/dts/marvell/berlin*





ARM/Marvell Dove/MV78xx0/Orion SOC support
@@ -1425,6 +1434,7 @@ S: Maintained 
F:	arch/arm/boot/dts/qcom-*.dts

F:	arch/arm/boot/dts/qcom-*.dtsi

F:	arch/arm/mach-qcom/

F:	arch/arm64/boot/dts/qcom/*

F:	drivers/soc/qcom/

F:	drivers/tty/serial/msm_serial.h

F:	drivers/tty/serial/msm_serial.c
@@ -1484,6 +1494,8 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

S:	Maintained

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

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

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

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

F:	arch/arm64/boot/dts/exynos/

F:	arch/arm/plat-samsung/
@@ -1563,6 +1575,7 @@ S: Maintained 
F:	arch/arm/mach-socfpga/

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

F:	arch/arm/configs/socfpga_defconfig

F:	arch/arm64/boot/dts/altera/

W:	http://www.rocketboards.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
@@ -1716,7 +1729,7 @@ M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

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

F:	arch/arm64/boot/dts/arm/vexpress*

F:	arch/arm64/boot/dts/arm/

F:	arch/arm/mach-vexpress/

F:	*/*/vexpress*

F:	*/*/*/vexpress*
@@ -2343,6 +2356,7 @@ F: arch/arm/mach-bcm/ 
F:	arch/arm/boot/dts/bcm113*

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

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

F:	arch/arm64/boot/dts/broadcom/

F:	arch/arm/configs/bcm_defconfig

F:	drivers/mmc/host/sdhci-bcm-kona.c

F:	drivers/clocksource/bcm_kona_timer.c
@@ -8818,6 +8832,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
T:	git git://github.com/hzhuang1/linux.git

T:	git git://github.com/rjarzmik/linux.git

S:	Maintained

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

F:	arch/arm/mach-pxa/

F:	drivers/dma/pxa*

F:	drivers/pcmcia/pxa2xx*
@@ -8847,6 +8862,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
T:	git git://github.com/hzhuang1/linux.git

T:	git git://git.linaro.org/people/ycmiao/pxa-linux.git

S:	Maintained

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

F:	arch/arm/mach-mmp/



PXA MMCI DRIVER
@@ -10291,6 +10307,7 @@ L: spear-devel@list.st.com 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.st.com/spear

S:	Maintained

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

F:	arch/arm/mach-spear/



SPEAR CLOCK FRAMEWORK SUPPORT
@@ -12133,7 +12150,7 @@ F: drivers/net/hamradio/*scc.c 
F:	drivers/net/hamradio/z8530.h



ZBUD COMPRESSED PAGE ALLOCATOR

M:	Seth Jennings <sjennings@variantweb.net>

M:	Seth Jennings <sjenning@redhat.com>

L:	linux-mm@kvack.org

S:	Maintained

F:	mm/zbud.c
@@ -12188,7 +12205,7 @@ F: include/linux/zsmalloc.h 
F:	Documentation/vm/zsmalloc.txt



ZSWAP COMPRESSED SWAP CACHING

M:	Seth Jennings <sjennings@variantweb.net>

M:	Seth Jennings <sjenning@redhat.com>

L:	linux-mm@kvack.org

S:	Maintained

F:	mm/zswap.c

drivers/char/ipmi/ipmi_si_intf.c

+1 −2
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 
#include <linux/of_platform.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/acpi.h>



#ifdef CONFIG_PARISC

#include <asm/hardware.h>	/* for register_parisc_driver() stuff */
@@ -2054,8 +2055,6 @@ static int hardcode_find_bmc(void) 


#ifdef CONFIG_ACPI



#include <linux/acpi.h>



/*

 * Once we get an ACPI failure, we don't try any more, because we go

 * through the tables sequentially.  Once we don't find a table, there