aboutsummaryrefslogtreecommitdiffstats
path: root/main/linux-virtgrsec
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2015-02-07 18:43:51 +0000
committerTimo Teräs <timo.teras@iki.fi>2015-02-07 18:51:03 +0000
commit487ca1f83f2abb45ae87261156c2f8b57b29e6e6 (patch)
treee036663d47d996162a1e4e6f8a9be7e1d645600e /main/linux-virtgrsec
parent4dfdfa84eb51520c4b8aeba678606e6af6326cd5 (diff)
downloadaports-487ca1f83f2abb45ae87261156c2f8b57b29e6e6.tar.bz2
aports-487ca1f83f2abb45ae87261156c2f8b57b29e6e6.tar.xz
main/linux-virtgrsec: upgrade to 3.18.6
Diffstat (limited to 'main/linux-virtgrsec')
-rw-r--r--main/linux-virtgrsec/APKBUILD34
-rw-r--r--main/linux-virtgrsec/grsecurity-3.0-3.18.6-201502062100.patch (renamed from main/linux-virtgrsec/grsecurity-3.0-3.14.31-201502021853.patch)27589
-rw-r--r--main/linux-virtgrsec/kernelconfig.x86400
-rw-r--r--main/linux-virtgrsec/kernelconfig.x86_64422
4 files changed, 14069 insertions, 14376 deletions
diff --git a/main/linux-virtgrsec/APKBUILD b/main/linux-virtgrsec/APKBUILD
index 91a9bb20a3..af4946de22 100644
--- a/main/linux-virtgrsec/APKBUILD
+++ b/main/linux-virtgrsec/APKBUILD
@@ -3,7 +3,7 @@
_flavor=virtgrsec
pkgname=linux-${_flavor}
-pkgver=3.14.31
+pkgver=3.18.6
case $pkgver in
*.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=${pkgver};;
@@ -18,7 +18,7 @@ _config=${config:-kernelconfig.${CARCH}}
install=
source="http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz
http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.xz
- grsecurity-3.0-3.14.31-201502021853.patch
+ grsecurity-3.0-3.18.6-201502062100.patch
fix-memory-map-for-PIE-applications.patch
imx6q-no-unclocked-sleep.patch
@@ -145,24 +145,24 @@ dev() {
"$subpkgdir"/lib/modules/${_abi_release}/build
}
-md5sums="b621207b3f6ecbb67db18b13258f8ea8 linux-3.14.tar.xz
-be2e0f3f1ebc124940571ca6130dc478 patch-3.14.31.xz
-228c15c924d4a1d9091a41bf9919ce36 grsecurity-3.0-3.14.31-201502021853.patch
+md5sums="9e854df51ca3fef8bfe566dbd7b89241 linux-3.18.tar.xz
+30aa769974e64fd17a01724d1577a913 patch-3.18.6.xz
+1bb44c0a509107101392b4d5e1c1bd10 grsecurity-3.0-3.18.6-201502062100.patch
c6a4ae7e8ca6159e1631545515805216 fix-memory-map-for-PIE-applications.patch
1a307fc1d63231bf01d22493a4f14378 imx6q-no-unclocked-sleep.patch
-6b30dd8284f37ecc244d556bebf32046 kernelconfig.x86
-8df8378d305bdd302b01293ff44e982d kernelconfig.x86_64"
-sha256sums="61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa linux-3.14.tar.xz
-4eb7743905bad80c8502d88913cfb5424c1772dbe44af30da97ed4198b12e4a1 patch-3.14.31.xz
-8584450f656fe28e621eac2946f0f9cf20250a6a5c8a228f3e51989a449bd90a grsecurity-3.0-3.14.31-201502021853.patch
+4938a7329976fd579206cb814ee75ef6 kernelconfig.x86
+54daab617c2eab14d08afed2c8321620 kernelconfig.x86_64"
+sha256sums="becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd linux-3.18.tar.xz
+84046931be1a0024eb7d2817480efe62e6b5e651257f4ed4114ddcbce92a23bb patch-3.18.6.xz
+060c24087ed82d984ba8a956c5719857f9fcf425f99858e110a34135313e9e85 grsecurity-3.0-3.18.6-201502062100.patch
500f3577310be52e87b9fecdc2e9c4ca43210fd97d69089f9005d484563f74c7 fix-memory-map-for-PIE-applications.patch
21179fbb22a5b74af0a609350ae1a170e232908572b201d02e791d2ce0a685d3 imx6q-no-unclocked-sleep.patch
-5e06e22ca723e50ae9f4bfabdda2e738f7b28cbbfe77b6be295285d6cd75c916 kernelconfig.x86
-0ec1e1eb4445bd9751cb98a55afd4a430bed08e8d8c3c0a107d2f14ec5746dd2 kernelconfig.x86_64"
-sha512sums="5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e linux-3.14.tar.xz
-93db5af7a604ebc5012efa7864fb2583db8ff0ca985e0f4194d688808ced3c666ff5271a6a19cf1de8102834bd512370d613bd7d33e186c16069220cf54c16ad patch-3.14.31.xz
-2cdd0a767e01b8ed05cae5409a956aae82cf16fde662552e5c77a13a106ad00b94cbae50a746b7da0d4b20ed4b2d918f4c0cd57f1740393afc45d47ac1f83755 grsecurity-3.0-3.14.31-201502021853.patch
+baa8e42965fb7e4ab66f99eca6d5959c13919cdc67d31d949da4831b9a4addfa kernelconfig.x86
+9bfda1dcffa2401e515d57991f105632bd20d316acc4807388f3a04e4879688e kernelconfig.x86_64"
+sha512sums="2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 linux-3.18.tar.xz
+e8755c0a88192a658a2c55b325caa4242978db546b505db6d0feb4c3dc41d3ccafe814b230513867ed915e58bf63faa31544b196066e6222f133d75c48fc8bc1 patch-3.18.6.xz
+c2377f4ec78b168d8bffab089dee1e5e60b9a453766a9bce9900bb42435bb705d8f94573c1f3f5e53d523fd10cd29a523410161ca27583566603371bbb4140ba grsecurity-3.0-3.18.6-201502062100.patch
4665c56ae1bbac311f9205d64918e84ee8b01d47d6e2396ff6b8adfb10aada7f7254531ce62e31edbb65c2a54a830f09ad05d314dfcd75d6272f4068945ad7c7 fix-memory-map-for-PIE-applications.patch
87d1ad59732f265a5b0db54490dc1762c14ea4b868e7eb1aedc3ce57b48046de7bbc08cf5cfcf6f1380fa84063b0edb16ba3d5e3c5670be9bbb229275c88b221 imx6q-no-unclocked-sleep.patch
-29dc4bbde6052bb16200d87b7137717a053ad3c716a305a51d2b523531f35c1a7e144099f7a251c85849c9117a65ed961262dd314e0832f58750f489aeb1440e kernelconfig.x86
-74b647b4a05414fac76068869aa8a84e2a5c6e571dc40abb1532b8d2ac7c6577011be3ae5fb307fa63bd9f1ee184f993ded5ed15dd94311cbbf9086f12a79de8 kernelconfig.x86_64"
+b0f57415a3b29a6e8d414fd2701cabd789d33e1a8ce9278d8e6653acbcf8fe199bf75c3bfb61330f1c1c50d2480d24b74615b65f4bc1300bfcf0a517fa05989f kernelconfig.x86
+ae0a4b3bec8498a4d836ca6097092d0e1e147dad1d94920b440226ff56100478d10d7589ffedad51d61d60082992ce6311c4a86f94550dc552d1e355fb73563c kernelconfig.x86_64"
diff --git a/main/linux-virtgrsec/grsecurity-3.0-3.14.31-201502021853.patch b/main/linux-virtgrsec/grsecurity-3.0-3.18.6-201502062100.patch
index 7d0e977e50..7f1798fea0 100644
--- a/main/linux-virtgrsec/grsecurity-3.0-3.14.31-201502021853.patch
+++ b/main/linux-virtgrsec/grsecurity-3.0-3.18.6-201502062100.patch
@@ -1,9 +1,9 @@
diff --git a/Documentation/dontdiff b/Documentation/dontdiff
-index b89a739..e289b9b 100644
+index 9de9813..1462492 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
-@@ -2,9 +2,11 @@
- *.aux
+@@ -3,9 +3,11 @@
+ *.bc
*.bin
*.bz2
+*.c.[012]*.*
@@ -14,7 +14,7 @@ index b89a739..e289b9b 100644
*.dsp
*.dvi
*.elf
-@@ -14,6 +16,7 @@
+@@ -15,6 +17,7 @@
*.gcov
*.gen.S
*.gif
@@ -22,7 +22,7 @@ index b89a739..e289b9b 100644
*.grep
*.grp
*.gz
-@@ -48,14 +51,17 @@
+@@ -51,14 +54,17 @@
*.tab.h
*.tex
*.ver
@@ -41,7 +41,7 @@ index b89a739..e289b9b 100644
.*.d
.mm
53c700_d.h
-@@ -69,9 +75,11 @@ Image
+@@ -72,9 +78,11 @@ Image
Module.markers
Module.symvers
PENDING
@@ -53,7 +53,7 @@ index b89a739..e289b9b 100644
aconf
af_names.h
aic7*reg.h*
-@@ -80,6 +88,7 @@ aic7*seq.h*
+@@ -83,6 +91,7 @@ aic7*seq.h*
aicasm
aicdb.h*
altivec*.c
@@ -61,7 +61,7 @@ index b89a739..e289b9b 100644
asm-offsets.h
asm_offsets.h
autoconf.h*
-@@ -92,32 +101,40 @@ bounds.h
+@@ -95,32 +104,40 @@ bounds.h
bsetup
btfixupprep
build
@@ -102,7 +102,7 @@ index b89a739..e289b9b 100644
fixdep
flask.h
fore200e_mkfirm
-@@ -125,12 +142,15 @@ fore200e_pca_fw.c*
+@@ -128,12 +145,15 @@ fore200e_pca_fw.c*
gconf
gconf.glade.h
gen-devlist
@@ -118,7 +118,7 @@ index b89a739..e289b9b 100644
hpet_example
hugepage-mmap
hugepage-shm
-@@ -145,14 +165,14 @@ int32.c
+@@ -148,14 +168,14 @@ int32.c
int4.c
int8.c
kallsyms
@@ -135,7 +135,7 @@ index b89a739..e289b9b 100644
logo_*.c
logo_*_clut224.c
logo_*_mono.c
-@@ -162,14 +182,15 @@ mach-types.h
+@@ -165,14 +185,15 @@ mach-types.h
machtypes.h
map
map_hugetlb
@@ -152,7 +152,7 @@ index b89a739..e289b9b 100644
mkprep
mkregtable
mktables
-@@ -185,6 +206,8 @@ oui.c*
+@@ -188,6 +209,8 @@ oui.c*
page-types
parse.c
parse.h
@@ -161,7 +161,7 @@ index b89a739..e289b9b 100644
patches*
pca200e.bin
pca200e_ecd.bin2
-@@ -194,6 +217,7 @@ perf-archive
+@@ -197,6 +220,7 @@ perf-archive
piggyback
piggy.gzip
piggy.S
@@ -169,7 +169,7 @@ index b89a739..e289b9b 100644
pnmtologo
ppc_defs.h*
pss_boot.h
-@@ -203,7 +227,12 @@ r200_reg_safe.h
+@@ -206,7 +230,12 @@ r200_reg_safe.h
r300_reg_safe.h
r420_reg_safe.h
r600_reg_safe.h
@@ -182,7 +182,7 @@ index b89a739..e289b9b 100644
relocs
rlim_names.h
rn50_reg_safe.h
-@@ -213,8 +242,12 @@ series
+@@ -216,8 +245,12 @@ series
setup
setup.bin
setup.elf
@@ -195,7 +195,7 @@ index b89a739..e289b9b 100644
split-include
syscalltab.h
tables.c
-@@ -224,6 +257,7 @@ tftpboot.img
+@@ -227,6 +260,7 @@ tftpboot.img
timeconst.h
times.h*
trix_boot.h
@@ -203,7 +203,7 @@ index b89a739..e289b9b 100644
utsrelease.h*
vdso-syms.lds
vdso.lds
-@@ -235,13 +269,17 @@ vdso32.lds
+@@ -238,13 +272,17 @@ vdso32.lds
vdso32.so.dbg
vdso64.lds
vdso64.so.dbg
@@ -221,7 +221,7 @@ index b89a739..e289b9b 100644
vmlinuz
voffset.h
vsyscall.lds
-@@ -249,9 +287,12 @@ vsyscall_32.lds
+@@ -252,9 +290,12 @@ vsyscall_32.lds
wanxlfw.inc
uImage
unifdef
@@ -234,11 +234,89 @@ index b89a739..e289b9b 100644
zconf.hash.c
+zconf.lex.c
zoffset.h
+diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
+index a311db8..415b28c 100644
+--- a/Documentation/kbuild/makefiles.txt
++++ b/Documentation/kbuild/makefiles.txt
+@@ -23,10 +23,11 @@ This document describes the Linux kernel Makefiles.
+ === 4 Host Program support
+ --- 4.1 Simple Host Program
+ --- 4.2 Composite Host Programs
+- --- 4.3 Using C++ for host programs
+- --- 4.4 Controlling compiler options for host programs
+- --- 4.5 When host programs are actually built
+- --- 4.6 Using hostprogs-$(CONFIG_FOO)
++ --- 4.3 Defining shared libraries
++ --- 4.4 Using C++ for host programs
++ --- 4.5 Controlling compiler options for host programs
++ --- 4.6 When host programs are actually built
++ --- 4.7 Using hostprogs-$(CONFIG_FOO)
+
+ === 5 Kbuild clean infrastructure
+
+@@ -642,7 +643,29 @@ Both possibilities are described in the following.
+ Finally, the two .o files are linked to the executable, lxdialog.
+ Note: The syntax <executable>-y is not permitted for host-programs.
+
+---- 4.3 Using C++ for host programs
++--- 4.3 Defining shared libraries
++
++ Objects with extension .so are considered shared libraries, and
++ will be compiled as position independent objects.
++ Kbuild provides support for shared libraries, but the usage
++ shall be restricted.
++ In the following example the libkconfig.so shared library is used
++ to link the executable conf.
++
++ Example:
++ #scripts/kconfig/Makefile
++ hostprogs-y := conf
++ conf-objs := conf.o libkconfig.so
++ libkconfig-objs := expr.o type.o
++
++ Shared libraries always require a corresponding -objs line, and
++ in the example above the shared library libkconfig is composed by
++ the two objects expr.o and type.o.
++ expr.o and type.o will be built as position independent code and
++ linked as a shared library libkconfig.so. C++ is not supported for
++ shared libraries.
++
++--- 4.4 Using C++ for host programs
+
+ kbuild offers support for host programs written in C++. This was
+ introduced solely to support kconfig, and is not recommended
+@@ -665,7 +688,7 @@ Both possibilities are described in the following.
+ qconf-cxxobjs := qconf.o
+ qconf-objs := check.o
+
+---- 4.4 Controlling compiler options for host programs
++--- 4.5 Controlling compiler options for host programs
+
+ When compiling host programs, it is possible to set specific flags.
+ The programs will always be compiled utilising $(HOSTCC) passed
+@@ -693,7 +716,7 @@ Both possibilities are described in the following.
+ When linking qconf, it will be passed the extra option
+ "-L$(QTDIR)/lib".
+
+---- 4.5 When host programs are actually built
++--- 4.6 When host programs are actually built
+
+ Kbuild will only build host-programs when they are referenced
+ as a prerequisite.
+@@ -724,7 +747,7 @@ Both possibilities are described in the following.
+ This will tell kbuild to build lxdialog even if not referenced in
+ any rule.
+
+---- 4.6 Using hostprogs-$(CONFIG_FOO)
++--- 4.7 Using hostprogs-$(CONFIG_FOO)
+
+ A typical pattern in a Kbuild file looks like this:
+
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index 5d91ba1..935a4e7 100644
+index f4c71d4..66811b1 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -1084,6 +1084,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -1182,6 +1182,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
Format: <unsigned int> such that (rxsize & ~0x1fffc0) == 0.
Default: 1024
@@ -249,7 +327,7 @@ index 5d91ba1..935a4e7 100644
hashdist= [KNL,NUMA] Large hashes allocated during boot
are distributed across NUMA nodes. Defaults on
for 64-bit NUMA, off otherwise.
-@@ -2081,6 +2085,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -2260,6 +2264,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
noexec=on: enable non-executable mappings (default)
noexec=off: disable non-executable mappings
@@ -260,7 +338,7 @@ index 5d91ba1..935a4e7 100644
nosmap [X86]
Disable SMAP (Supervisor Mode Access Prevention)
even if it is supported by processor.
-@@ -2348,6 +2356,30 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -2552,6 +2560,30 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
the specified number of seconds. This is to be used if
your oopses keep scrolling off the screen.
@@ -292,22 +370,21 @@ index 5d91ba1..935a4e7 100644
pcd. [PARIDE]
diff --git a/Makefile b/Makefile
-index 5abf670..9b24a3b 100644
+index d2bff2d..e505117 100644
--- a/Makefile
+++ b/Makefile
-@@ -244,8 +244,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
-
+@@ -298,7 +298,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
HOSTCC = gcc
HOSTCXX = g++
--HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
+ HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89
-HOSTCXXFLAGS = -O2
-+HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
++HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -std=gnu89 -fno-delete-null-pointer-checks
+HOSTCFLAGS += $(call cc-option, -Wno-empty-body)
+HOSTCXXFLAGS = -O2 -Wall -W -Wno-array-bounds
- # Decide whether to build built-in, modular, or both.
- # Normally, just do built-in.
-@@ -423,8 +424,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
+ ifeq ($(shell $(HOSTCC) -v 2>&1 | grep -c "clang version"), 1)
+ HOSTCFLAGS += -Wno-unused-value -Wno-unused-parameter \
+@@ -445,8 +447,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
# Rules shared between *config targets and build targets
# Basic helpers built in scripts/
@@ -318,13 +395,10 @@ index 5abf670..9b24a3b 100644
$(Q)$(MAKE) $(build)=scripts/basic
$(Q)rm -f .tmp_quiet_recordmcount
-@@ -585,6 +586,75 @@ else
- KBUILD_CFLAGS += -O2
- endif
+@@ -620,6 +622,72 @@ endif
+ # Tell gcc to never replace conditional load with a non-conditional one
+ KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0)
-+# Tell gcc to never replace conditional load with a non-conditional one
-+KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0)
-+
+ifndef DISABLE_PAX_PLUGINS
+ifeq ($(call cc-ifversion, -ge, 0408, y), y)
+PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCXX)" "$(HOSTCXX)" "$(CC)")
@@ -391,10 +465,19 @@ index 5abf670..9b24a3b 100644
+endif
+endif
+
- include $(srctree)/arch/$(SRCARCH)/Makefile
-
ifdef CONFIG_READABLE_ASM
-@@ -781,7 +851,7 @@ export mod_sign_cmd
+ # Disable optimizations that make assembler listings hard to read.
+ # reorder blocks reorders the control in the function
+@@ -712,7 +780,7 @@ KBUILD_CFLAGS += $(call cc-option, -gsplit-dwarf, -g)
+ else
+ KBUILD_CFLAGS += -g
+ endif
+-KBUILD_AFLAGS += -Wa,-gdwarf-2
++KBUILD_AFLAGS += -Wa,--gdwarf-2
+ endif
+ ifdef CONFIG_DEBUG_INFO_DWARF4
+ KBUILD_CFLAGS += $(call cc-option, -gdwarf-4,)
+@@ -877,7 +945,7 @@ export mod_sign_cmd
ifeq ($(KBUILD_EXTMOD),)
@@ -403,16 +486,16 @@ index 5abf670..9b24a3b 100644
vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-@@ -830,6 +900,8 @@ endif
+@@ -924,6 +992,8 @@ endif
- # The actual objects are generated when descending,
+ # The actual objects are generated when descending,
# make sure no implicit rule kicks in
+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
$(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
# Handle descending into subdirectories listed in $(vmlinux-dirs)
-@@ -839,7 +911,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
+@@ -933,7 +1003,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
# Error messages still appears in the original language
PHONY += $(vmlinux-dirs)
@@ -421,7 +504,7 @@ index 5abf670..9b24a3b 100644
$(Q)$(MAKE) $(build)=$@
define filechk_kernel.release
-@@ -882,10 +954,13 @@ prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
+@@ -976,10 +1046,13 @@ prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
archprepare: archheaders archscripts prepare1 scripts_basic
@@ -435,8 +518,8 @@ index 5abf670..9b24a3b 100644
prepare: prepare0
# Generate some files
-@@ -993,6 +1068,8 @@ all: modules
- # using awk while concatenating to the final file.
+@@ -1094,6 +1167,8 @@ all: modules
+ # using awk while concatenating to the final file.
PHONY += modules
+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
@@ -444,7 +527,7 @@ index 5abf670..9b24a3b 100644
modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
@$(kecho) ' Building modules, stage 2.';
-@@ -1008,7 +1085,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
+@@ -1109,7 +1184,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
# Target to prepare building external modules
PHONY += modules_prepare
@@ -453,28 +536,28 @@ index 5abf670..9b24a3b 100644
# Target to install modules
PHONY += modules_install
-@@ -1074,7 +1151,10 @@ MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
+@@ -1175,7 +1250,10 @@ MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
signing_key.priv signing_key.x509 x509.genkey \
extra_certificates signing_key.x509.keyid \
-- signing_key.x509.signer
-+ signing_key.x509.signer \
+- signing_key.x509.signer include/linux/version.h
++ signing_key.x509.signer include/linux/version.h \
+ tools/gcc/size_overflow_plugin/size_overflow_hash_aux.h \
+ tools/gcc/size_overflow_plugin/size_overflow_hash.h \
+ tools/gcc/randomize_layout_seed.h
# clean - Delete most, but leave enough to build external modules
#
-@@ -1113,7 +1193,7 @@ distclean: mrproper
+@@ -1214,7 +1292,7 @@ distclean: mrproper
@find $(srctree) $(RCS_FIND_IGNORE) \
\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
-- -o -name '.*.rej' \
-+ -o -name '.*.rej' -o -name '*.so' \
- -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
+- -o -name '.*.rej' -o -name '*%' -o -name 'core' \) \
++ -o -name '.*.rej' -o -name '*.so' -o -name '*%' -o -name 'core' \) \
-type f -print | xargs rm -f
-@@ -1275,6 +1355,8 @@ PHONY += $(module-dirs) modules
+
+@@ -1380,6 +1458,8 @@ PHONY += $(module-dirs) modules
$(module-dirs): crmodverdir $(objtree)/Module.symvers
$(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
@@ -483,7 +566,7 @@ index 5abf670..9b24a3b 100644
modules: $(module-dirs)
@$(kecho) ' Building modules, stage 2.';
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
-@@ -1414,17 +1496,21 @@ else
+@@ -1520,17 +1600,21 @@ else
target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
endif
@@ -509,10 +592,10 @@ index 5abf670..9b24a3b 100644
$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
%.symtypes: %.c prepare scripts FORCE
$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
-@@ -1434,11 +1520,15 @@ endif
- $(cmd_crmodverdir)
- $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
+@@ -1542,11 +1626,15 @@ endif
$(build)=$(build-dir)
+ # Make sure the latest headers are built for Documentation
+ Documentation/: headers_install
-%/: prepare scripts FORCE
+%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
+%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
@@ -528,10 +611,10 @@ index 5abf670..9b24a3b 100644
$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
$(build)=$(build-dir) $(@:.ko=.o)
diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
-index 78b03ef..da28a51 100644
+index 8f8eafb..3405f46 100644
--- a/arch/alpha/include/asm/atomic.h
+++ b/arch/alpha/include/asm/atomic.h
-@@ -292,6 +292,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
+@@ -239,4 +239,14 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
#define atomic_dec(v) atomic_sub(1,(v))
#define atomic64_dec(v) atomic64_sub(1,(v))
@@ -545,9 +628,7 @@ index 78b03ef..da28a51 100644
+#define atomic64_dec_unchecked(v) atomic64_dec(v)
+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
+
- #define smp_mb__before_atomic_dec() smp_mb()
- #define smp_mb__after_atomic_dec() smp_mb()
- #define smp_mb__before_atomic_inc() smp_mb()
+ #endif /* _ALPHA_ATOMIC_H */
diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
index ad368a9..fbe0f25 100644
--- a/arch/alpha/include/asm/cache.h
@@ -645,10 +726,10 @@ index 2fd00b7..cfd5069 100644
for (i = 0; i < n; i++) {
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
-index 1402fcc..0b1abd2 100644
+index f9c732e..78fbb0f 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
-@@ -1298,10 +1298,11 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
+@@ -1295,10 +1295,11 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
generic version except that we know how to honor ADDR_LIMIT_32BIT. */
static unsigned long
@@ -662,7 +743,7 @@ index 1402fcc..0b1abd2 100644
info.flags = 0;
info.length = len;
-@@ -1309,6 +1310,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
+@@ -1306,6 +1307,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
info.high_limit = limit;
info.align_mask = 0;
info.align_offset = 0;
@@ -670,7 +751,7 @@ index 1402fcc..0b1abd2 100644
return vm_unmapped_area(&info);
}
-@@ -1341,20 +1343,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -1338,20 +1340,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
merely specific addresses, but regions of memory -- perhaps
this feature should be incorporated into all ports? */
@@ -700,7 +781,7 @@ index 1402fcc..0b1abd2 100644
return addr;
}
diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
-index 98838a0..b304fb4 100644
+index 9d0ac09..479a962 100644
--- a/arch/alpha/mm/fault.c
+++ b/arch/alpha/mm/fault.c
@@ -53,6 +53,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
@@ -859,27 +940,11 @@ index 98838a0..b304fb4 100644
} else if (!cause) {
/* Allow reads even for write-only mappings */
if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff --git a/arch/arc/kernel/kgdb.c b/arch/arc/kernel/kgdb.c
-index a2ff5c5..ecf6a78 100644
---- a/arch/arc/kernel/kgdb.c
-+++ b/arch/arc/kernel/kgdb.c
-@@ -158,11 +158,6 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
- return -1;
- }
-
--unsigned long kgdb_arch_pc(int exception, struct pt_regs *regs)
--{
-- return instruction_pointer(regs);
--}
--
- int kgdb_arch_init(void)
- {
- single_step_data.armed = 0;
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 4733d32..b142a40 100644
+index 89c4b5c..847a7be 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -1863,7 +1863,7 @@ config ALIGNMENT_TRAP
+@@ -1740,7 +1740,7 @@ config ALIGNMENT_TRAP
config UACCESS_WITH_MEMCPY
bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()"
@@ -888,7 +953,7 @@ index 4733d32..b142a40 100644
default y if CPU_FEROCEON
help
Implement faster copy_to_user and clear_user methods for CPU
-@@ -2126,6 +2126,7 @@ config XIP_PHYS_ADDR
+@@ -2004,6 +2004,7 @@ config XIP_PHYS_ADDR
config KEXEC
bool "Kexec system call (EXPERIMENTAL)"
depends on (!SMP || PM_SLEEP_SMP)
@@ -897,7 +962,7 @@ index 4733d32..b142a40 100644
kexec is a system call that implements the ability to shutdown your
current kernel, and to start another kernel. It is like a reboot
diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
-index 62d2cb5..26a6f3c 100644
+index e22c119..eaa807d 100644
--- a/arch/arm/include/asm/atomic.h
+++ b/arch/arm/include/asm/atomic.h
@@ -18,17 +18,41 @@
@@ -929,10 +994,10 @@ index 62d2cb5..26a6f3c 100644
* strex/ldrex monitor on some implementations. The reason we can use it for
* atomic_set() is the clrex or dummy strex done on every exception return.
*/
- #define atomic_read(v) (*(volatile int *)&(v)->counter)
+ #define atomic_read(v) ACCESS_ONCE((v)->counter)
+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
+{
-+ return *(const volatile int *)&v->counter;
++ return ACCESS_ONCE(v->counter);
+}
#define atomic_set(v,i) (((v)->counter) = (i))
+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
@@ -942,152 +1007,119 @@ index 62d2cb5..26a6f3c 100644
#if __LINUX_ARM_ARCH__ >= 6
-@@ -44,6 +68,36 @@ static inline void atomic_add(int i, atomic_t *v)
+@@ -38,26 +62,50 @@
+ * to ensure that the update happens.
+ */
- prefetchw(&v->counter);
- __asm__ __volatile__("@ atomic_add\n"
-+"1: ldrex %1, [%3]\n"
-+" adds %0, %1, %4\n"
-+
+-#define ATOMIC_OP(op, c_op, asm_op) \
+-static inline void atomic_##op(int i, atomic_t *v) \
+#ifdef CONFIG_PAX_REFCOUNT
-+" bvc 3f\n"
-+"2: " REFCOUNT_TRAP_INSN "\n"
-+"3:\n"
-+#endif
-+
-+" strex %1, %0, [%3]\n"
-+" teq %1, #0\n"
-+" bne 1b"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+"\n4:\n"
-+ _ASM_EXTABLE(2b, 4b)
-+#endif
-+
-+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
-+ : "r" (&v->counter), "Ir" (i)
-+ : "cc");
-+}
-+
-+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
-+{
-+ unsigned long tmp;
-+ int result;
-+
-+ prefetchw(&v->counter);
-+ __asm__ __volatile__("@ atomic_add_unchecked\n"
- "1: ldrex %0, [%3]\n"
- " add %0, %0, %4\n"
- " strex %1, %0, [%3]\n"
-@@ -62,6 +116,42 @@ static inline int atomic_add_return(int i, atomic_t *v)
- smp_mb();
-
- __asm__ __volatile__("@ atomic_add_return\n"
-+"1: ldrex %1, [%3]\n"
-+" adds %0, %1, %4\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+" bvc 3f\n"
-+" mov %0, %1\n"
-+"2: " REFCOUNT_TRAP_INSN "\n"
-+"3:\n"
-+#endif
-+
-+" strex %1, %0, [%3]\n"
-+" teq %1, #0\n"
-+" bne 1b"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+"\n4:\n"
++#define __OVERFLOW_POST \
++ " bvc 3f\n" \
++ "2: " REFCOUNT_TRAP_INSN "\n"\
++ "3:\n"
++#define __OVERFLOW_POST_RETURN \
++ " bvc 3f\n" \
++" mov %0, %1\n" \
++ "2: " REFCOUNT_TRAP_INSN "\n"\
++ "3:\n"
++#define __OVERFLOW_EXTABLE \
++ "4:\n" \
+ _ASM_EXTABLE(2b, 4b)
++#else
++#define __OVERFLOW_POST
++#define __OVERFLOW_POST_RETURN
++#define __OVERFLOW_EXTABLE
+#endif
+
-+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
-+ : "r" (&v->counter), "Ir" (i)
-+ : "cc");
-+
-+ smp_mb();
-+
-+ return result;
-+}
-+
-+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
-+{
-+ unsigned long tmp;
-+ int result;
-+
-+ smp_mb();
-+
-+ __asm__ __volatile__("@ atomic_add_return_unchecked\n"
- "1: ldrex %0, [%3]\n"
- " add %0, %0, %4\n"
- " strex %1, %0, [%3]\n"
-@@ -83,6 +173,36 @@ static inline void atomic_sub(int i, atomic_t *v)
++#define __ATOMIC_OP(op, suffix, c_op, asm_op, post_op, extable) \
++static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
+ { \
+ unsigned long tmp; \
+ int result; \
+ \
+ prefetchw(&v->counter); \
+- __asm__ __volatile__("@ atomic_" #op "\n" \
++ __asm__ __volatile__("@ atomic_" #op #suffix "\n" \
+ "1: ldrex %0, [%3]\n" \
+ " " #asm_op " %0, %0, %4\n" \
++ post_op \
+ " strex %1, %0, [%3]\n" \
+ " teq %1, #0\n" \
+-" bne 1b" \
++" bne 1b\n" \
++ extable \
+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
+ : "r" (&v->counter), "Ir" (i) \
+ : "cc"); \
+ } \
- prefetchw(&v->counter);
- __asm__ __volatile__("@ atomic_sub\n"
-+"1: ldrex %1, [%3]\n"
-+" subs %0, %1, %4\n"
+-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
+-static inline int atomic_##op##_return(int i, atomic_t *v) \
++#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, , c_op, asm_op, , )\
++ __ATOMIC_OP(op, _unchecked, c_op, asm_op##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
+
-+#ifdef CONFIG_PAX_REFCOUNT
-+" bvc 3f\n"
-+"2: " REFCOUNT_TRAP_INSN "\n"
-+"3:\n"
-+#endif
-+
-+" strex %1, %0, [%3]\n"
-+" teq %1, #0\n"
-+" bne 1b"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+"\n4:\n"
-+ _ASM_EXTABLE(2b, 4b)
-+#endif
-+
-+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
-+ : "r" (&v->counter), "Ir" (i)
-+ : "cc");
-+}
-+
-+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
-+{
-+ unsigned long tmp;
-+ int result;
-+
-+ prefetchw(&v->counter);
-+ __asm__ __volatile__("@ atomic_sub_unchecked\n"
- "1: ldrex %0, [%3]\n"
- " sub %0, %0, %4\n"
- " strex %1, %0, [%3]\n"
-@@ -101,11 +221,25 @@ static inline int atomic_sub_return(int i, atomic_t *v)
- smp_mb();
-
- __asm__ __volatile__("@ atomic_sub_return\n"
--"1: ldrex %0, [%3]\n"
--" sub %0, %0, %4\n"
-+"1: ldrex %1, [%3]\n"
-+" subs %0, %1, %4\n"
++#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op, post_op, extable) \
++static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
+ { \
+ unsigned long tmp; \
+ int result; \
+@@ -65,12 +113,14 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
+ smp_mb(); \
+ prefetchw(&v->counter); \
+ \
+- __asm__ __volatile__("@ atomic_" #op "_return\n" \
++ __asm__ __volatile__("@ atomic_" #op "_return" #suffix "\n" \
+ "1: ldrex %0, [%3]\n" \
+ " " #asm_op " %0, %0, %4\n" \
++ post_op \
+ " strex %1, %0, [%3]\n" \
+ " teq %1, #0\n" \
+-" bne 1b" \
++" bne 1b\n" \
++ extable \
+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
+ : "r" (&v->counter), "Ir" (i) \
+ : "cc"); \
+@@ -80,6 +130,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
+ return result; \
+ }
+
++#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, , c_op, asm_op, , )\
++ __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
++
+ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
+ {
+ int oldval;
+@@ -115,12 +168,24 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
+ __asm__ __volatile__ ("@ atomic_add_unless\n"
+ "1: ldrex %0, [%4]\n"
+ " teq %0, %5\n"
+-" beq 2f\n"
+-" add %1, %0, %6\n"
++" beq 4f\n"
++" adds %1, %0, %6\n"
+
+#ifdef CONFIG_PAX_REFCOUNT
+" bvc 3f\n"
-+" mov %0, %1\n"
+"2: " REFCOUNT_TRAP_INSN "\n"
+"3:\n"
+#endif
+
- " strex %1, %0, [%3]\n"
- " teq %1, #0\n"
- " bne 1b"
+ " strex %2, %1, [%4]\n"
+ " teq %2, #0\n"
+ " bne 1b\n"
+-"2:"
++"4:"
+
+#ifdef CONFIG_PAX_REFCOUNT
-+"\n4:\n"
+ _ASM_EXTABLE(2b, 4b)
+#endif
+
- : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
- : "r" (&v->counter), "Ir" (i)
+ : "=&r" (oldval), "=&r" (newval), "=&r" (tmp), "+Qo" (v->counter)
+ : "r" (&v->counter), "r" (u), "r" (a)
: "cc");
-@@ -138,6 +272,28 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
+@@ -131,14 +196,36 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
return oldval;
}
@@ -1116,45 +1148,59 @@ index 62d2cb5..26a6f3c 100644
#else /* ARM_ARCH_6 */
#ifdef CONFIG_SMP
-@@ -156,7 +312,17 @@ static inline int atomic_add_return(int i, atomic_t *v)
+ #error SMP not supported on pre-ARMv6 CPUs
+ #endif
- return val;
- }
-+
-+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
-+{
-+ return atomic_add_return(i, v);
-+}
-+
- #define atomic_add(i, v) (void) atomic_add_return(i, v)
-+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
-+{
-+ (void) atomic_add_return(i, v);
-+}
+-#define ATOMIC_OP(op, c_op, asm_op) \
+-static inline void atomic_##op(int i, atomic_t *v) \
++#define __ATOMIC_OP(op, suffix, c_op, asm_op) \
++static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
+ { \
+ unsigned long flags; \
+ \
+@@ -147,8 +234,11 @@ static inline void atomic_##op(int i, atomic_t *v) \
+ raw_local_irq_restore(flags); \
+ } \
- static inline int atomic_sub_return(int i, atomic_t *v)
- {
-@@ -171,6 +337,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
- return val;
+-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
+-static inline int atomic_##op##_return(int i, atomic_t *v) \
++#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, , c_op, asm_op) \
++ __ATOMIC_OP(op, _unchecked, c_op, asm_op)
++
++#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op) \
++static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
+ { \
+ unsigned long flags; \
+ int val; \
+@@ -161,6 +251,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
+ return val; \
}
- #define atomic_sub(i, v) (void) atomic_sub_return(i, v)
-+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
-+{
-+ (void) atomic_sub_return(i, v);
-+}
++#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, , c_op, asm_op)\
++ __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op)
++
static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
{
-@@ -186,9 +356,18 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
+ int ret;
+@@ -175,6 +268,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
return ret;
}
+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
+{
-+ return atomic_cmpxchg(v, old, new);
++ return atomic_cmpxchg((atomic_t *)v, old, new);
+}
+
- #endif /* __LINUX_ARM_ARCH__ */
+ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
+ {
+ int c, old;
+@@ -196,16 +294,38 @@ ATOMIC_OPS(sub, -=, sub)
+
+ #undef ATOMIC_OPS
+ #undef ATOMIC_OP_RETURN
++#undef __ATOMIC_OP_RETURN
+ #undef ATOMIC_OP
++#undef __ATOMIC_OP
#define atomic_xchg(v, new) (xchg(&((v)->counter), new))
+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
@@ -1162,11 +1208,6 @@ index 62d2cb5..26a6f3c 100644
+ return xchg(&v->counter, new);
+}
- static inline int __atomic_add_unless(atomic_t *v, int a, int u)
- {
-@@ -201,11 +380,27 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
- }
-
#define atomic_inc(v) atomic_add(1, v)
+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
+{
@@ -1192,7 +1233,7 @@ index 62d2cb5..26a6f3c 100644
#define atomic_dec_return(v) (atomic_sub_return(1, v))
#define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
-@@ -221,6 +416,14 @@ typedef struct {
+@@ -216,6 +336,14 @@ typedef struct {
long long counter;
} atomic64_t;
@@ -1207,7 +1248,7 @@ index 62d2cb5..26a6f3c 100644
#define ATOMIC64_INIT(i) { (i) }
#ifdef CONFIG_ARM_LPAE
-@@ -237,6 +440,19 @@ static inline long long atomic64_read(const atomic64_t *v)
+@@ -232,6 +360,19 @@ static inline long long atomic64_read(const atomic64_t *v)
return result;
}
@@ -1227,7 +1268,7 @@ index 62d2cb5..26a6f3c 100644
static inline void atomic64_set(atomic64_t *v, long long i)
{
__asm__ __volatile__("@ atomic64_set\n"
-@@ -245,6 +461,15 @@ static inline void atomic64_set(atomic64_t *v, long long i)
+@@ -240,6 +381,15 @@ static inline void atomic64_set(atomic64_t *v, long long i)
: "r" (&v->counter), "r" (i)
);
}
@@ -1243,7 +1284,7 @@ index 62d2cb5..26a6f3c 100644
#else
static inline long long atomic64_read(const atomic64_t *v)
{
-@@ -259,6 +484,19 @@ static inline long long atomic64_read(const atomic64_t *v)
+@@ -254,6 +404,19 @@ static inline long long atomic64_read(const atomic64_t *v)
return result;
}
@@ -1263,7 +1304,7 @@ index 62d2cb5..26a6f3c 100644
static inline void atomic64_set(atomic64_t *v, long long i)
{
long long tmp;
-@@ -273,6 +511,21 @@ static inline void atomic64_set(atomic64_t *v, long long i)
+@@ -268,29 +431,57 @@ static inline void atomic64_set(atomic64_t *v, long long i)
: "r" (&v->counter), "r" (i)
: "cc");
}
@@ -1284,156 +1325,91 @@ index 62d2cb5..26a6f3c 100644
+}
#endif
- static inline void atomic64_add(long long i, atomic64_t *v)
-@@ -284,6 +537,37 @@ static inline void atomic64_add(long long i, atomic64_t *v)
- __asm__ __volatile__("@ atomic64_add\n"
- "1: ldrexd %0, %H0, [%3]\n"
- " adds %Q0, %Q0, %Q4\n"
-+" adcs %R0, %R0, %R4\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+" bvc 3f\n"
-+"2: " REFCOUNT_TRAP_INSN "\n"
-+"3:\n"
-+#endif
-+
-+" strexd %1, %0, %H0, [%3]\n"
-+" teq %1, #0\n"
-+" bne 1b"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+"\n4:\n"
-+ _ASM_EXTABLE(2b, 4b)
-+#endif
-+
-+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
-+ : "r" (&v->counter), "r" (i)
-+ : "cc");
-+}
-+
-+static inline void atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
-+{
-+ long long result;
-+ unsigned long tmp;
-+
-+ prefetchw(&v->counter);
-+ __asm__ __volatile__("@ atomic64_add_unchecked\n"
-+"1: ldrexd %0, %H0, [%3]\n"
-+" adds %Q0, %Q0, %Q4\n"
- " adc %R0, %R0, %R4\n"
- " strexd %1, %0, %H0, [%3]\n"
- " teq %1, #0\n"
-@@ -303,6 +587,44 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
- __asm__ __volatile__("@ atomic64_add_return\n"
- "1: ldrexd %0, %H0, [%3]\n"
- " adds %Q0, %Q0, %Q4\n"
-+" adcs %R0, %R0, %R4\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+" bvc 3f\n"
-+" mov %0, %1\n"
-+" mov %H0, %H1\n"
-+"2: " REFCOUNT_TRAP_INSN "\n"
-+"3:\n"
-+#endif
-+
-+" strexd %1, %0, %H0, [%3]\n"
-+" teq %1, #0\n"
-+" bne 1b"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+"\n4:\n"
-+ _ASM_EXTABLE(2b, 4b)
-+#endif
-+
-+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
-+ : "r" (&v->counter), "r" (i)
-+ : "cc");
-+
-+ smp_mb();
-+
-+ return result;
-+}
-+
-+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
-+{
-+ long long result;
-+ unsigned long tmp;
-+
-+ smp_mb();
-+
-+ __asm__ __volatile__("@ atomic64_add_return_unchecked\n"
-+"1: ldrexd %0, %H0, [%3]\n"
-+" adds %Q0, %Q0, %Q4\n"
- " adc %R0, %R0, %R4\n"
- " strexd %1, %0, %H0, [%3]\n"
- " teq %1, #0\n"
-@@ -325,6 +647,37 @@ static inline void atomic64_sub(long long i, atomic64_t *v)
- __asm__ __volatile__("@ atomic64_sub\n"
- "1: ldrexd %0, %H0, [%3]\n"
- " subs %Q0, %Q0, %Q4\n"
-+" sbcs %R0, %R0, %R4\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+" bvc 3f\n"
-+"2: " REFCOUNT_TRAP_INSN "\n"
-+"3:\n"
-+#endif
-+
-+" strexd %1, %0, %H0, [%3]\n"
-+" teq %1, #0\n"
-+" bne 1b"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+"\n4:\n"
-+ _ASM_EXTABLE(2b, 4b)
-+#endif
-+
-+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
-+ : "r" (&v->counter), "r" (i)
-+ : "cc");
-+}
-+
-+static inline void atomic64_sub_unchecked(long long i, atomic64_unchecked_t *v)
-+{
-+ long long result;
-+ unsigned long tmp;
-+
-+ prefetchw(&v->counter);
-+ __asm__ __volatile__("@ atomic64_sub_unchecked\n"
-+"1: ldrexd %0, %H0, [%3]\n"
-+" subs %Q0, %Q0, %Q4\n"
- " sbc %R0, %R0, %R4\n"
- " strexd %1, %0, %H0, [%3]\n"
- " teq %1, #0\n"
-@@ -344,10 +697,25 @@ static inline long long atomic64_sub_return(long long i, atomic64_t *v)
- __asm__ __volatile__("@ atomic64_sub_return\n"
- "1: ldrexd %0, %H0, [%3]\n"
- " subs %Q0, %Q0, %Q4\n"
--" sbc %R0, %R0, %R4\n"
-+" sbcs %R0, %R0, %R4\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+" bvc 3f\n"
-+" mov %0, %1\n"
-+" mov %H0, %H1\n"
-+"2: " REFCOUNT_TRAP_INSN "\n"
-+"3:\n"
-+#endif
-+
- " strexd %1, %0, %H0, [%3]\n"
- " teq %1, #0\n"
- " bne 1b"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+"\n4:\n"
-+ _ASM_EXTABLE(2b, 4b)
-+#endif
+-#define ATOMIC64_OP(op, op1, op2) \
+-static inline void atomic64_##op(long long i, atomic64_t *v) \
++#undef __OVERFLOW_POST_RETURN
++#define __OVERFLOW_POST_RETURN \
++ " bvc 3f\n" \
++" mov %0, %1\n" \
++" mov %H0, %H1\n" \
++ "2: " REFCOUNT_TRAP_INSN "\n"\
++ "3:\n"
++
++#define __ATOMIC64_OP(op, suffix, op1, op2, post_op, extable) \
++static inline void atomic64_##op##suffix(long long i, atomic64##suffix##_t *v)\
+ { \
+ long long result; \
+ unsigned long tmp; \
+ \
+ prefetchw(&v->counter); \
+- __asm__ __volatile__("@ atomic64_" #op "\n" \
++ __asm__ __volatile__("@ atomic64_" #op #suffix "\n" \
+ "1: ldrexd %0, %H0, [%3]\n" \
+ " " #op1 " %Q0, %Q0, %Q4\n" \
+ " " #op2 " %R0, %R0, %R4\n" \
++ post_op \
+ " strexd %1, %0, %H0, [%3]\n" \
+ " teq %1, #0\n" \
+-" bne 1b" \
++" bne 1b\n" \
++ extable \
+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
+ : "r" (&v->counter), "r" (i) \
+ : "cc"); \
+ } \
+
+-#define ATOMIC64_OP_RETURN(op, op1, op2) \
+-static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
++#define ATOMIC64_OP(op, op1, op2) __ATOMIC64_OP(op, , op1, op2, , ) \
++ __ATOMIC64_OP(op, _unchecked, op1, op2##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
+
- : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
- : "r" (&v->counter), "r" (i)
- : "cc");
-@@ -382,6 +750,31 @@ static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
++#define __ATOMIC64_OP_RETURN(op, suffix, op1, op2, post_op, extable) \
++static inline long long atomic64_##op##_return##suffix(long long i, atomic64##suffix##_t *v) \
+ { \
+ long long result; \
+ unsigned long tmp; \
+@@ -298,13 +489,15 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
+ smp_mb(); \
+ prefetchw(&v->counter); \
+ \
+- __asm__ __volatile__("@ atomic64_" #op "_return\n" \
++ __asm__ __volatile__("@ atomic64_" #op "_return" #suffix "\n" \
+ "1: ldrexd %0, %H0, [%3]\n" \
+ " " #op1 " %Q0, %Q0, %Q4\n" \
+ " " #op2 " %R0, %R0, %R4\n" \
++ post_op \
+ " strexd %1, %0, %H0, [%3]\n" \
+ " teq %1, #0\n" \
+-" bne 1b" \
++" bne 1b\n" \
++ extable \
+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
+ : "r" (&v->counter), "r" (i) \
+ : "cc"); \
+@@ -314,6 +507,9 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
+ return result; \
+ }
+
++#define ATOMIC64_OP_RETURN(op, op1, op2) __ATOMIC64_OP_RETURN(op, , op1, op2, , ) \
++ __ATOMIC64_OP_RETURN(op, _unchecked, op1, op2##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
++
+ #define ATOMIC64_OPS(op, op1, op2) \
+ ATOMIC64_OP(op, op1, op2) \
+ ATOMIC64_OP_RETURN(op, op1, op2)
+@@ -323,7 +519,12 @@ ATOMIC64_OPS(sub, subs, sbc)
+
+ #undef ATOMIC64_OPS
+ #undef ATOMIC64_OP_RETURN
++#undef __ATOMIC64_OP_RETURN
+ #undef ATOMIC64_OP
++#undef __ATOMIC64_OP
++#undef __OVERFLOW_EXTABLE
++#undef __OVERFLOW_POST_RETURN
++#undef __OVERFLOW_POST
+
+ static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
+ long long new)
+@@ -351,6 +552,31 @@ static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
return oldval;
}
@@ -1465,7 +1441,7 @@ index 62d2cb5..26a6f3c 100644
static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
{
long long result;
-@@ -406,20 +799,34 @@ static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
+@@ -376,21 +602,35 @@ static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
static inline long long atomic64_dec_if_positive(atomic64_t *v)
{
long long result;
@@ -1473,6 +1449,7 @@ index 62d2cb5..26a6f3c 100644
+ u64 tmp;
smp_mb();
+ prefetchw(&v->counter);
__asm__ __volatile__("@ atomic64_dec_if_positive\n"
-"1: ldrexd %0, %H0, [%3]\n"
@@ -1506,7 +1483,7 @@ index 62d2cb5..26a6f3c 100644
: "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
: "r" (&v->counter)
: "cc");
-@@ -442,13 +849,25 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
+@@ -414,13 +654,25 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
" teq %0, %5\n"
" teqeq %H0, %H5\n"
" moveq %1, #0\n"
@@ -1535,7 +1512,7 @@ index 62d2cb5..26a6f3c 100644
: "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
: "r" (&v->counter), "r" (u), "r" (a)
: "cc");
-@@ -461,10 +880,13 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
+@@ -433,10 +685,13 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
#define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
#define atomic64_inc(v) atomic64_add(1LL, (v))
@@ -1550,7 +1527,7 @@ index 62d2cb5..26a6f3c 100644
#define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
-index 2f59f74..1594659 100644
+index c6a3e73..35cca85 100644
--- a/arch/arm/include/asm/barrier.h
+++ b/arch/arm/include/asm/barrier.h
@@ -63,7 +63,7 @@
@@ -1586,7 +1563,7 @@ index 75fe66b..ba3dee4 100644
#endif
diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
-index 8b8b616..d973d24 100644
+index 10e78d0..dc8505d 100644
--- a/arch/arm/include/asm/cacheflush.h
+++ b/arch/arm/include/asm/cacheflush.h
@@ -116,7 +116,7 @@ struct cpu_cache_fns {
@@ -1624,10 +1601,10 @@ index 5233151..87a71fa 100644
/*
* Fold a partial checksum without adding pseudo headers
diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
-index df2fbba..63fe3e1 100644
+index abb2c37..96db950 100644
--- a/arch/arm/include/asm/cmpxchg.h
+++ b/arch/arm/include/asm/cmpxchg.h
-@@ -102,6 +102,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
+@@ -104,6 +104,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
#define xchg(ptr,x) \
((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
@@ -1698,10 +1675,10 @@ index 6ddbe44..b5e38b1 100644
static inline void set_domain(unsigned val) { }
static inline void modify_domain(unsigned dom, unsigned type) { }
diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
-index f4b46d3..abc9b2b 100644
+index afb9caf..9a0bac0 100644
--- a/arch/arm/include/asm/elf.h
+++ b/arch/arm/include/asm/elf.h
-@@ -114,7 +114,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
+@@ -115,7 +115,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -1717,7 +1694,7 @@ index f4b46d3..abc9b2b 100644
/* When the program starts, a1 contains a pointer to a function to be
registered with atexit, as per the SVR4 ABI. A value of 0 means we
-@@ -124,10 +131,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
+@@ -125,10 +132,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
extern void elf_set_personality(const struct elf32_hdr *);
#define SET_PERSONALITY(ex) elf_set_personality(&(ex))
@@ -1743,19 +1720,19 @@ index de53547..52b9a28 100644
(unsigned long)(dest_buf) + (size)); \
\
diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
-index 2aff798..099eb15 100644
+index 53e69da..3fdc896 100644
--- a/arch/arm/include/asm/futex.h
+++ b/arch/arm/include/asm/futex.h
-@@ -45,6 +45,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
+@@ -46,6 +46,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
return -EFAULT;
+ pax_open_userland();
+
smp_mb();
- __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
- "1: ldrex %1, [%4]\n"
-@@ -60,6 +62,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
+ /* Prefetching cannot fault */
+ prefetchw(uaddr);
+@@ -63,6 +65,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
: "cc", "memory");
smp_mb();
@@ -1764,7 +1741,7 @@ index 2aff798..099eb15 100644
*uval = val;
return ret;
}
-@@ -90,6 +94,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
+@@ -93,6 +97,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
return -EFAULT;
@@ -1773,7 +1750,7 @@ index 2aff798..099eb15 100644
__asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
"1: " TUSER(ldr) " %1, [%4]\n"
" teq %1, %2\n"
-@@ -100,6 +106,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
+@@ -103,6 +109,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
: "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
: "cc", "memory");
@@ -1782,7 +1759,7 @@ index 2aff798..099eb15 100644
*uval = val;
return ret;
}
-@@ -122,6 +130,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
+@@ -125,6 +133,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
return -EFAULT;
pagefault_disable(); /* implies preempt_disable() */
@@ -1790,7 +1767,7 @@ index 2aff798..099eb15 100644
switch (op) {
case FUTEX_OP_SET:
-@@ -143,6 +152,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
+@@ -146,6 +155,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
ret = -ENOSYS;
}
@@ -1855,13 +1832,13 @@ index f98c7f3..e5c626d 100644
MT_MEMORY_DMA_READY,
};
diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
-index f94784f..9a09a4a 100644
+index 891a56b..48f337e 100644
--- a/arch/arm/include/asm/outercache.h
+++ b/arch/arm/include/asm/outercache.h
-@@ -35,7 +35,7 @@ struct outer_cache_fns {
- #endif
- void (*set_debug)(unsigned long);
- void (*resume)(void);
+@@ -36,7 +36,7 @@ struct outer_cache_fns {
+
+ /* This is an ARM L2C thing */
+ void (*write_sec)(unsigned long, unsigned);
-};
+} __no_const;
@@ -1986,7 +1963,7 @@ index 5cfba15..f415e1a 100644
#define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
#define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
-index 219ac88..73ec32a 100644
+index f027941..f36ce30 100644
--- a/arch/arm/include/asm/pgtable-2level.h
+++ b/arch/arm/include/asm/pgtable-2level.h
@@ -126,6 +126,9 @@
@@ -2000,10 +1977,10 @@ index 219ac88..73ec32a 100644
* These are the memory types, defined to be compatible with
* pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
diff --git a/arch/arm/include/asm/pgtable-3level-hwdef.h b/arch/arm/include/asm/pgtable-3level-hwdef.h
-index 626989f..9d67a33 100644
+index 9fd61c7..f8f1cff 100644
--- a/arch/arm/include/asm/pgtable-3level-hwdef.h
+++ b/arch/arm/include/asm/pgtable-3level-hwdef.h
-@@ -75,6 +75,7 @@
+@@ -76,6 +76,7 @@
#define PTE_EXT_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
#define PTE_EXT_AF (_AT(pteval_t, 1) << 10) /* Access Flag */
#define PTE_EXT_NG (_AT(pteval_t, 1) << 11) /* nG */
@@ -2012,18 +1989,23 @@ index 626989f..9d67a33 100644
/*
diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
-index 85c60ad..b0bbd7e 100644
+index a31ecdad..95e98d4 100644
--- a/arch/arm/include/asm/pgtable-3level.h
+++ b/arch/arm/include/asm/pgtable-3level.h
-@@ -82,6 +82,7 @@
- #define L_PTE_RDONLY (_AT(pteval_t, 1) << 7) /* AP[2] */
+@@ -81,6 +81,7 @@
+ #define L_PTE_USER (_AT(pteval_t, 1) << 6) /* AP[1] */
#define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
#define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
+#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
#define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
- #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55) /* unused */
- #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56) /* unused */
-@@ -95,6 +96,7 @@
+ #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55)
+ #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56)
+@@ -92,10 +93,12 @@
+ #define L_PMD_SECT_SPLITTING (_AT(pmdval_t, 1) << 56)
+ #define L_PMD_SECT_NONE (_AT(pmdval_t, 1) << 57)
+ #define L_PMD_SECT_RDONLY (_AT(pteval_t, 1) << 58)
++#define PMD_SECT_RDONLY PMD_SECT_AP2
+
/*
* To be used in assembly code with the upper page attributes.
*/
@@ -2032,7 +2014,7 @@ index 85c60ad..b0bbd7e 100644
#define L_PTE_DIRTY_HIGH (1 << (55 - 32))
diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
-index 7d59b52..27a12f8 100644
+index 3b30062..01a5f9d 100644
--- a/arch/arm/include/asm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h
@@ -33,6 +33,9 @@
@@ -2115,7 +2097,7 @@ index 7d59b52..27a12f8 100644
*/
#define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
-@@ -262,7 +310,7 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; }
+@@ -267,7 +315,7 @@ PTE_BIT_FUNC(mknexec, |= L_PTE_XN);
static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
{
const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
@@ -2125,36 +2107,36 @@ index 7d59b52..27a12f8 100644
return pte;
}
diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
-index c4ae171..ea0c0c2 100644
+index c25ef3e..735f14b 100644
--- a/arch/arm/include/asm/psci.h
+++ b/arch/arm/include/asm/psci.h
-@@ -29,7 +29,7 @@ struct psci_operations {
- int (*cpu_off)(struct psci_power_state state);
- int (*cpu_on)(unsigned long cpuid, unsigned long entry_point);
- int (*migrate)(unsigned long cpuid);
+@@ -32,7 +32,7 @@ struct psci_operations {
+ int (*affinity_info)(unsigned long target_affinity,
+ unsigned long lowest_affinity_level);
+ int (*migrate_info_type)(void);
-};
+} __no_const;
extern struct psci_operations psci_ops;
extern struct smp_operations psci_smp_ops;
diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
-index 22a3b9b..7f214ee 100644
+index 18f5a55..5072a40 100644
--- a/arch/arm/include/asm/smp.h
+++ b/arch/arm/include/asm/smp.h
-@@ -112,7 +112,7 @@ struct smp_operations {
+@@ -107,7 +107,7 @@ struct smp_operations {
int (*cpu_disable)(unsigned int cpu);
#endif
#endif
-};
+} __no_const;
- /*
- * set platform specific SMP operations
+ struct of_cpu_method {
+ const char *method;
diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
-index 3e635ee..c39f5b4 100644
+index ce73ab6..7310f8a 100644
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
-@@ -77,9 +77,9 @@ struct thread_info {
+@@ -78,9 +78,9 @@ struct thread_info {
.flags = 0, \
.preempt_count = INIT_PREEMPT_COUNT, \
.addr_limit = KERNEL_DS, \
@@ -2167,7 +2149,7 @@ index 3e635ee..c39f5b4 100644
.restart_block = { \
.fn = do_no_restart_syscall, \
}, \
-@@ -146,7 +146,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
+@@ -154,7 +154,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
#define TIF_SYSCALL_AUDIT 9
#define TIF_SYSCALL_TRACEPOINT 10
#define TIF_SECCOMP 11 /* seccomp syscall filtering active */
@@ -2180,7 +2162,7 @@ index 3e635ee..c39f5b4 100644
#define TIF_USING_IWMMXT 17
#define TIF_MEMDIE 18 /* is terminating due to OOM killer */
#define TIF_RESTORE_SIGMASK 20
-@@ -159,10 +163,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
+@@ -168,10 +172,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
#define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
#define _TIF_SECCOMP (1 << TIF_SECCOMP)
#define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
@@ -2216,7 +2198,7 @@ index 5f833f7..76e6644 100644
}
diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
-index 7f3f3cc..bdf0665 100644
+index 4767eb9..bf00668 100644
--- a/arch/arm/include/asm/uaccess.h
+++ b/arch/arm/include/asm/uaccess.h
@@ -18,6 +18,7 @@
@@ -2225,7 +2207,7 @@ index 7f3f3cc..bdf0665 100644
#include <asm/compiler.h>
+#include <asm/pgtable.h>
- #if __LINUX_ARM_ARCH__ < 6
+ #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
#include <asm-generic/uaccess-unaligned.h>
@@ -70,11 +71,38 @@ extern int __put_user_bad(void);
static inline void set_fs(mm_segment_t fs)
@@ -2267,7 +2249,7 @@ index 7f3f3cc..bdf0665 100644
#define __addr_ok(addr) ({ \
unsigned long flag; \
__asm__("cmp %2, %0; movlo %0, #0" \
-@@ -150,8 +178,12 @@ extern int __get_user_4(void *);
+@@ -198,8 +226,12 @@ extern int __get_user_64t_4(void *);
#define get_user(x,p) \
({ \
@@ -2281,7 +2263,7 @@ index 7f3f3cc..bdf0665 100644
})
extern int __put_user_1(void *, unsigned int);
-@@ -196,8 +228,12 @@ extern int __put_user_8(void *, unsigned long long);
+@@ -244,8 +276,12 @@ extern int __put_user_8(void *, unsigned long long);
#define put_user(x,p) \
({ \
@@ -2295,7 +2277,7 @@ index 7f3f3cc..bdf0665 100644
})
#else /* CONFIG_MMU */
-@@ -221,6 +257,7 @@ static inline void set_fs(mm_segment_t fs)
+@@ -269,6 +305,7 @@ static inline void set_fs(mm_segment_t fs)
#endif /* CONFIG_MMU */
@@ -2303,7 +2285,7 @@ index 7f3f3cc..bdf0665 100644
#define access_ok(type,addr,size) (__range_ok(addr,size) == 0)
#define user_addr_max() \
-@@ -238,13 +275,17 @@ static inline void set_fs(mm_segment_t fs)
+@@ -286,13 +323,17 @@ static inline void set_fs(mm_segment_t fs)
#define __get_user(x,ptr) \
({ \
long __gu_err = 0; \
@@ -2321,7 +2303,7 @@ index 7f3f3cc..bdf0665 100644
(void) 0; \
})
-@@ -320,13 +361,17 @@ do { \
+@@ -368,13 +409,17 @@ do { \
#define __put_user(x,ptr) \
({ \
long __pu_err = 0; \
@@ -2339,7 +2321,7 @@ index 7f3f3cc..bdf0665 100644
(void) 0; \
})
-@@ -426,11 +471,44 @@ do { \
+@@ -474,11 +519,44 @@ do { \
#ifdef CONFIG_MMU
@@ -2387,7 +2369,7 @@ index 7f3f3cc..bdf0665 100644
#else
#define __copy_from_user(to,from,n) (memcpy(to, (void __force *)from, n), 0)
#define __copy_to_user(to,from,n) (memcpy((void __force *)to, from, n), 0)
-@@ -439,6 +517,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
+@@ -487,6 +565,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
{
@@ -2397,7 +2379,7 @@ index 7f3f3cc..bdf0665 100644
if (access_ok(VERIFY_READ, from, n))
n = __copy_from_user(to, from, n);
else /* security hole - plug it */
-@@ -448,6 +529,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
+@@ -496,6 +577,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
{
@@ -2421,7 +2403,7 @@ index 5af0ed1..cea83883 100644
#define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
-index 85e664b..419a1cd 100644
+index a88671c..1cc895e 100644
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
@@ -55,7 +55,7 @@ EXPORT_SYMBOL(arm_delay_ops);
@@ -2447,7 +2429,7 @@ index 85e664b..419a1cd 100644
EXPORT_SYMBOL(__get_user_1);
EXPORT_SYMBOL(__get_user_2);
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
-index 1879e8d..b2207fc 100644
+index 2f5555d..d493c91 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -47,6 +47,87 @@
@@ -2466,7 +2448,7 @@ index 1879e8d..b2207fc 100644
+ bic r2, r2, #(0x1fc0)
+ bic r2, r2, #(0x3f)
+ ldr r1, [r2, #TI_CPU_DOMAIN]
-+ @ store old DACR on stack
++ @ store old DACR on stack
+ str r1, [sp, #8]
+#ifdef CONFIG_PAX_KERNEXEC
+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
@@ -2555,7 +2537,7 @@ index 1879e8d..b2207fc 100644
.endm
@@ -149,7 +234,11 @@ ENDPROC(__und_invalid)
- .macro svc_entry, stack_hole=0
+ .macro svc_entry, stack_hole=0, trace=1
UNWIND(.fnstart )
UNWIND(.save {r0 - pc} )
+
@@ -2579,8 +2561,8 @@ index 1879e8d..b2207fc 100644
SPFIX( addeq r2, r2, #4 )
str r3, [sp, #-4]! @ save the "real" r0 copied
@ from the exception stack
-@@ -317,6 +411,9 @@ ENDPROC(__pabt_svc)
- .macro usr_entry
+@@ -368,6 +462,9 @@ ENDPROC(__fiq_abt)
+ .macro usr_entry, trace=1
UNWIND(.fnstart )
UNWIND(.cantunwind ) @ don't unwind the user space
+
@@ -2589,7 +2571,7 @@ index 1879e8d..b2207fc 100644
sub sp, sp, #S_FRAME_SIZE
ARM( stmib sp, {r1 - r12} )
THUMB( stmia sp, {r0 - r12} )
-@@ -416,7 +513,9 @@ __und_usr:
+@@ -478,7 +575,9 @@ __und_usr:
tst r3, #PSR_T_BIT @ Thumb mode?
bne __und_usr_thumb
sub r4, r2, #4 @ ARM instr at LR - 4
@@ -2599,7 +2581,7 @@ index 1879e8d..b2207fc 100644
ARM_BE8(rev r0, r0) @ little endian instruction
@ r0 = 32-bit ARM instruction which caused the exception
-@@ -450,11 +549,15 @@ __und_usr_thumb:
+@@ -512,11 +611,15 @@ __und_usr_thumb:
*/
.arch armv6t2
#endif
@@ -2615,17 +2597,17 @@ index 1879e8d..b2207fc 100644
ARM_BE8(rev16 r0, r0) @ little endian instruction
add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
-@@ -484,7 +587,8 @@ ENDPROC(__und_usr)
+@@ -546,7 +649,8 @@ ENDPROC(__und_usr)
*/
.pushsection .fixup, "ax"
.align 2
--4: mov pc, r9
+-4: str r4, [sp, #S_PC] @ retry current instruction
+4: pax_close_userland
-+ mov pc, r9
++ str r4, [sp, #S_PC] @ retry current instruction
+ ret r9
.popsection
.pushsection __ex_table,"a"
- .long 1b, 4b
-@@ -694,7 +798,7 @@ ENTRY(__switch_to)
+@@ -766,7 +870,7 @@ ENTRY(__switch_to)
THUMB( str lr, [ip], #4 )
ldr r4, [r2, #TI_TP_VALUE]
ldr r5, [r2, #TI_TP_VALUE + 4]
@@ -2634,7 +2616,7 @@ index 1879e8d..b2207fc 100644
ldr r6, [r2, #TI_CPU_DOMAIN]
#endif
switch_tls r1, r4, r5, r3, r7
-@@ -703,7 +807,7 @@ ENTRY(__switch_to)
+@@ -775,7 +879,7 @@ ENTRY(__switch_to)
ldr r8, =__stack_chk_guard
ldr r7, [r7, #TSK_STACK_CANARY]
#endif
@@ -2644,11 +2626,11 @@ index 1879e8d..b2207fc 100644
#endif
mov r5, r0
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
-index a2dcafd..1048b5a 100644
+index 6bb09d4..113e875 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
-@@ -10,18 +10,46 @@
-
+@@ -11,18 +11,46 @@
+ #include <asm/assembler.h>
#include <asm/unistd.h>
#include <asm/ftrace.h>
+#include <asm/domain.h>
@@ -2697,7 +2679,7 @@ index a2dcafd..1048b5a 100644
.align 5
/*
* This is the fast syscall return path. We do as little as
-@@ -411,6 +439,12 @@ ENTRY(vector_swi)
+@@ -406,6 +434,12 @@ ENTRY(vector_swi)
USER( ldr scno, [lr, #-4] ) @ get SWI instruction
#endif
@@ -2711,10 +2693,10 @@ index a2dcafd..1048b5a 100644
#if defined(CONFIG_OABI_COMPAT)
diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
-index 88c6bab..652981b 100644
+index 4176df7..a901f8d 100644
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
-@@ -188,6 +188,60 @@
+@@ -196,6 +196,60 @@
msr cpsr_c, \rtemp @ switch back to the SVC mode
.endm
@@ -2775,7 +2757,7 @@ index 88c6bab..652981b 100644
#ifndef CONFIG_THUMB2_KERNEL
.macro svc_exit, rpsr, irq = 0
.if \irq != 0
-@@ -207,6 +261,9 @@
+@@ -215,6 +269,9 @@
blne trace_hardirqs_off
#endif
.endif
@@ -2783,9 +2765,9 @@ index 88c6bab..652981b 100644
+ pax_exit_kernel
+
msr spsr_cxsf, \rpsr
- #if defined(CONFIG_CPU_V6)
- ldr r0, [sp]
-@@ -270,6 +327,9 @@
+ #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
+ @ We must avoid clrex due to Cortex-A15 erratum #830321
+@@ -290,6 +347,9 @@
blne trace_hardirqs_off
#endif
.endif
@@ -2794,12 +2776,12 @@ index 88c6bab..652981b 100644
+
ldr lr, [sp, #S_SP] @ top of the stack
ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
- clrex @ clear the exclusive monitor
+
diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
-index 918875d..cd5fa27 100644
+index b37752a..ff5cb72 100644
--- a/arch/arm/kernel/fiq.c
+++ b/arch/arm/kernel/fiq.c
-@@ -87,7 +87,10 @@ void set_fiq_handler(void *start, unsigned int length)
+@@ -95,7 +95,10 @@ void set_fiq_handler(void *start, unsigned int length)
void *base = vectors_page;
unsigned offset = FIQ_OFFSET;
@@ -2811,7 +2793,7 @@ index 918875d..cd5fa27 100644
flush_icache_range((unsigned long)base + offset, offset +
length);
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
-index f5f381d..a6f36a1 100644
+index 664eee8..f470938 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -437,7 +437,7 @@ __enable_mmu:
@@ -2824,7 +2806,7 @@ index f5f381d..a6f36a1 100644
mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
#endif
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
-index 45e4781..8eac93d 100644
+index 6a4dffe..4a86a70 100644
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
@@ -38,12 +38,39 @@
@@ -2890,10 +2872,10 @@ index 07314af..c46655c 100644
flush_icache_range((uintptr_t)(addr),
(uintptr_t)(addr) + size);
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
-index 5f6e650..b5e6630 100644
+index fe972a2..a772d83 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
-@@ -217,6 +217,7 @@ void machine_power_off(void)
+@@ -207,6 +207,7 @@ void machine_power_off(void)
if (pm_power_off)
pm_power_off();
@@ -2901,7 +2883,7 @@ index 5f6e650..b5e6630 100644
}
/*
-@@ -230,7 +231,7 @@ void machine_power_off(void)
+@@ -220,7 +221,7 @@ void machine_power_off(void)
* executing pre-reset code, and using RAM that the primary CPU's code wishes
* to use. Implementing such co-ordination would be essentially impossible.
*/
@@ -2910,7 +2892,7 @@ index 5f6e650..b5e6630 100644
{
local_irq_disable();
smp_send_stop();
-@@ -253,8 +254,8 @@ void __show_regs(struct pt_regs *regs)
+@@ -246,8 +247,8 @@ void __show_regs(struct pt_regs *regs)
show_regs_print_info(KERN_DEFAULT);
@@ -2921,7 +2903,7 @@ index 5f6e650..b5e6630 100644
printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
"sp : %08lx ip : %08lx fp : %08lx\n",
regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
-@@ -427,12 +428,6 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -424,12 +425,6 @@ unsigned long get_wchan(struct task_struct *p)
return 0;
}
@@ -2934,7 +2916,7 @@ index 5f6e650..b5e6630 100644
#ifdef CONFIG_MMU
#ifdef CONFIG_KUSER_HELPERS
/*
-@@ -448,7 +443,7 @@ static struct vm_area_struct gate_vma = {
+@@ -445,7 +440,7 @@ static struct vm_area_struct gate_vma = {
static int __init gate_vma_init(void)
{
@@ -2943,24 +2925,58 @@ index 5f6e650..b5e6630 100644
return 0;
}
arch_initcall(gate_vma_init);
-@@ -474,41 +469,16 @@ int in_gate_area_no_mm(unsigned long addr)
-
- const char *arch_vma_name(struct vm_area_struct *vma)
- {
-- return is_gate_vma(vma) ? "[vectors]" :
-- (vma->vm_mm && vma->vm_start == vma->vm_mm->context.sigpage) ?
-- "[sigpage]" : NULL;
-+ return is_gate_vma(vma) ? "[vectors]" : NULL;
+@@ -474,81 +469,13 @@ const char *arch_vma_name(struct vm_area_struct *vma)
+ return is_gate_vma(vma) ? "[vectors]" : NULL;
}
+-/* If possible, provide a placement hint at a random offset from the
+- * stack for the signal page.
+- */
+-static unsigned long sigpage_addr(const struct mm_struct *mm,
+- unsigned int npages)
+-{
+- unsigned long offset;
+- unsigned long first;
+- unsigned long last;
+- unsigned long addr;
+- unsigned int slots;
+-
+- first = PAGE_ALIGN(mm->start_stack);
+-
+- last = TASK_SIZE - (npages << PAGE_SHIFT);
+-
+- /* No room after stack? */
+- if (first > last)
+- return 0;
+-
+- /* Just enough room? */
+- if (first == last)
+- return first;
+-
+- slots = ((last - first) >> PAGE_SHIFT) + 1;
+-
+- offset = get_random_int() % slots;
+-
+- addr = first + (offset << PAGE_SHIFT);
+-
+- return addr;
+-}
+-
-static struct page *signal_page;
-extern struct page *get_signal_page(void);
-
+-static const struct vm_special_mapping sigpage_mapping = {
+- .name = "[sigpage]",
+- .pages = &signal_page,
+-};
+-
int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
{
struct mm_struct *mm = current->mm;
+- struct vm_area_struct *vma;
- unsigned long addr;
-- int ret;
+- unsigned long hint;
+- int ret = 0;
-
- if (!signal_page)
- signal_page = get_signal_page();
@@ -2968,18 +2984,23 @@ index 5f6e650..b5e6630 100644
- return -ENOMEM;
down_write(&mm->mmap_sem);
-- addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
+- hint = sigpage_addr(mm, 1);
+- addr = get_unmapped_area(NULL, hint, PAGE_SIZE, 0, 0);
- if (IS_ERR_VALUE(addr)) {
- ret = addr;
- goto up_fail;
- }
-
-- ret = install_special_mapping(mm, addr, PAGE_SIZE,
+- vma = _install_special_mapping(mm, addr, PAGE_SIZE,
- VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
-- &signal_page);
+- &sigpage_mapping);
+-
+- if (IS_ERR(vma)) {
+- ret = PTR_ERR(vma);
+- goto up_fail;
+- }
-
-- if (ret == 0)
-- mm->context.sigpage = addr;
+- mm->context.sigpage = addr;
-
- up_fail:
+ mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
@@ -2989,36 +3010,24 @@ index 5f6e650..b5e6630 100644
}
#endif
diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
-index 4693188..4596c5e 100644
+index f73891b..cf3004e 100644
--- a/arch/arm/kernel/psci.c
+++ b/arch/arm/kernel/psci.c
-@@ -24,7 +24,7 @@
- #include <asm/opcodes-virt.h>
+@@ -28,7 +28,7 @@
#include <asm/psci.h>
+ #include <asm/system_misc.h>
-struct psci_operations psci_ops;
+struct psci_operations psci_ops __read_only;
static int (*invoke_psci_fn)(u32, u32, u32, u32);
-
+ typedef int (*psci_initcall_t)(const struct device_node *);
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
-index 0dd3b79..b67388e 100644
+index ef9119f..31995a3 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
-@@ -908,7 +908,7 @@ enum ptrace_syscall_dir {
- PTRACE_SYSCALL_EXIT,
- };
-
--static int tracehook_report_syscall(struct pt_regs *regs,
-+static void tracehook_report_syscall(struct pt_regs *regs,
- enum ptrace_syscall_dir dir)
- {
- unsigned long ip;
-@@ -926,19 +926,29 @@ static int tracehook_report_syscall(struct pt_regs *regs,
- current_thread_info()->syscall = -1;
-
+@@ -928,10 +928,19 @@ static void tracehook_report_syscall(struct pt_regs *regs,
regs->ARM_ip = ip;
-- return current_thread_info()->syscall;
}
+#ifdef CONFIG_GRKERNSEC_SETXID
@@ -3035,24 +3044,15 @@ index 0dd3b79..b67388e 100644
+#endif
+
/* Do the secure computing check first; failures should be fast. */
- if (secure_computing(scno) == -1)
- return -1;
-
- if (test_thread_flag(TIF_SYSCALL_TRACE))
-- scno = tracehook_report_syscall(regs, PTRACE_SYSCALL_ENTER);
-+ tracehook_report_syscall(regs, PTRACE_SYSCALL_ENTER);
-+
-+ scno = current_thread_info()->syscall;
-
- if (test_thread_flag(TIF_SYSCALL_TRACEPOINT))
- trace_sys_enter(regs, scno);
+ #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
+ if (secure_computing() == -1)
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
-index aab70f6..bd2751b 100644
+index 306e1ac..1b477ed 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
-@@ -100,21 +100,23 @@ EXPORT_SYMBOL(system_serial_high);
- unsigned int elf_hwcap __read_mostly;
- EXPORT_SYMBOL(elf_hwcap);
+@@ -104,21 +104,23 @@ EXPORT_SYMBOL(elf_hwcap);
+ unsigned int elf_hwcap2 __read_mostly;
+ EXPORT_SYMBOL(elf_hwcap2);
+pteval_t __supported_pte_mask __read_only;
+pmdval_t __supported_pmd_mask __read_only;
@@ -3079,7 +3079,7 @@ index aab70f6..bd2751b 100644
EXPORT_SYMBOL(outer_cache);
#endif
-@@ -247,9 +249,13 @@ static int __get_cpu_architecture(void)
+@@ -252,9 +254,13 @@ static int __get_cpu_architecture(void)
asm("mrc p15, 0, %0, c0, c1, 4"
: "=r" (mmfr0));
if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
@@ -3096,10 +3096,10 @@ index aab70f6..bd2751b 100644
cpu_arch = CPU_ARCH_ARMv6;
else
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
-index 04d6388..5115238 100644
+index bd19834..e4d8c66 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
-@@ -23,8 +23,6 @@
+@@ -24,8 +24,6 @@
extern const unsigned long sigreturn_codes[7];
@@ -3108,7 +3108,7 @@ index 04d6388..5115238 100644
#ifdef CONFIG_CRUNCH
static int preserve_crunch_context(struct crunch_sigframe __user *frame)
{
-@@ -395,8 +393,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
+@@ -396,8 +394,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
* except when the MPU has protected the vectors
* page from PL0
*/
@@ -3118,7 +3118,7 @@ index 04d6388..5115238 100644
} else
#endif
{
-@@ -600,33 +597,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
+@@ -604,33 +601,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
} while (thread_flags & _TIF_WORK_MASK);
return 0;
}
@@ -3153,10 +3153,10 @@ index 04d6388..5115238 100644
- return page;
-}
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
-index 8cd3724..ea86e94 100644
+index a8e32aa..b2f7198 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
-@@ -73,7 +73,7 @@ enum ipi_msg_type {
+@@ -76,7 +76,7 @@ enum ipi_msg_type {
static DECLARE_COMPLETION(cpu_running);
@@ -3189,10 +3189,10 @@ index 7a3be1d..b00c7de 100644
start, end);
itcm_present = true;
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
-index 3f31443..ae30fc0 100644
+index 9f5d818..e013427 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
-@@ -62,7 +62,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
+@@ -65,7 +65,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
{
#ifdef CONFIG_KALLSYMS
@@ -3201,7 +3201,7 @@ index 3f31443..ae30fc0 100644
#else
printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
#endif
-@@ -264,6 +264,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
+@@ -267,6 +267,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
static int die_owner = -1;
static unsigned int die_nest_count;
@@ -3210,7 +3210,7 @@ index 3f31443..ae30fc0 100644
static unsigned long oops_begin(void)
{
int cpu;
-@@ -306,6 +308,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
+@@ -309,6 +311,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
panic("Fatal exception in interrupt");
if (panic_on_oops)
panic("Fatal exception");
@@ -3220,7 +3220,7 @@ index 3f31443..ae30fc0 100644
if (signr)
do_exit(signr);
}
-@@ -857,7 +862,11 @@ void __init early_trap_init(void *vectors_base)
+@@ -880,7 +885,11 @@ void __init early_trap_init(void *vectors_base)
kuser_init(vectors_base);
flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
@@ -3234,7 +3234,7 @@ index 3f31443..ae30fc0 100644
/*
* on V7-M there is no need to copy the vector table to a dedicated
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
-index 7bcee5c..e2f3249 100644
+index 8e95aa4..595dfc8 100644
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -8,7 +8,11 @@
@@ -3291,20 +3291,20 @@ index 7bcee5c..e2f3249 100644
#ifndef CONFIG_XIP_KERNEL
. = ALIGN(PAGE_SIZE);
-@@ -220,6 +233,11 @@ SECTIONS
- . = PAGE_OFFSET + TEXT_OFFSET;
+@@ -221,6 +234,11 @@ SECTIONS
#else
+ . = ALIGN(THREAD_SIZE);
__init_end = .;
+
+#ifdef CONFIG_PAX_KERNEXEC
+ . = ALIGN(1<<SECTION_SHIFT);
+#endif
+
- . = ALIGN(THREAD_SIZE);
__data_loc = .;
#endif
+
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
-index bd18bb8..2bf342f 100644
+index 9e193c8..3560fe6 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -57,7 +57,7 @@ static unsigned long hyp_default_vectors;
@@ -3316,7 +3316,7 @@ index bd18bb8..2bf342f 100644
static u8 kvm_next_vmid;
static DEFINE_SPINLOCK(kvm_vmid_lock);
-@@ -408,7 +408,7 @@ void force_vm_exit(const cpumask_t *mask)
+@@ -354,7 +354,7 @@ void force_vm_exit(const cpumask_t *mask)
*/
static bool need_new_vmid_gen(struct kvm *kvm)
{
@@ -3325,7 +3325,7 @@ index bd18bb8..2bf342f 100644
}
/**
-@@ -441,7 +441,7 @@ static void update_vttbr(struct kvm *kvm)
+@@ -387,7 +387,7 @@ static void update_vttbr(struct kvm *kvm)
/* First user of a new VMID generation? */
if (unlikely(kvm_next_vmid == 0)) {
@@ -3334,7 +3334,7 @@ index bd18bb8..2bf342f 100644
kvm_next_vmid = 1;
/*
-@@ -458,7 +458,7 @@ static void update_vttbr(struct kvm *kvm)
+@@ -404,7 +404,7 @@ static void update_vttbr(struct kvm *kvm)
kvm_call_hyp(__kvm_flush_vm_context);
}
@@ -3343,7 +3343,7 @@ index bd18bb8..2bf342f 100644
kvm->arch.vmid = kvm_next_vmid;
kvm_next_vmid++;
-@@ -1033,7 +1033,7 @@ static void check_kvm_target_cpu(void *ret)
+@@ -980,7 +980,7 @@ static void check_kvm_target_cpu(void *ret)
/**
* Initialize Hyp-mode and memory mappings on all CPUs.
*/
@@ -3464,10 +3464,10 @@ index 7d08b43..f7ca7ea 100644
#include "csumpartialcopygeneric.S"
diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
-index 5306de3..aed6d03 100644
+index 312d43e..21d2322 100644
--- a/arch/arm/lib/delay.c
+++ b/arch/arm/lib/delay.c
-@@ -28,7 +28,7 @@
+@@ -29,7 +29,7 @@
/*
* Default to the loop-based delay implementation.
*/
@@ -3499,73 +3499,71 @@ index 3e58d71..029817c 100644
/* See rational for this in __copy_to_user() above. */
if (n < 64)
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
-index f7ca97b..3d7e719 100644
+index 9610792..4dfb851 100644
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
-@@ -81,7 +81,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
+@@ -83,7 +83,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
desc->pfn = __phys_to_pfn(base);
desc->length = length;
- desc->type = MT_MEMORY_RWX_NONCACHED;
+ desc->type = MT_MEMORY_RW_NONCACHED;
- pr_info("AT91: sram at 0x%lx of 0x%x mapped at 0x%lx\n",
+ pr_info("sram at 0x%lx of 0x%x mapped at 0x%lx\n",
base, length, desc->virtual);
-diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
-index f3407a5..bd4256f 100644
---- a/arch/arm/mach-kirkwood/common.c
-+++ b/arch/arm/mach-kirkwood/common.c
-@@ -156,7 +156,16 @@ static void clk_gate_fn_disable(struct clk_hw *hw)
- clk_gate_ops.disable(hw);
- }
+diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
+index 7f352de..6dc0929 100644
+--- a/arch/arm/mach-keystone/keystone.c
++++ b/arch/arm/mach-keystone/keystone.c
+@@ -27,7 +27,7 @@
--static struct clk_ops clk_gate_fn_ops;
-+static int clk_gate_fn_is_enabled(struct clk_hw *hw)
-+{
-+ return clk_gate_ops.is_enabled(hw);
-+}
-+
-+static struct clk_ops clk_gate_fn_ops = {
-+ .enable = clk_gate_fn_enable,
-+ .disable = clk_gate_fn_disable,
-+ .is_enabled = clk_gate_fn_is_enabled,
-+};
+ #include "keystone.h"
- static struct clk __init *clk_register_gate_fn(struct device *dev,
- const char *name,
-@@ -190,14 +199,6 @@ static struct clk __init *clk_register_gate_fn(struct device *dev,
- gate_fn->fn_en = fn_en;
- gate_fn->fn_dis = fn_dis;
-
-- /* ops is the gate ops, but with our enable/disable functions */
-- if (clk_gate_fn_ops.enable != clk_gate_fn_enable ||
-- clk_gate_fn_ops.disable != clk_gate_fn_disable) {
-- clk_gate_fn_ops = clk_gate_ops;
-- clk_gate_fn_ops.enable = clk_gate_fn_enable;
-- clk_gate_fn_ops.disable = clk_gate_fn_disable;
-- }
--
- clk = clk_register(dev, &gate_fn->gate.hw);
+-static struct notifier_block platform_nb;
++static notifier_block_no_const platform_nb;
+ static unsigned long keystone_dma_pfn_offset __read_mostly;
+
+ static int keystone_platform_notifier(struct notifier_block *nb,
+diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
+index 2ffccd4..69ffe115 100644
+--- a/arch/arm/mach-mvebu/coherency.c
++++ b/arch/arm/mach-mvebu/coherency.c
+@@ -316,7 +316,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
+
+ /*
+ * This ioremap hook is used on Armada 375/38x to ensure that PCIe
+- * memory areas are mapped as MT_UNCACHED instead of MT_DEVICE. This
++ * memory areas are mapped as MT_UNCACHED_RW instead of MT_DEVICE. This
+ * is needed as a workaround for a deadlock issue between the PCIe
+ * interface and the cache controller.
+ */
+@@ -329,7 +329,7 @@ armada_pcie_wa_ioremap_caller(phys_addr_t phys_addr, size_t size,
+ mvebu_mbus_get_pcie_mem_aperture(&pcie_mem);
+
+ if (pcie_mem.start <= phys_addr && (phys_addr + size) <= pcie_mem.end)
+- mtype = MT_UNCACHED;
++ mtype = MT_UNCACHED_RW;
- if (IS_ERR(clk))
+ return __arm_ioremap_caller(phys_addr, size, mtype, caller);
+ }
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
-index aead77a..a2253fa 100644
+index 97767a2..9233746 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
-@@ -568,7 +568,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
+@@ -569,7 +569,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
}
#endif
--static struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
-+static struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
+-struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
++struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
.late_init = n8x0_menelaus_late_init,
};
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
-index ab43755..ccfa231 100644
+index 5fa3755..1e8c247 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
-@@ -148,7 +148,6 @@ struct omap3_gpmc_regs {
+@@ -151,7 +151,6 @@ struct omap3_gpmc_regs {
};
static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
@@ -3573,7 +3571,7 @@ index ab43755..ccfa231 100644
static int gpmc_irq_start;
static struct resource gpmc_mem_root;
-@@ -716,6 +715,18 @@ static void gpmc_irq_noop(struct irq_data *data) { }
+@@ -736,6 +735,18 @@ static void gpmc_irq_noop(struct irq_data *data) { }
static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
@@ -3592,7 +3590,7 @@ index ab43755..ccfa231 100644
static int gpmc_setup_irq(void)
{
int i;
-@@ -730,15 +741,6 @@ static int gpmc_setup_irq(void)
+@@ -750,15 +761,6 @@ static int gpmc_setup_irq(void)
return gpmc_irq_start;
}
@@ -3609,19 +3607,19 @@ index ab43755..ccfa231 100644
gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
-index 667915d..2ee1219 100644
+index 6944ae3..bc587ca 100644
--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
-@@ -84,7 +84,7 @@ struct cpu_pm_ops {
- int (*finish_suspend)(unsigned long cpu_state);
+@@ -86,7 +86,7 @@ struct cpu_pm_ops {
void (*resume)(void);
void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
+ void (*hotplug_restart)(void);
-};
+} __no_const;
static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
static struct powerdomain *mpuss_pd;
-@@ -102,7 +102,7 @@ static void dummy_cpu_resume(void)
+@@ -105,7 +105,7 @@ static void dummy_cpu_resume(void)
static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
{}
@@ -3631,10 +3629,10 @@ index 667915d..2ee1219 100644
.resume = dummy_cpu_resume,
.scu_prepare = dummy_scu_prepare,
diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
-index 3664562..72f85c6 100644
+index f961c46..4a453dc 100644
--- a/arch/arm/mach-omap2/omap-wakeupgen.c
+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
-@@ -343,7 +343,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
+@@ -344,7 +344,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
return NOTIFY_OK;
}
@@ -3644,7 +3642,7 @@ index 3664562..72f85c6 100644
};
diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
-index 01ef59d..32ae28a8 100644
+index 8c58b71..95b655f 100644
--- a/arch/arm/mach-omap2/omap_device.c
+++ b/arch/arm/mach-omap2/omap_device.c
@@ -510,7 +510,7 @@ void omap_device_delete(struct omap_device *od)
@@ -3685,7 +3683,7 @@ index 78c02b3..c94109a 100644
struct omap_device *omap_device_alloc(struct platform_device *pdev,
struct omap_hwmod **ohs, int oh_cnt);
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
-index 4551efd..d487c24 100644
+index 716247e..8df346d 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -194,10 +194,10 @@ struct omap_hwmod_soc_ops {
@@ -3725,7 +3723,7 @@ index 95fee54..cfa9cf1 100644
pwrdm_register_pwrdms(powerdomains_am43xx);
pwrdm_complete_init();
diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
-index d15c7bb..b2d1f0c 100644
+index ff0a68c..b312aa0 100644
--- a/arch/arm/mach-omap2/wd_timer.c
+++ b/arch/arm/mach-omap2/wd_timer.c
@@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
@@ -3749,7 +3747,7 @@ index d15c7bb..b2d1f0c 100644
sizeof(struct omap_wd_timer_platform_data));
WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
-index b82dcae..44ee5b6 100644
+index b30bf5c..d0825bf 100644
--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
@@ -180,7 +180,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
@@ -3780,7 +3778,7 @@ index 2dea8b5..6499da2 100644
extern void ux500_cpu_die(unsigned int cpu);
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
-index e9c290c..d0e3d41 100644
+index 7eb94e6..799ad3e 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -446,6 +446,7 @@ config CPU_32v5
@@ -3818,10 +3816,10 @@ index e9c290c..d0e3d41 100644
If all of the binaries and libraries which run on your platform
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
-index d301662..a6ef72c 100644
+index 83792f4..c25d36b 100644
--- a/arch/arm/mm/alignment.c
+++ b/arch/arm/mm/alignment.c
-@@ -213,10 +213,12 @@ union offset_union {
+@@ -216,10 +216,12 @@ union offset_union {
#define __get16_unaligned_check(ins,val,addr) \
do { \
unsigned int err = 0, v, a = addr; \
@@ -3834,7 +3832,7 @@ index d301662..a6ef72c 100644
if (err) \
goto fault; \
} while (0)
-@@ -230,6 +232,7 @@ union offset_union {
+@@ -233,6 +235,7 @@ union offset_union {
#define __get32_unaligned_check(ins,val,addr) \
do { \
unsigned int err = 0, v, a = addr; \
@@ -3842,7 +3840,7 @@ index d301662..a6ef72c 100644
__get8_unaligned_check(ins,v,a,err); \
val = v << ((BE) ? 24 : 0); \
__get8_unaligned_check(ins,v,a,err); \
-@@ -238,6 +241,7 @@ union offset_union {
+@@ -241,6 +244,7 @@ union offset_union {
val |= v << ((BE) ? 8 : 16); \
__get8_unaligned_check(ins,v,a,err); \
val |= v << ((BE) ? 0 : 24); \
@@ -3850,7 +3848,7 @@ index d301662..a6ef72c 100644
if (err) \
goto fault; \
} while (0)
-@@ -251,6 +255,7 @@ union offset_union {
+@@ -254,6 +258,7 @@ union offset_union {
#define __put16_unaligned_check(ins,val,addr) \
do { \
unsigned int err = 0, v = val, a = addr; \
@@ -3858,7 +3856,7 @@ index d301662..a6ef72c 100644
__asm__( FIRST_BYTE_16 \
ARM( "1: "ins" %1, [%2], #1\n" ) \
THUMB( "1: "ins" %1, [%2]\n" ) \
-@@ -270,6 +275,7 @@ union offset_union {
+@@ -273,6 +278,7 @@ union offset_union {
" .popsection\n" \
: "=r" (err), "=&r" (v), "=&r" (a) \
: "0" (err), "1" (v), "2" (a)); \
@@ -3866,7 +3864,7 @@ index d301662..a6ef72c 100644
if (err) \
goto fault; \
} while (0)
-@@ -283,6 +289,7 @@ union offset_union {
+@@ -286,6 +292,7 @@ union offset_union {
#define __put32_unaligned_check(ins,val,addr) \
do { \
unsigned int err = 0, v = val, a = addr; \
@@ -3874,7 +3872,7 @@ index d301662..a6ef72c 100644
__asm__( FIRST_BYTE_32 \
ARM( "1: "ins" %1, [%2], #1\n" ) \
THUMB( "1: "ins" %1, [%2]\n" ) \
-@@ -312,6 +319,7 @@ union offset_union {
+@@ -315,6 +322,7 @@ union offset_union {
" .popsection\n" \
: "=r" (err), "=&r" (v), "=&r" (a) \
: "0" (err), "1" (v), "2" (a)); \
@@ -3883,20 +3881,20 @@ index d301662..a6ef72c 100644
goto fault; \
} while (0)
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
-index 7abde2c..9df495f 100644
+index 5e65ca8..879e7b3 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
-@@ -46,7 +46,7 @@ struct l2x0_of_data {
- void (*setup)(const struct device_node *, u32 *, u32 *);
- void (*save)(void);
+@@ -42,7 +42,7 @@ struct l2c_init_data {
+ void (*fixup)(void __iomem *, u32, struct outer_cache_fns *);
+ void (*save)(void __iomem *);
struct outer_cache_fns outer_cache;
-};
+} __do_const;
- static bool of_init = false;
+ #define CACHE_LINE_SIZE 32
diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
-index 6eb97b3..ac509f6 100644
+index 6eb97b3..e77848e 100644
--- a/arch/arm/mm/context.c
+++ b/arch/arm/mm/context.c
@@ -43,7 +43,7 @@
@@ -3908,7 +3906,40 @@ index 6eb97b3..ac509f6 100644
static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
static DEFINE_PER_CPU(atomic64_t, active_asids);
-@@ -182,7 +182,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
+@@ -144,21 +144,17 @@ static void flush_context(unsigned int cpu)
+ /* Update the list of reserved ASIDs and the ASID bitmap. */
+ bitmap_clear(asid_map, 0, NUM_USER_ASIDS);
+ for_each_possible_cpu(i) {
+- if (i == cpu) {
+- asid = 0;
+- } else {
+- asid = atomic64_xchg(&per_cpu(active_asids, i), 0);
+- /*
+- * If this CPU has already been through a
+- * rollover, but hasn't run another task in
+- * the meantime, we must preserve its reserved
+- * ASID, as this is the only trace we have of
+- * the process it is still running.
+- */
+- if (asid == 0)
+- asid = per_cpu(reserved_asids, i);
+- __set_bit(asid & ~ASID_MASK, asid_map);
+- }
++ asid = atomic64_xchg(&per_cpu(active_asids, i), 0);
++ /*
++ * If this CPU has already been through a
++ * rollover, but hasn't run another task in
++ * the meantime, we must preserve its reserved
++ * ASID, as this is the only trace we have of
++ * the process it is still running.
++ */
++ if (asid == 0)
++ asid = per_cpu(reserved_asids, i);
++ __set_bit(asid & ~ASID_MASK, asid_map);
+ per_cpu(reserved_asids, i) = asid;
+ }
+
+@@ -182,7 +178,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
{
static u32 cur_idx = 1;
u64 asid = atomic64_read(&mm->context.id);
@@ -3917,7 +3948,7 @@ index 6eb97b3..ac509f6 100644
if (asid != 0 && is_reserved_asid(asid)) {
/*
-@@ -203,7 +203,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
+@@ -203,7 +199,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
*/
asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, cur_idx);
if (asid == NUM_USER_ASIDS) {
@@ -3926,7 +3957,7 @@ index 6eb97b3..ac509f6 100644
&asid_generation);
flush_context(cpu);
asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
-@@ -234,14 +234,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
+@@ -234,14 +230,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
cpu_set_reserved_ttbr0();
asid = atomic64_read(&mm->context.id);
@@ -4194,10 +4225,10 @@ index cf08bdf..772656c 100644
unsigned long search_exception_table(unsigned long addr);
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
-index 804d615..fcec50a 100644
+index 9481f85..6dae261 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
-@@ -30,6 +30,8 @@
+@@ -31,6 +31,8 @@
#include <asm/setup.h>
#include <asm/tlb.h>
#include <asm/fixmap.h>
@@ -4206,7 +4237,7 @@ index 804d615..fcec50a 100644
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
-@@ -625,7 +627,46 @@ void free_initmem(void)
+@@ -619,7 +621,46 @@ void free_initmem(void)
{
#ifdef CONFIG_HAVE_TCM
extern char __tcm_start, __tcm_end;
@@ -4254,7 +4285,7 @@ index 804d615..fcec50a 100644
free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
#endif
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
-index f9c32ba..8540068 100644
+index d1e5ad7..84dcbf2 100644
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
@@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
@@ -4381,10 +4412,10 @@ index 5e85ed3..b10a7ed 100644
}
}
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
-index f15c22e..d830561 100644
+index 9f98cec..115fcb6 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
-@@ -39,6 +39,22 @@
+@@ -40,6 +40,22 @@
#include "mm.h"
#include "tcm.h"
@@ -4407,7 +4438,7 @@ index f15c22e..d830561 100644
/*
* empty_zero_page is a special page that is used for
* zero-initialized data and COW.
-@@ -235,7 +251,15 @@ __setup("noalign", noalign_setup);
+@@ -239,7 +255,15 @@ __setup("noalign", noalign_setup);
#define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE
#define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
@@ -4424,7 +4455,7 @@ index f15c22e..d830561 100644
[MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
.prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
L_PTE_SHARED,
-@@ -264,19 +288,19 @@ static struct mem_type mem_types[] = {
+@@ -268,19 +292,19 @@ static struct mem_type mem_types[] = {
.prot_sect = PROT_SECT_DEVICE,
.domain = DOMAIN_IO,
},
@@ -4449,7 +4480,7 @@ index f15c22e..d830561 100644
.domain = DOMAIN_KERNEL,
},
#endif
-@@ -284,15 +308,15 @@ static struct mem_type mem_types[] = {
+@@ -288,15 +312,15 @@ static struct mem_type mem_types[] = {
.prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
L_PTE_RDONLY,
.prot_l1 = PMD_TYPE_TABLE,
@@ -4468,7 +4499,7 @@ index f15c22e..d830561 100644
.prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
.prot_l1 = PMD_TYPE_TABLE,
.prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
-@@ -305,17 +329,30 @@ static struct mem_type mem_types[] = {
+@@ -309,17 +333,30 @@ static struct mem_type mem_types[] = {
.prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
.domain = DOMAIN_KERNEL,
},
@@ -4502,7 +4533,7 @@ index f15c22e..d830561 100644
[MT_MEMORY_RW_DTCM] = {
.prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
L_PTE_XN,
-@@ -323,9 +360,10 @@ static struct mem_type mem_types[] = {
+@@ -327,9 +364,10 @@ static struct mem_type mem_types[] = {
.prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
.domain = DOMAIN_KERNEL,
},
@@ -4515,7 +4546,7 @@ index f15c22e..d830561 100644
.domain = DOMAIN_KERNEL,
},
[MT_MEMORY_RW_SO] = {
-@@ -534,9 +572,14 @@ static void __init build_mem_type_table(void)
+@@ -547,9 +585,14 @@ static void __init build_mem_type_table(void)
* Mark cache clean areas and XIP ROM read only
* from SVC mode and no access from userspace.
*/
@@ -4532,8 +4563,8 @@ index f15c22e..d830561 100644
+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
#endif
- if (is_smp()) {
-@@ -552,13 +595,17 @@ static void __init build_mem_type_table(void)
+ /*
+@@ -566,13 +609,17 @@ static void __init build_mem_type_table(void)
mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
@@ -4555,7 +4586,7 @@ index f15c22e..d830561 100644
}
}
-@@ -569,15 +616,20 @@ static void __init build_mem_type_table(void)
+@@ -583,15 +630,20 @@ static void __init build_mem_type_table(void)
if (cpu_arch >= CPU_ARCH_ARMv6) {
if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
/* Non-cacheable Normal is XCB = 001 */
@@ -4579,7 +4610,7 @@ index f15c22e..d830561 100644
}
#ifdef CONFIG_ARM_LPAE
-@@ -593,6 +645,8 @@ static void __init build_mem_type_table(void)
+@@ -607,6 +659,8 @@ static void __init build_mem_type_table(void)
vecs_pgprot |= PTE_EXT_AF;
#endif
@@ -4588,7 +4619,7 @@ index f15c22e..d830561 100644
for (i = 0; i < 16; i++) {
pteval_t v = pgprot_val(protection_map[i]);
protection_map[i] = __pgprot(v | user_pgprot);
-@@ -610,21 +664,24 @@ static void __init build_mem_type_table(void)
+@@ -624,21 +678,24 @@ static void __init build_mem_type_table(void)
mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
@@ -4619,7 +4650,7 @@ index f15c22e..d830561 100644
break;
}
pr_info("Memory policy: %sData cache %s\n",
-@@ -842,7 +899,7 @@ static void __init create_mapping(struct map_desc *md)
+@@ -856,7 +913,7 @@ static void __init create_mapping(struct map_desc *md)
return;
}
@@ -4628,7 +4659,7 @@ index f15c22e..d830561 100644
md->virtual >= PAGE_OFFSET &&
(md->virtual < VMALLOC_START || md->virtual >= VMALLOC_END)) {
printk(KERN_WARNING "BUG: mapping for 0x%08llx"
-@@ -1257,18 +1314,15 @@ void __init arm_mm_memblock_reserve(void)
+@@ -1224,18 +1281,15 @@ void __init arm_mm_memblock_reserve(void)
* called function. This means you can't use any function or debugging
* method which may touch any device, otherwise the kernel _will_ crash.
*/
@@ -4651,7 +4682,7 @@ index f15c22e..d830561 100644
for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
pmd_clear(pmd_off_k(addr));
-@@ -1281,7 +1335,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
+@@ -1248,7 +1302,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
map.virtual = MODULES_VADDR;
map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
@@ -4660,7 +4691,7 @@ index f15c22e..d830561 100644
create_mapping(&map);
#endif
-@@ -1292,14 +1346,14 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
+@@ -1259,14 +1313,14 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);
map.virtual = FLUSH_BASE;
map.length = SZ_1M;
@@ -4677,7 +4708,7 @@ index f15c22e..d830561 100644
create_mapping(&map);
#endif
-@@ -1308,7 +1362,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
+@@ -1275,7 +1329,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
* location (0xffff0000). If we aren't using high-vectors, also
* create a mapping at the low-vectors virtual address.
*/
@@ -4686,7 +4717,7 @@ index f15c22e..d830561 100644
map.virtual = 0xffff0000;
map.length = PAGE_SIZE;
#ifdef CONFIG_KUSER_HELPERS
-@@ -1365,8 +1419,10 @@ static void __init kmap_init(void)
+@@ -1335,8 +1389,10 @@ static void __init kmap_init(void)
static void __init map_lowmem(void)
{
struct memblock_region *reg;
@@ -4697,7 +4728,7 @@ index f15c22e..d830561 100644
/* Map all the lowmem memory banks. */
for_each_memblock(memory, reg) {
-@@ -1379,11 +1435,48 @@ static void __init map_lowmem(void)
+@@ -1349,11 +1405,48 @@ static void __init map_lowmem(void)
if (start >= end)
break;
@@ -4747,7 +4778,7 @@ index f15c22e..d830561 100644
create_mapping(&map);
} else {
-@@ -1400,7 +1493,7 @@ static void __init map_lowmem(void)
+@@ -1370,7 +1463,7 @@ static void __init map_lowmem(void)
map.pfn = __phys_to_pfn(kernel_x_start);
map.virtual = __phys_to_virt(kernel_x_start);
map.length = kernel_x_end - kernel_x_start;
@@ -4756,7 +4787,7 @@ index f15c22e..d830561 100644
create_mapping(&map);
-@@ -1413,6 +1506,7 @@ static void __init map_lowmem(void)
+@@ -1383,6 +1476,7 @@ static void __init map_lowmem(void)
create_mapping(&map);
}
}
@@ -4764,6 +4795,41 @@ index f15c22e..d830561 100644
}
}
+diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
+index e1268f9..a9755a7 100644
+--- a/arch/arm/net/bpf_jit_32.c
++++ b/arch/arm/net/bpf_jit_32.c
+@@ -20,6 +20,7 @@
+ #include <asm/cacheflush.h>
+ #include <asm/hwcap.h>
+ #include <asm/opcodes.h>
++#include <asm/pgtable.h>
+
+ #include "bpf_jit_32.h"
+
+@@ -71,7 +72,11 @@ struct jit_ctx {
+ #endif
+ };
+
++#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
++int bpf_jit_enable __read_only;
++#else
+ int bpf_jit_enable __read_mostly;
++#endif
+
+ static u64 jit_get_skb_b(struct sk_buff *skb, unsigned offset)
+ {
+@@ -178,8 +183,10 @@ static void jit_fill_hole(void *area, unsigned int size)
+ {
+ u32 *ptr;
+ /* We are guaranteed to have aligned memory. */
++ pax_open_kernel();
+ for (ptr = area; size >= sizeof(u32); size -= sizeof(u32))
+ *ptr++ = __opcode_to_mem_arm(ARM_INST_UDF);
++ pax_close_kernel();
+ }
+
+ static void build_prologue(struct jit_ctx *ctx)
diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c
index 5b217f4..c23f40e 100644
--- a/arch/arm/plat-iop/setup.c
@@ -4804,20 +4870,20 @@ index ce6d763..cfea917 100644
extern void *samsung_dmadev_get_ops(void);
extern void *s3c_dma_get_ops(void);
diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
-index 409ca37..10c87ad 100644
+index 6389d60..b5d3bdd 100644
--- a/arch/arm64/include/asm/barrier.h
+++ b/arch/arm64/include/asm/barrier.h
-@@ -40,7 +40,7 @@
+@@ -41,7 +41,7 @@
do { \
compiletime_assert_atomic_type(*p); \
- smp_mb(); \
+ barrier(); \
- ACCESS_ONCE(*p) = (v); \
+ ACCESS_ONCE_RW(*p) = (v); \
} while (0)
#define smp_load_acquire(p) \
diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
-index 6c0f684..5faea9d 100644
+index 3bf8f4e..5dd5491 100644
--- a/arch/arm64/include/asm/uaccess.h
+++ b/arch/arm64/include/asm/uaccess.h
@@ -99,6 +99,7 @@ static inline void set_fs(mm_segment_t fs)
@@ -4881,7 +4947,7 @@ index 479330b..53717a8 100644
#endif /* __ASM_AVR32_KMAP_TYPES_H */
diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
-index 0eca933..eb78c7b 100644
+index d223a8b..69c5210 100644
--- a/arch/avr32/mm/fault.c
+++ b/arch/avr32/mm/fault.c
@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
@@ -4908,7 +4974,7 @@ index 0eca933..eb78c7b 100644
/*
* This routine handles page faults. It determines the address and the
* problem, and then passes it off to one of the appropriate routines.
-@@ -176,6 +193,16 @@ bad_area:
+@@ -178,6 +195,16 @@ bad_area:
up_read(&mm->mmap_sem);
if (user_mode(regs)) {
@@ -4980,10 +5046,10 @@ index 7caf25d..ee65ac5 100644
#define __read_mostly __attribute__((__section__(".data..read_mostly")))
diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
-index b86329d..6709906 100644
+index 102190a..5334cea 100644
--- a/arch/frv/include/asm/atomic.h
+++ b/arch/frv/include/asm/atomic.h
-@@ -186,6 +186,16 @@ static inline void atomic64_dec(atomic64_t *v)
+@@ -181,6 +181,16 @@ static inline void atomic64_dec(atomic64_t *v)
#define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
#define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
@@ -5060,7 +5126,7 @@ index 836f147..4cf23f5 100644
if (!(addr & ~PAGE_MASK))
goto success;
diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
-index f4ca594..adc72fd6 100644
+index 2635117..fa223cb 100644
--- a/arch/hexagon/include/asm/cache.h
+++ b/arch/hexagon/include/asm/cache.h
@@ -21,9 +21,11 @@
@@ -5078,10 +5144,10 @@ index f4ca594..adc72fd6 100644
#define __cacheline_aligned __aligned(L1_CACHE_BYTES)
#define ____cacheline_aligned __aligned(L1_CACHE_BYTES)
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
-index 0c8e553..112d734 100644
+index c84c88b..2a6e1ba 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
-@@ -544,6 +544,7 @@ source "drivers/sn/Kconfig"
+@@ -549,6 +549,7 @@ source "drivers/sn/Kconfig"
config KEXEC
bool "kexec system call"
depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
@@ -5090,7 +5156,7 @@ index 0c8e553..112d734 100644
kexec is a system call that implements the ability to shutdown your
current kernel, and to start another kernel. It is like a reboot
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
-index f37238f..810b95f 100644
+index 5441b14..039a446 100644
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@ -99,5 +99,6 @@ endef
@@ -5101,10 +5167,10 @@ index f37238f..810b95f 100644
make_nr_irqs_h: FORCE
$(Q)$(MAKE) $(build)=arch/ia64/kernel include/generated/nr-irqs.h
diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
-index 6e6fe18..a6ae668 100644
+index 0bf0350..2ad1957 100644
--- a/arch/ia64/include/asm/atomic.h
+++ b/arch/ia64/include/asm/atomic.h
-@@ -208,6 +208,16 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
+@@ -193,4 +193,14 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
#define atomic64_inc(v) atomic64_add(1, (v))
#define atomic64_dec(v) atomic64_sub(1, (v))
@@ -5118,14 +5184,12 @@ index 6e6fe18..a6ae668 100644
+#define atomic64_dec_unchecked(v) atomic64_dec(v)
+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
+
- /* Atomic operations are already serializing */
- #define smp_mb__before_atomic_dec() barrier()
- #define smp_mb__after_atomic_dec() barrier()
+ #endif /* _ASM_IA64_ATOMIC_H */
diff --git a/arch/ia64/include/asm/barrier.h b/arch/ia64/include/asm/barrier.h
-index d0a69aa..142f878 100644
+index a48957c..e097b56 100644
--- a/arch/ia64/include/asm/barrier.h
+++ b/arch/ia64/include/asm/barrier.h
-@@ -64,7 +64,7 @@
+@@ -67,7 +67,7 @@
do { \
compiletime_assert_atomic_type(*p); \
barrier(); \
@@ -5410,7 +5474,7 @@ index 24603be..948052d 100644
DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
}
diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
-index ab33328..f39506c 100644
+index c39c3cd..3c77738 100644
--- a/arch/ia64/kernel/palinfo.c
+++ b/arch/ia64/kernel/palinfo.c
@@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
@@ -5470,7 +5534,7 @@ index 84f8a52..7c76178 100644
* ensure percpu data fits
* into percpu page size
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
-index 7225dad..2a7c8256 100644
+index ba5ba7a..36e9d3a 100644
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
@@ -5541,7 +5605,7 @@ index 76069c1..c2aa816 100644
}
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
-index 25c3502..560dae7 100644
+index 6b33457..88b5124 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
@@ -5564,6 +5628,15 @@ index 25c3502..560dae7 100644
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
down_write(&current->mm->mmap_sem);
if (insert_vm_struct(current->mm, vma)) {
+@@ -286,7 +299,7 @@ static int __init gate_vma_init(void)
+ gate_vma.vm_start = FIXADDR_USER_START;
+ gate_vma.vm_end = FIXADDR_USER_END;
+ gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
+- gate_vma.vm_page_prot = __P101;
++ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
+
+ return 0;
+ }
diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
index 40b3ee9..8c2c112 100644
--- a/arch/m32r/include/asm/cache.h
@@ -5622,7 +5695,7 @@ index 0395c51..5f26031 100644
#define ARCH_DMA_MINALIGN L1_CACHE_BYTES
diff --git a/arch/metag/include/asm/barrier.h b/arch/metag/include/asm/barrier.h
-index 2d6f0de..de5f5ac 100644
+index c7591e8..ecef036 100644
--- a/arch/metag/include/asm/barrier.h
+++ b/arch/metag/include/asm/barrier.h
@@ -89,7 +89,7 @@ static inline void fence(void)
@@ -5635,7 +5708,7 @@ index 2d6f0de..de5f5ac 100644
#define smp_load_acquire(p) \
diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
-index 3c52fa6..11b2ad8 100644
+index 3c32075..ae0ae75 100644
--- a/arch/metag/mm/hugetlbpage.c
+++ b/arch/metag/mm/hugetlbpage.c
@@ -200,6 +200,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
@@ -5665,10 +5738,10 @@ index 4efe96a..60e8699 100644
#define SMP_CACHE_BYTES L1_CACHE_BYTES
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
-index 95fa1f1..56a6fa2 100644
+index 9536ef9..9333776 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -2298,6 +2298,7 @@ source "kernel/Kconfig.preempt"
+@@ -2413,6 +2413,7 @@ source "kernel/Kconfig.preempt"
config KEXEC
bool "Kexec system call"
@@ -5690,7 +5763,7 @@ index 02f2444..506969c 100644
static dma_addr_t octeon_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
-index 7eed2f2..c4e385d 100644
+index 6dd6bfc..903b0d6 100644
--- a/arch/mips/include/asm/atomic.h
+++ b/arch/mips/include/asm/atomic.h
@@ -21,15 +21,39 @@
@@ -5721,20 +5794,20 @@ index 7eed2f2..c4e385d 100644
*
* Atomically reads the value of @v.
*/
--#define atomic_read(v) (*(volatile int *)&(v)->counter)
+-#define atomic_read(v) ACCESS_ONCE((v)->counter)
+static inline int atomic_read(const atomic_t *v)
+{
-+ return (*(volatile const int *) &v->counter);
++ return ACCESS_ONCE(v->counter);
+}
+
+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
+{
-+ return (*(volatile const int *) &v->counter);
++ return ACCESS_ONCE(v->counter);
+}
/*
* atomic_set - set atomic variable
-@@ -38,7 +62,15 @@
+@@ -38,47 +62,77 @@
*
* Atomically sets the value of @v to @i.
*/
@@ -5743,343 +5816,187 @@ index 7eed2f2..c4e385d 100644
+{
+ v->counter = i;
+}
-+
+
+-#define ATOMIC_OP(op, c_op, asm_op) \
+-static __inline__ void atomic_##op(int i, atomic_t * v) \
+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
+{
+ v->counter = i;
+}
-
- /*
- * atomic_add - add integer to atomic variable
-@@ -47,7 +79,67 @@
- *
- * Atomically adds @i to @v.
- */
--static __inline__ void atomic_add(int i, atomic_t * v)
-+static __inline__ void atomic_add(int i, atomic_t *v)
-+{
-+ int temp;
+
-+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: ll %0, %1 # atomic_add \n"
+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "2: add %0, %2 \n"
++#define __OVERFLOW_POST \
++ " b 4f \n" \
++ " .set noreorder \n" \
++ "3: b 5f \n" \
++ " move %0, %1 \n" \
++ " .set reorder \n"
++#define __OVERFLOW_EXTABLE \
++ "3:\n" \
++ _ASM_EXTABLE(2b, 3b)
+#else
-+ " addu %0, %2 \n"
-+#endif
-+ " sc %0, %1 \n"
-+ " beqzl %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "3: \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else if (kernel_uses_llsc) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: ll %0, %1 # atomic_add \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "2: add %0, %2 \n"
-+#else
-+ " addu %0, %2 \n"
-+#endif
-+ " sc %0, %1 \n"
-+ " beqz %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "3: \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else {
-+ unsigned long flags;
-+
-+ raw_local_irq_save(flags);
-+ __asm__ __volatile__(
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "1: add %0, %1 \n"
-+ "2: \n"
-+ _ASM_EXTABLE(1b, 2b)
-+#else
-+ " addu %0, %1 \n"
-+#endif
-+ : "+r" (v->counter) : "Ir" (i));
-+ raw_local_irq_restore(flags);
-+ }
-+}
-+
-+static __inline__ void atomic_add_unchecked(int i, atomic_unchecked_t *v)
- {
- if (kernel_uses_llsc && R10000_LLSC_WAR) {
- int temp;
-@@ -90,7 +182,67 @@ static __inline__ void atomic_add(int i, atomic_t * v)
- *
- * Atomically subtracts @i from @v.
- */
--static __inline__ void atomic_sub(int i, atomic_t * v)
-+static __inline__ void atomic_sub(int i, atomic_t *v)
-+{
-+ int temp;
-+
-+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: ll %0, %1 # atomic64_sub \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "2: sub %0, %2 \n"
-+#else
-+ " subu %0, %2 \n"
-+#endif
-+ " sc %0, %1 \n"
-+ " beqzl %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "3: \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else if (kernel_uses_llsc) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: ll %0, %1 # atomic64_sub \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "2: sub %0, %2 \n"
-+#else
-+ " subu %0, %2 \n"
-+#endif
-+ " sc %0, %1 \n"
-+ " beqz %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "3: \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else {
-+ unsigned long flags;
-+
-+ raw_local_irq_save(flags);
-+ __asm__ __volatile__(
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "1: sub %0, %1 \n"
-+ "2: \n"
-+ _ASM_EXTABLE(1b, 2b)
-+#else
-+ " subu %0, %1 \n"
-+#endif
-+ : "+r" (v->counter) : "Ir" (i));
-+ raw_local_irq_restore(flags);
-+ }
-+}
-+
-+static __inline__ void atomic_sub_unchecked(long i, atomic_unchecked_t *v)
- {
- if (kernel_uses_llsc && R10000_LLSC_WAR) {
- int temp;
-@@ -129,7 +281,93 @@ static __inline__ void atomic_sub(int i, atomic_t * v)
- /*
- * Same as above, but return the result value
- */
--static __inline__ int atomic_add_return(int i, atomic_t * v)
-+static __inline__ int atomic_add_return(int i, atomic_t *v)
-+{
-+ int result;
-+ int temp;
-+
-+ smp_mb__before_llsc();
-+
-+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: ll %1, %2 # atomic_add_return \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "2: add %0, %1, %3 \n"
-+#else
-+ " addu %0, %1, %3 \n"
-+#endif
-+ " sc %0, %2 \n"
-+ " beqzl %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ " b 4f \n"
-+ " .set noreorder \n"
-+ "3: b 5f \n"
-+ " move %0, %1 \n"
-+ " .set reorder \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ "4: addu %0, %1, %3 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "5: \n"
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (result), "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else if (kernel_uses_llsc) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: ll %1, %2 # atomic_add_return \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "2: add %0, %1, %3 \n"
-+#else
-+ " addu %0, %1, %3 \n"
-+#endif
-+ " sc %0, %2 \n"
-+ " bnez %0, 4f \n"
-+ " b 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ " .set noreorder \n"
-+ "3: b 5f \n"
-+ " move %0, %1 \n"
-+ " .set reorder \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ "4: addu %0, %1, %3 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "5: \n"
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (result), "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else {
-+ unsigned long flags;
-+
-+ raw_local_irq_save(flags);
-+ __asm__ __volatile__(
-+ " lw %0, %1 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "1: add %0, %2 \n"
-+#else
-+ " addu %0, %2 \n"
-+#endif
-+ " sw %0, %1 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Note: Dest reg is not modified on overflow */
-+ "2: \n"
-+ _ASM_EXTABLE(1b, 2b)
-+#endif
-+ : "=&r" (result), "+m" (v->counter) : "Ir" (i));
-+ raw_local_irq_restore(flags);
-+ }
-+
-+ smp_llsc_mb();
-+
-+ return result;
-+}
-+
-+static __inline__ int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
- {
- int result;
-
-@@ -178,7 +416,93 @@ static __inline__ int atomic_add_return(int i, atomic_t * v)
- return result;
- }
-
--static __inline__ int atomic_sub_return(int i, atomic_t * v)
-+static __inline__ int atomic_sub_return(int i, atomic_t *v)
-+{
-+ int result;
-+ int temp;
-+
-+ smp_mb__before_llsc();
-+
-+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: ll %1, %2 # atomic_sub_return \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "2: sub %0, %1, %3 \n"
-+#else
-+ " subu %0, %1, %3 \n"
-+#endif
-+ " sc %0, %2 \n"
-+ " beqzl %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ " b 4f \n"
-+ " .set noreorder \n"
-+ "3: b 5f \n"
-+ " move %0, %1 \n"
-+ " .set reorder \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ "4: subu %0, %1, %3 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "5: \n"
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (result), "=&r" (temp), "=m" (v->counter)
-+ : "Ir" (i), "m" (v->counter)
-+ : "memory");
-+ } else if (kernel_uses_llsc) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: ll %1, %2 # atomic_sub_return \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "2: sub %0, %1, %3 \n"
-+#else
-+ " subu %0, %1, %3 \n"
-+#endif
-+ " sc %0, %2 \n"
-+ " bnez %0, 4f \n"
-+ " b 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ " .set noreorder \n"
-+ "3: b 5f \n"
-+ " move %0, %1 \n"
-+ " .set reorder \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ "4: subu %0, %1, %3 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "5: \n"
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (result), "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else {
-+ unsigned long flags;
-+
-+ raw_local_irq_save(flags);
-+ __asm__ __volatile__(
-+ " lw %0, %1 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "1: sub %0, %2 \n"
-+#else
-+ " subu %0, %2 \n"
-+#endif
-+ " sw %0, %1 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Note: Dest reg is not modified on overflow */
-+ "2: \n"
-+ _ASM_EXTABLE(1b, 2b)
-+#endif
-+ : "=&r" (result), "+m" (v->counter) : "Ir" (i));
-+ raw_local_irq_restore(flags);
-+ }
-+
-+ smp_llsc_mb();
-+
-+ return result;
-+}
-+static __inline__ int atomic_sub_return_unchecked(int i, atomic_unchecked_t *v)
- {
- int result;
++#define __OVERFLOW_POST
++#define __OVERFLOW_EXTABLE
++#endif
++
++#define __ATOMIC_OP(op, suffix, asm_op, extable) \
++static inline void atomic_##op##suffix(int i, atomic##suffix##_t * v) \
+ { \
+ if (kernel_uses_llsc && R10000_LLSC_WAR) { \
+ int temp; \
+ \
+ __asm__ __volatile__( \
+- " .set arch=r4000 \n" \
+- "1: ll %0, %1 # atomic_" #op " \n" \
+- " " #asm_op " %0, %2 \n" \
++ " .set mips3 \n" \
++ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
++ "2: " #asm_op " %0, %2 \n" \
+ " sc %0, %1 \n" \
+ " beqzl %0, 1b \n" \
++ extable \
+ " .set mips0 \n" \
+ : "=&r" (temp), "+m" (v->counter) \
+ : "Ir" (i)); \
+ } else if (kernel_uses_llsc) { \
+ int temp; \
+ \
+- do { \
+- __asm__ __volatile__( \
+- " .set arch=r4000 \n" \
+- " ll %0, %1 # atomic_" #op "\n" \
+- " " #asm_op " %0, %2 \n" \
+- " sc %0, %1 \n" \
+- " .set mips0 \n" \
+- : "=&r" (temp), "+m" (v->counter) \
+- : "Ir" (i)); \
+- } while (unlikely(!temp)); \
++ __asm__ __volatile__( \
++ " .set mips3 \n" \
++ " ll %0, %1 # atomic_" #op #suffix "\n" \
++ "2: " #asm_op " %0, %2 \n" \
++ " sc %0, %1 \n" \
++ " beqz %0, 1b \n" \
++ extable \
++ " .set mips0 \n" \
++ : "=&r" (temp), "+m" (v->counter) \
++ : "Ir" (i)); \
+ } else { \
+ unsigned long flags; \
+ \
+ raw_local_irq_save(flags); \
+- v->counter c_op i; \
++ __asm__ __volatile__( \
++ "2: " #asm_op " %0, %1 \n" \
++ extable \
++ : "+r" (v->counter) : "Ir" (i)); \
+ raw_local_irq_restore(flags); \
+ } \
+ } \
+
+-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
+-static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
++#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , asm_op##u) \
++ __ATOMIC_OP(op, _unchecked, asm_op)
++
++#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op, extable) \
++static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t * v) \
+ { \
+ int result; \
+ \
+@@ -88,37 +142,47 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
+ int temp; \
+ \
+ __asm__ __volatile__( \
+- " .set arch=r4000 \n" \
+- "1: ll %1, %2 # atomic_" #op "_return \n" \
+- " " #asm_op " %0, %1, %3 \n" \
++ " .set mips3 \n" \
++ "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
++ "2: " #asm_op " %0, %1, %3 \n" \
+ " sc %0, %2 \n" \
+ " beqzl %0, 1b \n" \
+- " " #asm_op " %0, %1, %3 \n" \
++ post_op \
++ extable \
++ "4: " #asm_op " %0, %1, %3 \n" \
++ "5: \n" \
+ " .set mips0 \n" \
+ : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
+ : "Ir" (i)); \
+ } else if (kernel_uses_llsc) { \
+ int temp; \
+ \
+- do { \
+- __asm__ __volatile__( \
+- " .set arch=r4000 \n" \
+- " ll %1, %2 # atomic_" #op "_return \n" \
+- " " #asm_op " %0, %1, %3 \n" \
+- " sc %0, %2 \n" \
+- " .set mips0 \n" \
+- : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
+- : "Ir" (i)); \
+- } while (unlikely(!result)); \
++ __asm__ __volatile__( \
++ " .set mips3 \n" \
++ "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
++ "2: " #asm_op " %0, %1, %3 \n" \
++ " sc %0, %2 \n" \
++ " beqz %0, 1b \n" \
++ post_op \
++ extable \
++ "4: " #asm_op " %0, %1, %3 \n" \
++ "5: \n" \
++ " .set mips0 \n" \
++ : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
++ : "Ir" (i)); \
+ \
+ result = temp; result c_op i; \
+ } else { \
+ unsigned long flags; \
+ \
+ raw_local_irq_save(flags); \
+- result = v->counter; \
+- result c_op i; \
+- v->counter = result; \
++ __asm__ __volatile__( \
++ " lw %0, %1 \n" \
++ "2: " #asm_op " %0, %1, %2 \n" \
++ " sw %0, %1 \n" \
++ "3: \n" \
++ extable \
++ : "=&r" (result), "+m" (v->counter) : "Ir" (i)); \
+ raw_local_irq_restore(flags); \
+ } \
+ \
+@@ -127,16 +191,21 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
+ return result; \
+ }
+
+-#define ATOMIC_OPS(op, c_op, asm_op) \
+- ATOMIC_OP(op, c_op, asm_op) \
+- ATOMIC_OP_RETURN(op, c_op, asm_op)
++#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , asm_op##u, , __OVERFLOW_EXTABLE) \
++ __ATOMIC_OP_RETURN(op, _unchecked, asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
+
+-ATOMIC_OPS(add, +=, addu)
+-ATOMIC_OPS(sub, -=, subu)
++#define ATOMIC_OPS(op, asm_op) \
++ ATOMIC_OP(op, asm_op) \
++ ATOMIC_OP_RETURN(op, asm_op)
++
++ATOMIC_OPS(add, add)
++ATOMIC_OPS(sub, sub)
+
+ #undef ATOMIC_OPS
+ #undef ATOMIC_OP_RETURN
++#undef __ATOMIC_OP_RETURN
+ #undef ATOMIC_OP
++#undef __ATOMIC_OP
-@@ -238,7 +562,7 @@ static __inline__ int atomic_sub_return(int i, atomic_t * v)
+ /*
+ * atomic_sub_if_positive - conditionally subtract integer from atomic variable
+@@ -146,7 +215,7 @@ ATOMIC_OPS(sub, -=, subu)
* Atomically test @v and subtract @i if @v is greater or equal than @i.
* The function returns the old value of @v minus @i.
*/
@@ -6088,7 +6005,7 @@ index 7eed2f2..c4e385d 100644
{
int result;
-@@ -295,8 +619,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
+@@ -203,8 +272,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
return result;
}
@@ -6117,7 +6034,7 @@ index 7eed2f2..c4e385d 100644
/**
* __atomic_add_unless - add unless the number is a given value
-@@ -324,6 +666,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
+@@ -232,6 +319,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
#define atomic_dec_return(v) atomic_sub_return(1, (v))
#define atomic_inc_return(v) atomic_add_return(1, (v))
@@ -6128,7 +6045,7 @@ index 7eed2f2..c4e385d 100644
/*
* atomic_sub_and_test - subtract value from variable and test result
-@@ -345,6 +691,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
+@@ -253,6 +344,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
* other cases.
*/
#define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
@@ -6139,7 +6056,7 @@ index 7eed2f2..c4e385d 100644
/*
* atomic_dec_and_test - decrement by 1 and test
-@@ -369,6 +719,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
+@@ -277,6 +372,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
* Atomically increments @v by 1.
*/
#define atomic_inc(v) atomic_add(1, (v))
@@ -6150,7 +6067,7 @@ index 7eed2f2..c4e385d 100644
/*
* atomic_dec - decrement and test
-@@ -377,6 +731,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
+@@ -285,6 +384,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
* Atomically decrements @v by 1.
*/
#define atomic_dec(v) atomic_sub(1, (v))
@@ -6161,19 +6078,19 @@ index 7eed2f2..c4e385d 100644
/*
* atomic_add_negative - add and test if negative
-@@ -398,14 +756,30 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
+@@ -306,54 +409,77 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
* @v: pointer of type atomic64_t
*
*/
--#define atomic64_read(v) (*(volatile long *)&(v)->counter)
+-#define atomic64_read(v) ACCESS_ONCE((v)->counter)
+static inline long atomic64_read(const atomic64_t *v)
+{
-+ return (*(volatile const long *) &v->counter);
++ return ACCESS_ONCE(v->counter);
+}
+
+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
+{
-+ return (*(volatile const long *) &v->counter);
++ return ACCESS_ONCE(v->counter);
+}
/*
@@ -6186,346 +6103,175 @@ index 7eed2f2..c4e385d 100644
+{
+ v->counter = i;
+}
-+
+
+-#define ATOMIC64_OP(op, c_op, asm_op) \
+-static __inline__ void atomic64_##op(long i, atomic64_t * v) \
+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
+{
+ v->counter = i;
+}
-
- /*
- * atomic64_add - add integer to atomic variable
-@@ -414,7 +788,66 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
- *
- * Atomically adds @i to @v.
- */
--static __inline__ void atomic64_add(long i, atomic64_t * v)
-+static __inline__ void atomic64_add(long i, atomic64_t *v)
-+{
-+ long temp;
-+
-+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: lld %0, %1 # atomic64_add \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "2: dadd %0, %2 \n"
-+#else
-+ " daddu %0, %2 \n"
-+#endif
-+ " scd %0, %1 \n"
-+ " beqzl %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "3: \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else if (kernel_uses_llsc) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: lld %0, %1 # atomic64_add \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "2: dadd %0, %2 \n"
-+#else
-+ " daddu %0, %2 \n"
-+#endif
-+ " scd %0, %1 \n"
-+ " beqz %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "3: \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else {
-+ unsigned long flags;
+
-+ raw_local_irq_save(flags);
-+ __asm__ __volatile__(
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "1: dadd %0, %1 \n"
-+ "2: \n"
-+ _ASM_EXTABLE(1b, 2b)
-+#else
-+ " daddu %0, %1 \n"
-+#endif
-+ : "+r" (v->counter) : "Ir" (i));
-+ raw_local_irq_restore(flags);
-+ }
-+}
-+static __inline__ void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
- {
- if (kernel_uses_llsc && R10000_LLSC_WAR) {
- long temp;
-@@ -457,7 +890,67 @@ static __inline__ void atomic64_add(long i, atomic64_t * v)
- *
- * Atomically subtracts @i from @v.
- */
--static __inline__ void atomic64_sub(long i, atomic64_t * v)
-+static __inline__ void atomic64_sub(long i, atomic64_t *v)
-+{
-+ long temp;
-+
-+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: lld %0, %1 # atomic64_sub \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "2: dsub %0, %2 \n"
-+#else
-+ " dsubu %0, %2 \n"
-+#endif
-+ " scd %0, %1 \n"
-+ " beqzl %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "3: \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else if (kernel_uses_llsc) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: lld %0, %1 # atomic64_sub \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "2: dsub %0, %2 \n"
-+#else
-+ " dsubu %0, %2 \n"
-+#endif
-+ " scd %0, %1 \n"
-+ " beqz %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "3: \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else {
-+ unsigned long flags;
-+
-+ raw_local_irq_save(flags);
-+ __asm__ __volatile__(
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "1: dsub %0, %1 \n"
-+ "2: \n"
-+ _ASM_EXTABLE(1b, 2b)
-+#else
-+ " dsubu %0, %1 \n"
-+#endif
-+ : "+r" (v->counter) : "Ir" (i));
-+ raw_local_irq_restore(flags);
-+ }
-+}
-+
-+static __inline__ void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
- {
- if (kernel_uses_llsc && R10000_LLSC_WAR) {
- long temp;
-@@ -496,7 +989,93 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v)
- /*
- * Same as above, but return the result value
- */
--static __inline__ long atomic64_add_return(long i, atomic64_t * v)
-+static __inline__ long atomic64_add_return(long i, atomic64_t *v)
-+{
-+ long result;
-+ long temp;
-+
-+ smp_mb__before_llsc();
-+
-+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: lld %1, %2 # atomic64_add_return \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "2: dadd %0, %1, %3 \n"
-+#else
-+ " daddu %0, %1, %3 \n"
-+#endif
-+ " scd %0, %2 \n"
-+ " beqzl %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ " b 4f \n"
-+ " .set noreorder \n"
-+ "3: b 5f \n"
-+ " move %0, %1 \n"
-+ " .set reorder \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ "4: daddu %0, %1, %3 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "5: \n"
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (result), "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else if (kernel_uses_llsc) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: lld %1, %2 # atomic64_add_return \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "2: dadd %0, %1, %3 \n"
-+#else
-+ " daddu %0, %1, %3 \n"
-+#endif
-+ " scd %0, %2 \n"
-+ " bnez %0, 4f \n"
-+ " b 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ " .set noreorder \n"
-+ "3: b 5f \n"
-+ " move %0, %1 \n"
-+ " .set reorder \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ "4: daddu %0, %1, %3 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "5: \n"
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (result), "=&r" (temp), "=m" (v->counter)
-+ : "Ir" (i), "m" (v->counter)
-+ : "memory");
-+ } else {
-+ unsigned long flags;
-+
-+ raw_local_irq_save(flags);
-+ __asm__ __volatile__(
-+ " ld %0, %1 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "1: dadd %0, %2 \n"
-+#else
-+ " daddu %0, %2 \n"
-+#endif
-+ " sd %0, %1 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Note: Dest reg is not modified on overflow */
-+ "2: \n"
-+ _ASM_EXTABLE(1b, 2b)
-+#endif
-+ : "=&r" (result), "+m" (v->counter) : "Ir" (i));
-+ raw_local_irq_restore(flags);
-+ }
-+
-+ smp_llsc_mb();
-+
-+ return result;
-+}
-+static __inline__ long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
- {
- long result;
-
-@@ -546,7 +1125,97 @@ static __inline__ long atomic64_add_return(long i, atomic64_t * v)
- return result;
- }
++#define __ATOMIC64_OP(op, suffix, asm_op, extable) \
++static inline void atomic64_##op##suffix(long i, atomic64##suffix##_t * v) \
+ { \
+ if (kernel_uses_llsc && R10000_LLSC_WAR) { \
+ long temp; \
+ \
+ __asm__ __volatile__( \
+- " .set arch=r4000 \n" \
+- "1: lld %0, %1 # atomic64_" #op " \n" \
+- " " #asm_op " %0, %2 \n" \
++ " .set mips3 \n" \
++ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
++ "2: " #asm_op " %0, %2 \n" \
+ " scd %0, %1 \n" \
+ " beqzl %0, 1b \n" \
++ extable \
+ " .set mips0 \n" \
+ : "=&r" (temp), "+m" (v->counter) \
+ : "Ir" (i)); \
+ } else if (kernel_uses_llsc) { \
+ long temp; \
+ \
+- do { \
+- __asm__ __volatile__( \
+- " .set arch=r4000 \n" \
+- " lld %0, %1 # atomic64_" #op "\n" \
+- " " #asm_op " %0, %2 \n" \
+- " scd %0, %1 \n" \
+- " .set mips0 \n" \
+- : "=&r" (temp), "+m" (v->counter) \
+- : "Ir" (i)); \
+- } while (unlikely(!temp)); \
++ __asm__ __volatile__( \
++ " .set mips3 \n" \
++ " lld %0, %1 # atomic64_" #op #suffix "\n" \
++ "2: " #asm_op " %0, %2 \n" \
++ " scd %0, %1 \n" \
++ " beqz %0, 1b \n" \
++ extable \
++ " .set mips0 \n" \
++ : "=&r" (temp), "+m" (v->counter) \
++ : "Ir" (i)); \
+ } else { \
+ unsigned long flags; \
+ \
+ raw_local_irq_save(flags); \
+- v->counter c_op i; \
++ __asm__ __volatile__( \
++ "2: " #asm_op " %0, %1 \n" \
++ extable \
++ : "+r" (v->counter) : "Ir" (i)); \
+ raw_local_irq_restore(flags); \
+ } \
+ } \
+
+-#define ATOMIC64_OP_RETURN(op, c_op, asm_op) \
+-static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
++#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , asm_op##u) \
++ __ATOMIC64_OP(op, _unchecked, asm_op)
++
++#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op, extable) \
++static inline long atomic64_##op##_return##suffix(long i, atomic64##suffix##_t * v)\
+ { \
+ long result; \
+ \
+@@ -363,38 +489,48 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
+ long temp; \
+ \
+ __asm__ __volatile__( \
+- " .set arch=r4000 \n" \
++ " .set mips3 \n" \
+ "1: lld %1, %2 # atomic64_" #op "_return\n" \
+- " " #asm_op " %0, %1, %3 \n" \
++ "2: " #asm_op " %0, %1, %3 \n" \
+ " scd %0, %2 \n" \
+ " beqzl %0, 1b \n" \
+- " " #asm_op " %0, %1, %3 \n" \
++ post_op \
++ extable \
++ "4: " #asm_op " %0, %1, %3 \n" \
++ "5: \n" \
+ " .set mips0 \n" \
+ : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
+ : "Ir" (i)); \
+ } else if (kernel_uses_llsc) { \
+ long temp; \
+ \
+- do { \
+- __asm__ __volatile__( \
+- " .set arch=r4000 \n" \
+- " lld %1, %2 # atomic64_" #op "_return\n" \
+- " " #asm_op " %0, %1, %3 \n" \
+- " scd %0, %2 \n" \
+- " .set mips0 \n" \
+- : "=&r" (result), "=&r" (temp), "=m" (v->counter) \
+- : "Ir" (i), "m" (v->counter) \
+- : "memory"); \
+- } while (unlikely(!result)); \
++ __asm__ __volatile__( \
++ " .set mips3 \n" \
++ "1: lld %1, %2 # atomic64_" #op "_return" #suffix "\n" \
++ "2: " #asm_op " %0, %1, %3 \n" \
++ " scd %0, %2 \n" \
++ " beqz %0, 1b \n" \
++ post_op \
++ extable \
++ "4: " #asm_op " %0, %1, %3 \n" \
++ "5: \n" \
++ " .set mips0 \n" \
++ : "=&r" (result), "=&r" (temp), "=m" (v->counter) \
++ : "Ir" (i), "m" (v->counter) \
++ : "memory"); \
+ \
+ result = temp; result c_op i; \
+ } else { \
+ unsigned long flags; \
+ \
+ raw_local_irq_save(flags); \
+- result = v->counter; \
+- result c_op i; \
+- v->counter = result; \
++ __asm__ __volatile__( \
++ " ld %0, %1 \n" \
++ "2: " #asm_op " %0, %1, %2 \n" \
++ " sd %0, %1 \n" \
++ "3: \n" \
++ extable \
++ : "=&r" (result), "+m" (v->counter) : "Ir" (i)); \
+ raw_local_irq_restore(flags); \
+ } \
+ \
+@@ -403,16 +539,23 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
+ return result; \
+ }
+
+-#define ATOMIC64_OPS(op, c_op, asm_op) \
+- ATOMIC64_OP(op, c_op, asm_op) \
+- ATOMIC64_OP_RETURN(op, c_op, asm_op)
++#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , asm_op##u, , __OVERFLOW_EXTABLE) \
++ __ATOMIC64_OP_RETURN(op, _unchecked, asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
+
+-ATOMIC64_OPS(add, +=, daddu)
+-ATOMIC64_OPS(sub, -=, dsubu)
++#define ATOMIC64_OPS(op, asm_op) \
++ ATOMIC64_OP(op, asm_op) \
++ ATOMIC64_OP_RETURN(op, asm_op)
++
++ATOMIC64_OPS(add, dadd)
++ATOMIC64_OPS(sub, dsub)
+
+ #undef ATOMIC64_OPS
+ #undef ATOMIC64_OP_RETURN
++#undef __ATOMIC64_OP_RETURN
+ #undef ATOMIC64_OP
++#undef __ATOMIC64_OP
++#undef __OVERFLOW_EXTABLE
++#undef __OVERFLOW_POST
--static __inline__ long atomic64_sub_return(long i, atomic64_t * v)
-+static __inline__ long atomic64_sub_return(long i, atomic64_t *v)
-+{
-+ long result;
-+ long temp;
-+
-+ smp_mb__before_llsc();
-+
-+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
-+ long temp;
-+
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: lld %1, %2 # atomic64_sub_return \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "2: dsub %0, %1, %3 \n"
-+#else
-+ " dsubu %0, %1, %3 \n"
-+#endif
-+ " scd %0, %2 \n"
-+ " beqzl %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ " b 4f \n"
-+ " .set noreorder \n"
-+ "3: b 5f \n"
-+ " move %0, %1 \n"
-+ " .set reorder \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ "4: dsubu %0, %1, %3 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "5: \n"
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (result), "=&r" (temp), "=m" (v->counter)
-+ : "Ir" (i), "m" (v->counter)
-+ : "memory");
-+ } else if (kernel_uses_llsc) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: lld %1, %2 # atomic64_sub_return \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "2: dsub %0, %1, %3 \n"
-+#else
-+ " dsubu %0, %1, %3 \n"
-+#endif
-+ " scd %0, %2 \n"
-+ " bnez %0, 4f \n"
-+ " b 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ " .set noreorder \n"
-+ "3: b 5f \n"
-+ " move %0, %1 \n"
-+ " .set reorder \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ "4: dsubu %0, %1, %3 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "5: \n"
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (result), "=&r" (temp), "=m" (v->counter)
-+ : "Ir" (i), "m" (v->counter)
-+ : "memory");
-+ } else {
-+ unsigned long flags;
-+
-+ raw_local_irq_save(flags);
-+ __asm__ __volatile__(
-+ " ld %0, %1 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "1: dsub %0, %2 \n"
-+#else
-+ " dsubu %0, %2 \n"
-+#endif
-+ " sd %0, %1 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Note: Dest reg is not modified on overflow */
-+ "2: \n"
-+ _ASM_EXTABLE(1b, 2b)
-+#endif
-+ : "=&r" (result), "+m" (v->counter) : "Ir" (i));
-+ raw_local_irq_restore(flags);
-+ }
-+
-+ smp_llsc_mb();
-+
-+ return result;
-+}
-+
-+static __inline__ long atomic64_sub_return_unchecked(long i, atomic64_unchecked_t *v)
- {
- long result;
-
-@@ -605,7 +1274,7 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v)
+ /*
+ * atomic64_sub_if_positive - conditionally subtract integer from atomic variable
+@@ -422,7 +565,7 @@ ATOMIC64_OPS(sub, -=, dsubu)
* Atomically test @v and subtract @i if @v is greater or equal than @i.
* The function returns the old value of @v minus @i.
*/
@@ -6534,7 +6280,7 @@ index 7eed2f2..c4e385d 100644
{
long result;
-@@ -662,9 +1331,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
+@@ -479,9 +622,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
return result;
}
@@ -6564,7 +6310,7 @@ index 7eed2f2..c4e385d 100644
/**
* atomic64_add_unless - add unless the number is a given value
-@@ -694,6 +1380,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
+@@ -511,6 +671,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
#define atomic64_dec_return(v) atomic64_sub_return(1, (v))
#define atomic64_inc_return(v) atomic64_add_return(1, (v))
@@ -6572,7 +6318,7 @@ index 7eed2f2..c4e385d 100644
/*
* atomic64_sub_and_test - subtract value from variable and test result
-@@ -715,6 +1402,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
+@@ -532,6 +693,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
* other cases.
*/
#define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
@@ -6580,7 +6326,7 @@ index 7eed2f2..c4e385d 100644
/*
* atomic64_dec_and_test - decrement by 1 and test
-@@ -739,6 +1427,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
+@@ -556,6 +718,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
* Atomically increments @v by 1.
*/
#define atomic64_inc(v) atomic64_add(1, (v))
@@ -6588,7 +6334,7 @@ index 7eed2f2..c4e385d 100644
/*
* atomic64_dec - decrement and test
-@@ -747,6 +1436,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
+@@ -564,6 +727,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
* Atomically decrements @v by 1.
*/
#define atomic64_dec(v) atomic64_sub(1, (v))
@@ -6597,7 +6343,7 @@ index 7eed2f2..c4e385d 100644
/*
* atomic64_add_negative - add and test if negative
diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h
-index e1aa4e4..670b68b 100644
+index d0101dd..266982c 100644
--- a/arch/mips/include/asm/barrier.h
+++ b/arch/mips/include/asm/barrier.h
@@ -184,7 +184,7 @@
@@ -6627,10 +6373,10 @@ index b4db69f..8f3b093 100644
#define SMP_CACHE_SHIFT L1_CACHE_SHIFT
#define SMP_CACHE_BYTES L1_CACHE_BYTES
diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
-index d414405..6bb4ba2 100644
+index 1d38fe0..9beabc9 100644
--- a/arch/mips/include/asm/elf.h
+++ b/arch/mips/include/asm/elf.h
-@@ -398,13 +398,16 @@ extern const char *__elf_platform;
+@@ -381,13 +381,16 @@ extern const char *__elf_platform;
#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
#endif
@@ -6677,7 +6423,7 @@ index 9e8ef59..1139d6b 100644
/*
* interrupt-retrigger: NOP for now. This may not be appropriate for all
diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
-index d44622c..64990d2 100644
+index 46dfc3c..a16b13a 100644
--- a/arch/mips/include/asm/local.h
+++ b/arch/mips/include/asm/local.h
@@ -12,15 +12,25 @@ typedef struct
@@ -6768,7 +6514,7 @@ index d44622c..64990d2 100644
/**
diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
-index 5e08bcc..cfedefc 100644
+index 3be8180..c4798d5 100644
--- a/arch/mips/include/asm/page.h
+++ b/arch/mips/include/asm/page.h
@@ -120,7 +120,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
@@ -6797,7 +6543,7 @@ index b336037..5b874cc 100644
/*
diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
-index 008324d..f67c239 100644
+index d6d1928..ce4f822 100644
--- a/arch/mips/include/asm/pgtable.h
+++ b/arch/mips/include/asm/pgtable.h
@@ -20,6 +20,9 @@
@@ -6810,41 +6556,31 @@ index 008324d..f67c239 100644
struct mm_struct;
struct vm_area_struct;
-diff --git a/arch/mips/include/asm/smtc_proc.h b/arch/mips/include/asm/smtc_proc.h
-index 25da651..ae2a259 100644
---- a/arch/mips/include/asm/smtc_proc.h
-+++ b/arch/mips/include/asm/smtc_proc.h
-@@ -18,6 +18,6 @@ extern struct smtc_cpu_proc smtc_cpu_stats[NR_CPUS];
-
- /* Count of number of recoveries of "stolen" FPU access rights on 34K */
-
--extern atomic_t smtc_fpu_recoveries;
-+extern atomic_unchecked_t smtc_fpu_recoveries;
-
- #endif /* __ASM_SMTC_PROC_H */
diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
-index e80ae50..b93dd2e 100644
+index 7de8658..c109224 100644
--- a/arch/mips/include/asm/thread_info.h
+++ b/arch/mips/include/asm/thread_info.h
-@@ -105,6 +105,8 @@ static inline struct thread_info *current_thread_info(void)
+@@ -105,6 +105,9 @@ static inline struct thread_info *current_thread_info(void)
#define TIF_SECCOMP 4 /* secure computing */
#define TIF_NOTIFY_RESUME 5 /* callback before returning to user */
#define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */
+/* li takes a 32bit immediate */
+#define TIF_GRSEC_SETXID 10 /* update credentials on syscall entry/exit */
++
#define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */
#define TIF_MEMDIE 18 /* is terminating due to OOM killer */
#define TIF_NOHZ 19 /* in adaptive nohz mode */
-@@ -134,14 +136,15 @@ static inline struct thread_info *current_thread_info(void)
- #define _TIF_LOAD_WATCH (1<<TIF_LOAD_WATCH)
- #define _TIF_32BIT_FPREGS (1<<TIF_32BIT_FPREGS)
+@@ -138,14 +141,16 @@ static inline struct thread_info *current_thread_info(void)
+ #define _TIF_USEDMSA (1<<TIF_USEDMSA)
+ #define _TIF_MSA_CTX_LIVE (1<<TIF_MSA_CTX_LIVE)
#define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
#define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
_TIF_SYSCALL_AUDIT | \
- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
-+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
++ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
++ _TIF_GRSEC_SETXID)
/* work to do in syscall_trace_leave() */
#define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
@@ -6853,7 +6589,7 @@ index e80ae50..b93dd2e 100644
/* work to do on interrupt/exception return */
#define _TIF_WORK_MASK \
-@@ -149,7 +152,7 @@ static inline struct thread_info *current_thread_info(void)
+@@ -153,7 +158,7 @@ static inline struct thread_info *current_thread_info(void)
/* work to do on any return to u-space */
#define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
_TIF_WORK_SYSCALL_EXIT | \
@@ -6863,10 +6599,10 @@ index e80ae50..b93dd2e 100644
/*
* We stash processor id into a COP0 register to retrieve it fast
diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
-index f3fa375..3af6637 100644
+index 22a5624..7c96295 100644
--- a/arch/mips/include/asm/uaccess.h
+++ b/arch/mips/include/asm/uaccess.h
-@@ -128,6 +128,7 @@ extern u64 __ua_limit;
+@@ -130,6 +130,7 @@ extern u64 __ua_limit;
__ok == 0; \
})
@@ -6893,7 +6629,7 @@ index 1188e00..41cf144 100644
#include <linux/module.h>
#include <linux/elfcore.h>
diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
-index 71df942..199dd19 100644
+index 9287678..f870e47 100644
--- a/arch/mips/kernel/binfmt_elfo32.c
+++ b/arch/mips/kernel/binfmt_elfo32.c
@@ -70,6 +70,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
@@ -6909,12 +6645,12 @@ index 71df942..199dd19 100644
+
#include <asm/processor.h>
- /* These MUST be defined before elf.h gets included */
+ #include <linux/module.h>
diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
-index 2b91fe8..fe4f6b4 100644
+index 50b3648..c2f3cec 100644
--- a/arch/mips/kernel/i8259.c
+++ b/arch/mips/kernel/i8259.c
-@@ -205,7 +205,7 @@ spurious_8259A_irq:
+@@ -201,7 +201,7 @@ spurious_8259A_irq:
printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq);
spurious_irq_mask |= irqmask;
}
@@ -6937,10 +6673,10 @@ index 44a1f79..2bd6aa3 100644
void __init gt641xx_irq_init(void)
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
-index d1fea7a..2e591b0 100644
+index d2bfbc2..a8eacd2 100644
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
-@@ -77,17 +77,17 @@ void ack_bad_irq(unsigned int irq)
+@@ -76,17 +76,17 @@ void ack_bad_irq(unsigned int irq)
printk("unexpected IRQ # %d\n", irq);
}
@@ -6961,7 +6697,7 @@ index d1fea7a..2e591b0 100644
}
void __init init_IRQ(void)
-@@ -110,7 +110,10 @@ void __init init_IRQ(void)
+@@ -109,7 +109,10 @@ void __init init_IRQ(void)
#endif
}
@@ -6972,7 +6708,7 @@ index d1fea7a..2e591b0 100644
static inline void check_stack_overflow(void)
{
unsigned long sp;
-@@ -126,6 +129,7 @@ static inline void check_stack_overflow(void)
+@@ -125,6 +128,7 @@ static inline void check_stack_overflow(void)
printk("do_IRQ: stack overflow: %ld\n",
sp - sizeof(struct thread_info));
dump_stack();
@@ -6980,11 +6716,24 @@ index d1fea7a..2e591b0 100644
}
}
#else
+diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
+index 0614717..002fa43 100644
+--- a/arch/mips/kernel/pm-cps.c
++++ b/arch/mips/kernel/pm-cps.c
+@@ -172,7 +172,7 @@ int cps_pm_enter_state(enum cps_pm_state state)
+ nc_core_ready_count = nc_addr;
+
+ /* Ensure ready_count is zero-initialised before the assembly runs */
+- ACCESS_ONCE(*nc_core_ready_count) = 0;
++ ACCESS_ONCE_RW(*nc_core_ready_count) = 0;
+ coupled_barrier(&per_cpu(pm_barrier, core), online);
+
+ /* Run the generated entry code */
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
-index 6ae540e..b7396dc 100644
+index 636b074..8fbb91f 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
-@@ -562,15 +562,3 @@ unsigned long get_wchan(struct task_struct *task)
+@@ -520,15 +520,3 @@ unsigned long get_wchan(struct task_struct *task)
out:
return pc;
}
@@ -7001,10 +6750,10 @@ index 6ae540e..b7396dc 100644
- return sp & ALMASK;
-}
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
-index 60f48fe..a2df508 100644
+index 9d1487d..10c5da5 100644
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
-@@ -790,6 +790,10 @@ long arch_ptrace(struct task_struct *child, long request,
+@@ -761,6 +761,10 @@ long arch_ptrace(struct task_struct *child, long request,
return ret;
}
@@ -7015,7 +6764,7 @@ index 60f48fe..a2df508 100644
/*
* Notification of system call entry/exit
* - triggered by current->work.syscall_trace
-@@ -806,6 +810,11 @@ asmlinkage void syscall_trace_enter(struct pt_regs *regs)
+@@ -777,6 +781,11 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
tracehook_report_syscall_entry(regs))
ret = -1;
@@ -7059,55 +6808,11 @@ index 07fc524..b9d7f28 100644
pm_power_off();
+ BUG();
}
-diff --git a/arch/mips/kernel/smtc-proc.c b/arch/mips/kernel/smtc-proc.c
-index c10aa84..9ec2e60 100644
---- a/arch/mips/kernel/smtc-proc.c
-+++ b/arch/mips/kernel/smtc-proc.c
-@@ -31,7 +31,7 @@ unsigned long selfipis[NR_CPUS];
-
- struct smtc_cpu_proc smtc_cpu_stats[NR_CPUS];
-
--atomic_t smtc_fpu_recoveries;
-+atomic_unchecked_t smtc_fpu_recoveries;
-
- static int smtc_proc_show(struct seq_file *m, void *v)
- {
-@@ -48,7 +48,7 @@ static int smtc_proc_show(struct seq_file *m, void *v)
- for(i = 0; i < NR_CPUS; i++)
- seq_printf(m, "%d: %ld\n", i, smtc_cpu_stats[i].selfipis);
- seq_printf(m, "%d Recoveries of \"stolen\" FPU\n",
-- atomic_read(&smtc_fpu_recoveries));
-+ atomic_read_unchecked(&smtc_fpu_recoveries));
- return 0;
- }
-
-@@ -73,7 +73,7 @@ void init_smtc_stats(void)
- smtc_cpu_stats[i].selfipis = 0;
- }
-
-- atomic_set(&smtc_fpu_recoveries, 0);
-+ atomic_set_unchecked(&smtc_fpu_recoveries, 0);
-
- proc_create("smtc", 0444, NULL, &smtc_proc_fops);
- }
-diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
-index dfc1b91..11a2c07 100644
---- a/arch/mips/kernel/smtc.c
-+++ b/arch/mips/kernel/smtc.c
-@@ -1359,7 +1359,7 @@ void smtc_soft_dump(void)
- }
- smtc_ipi_qdump();
- printk("%d Recoveries of \"stolen\" FPU\n",
-- atomic_read(&smtc_fpu_recoveries));
-+ atomic_read_unchecked(&smtc_fpu_recoveries));
- }
-
-
diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
-index c24ad5f..9983ab2 100644
+index 2242bdd..b284048 100644
--- a/arch/mips/kernel/sync-r4k.c
+++ b/arch/mips/kernel/sync-r4k.c
-@@ -20,8 +20,8 @@
+@@ -18,8 +18,8 @@
#include <asm/mipsregs.h>
static atomic_t count_start_flag = ATOMIC_INIT(0);
@@ -7118,7 +6823,7 @@ index c24ad5f..9983ab2 100644
static atomic_t count_reference = ATOMIC_INIT(0);
#define COUNTON 100
-@@ -68,13 +68,13 @@ void synchronise_count_master(int cpu)
+@@ -58,13 +58,13 @@ void synchronise_count_master(int cpu)
for (i = 0; i < NR_LOOPS; i++) {
/* slaves loop on '!= 2' */
@@ -7135,7 +6840,7 @@ index c24ad5f..9983ab2 100644
/*
* Everyone initialises count in the last loop:
-@@ -85,11 +85,11 @@ void synchronise_count_master(int cpu)
+@@ -75,11 +75,11 @@ void synchronise_count_master(int cpu)
/*
* Wait for all slaves to leave the synchronization point:
*/
@@ -7150,7 +6855,7 @@ index c24ad5f..9983ab2 100644
}
/* Arrange for an interrupt in a short while */
write_c0_compare(read_c0_count() + COUNTON);
-@@ -130,8 +130,8 @@ void synchronise_count_slave(int cpu)
+@@ -112,8 +112,8 @@ void synchronise_count_slave(int cpu)
initcount = atomic_read(&count_reference);
for (i = 0; i < NR_LOOPS; i++) {
@@ -7161,7 +6866,7 @@ index c24ad5f..9983ab2 100644
mb();
/*
-@@ -140,8 +140,8 @@ void synchronise_count_slave(int cpu)
+@@ -122,8 +122,8 @@ void synchronise_count_slave(int cpu)
if (i == NR_LOOPS-1)
write_c0_count(initcount);
@@ -7173,10 +6878,10 @@ index c24ad5f..9983ab2 100644
}
/* Arrange for an interrupt in a short while */
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
-index 81e6ae0..6ab6e79 100644
+index 22b19c2..c5cc8c4 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
-@@ -691,7 +691,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
+@@ -688,7 +688,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
siginfo_t info;
prev_state = exception_enter();
@@ -7196,21 +6901,21 @@ index 81e6ae0..6ab6e79 100644
info.si_code = FPE_INTOVF;
info.si_signo = SIGFPE;
-diff --git a/arch/mips/kvm/kvm_mips.c b/arch/mips/kvm/kvm_mips.c
-index 3e0ff8d..9eafbf0b 100644
---- a/arch/mips/kvm/kvm_mips.c
-+++ b/arch/mips/kvm/kvm_mips.c
-@@ -832,7 +832,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
+diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
+index e3b21e5..ea5ff7c 100644
+--- a/arch/mips/kvm/mips.c
++++ b/arch/mips/kvm/mips.c
+@@ -805,7 +805,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
return r;
}
-int kvm_arch_init(void *opaque)
+int kvm_arch_init(const void *opaque)
{
- int ret;
-
+ if (kvm_mips_callbacks) {
+ kvm_err("kvm: module already exists\n");
diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
-index becc42b..9e43d4b 100644
+index 70ab5d6..62940fe 100644
--- a/arch/mips/mm/fault.c
+++ b/arch/mips/mm/fault.c
@@ -28,6 +28,23 @@
@@ -7237,7 +6942,7 @@ index becc42b..9e43d4b 100644
/*
* This routine handles page faults. It determines the address,
* and the problem, and then passes it off to one of the appropriate
-@@ -199,6 +216,14 @@ bad_area:
+@@ -201,6 +218,14 @@ bad_area:
bad_area_nosemaphore:
/* User mode accesses just cause a SIGSEGV */
if (user_mode(regs)) {
@@ -7543,10 +7248,10 @@ index 4ce7a01..449202a 100644
#endif /* __ASM_OPENRISC_CACHE_H */
diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
-index 472886c..00e7df9 100644
+index 226f8ca..9d9b87d 100644
--- a/arch/parisc/include/asm/atomic.h
+++ b/arch/parisc/include/asm/atomic.h
-@@ -252,6 +252,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
+@@ -273,6 +273,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
return dec;
}
@@ -7656,10 +7361,10 @@ index 22b89d1..ce34230 100644
#define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
#define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
-index 4006964..fcb3cc2 100644
+index a5cb070..8604ddc 100644
--- a/arch/parisc/include/asm/uaccess.h
+++ b/arch/parisc/include/asm/uaccess.h
-@@ -246,10 +246,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
+@@ -243,10 +243,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
const void __user *from,
unsigned long n)
{
@@ -7863,7 +7568,7 @@ index 47ee620..1107387 100644
fault_space = regs->iasq[0];
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
-index d72197f..c017c84 100644
+index e5120e6..8ddb5cc 100644
--- a/arch/parisc/mm/fault.c
+++ b/arch/parisc/mm/fault.c
@@ -15,6 +15,7 @@
@@ -8036,10 +7741,10 @@ index d72197f..c017c84 100644
/*
* If for any reason at all we couldn't handle the fault, make
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
-index ee3c660..afa4212 100644
+index 88eace4..4ba2591 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
-@@ -394,6 +394,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
+@@ -404,6 +404,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
config KEXEC
bool "kexec system call"
depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
@@ -8048,28 +7753,520 @@ index ee3c660..afa4212 100644
kexec is a system call that implements the ability to shutdown your
current kernel, and to start another kernel. It is like a reboot
diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
-index e3b1d41..8e81edf 100644
+index 512d278..d31fadd 100644
--- a/arch/powerpc/include/asm/atomic.h
+++ b/arch/powerpc/include/asm/atomic.h
-@@ -523,6 +523,16 @@ static __inline__ long atomic64_inc_not_zero(atomic64_t *v)
- return t1;
+@@ -12,6 +12,11 @@
+
+ #define ATOMIC_INIT(i) { (i) }
+
++#define _ASM_EXTABLE(from, to) \
++" .section __ex_table,\"a\"\n" \
++ PPC_LONG" " #from ", " #to"\n" \
++" .previous\n"
++
+ static __inline__ int atomic_read(const atomic_t *v)
+ {
+ int t;
+@@ -21,39 +26,80 @@ static __inline__ int atomic_read(const atomic_t *v)
+ return t;
}
-+#define atomic64_read_unchecked(v) atomic64_read(v)
-+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
-+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
-+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
-+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
-+#define atomic64_inc_unchecked(v) atomic64_inc(v)
-+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
-+#define atomic64_dec_unchecked(v) atomic64_dec(v)
-+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
++static __inline__ int atomic_read_unchecked(const atomic_unchecked_t *v)
++{
++ int t;
++
++ __asm__ __volatile__("lwz%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
++
++ return t;
++}
++
+ static __inline__ void atomic_set(atomic_t *v, int i)
+ {
+ __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
+ }
+
+-#define ATOMIC_OP(op, asm_op) \
+-static __inline__ void atomic_##op(int a, atomic_t *v) \
++static __inline__ void atomic_set_unchecked(atomic_unchecked_t *v, int i)
++{
++ __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
++}
++
++#ifdef CONFIG_PAX_REFCOUNT
++#define __REFCOUNT_OP(op) op##o.
++#define __OVERFLOW_PRE \
++ " mcrxr cr0\n"
++#define __OVERFLOW_POST \
++ " bf 4*cr0+so, 3f\n" \
++ "2: .long 0x00c00b00\n" \
++ "3:\n"
++#define __OVERFLOW_EXTABLE \
++ "\n4:\n"
++ _ASM_EXTABLE(2b, 4b)
++#else
++#define __REFCOUNT_OP(op) op
++#define __OVERFLOW_PRE
++#define __OVERFLOW_POST
++#define __OVERFLOW_EXTABLE
++#endif
+
- #endif /* __powerpc64__ */
++#define __ATOMIC_OP(op, suffix, pre_op, asm_op, post_op, extable) \
++static inline void atomic_##op##suffix(int a, atomic##suffix##_t *v) \
+ { \
+ int t; \
+ \
+ __asm__ __volatile__( \
+-"1: lwarx %0,0,%3 # atomic_" #op "\n" \
++"1: lwarx %0,0,%3 # atomic_" #op #suffix "\n" \
++ pre_op \
+ #asm_op " %0,%2,%0\n" \
++ post_op \
+ PPC405_ERR77(0,%3) \
+ " stwcx. %0,0,%3 \n" \
+ " bne- 1b\n" \
++ extable \
+ : "=&r" (t), "+m" (v->counter) \
+ : "r" (a), "r" (&v->counter) \
+ : "cc"); \
+ } \
- #endif /* __KERNEL__ */
+-#define ATOMIC_OP_RETURN(op, asm_op) \
+-static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
++#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , , asm_op, , ) \
++ __ATOMIC_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
++
++#define __ATOMIC_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
++static inline int atomic_##op##_return##suffix(int a, atomic##suffix##_t *v)\
+ { \
+ int t; \
+ \
+ __asm__ __volatile__( \
+ PPC_ATOMIC_ENTRY_BARRIER \
+-"1: lwarx %0,0,%2 # atomic_" #op "_return\n" \
++"1: lwarx %0,0,%2 # atomic_" #op "_return" #suffix "\n" \
++ pre_op \
+ #asm_op " %0,%1,%0\n" \
++ post_op \
+ PPC405_ERR77(0,%2) \
+ " stwcx. %0,0,%2 \n" \
+ " bne- 1b\n" \
++ extable \
+ PPC_ATOMIC_EXIT_BARRIER \
+ : "=&r" (t) \
+ : "r" (a), "r" (&v->counter) \
+@@ -62,6 +108,9 @@ static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
+ return t; \
+ }
+
++#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , , asm_op, , )\
++ __ATOMIC_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
++
+ #define ATOMIC_OPS(op, asm_op) ATOMIC_OP(op, asm_op) ATOMIC_OP_RETURN(op, asm_op)
+
+ ATOMIC_OPS(add, add)
+@@ -69,42 +118,29 @@ ATOMIC_OPS(sub, subf)
+
+ #undef ATOMIC_OPS
+ #undef ATOMIC_OP_RETURN
++#undef __ATOMIC_OP_RETURN
+ #undef ATOMIC_OP
++#undef __ATOMIC_OP
+
+ #define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0)
+
+-static __inline__ void atomic_inc(atomic_t *v)
+-{
+- int t;
++/*
++ * atomic_inc - increment atomic variable
++ * @v: pointer of type atomic_t
++ *
++ * Automatically increments @v by 1
++ */
++#define atomic_inc(v) atomic_add(1, (v))
++#define atomic_inc_return(v) atomic_add_return(1, (v))
+
+- __asm__ __volatile__(
+-"1: lwarx %0,0,%2 # atomic_inc\n\
+- addic %0,%0,1\n"
+- PPC405_ERR77(0,%2)
+-" stwcx. %0,0,%2 \n\
+- bne- 1b"
+- : "=&r" (t), "+m" (v->counter)
+- : "r" (&v->counter)
+- : "cc", "xer");
++static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
++{
++ atomic_add_unchecked(1, v);
+ }
+
+-static __inline__ int atomic_inc_return(atomic_t *v)
++static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
+ {
+- int t;
+-
+- __asm__ __volatile__(
+- PPC_ATOMIC_ENTRY_BARRIER
+-"1: lwarx %0,0,%1 # atomic_inc_return\n\
+- addic %0,%0,1\n"
+- PPC405_ERR77(0,%1)
+-" stwcx. %0,0,%1 \n\
+- bne- 1b"
+- PPC_ATOMIC_EXIT_BARRIER
+- : "=&r" (t)
+- : "r" (&v->counter)
+- : "cc", "xer", "memory");
+-
+- return t;
++ return atomic_add_return_unchecked(1, v);
+ }
+
+ /*
+@@ -117,43 +153,38 @@ static __inline__ int atomic_inc_return(atomic_t *v)
+ */
+ #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
+
+-static __inline__ void atomic_dec(atomic_t *v)
++static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
+ {
+- int t;
+-
+- __asm__ __volatile__(
+-"1: lwarx %0,0,%2 # atomic_dec\n\
+- addic %0,%0,-1\n"
+- PPC405_ERR77(0,%2)\
+-" stwcx. %0,0,%2\n\
+- bne- 1b"
+- : "=&r" (t), "+m" (v->counter)
+- : "r" (&v->counter)
+- : "cc", "xer");
++ return atomic_add_return_unchecked(1, v) == 0;
+ }
+
+-static __inline__ int atomic_dec_return(atomic_t *v)
++/*
++ * atomic_dec - decrement atomic variable
++ * @v: pointer of type atomic_t
++ *
++ * Atomically decrements @v by 1
++ */
++#define atomic_dec(v) atomic_sub(1, (v))
++#define atomic_dec_return(v) atomic_sub_return(1, (v))
++
++static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
+ {
+- int t;
+-
+- __asm__ __volatile__(
+- PPC_ATOMIC_ENTRY_BARRIER
+-"1: lwarx %0,0,%1 # atomic_dec_return\n\
+- addic %0,%0,-1\n"
+- PPC405_ERR77(0,%1)
+-" stwcx. %0,0,%1\n\
+- bne- 1b"
+- PPC_ATOMIC_EXIT_BARRIER
+- : "=&r" (t)
+- : "r" (&v->counter)
+- : "cc", "xer", "memory");
+-
+- return t;
++ atomic_sub_unchecked(1, v);
+ }
+
+ #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
+ #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
+
++static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
++{
++ return cmpxchg(&(v->counter), old, new);
++}
++
++static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
++{
++ return xchg(&(v->counter), new);
++}
++
+ /**
+ * __atomic_add_unless - add unless the number is a given value
+ * @v: pointer of type atomic_t
+@@ -171,11 +202,27 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
+ PPC_ATOMIC_ENTRY_BARRIER
+ "1: lwarx %0,0,%1 # __atomic_add_unless\n\
+ cmpw 0,%0,%3 \n\
+- beq- 2f \n\
+- add %0,%2,%0 \n"
++ beq- 2f \n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++" mcrxr cr0\n"
++" addo. %0,%2,%0\n"
++" bf 4*cr0+so, 4f\n"
++"3:.long " "0x00c00b00""\n"
++"4:\n"
++#else
++ "add %0,%2,%0 \n"
++#endif
++
+ PPC405_ERR77(0,%2)
+ " stwcx. %0,0,%1 \n\
+ bne- 1b \n"
++"5:"
++
++#ifdef CONFIG_PAX_REFCOUNT
++ _ASM_EXTABLE(3b, 5b)
++#endif
++
+ PPC_ATOMIC_EXIT_BARRIER
+ " subf %0,%2,%0 \n\
+ 2:"
+@@ -248,6 +295,11 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)
+ }
+ #define atomic_dec_if_positive atomic_dec_if_positive
+
++#define smp_mb__before_atomic_dec() smp_mb()
++#define smp_mb__after_atomic_dec() smp_mb()
++#define smp_mb__before_atomic_inc() smp_mb()
++#define smp_mb__after_atomic_inc() smp_mb()
++
+ #ifdef __powerpc64__
+
+ #define ATOMIC64_INIT(i) { (i) }
+@@ -261,37 +313,60 @@ static __inline__ long atomic64_read(const atomic64_t *v)
+ return t;
+ }
+
++static __inline__ long atomic64_read_unchecked(const atomic64_unchecked_t *v)
++{
++ long t;
++
++ __asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
++
++ return t;
++}
++
+ static __inline__ void atomic64_set(atomic64_t *v, long i)
+ {
+ __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
+ }
+
+-#define ATOMIC64_OP(op, asm_op) \
+-static __inline__ void atomic64_##op(long a, atomic64_t *v) \
++static __inline__ void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
++{
++ __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
++}
++
++#define __ATOMIC64_OP(op, suffix, pre_op, asm_op, post_op, extable) \
++static inline void atomic64_##op##suffix(long a, atomic64##suffix##_t *v)\
+ { \
+ long t; \
+ \
+ __asm__ __volatile__( \
+ "1: ldarx %0,0,%3 # atomic64_" #op "\n" \
++ pre_op \
+ #asm_op " %0,%2,%0\n" \
++ post_op \
+ " stdcx. %0,0,%3 \n" \
+ " bne- 1b\n" \
++ extable \
+ : "=&r" (t), "+m" (v->counter) \
+ : "r" (a), "r" (&v->counter) \
+ : "cc"); \
+ }
+
+-#define ATOMIC64_OP_RETURN(op, asm_op) \
+-static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
++#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , , asm_op, , ) \
++ __ATOMIC64_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
++
++#define __ATOMIC64_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
++static inline long atomic64_##op##_return##suffix(long a, atomic64##suffix##_t *v)\
+ { \
+ long t; \
+ \
+ __asm__ __volatile__( \
+ PPC_ATOMIC_ENTRY_BARRIER \
+ "1: ldarx %0,0,%2 # atomic64_" #op "_return\n" \
++ pre_op \
+ #asm_op " %0,%1,%0\n" \
++ post_op \
+ " stdcx. %0,0,%2 \n" \
+ " bne- 1b\n" \
++ extable \
+ PPC_ATOMIC_EXIT_BARRIER \
+ : "=&r" (t) \
+ : "r" (a), "r" (&v->counter) \
+@@ -300,6 +375,9 @@ static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
+ return t; \
+ }
+
++#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , , asm_op, , )\
++ __ATOMIC64_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
++
+ #define ATOMIC64_OPS(op, asm_op) ATOMIC64_OP(op, asm_op) ATOMIC64_OP_RETURN(op, asm_op)
+
+ ATOMIC64_OPS(add, add)
+@@ -307,40 +385,33 @@ ATOMIC64_OPS(sub, subf)
+
+ #undef ATOMIC64_OPS
+ #undef ATOMIC64_OP_RETURN
++#undef __ATOMIC64_OP_RETURN
+ #undef ATOMIC64_OP
++#undef __ATOMIC64_OP
++#undef __OVERFLOW_EXTABLE
++#undef __OVERFLOW_POST
++#undef __OVERFLOW_PRE
++#undef __REFCOUNT_OP
+
+ #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
+
+-static __inline__ void atomic64_inc(atomic64_t *v)
+-{
+- long t;
++/*
++ * atomic64_inc - increment atomic variable
++ * @v: pointer of type atomic64_t
++ *
++ * Automatically increments @v by 1
++ */
++#define atomic64_inc(v) atomic64_add(1, (v))
++#define atomic64_inc_return(v) atomic64_add_return(1, (v))
+
+- __asm__ __volatile__(
+-"1: ldarx %0,0,%2 # atomic64_inc\n\
+- addic %0,%0,1\n\
+- stdcx. %0,0,%2 \n\
+- bne- 1b"
+- : "=&r" (t), "+m" (v->counter)
+- : "r" (&v->counter)
+- : "cc", "xer");
++static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
++{
++ atomic64_add_unchecked(1, v);
+ }
+
+-static __inline__ long atomic64_inc_return(atomic64_t *v)
++static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
+ {
+- long t;
+-
+- __asm__ __volatile__(
+- PPC_ATOMIC_ENTRY_BARRIER
+-"1: ldarx %0,0,%1 # atomic64_inc_return\n\
+- addic %0,%0,1\n\
+- stdcx. %0,0,%1 \n\
+- bne- 1b"
+- PPC_ATOMIC_EXIT_BARRIER
+- : "=&r" (t)
+- : "r" (&v->counter)
+- : "cc", "xer", "memory");
+-
+- return t;
++ return atomic64_add_return_unchecked(1, v);
+ }
+
+ /*
+@@ -353,36 +424,18 @@ static __inline__ long atomic64_inc_return(atomic64_t *v)
+ */
+ #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
+
+-static __inline__ void atomic64_dec(atomic64_t *v)
++/*
++ * atomic64_dec - decrement atomic variable
++ * @v: pointer of type atomic64_t
++ *
++ * Atomically decrements @v by 1
++ */
++#define atomic64_dec(v) atomic64_sub(1, (v))
++#define atomic64_dec_return(v) atomic64_sub_return(1, (v))
++
++static __inline__ void atomic64_dec_unchecked(atomic64_unchecked_t *v)
+ {
+- long t;
+-
+- __asm__ __volatile__(
+-"1: ldarx %0,0,%2 # atomic64_dec\n\
+- addic %0,%0,-1\n\
+- stdcx. %0,0,%2\n\
+- bne- 1b"
+- : "=&r" (t), "+m" (v->counter)
+- : "r" (&v->counter)
+- : "cc", "xer");
+-}
+-
+-static __inline__ long atomic64_dec_return(atomic64_t *v)
+-{
+- long t;
+-
+- __asm__ __volatile__(
+- PPC_ATOMIC_ENTRY_BARRIER
+-"1: ldarx %0,0,%1 # atomic64_dec_return\n\
+- addic %0,%0,-1\n\
+- stdcx. %0,0,%1\n\
+- bne- 1b"
+- PPC_ATOMIC_EXIT_BARRIER
+- : "=&r" (t)
+- : "r" (&v->counter)
+- : "cc", "xer", "memory");
+-
+- return t;
++ atomic64_sub_unchecked(1, v);
+ }
+
+ #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
+@@ -415,6 +468,16 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v)
+ #define atomic64_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
+ #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
+
++static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
++{
++ return cmpxchg(&(v->counter), old, new);
++}
++
++static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
++{
++ return xchg(&(v->counter), new);
++}
++
+ /**
+ * atomic64_add_unless - add unless the number is a given value
+ * @v: pointer of type atomic64_t
+@@ -430,13 +493,29 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
+
+ __asm__ __volatile__ (
+ PPC_ATOMIC_ENTRY_BARRIER
+-"1: ldarx %0,0,%1 # __atomic_add_unless\n\
++"1: ldarx %0,0,%1 # atomic64_add_unless\n\
+ cmpd 0,%0,%3 \n\
+- beq- 2f \n\
+- add %0,%2,%0 \n"
++ beq- 2f \n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++" mcrxr cr0\n"
++" addo. %0,%2,%0\n"
++" bf 4*cr0+so, 4f\n"
++"3:.long " "0x00c00b00""\n"
++"4:\n"
++#else
++ "add %0,%2,%0 \n"
++#endif
++
+ " stdcx. %0,0,%1 \n\
+ bne- 1b \n"
+ PPC_ATOMIC_EXIT_BARRIER
++"5:"
++
++#ifdef CONFIG_PAX_REFCOUNT
++ _ASM_EXTABLE(3b, 5b)
++#endif
++
+ " subf %0,%2,%0 \n\
+ 2:"
+ : "=&r" (t)
diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h
-index f89da80..7f5b05a 100644
+index bab79a1..4a3eabc 100644
--- a/arch/powerpc/include/asm/barrier.h
+++ b/arch/powerpc/include/asm/barrier.h
@@ -73,7 +73,7 @@
@@ -8082,18 +8279,18 @@ index f89da80..7f5b05a 100644
#define smp_load_acquire(p) \
diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
-index ed0afc1..0332825 100644
+index 34a05a1..a1f2c67 100644
--- a/arch/powerpc/include/asm/cache.h
+++ b/arch/powerpc/include/asm/cache.h
-@@ -3,6 +3,7 @@
-
+@@ -4,6 +4,7 @@
#ifdef __KERNEL__
+ #include <asm/reg.h>
+#include <linux/const.h>
/* bytes per L1 cache line */
#if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
-@@ -22,7 +23,7 @@
+@@ -23,7 +24,7 @@
#define L1_CACHE_SHIFT 7
#endif
@@ -8103,7 +8300,7 @@ index ed0afc1..0332825 100644
#define SMP_CACHE_BYTES L1_CACHE_BYTES
diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
-index 935b5e7..7001d2d 100644
+index 888d8f3..66f581c 100644
--- a/arch/powerpc/include/asm/elf.h
+++ b/arch/powerpc/include/asm/elf.h
@@ -28,8 +28,19 @@
@@ -8128,7 +8325,7 @@ index 935b5e7..7001d2d 100644
#define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)
-@@ -127,10 +138,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
+@@ -129,10 +140,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
(0x7ff >> (PAGE_SHIFT - 12)) : \
(0x3ffff >> (PAGE_SHIFT - 12)))
@@ -8165,10 +8362,10 @@ index 5acabbd..7ea14fa 100644
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_KMAP_TYPES_H */
diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h
-index b8da913..60b608a 100644
+index b8da913..c02b593 100644
--- a/arch/powerpc/include/asm/local.h
+++ b/arch/powerpc/include/asm/local.h
-@@ -9,15 +9,26 @@ typedef struct
+@@ -9,21 +9,65 @@ typedef struct
atomic_long_t a;
} local_t;
@@ -8195,23 +8392,46 @@ index b8da913..60b608a 100644
static __inline__ long local_add_return(long a, local_t *l)
{
-@@ -35,6 +46,7 @@ static __inline__ long local_add_return(long a, local_t *l)
-
- return t;
- }
-+#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
-
- #define local_add_negative(a, l) (local_add_return((a), (l)) < 0)
+ long t;
-@@ -54,6 +66,7 @@ static __inline__ long local_sub_return(long a, local_t *l)
-
- return t;
- }
-+#define local_sub_return_unchecked(i, l) atomic_long_sub_return_unchecked((i), (&(l)->a))
-
- static __inline__ long local_inc_return(local_t *l)
- {
-@@ -101,6 +114,8 @@ static __inline__ long local_dec_return(local_t *l)
+ __asm__ __volatile__(
++"1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++" mcrxr cr0\n"
++" addo. %0,%1,%0\n"
++" bf 4*cr0+so, 3f\n"
++"2:.long " "0x00c00b00""\n"
++#else
++" add %0,%1,%0\n"
++#endif
++
++"3:\n"
++ PPC405_ERR77(0,%2)
++ PPC_STLCX "%0,0,%2 \n\
++ bne- 1b"
++
++#ifdef CONFIG_PAX_REFCOUNT
++"\n4:\n"
++ _ASM_EXTABLE(2b, 4b)
++#endif
++
++ : "=&r" (t)
++ : "r" (a), "r" (&(l->a.counter))
++ : "cc", "memory");
++
++ return t;
++}
++
++static __inline__ long local_add_return_unchecked(long a, local_unchecked_t *l)
++{
++ long t;
++
++ __asm__ __volatile__(
+ "1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n\
+ add %0,%1,%0\n"
+ PPC405_ERR77(0,%2)
+@@ -101,6 +145,8 @@ static __inline__ long local_dec_return(local_t *l)
#define local_cmpxchg(l, o, n) \
(cmpxchg_local(&((l)->a.counter), (o), (n)))
@@ -8234,10 +8454,10 @@ index 8565c25..2865190 100644
return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
}
diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
-index 32e4e21..62afb12 100644
+index 26fe1ae..987ffc5 100644
--- a/arch/powerpc/include/asm/page.h
+++ b/arch/powerpc/include/asm/page.h
-@@ -230,8 +230,9 @@ extern long long virt_phys_offset;
+@@ -227,8 +227,9 @@ extern long long virt_phys_offset;
* and needs to be executable. This means the whole heap ends
* up being executable.
*/
@@ -8249,7 +8469,7 @@ index 32e4e21..62afb12 100644
#define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-@@ -259,6 +260,9 @@ extern long long virt_phys_offset;
+@@ -256,6 +257,9 @@ extern long long virt_phys_offset;
#define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
#endif
@@ -8260,10 +8480,10 @@ index 32e4e21..62afb12 100644
/*
* Use the top bit of the higher-level page table entries to indicate whether
diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
-index 88693ce..ac6f9ab 100644
+index d908a46..3753f71 100644
--- a/arch/powerpc/include/asm/page_64.h
+++ b/arch/powerpc/include/asm/page_64.h
-@@ -153,15 +153,18 @@ do { \
+@@ -172,15 +172,18 @@ do { \
* stack by default, so in the absence of a PT_GNU_STACK program header
* we turn execute permission off.
*/
@@ -8317,7 +8537,7 @@ index 4b0be20..c15a27d 100644
static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
pte_t *pte)
diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
-index 3ebb188..e17dddf 100644
+index 316f9a5..ba05c77 100644
--- a/arch/powerpc/include/asm/pgtable.h
+++ b/arch/powerpc/include/asm/pgtable.h
@@ -2,6 +2,7 @@
@@ -8327,7 +8547,7 @@ index 3ebb188..e17dddf 100644
+#include <linux/const.h>
#ifndef __ASSEMBLY__
#include <linux/mmdebug.h>
- #include <asm/processor.h> /* For TASK_SIZE */
+ #include <linux/mmzone.h>
diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
index 4aad413..85d86bf 100644
--- a/arch/powerpc/include/asm/pte-hash32.h
@@ -8341,10 +8561,10 @@ index 4aad413..85d86bf 100644
#define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
#define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
-index ce17815..c5574cc 100644
+index a68ee15..552d213 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
-@@ -249,6 +249,7 @@
+@@ -253,6 +253,7 @@
#define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
#define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
#define DSISR_NOHPTE 0x40000000 /* no translation found */
@@ -8353,7 +8573,7 @@ index ce17815..c5574cc 100644
#define DSISR_ISSTORE 0x02000000 /* access was a store */
#define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
-index 084e080..9415a3d 100644
+index 5a6614a..d89995d1 100644
--- a/arch/powerpc/include/asm/smp.h
+++ b/arch/powerpc/include/asm/smp.h
@@ -51,7 +51,7 @@ struct smp_ops_t {
@@ -8365,6 +8585,73 @@ index 084e080..9415a3d 100644
extern void smp_send_debugger_break(void);
extern void start_secondary_resume(void);
+diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
+index 4dbe072..b803275 100644
+--- a/arch/powerpc/include/asm/spinlock.h
++++ b/arch/powerpc/include/asm/spinlock.h
+@@ -204,13 +204,29 @@ static inline long __arch_read_trylock(arch_rwlock_t *rw)
+ __asm__ __volatile__(
+ "1: " PPC_LWARX(%0,0,%1,1) "\n"
+ __DO_SIGN_EXTEND
+-" addic. %0,%0,1\n\
+- ble- 2f\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++" mcrxr cr0\n"
++" addico. %0,%0,1\n"
++" bf 4*cr0+so, 3f\n"
++"2:.long " "0x00c00b00""\n"
++#else
++" addic. %0,%0,1\n"
++#endif
++
++"3:\n"
++ "ble- 4f\n"
+ PPC405_ERR77(0,%1)
+ " stwcx. %0,0,%1\n\
+ bne- 1b\n"
+ PPC_ACQUIRE_BARRIER
+-"2:" : "=&r" (tmp)
++"4:"
++
++#ifdef CONFIG_PAX_REFCOUNT
++ _ASM_EXTABLE(2b,4b)
++#endif
++
++ : "=&r" (tmp)
+ : "r" (&rw->lock)
+ : "cr0", "xer", "memory");
+
+@@ -286,11 +302,27 @@ static inline void arch_read_unlock(arch_rwlock_t *rw)
+ __asm__ __volatile__(
+ "# read_unlock\n\t"
+ PPC_RELEASE_BARRIER
+-"1: lwarx %0,0,%1\n\
+- addic %0,%0,-1\n"
++"1: lwarx %0,0,%1\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++" mcrxr cr0\n"
++" addico. %0,%0,-1\n"
++" bf 4*cr0+so, 3f\n"
++"2:.long " "0x00c00b00""\n"
++#else
++" addic. %0,%0,-1\n"
++#endif
++
++"3:\n"
+ PPC405_ERR77(0,%1)
+ " stwcx. %0,0,%1\n\
+ bne- 1b"
++
++#ifdef CONFIG_PAX_REFCOUNT
++"\n4:\n"
++ _ASM_EXTABLE(2b, 4b)
++#endif
++
+ : "=&r"(tmp)
+ : "r"(&rw->lock)
+ : "cr0", "xer", "memory");
diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
index b034ecd..af7e31f 100644
--- a/arch/powerpc/include/asm/thread_info.h
@@ -8571,10 +8858,10 @@ index 9485b43..3bd3c16 100644
static inline unsigned long clear_user(void __user *addr, unsigned long size)
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
-index fcc9a89..07be2bb 100644
+index 502cf69..822e63b 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
-@@ -26,6 +26,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
+@@ -27,6 +27,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog
endif
@@ -8584,48 +8871,48 @@ index fcc9a89..07be2bb 100644
irq.o align.o signal_32.o pmc.o vdso.o \
process.o systbl.o idle.o \
diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
-index 063b65d..7a26e9d 100644
+index 3e68d1c..72a5ee6 100644
--- a/arch/powerpc/kernel/exceptions-64e.S
+++ b/arch/powerpc/kernel/exceptions-64e.S
-@@ -771,6 +771,7 @@ storage_fault_common:
+@@ -1010,6 +1010,7 @@ storage_fault_common:
std r14,_DAR(r1)
std r15,_DSISR(r1)
addi r3,r1,STACK_FRAME_OVERHEAD
-+ bl .save_nvgprs
++ bl save_nvgprs
mr r4,r14
mr r5,r15
ld r14,PACA_EXGEN+EX_R14(r13)
-@@ -779,8 +780,7 @@ storage_fault_common:
+@@ -1018,8 +1019,7 @@ storage_fault_common:
cmpdi r3,0
bne- 1f
- b .ret_from_except_lite
--1: bl .save_nvgprs
+ b ret_from_except_lite
+-1: bl save_nvgprs
- mr r5,r3
+1: mr r5,r3
addi r3,r1,STACK_FRAME_OVERHEAD
ld r4,_DAR(r1)
- bl .bad_page_fault
+ bl bad_page_fault
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
-index 38d5073..f00af8d 100644
+index 72e783e..fe058e2 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
-@@ -1584,10 +1584,10 @@ handle_page_fault:
+@@ -1588,10 +1588,10 @@ handle_page_fault:
11: ld r4,_DAR(r1)
ld r5,_DSISR(r1)
addi r3,r1,STACK_FRAME_OVERHEAD
-+ bl .save_nvgprs
- bl .do_page_fault
++ bl save_nvgprs
+ bl do_page_fault
cmpdi r3,0
beq+ 12f
-- bl .save_nvgprs
+- bl save_nvgprs
mr r5,r3
addi r3,r1,STACK_FRAME_OVERHEAD
lwz r4,_DAR(r1)
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
-index 1d0848b..d74685f 100644
+index c143835..5a9697f 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
-@@ -447,6 +447,8 @@ void migrate_irqs(void)
+@@ -461,6 +461,8 @@ void migrate_irqs(void)
}
#endif
@@ -8634,8 +8921,8 @@ index 1d0848b..d74685f 100644
static inline void check_stack_overflow(void)
{
#ifdef CONFIG_DEBUG_STACKOVERFLOW
-@@ -459,6 +461,7 @@ static inline void check_stack_overflow(void)
- printk("do_IRQ: stack overflow: %ld\n",
+@@ -473,6 +475,7 @@ static inline void check_stack_overflow(void)
+ pr_err("do_IRQ: stack overflow: %ld\n",
sp - sizeof(struct thread_info));
dump_stack();
+ gr_handle_kernel_exploit();
@@ -8643,21 +8930,21 @@ index 1d0848b..d74685f 100644
#endif
}
diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
-index 6cff040..74ac5d1b 100644
+index c94d2e0..992a9ce 100644
--- a/arch/powerpc/kernel/module_32.c
+++ b/arch/powerpc/kernel/module_32.c
-@@ -161,7 +161,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
+@@ -158,7 +158,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
me->arch.core_plt_section = i;
}
if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
-- printk("Module doesn't contain .plt or .init.plt sections.\n");
-+ printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
+- pr_err("Module doesn't contain .plt or .init.plt sections.\n");
++ pr_err("Module $s doesn't contain .plt or .init.plt sections.\n", me->name);
return -ENOEXEC;
}
-@@ -191,11 +191,16 @@ static uint32_t do_plt_call(void *location,
+@@ -188,11 +188,16 @@ static uint32_t do_plt_call(void *location,
- DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
+ pr_debug("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
/* Init, or core PLT? */
- if (location >= mod->module_core
- && location < mod->module_core + mod->core_size)
@@ -8675,7 +8962,7 @@ index 6cff040..74ac5d1b 100644
/* Find this entry, or if that fails, the next avail. entry */
while (entry->jump[0]) {
-@@ -299,7 +304,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
+@@ -296,7 +301,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
}
#ifdef CONFIG_DYNAMIC_FTRACE
module->arch.tramp =
@@ -8685,10 +8972,10 @@ index 6cff040..74ac5d1b 100644
sechdrs, module);
#endif
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
-index 31d0215..206af70 100644
+index 923cd2d..ae782a9 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
-@@ -1031,8 +1031,8 @@ void show_regs(struct pt_regs * regs)
+@@ -1040,8 +1040,8 @@ void show_regs(struct pt_regs * regs)
* Lookup NIP late so we have the best change of getting the
* above info out without failing
*/
@@ -8699,7 +8986,7 @@ index 31d0215..206af70 100644
#endif
show_stack(current, (unsigned long *) regs->gpr[1]);
if (!user_mode(regs))
-@@ -1554,10 +1554,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
+@@ -1560,10 +1560,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
newsp = stack[0];
ip = stack[STACK_FRAME_LR_SAVE];
if (!firstframe || ip != lr) {
@@ -8712,16 +8999,16 @@ index 31d0215..206af70 100644
(void *)current->ret_stack[curr_frame].ret);
curr_frame--;
}
-@@ -1577,7 +1577,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
+@@ -1583,7 +1583,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
struct pt_regs *regs = (struct pt_regs *)
(sp + STACK_FRAME_OVERHEAD);
lr = regs->link;
-- printk("--- Exception: %lx at %pS\n LR = %pS\n",
-+ printk("--- Exception: %lx at %pA\n LR = %pA\n",
+- printk("--- interrupt: %lx at %pS\n LR = %pS\n",
++ printk("--- interrupt: %lx at %pA\n LR = %pA\n",
regs->trap, (void *)regs->nip, (void *)lr);
firstframe = 1;
}
-@@ -1613,58 +1613,3 @@ void notrace __ppc64_runlatch_off(void)
+@@ -1619,58 +1619,3 @@ void notrace __ppc64_runlatch_off(void)
mtspr(SPRN_CTRLT, ctrl);
}
#endif /* CONFIG_PPC64 */
@@ -8781,7 +9068,7 @@ index 31d0215..206af70 100644
- return ret;
-}
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
-index 2e3d2bf..35df241 100644
+index f21897b..28c0428 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -1762,6 +1762,10 @@ long arch_ptrace(struct task_struct *child, long request,
@@ -8807,7 +9094,7 @@ index 2e3d2bf..35df241 100644
if (test_thread_flag(TIF_SYSCALL_TRACE) &&
tracehook_report_syscall_entry(regs))
/*
-@@ -1808,6 +1817,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
+@@ -1805,6 +1814,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
{
int step;
@@ -8820,10 +9107,10 @@ index 2e3d2bf..35df241 100644
if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
-index 4e47db6..6dcc96e 100644
+index b171001..4ac7ac5 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
-@@ -1013,7 +1013,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
+@@ -1011,7 +1011,7 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
/* Save user registers on the stack */
frame = &rt_sf->uc.uc_mcontext;
addr = frame;
@@ -8833,10 +9120,10 @@ index 4e47db6..6dcc96e 100644
tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
} else {
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
-index d501dc4..e5a0de0 100644
+index 2cb0c94..c0c0bc9 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
-@@ -760,7 +760,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
+@@ -754,7 +754,7 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs
current->thread.fp_state.fpscr = 0;
/* Set up to return from userspace. */
@@ -8846,10 +9133,18 @@ index d501dc4..e5a0de0 100644
} else {
err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
-index 33cd7a0..d615344 100644
+index 0dc43f9..a885d33 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
-@@ -142,6 +142,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
+@@ -36,6 +36,7 @@
+ #include <linux/debugfs.h>
+ #include <linux/ratelimit.h>
+ #include <linux/context_tracking.h>
++#include <linux/uaccess.h>
+
+ #include <asm/emulated_ops.h>
+ #include <asm/pgtable.h>
+@@ -142,6 +143,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
return flags;
}
@@ -8858,7 +9153,7 @@ index 33cd7a0..d615344 100644
static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
int signr)
{
-@@ -191,6 +193,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
+@@ -191,6 +194,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
panic("Fatal exception in interrupt");
if (panic_on_oops)
panic("Fatal exception");
@@ -8868,8 +9163,35 @@ index 33cd7a0..d615344 100644
do_exit(signr);
}
+@@ -1137,6 +1143,26 @@ void __kprobes program_check_exception(struct pt_regs *regs)
+ enum ctx_state prev_state = exception_enter();
+ unsigned int reason = get_reason(regs);
+
++#ifdef CONFIG_PAX_REFCOUNT
++ unsigned int bkpt;
++ const struct exception_table_entry *entry;
++
++ if (reason & REASON_ILLEGAL) {
++ /* Check if PaX bad instruction */
++ if (!probe_kernel_address(regs->nip, bkpt) && bkpt == 0xc00b00) {
++ current->thread.trap_nr = 0;
++ pax_report_refcount_overflow(regs);
++ /* fixup_exception() for PowerPC does not exist, simulate its job */
++ if ((entry = search_exception_tables(regs->nip)) != NULL) {
++ regs->nip = entry->fixup;
++ return;
++ }
++ /* fixup_exception() could not handle */
++ goto bail;
++ }
++ }
++#endif
++
+ /* We can now get here via a FP Unavailable exception if the core
+ * has no FPU, in that case the reason flags will be 0 */
+
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
-index 094e45c..d82b848 100644
+index f174351..5722009 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -35,6 +35,7 @@
@@ -8899,10 +9221,10 @@ index 094e45c..d82b848 100644
rc = vdso_base;
goto fail_mmapsem;
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
-index 3cf541a..ab2d825 100644
+index c1f8f53..71a3b96 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
-@@ -1153,7 +1153,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
+@@ -1409,7 +1409,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
}
EXPORT_SYMBOL_GPL(kvmppc_init_lpid);
@@ -8947,13 +9269,13 @@ index 5eea6f3..5d10396 100644
EXPORT_SYMBOL(copy_in_user);
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
-index 51ab9e7..7d3c78b 100644
+index f06b56b..ffb2fb4 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -33,6 +33,10 @@
- #include <linux/magic.h>
#include <linux/ratelimit.h>
#include <linux/context_tracking.h>
+ #include <linux/hugetlb.h>
+#include <linux/slab.h>
+#include <linux/pagemap.h>
+#include <linux/compiler.h>
@@ -8995,7 +9317,7 @@ index 51ab9e7..7d3c78b 100644
/*
* Check whether the instruction at regs->nip is a store using
* an update addressing form which will update r1.
-@@ -216,7 +247,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
+@@ -228,7 +259,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
* indicate errors in DSISR but can validly be set in SRR1.
*/
if (trap == 0x400)
@@ -9004,7 +9326,7 @@ index 51ab9e7..7d3c78b 100644
else
is_write = error_code & DSISR_ISSTORE;
#else
-@@ -378,7 +409,7 @@ good_area:
+@@ -390,7 +421,7 @@ good_area:
* "undefined". Of those that can be set, this is the only
* one which seems bad.
*/
@@ -9013,7 +9335,7 @@ index 51ab9e7..7d3c78b 100644
/* Guarded storage error. */
goto bad_area;
#endif /* CONFIG_8xx */
-@@ -393,7 +424,7 @@ good_area:
+@@ -405,7 +436,7 @@ good_area:
* processors use the same I/D cache coherency mechanism
* as embedded.
*/
@@ -9022,7 +9344,7 @@ index 51ab9e7..7d3c78b 100644
goto bad_area;
#endif /* CONFIG_PPC_STD_MMU */
-@@ -483,6 +514,23 @@ bad_area:
+@@ -497,6 +528,23 @@ bad_area:
bad_area_nosemaphore:
/* User mode accesses cause a SIGSEGV */
if (user_mode(regs)) {
@@ -9108,10 +9430,10 @@ index cb8bdbe..cde4bc7 100644
}
}
diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
-index b0c75cc..ef7fb93 100644
+index ded0ea1..f213a9b 100644
--- a/arch/powerpc/mm/slice.c
+++ b/arch/powerpc/mm/slice.c
-@@ -103,7 +103,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
+@@ -105,7 +105,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
if ((mm->task_size - len) < addr)
return 0;
vma = find_vma(mm, addr);
@@ -9161,7 +9483,7 @@ index 4278acf..67fd0e6 100644
static void pciex_clear_intr_all(unsigned int __iomem *base)
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
-index 9098692..3d54cd1 100644
+index d966bbe..372124a 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
@@ -9177,10 +9499,10 @@ index 9098692..3d54cd1 100644
struct spu_context *ctx = vma->vm_file->private_data;
unsigned long offset = address - vma->vm_start;
diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
-index 1d47061..0714963 100644
+index fa934fe..c296056 100644
--- a/arch/s390/include/asm/atomic.h
+++ b/arch/s390/include/asm/atomic.h
-@@ -412,6 +412,16 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
+@@ -412,4 +412,14 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
#define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
@@ -9194,14 +9516,12 @@ index 1d47061..0714963 100644
+#define atomic64_dec_unchecked(v) atomic64_dec(v)
+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
+
- #define smp_mb__before_atomic_dec() smp_mb()
- #define smp_mb__after_atomic_dec() smp_mb()
- #define smp_mb__before_atomic_inc() smp_mb()
+ #endif /* __ARCH_S390_ATOMIC__ */
diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h
-index 578680f..0eb3b11 100644
+index b5dce65..8aca09a 100644
--- a/arch/s390/include/asm/barrier.h
+++ b/arch/s390/include/asm/barrier.h
-@@ -36,7 +36,7 @@
+@@ -39,7 +39,7 @@
do { \
compiletime_assert_atomic_type(*p); \
barrier(); \
@@ -9227,10 +9547,10 @@ index 4d7ccac..d03d0ad 100644
#define __read_mostly __attribute__((__section__(".data..read_mostly")))
diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
-index 78f4f87..598ce39 100644
+index f6e43d3..5f57681 100644
--- a/arch/s390/include/asm/elf.h
+++ b/arch/s390/include/asm/elf.h
-@@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
+@@ -163,8 +163,14 @@ extern unsigned int vdso_enabled;
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -9247,14 +9567,14 @@ index 78f4f87..598ce39 100644
/* This yields a mask that user programs can use to figure out what
instruction set this CPU supports. */
-@@ -222,9 +228,6 @@ struct linux_binprm;
+@@ -223,9 +229,6 @@ struct linux_binprm;
#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
int arch_setup_additional_pages(struct linux_binprm *, int);
-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
-#define arch_randomize_brk arch_randomize_brk
-
- void *fill_cpu_elf_notes(void *ptr, struct save_area *sa);
+ void *fill_cpu_elf_notes(void *ptr, struct save_area *sa, __vector128 *vxrs);
#endif
diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
@@ -9270,7 +9590,7 @@ index c4a93d6..4d2a9b4 100644
#endif /* __ASM_EXEC_H */
diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
-index 79330af..254cf37 100644
+index cd4c68e..6764641 100644
--- a/arch/s390/include/asm/uaccess.h
+++ b/arch/s390/include/asm/uaccess.h
@@ -59,6 +59,7 @@ static inline int __range_ok(unsigned long addr, unsigned long size)
@@ -9281,7 +9601,7 @@ index 79330af..254cf37 100644
#define access_ok(type, addr, size) __access_ok(addr, size)
/*
-@@ -245,6 +246,10 @@ static inline unsigned long __must_check
+@@ -275,6 +276,10 @@ static inline unsigned long __must_check
copy_to_user(void __user *to, const void *from, unsigned long n)
{
might_fault();
@@ -9292,17 +9612,7 @@ index 79330af..254cf37 100644
return __copy_to_user(to, from, n);
}
-@@ -268,6 +273,9 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
- static inline unsigned long __must_check
- __copy_from_user(void *to, const void __user *from, unsigned long n)
- {
-+ if ((long)n < 0)
-+ return n;
-+
- return uaccess.copy_from_user(n, from, to);
- }
-
-@@ -296,10 +304,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
+@@ -303,10 +308,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
static inline unsigned long __must_check
copy_from_user(void *to, const void __user *from, unsigned long n)
{
@@ -9395,10 +9705,10 @@ index b89b591..fd9609d 100644
if (r_type == R_390_GOTPC)
rc = apply_rela_bits(loc, val, 1, 32, 0);
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
-index dd14532..1dfc145 100644
+index ed84cc2..c05a9d2 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
-@@ -242,37 +242,3 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -218,37 +218,3 @@ unsigned long get_wchan(struct task_struct *p)
}
return 0;
}
@@ -9624,21 +9934,21 @@ index 6777177..cb5e44f 100644
addr = vm_unmapped_area(&info);
}
diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
-index be56a24..eaef2ca 100644
+index 4082749..fd97781 100644
--- a/arch/sparc/include/asm/atomic_64.h
+++ b/arch/sparc/include/asm/atomic_64.h
-@@ -14,18 +14,40 @@
+@@ -15,18 +15,38 @@
#define ATOMIC64_INIT(i) { (i) }
- #define atomic_read(v) (*(volatile int *)&(v)->counter)
+ #define atomic_read(v) ACCESS_ONCE((v)->counter)
+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
+{
-+ return *(const volatile int *)&v->counter;
++ return ACCESS_ONCE(v->counter);
+}
- #define atomic64_read(v) (*(volatile long *)&(v)->counter)
+ #define atomic64_read(v) ACCESS_ONCE((v)->counter)
+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
+{
-+ return *(const volatile long *)&v->counter;
++ return ACCESS_ONCE(v->counter);
+}
#define atomic_set(v, i) (((v)->counter) = i)
@@ -9652,53 +9962,51 @@ index be56a24..eaef2ca 100644
+ v->counter = i;
+}
- extern void atomic_add(int, atomic_t *);
-+extern void atomic_add_unchecked(int, atomic_unchecked_t *);
- extern void atomic64_add(long, atomic64_t *);
-+extern void atomic64_add_unchecked(long, atomic64_unchecked_t *);
- extern void atomic_sub(int, atomic_t *);
-+extern void atomic_sub_unchecked(int, atomic_unchecked_t *);
- extern void atomic64_sub(long, atomic64_t *);
-+extern void atomic64_sub_unchecked(long, atomic64_unchecked_t *);
+-#define ATOMIC_OP(op) \
+-void atomic_##op(int, atomic_t *); \
+-void atomic64_##op(long, atomic64_t *);
++#define __ATOMIC_OP(op, suffix) \
++void atomic_##op##suffix(int, atomic##suffix##_t *); \
++void atomic64_##op##suffix(long, atomic64##suffix##_t *);
- extern int atomic_add_ret(int, atomic_t *);
-+extern int atomic_add_ret_unchecked(int, atomic_unchecked_t *);
- extern long atomic64_add_ret(long, atomic64_t *);
-+extern long atomic64_add_ret_unchecked(long, atomic64_unchecked_t *);
- extern int atomic_sub_ret(int, atomic_t *);
- extern long atomic64_sub_ret(long, atomic64_t *);
+-#define ATOMIC_OP_RETURN(op) \
+-int atomic_##op##_return(int, atomic_t *); \
+-long atomic64_##op##_return(long, atomic64_t *);
++#define ATOMIC_OP(op) __ATOMIC_OP(op, ) __ATOMIC_OP(op, _unchecked)
++
++#define __ATOMIC_OP_RETURN(op, suffix) \
++int atomic_##op##_return##suffix(int, atomic##suffix##_t *); \
++long atomic64_##op##_return##suffix(long, atomic64##suffix##_t *);
++
++#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, ) __ATOMIC_OP_RETURN(op, _unchecked)
-@@ -33,13 +55,29 @@ extern long atomic64_sub_ret(long, atomic64_t *);
- #define atomic64_dec_return(v) atomic64_sub_ret(1, v)
+ #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
- #define atomic_inc_return(v) atomic_add_ret(1, v)
-+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
-+{
-+ return atomic_add_ret_unchecked(1, v);
-+}
- #define atomic64_inc_return(v) atomic64_add_ret(1, v)
-+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
-+{
-+ return atomic64_add_ret_unchecked(1, v);
-+}
+@@ -35,13 +55,23 @@ ATOMIC_OPS(sub)
- #define atomic_sub_return(i, v) atomic_sub_ret(i, v)
- #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
+ #undef ATOMIC_OPS
+ #undef ATOMIC_OP_RETURN
++#undef __ATOMIC_OP_RETURN
+ #undef ATOMIC_OP
++#undef __ATOMIC_OP
- #define atomic_add_return(i, v) atomic_add_ret(i, v)
-+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
+ #define atomic_dec_return(v) atomic_sub_return(1, v)
+ #define atomic64_dec_return(v) atomic64_sub_return(1, v)
+
+ #define atomic_inc_return(v) atomic_add_return(1, v)
++static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
+{
-+ return atomic_add_ret_unchecked(i, v);
++ return atomic_add_return_unchecked(1, v);
+}
- #define atomic64_add_return(i, v) atomic64_add_ret(i, v)
-+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
+ #define atomic64_inc_return(v) atomic64_add_return(1, v)
++static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
+{
-+ return atomic64_add_ret_unchecked(i, v);
++ return atomic64_add_return_unchecked(1, v);
+}
/*
* atomic_inc_and_test - increment and test
-@@ -50,6 +88,10 @@ extern long atomic64_sub_ret(long, atomic64_t *);
+@@ -52,6 +82,10 @@ ATOMIC_OPS(sub)
* other cases.
*/
#define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
@@ -9708,9 +10016,9 @@ index be56a24..eaef2ca 100644
+}
#define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
- #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
-@@ -59,25 +101,60 @@ extern long atomic64_sub_ret(long, atomic64_t *);
- #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
+ #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
+@@ -61,25 +95,60 @@ ATOMIC_OPS(sub)
+ #define atomic64_dec_and_test(v) (atomic64_sub_return(1, v) == 0)
#define atomic_inc(v) atomic_add(1, v)
+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
@@ -9734,8 +10042,8 @@ index be56a24..eaef2ca 100644
+ atomic64_sub_unchecked(1, v);
+}
- #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0)
- #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
+ #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
+ #define atomic64_add_negative(i, v) (atomic64_add_return(i, v) < 0)
#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
@@ -9773,7 +10081,7 @@ index be56a24..eaef2ca 100644
if (likely(old == c))
break;
c = old;
-@@ -88,20 +165,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
+@@ -90,20 +159,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
#define atomic64_cmpxchg(v, o, n) \
((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
#define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
@@ -9814,7 +10122,7 @@ index be56a24..eaef2ca 100644
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
diff --git a/arch/sparc/include/asm/barrier_64.h b/arch/sparc/include/asm/barrier_64.h
-index b5aad96..99d7465 100644
+index 305dcc3..7835030 100644
--- a/arch/sparc/include/asm/barrier_64.h
+++ b/arch/sparc/include/asm/barrier_64.h
@@ -57,7 +57,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
@@ -9881,10 +10189,10 @@ index 370ca1e..d4f4a98 100644
#define ELF_HWCAP sparc64_elf_hwcap
diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
-index 9b1c36d..209298b 100644
+index a3890da..f6a408e 100644
--- a/arch/sparc/include/asm/pgalloc_32.h
+++ b/arch/sparc/include/asm/pgalloc_32.h
-@@ -33,6 +33,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
+@@ -35,6 +35,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
}
#define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
@@ -9893,7 +10201,7 @@ index 9b1c36d..209298b 100644
static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
unsigned long address)
diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
-index 2c8d41f..f337fbc 100644
+index 5e31871..13469c6 100644
--- a/arch/sparc/include/asm/pgalloc_64.h
+++ b/arch/sparc/include/asm/pgalloc_64.h
@@ -21,6 +21,7 @@ static inline void __pgd_populate(pgd_t *pgd, pud_t *pud)
@@ -9926,10 +10234,10 @@ index 59ba6f6..4518128 100644
+
#endif
diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
-index 502f632..da1917f 100644
+index b9b91ae..950b91e 100644
--- a/arch/sparc/include/asm/pgtable_32.h
+++ b/arch/sparc/include/asm/pgtable_32.h
-@@ -50,6 +50,9 @@ extern unsigned long calc_highpages(void);
+@@ -51,6 +51,9 @@ unsigned long __init bootmem_init(unsigned long *pages_avail);
#define PAGE_SHARED SRMMU_PAGE_SHARED
#define PAGE_COPY SRMMU_PAGE_COPY
#define PAGE_READONLY SRMMU_PAGE_RDONLY
@@ -9939,7 +10247,7 @@ index 502f632..da1917f 100644
#define PAGE_KERNEL SRMMU_PAGE_KERNEL
/* Top-level page directory - dummy used by init-mm.
-@@ -62,18 +65,18 @@ extern unsigned long ptr_in_current_pgd;
+@@ -63,18 +66,18 @@ extern unsigned long ptr_in_current_pgd;
/* xwr */
#define __P000 PAGE_NONE
@@ -9980,6 +10288,21 @@ index 79da178..c2eede8 100644
#define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
SRMMU_DIRTY | SRMMU_REF)
+diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
+index 29d64b1..4272fe8 100644
+--- a/arch/sparc/include/asm/setup.h
++++ b/arch/sparc/include/asm/setup.h
+@@ -55,8 +55,8 @@ int handle_ldf_stq(u32 insn, struct pt_regs *regs);
+ void handle_ld_nf(u32 insn, struct pt_regs *regs);
+
+ /* init_64.c */
+-extern atomic_t dcpage_flushes;
+-extern atomic_t dcpage_flushes_xcall;
++extern atomic_unchecked_t dcpage_flushes;
++extern atomic_unchecked_t dcpage_flushes_xcall;
+
+ extern int sysctl_tsb_ratio;
+ #endif
diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
index 9689176..63c18ea 100644
--- a/arch/sparc/include/asm/spinlock_64.h
@@ -10082,7 +10405,7 @@ index 9689176..63c18ea 100644
unsigned long mask, tmp1, tmp2, result;
diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
-index 96efa7a..16858bf 100644
+index 025c984..a216504 100644
--- a/arch/sparc/include/asm/thread_info_32.h
+++ b/arch/sparc/include/asm/thread_info_32.h
@@ -49,6 +49,8 @@ struct thread_info {
@@ -10095,7 +10418,7 @@ index 96efa7a..16858bf 100644
/*
diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
-index cc6275c..7eb8e21 100644
+index 798f027..b009941 100644
--- a/arch/sparc/include/asm/thread_info_64.h
+++ b/arch/sparc/include/asm/thread_info_64.h
@@ -63,6 +63,8 @@ struct thread_info {
@@ -10122,7 +10445,7 @@ index cc6275c..7eb8e21 100644
/* NOTE: Thread flags >= 12 should be ones we have no interest
* in using in assembly, else we can't use the mask as
* an immediate value in instructions such as andcc.
-@@ -215,12 +218,18 @@ register struct thread_info *current_thread_info_reg asm("g6");
+@@ -215,12 +218,17 @@ register struct thread_info *current_thread_info_reg asm("g6");
#define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
#define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
#define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
@@ -10137,12 +10460,11 @@ index cc6275c..7eb8e21 100644
+ (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
+
-+
+ #define is_32bit_task() (test_thread_flag(TIF_32BIT))
+
/*
- * Thread-synchronous status.
- *
diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
-index 0167d26..767bb0c 100644
+index bd56c28..4b63d83 100644
--- a/arch/sparc/include/asm/uaccess.h
+++ b/arch/sparc/include/asm/uaccess.h
@@ -1,5 +1,6 @@
@@ -10153,10 +10475,10 @@ index 0167d26..767bb0c 100644
#include <asm/uaccess_64.h>
#else
diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
-index 53a28dd..50c38c3 100644
+index 9634d08..f55fe4f 100644
--- a/arch/sparc/include/asm/uaccess_32.h
+++ b/arch/sparc/include/asm/uaccess_32.h
-@@ -250,27 +250,46 @@ extern unsigned long __copy_user(void __user *to, const void __user *from, unsig
+@@ -250,27 +250,46 @@ unsigned long __copy_user(void __user *to, const void __user *from, unsigned lon
static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
{
@@ -10208,7 +10530,7 @@ index 53a28dd..50c38c3 100644
}
diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
-index ad7e178..c9e7423 100644
+index c990a5e..f17b9c1 100644
--- a/arch/sparc/include/asm/uaccess_64.h
+++ b/arch/sparc/include/asm/uaccess_64.h
@@ -10,6 +10,7 @@
@@ -10219,7 +10541,7 @@ index ad7e178..c9e7423 100644
#include <asm/asi.h>
#include <asm/spitfire.h>
#include <asm-generic/uaccess-unaligned.h>
-@@ -214,8 +215,15 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
+@@ -214,8 +215,15 @@ unsigned long copy_from_user_fixup(void *to, const void __user *from,
static inline unsigned long __must_check
copy_from_user(void *to, const void __user *from, unsigned long size)
{
@@ -10236,7 +10558,7 @@ index ad7e178..c9e7423 100644
if (unlikely(ret))
ret = copy_from_user_fixup(to, from, size);
-@@ -231,8 +239,15 @@ extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
+@@ -231,8 +239,15 @@ unsigned long copy_to_user_fixup(void __user *to, const void *from,
static inline unsigned long __must_check
copy_to_user(void __user *to, const void *from, unsigned long size)
{
@@ -10254,7 +10576,7 @@ index ad7e178..c9e7423 100644
ret = copy_to_user_fixup(to, from, size);
return ret;
diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
-index d15cc17..d0ae796 100644
+index 7cf9c6e..6206648 100644
--- a/arch/sparc/kernel/Makefile
+++ b/arch/sparc/kernel/Makefile
@@ -4,7 +4,7 @@
@@ -10267,10 +10589,10 @@ index d15cc17..d0ae796 100644
extra-y := head_$(BITS).o
diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
-index 510baec..9ff2607 100644
+index 50e7b62..79fae35 100644
--- a/arch/sparc/kernel/process_32.c
+++ b/arch/sparc/kernel/process_32.c
-@@ -115,14 +115,14 @@ void show_regs(struct pt_regs *r)
+@@ -123,14 +123,14 @@ void show_regs(struct pt_regs *r)
printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
r->psr, r->pc, r->npc, r->y, print_tainted());
@@ -10287,7 +10609,7 @@ index 510baec..9ff2607 100644
printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
-@@ -159,7 +159,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
+@@ -167,7 +167,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
rw = (struct reg_window32 *) fp;
pc = rw->ins[7];
printk("[%08lx : ", pc);
@@ -10297,7 +10619,7 @@ index 510baec..9ff2607 100644
} while (++count < 16);
printk("\n");
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
-index c6f7113..9299700 100644
+index 0be7bf9..2b1cba8 100644
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@ -161,7 +161,7 @@ static void show_regwindow(struct pt_regs *regs)
@@ -10327,7 +10649,7 @@ index c6f7113..9299700 100644
show_regwindow(regs);
show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
}
-@@ -272,7 +272,7 @@ void arch_trigger_all_cpu_backtrace(void)
+@@ -278,7 +278,7 @@ void arch_trigger_all_cpu_backtrace(bool include_self)
((tp && tp->task) ? tp->task->pid : -1));
if (gp->tstate & TSTATE_PRIV) {
@@ -10350,7 +10672,7 @@ index 79cc0d1..ec62734 100644
.getproplen = prom_getproplen,
.getproperty = prom_getproperty,
diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
-index c13c9f2..d572c34 100644
+index 9ddc492..27a5619 100644
--- a/arch/sparc/kernel/ptrace_64.c
+++ b/arch/sparc/kernel/ptrace_64.c
@@ -1060,6 +1060,10 @@ long arch_ptrace(struct task_struct *child, long request,
@@ -10376,7 +10698,7 @@ index c13c9f2..d572c34 100644
if (test_thread_flag(TIF_SYSCALL_TRACE))
ret = tracehook_report_syscall_entry(regs);
-@@ -1093,6 +1102,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
+@@ -1088,6 +1097,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
if (test_thread_flag(TIF_NOHZ))
user_exit();
@@ -10389,21 +10711,10 @@ index c13c9f2..d572c34 100644
if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
-index 9af0a5d..06e12f4 100644
+index da6f1a7..e5dea8f 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
-@@ -874,8 +874,8 @@ extern unsigned long xcall_flush_dcache_page_cheetah;
- extern unsigned long xcall_flush_dcache_page_spitfire;
-
- #ifdef CONFIG_DEBUG_DCFLUSH
--extern atomic_t dcpage_flushes;
--extern atomic_t dcpage_flushes_xcall;
-+extern atomic_unchecked_t dcpage_flushes;
-+extern atomic_unchecked_t dcpage_flushes_xcall;
- #endif
-
- static inline void __local_flush_dcache_page(struct page *page)
-@@ -899,7 +899,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
+@@ -887,7 +887,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
return;
#ifdef CONFIG_DEBUG_DCFLUSH
@@ -10412,7 +10723,7 @@ index 9af0a5d..06e12f4 100644
#endif
this_cpu = get_cpu();
-@@ -923,7 +923,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
+@@ -911,7 +911,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
xcall_deliver(data0, __pa(pg_addr),
(u64) pg_addr, cpumask_of(cpu));
#ifdef CONFIG_DEBUG_DCFLUSH
@@ -10421,7 +10732,7 @@ index 9af0a5d..06e12f4 100644
#endif
}
}
-@@ -942,7 +942,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
+@@ -930,7 +930,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
preempt_disable();
#ifdef CONFIG_DEBUG_DCFLUSH
@@ -10430,7 +10741,7 @@ index 9af0a5d..06e12f4 100644
#endif
data0 = 0;
pg_addr = page_address(page);
-@@ -959,7 +959,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
+@@ -947,7 +947,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
xcall_deliver(data0, __pa(pg_addr),
(u64) pg_addr, cpu_online_mask);
#ifdef CONFIG_DEBUG_DCFLUSH
@@ -10440,10 +10751,10 @@ index 9af0a5d..06e12f4 100644
}
__local_flush_dcache_page(page);
diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
-index 3a8d184..49498a8 100644
+index 646988d..b88905f 100644
--- a/arch/sparc/kernel/sys_sparc_32.c
+++ b/arch/sparc/kernel/sys_sparc_32.c
-@@ -52,7 +52,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+@@ -54,7 +54,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
if (len > TASK_SIZE - PAGE_SIZE)
return -ENOMEM;
if (!addr)
@@ -10453,10 +10764,10 @@ index 3a8d184..49498a8 100644
info.flags = 0;
info.length = len;
diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
-index beb0b5a..5a153f7 100644
+index c85403d..6af95c9 100644
--- a/arch/sparc/kernel/sys_sparc_64.c
+++ b/arch/sparc/kernel/sys_sparc_64.c
-@@ -88,13 +88,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+@@ -89,13 +89,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
struct vm_area_struct * vma;
unsigned long task_size = TASK_SIZE;
int do_color_align;
@@ -10472,7 +10783,7 @@ index beb0b5a..5a153f7 100644
((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
return -EINVAL;
return addr;
-@@ -109,6 +110,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+@@ -110,6 +111,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
if (filp || (flags & MAP_SHARED))
do_color_align = 1;
@@ -10483,7 +10794,7 @@ index beb0b5a..5a153f7 100644
if (addr) {
if (do_color_align)
addr = COLOR_ALIGN(addr, pgoff);
-@@ -116,22 +121,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+@@ -117,22 +122,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
addr = PAGE_ALIGN(addr);
vma = find_vma(mm, addr);
@@ -10515,7 +10826,7 @@ index beb0b5a..5a153f7 100644
info.high_limit = task_size;
addr = vm_unmapped_area(&info);
}
-@@ -149,6 +160,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -150,6 +161,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
unsigned long task_size = STACK_TOP32;
unsigned long addr = addr0;
int do_color_align;
@@ -10523,7 +10834,7 @@ index beb0b5a..5a153f7 100644
struct vm_unmapped_area_info info;
/* This should only ever run for 32-bit processes. */
-@@ -158,7 +170,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -159,7 +171,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
/* We do not accept a shared mapping if it would violate
* cache aliasing constraints.
*/
@@ -10532,7 +10843,7 @@ index beb0b5a..5a153f7 100644
((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
return -EINVAL;
return addr;
-@@ -171,6 +183,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -172,6 +184,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
if (filp || (flags & MAP_SHARED))
do_color_align = 1;
@@ -10543,7 +10854,7 @@ index beb0b5a..5a153f7 100644
/* requesting a specific address */
if (addr) {
if (do_color_align)
-@@ -179,8 +195,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -180,8 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
addr = PAGE_ALIGN(addr);
vma = find_vma(mm, addr);
@@ -10553,7 +10864,7 @@ index beb0b5a..5a153f7 100644
return addr;
}
-@@ -190,6 +205,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -191,6 +206,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
info.high_limit = mm->mmap_base;
info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
info.align_offset = pgoff << PAGE_SHIFT;
@@ -10561,7 +10872,7 @@ index beb0b5a..5a153f7 100644
addr = vm_unmapped_area(&info);
/*
-@@ -202,6 +218,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -203,6 +219,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
VM_BUG_ON(addr != -ENOMEM);
info.flags = 0;
info.low_limit = TASK_UNMAPPED_BASE;
@@ -10574,7 +10885,7 @@ index beb0b5a..5a153f7 100644
info.high_limit = STACK_TOP32;
addr = vm_unmapped_area(&info);
}
-@@ -258,10 +280,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
+@@ -259,10 +281,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
EXPORT_SYMBOL(get_fb_unmapped_area);
/* Essentially the same as PowerPC. */
@@ -10590,7 +10901,7 @@ index beb0b5a..5a153f7 100644
if (current->flags & PF_RANDOMIZE) {
unsigned long val = get_random_int();
if (test_thread_flag(TIF_32BIT))
-@@ -274,7 +300,7 @@ static unsigned long mmap_rnd(void)
+@@ -275,7 +301,7 @@ static unsigned long mmap_rnd(void)
void arch_pick_mmap_layout(struct mm_struct *mm)
{
@@ -10599,7 +10910,7 @@ index beb0b5a..5a153f7 100644
unsigned long gap;
/*
-@@ -287,6 +313,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -288,6 +314,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
gap == RLIM_INFINITY ||
sysctl_legacy_va_layout) {
mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
@@ -10612,7 +10923,7 @@ index beb0b5a..5a153f7 100644
mm->get_unmapped_area = arch_get_unmapped_area;
} else {
/* We know it's 32-bit */
-@@ -298,6 +330,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -299,6 +331,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
gap = (task_size / 6 * 5);
mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
@@ -10666,7 +10977,7 @@ index 33a17e7..d87fb1f 100644
2:
diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
-index 6629829..036032d 100644
+index 6fd386c5..6907d81 100644
--- a/arch/sparc/kernel/traps_32.c
+++ b/arch/sparc/kernel/traps_32.c
@@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
@@ -10675,10 +10986,10 @@ index 6629829..036032d 100644
+extern void gr_handle_kernel_exploit(void);
+
- void die_if_kernel(char *str, struct pt_regs *regs)
+ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
{
static int die_counter;
-@@ -76,15 +78,17 @@ void die_if_kernel(char *str, struct pt_regs *regs)
+@@ -76,15 +78,17 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
count++ < 30 &&
(((unsigned long) rw) >= PAGE_OFFSET) &&
!(((unsigned long) rw) & 0x7)) {
@@ -10699,10 +11010,10 @@ index 6629829..036032d 100644
}
diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
-index 25d0c7e..b571456 100644
+index 981a769..d906eda 100644
--- a/arch/sparc/kernel/traps_64.c
+++ b/arch/sparc/kernel/traps_64.c
-@@ -77,7 +77,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
+@@ -79,7 +79,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
i + 1,
p->trapstack[i].tstate, p->trapstack[i].tpc,
p->trapstack[i].tnpc, p->trapstack[i].tt);
@@ -10711,7 +11022,7 @@ index 25d0c7e..b571456 100644
}
}
-@@ -97,6 +97,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
+@@ -99,6 +99,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
lvl -= 0x100;
if (regs->tstate & TSTATE_PRIV) {
@@ -10724,7 +11035,7 @@ index 25d0c7e..b571456 100644
sprintf(buffer, "Kernel bad sw trap %lx", lvl);
die_if_kernel(buffer, regs);
}
-@@ -115,11 +121,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
+@@ -117,11 +123,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
void bad_trap_tl1(struct pt_regs *regs, long lvl)
{
char buffer[32];
@@ -10742,7 +11053,7 @@ index 25d0c7e..b571456 100644
dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
sprintf (buffer, "Bad trap %lx at tl>0", lvl);
-@@ -1149,7 +1160,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
+@@ -1151,7 +1162,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
printk("%s" "ERROR(%d): ",
(recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
@@ -10751,7 +11062,7 @@ index 25d0c7e..b571456 100644
printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
(recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
(afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
-@@ -1756,7 +1767,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
+@@ -1758,7 +1769,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
smp_processor_id(),
(type & 0x1) ? 'I' : 'D',
regs->tpc);
@@ -10760,7 +11071,7 @@ index 25d0c7e..b571456 100644
panic("Irrecoverable Cheetah+ parity error.");
}
-@@ -1764,7 +1775,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
+@@ -1766,7 +1777,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
smp_processor_id(),
(type & 0x1) ? 'I' : 'D',
regs->tpc);
@@ -10769,7 +11080,7 @@ index 25d0c7e..b571456 100644
}
struct sun4v_error_entry {
-@@ -1837,8 +1848,8 @@ struct sun4v_error_entry {
+@@ -1839,8 +1850,8 @@ struct sun4v_error_entry {
/*0x38*/u64 reserved_5;
};
@@ -10780,7 +11091,7 @@ index 25d0c7e..b571456 100644
static const char *sun4v_err_type_to_str(u8 type)
{
-@@ -1930,7 +1941,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
+@@ -1932,7 +1943,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
}
static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
@@ -10789,7 +11100,7 @@ index 25d0c7e..b571456 100644
{
u64 *raw_ptr = (u64 *) ent;
u32 attrs;
-@@ -1988,8 +1999,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
+@@ -1990,8 +2001,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
show_regs(regs);
@@ -10800,7 +11111,7 @@ index 25d0c7e..b571456 100644
wmb();
printk("%s: Queue overflowed %d times.\n",
pfx, cnt);
-@@ -2046,7 +2057,7 @@ out:
+@@ -2048,7 +2059,7 @@ out:
*/
void sun4v_resum_overflow(struct pt_regs *regs)
{
@@ -10809,7 +11120,7 @@ index 25d0c7e..b571456 100644
}
/* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
-@@ -2099,7 +2110,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
+@@ -2101,7 +2112,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
/* XXX Actually even this can make not that much sense. Perhaps
* XXX we should just pull the plug and panic directly from here?
*/
@@ -10818,7 +11129,7 @@ index 25d0c7e..b571456 100644
}
static void sun4v_tlb_error(struct pt_regs *regs)
-@@ -2118,9 +2129,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
+@@ -2120,9 +2131,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
regs->tpc, tl);
@@ -10830,7 +11141,7 @@ index 25d0c7e..b571456 100644
(void *) regs->u_regs[UREG_I7]);
printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
"pte[%lx] error[%lx]\n",
-@@ -2141,9 +2152,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
+@@ -2143,9 +2154,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
regs->tpc, tl);
@@ -10864,10 +11175,10 @@ index 25d0c7e..b571456 100644
+extern void gr_handle_kernel_exploit(void);
+
- void die_if_kernel(char *str, struct pt_regs *regs)
+ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
{
static int die_counter;
-@@ -2414,7 +2427,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
+@@ -2414,7 +2427,7 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
while (rw &&
count++ < 30 &&
kstack_valid(tp, (unsigned long) rw)) {
@@ -10876,7 +11187,7 @@ index 25d0c7e..b571456 100644
(void *) rw->ins[7]);
rw = kernel_stack_up(rw);
-@@ -2427,8 +2440,10 @@ void die_if_kernel(char *str, struct pt_regs *regs)
+@@ -2427,8 +2440,10 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
}
user_instruction_dump ((unsigned int __user *) regs->tpc);
}
@@ -10889,10 +11200,10 @@ index 25d0c7e..b571456 100644
}
EXPORT_SYMBOL(die_if_kernel);
diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
-index 35ab8b6..9046547 100644
+index 62098a8..547ab2c 100644
--- a/arch/sparc/kernel/unaligned_64.c
+++ b/arch/sparc/kernel/unaligned_64.c
-@@ -295,7 +295,7 @@ static void log_unaligned(struct pt_regs *regs)
+@@ -297,7 +297,7 @@ static void log_unaligned(struct pt_regs *regs)
static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
if (__ratelimit(&ratelimit)) {
@@ -10902,7 +11213,7 @@ index 35ab8b6..9046547 100644
}
}
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
-index dbe119b..089c7c1 100644
+index 3269b02..64f5231 100644
--- a/arch/sparc/lib/Makefile
+++ b/arch/sparc/lib/Makefile
@@ -2,7 +2,7 @@
@@ -10915,242 +11226,150 @@ index dbe119b..089c7c1 100644
lib-$(CONFIG_SPARC32) += ashrdi3.o
lib-$(CONFIG_SPARC32) += memcpy.o memset.o
diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
-index 85c233d..68500e0 100644
+index 05dac43..76f8ed4 100644
--- a/arch/sparc/lib/atomic_64.S
+++ b/arch/sparc/lib/atomic_64.S
-@@ -17,7 +17,12 @@
- ENTRY(atomic_add) /* %o0 = increment, %o1 = atomic_ptr */
- BACKOFF_SETUP(%o2)
- 1: lduw [%o1], %g1
-- add %g1, %o0, %g7
-+ addcc %g1, %o0, %g7
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ tvs %icc, 6
-+#endif
-+
- cas [%o1], %g1, %g7
- cmp %g1, %g7
- bne,pn %icc, BACKOFF_LABEL(2f, 1b)
-@@ -27,10 +32,28 @@ ENTRY(atomic_add) /* %o0 = increment, %o1 = atomic_ptr */
- 2: BACKOFF_SPIN(%o2, %o3, 1b)
- ENDPROC(atomic_add)
-
-+ENTRY(atomic_add_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
-+ BACKOFF_SETUP(%o2)
-+1: lduw [%o1], %g1
-+ add %g1, %o0, %g7
-+ cas [%o1], %g1, %g7
-+ cmp %g1, %g7
-+ bne,pn %icc, 2f
-+ nop
-+ retl
-+ nop
-+2: BACKOFF_SPIN(%o2, %o3, 1b)
-+ENDPROC(atomic_add_unchecked)
-+
- ENTRY(atomic_sub) /* %o0 = decrement, %o1 = atomic_ptr */
- BACKOFF_SETUP(%o2)
- 1: lduw [%o1], %g1
-- sub %g1, %o0, %g7
-+ subcc %g1, %o0, %g7
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ tvs %icc, 6
-+#endif
-+
- cas [%o1], %g1, %g7
- cmp %g1, %g7
- bne,pn %icc, BACKOFF_LABEL(2f, 1b)
-@@ -40,10 +63,28 @@ ENTRY(atomic_sub) /* %o0 = decrement, %o1 = atomic_ptr */
- 2: BACKOFF_SPIN(%o2, %o3, 1b)
- ENDPROC(atomic_sub)
-
-+ENTRY(atomic_sub_unchecked) /* %o0 = decrement, %o1 = atomic_ptr */
-+ BACKOFF_SETUP(%o2)
-+1: lduw [%o1], %g1
-+ sub %g1, %o0, %g7
-+ cas [%o1], %g1, %g7
-+ cmp %g1, %g7
-+ bne,pn %icc, 2f
-+ nop
-+ retl
-+ nop
-+2: BACKOFF_SPIN(%o2, %o3, 1b)
-+ENDPROC(atomic_sub_unchecked)
-+
- ENTRY(atomic_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
- BACKOFF_SETUP(%o2)
- 1: lduw [%o1], %g1
-- add %g1, %o0, %g7
-+ addcc %g1, %o0, %g7
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ tvs %icc, 6
-+#endif
-+
- cas [%o1], %g1, %g7
- cmp %g1, %g7
- bne,pn %icc, BACKOFF_LABEL(2f, 1b)
-@@ -53,10 +94,29 @@ ENTRY(atomic_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
- 2: BACKOFF_SPIN(%o2, %o3, 1b)
- ENDPROC(atomic_add_ret)
-
-+ENTRY(atomic_add_ret_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
-+ BACKOFF_SETUP(%o2)
-+1: lduw [%o1], %g1
-+ addcc %g1, %o0, %g7
-+ cas [%o1], %g1, %g7
-+ cmp %g1, %g7
-+ bne,pn %icc, 2f
-+ add %g7, %o0, %g7
-+ sra %g7, 0, %o0
-+ retl
-+ nop
-+2: BACKOFF_SPIN(%o2, %o3, 1b)
-+ENDPROC(atomic_add_ret_unchecked)
-+
- ENTRY(atomic_sub_ret) /* %o0 = decrement, %o1 = atomic_ptr */
- BACKOFF_SETUP(%o2)
- 1: lduw [%o1], %g1
-- sub %g1, %o0, %g7
-+ subcc %g1, %o0, %g7
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ tvs %icc, 6
-+#endif
-+
- cas [%o1], %g1, %g7
- cmp %g1, %g7
- bne,pn %icc, BACKOFF_LABEL(2f, 1b)
-@@ -69,7 +129,12 @@ ENDPROC(atomic_sub_ret)
- ENTRY(atomic64_add) /* %o0 = increment, %o1 = atomic_ptr */
- BACKOFF_SETUP(%o2)
- 1: ldx [%o1], %g1
-- add %g1, %o0, %g7
-+ addcc %g1, %o0, %g7
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ tvs %xcc, 6
-+#endif
-+
- casx [%o1], %g1, %g7
- cmp %g1, %g7
- bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
-@@ -79,10 +144,28 @@ ENTRY(atomic64_add) /* %o0 = increment, %o1 = atomic_ptr */
- 2: BACKOFF_SPIN(%o2, %o3, 1b)
- ENDPROC(atomic64_add)
-
-+ENTRY(atomic64_add_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
-+ BACKOFF_SETUP(%o2)
-+1: ldx [%o1], %g1
-+ addcc %g1, %o0, %g7
-+ casx [%o1], %g1, %g7
-+ cmp %g1, %g7
-+ bne,pn %xcc, 2f
-+ nop
-+ retl
-+ nop
-+2: BACKOFF_SPIN(%o2, %o3, 1b)
-+ENDPROC(atomic64_add_unchecked)
-+
- ENTRY(atomic64_sub) /* %o0 = decrement, %o1 = atomic_ptr */
- BACKOFF_SETUP(%o2)
- 1: ldx [%o1], %g1
-- sub %g1, %o0, %g7
-+ subcc %g1, %o0, %g7
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ tvs %xcc, 6
-+#endif
-+
- casx [%o1], %g1, %g7
- cmp %g1, %g7
- bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
-@@ -92,10 +175,28 @@ ENTRY(atomic64_sub) /* %o0 = decrement, %o1 = atomic_ptr */
- 2: BACKOFF_SPIN(%o2, %o3, 1b)
- ENDPROC(atomic64_sub)
-
-+ENTRY(atomic64_sub_unchecked) /* %o0 = decrement, %o1 = atomic_ptr */
-+ BACKOFF_SETUP(%o2)
-+1: ldx [%o1], %g1
-+ subcc %g1, %o0, %g7
-+ casx [%o1], %g1, %g7
-+ cmp %g1, %g7
-+ bne,pn %xcc, 2f
-+ nop
-+ retl
-+ nop
-+2: BACKOFF_SPIN(%o2, %o3, 1b)
-+ENDPROC(atomic64_sub_unchecked)
-+
- ENTRY(atomic64_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
- BACKOFF_SETUP(%o2)
- 1: ldx [%o1], %g1
-- add %g1, %o0, %g7
-+ addcc %g1, %o0, %g7
-+
+@@ -15,11 +15,22 @@
+ * a value and does the barriers.
+ */
+
+-#define ATOMIC_OP(op) \
+-ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
+#ifdef CONFIG_PAX_REFCOUNT
-+ tvs %xcc, 6
-+#endif
-+
- casx [%o1], %g1, %g7
- cmp %g1, %g7
- bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
-@@ -105,10 +206,29 @@ ENTRY(atomic64_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
- 2: BACKOFF_SPIN(%o2, %o3, 1b)
- ENDPROC(atomic64_add_ret)
-
-+ENTRY(atomic64_add_ret_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
-+ BACKOFF_SETUP(%o2)
-+1: ldx [%o1], %g1
-+ addcc %g1, %o0, %g7
-+ casx [%o1], %g1, %g7
-+ cmp %g1, %g7
-+ bne,pn %xcc, 2f
-+ add %g7, %o0, %g7
-+ mov %g7, %o0
-+ retl
-+ nop
-+2: BACKOFF_SPIN(%o2, %o3, 1b)
-+ENDPROC(atomic64_add_ret_unchecked)
-+
- ENTRY(atomic64_sub_ret) /* %o0 = decrement, %o1 = atomic_ptr */
++#define __REFCOUNT_OP(op) op##cc
++#define __OVERFLOW_IOP tvs %icc, 6;
++#define __OVERFLOW_XOP tvs %xcc, 6;
++#else
++#define __REFCOUNT_OP(op) op
++#define __OVERFLOW_IOP
++#define __OVERFLOW_XOP
++#endif
++
++#define __ATOMIC_OP(op, suffix, asm_op, post_op) \
++ENTRY(atomic_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
+ BACKOFF_SETUP(%o2); \
+ 1: lduw [%o1], %g1; \
+- op %g1, %o0, %g7; \
++ asm_op %g1, %o0, %g7; \
++ post_op \
+ cas [%o1], %g1, %g7; \
+ cmp %g1, %g7; \
+ bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
+@@ -29,11 +40,15 @@ ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
+ 2: BACKOFF_SPIN(%o2, %o3, 1b); \
+ ENDPROC(atomic_##op); \
+
+-#define ATOMIC_OP_RETURN(op) \
+-ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
++#define ATOMIC_OP(op) __ATOMIC_OP(op, , op, ) \
++ __ATOMIC_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
++
++#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op) \
++ENTRY(atomic_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
+ BACKOFF_SETUP(%o2); \
+ 1: lduw [%o1], %g1; \
+- op %g1, %o0, %g7; \
++ asm_op %g1, %o0, %g7; \
++ post_op \
+ cas [%o1], %g1, %g7; \
+ cmp %g1, %g7; \
+ bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
+@@ -43,6 +58,9 @@ ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
+ 2: BACKOFF_SPIN(%o2, %o3, 1b); \
+ ENDPROC(atomic_##op##_return);
+
++#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, , op, ) \
++ __ATOMIC_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
++
+ #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
+
+ ATOMIC_OPS(add)
+@@ -50,13 +68,16 @@ ATOMIC_OPS(sub)
+
+ #undef ATOMIC_OPS
+ #undef ATOMIC_OP_RETURN
++#undef __ATOMIC_OP_RETURN
+ #undef ATOMIC_OP
++#undef __ATOMIC_OP
+
+-#define ATOMIC64_OP(op) \
+-ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
++#define __ATOMIC64_OP(op, suffix, asm_op, post_op) \
++ENTRY(atomic64_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
+ BACKOFF_SETUP(%o2); \
+ 1: ldx [%o1], %g1; \
+- op %g1, %o0, %g7; \
++ asm_op %g1, %o0, %g7; \
++ post_op \
+ casx [%o1], %g1, %g7; \
+ cmp %g1, %g7; \
+ bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
+@@ -66,11 +87,15 @@ ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
+ 2: BACKOFF_SPIN(%o2, %o3, 1b); \
+ ENDPROC(atomic64_##op); \
+
+-#define ATOMIC64_OP_RETURN(op) \
+-ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
++#define ATOMIC64_OP(op) __ATOMIC64_OP(op, , op, ) \
++ __ATOMIC64_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
++
++#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op) \
++ENTRY(atomic64_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
+ BACKOFF_SETUP(%o2); \
+ 1: ldx [%o1], %g1; \
+- op %g1, %o0, %g7; \
++ asm_op %g1, %o0, %g7; \
++ post_op \
+ casx [%o1], %g1, %g7; \
+ cmp %g1, %g7; \
+ bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
+@@ -80,6 +105,9 @@ ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
+ 2: BACKOFF_SPIN(%o2, %o3, 1b); \
+ ENDPROC(atomic64_##op##_return);
+
++#define ATOMIC64_OP_RETURN(op) __ATOMIC64_OP_RETURN(op, , op, ) \
++i __ATOMIC64_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
++
+ #define ATOMIC64_OPS(op) ATOMIC64_OP(op) ATOMIC64_OP_RETURN(op)
+
+ ATOMIC64_OPS(add)
+@@ -87,7 +115,12 @@ ATOMIC64_OPS(sub)
+
+ #undef ATOMIC64_OPS
+ #undef ATOMIC64_OP_RETURN
++#undef __ATOMIC64_OP_RETURN
+ #undef ATOMIC64_OP
++#undef __ATOMIC64_OP
++#undef __OVERFLOW_XOP
++#undef __OVERFLOW_IOP
++#undef __REFCOUNT_OP
+
+ ENTRY(atomic64_dec_if_positive) /* %o0 = atomic_ptr */
BACKOFF_SETUP(%o2)
- 1: ldx [%o1], %g1
-- sub %g1, %o0, %g7
-+ subcc %g1, %o0, %g7
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ tvs %xcc, 6
-+#endif
-+
- casx [%o1], %g1, %g7
- cmp %g1, %g7
- bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
-index 323335b..ed85ea2 100644
+index 1d649a9..fbc5bfc 100644
--- a/arch/sparc/lib/ksyms.c
+++ b/arch/sparc/lib/ksyms.c
-@@ -100,12 +100,18 @@ EXPORT_SYMBOL(__clear_user);
-
+@@ -101,7 +101,9 @@ EXPORT_SYMBOL(__clear_user);
/* Atomic counter implementation. */
- EXPORT_SYMBOL(atomic_add);
-+EXPORT_SYMBOL(atomic_add_unchecked);
- EXPORT_SYMBOL(atomic_add_ret);
+ #define ATOMIC_OP(op) \
+ EXPORT_SYMBOL(atomic_##op); \
+-EXPORT_SYMBOL(atomic64_##op);
++EXPORT_SYMBOL(atomic_##op##_unchecked); \
++EXPORT_SYMBOL(atomic64_##op); \
++EXPORT_SYMBOL(atomic64_##op##_unchecked);
+
+ #define ATOMIC_OP_RETURN(op) \
+ EXPORT_SYMBOL(atomic_##op##_return); \
+@@ -110,6 +112,8 @@ EXPORT_SYMBOL(atomic64_##op##_return);
+ #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
+
+ ATOMIC_OPS(add)
+EXPORT_SYMBOL(atomic_add_ret_unchecked);
- EXPORT_SYMBOL(atomic_sub);
-+EXPORT_SYMBOL(atomic_sub_unchecked);
- EXPORT_SYMBOL(atomic_sub_ret);
- EXPORT_SYMBOL(atomic64_add);
-+EXPORT_SYMBOL(atomic64_add_unchecked);
- EXPORT_SYMBOL(atomic64_add_ret);
+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
- EXPORT_SYMBOL(atomic64_sub);
-+EXPORT_SYMBOL(atomic64_sub_unchecked);
- EXPORT_SYMBOL(atomic64_sub_ret);
- EXPORT_SYMBOL(atomic64_dec_if_positive);
+ ATOMIC_OPS(sub)
+ #undef ATOMIC_OPS
diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
index 30c3ecc..736f015 100644
--- a/arch/sparc/mm/Makefile
@@ -11165,7 +11384,7 @@ index 30c3ecc..736f015 100644
obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
obj-y += fault_$(BITS).o
diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
-index 59dbd46..1dd7f5e 100644
+index 70d8171..274c6c0 100644
--- a/arch/sparc/mm/fault_32.c
+++ b/arch/sparc/mm/fault_32.c
@@ -21,6 +21,9 @@
@@ -11178,7 +11397,7 @@ index 59dbd46..1dd7f5e 100644
#include <asm/page.h>
#include <asm/pgtable.h>
-@@ -159,6 +162,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
+@@ -156,6 +159,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
return safe_compute_effective_address(regs, insn);
}
@@ -11456,7 +11675,7 @@ index 59dbd46..1dd7f5e 100644
static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
int text_fault)
{
-@@ -229,6 +503,24 @@ good_area:
+@@ -226,6 +500,24 @@ good_area:
if (!(vma->vm_flags & VM_WRITE))
goto bad_area;
} else {
@@ -11482,7 +11701,7 @@ index 59dbd46..1dd7f5e 100644
if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
goto bad_area;
diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
-index 45a413e..fff0231 100644
+index 4798232..f76e3aa 100644
--- a/arch/sparc/mm/fault_64.c
+++ b/arch/sparc/mm/fault_64.c
@@ -22,6 +22,9 @@
@@ -11495,7 +11714,7 @@ index 45a413e..fff0231 100644
#include <asm/page.h>
#include <asm/pgtable.h>
-@@ -75,7 +78,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
+@@ -76,7 +79,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
regs->tpc);
printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
@@ -11504,7 +11723,7 @@ index 45a413e..fff0231 100644
printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
dump_stack();
unhandled_fault(regs->tpc, current, regs);
-@@ -281,6 +284,466 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
+@@ -279,6 +282,466 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
show_regs(regs);
}
@@ -11971,7 +12190,7 @@ index 45a413e..fff0231 100644
asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
{
enum ctx_state prev_state = exception_enter();
-@@ -355,6 +818,29 @@ retry:
+@@ -353,6 +816,29 @@ retry:
if (!vma)
goto bad_area;
@@ -12108,10 +12327,10 @@ index d329537..2c3746a 100644
pte_t *huge_pte_alloc(struct mm_struct *mm,
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
-index 34506f2..0621e68 100644
+index 2d91c62..17a8fff 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
-@@ -184,9 +184,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
+@@ -186,9 +186,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
int num_kernel_image_mappings;
#ifdef CONFIG_DEBUG_DCFLUSH
@@ -12123,7 +12342,7 @@ index 34506f2..0621e68 100644
#endif
#endif
-@@ -194,7 +194,7 @@ inline void flush_dcache_page_impl(struct page *page)
+@@ -196,7 +196,7 @@ inline void flush_dcache_page_impl(struct page *page)
{
BUG_ON(tlb_type == hypervisor);
#ifdef CONFIG_DEBUG_DCFLUSH
@@ -12132,7 +12351,7 @@ index 34506f2..0621e68 100644
#endif
#ifdef DCACHE_ALIASING_POSSIBLE
-@@ -466,10 +466,10 @@ void mmu_info(struct seq_file *m)
+@@ -468,10 +468,10 @@ void mmu_info(struct seq_file *m)
#ifdef CONFIG_DEBUG_DCFLUSH
seq_printf(m, "DCPageFlushes\t: %d\n",
@@ -12146,10 +12365,10 @@ index 34506f2..0621e68 100644
#endif /* CONFIG_DEBUG_DCFLUSH */
}
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
-index b3692ce..e4517c9 100644
+index 7cca418..53fc030 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
-@@ -184,6 +184,7 @@ source "kernel/Kconfig.hz"
+@@ -192,6 +192,7 @@ source "kernel/Kconfig.hz"
config KEXEC
bool "kexec system call"
@@ -12158,7 +12377,7 @@ index b3692ce..e4517c9 100644
kexec is a system call that implements the ability to shutdown your
current kernel, and to start another kernel. It is like a reboot
diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
-index ad220ee..2f537b3 100644
+index 7b11c5f..755a026 100644
--- a/arch/tile/include/asm/atomic_64.h
+++ b/arch/tile/include/asm/atomic_64.h
@@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
@@ -12175,9 +12394,9 @@ index ad220ee..2f537b3 100644
+#define atomic64_dec_unchecked(v) atomic64_dec(v)
+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
+
- /* Atomic dec and inc don't implement barrier, so provide them if needed. */
- #define smp_mb__before_atomic_dec() smp_mb()
- #define smp_mb__after_atomic_dec() smp_mb()
+ /* Define this to indicate that cmpxchg is an efficient operation. */
+ #define __HAVE_ARCH_CMPXCHG
+
diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
index 6160761..00cac88 100644
--- a/arch/tile/include/asm/cache.h
@@ -12233,7 +12452,7 @@ index e514899..f8743c4 100644
/*
diff --git a/arch/um/Makefile b/arch/um/Makefile
-index 36e658a..71a5c5a 100644
+index e4b1a96..16162f8 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -72,6 +72,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
@@ -12280,7 +12499,7 @@ index 2e0a6b1..a64d0f5 100644
#endif
diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
-index 5ff53d9..5850cdf 100644
+index 71c5d13..4c7b9f1 100644
--- a/arch/um/include/asm/page.h
+++ b/arch/um/include/asm/page.h
@@ -14,6 +14,9 @@
@@ -12306,7 +12525,7 @@ index 0032f92..cd151e0 100644
#ifdef CONFIG_64BIT
#define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
-index eecc414..48adb87 100644
+index f17bca8..48adb87 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -356,22 +356,6 @@ int singlestepping(void * t)
@@ -12316,7 +12535,7 @@ index eecc414..48adb87 100644
-/*
- * Only x86 and x86_64 have an arch_align_stack().
- * All other arches have "#define arch_align_stack(x) (x)"
-- * in their asm/system.h
+- * in their asm/exec.h
- * As this is included in UML from asm-um/system-generic.h,
- * we can use it to behave as the subarch does.
- */
@@ -12350,27 +12569,19 @@ index ad8f795..2c7eec6 100644
/*
* Memory returned by kmalloc() may be used for DMA, so we must make
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 2f645c9..7e2933c 100644
+index 3635fff..c1f9fab 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
-@@ -22,6 +22,7 @@ config X86_64
- config X86
- def_bool y
- select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
-+ select ARCH_HAS_FAST_MULTIPLIER
- select ARCH_MIGHT_HAVE_PC_PARPORT
- select ARCH_MIGHT_HAVE_PC_SERIO
- select HAVE_AOUT if X86_32
-@@ -126,7 +127,7 @@ config X86
+@@ -129,7 +129,7 @@ config X86
select RTC_LIB
select HAVE_DEBUG_STACKOVERFLOW
select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
- select HAVE_CC_STACKPROTECTOR
+ select HAVE_CC_STACKPROTECTOR if X86_64 || !PAX_MEMORY_UDEREF
+ select GENERIC_CPU_AUTOPROBE
+ select HAVE_ARCH_AUDITSYSCALL
select ARCH_SUPPORTS_ATOMIC_RMW
-
- config INSTRUCTION_DECODER
-@@ -252,7 +253,7 @@ config X86_HT
+@@ -262,7 +262,7 @@ config X86_HT
config X86_32_LAZY_GS
def_bool y
@@ -12379,7 +12590,7 @@ index 2f645c9..7e2933c 100644
config ARCH_HWEIGHT_CFLAGS
string
-@@ -590,6 +591,7 @@ config SCHED_OMIT_FRAME_POINTER
+@@ -600,6 +600,7 @@ config SCHED_OMIT_FRAME_POINTER
menuconfig HYPERVISOR_GUEST
bool "Linux guest support"
@@ -12387,7 +12598,7 @@ index 2f645c9..7e2933c 100644
---help---
Say Y here to enable options for running Linux under various hyper-
visors. This option enables basic hypervisor detection and platform
-@@ -977,6 +979,7 @@ config VM86
+@@ -977,6 +978,7 @@ config VM86
config X86_16BIT
bool "Enable support for 16-bit segments" if EXPERT
@@ -12395,25 +12606,23 @@ index 2f645c9..7e2933c 100644
default y
---help---
This option is required by programs like Wine to run 16-bit
-@@ -1133,7 +1136,7 @@ choice
+@@ -1132,6 +1134,7 @@ choice
config NOHIGHMEM
bool "off"
-- depends on !X86_NUMAQ
-+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
++ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
---help---
Linux can use up to 64 Gigabytes of physical memory on x86 systems.
However, the address space of 32-bit x86 processors is only 4
-@@ -1170,7 +1173,7 @@ config NOHIGHMEM
+@@ -1168,6 +1171,7 @@ config NOHIGHMEM
config HIGHMEM4G
bool "4GB"
-- depends on !X86_NUMAQ
-+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
++ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
---help---
Select this if you have a 32-bit processor and between 1 and 4
gigabytes of physical RAM.
-@@ -1223,7 +1226,7 @@ config PAGE_OFFSET
+@@ -1220,7 +1224,7 @@ config PAGE_OFFSET
hex
default 0xB0000000 if VMSPLIT_3G_OPT
default 0x80000000 if VMSPLIT_2G
@@ -12422,7 +12631,7 @@ index 2f645c9..7e2933c 100644
default 0x40000000 if VMSPLIT_1G
default 0xC0000000
depends on X86_32
-@@ -1628,6 +1631,7 @@ source kernel/Kconfig.hz
+@@ -1635,6 +1639,7 @@ source kernel/Kconfig.hz
config KEXEC
bool "kexec system call"
@@ -12430,7 +12639,7 @@ index 2f645c9..7e2933c 100644
---help---
kexec is a system call that implements the ability to shutdown your
current kernel, and to start another kernel. It is like a reboot
-@@ -1779,7 +1783,9 @@ config X86_NEED_RELOCS
+@@ -1820,7 +1825,9 @@ config X86_NEED_RELOCS
config PHYSICAL_ALIGN
hex "Alignment value to which kernel should be aligned"
@@ -12441,20 +12650,16 @@ index 2f645c9..7e2933c 100644
range 0x2000 0x1000000 if X86_32
range 0x200000 0x1000000 if X86_64
---help---
-@@ -1859,9 +1865,10 @@ config DEBUG_HOTPLUG_CPU0
- If unsure, say N.
-
- config COMPAT_VDSO
-- def_bool y
-+ def_bool n
- prompt "Compat VDSO support"
+@@ -1903,6 +1910,7 @@ config COMPAT_VDSO
+ def_bool n
+ prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
depends on X86_32 || IA32_EMULATION
+ depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
---help---
- Map the 32-bit VDSO to the predictable old-style address too.
-
+ Certain buggy versions of glibc will crash if they are
+ presented with a 32-bit vDSO that is not mapped at the address
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
-index f3aaf23..a1d3c49 100644
+index 6983314..54ad7e8 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -319,7 +319,7 @@ config X86_PPRO_FENCE
@@ -12485,10 +12690,10 @@ index f3aaf23..a1d3c49 100644
config X86_MINIMUM_CPU_FAMILY
int
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
-index 321a52c..3d51a5e 100644
+index 61bd2ad..50b625d 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
-@@ -84,7 +84,7 @@ config X86_PTDUMP
+@@ -93,7 +93,7 @@ config EFI_PGT_DUMP
config DEBUG_RODATA
bool "Write protect kernel read-only data structures"
default y
@@ -12497,7 +12702,7 @@ index 321a52c..3d51a5e 100644
---help---
Mark the kernel read-only data as write-protected in the pagetables,
in order to catch accidental (and incorrect) writes to such const
-@@ -102,7 +102,7 @@ config DEBUG_RODATA_TEST
+@@ -111,7 +111,7 @@ config DEBUG_RODATA_TEST
config DEBUG_SET_MODULE_RONX
bool "Set loadable kernel module data as NX and text as RO"
@@ -12507,10 +12712,10 @@ index 321a52c..3d51a5e 100644
This option helps catch unintended modifications to loadable
kernel module's text and read-only data. It also prevents execution
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
-index 0dd99ea..4a63d82 100644
+index 920e616..ac3d4df 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
-@@ -71,9 +71,6 @@ ifeq ($(CONFIG_X86_32),y)
+@@ -65,9 +65,6 @@ ifeq ($(CONFIG_X86_32),y)
# CPU-specific tuning. Anything which can be shared with UML should go here.
include $(srctree)/arch/x86/Makefile_32.cpu
KBUILD_CFLAGS += $(cflags-y)
@@ -12520,8 +12725,8 @@ index 0dd99ea..4a63d82 100644
else
BITS := 64
UTS_MACHINE := x86_64
-@@ -112,6 +109,9 @@ else
- KBUILD_CFLAGS += -maccumulate-outgoing-args
+@@ -107,6 +104,9 @@ else
+ KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
endif
+# temporary until string.h is fixed
@@ -12530,9 +12735,17 @@ index 0dd99ea..4a63d82 100644
# Make sure compiler does not have buggy stack-protector support.
ifdef CONFIG_CC_STACKPROTECTOR
cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
-@@ -269,3 +269,12 @@ define archhelp
+@@ -180,6 +180,7 @@ archheaders:
+ $(Q)$(MAKE) $(build)=arch/x86/syscalls all
+
+ archprepare:
++ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
+ ifeq ($(CONFIG_KEXEC_FILE),y)
+ $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
+ endif
+@@ -263,3 +264,9 @@ define archhelp
+ echo ' FDARGS="..." arguments for the booted kernel'
echo ' FDINITRD=file initrd for the booted kernel'
- echo ' kvmconfig - Enable additional options for guest kernel support'
endef
+
+define OLD_LD
@@ -12540,14 +12753,11 @@ index 0dd99ea..4a63d82 100644
+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
+*** Please upgrade your binutils to 2.18 or newer
+endef
-+
-+archprepare:
-+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
-index 878df7e..a803913 100644
+index 3db07f3..9d81d0f 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
-@@ -52,6 +52,9 @@ $(obj)/cpustr.h: $(obj)/mkcpustr FORCE
+@@ -56,6 +56,9 @@ clean-files += cpustr.h
# ---------------------------------------------------------------------------
KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
@@ -12580,7 +12790,7 @@ index 878e4b9..20537ab 100644
#endif /* BOOT_BITOPS_H */
diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
-index 50f8c5e..4f84fff 100644
+index bd49ec6..94c7f58 100644
--- a/arch/x86/boot/boot.h
+++ b/arch/x86/boot/boot.h
@@ -84,7 +84,7 @@ static inline void io_delay(void)
@@ -12592,17 +12802,8 @@ index 50f8c5e..4f84fff 100644
return seg;
}
-@@ -180,7 +180,7 @@ static inline void wrgs32(u32 v, addr_t addr)
- static inline int memcmp(const void *s1, const void *s2, size_t len)
- {
- u8 diff;
-- asm("repe; cmpsb; setnz %0"
-+ asm volatile("repe; cmpsb; setnz %0"
- : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
- return diff;
- }
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
-index b5bb498..74110e8 100644
+index 6a1a845..0ad2dae 100644
--- a/arch/x86/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile
@@ -16,6 +16,9 @@ KBUILD_CFLAGS += $(cflags-y)
@@ -12658,10 +12859,10 @@ index a53440e..c3dbf1e 100644
.previous
diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
-index c5b56ed..9f79ed3 100644
+index 1d7fbbc..36ecd58 100644
--- a/arch/x86/boot/compressed/head_32.S
+++ b/arch/x86/boot/compressed/head_32.S
-@@ -119,10 +119,10 @@ preferred_addr:
+@@ -140,10 +140,10 @@ preferred_addr:
addl %eax, %ebx
notl %eax
andl %eax, %ebx
@@ -12675,7 +12876,7 @@ index c5b56ed..9f79ed3 100644
/* Target address to relocate to for decompression */
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
-index 34bbc09..c126b87 100644
+index 6b1766c..ad465c9 100644
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -94,10 +94,10 @@ ENTRY(startup_32)
@@ -12691,7 +12892,7 @@ index 34bbc09..c126b87 100644
1:
/* Target address to relocate to for decompression */
-@@ -268,10 +268,10 @@ preferred_addr:
+@@ -322,10 +322,10 @@ preferred_addr:
addq %rax, %rbp
notq %rax
andq %rax, %rbp
@@ -12704,7 +12905,7 @@ index 34bbc09..c126b87 100644
1:
/* Target address to relocate to for decompression */
-@@ -366,8 +366,8 @@ gdt:
+@@ -434,8 +434,8 @@ gdt:
.long gdt
.word 0
.quad 0x0000000000000000 /* NULL descriptor */
@@ -12716,19 +12917,10 @@ index 34bbc09..c126b87 100644
.quad 0x0000000000000000 /* TS continued */
gdt_end:
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
-index 8f45c85..fc8346a 100644
+index 0c33a7c..be226ed 100644
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
-@@ -218,7 +218,7 @@ void __putstr(const char *s)
-
- void *memset(void *s, int c, size_t n)
- {
-- int i;
-+ size_t i;
- char *ss = s;
-
- for (i = 0; i < n; i++)
-@@ -277,7 +277,7 @@ static void handle_relocations(void *output, unsigned long output_len)
+@@ -242,7 +242,7 @@ static void handle_relocations(void *output, unsigned long output_len)
* Calculate the delta between where vmlinux was linked to load
* and where it was actually loaded.
*/
@@ -12737,7 +12929,7 @@ index 8f45c85..fc8346a 100644
if (!delta) {
debug_putstr("No relocation needed... ");
return;
-@@ -347,7 +347,7 @@ static void parse_elf(void *output)
+@@ -312,7 +312,7 @@ static void parse_elf(void *output)
Elf32_Ehdr ehdr;
Elf32_Phdr *phdrs, *phdr;
#endif
@@ -12746,7 +12938,7 @@ index 8f45c85..fc8346a 100644
int i;
memcpy(&ehdr, output, sizeof(ehdr));
-@@ -374,13 +374,16 @@ static void parse_elf(void *output)
+@@ -339,13 +339,16 @@ static void parse_elf(void *output)
case PT_LOAD:
#ifdef CONFIG_RELOCATABLE
dest = output;
@@ -12764,7 +12956,7 @@ index 8f45c85..fc8346a 100644
break;
default: /* Ignore other PT_* */ break;
}
-@@ -439,7 +442,7 @@ asmlinkage void *decompress_kernel(void *rmode, memptr heap,
+@@ -404,7 +407,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
error("Destination address too large");
#endif
#ifndef CONFIG_RELOCATABLE
@@ -12774,10 +12966,10 @@ index 8f45c85..fc8346a 100644
#endif
diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
-index 100a9a1..bb3bdb0 100644
+index 1fd7d57..0f7d096 100644
--- a/arch/x86/boot/cpucheck.c
+++ b/arch/x86/boot/cpucheck.c
-@@ -117,9 +117,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
+@@ -125,9 +125,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
u32 ecx = MSR_K7_HWCR;
u32 eax, edx;
@@ -12789,7 +12981,7 @@ index 100a9a1..bb3bdb0 100644
get_cpuflags(); /* Make sure it really did something */
err = check_cpuflags();
-@@ -132,9 +132,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
+@@ -140,9 +140,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
u32 ecx = MSR_VIA_FCR;
u32 eax, edx;
@@ -12801,7 +12993,7 @@ index 100a9a1..bb3bdb0 100644
set_bit(X86_FEATURE_CX8, cpu.flags);
err = check_cpuflags();
-@@ -145,12 +145,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
+@@ -153,12 +153,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
u32 eax, edx;
u32 level = 1;
@@ -12817,12 +13009,12 @@ index 100a9a1..bb3bdb0 100644
+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
err = check_cpuflags();
- }
+ } else if (err == 0x01 &&
diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
-index 04da6c2..a151f55 100644
+index 16ef025..91e033b 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
-@@ -434,10 +434,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
+@@ -438,10 +438,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
# single linked list of
# struct setup_data
@@ -12852,10 +13044,10 @@ index db75d07..8e6d0af 100644
struct e820entry *desc = boot_params.e820_map;
static struct e820entry buf; /* static so it is zeroed */
diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
-index 11e8c6e..fdbb1ed 100644
+index ba3e100..6501b8f 100644
--- a/arch/x86/boot/video-vesa.c
+++ b/arch/x86/boot/video-vesa.c
-@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
+@@ -201,6 +201,7 @@ static void vesa_store_pm_info(void)
boot_params.screen_info.vesapm_seg = oreg.es;
boot_params.screen_info.vesapm_off = oreg.di;
@@ -13830,7 +14022,7 @@ index e3531f8..e123f35 100644
ret;
ENDPROC(cast6_xts_dec_8way)
diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
-index dbc4339..de6e120 100644
+index 26d49eb..c0a8c84 100644
--- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
@@ -45,6 +45,7 @@
@@ -13841,7 +14033,7 @@ index dbc4339..de6e120 100644
## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
-@@ -312,6 +313,7 @@ do_return:
+@@ -309,6 +310,7 @@ do_return:
popq %rsi
popq %rdi
popq %rbx
@@ -13850,7 +14042,7 @@ index dbc4339..de6e120 100644
################################################################
diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
-index 185fad4..ff4cd36 100644
+index 5d1e007..098cb4f 100644
--- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
+++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
@@ -18,6 +18,7 @@
@@ -14433,7 +14625,7 @@ index a039d21..524b8b2 100644
ret
ENDPROC(twofish_dec_blk)
diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
-index d21ff89..6da8e6e 100644
+index df91466..74b31cb 100644
--- a/arch/x86/ia32/ia32_aout.c
+++ b/arch/x86/ia32/ia32_aout.c
@@ -153,6 +153,8 @@ static int aout_core_dump(struct coredump_params *cprm)
@@ -14446,7 +14638,7 @@ index d21ff89..6da8e6e 100644
set_fs(KERNEL_DS);
has_dumped = 1;
diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
-index 2206757..85cbcfa 100644
+index f9e181a..300544c 100644
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
@@ -218,7 +218,7 @@ asmlinkage long sys32_sigreturn(void)
@@ -14467,9 +14659,14 @@ index 2206757..85cbcfa 100644
return (void __user *) sp;
}
-@@ -386,7 +386,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
- restorer = VDSO32_SYMBOL(current->mm->context.vdso,
- sigreturn);
+@@ -383,10 +383,10 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
+ } else {
+ /* Return stub is in 32bit vsyscall page */
+ if (current->mm->context.vdso)
+- restorer = current->mm->context.vdso +
+- selected_vdso32->sym___kernel_sigreturn;
++ restorer = (void __force_user *)(current->mm->context.vdso +
++ selected_vdso32->sym___kernel_sigreturn);
else
- restorer = &frame->retcode;
+ restorer = frame->retcode;
@@ -14494,16 +14691,17 @@ index 2206757..85cbcfa 100644
};
frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
-@@ -461,16 +461,18 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
+@@ -461,16 +461,19 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
if (ksig->ka.sa.sa_flags & SA_RESTORER)
restorer = ksig->ka.sa.sa_restorer;
+ else if (current->mm->context.vdso)
+ /* Return stub is in 32bit vsyscall page */
-+ restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
++ restorer = (void __force_user *)(current->mm->context.vdso +
++ selected_vdso32->sym___kernel_rt_sigreturn);
else
-- restorer = VDSO32_SYMBOL(current->mm->context.vdso,
-- rt_sigreturn);
+- restorer = current->mm->context.vdso +
+- selected_vdso32->sym___kernel_rt_sigreturn;
+ restorer = frame->retcode;
put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
@@ -14517,7 +14715,7 @@ index 2206757..85cbcfa 100644
err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
-index 92a2e93..9b829fa 100644
+index ffe7122..899bad3 100644
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@ -15,8 +15,10 @@
@@ -14675,14 +14873,14 @@ index 92a2e93..9b829fa 100644
/* clear IF, that popfq doesn't enable interrupts early */
- andl $~0x200,EFLAGS-R11(%rsp)
- movl RIP-R11(%rsp),%edx /* User %eip */
-+ andl $~X86_EFLAGS_IF,EFLAGS(%rsp)
++ andl $~X86_EFLAGS_IF,EFLAGS(%rsp)
+ movl RIP(%rsp),%edx /* User %eip */
CFI_REGISTER rip,rdx
RESTORE_ARGS 0,24,0,0,0,0
xorq %r8,%r8
@@ -205,6 +254,9 @@ sysexit_from_sys_call:
- movl %eax,%esi /* 2nd arg: syscall number */
- movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
+ movl %ebx,%esi /* 2nd arg: 1st syscall arg */
+ movl %eax,%edi /* 1st arg: syscall number */
call __audit_syscall_entry
+
+ pax_erase_kstack
@@ -14947,7 +15145,7 @@ index 372231c..51b537d 100644
.long \orig - .
.long \alt - .
diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
-index 0a3f9c9..c9d081d 100644
+index 473bdbe..b1e3377 100644
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -106,7 +106,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
@@ -14969,7 +15167,7 @@ index 0a3f9c9..c9d081d 100644
ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
".popsection"
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
-index 1d2091a..f5074c1 100644
+index 465b309..ab7e51f 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
@@ -15004,18 +15202,13 @@ index 20370c6..a2eb9b0 100644
"popl %%ebp\n\t"
"popl %%edi\n\t"
diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
-index b17f4f4..7a16182 100644
+index 5e5cd12..3d18208 100644
--- a/arch/x86/include/asm/atomic.h
+++ b/arch/x86/include/asm/atomic.h
-@@ -23,7 +23,18 @@
- */
- static inline int atomic_read(const atomic_t *v)
- {
-- return (*(volatile int *)&(v)->counter);
-+ return (*(volatile const int *)&(v)->counter);
-+}
-+
-+/**
+@@ -28,6 +28,17 @@ static inline int atomic_read(const atomic_t *v)
+ }
+
+ /**
+ * atomic_read_unchecked - read atomic variable
+ * @v: pointer of type atomic_unchecked_t
+ *
@@ -15023,11 +15216,14 @@ index b17f4f4..7a16182 100644
+ */
+static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
+{
-+ return (*(volatile const int *)&(v)->counter);
- }
-
- /**
-@@ -39,6 +50,18 @@ static inline void atomic_set(atomic_t *v, int i)
++ return ACCESS_ONCE((v)->counter);
++}
++
++/**
+ * atomic_set - set atomic variable
+ * @v: pointer of type atomic_t
+ * @i: required value
+@@ -40,6 +51,18 @@ static inline void atomic_set(atomic_t *v, int i)
}
/**
@@ -15046,7 +15242,7 @@ index b17f4f4..7a16182 100644
* atomic_add - add integer to atomic variable
* @i: integer value to add
* @v: pointer of type atomic_t
-@@ -47,7 +70,29 @@ static inline void atomic_set(atomic_t *v, int i)
+@@ -48,7 +71,29 @@ static inline void atomic_set(atomic_t *v, int i)
*/
static inline void atomic_add(int i, atomic_t *v)
{
@@ -15077,7 +15273,7 @@ index b17f4f4..7a16182 100644
: "+m" (v->counter)
: "ir" (i));
}
-@@ -61,7 +106,29 @@ static inline void atomic_add(int i, atomic_t *v)
+@@ -62,7 +107,29 @@ static inline void atomic_add(int i, atomic_t *v)
*/
static inline void atomic_sub(int i, atomic_t *v)
{
@@ -15108,7 +15304,7 @@ index b17f4f4..7a16182 100644
: "+m" (v->counter)
: "ir" (i));
}
-@@ -77,7 +144,7 @@ static inline void atomic_sub(int i, atomic_t *v)
+@@ -78,7 +145,7 @@ static inline void atomic_sub(int i, atomic_t *v)
*/
static inline int atomic_sub_and_test(int i, atomic_t *v)
{
@@ -15117,7 +15313,7 @@ index b17f4f4..7a16182 100644
}
/**
-@@ -88,7 +155,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
+@@ -89,7 +156,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
*/
static inline void atomic_inc(atomic_t *v)
{
@@ -15146,7 +15342,7 @@ index b17f4f4..7a16182 100644
: "+m" (v->counter));
}
-@@ -100,7 +187,27 @@ static inline void atomic_inc(atomic_t *v)
+@@ -101,7 +188,27 @@ static inline void atomic_inc(atomic_t *v)
*/
static inline void atomic_dec(atomic_t *v)
{
@@ -15175,7 +15371,7 @@ index b17f4f4..7a16182 100644
: "+m" (v->counter));
}
-@@ -114,7 +221,7 @@ static inline void atomic_dec(atomic_t *v)
+@@ -115,7 +222,7 @@ static inline void atomic_dec(atomic_t *v)
*/
static inline int atomic_dec_and_test(atomic_t *v)
{
@@ -15184,7 +15380,7 @@ index b17f4f4..7a16182 100644
}
/**
-@@ -127,7 +234,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
+@@ -128,7 +235,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
*/
static inline int atomic_inc_and_test(atomic_t *v)
{
@@ -15206,7 +15402,7 @@ index b17f4f4..7a16182 100644
}
/**
-@@ -141,7 +261,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
+@@ -142,7 +262,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
*/
static inline int atomic_add_negative(int i, atomic_t *v)
{
@@ -15215,7 +15411,7 @@ index b17f4f4..7a16182 100644
}
/**
-@@ -151,7 +271,19 @@ static inline int atomic_add_negative(int i, atomic_t *v)
+@@ -152,7 +272,19 @@ static inline int atomic_add_negative(int i, atomic_t *v)
*
* Atomically adds @i to @v and returns @i + @v
*/
@@ -15236,7 +15432,7 @@ index b17f4f4..7a16182 100644
{
return i + xadd(&v->counter, i);
}
-@@ -163,15 +295,24 @@ static inline int atomic_add_return(int i, atomic_t *v)
+@@ -164,15 +296,24 @@ static inline int atomic_add_return(int i, atomic_t *v)
*
* Atomically subtracts @i from @v and returns @v - @i
*/
@@ -15263,7 +15459,7 @@ index b17f4f4..7a16182 100644
{
return cmpxchg(&v->counter, old, new);
}
-@@ -181,6 +322,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
+@@ -182,6 +323,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
return xchg(&v->counter, new);
}
@@ -15275,7 +15471,7 @@ index b17f4f4..7a16182 100644
/**
* __atomic_add_unless - add unless the number is already a given value
* @v: pointer of type atomic_t
-@@ -190,14 +336,27 @@ static inline int atomic_xchg(atomic_t *v, int new)
+@@ -191,14 +337,27 @@ static inline int atomic_xchg(atomic_t *v, int new)
* Atomically adds @a to @v, so long as @v was not already @u.
* Returns the old value of @v.
*/
@@ -15307,7 +15503,7 @@ index b17f4f4..7a16182 100644
if (likely(old == c))
break;
c = old;
-@@ -206,6 +365,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
+@@ -207,6 +366,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
}
/**
@@ -15357,8 +15553,8 @@ index b17f4f4..7a16182 100644
* atomic_inc_short - increment of a short integer
* @v: pointer to type int
*
-@@ -234,14 +436,37 @@ static inline void atomic_or_long(unsigned long *v1, unsigned long v2)
- #endif
+@@ -220,14 +422,37 @@ static inline short int atomic_inc_short(short int *v)
+ }
/* These are x86-specific, used by some header files */
-#define atomic_clear_mask(mask, addr) \
@@ -15400,8 +15596,8 @@ index b17f4f4..7a16182 100644
+ : "memory");
+}
- /* Atomic operations are already serializing on x86 */
- #define smp_mb__before_atomic_dec() barrier()
+ #ifdef CONFIG_X86_32
+ # include <asm/atomic64_32.h>
diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
index b154de7..bf18a5a 100644
--- a/arch/x86/include/asm/atomic64_32.h
@@ -15578,18 +15774,13 @@ index b154de7..bf18a5a 100644
* @i: integer value to subtract
* @v: pointer to type atomic64_t
diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
-index 46e9052..ae45136 100644
+index f8d273e..02f39f3 100644
--- a/arch/x86/include/asm/atomic64_64.h
+++ b/arch/x86/include/asm/atomic64_64.h
-@@ -18,7 +18,19 @@
- */
- static inline long atomic64_read(const atomic64_t *v)
- {
-- return (*(volatile long *)&(v)->counter);
-+ return (*(volatile const long *)&(v)->counter);
-+}
-+
-+/**
+@@ -22,6 +22,18 @@ static inline long atomic64_read(const atomic64_t *v)
+ }
+
+ /**
+ * atomic64_read_unchecked - read atomic64 variable
+ * @v: pointer of type atomic64_unchecked_t
+ *
@@ -15598,10 +15789,13 @@ index 46e9052..ae45136 100644
+ */
+static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
+{
-+ return (*(volatile const long *)&(v)->counter);
- }
-
- /**
++ return ACCESS_ONCE((v)->counter);
++}
++
++/**
+ * atomic64_set - set atomic64 variable
+ * @v: pointer to type atomic64_t
+ * @i: required value
@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
}
@@ -15853,7 +16047,7 @@ index 46e9052..ae45136 100644
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
-index 69bbb48..32517fe 100644
+index 0f4460b..fa1ee19 100644
--- a/arch/x86/include/asm/barrier.h
+++ b/arch/x86/include/asm/barrier.h
@@ -107,7 +107,7 @@
@@ -15875,10 +16069,10 @@ index 69bbb48..32517fe 100644
#define smp_load_acquire(p) \
diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
-index 9fc1af7..98cab0b 100644
+index cfe3b95..d01b118 100644
--- a/arch/x86/include/asm/bitops.h
+++ b/arch/x86/include/asm/bitops.h
-@@ -49,7 +49,7 @@
+@@ -50,7 +50,7 @@
* a mask operation on a byte.
*/
#define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
@@ -15887,7 +16081,7 @@ index 9fc1af7..98cab0b 100644
#define CONST_MASK(nr) (1 << ((nr) & 7))
/**
-@@ -205,7 +205,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
+@@ -203,7 +203,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
*/
static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
{
@@ -15896,7 +16090,7 @@ index 9fc1af7..98cab0b 100644
}
/**
-@@ -251,7 +251,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
+@@ -249,7 +249,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
*/
static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
{
@@ -15905,7 +16099,7 @@ index 9fc1af7..98cab0b 100644
}
/**
-@@ -304,7 +304,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
+@@ -302,7 +302,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
*/
static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
{
@@ -15914,7 +16108,7 @@ index 9fc1af7..98cab0b 100644
}
static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
-@@ -345,7 +345,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
+@@ -343,7 +343,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
*
* Undefined if no bit exists, so code should check against 0 first.
*/
@@ -15923,7 +16117,7 @@ index 9fc1af7..98cab0b 100644
{
asm("rep; bsf %1,%0"
: "=r" (word)
-@@ -359,7 +359,7 @@ static inline unsigned long __ffs(unsigned long word)
+@@ -357,7 +357,7 @@ static inline unsigned long __ffs(unsigned long word)
*
* Undefined if no zero exists, so code should check against ~0UL first.
*/
@@ -15932,7 +16126,7 @@ index 9fc1af7..98cab0b 100644
{
asm("rep; bsf %1,%0"
: "=r" (word)
-@@ -373,7 +373,7 @@ static inline unsigned long ffz(unsigned long word)
+@@ -371,7 +371,7 @@ static inline unsigned long ffz(unsigned long word)
*
* Undefined if no set bit exists, so code should check against 0 first.
*/
@@ -15941,7 +16135,7 @@ index 9fc1af7..98cab0b 100644
{
asm("bsr %1,%0"
: "=r" (word)
-@@ -436,7 +436,7 @@ static inline int ffs(int x)
+@@ -434,7 +434,7 @@ static inline int ffs(int x)
* set bit if value is nonzero. The last (most significant) bit is
* at position 32.
*/
@@ -15950,7 +16144,7 @@ index 9fc1af7..98cab0b 100644
{
int r;
-@@ -478,7 +478,7 @@ static inline int fls(int x)
+@@ -476,7 +476,7 @@ static inline int fls(int x)
* at position 64.
*/
#ifdef CONFIG_X86_64
@@ -15959,15 +16153,6 @@ index 9fc1af7..98cab0b 100644
{
int bitpos = -1;
/*
-@@ -499,8 +499,6 @@ static __always_inline int fls64(__u64 x)
-
- #include <asm-generic/bitops/sched.h>
-
--#define ARCH_HAS_FAST_MULTIPLIER 1
--
- #include <asm/arch_hweight.h>
-
- #include <asm-generic/bitops/const_hweight.h>
diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
index 4fa687a..60f2d39 100644
--- a/arch/x86/include/asm/boot.h
@@ -16023,10 +16208,10 @@ index 9863ee3..4a1f8e1 100644
return _PAGE_CACHE_WC;
else if (pg_flags == _PGMT_UC_MINUS)
diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
-index cb4c73b..c473c29 100644
+index 76659b6..72b8439 100644
--- a/arch/x86/include/asm/calling.h
+++ b/arch/x86/include/asm/calling.h
-@@ -82,103 +82,113 @@ For 32-bit we have the following conventions - kernel is built with
+@@ -82,107 +82,117 @@ For 32-bit we have the following conventions - kernel is built with
#define RSP 152
#define SS 160
@@ -16034,7 +16219,7 @@ index cb4c73b..c473c29 100644
-#define SWFRAME ORIG_RAX
+#define ARGOFFSET R15
- .macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1
+ .macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1, rax_enosys=0
- subq $9*8+\addskip, %rsp
- CFI_ADJUST_CFA_OFFSET 9*8+\addskip
- movq_cfi rdi, 8*8
@@ -16051,8 +16236,13 @@ index cb4c73b..c473c29 100644
+ movq_cfi rcx, RCX
.endif
+ .if \rax_enosys
+- movq $-ENOSYS, 4*8(%rsp)
++ movq $-ENOSYS, RAX(%rsp)
+ .else
- movq_cfi rax, 4*8
+ movq_cfi rax, RAX
+ .endif
.if \save_r891011
- movq_cfi r8, 3*8
@@ -16145,7 +16335,7 @@ index cb4c73b..c473c29 100644
.if \skiprax
.else
- movq \offset+72(%rsp), %rax
-+ movq RAX(%rsp), %rax
++ movq ORIG_RAX(%rsp), %rax
.endif
.endm
@@ -16232,10 +16422,10 @@ index f50de69..2b0a458 100644
clac();
return ret;
diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
-index d47786a..2d8883e 100644
+index 99c105d7..2f667ac 100644
--- a/arch/x86/include/asm/cmpxchg.h
+++ b/arch/x86/include/asm/cmpxchg.h
-@@ -14,8 +14,12 @@ extern void __cmpxchg_wrong_size(void)
+@@ -16,8 +16,12 @@ extern void __cmpxchg_wrong_size(void)
__compiletime_error("Bad argument size for cmpxchg");
extern void __xadd_wrong_size(void)
__compiletime_error("Bad argument size for xadd");
@@ -16248,7 +16438,7 @@ index d47786a..2d8883e 100644
/*
* Constants for operation sizes. On 32-bit, the 64-bit size it set to
-@@ -67,6 +71,38 @@ extern void __add_wrong_size(void)
+@@ -69,6 +73,38 @@ extern void __add_wrong_size(void)
__ret; \
})
@@ -16311,36 +16501,36 @@ index 59c6c40..5e0b22c 100644
struct compat_timespec {
compat_time_t tv_sec;
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
-index 1717156..14e260a 100644
+index 0bb1335..8f1aec7 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
-@@ -204,7 +204,7 @@
- #define X86_FEATURE_PAUSEFILTER (8*32+13) /* AMD filtered pause intercept */
- #define X86_FEATURE_PFTHRESHOLD (8*32+14) /* AMD pause filter threshold */
- #define X86_FEATURE_VMMCALL (8*32+15) /* Prefer vmmcall to vmcall */
+@@ -207,7 +207,7 @@
+ #define X86_FEATURE_PAUSEFILTER ( 8*32+13) /* AMD filtered pause intercept */
+ #define X86_FEATURE_PFTHRESHOLD ( 8*32+14) /* AMD pause filter threshold */
+ #define X86_FEATURE_VMMCALL ( 8*32+15) /* Prefer vmmcall to vmcall */
-
+#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
/* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
- #define X86_FEATURE_FSGSBASE (9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
-@@ -212,7 +212,7 @@
- #define X86_FEATURE_BMI1 (9*32+ 3) /* 1st group bit manipulation extensions */
- #define X86_FEATURE_HLE (9*32+ 4) /* Hardware Lock Elision */
- #define X86_FEATURE_AVX2 (9*32+ 5) /* AVX2 instructions */
--#define X86_FEATURE_SMEP (9*32+ 7) /* Supervisor Mode Execution Protection */
-+#define X86_FEATURE_SMEP (9*32+ 7) /* Supervisor Mode Execution Prevention */
- #define X86_FEATURE_BMI2 (9*32+ 8) /* 2nd group bit manipulation extensions */
- #define X86_FEATURE_ERMS (9*32+ 9) /* Enhanced REP MOVSB/STOSB */
- #define X86_FEATURE_INVPCID (9*32+10) /* Invalidate Processor Context ID */
-@@ -359,6 +359,7 @@ extern const char * const x86_power_flags[32];
- #undef cpu_has_centaur_mcr
- #define cpu_has_centaur_mcr 0
-
+ #define X86_FEATURE_FSGSBASE ( 9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
+@@ -215,7 +215,7 @@
+ #define X86_FEATURE_BMI1 ( 9*32+ 3) /* 1st group bit manipulation extensions */
+ #define X86_FEATURE_HLE ( 9*32+ 4) /* Hardware Lock Elision */
+ #define X86_FEATURE_AVX2 ( 9*32+ 5) /* AVX2 instructions */
+-#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Protection */
++#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Prevention */
+ #define X86_FEATURE_BMI2 ( 9*32+ 8) /* 2nd group bit manipulation extensions */
+ #define X86_FEATURE_ERMS ( 9*32+ 9) /* Enhanced REP MOVSB/STOSB */
+ #define X86_FEATURE_INVPCID ( 9*32+10) /* Invalidate Processor Context ID */
+@@ -383,6 +383,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
+ #define cpu_has_cx16 boot_cpu_has(X86_FEATURE_CX16)
+ #define cpu_has_eager_fpu boot_cpu_has(X86_FEATURE_EAGER_FPU)
+ #define cpu_has_topoext boot_cpu_has(X86_FEATURE_TOPOEXT)
+#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
- #endif /* CONFIG_X86_64 */
#if __GNUC__ >= 4
-@@ -411,7 +412,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
+ extern void warn_pre_alternatives(void);
+@@ -434,7 +435,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
#ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
t_warn:
@@ -16350,7 +16540,7 @@ index 1717156..14e260a 100644
return false;
#endif
-@@ -431,7 +433,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
+@@ -454,7 +456,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
".section .discard,\"aw\",@progbits\n"
" .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
".previous\n"
@@ -16359,7 +16549,7 @@ index 1717156..14e260a 100644
"3: movb $1,%0\n"
"4:\n"
".previous\n"
-@@ -468,7 +470,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
+@@ -491,7 +493,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
" .byte 2b - 1b\n" /* src len */
" .byte 4f - 3f\n" /* repl len */
".previous\n"
@@ -16368,7 +16558,7 @@ index 1717156..14e260a 100644
"3: .byte 0xe9\n .long %l[t_no] - 2b\n"
"4:\n"
".previous\n"
-@@ -501,7 +503,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
+@@ -524,7 +526,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
".section .discard,\"aw\",@progbits\n"
" .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
".previous\n"
@@ -16377,7 +16567,7 @@ index 1717156..14e260a 100644
"3: movb $0,%0\n"
"4:\n"
".previous\n"
-@@ -515,7 +517,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
+@@ -538,7 +540,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
".section .discard,\"aw\",@progbits\n"
" .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
".previous\n"
@@ -16645,10 +16835,20 @@ index ced283a..ffe04cc 100644
union {
u64 v64;
diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
-index 01f15b2..5718a82 100644
+index ca3347a..1a5082a 100644
--- a/arch/x86/include/asm/elf.h
+++ b/arch/x86/include/asm/elf.h
-@@ -244,7 +244,25 @@ extern int force_personality32;
+@@ -75,9 +75,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
+
+ #include <asm/vdso.h>
+
+-#ifdef CONFIG_X86_64
+-extern unsigned int vdso64_enabled;
+-#endif
+ #if defined(CONFIG_X86_32) || defined(CONFIG_COMPAT)
+ extern unsigned int vdso32_enabled;
+ #endif
+@@ -249,7 +246,25 @@ extern int force_personality32;
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -16674,26 +16874,27 @@ index 01f15b2..5718a82 100644
/* This yields a mask that user programs can use to figure out what
instruction set this CPU supports. This could be done in user space,
-@@ -297,16 +315,12 @@ do { \
+@@ -298,17 +313,13 @@ do { \
#define ARCH_DLINFO \
do { \
-- if (vdso_enabled) \
+- if (vdso64_enabled) \
- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
-- (unsigned long)current->mm->context.vdso); \
+- (unsigned long __force)current->mm->context.vdso); \
+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
} while (0)
+ /* As a historical oddity, the x32 and x86_64 vDSOs are controlled together. */
#define ARCH_DLINFO_X32 \
do { \
-- if (vdso_enabled) \
+- if (vdso64_enabled) \
- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
-- (unsigned long)current->mm->context.vdso); \
+- (unsigned long __force)current->mm->context.vdso); \
+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
} while (0)
#define AT_SYSINFO 32
-@@ -321,7 +335,7 @@ else \
+@@ -323,10 +334,10 @@ else \
#endif /* !CONFIG_X86_32 */
@@ -16701,10 +16902,14 @@ index 01f15b2..5718a82 100644
+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
#define VDSO_ENTRY \
- ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
-@@ -337,9 +351,6 @@ extern int x32_setup_additional_pages(struct linux_binprm *bprm,
- extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
- #define compat_arch_setup_additional_pages syscall32_setup_pages
+- ((unsigned long)current->mm->context.vdso + \
++ (current->mm->context.vdso + \
+ selected_vdso32->sym___kernel_vsyscall)
+
+ struct linux_binprm;
+@@ -338,9 +349,6 @@ extern int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
+ int uses_interp);
+ #define compat_arch_setup_additional_pages compat_arch_setup_additional_pages
-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
-#define arch_randomize_brk arch_randomize_brk
@@ -16725,7 +16930,7 @@ index 77a99ac..39ff7f5 100644
#endif /* _ASM_X86_EMERGENCY_RESTART_H */
diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
-index d3d7469..677ef72 100644
+index 1c7eefe..d0e4702 100644
--- a/arch/x86/include/asm/floppy.h
+++ b/arch/x86/include/asm/floppy.h
@@ -229,18 +229,18 @@ static struct fd_routine_l {
@@ -16758,7 +16963,7 @@ index d3d7469..677ef72 100644
};
diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
-index cea1c76..6c0d79b 100644
+index e97622f..d0ba77a 100644
--- a/arch/x86/include/asm/fpu-internal.h
+++ b/arch/x86/include/asm/fpu-internal.h
@@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
@@ -16856,10 +17061,10 @@ index b4c1f54..e290c08 100644
pagefault_enable();
diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
-index 67d69b8..50e4b77 100644
+index 4615906..788c817 100644
--- a/arch/x86/include/asm/hw_irq.h
+++ b/arch/x86/include/asm/hw_irq.h
-@@ -165,8 +165,8 @@ extern void setup_ioapic_dest(void);
+@@ -164,8 +164,8 @@ extern void setup_ioapic_dest(void);
extern void enable_IO_APIC(void);
/* Statistics */
@@ -16871,7 +17076,7 @@ index 67d69b8..50e4b77 100644
/* EISA */
extern void eisa_set_level_irq(unsigned int irq);
diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
-index a203659..9889f1c 100644
+index ccffa53..3c90c87 100644
--- a/arch/x86/include/asm/i8259.h
+++ b/arch/x86/include/asm/i8259.h
@@ -62,7 +62,7 @@ struct legacy_pic {
@@ -16884,10 +17089,10 @@ index a203659..9889f1c 100644
extern struct legacy_pic *legacy_pic;
extern struct legacy_pic null_legacy_pic;
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
-index 91d9c69..dfae7d0 100644
+index b8237d8..3e8864e 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
-@@ -51,12 +51,12 @@ static inline void name(type val, volatile void __iomem *addr) \
+@@ -52,12 +52,12 @@ static inline void name(type val, volatile void __iomem *addr) \
"m" (*(volatile type __force *)addr) barrier); }
build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
@@ -16904,7 +17109,16 @@ index 91d9c69..dfae7d0 100644
build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
build_mmio_write(writew, "w", unsigned short, "r", :"memory")
-@@ -184,7 +184,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
+@@ -109,7 +109,7 @@ build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
+ * this function
+ */
+
+-static inline phys_addr_t virt_to_phys(volatile void *address)
++static inline phys_addr_t __intentional_overflow(-1) virt_to_phys(volatile void *address)
+ {
+ return __pa(address);
+ }
+@@ -185,7 +185,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
return ioremap_nocache(offset, size);
}
@@ -16913,7 +17127,7 @@ index 91d9c69..dfae7d0 100644
extern void set_iounmap_nonlazy(void);
-@@ -194,6 +194,17 @@ extern void set_iounmap_nonlazy(void);
+@@ -195,6 +195,17 @@ extern void set_iounmap_nonlazy(void);
#include <linux/vmalloc.h>
@@ -16948,10 +17162,10 @@ index 0a8b519..80e7d5b 100644
#define INTERRUPT_RETURN iret
#define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
-index 9454c16..e4100e3 100644
+index 4421b5d..8543006 100644
--- a/arch/x86/include/asm/kprobes.h
+++ b/arch/x86/include/asm/kprobes.h
-@@ -38,13 +38,8 @@ typedef u8 kprobe_opcode_t;
+@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
#define RELATIVEJUMP_SIZE 5
#define RELATIVECALL_OPCODE 0xe8
#define RELATIVE_ADDR_SIZE 4
@@ -16968,13 +17182,13 @@ index 9454c16..e4100e3 100644
#define flush_insn_slot(p) do { } while (0)
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
-index e9dc029..468a823 100644
+index 6ed0c30..74fb6c3 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
-@@ -55,6 +55,7 @@
- #define CR3_PCID_ENABLED_RESERVED_BITS 0xFFFFFF0000000000ULL
- #define CR3_L_MODE_RESERVED_BITS (CR3_NONPAE_RESERVED_BITS | \
- 0xFFFFFF0000000000ULL)
+@@ -51,6 +51,7 @@
+ | X86_CR0_NW | X86_CR0_CD | X86_CR0_PG))
+
+ #define CR3_L_MODE_RESERVED_BITS 0xFFFFFF0000000000ULL
+#define CR3_PCID_INVD (1UL << 63)
#define CR4_RESERVED_BITS \
(~(unsigned long)(X86_CR4_VME | X86_CR4_PVI | X86_CR4_TSD | X86_CR4_DE\
@@ -17183,7 +17397,7 @@ index 0000000..2bfd3ba
+
+#endif /* X86_MMAN_H */
diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
-index 5f55e69..e20bfb1 100644
+index 876e74e..e20bfb1 100644
--- a/arch/x86/include/asm/mmu.h
+++ b/arch/x86/include/asm/mmu.h
@@ -9,7 +9,7 @@
@@ -17199,7 +17413,7 @@ index 5f55e69..e20bfb1 100644
#endif
struct mutex lock;
-- void *vdso;
+- void __user *vdso;
+ unsigned long vdso;
+
+#ifdef CONFIG_X86_32
@@ -17217,10 +17431,10 @@ index 5f55e69..e20bfb1 100644
#ifdef CONFIG_SMP
diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
-index be12c53..4d24039 100644
+index 166af2a..648c200 100644
--- a/arch/x86/include/asm/mmu_context.h
+++ b/arch/x86/include/asm/mmu_context.h
-@@ -24,6 +24,20 @@ void destroy_context(struct mm_struct *mm);
+@@ -28,6 +28,20 @@ void destroy_context(struct mm_struct *mm);
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
{
@@ -17241,7 +17455,7 @@ index be12c53..4d24039 100644
#ifdef CONFIG_SMP
if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
-@@ -34,16 +48,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
+@@ -38,16 +52,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
struct task_struct *tsk)
{
unsigned cpu = smp_processor_id();
@@ -17298,19 +17512,19 @@ index be12c53..4d24039 100644
+#else
load_cr3(next->pgd);
+#endif
+ trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
/* Stop flush ipis for the previous mm */
- cpumask_clear_cpu(cpu, mm_cpumask(prev));
-@@ -51,9 +108,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
+@@ -56,9 +113,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
/* Load the LDT, if the LDT is different: */
if (unlikely(prev->context.ldt != next->context.ldt))
load_LDT_nolock(&next->context);
+
+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
+ if (!(__supported_pte_mask & _PAGE_NX)) {
-+ smp_mb__before_clear_bit();
++ smp_mb__before_atomic();
+ cpu_clear(cpu, prev->context.cpu_user_cs_mask);
-+ smp_mb__after_clear_bit();
++ smp_mb__after_atomic();
+ cpu_set(cpu, next->context.cpu_user_cs_mask);
+ }
+#endif
@@ -17370,13 +17584,14 @@ index be12c53..4d24039 100644
this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
-@@ -70,11 +185,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
+@@ -75,12 +190,29 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
* tlb flush IPI delivery. We must reload CR3
* to make sure to use no freed page tables.
*/
+
+#ifndef CONFIG_PAX_PER_CPU_PGD
load_cr3(next->pgd);
+ trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
+#endif
+
load_LDT_nolock(&next->context);
@@ -17436,24 +17651,42 @@ index e3b7819..b257c64 100644
+
#endif /* _ASM_X86_MODULE_H */
diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
-index 86f9301..b365cda 100644
+index 5f2fc44..106caa6 100644
--- a/arch/x86/include/asm/nmi.h
+++ b/arch/x86/include/asm/nmi.h
-@@ -40,11 +40,11 @@ struct nmiaction {
+@@ -36,26 +36,35 @@ enum {
+
+ typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
+
++struct nmiaction;
++
++struct nmiwork {
++ const struct nmiaction *action;
++ u64 max_duration;
++ struct irq_work irq_work;
++};
++
+ struct nmiaction {
+ struct list_head list;
nmi_handler_t handler;
+- u64 max_duration;
+- struct irq_work irq_work;
unsigned long flags;
const char *name;
-};
++ struct nmiwork *work;
+} __do_const;
#define register_nmi_handler(t, fn, fg, n, init...) \
({ \
- static struct nmiaction init fn##_na = { \
++ static struct nmiwork fn##_nw; \
+ static const struct nmiaction init fn##_na = { \
.handler = (fn), \
.name = (n), \
.flags = (fg), \
-@@ -52,7 +52,7 @@ struct nmiaction {
++ .work = &fn##_nw, \
+ }; \
__register_nmi_handler((t), &fn##_na); \
})
@@ -17463,7 +17696,7 @@ index 86f9301..b365cda 100644
void unregister_nmi_handler(unsigned int, const char *);
diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
-index 775873d..04cd306 100644
+index 802dde3..9183e68 100644
--- a/arch/x86/include/asm/page.h
+++ b/arch/x86/include/asm/page.h
@@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
@@ -17498,7 +17731,7 @@ index 775873d..04cd306 100644
#include <asm-generic/memory_model.h>
diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
-index 0f1ddee..e2fc3d1 100644
+index f408caf..4a0455e 100644
--- a/arch/x86/include/asm/page_64.h
+++ b/arch/x86/include/asm/page_64.h
@@ -7,9 +7,9 @@
@@ -17513,19 +17746,6 @@ index 0f1ddee..e2fc3d1 100644
{
unsigned long y = x - __START_KERNEL_map;
-diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h
-index d54d1ee..75450b2 100644
---- a/arch/x86/include/asm/page_64_types.h
-+++ b/arch/x86/include/asm/page_64_types.h
-@@ -1,7 +1,7 @@
- #ifndef _ASM_X86_PAGE_64_DEFS_H
- #define _ASM_X86_PAGE_64_DEFS_H
-
--#define THREAD_SIZE_ORDER 1
-+#define THREAD_SIZE_ORDER 2
- #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)
- #define CURRENT_MASK (~(THREAD_SIZE - 1))
-
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index cd6e1610..70f4418 100644
--- a/arch/x86/include/asm/paravirt.h
@@ -17771,7 +17991,7 @@ index c4412e9..90e88c5 100644
{
return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
-index 0d193e2..bf59aeb 100644
+index 206a87f..1623b06 100644
--- a/arch/x86/include/asm/pgtable-2level.h
+++ b/arch/x86/include/asm/pgtable-2level.h
@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
@@ -17806,10 +18026,10 @@ index 81bb91b..9392125 100644
/*
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
-index bbc8b12..a614983 100644
+index aa97a07..5c53c32 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
-@@ -45,6 +45,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
+@@ -46,6 +46,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
#ifndef __PAGETABLE_PUD_FOLDED
#define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
@@ -17817,7 +18037,7 @@ index bbc8b12..a614983 100644
#define pgd_clear(pgd) native_pgd_clear(pgd)
#endif
-@@ -82,12 +83,53 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
+@@ -83,12 +84,53 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
#define arch_end_context_switch(prev) do {} while(0)
@@ -17871,7 +18091,7 @@ index bbc8b12..a614983 100644
static inline int pte_dirty(pte_t pte)
{
return pte_flags(pte) & _PAGE_DIRTY;
-@@ -148,6 +190,11 @@ static inline unsigned long pud_pfn(pud_t pud)
+@@ -155,6 +197,11 @@ static inline unsigned long pud_pfn(pud_t pud)
return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
}
@@ -17883,7 +18103,7 @@ index bbc8b12..a614983 100644
#define pte_page(pte) pfn_to_page(pte_pfn(pte))
static inline int pmd_large(pmd_t pte)
-@@ -201,9 +248,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
+@@ -208,9 +255,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
return pte_clear_flags(pte, _PAGE_RW);
}
@@ -17914,7 +18134,7 @@ index bbc8b12..a614983 100644
}
static inline pte_t pte_mkdirty(pte_t pte)
-@@ -430,6 +497,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
+@@ -440,6 +507,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
#endif
#ifndef __ASSEMBLY__
@@ -17931,7 +18151,7 @@ index bbc8b12..a614983 100644
#include <linux/mm_types.h>
#include <linux/mmdebug.h>
#include <linux/log2.h>
-@@ -570,7 +647,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
+@@ -586,7 +663,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
* Currently stuck as a macro due to indirect forward reference to
* linux/mmzone.h's __section_mem_map_addr() definition:
*/
@@ -17940,7 +18160,7 @@ index bbc8b12..a614983 100644
/* Find an entry in the second-level page table.. */
static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
-@@ -610,7 +687,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
+@@ -626,7 +703,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
* Currently stuck as a macro due to indirect forward reference to
* linux/mmzone.h's __section_mem_map_addr() definition:
*/
@@ -17949,7 +18169,7 @@ index bbc8b12..a614983 100644
/* to find an entry in a page-table-directory. */
static inline unsigned long pud_index(unsigned long address)
-@@ -625,7 +702,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
+@@ -641,7 +718,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
static inline int pgd_bad(pgd_t pgd)
{
@@ -17958,7 +18178,7 @@ index bbc8b12..a614983 100644
}
static inline int pgd_none(pgd_t pgd)
-@@ -648,7 +725,12 @@ static inline int pgd_none(pgd_t pgd)
+@@ -664,7 +741,12 @@ static inline int pgd_none(pgd_t pgd)
* pgd_offset() returns a (pgd_t *)
* pgd_index() is used get the offset into the pgd page's array of pgd_t's;
*/
@@ -17972,7 +18192,7 @@ index bbc8b12..a614983 100644
/*
* a shortcut which implies the use of the kernel's pgd, instead
* of a process's
-@@ -659,6 +741,23 @@ static inline int pgd_none(pgd_t pgd)
+@@ -675,6 +757,23 @@ static inline int pgd_none(pgd_t pgd)
#define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
#define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
@@ -17996,7 +18216,7 @@ index bbc8b12..a614983 100644
#ifndef __ASSEMBLY__
extern int direct_gbpages;
-@@ -825,11 +924,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
+@@ -841,11 +940,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
* dst and src can be on the same page, but the range must not overlap,
* and must not cross a page boundary.
*/
@@ -18024,7 +18244,7 @@ index bbc8b12..a614983 100644
static inline int page_level_shift(enum pg_level level)
{
diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
-index 9ee3221..b979c6b 100644
+index b6c0b40..3535d47 100644
--- a/arch/x86/include/asm/pgtable_32.h
+++ b/arch/x86/include/asm/pgtable_32.h
@@ -25,9 +25,6 @@
@@ -18037,7 +18257,7 @@ index 9ee3221..b979c6b 100644
static inline void pgtable_cache_init(void) { }
static inline void check_pgt_cache(void) { }
void paging_init(void);
-@@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
+@@ -45,6 +42,12 @@ void paging_init(void);
# include <asm/pgtable-2level.h>
#endif
@@ -18050,7 +18270,7 @@ index 9ee3221..b979c6b 100644
#if defined(CONFIG_HIGHPTE)
#define pte_offset_map(dir, address) \
((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
-@@ -62,12 +65,17 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
+@@ -59,12 +62,17 @@ void paging_init(void);
/* Clear a kernel PTE and flush it from the TLB */
#define kpte_clear_flush(ptep, vaddr) \
do { \
@@ -18102,7 +18322,7 @@ index ed5903b..c7fe163 100644
#define MODULES_END VMALLOC_END
#define MODULES_LEN (MODULES_VADDR - MODULES_END)
diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
-index d869931..aeba032 100644
+index 4572b2f..4430113 100644
--- a/arch/x86/include/asm/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.h
@@ -16,11 +16,16 @@
@@ -18178,35 +18398,10 @@ index 7166e25..baaa6fe 100644
#endif /* _ASM_X86_PGTABLE_64_DEFS_H */
diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
-index 94e40f1..ebd03e4 100644
+index 0778964..0e94758 100644
--- a/arch/x86/include/asm/pgtable_types.h
+++ b/arch/x86/include/asm/pgtable_types.h
-@@ -16,13 +16,12 @@
- #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
- #define _PAGE_BIT_PAT 7 /* on 4KB pages */
- #define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
--#define _PAGE_BIT_UNUSED1 9 /* available for programmer */
-+#define _PAGE_BIT_SPECIAL 9 /* special mappings, no associated struct page */
- #define _PAGE_BIT_IOMAP 10 /* flag used to indicate IO mapping */
- #define _PAGE_BIT_HIDDEN 11 /* hidden by kmemcheck */
- #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */
--#define _PAGE_BIT_SPECIAL _PAGE_BIT_UNUSED1
--#define _PAGE_BIT_CPA_TEST _PAGE_BIT_UNUSED1
--#define _PAGE_BIT_SPLITTING _PAGE_BIT_UNUSED1 /* only valid on a PSE pmd */
-+#define _PAGE_BIT_CPA_TEST _PAGE_BIT_SPECIAL
-+#define _PAGE_BIT_SPLITTING _PAGE_BIT_SPECIAL /* only valid on a PSE pmd */
- #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */
-
- /* If _PAGE_BIT_PRESENT is clear, we use these: */
-@@ -40,7 +39,6 @@
- #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY)
- #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE)
- #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL)
--#define _PAGE_UNUSED1 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1)
- #define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)
- #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT)
- #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)
-@@ -87,8 +85,10 @@
+@@ -110,8 +110,10 @@
#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
@@ -18218,7 +18413,7 @@ index 94e40f1..ebd03e4 100644
#endif
#define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
-@@ -147,6 +147,9 @@
+@@ -150,6 +152,9 @@
#define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
_PAGE_ACCESSED)
@@ -18228,7 +18423,7 @@ index 94e40f1..ebd03e4 100644
#define __PAGE_KERNEL_EXEC \
(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
#define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
-@@ -157,7 +160,7 @@
+@@ -160,7 +165,7 @@
#define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
#define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
#define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
@@ -18237,18 +18432,16 @@ index 94e40f1..ebd03e4 100644
#define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
#define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
#define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
-@@ -219,8 +222,8 @@
- * bits are combined, this will alow user to access the high address mapped
- * VDSO in the presence of CONFIG_COMPAT_VDSO
- */
+@@ -217,7 +222,7 @@
+ #ifdef CONFIG_X86_64
+ #define __PAGE_KERNEL_IDENT_LARGE_EXEC __PAGE_KERNEL_LARGE_EXEC
+ #else
-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
--#define PDE_IDENT_ATTR 0x067 /* PRESENT+RW+USER+DIRTY+ACCESSED */
+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
-+#define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
+ #define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
#define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
#endif
-
-@@ -258,7 +261,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
+@@ -256,7 +261,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
{
return native_pgd_val(pgd) & PTE_FLAGS_MASK;
}
@@ -18266,7 +18459,7 @@ index 94e40f1..ebd03e4 100644
#if PAGETABLE_LEVELS > 3
typedef struct { pudval_t pud; } pud_t;
-@@ -272,8 +285,6 @@ static inline pudval_t native_pud_val(pud_t pud)
+@@ -270,8 +285,6 @@ static inline pudval_t native_pud_val(pud_t pud)
return pud.pud;
}
#else
@@ -18275,7 +18468,7 @@ index 94e40f1..ebd03e4 100644
static inline pudval_t native_pud_val(pud_t pud)
{
return native_pgd_val(pud.pgd);
-@@ -293,8 +304,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
+@@ -291,8 +304,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
return pmd.pmd;
}
#else
@@ -18284,7 +18477,7 @@ index 94e40f1..ebd03e4 100644
static inline pmdval_t native_pmd_val(pmd_t pmd)
{
return native_pgd_val(pmd.pud.pgd);
-@@ -334,7 +343,6 @@ typedef struct page *pgtable_t;
+@@ -346,7 +357,6 @@ typedef struct page *pgtable_t;
extern pteval_t __supported_pte_mask;
extern void set_nx(void);
@@ -18293,10 +18486,10 @@ index 94e40f1..ebd03e4 100644
#define pgprot_writecombine pgprot_writecombine
extern pgprot_t pgprot_writecombine(pgprot_t prot);
diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
-index b39e194..9d44fd1 100644
+index 4008734..48f0d81 100644
--- a/arch/x86/include/asm/preempt.h
+++ b/arch/x86/include/asm/preempt.h
-@@ -99,7 +99,7 @@ static __always_inline void __preempt_count_sub(int val)
+@@ -87,7 +87,7 @@ static __always_inline void __preempt_count_sub(int val)
*/
static __always_inline bool __preempt_count_dec_and_test(void)
{
@@ -18306,10 +18499,10 @@ index b39e194..9d44fd1 100644
/*
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
-index fdedd38..129b180 100644
+index eb71ec7..f06532a 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
-@@ -128,7 +128,7 @@ struct cpuinfo_x86 {
+@@ -127,7 +127,7 @@ struct cpuinfo_x86 {
/* Index into per_cpu list: */
u16 cpu_index;
u32 microcode;
@@ -18318,7 +18511,7 @@ index fdedd38..129b180 100644
#define X86_VENDOR_INTEL 0
#define X86_VENDOR_CYRIX 1
-@@ -199,9 +199,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
+@@ -198,9 +198,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
: "memory");
}
@@ -18341,7 +18534,7 @@ index fdedd38..129b180 100644
}
#ifdef CONFIG_X86_32
-@@ -283,7 +295,7 @@ struct tss_struct {
+@@ -282,7 +294,7 @@ struct tss_struct {
} ____cacheline_aligned;
@@ -18350,7 +18543,7 @@ index fdedd38..129b180 100644
/*
* Save the original ist values for checking stack pointers during debugging
-@@ -470,6 +482,7 @@ struct thread_struct {
+@@ -478,6 +490,7 @@ struct thread_struct {
unsigned short ds;
unsigned short fsindex;
unsigned short gsindex;
@@ -18358,7 +18551,7 @@ index fdedd38..129b180 100644
#endif
#ifdef CONFIG_X86_32
unsigned long ip;
-@@ -579,29 +592,8 @@ static inline void load_sp0(struct tss_struct *tss,
+@@ -587,29 +600,8 @@ static inline void load_sp0(struct tss_struct *tss,
extern unsigned long mmu_cr4_features;
extern u32 *trampoline_cr4_features;
@@ -18390,7 +18583,7 @@ index fdedd38..129b180 100644
typedef struct {
unsigned long seg;
-@@ -827,11 +819,18 @@ static inline void spin_lock_prefetch(const void *x)
+@@ -837,11 +829,18 @@ static inline void spin_lock_prefetch(const void *x)
*/
#define TASK_SIZE PAGE_OFFSET
#define TASK_SIZE_MAX TASK_SIZE
@@ -18411,7 +18604,7 @@ index fdedd38..129b180 100644
.vm86_info = NULL, \
.sysenter_cs = __KERNEL_CS, \
.io_bitmap_ptr = NULL, \
-@@ -845,7 +844,7 @@ static inline void spin_lock_prefetch(const void *x)
+@@ -855,7 +854,7 @@ static inline void spin_lock_prefetch(const void *x)
*/
#define INIT_TSS { \
.x86_tss = { \
@@ -18420,7 +18613,7 @@ index fdedd38..129b180 100644
.ss0 = __KERNEL_DS, \
.ss1 = __KERNEL_CS, \
.io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
-@@ -856,11 +855,7 @@ static inline void spin_lock_prefetch(const void *x)
+@@ -866,11 +865,7 @@ static inline void spin_lock_prefetch(const void *x)
extern unsigned long thread_saved_pc(struct task_struct *tsk);
#define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
@@ -18433,7 +18626,7 @@ index fdedd38..129b180 100644
/*
* The below -8 is to reserve 8 bytes on top of the ring0 stack.
-@@ -875,7 +870,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
+@@ -885,7 +880,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
#define task_pt_regs(task) \
({ \
struct pt_regs *__regs__; \
@@ -18442,7 +18635,7 @@ index fdedd38..129b180 100644
__regs__ - 1; \
})
-@@ -885,13 +880,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
+@@ -895,13 +890,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
/*
* User space process size. 47bits minus one guard page.
*/
@@ -18458,7 +18651,7 @@ index fdedd38..129b180 100644
#define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
IA32_PAGE_OFFSET : TASK_SIZE_MAX)
-@@ -902,11 +897,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
+@@ -912,11 +907,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
#define STACK_TOP_MAX TASK_SIZE_MAX
#define INIT_THREAD { \
@@ -18472,7 +18665,7 @@ index fdedd38..129b180 100644
}
/*
-@@ -934,6 +929,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
+@@ -944,6 +939,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
*/
#define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
@@ -18483,7 +18676,7 @@ index fdedd38..129b180 100644
#define KSTK_EIP(task) (task_pt_regs(task)->ip)
/* Get/set a process' ability to use the timestamp counter instruction */
-@@ -960,7 +959,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
+@@ -970,7 +969,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
return 0;
}
@@ -18492,7 +18685,7 @@ index fdedd38..129b180 100644
extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
void default_idle(void);
-@@ -970,6 +969,6 @@ bool xen_set_default_idle(void);
+@@ -980,6 +979,6 @@ bool xen_set_default_idle(void);
#define xen_set_default_idle 0
#endif
@@ -18501,10 +18694,10 @@ index fdedd38..129b180 100644
void df_debug(struct pt_regs *regs, long error_code);
#endif /* _ASM_X86_PROCESSOR_H */
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
-index 6205f0c..b31a4a4 100644
+index 86fc2bb..bd5049a 100644
--- a/arch/x86/include/asm/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
-@@ -84,28 +84,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
+@@ -89,28 +89,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
}
/*
@@ -18540,7 +18733,7 @@ index 6205f0c..b31a4a4 100644
#endif
}
-@@ -121,15 +122,16 @@ static inline int v8086_mode(struct pt_regs *regs)
+@@ -126,15 +127,16 @@ static inline int v8086_mode(struct pt_regs *regs)
#ifdef CONFIG_X86_64
static inline bool user_64bit_mode(struct pt_regs *regs)
{
@@ -18559,7 +18752,7 @@ index 6205f0c..b31a4a4 100644
#endif
}
-@@ -180,9 +182,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
+@@ -185,9 +187,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
* Traps from the kernel do not save sp and ss.
* Use the helper function to retrieve sp.
*/
@@ -18568,12 +18761,27 @@ index 6205f0c..b31a4a4 100644
- return kernel_stack_pointer(regs);
+ if (offset == offsetof(struct pt_regs, sp)) {
+ unsigned long cs = regs->cs & 0xffff;
-+ if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
++ if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
+ return kernel_stack_pointer(regs);
+ }
#endif
return *(unsigned long *)((unsigned long)regs + offset);
}
+diff --git a/arch/x86/include/asm/qrwlock.h b/arch/x86/include/asm/qrwlock.h
+index ae0e241..e80b10b 100644
+--- a/arch/x86/include/asm/qrwlock.h
++++ b/arch/x86/include/asm/qrwlock.h
+@@ -7,8 +7,8 @@
+ #define queue_write_unlock queue_write_unlock
+ static inline void queue_write_unlock(struct qrwlock *lock)
+ {
+- barrier();
+- ACCESS_ONCE(*(u8 *)&lock->cnts) = 0;
++ barrier();
++ ACCESS_ONCE_RW(*(u8 *)&lock->cnts) = 0;
+ }
+ #endif
+
diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
index 9c6b890..5305f53 100644
--- a/arch/x86/include/asm/realmode.h
@@ -19043,7 +19251,7 @@ index 8d3120f..352b440 100644
static __always_inline void clac(void)
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
-index 8cd27e0..7f05ec8 100644
+index 8cd1cc3..827e09e 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -35,7 +35,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
@@ -19064,7 +19272,7 @@ index 8cd27e0..7f05ec8 100644
/* Globals due to paravirt */
extern void set_cpu_sibling_map(int cpu);
-@@ -190,14 +190,8 @@ extern unsigned disabled_cpus;
+@@ -191,14 +191,8 @@ extern unsigned disabled_cpus;
extern int safe_smp_processor_id(void);
#elif defined(CONFIG_X86_64_SMP)
@@ -19081,72 +19289,6 @@ index 8cd27e0..7f05ec8 100644
#define safe_smp_processor_id() smp_processor_id()
#endif
-diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
-index 0f62f54..cb5d0dd 100644
---- a/arch/x86/include/asm/spinlock.h
-+++ b/arch/x86/include/asm/spinlock.h
-@@ -222,6 +222,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock)
- static inline void arch_read_lock(arch_rwlock_t *rw)
- {
- asm volatile(LOCK_PREFIX READ_LOCK_SIZE(dec) " (%0)\n\t"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "jno 0f\n"
-+ LOCK_PREFIX READ_LOCK_SIZE(inc) " (%0)\n"
-+ "int $4\n0:\n"
-+ _ASM_EXTABLE(0b, 0b)
-+#endif
-+
- "jns 1f\n"
- "call __read_lock_failed\n\t"
- "1:\n"
-@@ -231,6 +239,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
- static inline void arch_write_lock(arch_rwlock_t *rw)
- {
- asm volatile(LOCK_PREFIX WRITE_LOCK_SUB(%1) "(%0)\n\t"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "jno 0f\n"
-+ LOCK_PREFIX WRITE_LOCK_ADD(%1) "(%0)\n"
-+ "int $4\n0:\n"
-+ _ASM_EXTABLE(0b, 0b)
-+#endif
-+
- "jz 1f\n"
- "call __write_lock_failed\n\t"
- "1:\n"
-@@ -260,13 +276,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
-
- static inline void arch_read_unlock(arch_rwlock_t *rw)
- {
-- asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0"
-+ asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "jno 0f\n"
-+ LOCK_PREFIX READ_LOCK_SIZE(dec) " %0\n"
-+ "int $4\n0:\n"
-+ _ASM_EXTABLE(0b, 0b)
-+#endif
-+
- :"+m" (rw->lock) : : "memory");
- }
-
- static inline void arch_write_unlock(arch_rwlock_t *rw)
- {
-- asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0"
-+ asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "jno 0f\n"
-+ LOCK_PREFIX WRITE_LOCK_SUB(%1) "%0\n"
-+ "int $4\n0:\n"
-+ _ASM_EXTABLE(0b, 0b)
-+#endif
-+
- : "+m" (rw->write) : "i" (RW_LOCK_BIAS) : "memory");
- }
-
diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
index 6a99859..03cb807 100644
--- a/arch/x86/include/asm/stackprotector.h
@@ -19245,18 +19387,10 @@ index d7f3b3b..3cc39f1 100644
__switch_canary_iparam \
: "memory", "cc" __EXTRA_CLOBBER)
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
-index e870ea9..0f4c275 100644
+index 547e344..6be1175 100644
--- a/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
-@@ -10,6 +10,7 @@
- #include <linux/compiler.h>
- #include <asm/page.h>
- #include <asm/types.h>
-+#include <asm/percpu.h>
-
- /*
- * low level task data that entry.S needs immediate access to
-@@ -23,7 +24,6 @@ struct exec_domain;
+@@ -24,7 +24,6 @@ struct exec_domain;
#include <linux/atomic.h>
struct thread_info {
@@ -19264,16 +19398,10 @@ index e870ea9..0f4c275 100644
struct exec_domain *exec_domain; /* execution domain */
__u32 flags; /* low level flags */
__u32 status; /* thread synchronous flags */
-@@ -32,19 +32,13 @@ struct thread_info {
+@@ -33,13 +32,13 @@ struct thread_info {
mm_segment_t addr_limit;
struct restart_block restart_block;
void __user *sysenter_return;
--#ifdef CONFIG_X86_32
-- unsigned long previous_esp; /* ESP of the previous stack in
-- case of nested (IRQ) stacks
-- */
-- __u8 supervisor_stack[0];
--#endif
+ unsigned long lowest_stack;
unsigned int sig_on_uaccess_error:1;
unsigned int uaccess_err:1; /* uaccess failed */
@@ -19286,7 +19414,7 @@ index e870ea9..0f4c275 100644
.exec_domain = &default_exec_domain, \
.flags = 0, \
.cpu = 0, \
-@@ -55,7 +49,7 @@ struct thread_info {
+@@ -50,7 +49,7 @@ struct thread_info {
}, \
}
@@ -19295,7 +19423,7 @@ index e870ea9..0f4c275 100644
#define init_stack (init_thread_union.stack)
#else /* !__ASSEMBLY__ */
-@@ -95,6 +89,7 @@ struct thread_info {
+@@ -91,6 +90,7 @@ struct thread_info {
#define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
#define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
#define TIF_X32 30 /* 32-bit native x86-64 binary */
@@ -19303,7 +19431,7 @@ index e870ea9..0f4c275 100644
#define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
-@@ -118,17 +113,18 @@ struct thread_info {
+@@ -115,17 +115,18 @@ struct thread_info {
#define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
#define _TIF_ADDR32 (1 << TIF_ADDR32)
#define _TIF_X32 (1 << TIF_X32)
@@ -19324,7 +19452,7 @@ index e870ea9..0f4c275 100644
/* work to do on interrupt/exception return */
#define _TIF_WORK_MASK \
-@@ -139,7 +135,7 @@ struct thread_info {
+@@ -136,7 +137,7 @@ struct thread_info {
/* work to do on any return to user space */
#define _TIF_ALLWORK_MASK \
((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
@@ -19333,93 +19461,46 @@ index e870ea9..0f4c275 100644
/* Only used for 64 bit */
#define _TIF_DO_NOTIFY_MASK \
-@@ -153,6 +149,23 @@ struct thread_info {
- #define _TIF_WORK_CTXSW_PREV (_TIF_WORK_CTXSW|_TIF_USER_RETURN_NOTIFY)
+@@ -151,7 +152,6 @@ struct thread_info {
#define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
-+#ifdef __ASSEMBLY__
-+/* how to get the thread information struct from ASM */
-+#define GET_THREAD_INFO(reg) \
-+ mov PER_CPU_VAR(current_tinfo), reg
-+
-+/* use this one if reg already contains %esp */
-+#define GET_THREAD_INFO_WITH_ESP(reg) GET_THREAD_INFO(reg)
-+#else
-+/* how to get the thread information struct from C */
-+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
-+
-+static __always_inline struct thread_info *current_thread_info(void)
-+{
-+ return this_cpu_read_stable(current_tinfo);
-+}
-+#endif
-+
- #ifdef CONFIG_X86_32
-
- #define STACK_WARN (THREAD_SIZE/8)
-@@ -169,31 +182,10 @@ struct thread_info {
- sp; \
- })
+ #define STACK_WARN (THREAD_SIZE/8)
+-#define KERNEL_STACK_OFFSET (5*(BITS_PER_LONG/8))
--/* how to get the thread information struct from C */
--static inline struct thread_info *current_thread_info(void)
--{
-- return (struct thread_info *)
-- (current_stack_pointer & ~(THREAD_SIZE - 1));
--}
--
--#else /* !__ASSEMBLY__ */
--
--/* how to get the thread information struct from ASM */
--#define GET_THREAD_INFO(reg) \
-- movl $-THREAD_SIZE, reg; \
-- andl %esp, reg
--
--/* use this one if reg already contains %esp */
--#define GET_THREAD_INFO_WITH_ESP(reg) \
-- andl $-THREAD_SIZE, reg
--
- #endif
-
- #else /* X86_32 */
-
--#include <asm/percpu.h>
--#define KERNEL_STACK_OFFSET (5*8)
--
/*
* macros/functions for gaining access to the thread information structure
- * preempt_count needs to be 1 initially, until the scheduler is functional.
-@@ -201,27 +193,8 @@ static inline struct thread_info *current_thread_info(void)
- #ifndef __ASSEMBLY__
+@@ -162,26 +162,18 @@ struct thread_info {
+
DECLARE_PER_CPU(unsigned long, kernel_stack);
--static inline struct thread_info *current_thread_info(void)
--{
++DECLARE_PER_CPU(struct thread_info *, current_tinfo);
++
+ static inline struct thread_info *current_thread_info(void)
+ {
- struct thread_info *ti;
- ti = (void *)(this_cpu_read_stable(kernel_stack) +
- KERNEL_STACK_OFFSET - THREAD_SIZE);
- return ti;
--}
--
--#else /* !__ASSEMBLY__ */
--
--/* how to get the thread information struct from ASM */
--#define GET_THREAD_INFO(reg) \
-- movq PER_CPU_VAR(kernel_stack),reg ; \
-- subq $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg
++ return this_cpu_read_stable(current_tinfo);
+ }
+
+ #else /* !__ASSEMBLY__ */
+
+ /* how to get the thread information struct from ASM */
+ #define GET_THREAD_INFO(reg) \
+- _ASM_MOV PER_CPU_VAR(kernel_stack),reg ; \
+- _ASM_SUB $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg ;
-
-/*
- * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
- * a certain register (to be used in assembler memory operands).
- */
-#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
--
-+/* how to get the current stack pointer from C */
-+register unsigned long current_stack_pointer asm("rsp") __used;
++ _ASM_MOV PER_CPU_VAR(current_tinfo),reg ;
+
#endif
- #endif /* !X86_32 */
-@@ -280,5 +253,12 @@ static inline bool is_ia32_task(void)
+@@ -237,5 +229,12 @@ static inline bool is_ia32_task(void)
extern void arch_task_cache_init(void);
extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
extern void arch_release_task_struct(struct task_struct *tsk);
@@ -20447,10 +20528,10 @@ index e45e4da..44e8572 100644
extern struct x86_init_ops x86_init;
extern struct x86_cpuinit_ops x86_cpuinit;
diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
-index 3e276eb..2eb3c30 100644
+index f58ef6c..a2abc78 100644
--- a/arch/x86/include/asm/xen/page.h
+++ b/arch/x86/include/asm/xen/page.h
-@@ -56,7 +56,7 @@ extern int m2p_remove_override(struct page *page,
+@@ -63,7 +63,7 @@ extern int m2p_remove_override(struct page *page,
extern struct page *m2p_find_override(unsigned long mfn);
extern unsigned long m2p_find_override_pfn(unsigned long mfn, unsigned long pfn);
@@ -20460,33 +20541,31 @@ index 3e276eb..2eb3c30 100644
unsigned long mfn;
diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
-index 6c1d741..39e6ecf 100644
+index 7e7a79a..0824666 100644
--- a/arch/x86/include/asm/xsave.h
+++ b/arch/x86/include/asm/xsave.h
-@@ -80,8 +80,11 @@ static inline int xsave_user(struct xsave_struct __user *buf)
+@@ -228,12 +228,16 @@ static inline int xsave_user(struct xsave_struct __user *buf)
if (unlikely(err))
return -EFAULT;
+ pax_open_userland();
__asm__ __volatile__(ASM_STAC "\n"
-- "1: .byte " REX_PREFIX "0x0f,0xae,0x27\n"
+- "1:"XSAVE"\n"
+ "1:"
+ __copyuser_seg
-+ ".byte " REX_PREFIX "0x0f,0xae,0x27\n"
++ XSAVE"\n"
"2: " ASM_CLAC "\n"
- ".section .fixup,\"ax\"\n"
- "3: movl $-1,%[err]\n"
-@@ -91,18 +94,22 @@ static inline int xsave_user(struct xsave_struct __user *buf)
- : [err] "=r" (err)
+ xstate_fault
: "D" (buf), "a" (-1), "d" (-1), "0" (0)
: "memory");
+ pax_close_userland();
return err;
}
+@@ -243,16 +247,20 @@ static inline int xsave_user(struct xsave_struct __user *buf)
static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
{
- int err;
+ int err = 0;
- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
u32 lmask = mask;
@@ -20494,15 +20573,12 @@ index 6c1d741..39e6ecf 100644
+ pax_open_userland();
__asm__ __volatile__(ASM_STAC "\n"
-- "1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
+- "1:"XRSTOR"\n"
+ "1:"
+ __copyuser_seg
-+ ".byte " REX_PREFIX "0x0f,0xae,0x2f\n"
++ XRSTOR"\n"
"2: " ASM_CLAC "\n"
- ".section .fixup,\"ax\"\n"
- "3: movl $-1,%[err]\n"
-@@ -112,6 +119,7 @@ static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
- : [err] "=r" (err)
+ xstate_fault
: "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
: "memory"); /* memory required? */
+ pax_close_userland();
@@ -20510,10 +20586,10 @@ index 6c1d741..39e6ecf 100644
}
diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
-index bbae024..e1528f9 100644
+index d993e33..8db1b18 100644
--- a/arch/x86/include/uapi/asm/e820.h
+++ b/arch/x86/include/uapi/asm/e820.h
-@@ -63,7 +63,7 @@ struct e820map {
+@@ -58,7 +58,7 @@ struct e820map {
#define ISA_START_ADDRESS 0xa0000
#define ISA_END_ADDRESS 0x100000
@@ -20535,7 +20611,7 @@ index 7b0a55a..ad115bf 100644
/* top of stack page */
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
-index 56bac86..9d8df82 100644
+index 8f1e774..9b4c381 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -24,7 +24,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
@@ -20545,13 +20621,13 @@ index 56bac86..9d8df82 100644
-obj-$(CONFIG_X86_32) += i386_ksyms_32.o
+obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
- obj-y += syscall_$(BITS).o
- obj-$(CONFIG_X86_64) += vsyscall_64.o
+ obj-$(CONFIG_X86_64) += mcount_64.o
+ obj-y += syscall_$(BITS).o vsyscall_gtod.o
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
-index 1dac942..19c8b0c 100644
+index a142e77..6222cdd 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
-@@ -1312,7 +1312,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
+@@ -1276,7 +1276,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
* If your system is blacklisted here, but you find that acpi=force
* works for you, please contact linux-acpi@vger.kernel.org
*/
@@ -20560,7 +20636,7 @@ index 1dac942..19c8b0c 100644
/*
* Boxes that need ACPI disabled
*/
-@@ -1387,7 +1387,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
+@@ -1351,7 +1351,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
};
/* second table for DMI checks that should run after early-quirks */
@@ -20570,7 +20646,7 @@ index 1dac942..19c8b0c 100644
* HP laptops which use a DSDT reporting as HP/SB400/10000,
* which includes some code which overrides all temperature
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
-index 3a2ae4c..9db31d6 100644
+index 3136820..e2c6577 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
@@ -20607,10 +20683,10 @@ index 665c6b7..eae4d56 100644
bogus_magic:
jmp bogus_magic
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
-index df94598..f3b29bf 100644
+index 703130f..27a155d 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
-@@ -269,6 +269,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
+@@ -268,6 +268,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
*/
for (a = start; a < end; a++) {
instr = (u8 *)&a->instr_offset + a->instr_offset;
@@ -20624,7 +20700,19 @@ index df94598..f3b29bf 100644
replacement = (u8 *)&a->repl_offset + a->repl_offset;
BUG_ON(a->replacementlen > a->instrlen);
BUG_ON(a->instrlen > sizeof(insnbuf));
-@@ -300,10 +307,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
+@@ -284,6 +291,11 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
+ add_nops(insnbuf + a->replacementlen,
+ a->instrlen - a->replacementlen);
+
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
++ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
++ instr = ktva_ktla(instr);
++#endif
++
+ text_poke_early(instr, insnbuf, a->instrlen);
+ }
+ }
+@@ -299,10 +311,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
for (poff = start; poff < end; poff++) {
u8 *ptr = (u8 *)poff + *poff;
@@ -20642,7 +20730,7 @@ index df94598..f3b29bf 100644
text_poke(ptr, ((unsigned char []){0xf0}), 1);
}
mutex_unlock(&text_mutex);
-@@ -318,10 +331,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
+@@ -317,10 +335,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
for (poff = start; poff < end; poff++) {
u8 *ptr = (u8 *)poff + *poff;
@@ -20660,7 +20748,7 @@ index df94598..f3b29bf 100644
text_poke(ptr, ((unsigned char []){0x3E}), 1);
}
mutex_unlock(&text_mutex);
-@@ -458,7 +477,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
+@@ -457,7 +481,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
BUG_ON(p->len > MAX_PATCH_LEN);
/* prep the buffer with the original instructions */
@@ -20669,7 +20757,7 @@ index df94598..f3b29bf 100644
used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
(unsigned long)p->instr, p->len);
-@@ -505,7 +524,7 @@ void __init alternative_instructions(void)
+@@ -504,7 +528,7 @@ void __init alternative_instructions(void)
if (!uniproc_patched || num_possible_cpus() == 1)
free_init_pages("SMP alternatives",
(unsigned long)__smp_locks,
@@ -20678,7 +20766,7 @@ index df94598..f3b29bf 100644
#endif
apply_paravirt(__parainstructions, __parainstructions_end);
-@@ -525,13 +544,17 @@ void __init alternative_instructions(void)
+@@ -524,13 +548,17 @@ void __init alternative_instructions(void)
* instructions. And on the local CPU you need to be protected again NMI or MCE
* handlers seeing an inconsistent instruction while you patch.
*/
@@ -20698,9 +20786,9 @@ index df94598..f3b29bf 100644
local_irq_restore(flags);
/* Could also do a CLFLUSH here to speed up CPU recovery; but
that causes hangs on some VIA CPUs. */
-@@ -553,36 +576,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
+@@ -552,36 +580,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
*/
- void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
+ void *text_poke(void *addr, const void *opcode, size_t len)
{
- unsigned long flags;
- char *vaddr;
@@ -20743,7 +20831,7 @@ index df94598..f3b29bf 100644
return addr;
}
-@@ -602,7 +611,7 @@ int poke_int3_handler(struct pt_regs *regs)
+@@ -601,7 +615,7 @@ int poke_int3_handler(struct pt_regs *regs)
if (likely(!bp_patching_in_progress))
return 0;
@@ -20752,7 +20840,7 @@ index df94598..f3b29bf 100644
return 0;
/* set up the specified breakpoint handler */
-@@ -636,7 +645,7 @@ int poke_int3_handler(struct pt_regs *regs)
+@@ -635,7 +649,7 @@ int poke_int3_handler(struct pt_regs *regs)
*/
void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
{
@@ -20762,10 +20850,10 @@ index df94598..f3b29bf 100644
bp_int3_handler = handler;
bp_int3_addr = (u8 *)addr + sizeof(int3);
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
-index 523f147..7b996e0 100644
+index ba6cc04..06fd971 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
-@@ -198,7 +198,7 @@ int first_system_vector = 0xfe;
+@@ -201,7 +201,7 @@ int first_system_vector = 0xfe;
/*
* Debug level, exported for io_apic.c
*/
@@ -20774,8 +20862,8 @@ index 523f147..7b996e0 100644
int pic_mode;
-@@ -1992,7 +1992,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
- apic_write(APIC_ESR, 0);
+@@ -1989,7 +1989,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
+ apic_write(APIC_ESR, 0);
v = apic_read(APIC_ESR);
ack_APIC_irq();
- atomic_inc(&irq_err_count);
@@ -20784,7 +20872,7 @@ index 523f147..7b996e0 100644
apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
smp_processor_id(), v);
diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
-index 2c621a6..fa2b1ae 100644
+index de918c4..32eed23 100644
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -154,7 +154,7 @@ static int flat_probe(void)
@@ -20796,7 +20884,7 @@ index 2c621a6..fa2b1ae 100644
.name = "flat",
.probe = flat_probe,
.acpi_madt_oem_check = flat_acpi_madt_oem_check,
-@@ -268,7 +268,7 @@ static int physflat_probe(void)
+@@ -260,7 +260,7 @@ static int physflat_probe(void)
return 0;
}
@@ -20806,10 +20894,10 @@ index 2c621a6..fa2b1ae 100644
.name = "physical flat",
.probe = physflat_probe,
diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
-index 191ce75..2db6d63 100644
+index b205cdb..d8503ff 100644
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
-@@ -118,7 +118,7 @@ static void noop_apic_write(u32 reg, u32 v)
+@@ -108,7 +108,7 @@ static void noop_apic_write(u32 reg, u32 v)
WARN_ON_ONCE(cpu_has_apic && !disable_apic);
}
@@ -20819,10 +20907,10 @@ index 191ce75..2db6d63 100644
.probe = noop_probe,
.acpi_madt_oem_check = NULL,
diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
-index d50e364..543bee3 100644
+index c4a8d63..fe893ac 100644
--- a/arch/x86/kernel/apic/bigsmp_32.c
+++ b/arch/x86/kernel/apic/bigsmp_32.c
-@@ -152,7 +152,7 @@ static int probe_bigsmp(void)
+@@ -147,7 +147,7 @@ static int probe_bigsmp(void)
return dmi_bigsmp;
}
@@ -20831,34 +20919,11 @@ index d50e364..543bee3 100644
.name = "bigsmp",
.probe = probe_bigsmp,
-diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
-index c552247..587a316 100644
---- a/arch/x86/kernel/apic/es7000_32.c
-+++ b/arch/x86/kernel/apic/es7000_32.c
-@@ -608,8 +608,7 @@ static int es7000_mps_oem_check_cluster(struct mpc_table *mpc, char *oem,
- return ret && es7000_apic_is_cluster();
- }
-
--/* We've been warned by a false positive warning.Use __refdata to keep calm. */
--static struct apic __refdata apic_es7000_cluster = {
-+static struct apic apic_es7000_cluster __read_only = {
-
- .name = "es7000",
- .probe = probe_es7000,
-@@ -675,7 +674,7 @@ static struct apic __refdata apic_es7000_cluster = {
- .x86_32_early_logical_apicid = es7000_early_logical_apicid,
- };
-
--static struct apic __refdata apic_es7000 = {
-+static struct apic apic_es7000 __read_only = {
-
- .name = "es7000",
- .probe = probe_es7000,
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
-index 6ad4658..38a7b5c 100644
+index 1183d54..6158e47 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
-@@ -1057,7 +1057,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
+@@ -1230,7 +1230,7 @@ out:
}
EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
@@ -20867,7 +20932,7 @@ index 6ad4658..38a7b5c 100644
{
/* Used to the online set of cpus does not change
* during assign_irq_vector.
-@@ -1065,7 +1065,7 @@ void lock_vector_lock(void)
+@@ -1238,7 +1238,7 @@ void lock_vector_lock(void)
raw_spin_lock(&vector_lock);
}
@@ -20876,7 +20941,7 @@ index 6ad4658..38a7b5c 100644
{
raw_spin_unlock(&vector_lock);
}
-@@ -2364,7 +2364,7 @@ static void ack_apic_edge(struct irq_data *data)
+@@ -2465,7 +2465,7 @@ static void ack_apic_edge(struct irq_data *data)
ack_APIC_irq();
}
@@ -20885,7 +20950,7 @@ index 6ad4658..38a7b5c 100644
#ifdef CONFIG_GENERIC_PENDING_IRQ
static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
-@@ -2505,7 +2505,7 @@ static void ack_apic_level(struct irq_data *data)
+@@ -2606,7 +2606,7 @@ static void ack_apic_level(struct irq_data *data)
* at the cpu.
*/
if (!(v & (1 << (i & 0x1f)))) {
@@ -20894,22 +20959,8 @@ index 6ad4658..38a7b5c 100644
eoi_ioapic_irq(irq, cfg);
}
-diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
-index 1e42e8f..daacf44 100644
---- a/arch/x86/kernel/apic/numaq_32.c
-+++ b/arch/x86/kernel/apic/numaq_32.c
-@@ -455,8 +455,7 @@ static void numaq_setup_portio_remap(void)
- (u_long) xquad_portio, (u_long) num_quads*XQUAD_PORTIO_QUAD);
- }
-
--/* Use __refdata to keep false positive warning calm. */
--static struct apic __refdata apic_numaq = {
-+static struct apic apic_numaq __read_only = {
-
- .name = "NUMAQ",
- .probe = probe_numaq,
diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
-index eb35ef9..f184a21 100644
+index bda4886..f9c7195 100644
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -72,7 +72,7 @@ static int probe_default(void)
@@ -20921,21 +20972,8 @@ index eb35ef9..f184a21 100644
.name = "default",
.probe = probe_default,
-diff --git a/arch/x86/kernel/apic/summit_32.c b/arch/x86/kernel/apic/summit_32.c
-index 00146f9..5e299b8 100644
---- a/arch/x86/kernel/apic/summit_32.c
-+++ b/arch/x86/kernel/apic/summit_32.c
-@@ -485,7 +485,7 @@ void setup_summit(void)
- }
- #endif
-
--static struct apic apic_summit = {
-+static struct apic apic_summit __read_only = {
-
- .name = "summit",
- .probe = probe_summit,
diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
-index cac85ee..01fa741 100644
+index e658f21..b695a1a 100644
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
@@ -20957,7 +20995,7 @@ index cac85ee..01fa741 100644
.name = "cluster x2apic",
.probe = x2apic_cluster_probe,
diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
-index de231e3..1d1b2ee 100644
+index 6fae733..5ca17af 100644
--- a/arch/x86/kernel/apic/x2apic_phys.c
+++ b/arch/x86/kernel/apic/x2apic_phys.c
@@ -88,7 +88,7 @@ static int x2apic_phys_probe(void)
@@ -20970,10 +21008,10 @@ index de231e3..1d1b2ee 100644
.name = "physical x2apic",
.probe = x2apic_phys_probe,
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
-index d263b13..963258b 100644
+index 8e9dcfd..c61b3e4 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
-@@ -350,7 +350,7 @@ static int uv_probe(void)
+@@ -348,7 +348,7 @@ static int uv_probe(void)
return apic == &apic_x2apic_uv_x;
}
@@ -20983,7 +21021,7 @@ index d263b13..963258b 100644
.name = "UV large system",
.probe = uv_probe,
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
-index 3ab0343..814c4787 100644
+index 5848744..56cb598 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -433,7 +433,7 @@ static DEFINE_MUTEX(apm_mutex);
@@ -21041,7 +21079,7 @@ index 3ab0343..814c4787 100644
put_cpu();
return error;
}
-@@ -2362,12 +2376,15 @@ static int __init apm_init(void)
+@@ -2350,12 +2364,15 @@ static int __init apm_init(void)
* code to that CPU.
*/
gdt = get_cpu_gdt_table(0);
@@ -21110,7 +21148,7 @@ index e7c798b..2b2019b 100644
BLANK();
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
-index 7fd54f0..0691410 100644
+index 80091ae..0c5184f 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
@@ -21122,13 +21160,13 @@ index 7fd54f0..0691410 100644
-CFLAGS_common.o := $(nostackp)
-
obj-y := intel_cacheinfo.o scattered.o topology.o
- obj-y += proc.o capflags.o powerflags.o common.o
+ obj-y += common.o
obj-y += rdrand.o
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
-index c005fdd..e33da29 100644
+index 813d29d..6e542d4 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
-@@ -759,7 +759,7 @@ static void init_amd(struct cpuinfo_x86 *c)
+@@ -718,7 +718,7 @@ static void init_amd(struct cpuinfo_x86 *c)
static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
{
/* AMD errata T13 (order #21922) */
@@ -21138,10 +21176,10 @@ index c005fdd..e33da29 100644
if (c->x86_model == 3 && c->x86_mask == 0)
size = 64;
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index e6bddd5..517213d 100644
+index cfa9b5b..19b5084 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
-@@ -88,60 +88,6 @@ static const struct cpu_dev default_cpu = {
+@@ -90,60 +90,6 @@ static const struct cpu_dev default_cpu = {
static const struct cpu_dev *this_cpu = &default_cpu;
@@ -21202,7 +21240,7 @@ index e6bddd5..517213d 100644
static int __init x86_xsave_setup(char *s)
{
if (strlen(s))
-@@ -295,6 +241,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
+@@ -305,6 +251,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
}
}
@@ -21262,7 +21300,7 @@ index e6bddd5..517213d 100644
/*
* Some CPU features depend on higher CPUID levels, which may not always
* be available due to CPUID level capping or broken virtualization
-@@ -395,7 +394,7 @@ void switch_to_new_gdt(int cpu)
+@@ -405,7 +404,7 @@ void switch_to_new_gdt(int cpu)
{
struct desc_ptr gdt_descr;
@@ -21271,7 +21309,7 @@ index e6bddd5..517213d 100644
gdt_descr.size = GDT_SIZE - 1;
load_gdt(&gdt_descr);
/* Reload the per-cpu base */
-@@ -885,6 +884,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
+@@ -895,6 +894,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
setup_smep(c);
setup_smap(c);
@@ -21282,7 +21320,7 @@ index e6bddd5..517213d 100644
/*
* The vendor-specific functions might have changed features.
* Now we do "generic changes."
-@@ -893,6 +896,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
+@@ -903,6 +906,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
/* Filter out anything that depends on CPUID levels we don't have */
filter_cpuid_features(c, true);
@@ -21293,13 +21331,27 @@ index e6bddd5..517213d 100644
/* If the model name is still unset, do table lookup. */
if (!c->x86_model_id[0]) {
const char *p;
-@@ -1080,10 +1087,12 @@ static __init int setup_disablecpuid(char *arg)
+@@ -985,7 +992,7 @@ static void syscall32_cpu_init(void)
+ void enable_sep_cpu(void)
+ {
+ int cpu = get_cpu();
+- struct tss_struct *tss = &per_cpu(init_tss, cpu);
++ struct tss_struct *tss = init_tss + cpu;
+
+ if (!boot_cpu_has(X86_FEATURE_SEP)) {
+ put_cpu();
+@@ -1125,14 +1132,16 @@ static __init int setup_disablecpuid(char *arg)
}
__setup("clearcpuid=", setup_disablecpuid);
+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
+EXPORT_PER_CPU_SYMBOL(current_tinfo);
+
+ DEFINE_PER_CPU(unsigned long, kernel_stack) =
+- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
++ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
+ EXPORT_PER_CPU_SYMBOL(kernel_stack);
+
#ifdef CONFIG_X86_64
-struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
-struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
@@ -21309,25 +21361,16 @@ index e6bddd5..517213d 100644
DEFINE_PER_CPU_FIRST(union irq_stack_union,
irq_stack_union) __aligned(PAGE_SIZE) __visible;
-@@ -1097,7 +1106,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =
- EXPORT_PER_CPU_SYMBOL(current_task);
-
- DEFINE_PER_CPU(unsigned long, kernel_stack) =
-- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
-+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
- EXPORT_PER_CPU_SYMBOL(kernel_stack);
-
- DEFINE_PER_CPU(char *, irq_stack_ptr) =
-@@ -1247,7 +1256,7 @@ void cpu_init(void)
+@@ -1309,7 +1318,7 @@ void cpu_init(void)
+ */
load_ucode_ap();
- cpu = stack_smp_processor_id();
- t = &per_cpu(init_tss, cpu);
+ t = init_tss + cpu;
oist = &per_cpu(orig_ist, cpu);
#ifdef CONFIG_NUMA
-@@ -1282,7 +1291,6 @@ void cpu_init(void)
+@@ -1341,7 +1350,6 @@ void cpu_init(void)
wrmsrl(MSR_KERNEL_GS_BASE, 0);
barrier();
@@ -21335,7 +21378,7 @@ index e6bddd5..517213d 100644
enable_x2apic();
/*
-@@ -1334,7 +1342,7 @@ void cpu_init(void)
+@@ -1393,7 +1401,7 @@ void cpu_init(void)
{
int cpu = smp_processor_id();
struct task_struct *curr = current;
@@ -21343,12 +21386,12 @@ index e6bddd5..517213d 100644
+ struct tss_struct *t = init_tss + cpu;
struct thread_struct *thread = &curr->thread;
- show_ucode_info_early();
+ wait_for_master_cpu(cpu);
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
-index 0641113..06f5ba4 100644
+index c703507..28535e3 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
-@@ -1014,6 +1014,22 @@ static struct attribute *default_attrs[] = {
+@@ -1026,6 +1026,22 @@ static struct attribute *default_attrs[] = {
};
#ifdef CONFIG_AMD_NB
@@ -21371,7 +21414,7 @@ index 0641113..06f5ba4 100644
static struct attribute **amd_l3_attrs(void)
{
static struct attribute **attrs;
-@@ -1024,18 +1040,7 @@ static struct attribute **amd_l3_attrs(void)
+@@ -1036,18 +1052,7 @@ static struct attribute **amd_l3_attrs(void)
n = ARRAY_SIZE(default_attrs);
@@ -21391,7 +21434,7 @@ index 0641113..06f5ba4 100644
if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
attrs[n++] = &cache_disable_0.attr;
-@@ -1086,6 +1091,13 @@ static struct kobj_type ktype_cache = {
+@@ -1098,6 +1103,13 @@ static struct kobj_type ktype_cache = {
.default_attrs = default_attrs,
};
@@ -21405,7 +21448,7 @@ index 0641113..06f5ba4 100644
static struct kobj_type ktype_percpu_entry = {
.sysfs_ops = &sysfs_ops,
};
-@@ -1151,20 +1163,26 @@ static int cache_add_dev(struct device *dev)
+@@ -1163,20 +1175,26 @@ static int cache_add_dev(struct device *dev)
return retval;
}
@@ -21436,7 +21479,7 @@ index 0641113..06f5ba4 100644
"index%1lu", i);
if (unlikely(retval)) {
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
-index 4d5419b..95f11bb 100644
+index 61a9668ce..b446a37 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -45,6 +45,7 @@
@@ -21447,7 +21490,7 @@ index 4d5419b..95f11bb 100644
#include "mce-internal.h"
-@@ -258,7 +259,7 @@ static void print_mce(struct mce *m)
+@@ -259,7 +260,7 @@ static void print_mce(struct mce *m)
!(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
m->cs, m->ip);
@@ -21456,7 +21499,7 @@ index 4d5419b..95f11bb 100644
print_symbol("{%s}", m->ip);
pr_cont("\n");
}
-@@ -291,10 +292,10 @@ static void print_mce(struct mce *m)
+@@ -292,10 +293,10 @@ static void print_mce(struct mce *m)
#define PANIC_TIMEOUT 5 /* 5 seconds */
@@ -21469,7 +21512,7 @@ index 4d5419b..95f11bb 100644
/* Panic in progress. Enable interrupts and wait for final IPI */
static void wait_for_panic(void)
-@@ -318,7 +319,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
+@@ -319,7 +320,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
/*
* Make sure only one CPU runs in machine check panic
*/
@@ -21478,7 +21521,7 @@ index 4d5419b..95f11bb 100644
wait_for_panic();
barrier();
-@@ -326,7 +327,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
+@@ -327,7 +328,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
console_verbose();
} else {
/* Don't log too much for fake panic */
@@ -21487,7 +21530,7 @@ index 4d5419b..95f11bb 100644
return;
}
/* First print corrected ones that are still unlogged */
-@@ -365,7 +366,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
+@@ -366,7 +367,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
if (!fake_panic) {
if (panic_timeout == 0)
panic_timeout = mca_cfg.panic_timeout;
@@ -21496,7 +21539,7 @@ index 4d5419b..95f11bb 100644
} else
pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
}
-@@ -695,7 +696,7 @@ static int mce_timed_out(u64 *t)
+@@ -697,7 +698,7 @@ static int mce_timed_out(u64 *t)
* might have been modified by someone else.
*/
rmb();
@@ -21505,7 +21548,7 @@ index 4d5419b..95f11bb 100644
wait_for_panic();
if (!mca_cfg.monarch_timeout)
goto out;
-@@ -1666,7 +1667,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
+@@ -1674,7 +1675,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
}
/* Call the installed machine check handler for this CPU setup. */
@@ -21514,7 +21557,7 @@ index 4d5419b..95f11bb 100644
unexpected_machine_check;
/*
-@@ -1689,7 +1690,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
+@@ -1697,7 +1698,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
return;
}
@@ -21524,7 +21567,7 @@ index 4d5419b..95f11bb 100644
__mcheck_cpu_init_generic();
__mcheck_cpu_init_vendor(c);
-@@ -1703,7 +1706,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
+@@ -1711,7 +1714,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
*/
static DEFINE_SPINLOCK(mce_chrdev_state_lock);
@@ -21533,7 +21576,7 @@ index 4d5419b..95f11bb 100644
static int mce_chrdev_open_exclu; /* already open exclusive? */
static int mce_chrdev_open(struct inode *inode, struct file *file)
-@@ -1711,7 +1714,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
+@@ -1719,7 +1722,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
spin_lock(&mce_chrdev_state_lock);
if (mce_chrdev_open_exclu ||
@@ -21542,7 +21585,7 @@ index 4d5419b..95f11bb 100644
spin_unlock(&mce_chrdev_state_lock);
return -EBUSY;
-@@ -1719,7 +1722,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
+@@ -1727,7 +1730,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
if (file->f_flags & O_EXCL)
mce_chrdev_open_exclu = 1;
@@ -21551,7 +21594,7 @@ index 4d5419b..95f11bb 100644
spin_unlock(&mce_chrdev_state_lock);
-@@ -1730,7 +1733,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
+@@ -1738,7 +1741,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
{
spin_lock(&mce_chrdev_state_lock);
@@ -21560,7 +21603,7 @@ index 4d5419b..95f11bb 100644
mce_chrdev_open_exclu = 0;
spin_unlock(&mce_chrdev_state_lock);
-@@ -2406,7 +2409,7 @@ static __init void mce_init_banks(void)
+@@ -2413,7 +2416,7 @@ static __init void mce_init_banks(void)
for (i = 0; i < mca_cfg.banks; i++) {
struct mce_bank *b = &mce_banks[i];
@@ -21569,7 +21612,7 @@ index 4d5419b..95f11bb 100644
sysfs_attr_init(&a->attr);
a->attr.name = b->attrname;
-@@ -2474,7 +2477,7 @@ struct dentry *mce_get_debugfs_dir(void)
+@@ -2520,7 +2523,7 @@ struct dentry *mce_get_debugfs_dir(void)
static void mce_reset(void)
{
cpu_missing = 0;
@@ -21623,10 +21666,10 @@ index 7dc5564..1273569 100644
wmb();
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
-index 15c9876..0a43909 100644
+index 15c2909..2cef20c 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
-@@ -513,7 +513,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
+@@ -518,7 +518,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
return NOTIFY_OK;
}
@@ -21636,7 +21679,7 @@ index 15c9876..0a43909 100644
};
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
-index a276fa7..e66810f 100644
+index c6826d1..ad18e14a 100644
--- a/arch/x86/kernel/cpu/microcode/intel.c
+++ b/arch/x86/kernel/cpu/microcode/intel.c
@@ -293,13 +293,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
@@ -21656,7 +21699,7 @@ index a276fa7..e66810f 100644
static void microcode_fini_cpu(int cpu)
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
-index f961de9..8a9d332 100644
+index ea5f363..cb0e905 100644
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
@@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
@@ -21682,11 +21725,11 @@ index df5e41f..816c719 100644
extern int generic_get_free_region(unsigned long base, unsigned long size,
int replace_reg);
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
-index fb345c4..445b2d0 100644
+index 143e5f5..5825081 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
-@@ -1354,7 +1354,7 @@ static void __init pmu_check_apic(void)
- pr_info("no hardware sampling interrupt available.\n");
+@@ -1374,7 +1374,7 @@ static void __init pmu_check_apic(void)
+
}
-static struct attribute_group x86_pmu_format_group = {
@@ -21694,7 +21737,7 @@ index fb345c4..445b2d0 100644
.name = "format",
.attrs = NULL,
};
-@@ -1453,7 +1453,7 @@ static struct attribute *events_attr[] = {
+@@ -1473,7 +1473,7 @@ static struct attribute *events_attr[] = {
NULL,
};
@@ -21703,16 +21746,16 @@ index fb345c4..445b2d0 100644
.name = "events",
.attrs = events_attr,
};
-@@ -1974,7 +1974,7 @@ static unsigned long get_segment_base(unsigned int segment)
+@@ -1997,7 +1997,7 @@ static unsigned long get_segment_base(unsigned int segment)
if (idx > GDT_ENTRIES)
return 0;
-- desc = __this_cpu_ptr(&gdt_page.gdt[0]);
+- desc = raw_cpu_ptr(gdt_page.gdt);
+ desc = get_cpu_gdt_table(smp_processor_id());
}
return get_desc_base(desc + idx);
-@@ -2064,7 +2064,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
+@@ -2087,7 +2087,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
break;
perf_callchain_store(entry, frame.return_address);
@@ -21735,10 +21778,10 @@ index 639d128..e92d7e5 100644
while (amd_iommu_v2_event_descs[i].attr.attr.name)
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
-index d4c0a0e..4057f84 100644
+index 498b6d9..4126515 100644
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
-@@ -2354,10 +2354,10 @@ __init int intel_pmu_init(void)
+@@ -2353,10 +2353,10 @@ __init int intel_pmu_init(void)
x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3);
if (boot_cpu_has(X86_FEATURE_PDCM)) {
@@ -21753,10 +21796,10 @@ index d4c0a0e..4057f84 100644
intel_ds_init();
diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
-index 95700e5..19779f8 100644
+index 8c25674..30aa32e 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
-@@ -425,7 +425,7 @@ static struct attribute *rapl_events_cln_attr[] = {
+@@ -449,7 +449,7 @@ static struct attribute *rapl_events_hsw_attr[] = {
NULL,
};
@@ -21766,10 +21809,10 @@ index 95700e5..19779f8 100644
.attrs = NULL, /* patched at runtime */
};
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
-index 2f98588..aa6f3c4 100644
+index e98f68c..1992b15 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
-@@ -3342,7 +3342,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
+@@ -737,7 +737,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
static int __init uncore_type_init(struct intel_uncore_type *type)
{
struct intel_uncore_pmu *pmus;
@@ -21779,20 +21822,20 @@ index 2f98588..aa6f3c4 100644
int i, j;
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
-index a80ab71..4089da5 100644
+index 863d9b0..6289b63 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
-@@ -498,7 +498,7 @@ struct intel_uncore_box {
+@@ -114,7 +114,7 @@ struct intel_uncore_box {
struct uncore_event_desc {
struct kobj_attribute attr;
const char *config;
-};
+} __do_const;
- #define INTEL_UNCORE_EVENT_DESC(_name, _config) \
- { \
+ ssize_t uncore_event_show(struct kobject *kobj,
+ struct kobj_attribute *attr, char *buf);
diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
-index 7d9481c..99c7e4b 100644
+index 3225ae6c..ee3c6db 100644
--- a/arch/x86/kernel/cpuid.c
+++ b/arch/x86/kernel/cpuid.c
@@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
@@ -21805,16 +21848,13 @@ index 7d9481c..99c7e4b 100644
.notifier_call = cpuid_class_cpu_callback,
};
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
-index a57902e..ebaae2a 100644
+index f5ab56d..d3b201a 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
-@@ -57,10 +57,8 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
- {
+@@ -104,7 +104,7 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
#ifdef CONFIG_X86_32
struct pt_regs fixed_regs;
--#endif
--#ifdef CONFIG_X86_32
- if (!user_mode_vm(regs)) {
+ if (!user_mode(regs)) {
crash_fixup_ss_esp(&fixed_regs, regs);
@@ -21869,7 +21909,7 @@ index f6dfd93..892ade4 100644
.__cr3 = __pa_nodebug(swapper_pg_dir),
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
-index d9c12d3..3e70198 100644
+index b74ebc7..2c95874 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -2,6 +2,9 @@
@@ -21991,16 +22031,16 @@ index d9c12d3..3e70198 100644
printk_stack_address(addr, reliable);
}
-@@ -224,6 +223,8 @@ unsigned __kprobes long oops_begin(void)
- }
+@@ -225,6 +224,8 @@ unsigned long oops_begin(void)
EXPORT_SYMBOL_GPL(oops_begin);
+ NOKPROBE_SYMBOL(oops_begin);
+extern void gr_handle_kernel_exploit(void);
+
- void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
+ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
{
if (regs && kexec_should_crash(current))
-@@ -245,7 +246,10 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
+@@ -246,7 +247,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
panic("Fatal exception in interrupt");
if (panic_on_oops)
panic("Fatal exception");
@@ -22010,9 +22050,9 @@ index d9c12d3..3e70198 100644
+
+ do_group_exit(signr);
}
+ NOKPROBE_SYMBOL(oops_end);
- int __kprobes __die(const char *str, struct pt_regs *regs, long err)
-@@ -273,7 +277,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
+@@ -275,7 +279,7 @@ int __die(const char *str, struct pt_regs *regs, long err)
print_modules();
show_regs(regs);
#ifdef CONFIG_X86_32
@@ -22021,7 +22061,7 @@ index d9c12d3..3e70198 100644
sp = regs->sp;
ss = regs->ss & 0xffff;
} else {
-@@ -301,7 +305,7 @@ void die(const char *str, struct pt_regs *regs, long err)
+@@ -304,7 +308,7 @@ void die(const char *str, struct pt_regs *regs, long err)
unsigned long flags = oops_begin();
int sig = SIGSEGV;
@@ -22031,30 +22071,28 @@ index d9c12d3..3e70198 100644
if (__die(str, regs, err))
diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
-index f2a1770..10fa52d 100644
+index 5abd4cd..c65733b 100644
--- a/arch/x86/kernel/dumpstack_32.c
+++ b/arch/x86/kernel/dumpstack_32.c
-@@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
+@@ -61,15 +61,14 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
bp = stack_frame(task, regs);
for (;;) {
- struct thread_info *context;
+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
+ void *end_stack;
-- context = (struct thread_info *)
-- ((unsigned long)stack & (~(THREAD_SIZE - 1)));
-- bp = ops->walk_stack(context, stack, bp, ops, data, NULL, &graph);
-+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
+ end_stack = is_hardirq_stack(stack, cpu);
+ if (!end_stack)
+ end_stack = is_softirq_stack(stack, cpu);
-- stack = (unsigned long *)context->previous_esp;
-- if (!stack)
-+ if (stack_start == task_stack_page(task))
- break;
-+ stack = *(unsigned long **)stack_start;
- if (ops->stack(data, "IRQ") < 0)
- break;
- touch_nmi_watchdog();
-@@ -87,27 +85,28 @@ void show_regs(struct pt_regs *regs)
+- context = task_thread_info(task);
+- bp = ops->walk_stack(context, stack, bp, ops, data,
++ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data,
+ end_stack, &graph);
+
+ /* Stop if not on irq stack */
+@@ -123,27 +122,28 @@ void show_regs(struct pt_regs *regs)
int i;
show_regs_print_info(KERN_EMERG);
@@ -22087,7 +22125,7 @@ index f2a1770..10fa52d 100644
code_len = code_len - code_prologue + 1;
}
for (i = 0; i < code_len; i++, ip++) {
-@@ -116,7 +115,7 @@ void show_regs(struct pt_regs *regs)
+@@ -152,7 +152,7 @@ void show_regs(struct pt_regs *regs)
pr_cont(" Bad EIP value.");
break;
}
@@ -22096,7 +22134,7 @@ index f2a1770..10fa52d 100644
pr_cont(" <%02x>", c);
else
pr_cont(" %02x", c);
-@@ -129,6 +128,7 @@ int is_valid_bugaddr(unsigned long ip)
+@@ -165,6 +165,7 @@ int is_valid_bugaddr(unsigned long ip)
{
unsigned short ud2;
@@ -22104,7 +22142,7 @@ index f2a1770..10fa52d 100644
if (ip < PAGE_OFFSET)
return 0;
if (probe_kernel_address((unsigned short *)ip, ud2))
-@@ -136,3 +136,15 @@ int is_valid_bugaddr(unsigned long ip)
+@@ -172,3 +173,15 @@ int is_valid_bugaddr(unsigned long ip)
return ud2 == 0x0b0f;
}
@@ -22121,60 +22159,59 @@ index f2a1770..10fa52d 100644
+EXPORT_SYMBOL(pax_check_alloca);
+#endif
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
-index 66e274a..99080e6 100644
+index ff86f19..73eabf4 100644
--- a/arch/x86/kernel/dumpstack_64.c
+++ b/arch/x86/kernel/dumpstack_64.c
-@@ -118,9 +118,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
- unsigned long *irq_stack_end =
- (unsigned long *)per_cpu(irq_stack_ptr, cpu);
- unsigned used = 0;
+@@ -153,12 +153,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
+ const struct stacktrace_ops *ops, void *data)
+ {
+ const unsigned cpu = get_cpu();
- struct thread_info *tinfo;
- int graph = 0;
+ unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
unsigned long dummy;
+ unsigned used = 0;
+ int graph = 0;
+ int done = 0;
+ void *stack_start;
if (!task)
task = current;
-@@ -141,10 +141,10 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
+@@ -179,7 +179,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
* current stack address. If the stacks consist of nested
* exceptions
*/
- tinfo = task_thread_info(task);
- for (;;) {
- char *id;
- unsigned long *estack_end;
-+
- estack_end = in_exception_stack(cpu, (unsigned long)stack,
- &used, &id);
-
-@@ -152,7 +152,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
+ while (!done) {
+ unsigned long *stack_end;
+ enum stack_type stype;
+@@ -202,7 +201,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
if (ops->stack(data, id) < 0)
break;
- bp = ops->walk_stack(tinfo, stack, bp, ops,
-+ bp = ops->walk_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops,
- data, estack_end, &graph);
++ bp = ops->walk_stack(task, stack_end - EXCEPTION_STKSZ, stack, bp, ops,
+ data, stack_end, &graph);
ops->stack(data, "<EOE>");
/*
-@@ -160,6 +160,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
+@@ -210,6 +209,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
* second-to-last pointer (index -2 to end) in the
* exception stack:
*/
-+ if ((u16)estack_end[-1] != __KERNEL_DS)
++ if ((u16)stack_end[-1] != __KERNEL_DS)
+ goto out;
- stack = (unsigned long *) estack_end[-2];
- continue;
- }
-@@ -171,7 +173,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
- if (in_irq_stack(stack, irq_stack, irq_stack_end)) {
- if (ops->stack(data, "IRQ") < 0)
- break;
-- bp = ops->walk_stack(tinfo, stack, bp,
-+ bp = ops->walk_stack(task, irq_stack, stack, bp,
- ops, data, irq_stack_end, &graph);
- /*
- * We link to the next stack (which would be
-@@ -190,7 +192,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
+ stack = (unsigned long *) stack_end[-2];
+ done = 0;
+ break;
+@@ -218,7 +219,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
+
+ if (ops->stack(data, "IRQ") < 0)
+ break;
+- bp = ops->walk_stack(tinfo, stack, bp,
++ bp = ops->walk_stack(task, irq_stack, stack, bp,
+ ops, data, stack_end, &graph);
+ /*
+ * We link to the next stack (which would be
+@@ -240,7 +241,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
/*
* This handles the process stack:
*/
@@ -22185,7 +22222,13 @@ index 66e274a..99080e6 100644
put_cpu();
}
EXPORT_SYMBOL(dump_trace);
-@@ -299,3 +303,50 @@ int is_valid_bugaddr(unsigned long ip)
+@@ -344,8 +347,55 @@ int is_valid_bugaddr(unsigned long ip)
+ {
+ unsigned short ud2;
+
+- if (__copy_from_user(&ud2, (const void __user *) ip, sizeof(ud2)))
++ if (probe_kernel_address((unsigned short *)ip, ud2))
+ return 0;
return ud2 == 0x0b0f;
}
@@ -22237,10 +22280,10 @@ index 66e274a..99080e6 100644
+EXPORT_SYMBOL(pax_check_alloca);
+#endif
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
-index 988c00a..4f673b6 100644
+index 49f8864..1cc6d07 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
-@@ -803,8 +803,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
+@@ -802,8 +802,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
static void early_panic(char *msg)
{
@@ -22264,7 +22307,7 @@ index 01d1c18..8073693 100644
#include <asm/processor.h>
#include <asm/fcntl.h>
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
-index c5a9cb9..b6a5426 100644
+index 344b63f..55adf14 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -177,13 +177,154 @@
@@ -22457,7 +22500,7 @@ index c5a9cb9..b6a5426 100644
ENTRY(ret_from_kernel_thread)
CFI_STARTPROC
-@@ -344,7 +494,15 @@ ret_from_intr:
+@@ -340,7 +490,15 @@ ret_from_intr:
andl $SEGMENT_RPL_MASK, %eax
#endif
cmpl $USER_RPL, %eax
@@ -22473,7 +22516,7 @@ index c5a9cb9..b6a5426 100644
ENTRY(resume_userspace)
LOCKDEP_SYS_EXIT
-@@ -356,8 +514,8 @@ ENTRY(resume_userspace)
+@@ -352,8 +510,8 @@ ENTRY(resume_userspace)
andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
# int/exception return?
jne work_pending
@@ -22484,7 +22527,7 @@ index c5a9cb9..b6a5426 100644
#ifdef CONFIG_PREEMPT
ENTRY(resume_kernel)
-@@ -369,7 +527,7 @@ need_resched:
+@@ -365,7 +523,7 @@ need_resched:
jz restore_all
call preempt_schedule_irq
jmp need_resched
@@ -22492,8 +22535,8 @@ index c5a9cb9..b6a5426 100644
+ENDPROC(resume_kernel)
#endif
CFI_ENDPROC
- /*
-@@ -403,30 +561,45 @@ sysenter_past_esp:
+
+@@ -395,30 +553,45 @@ sysenter_past_esp:
/*CFI_REL_OFFSET cs, 0*/
/*
* Push current_thread_info()->sysenter_return to the stack.
@@ -22542,7 +22585,7 @@ index c5a9cb9..b6a5426 100644
testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
jnz sysenter_audit
sysenter_do_call:
-@@ -442,12 +615,24 @@ sysenter_after_call:
+@@ -434,12 +607,24 @@ sysenter_after_call:
testl $_TIF_ALLWORK_MASK, %ecx
jne sysexit_audit
sysenter_exit:
@@ -22567,17 +22610,17 @@ index c5a9cb9..b6a5426 100644
PTGS_TO_GS
ENABLE_INTERRUPTS_SYSEXIT
-@@ -464,6 +649,9 @@ sysenter_audit:
- movl %eax,%edx /* 2nd arg: syscall number */
- movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */
+@@ -453,6 +638,9 @@ sysenter_audit:
+ pushl_cfi PT_ESI(%esp) /* a3: 5th arg */
+ pushl_cfi PT_EDX+4(%esp) /* a2: 4th arg */
call __audit_syscall_entry
+
+ pax_erase_kstack
+
- pushl_cfi %ebx
+ popl_cfi %ecx /* get that remapped edx off the stack */
+ popl_cfi %ecx /* get that remapped esi off the stack */
movl PT_EAX(%esp),%eax /* reload syscall number */
- jmp sysenter_do_call
-@@ -489,10 +677,16 @@ sysexit_audit:
+@@ -479,10 +667,16 @@ sysexit_audit:
CFI_ENDPROC
.pushsection .fixup,"ax"
@@ -22596,7 +22639,7 @@ index c5a9cb9..b6a5426 100644
PTGS_TO_GS_EX
ENDPROC(ia32_sysenter_target)
-@@ -507,6 +701,11 @@ ENTRY(system_call)
+@@ -493,6 +687,11 @@ ENTRY(system_call)
pushl_cfi %eax # save orig_eax
SAVE_ALL
GET_THREAD_INFO(%ebp)
@@ -22608,7 +22651,7 @@ index c5a9cb9..b6a5426 100644
# system call tracing in operation / emulation
testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
jnz syscall_trace_entry
-@@ -526,6 +725,15 @@ syscall_exit:
+@@ -512,6 +711,15 @@ syscall_exit:
testl $_TIF_ALLWORK_MASK, %ecx # current->work
jne syscall_exit_work
@@ -22624,7 +22667,7 @@ index c5a9cb9..b6a5426 100644
restore_all:
TRACE_IRQS_IRET
restore_all_notrace:
-@@ -580,14 +788,34 @@ ldt_ss:
+@@ -566,14 +774,34 @@ ldt_ss:
* compensating for the offset by changing to the ESPFIX segment with
* a base address that matches for the difference.
*/
@@ -22662,7 +22705,7 @@ index c5a9cb9..b6a5426 100644
pushl_cfi $__ESPFIX_SS
pushl_cfi %eax /* new kernel esp */
/* Disable interrupts, but do not irqtrace this section: we
-@@ -617,20 +845,18 @@ work_resched:
+@@ -603,20 +831,18 @@ work_resched:
movl TI_flags(%ebp), %ecx
andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
# than syscall tracing?
@@ -22685,7 +22728,7 @@ index c5a9cb9..b6a5426 100644
#endif
TRACE_IRQS_ON
ENABLE_INTERRUPTS(CLBR_NONE)
-@@ -651,7 +877,7 @@ work_notifysig_v86:
+@@ -637,7 +863,7 @@ work_notifysig_v86:
movl %eax, %esp
jmp 1b
#endif
@@ -22694,7 +22737,7 @@ index c5a9cb9..b6a5426 100644
# perform syscall exit tracing
ALIGN
-@@ -659,11 +885,14 @@ syscall_trace_entry:
+@@ -645,11 +871,14 @@ syscall_trace_entry:
movl $-ENOSYS,PT_EAX(%esp)
movl %esp, %eax
call syscall_trace_enter
@@ -22710,7 +22753,7 @@ index c5a9cb9..b6a5426 100644
# perform syscall exit tracing
ALIGN
-@@ -676,26 +905,30 @@ syscall_exit_work:
+@@ -662,26 +891,30 @@ syscall_exit_work:
movl %esp, %eax
call syscall_trace_leave
jmp resume_userspace
@@ -22740,12 +22783,12 @@ index c5a9cb9..b6a5426 100644
sysenter_badsys:
movl $-ENOSYS,%eax
jmp sysenter_after_call
--END(syscall_badsys)
+-END(sysenter_badsys)
+ENDPROC(sysenter_badsys)
CFI_ENDPROC
- /*
- * End of kprobes section
-@@ -712,8 +945,15 @@ END(syscall_badsys)
+
+ .macro FIXUP_ESPFIX_STACK
+@@ -694,8 +927,15 @@ END(sysenter_badsys)
*/
#ifdef CONFIG_X86_ESPFIX32
/* fixup the stack */
@@ -22763,7 +22806,7 @@ index c5a9cb9..b6a5426 100644
shl $16, %eax
addl %esp, %eax /* the adjusted stack pointer */
pushl_cfi $__KERNEL_DS
-@@ -769,7 +1009,7 @@ vector=vector+1
+@@ -751,7 +991,7 @@ vector=vector+1
.endr
2: jmp common_interrupt
.endr
@@ -22772,7 +22815,7 @@ index c5a9cb9..b6a5426 100644
.previous
END(interrupt)
-@@ -830,7 +1070,7 @@ ENTRY(coprocessor_error)
+@@ -808,7 +1048,7 @@ ENTRY(coprocessor_error)
pushl_cfi $do_coprocessor_error
jmp error_code
CFI_ENDPROC
@@ -22781,7 +22824,7 @@ index c5a9cb9..b6a5426 100644
ENTRY(simd_coprocessor_error)
RING0_INT_FRAME
-@@ -843,7 +1083,7 @@ ENTRY(simd_coprocessor_error)
+@@ -821,7 +1061,7 @@ ENTRY(simd_coprocessor_error)
.section .altinstructions,"a"
altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
.previous
@@ -22790,7 +22833,7 @@ index c5a9cb9..b6a5426 100644
663: pushl $do_simd_coprocessor_error
664:
.previous
-@@ -852,7 +1092,7 @@ ENTRY(simd_coprocessor_error)
+@@ -830,7 +1070,7 @@ ENTRY(simd_coprocessor_error)
#endif
jmp error_code
CFI_ENDPROC
@@ -22799,7 +22842,7 @@ index c5a9cb9..b6a5426 100644
ENTRY(device_not_available)
RING0_INT_FRAME
-@@ -861,18 +1101,18 @@ ENTRY(device_not_available)
+@@ -839,18 +1079,18 @@ ENTRY(device_not_available)
pushl_cfi $do_device_not_available
jmp error_code
CFI_ENDPROC
@@ -22821,7 +22864,7 @@ index c5a9cb9..b6a5426 100644
#endif
ENTRY(overflow)
-@@ -882,7 +1122,7 @@ ENTRY(overflow)
+@@ -860,7 +1100,7 @@ ENTRY(overflow)
pushl_cfi $do_overflow
jmp error_code
CFI_ENDPROC
@@ -22830,7 +22873,7 @@ index c5a9cb9..b6a5426 100644
ENTRY(bounds)
RING0_INT_FRAME
-@@ -891,7 +1131,7 @@ ENTRY(bounds)
+@@ -869,7 +1109,7 @@ ENTRY(bounds)
pushl_cfi $do_bounds
jmp error_code
CFI_ENDPROC
@@ -22839,7 +22882,7 @@ index c5a9cb9..b6a5426 100644
ENTRY(invalid_op)
RING0_INT_FRAME
-@@ -900,7 +1140,7 @@ ENTRY(invalid_op)
+@@ -878,7 +1118,7 @@ ENTRY(invalid_op)
pushl_cfi $do_invalid_op
jmp error_code
CFI_ENDPROC
@@ -22848,7 +22891,7 @@ index c5a9cb9..b6a5426 100644
ENTRY(coprocessor_segment_overrun)
RING0_INT_FRAME
-@@ -909,7 +1149,7 @@ ENTRY(coprocessor_segment_overrun)
+@@ -887,7 +1127,7 @@ ENTRY(coprocessor_segment_overrun)
pushl_cfi $do_coprocessor_segment_overrun
jmp error_code
CFI_ENDPROC
@@ -22857,7 +22900,7 @@ index c5a9cb9..b6a5426 100644
ENTRY(invalid_TSS)
RING0_EC_FRAME
-@@ -917,7 +1157,7 @@ ENTRY(invalid_TSS)
+@@ -895,7 +1135,7 @@ ENTRY(invalid_TSS)
pushl_cfi $do_invalid_TSS
jmp error_code
CFI_ENDPROC
@@ -22866,7 +22909,7 @@ index c5a9cb9..b6a5426 100644
ENTRY(segment_not_present)
RING0_EC_FRAME
-@@ -925,7 +1165,7 @@ ENTRY(segment_not_present)
+@@ -903,7 +1143,7 @@ ENTRY(segment_not_present)
pushl_cfi $do_segment_not_present
jmp error_code
CFI_ENDPROC
@@ -22875,7 +22918,7 @@ index c5a9cb9..b6a5426 100644
ENTRY(stack_segment)
RING0_EC_FRAME
-@@ -933,7 +1173,7 @@ ENTRY(stack_segment)
+@@ -911,7 +1151,7 @@ ENTRY(stack_segment)
pushl_cfi $do_stack_segment
jmp error_code
CFI_ENDPROC
@@ -22884,7 +22927,7 @@ index c5a9cb9..b6a5426 100644
ENTRY(alignment_check)
RING0_EC_FRAME
-@@ -941,7 +1181,7 @@ ENTRY(alignment_check)
+@@ -919,7 +1159,7 @@ ENTRY(alignment_check)
pushl_cfi $do_alignment_check
jmp error_code
CFI_ENDPROC
@@ -22893,7 +22936,7 @@ index c5a9cb9..b6a5426 100644
ENTRY(divide_error)
RING0_INT_FRAME
-@@ -950,7 +1190,7 @@ ENTRY(divide_error)
+@@ -928,7 +1168,7 @@ ENTRY(divide_error)
pushl_cfi $do_divide_error
jmp error_code
CFI_ENDPROC
@@ -22902,7 +22945,7 @@ index c5a9cb9..b6a5426 100644
#ifdef CONFIG_X86_MCE
ENTRY(machine_check)
-@@ -960,7 +1200,7 @@ ENTRY(machine_check)
+@@ -938,7 +1178,7 @@ ENTRY(machine_check)
pushl_cfi machine_check_vector
jmp error_code
CFI_ENDPROC
@@ -22911,16 +22954,16 @@ index c5a9cb9..b6a5426 100644
#endif
ENTRY(spurious_interrupt_bug)
-@@ -970,7 +1210,7 @@ ENTRY(spurious_interrupt_bug)
+@@ -948,7 +1188,7 @@ ENTRY(spurious_interrupt_bug)
pushl_cfi $do_spurious_interrupt_bug
jmp error_code
CFI_ENDPROC
-END(spurious_interrupt_bug)
+ENDPROC(spurious_interrupt_bug)
- /*
- * End of kprobes section
- */
-@@ -1080,7 +1320,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
+
+ #ifdef CONFIG_XEN
+ /* Xen doesn't set %esp to be precisely what the normal sysenter
+@@ -1054,7 +1294,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
ENTRY(mcount)
ret
@@ -22928,8 +22971,8 @@ index c5a9cb9..b6a5426 100644
+ENDPROC(mcount)
ENTRY(ftrace_caller)
- cmpl $0, function_trace_stop
-@@ -1113,7 +1353,7 @@ ftrace_graph_call:
+ pushl %eax
+@@ -1084,7 +1324,7 @@ ftrace_graph_call:
.globl ftrace_stub
ftrace_stub:
ret
@@ -22938,7 +22981,7 @@ index c5a9cb9..b6a5426 100644
ENTRY(ftrace_regs_caller)
pushf /* push flags before compare (in cs location) */
-@@ -1217,7 +1457,7 @@ trace:
+@@ -1182,7 +1422,7 @@ trace:
popl %ecx
popl %eax
jmp ftrace_stub
@@ -22947,7 +22990,7 @@ index c5a9cb9..b6a5426 100644
#endif /* CONFIG_DYNAMIC_FTRACE */
#endif /* CONFIG_FUNCTION_TRACER */
-@@ -1235,7 +1475,7 @@ ENTRY(ftrace_graph_caller)
+@@ -1200,7 +1440,7 @@ ENTRY(ftrace_graph_caller)
popl %ecx
popl %eax
ret
@@ -22956,7 +22999,7 @@ index c5a9cb9..b6a5426 100644
.globl return_to_handler
return_to_handler:
-@@ -1301,15 +1541,18 @@ error_code:
+@@ -1261,15 +1501,18 @@ error_code:
movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
REG_TO_PTGS %ecx
SET_KERNEL_GS %ecx
@@ -22977,7 +23020,7 @@ index c5a9cb9..b6a5426 100644
/*
* Debug traps and NMI can happen at the one SYSENTER instruction
-@@ -1352,7 +1595,7 @@ debug_stack_correct:
+@@ -1312,7 +1555,7 @@ debug_stack_correct:
call do_debug
jmp ret_from_exception
CFI_ENDPROC
@@ -22986,7 +23029,7 @@ index c5a9cb9..b6a5426 100644
/*
* NMI is doubly nasty. It can happen _while_ we're handling
-@@ -1392,6 +1635,9 @@ nmi_stack_correct:
+@@ -1352,6 +1595,9 @@ nmi_stack_correct:
xorl %edx,%edx # zero error code
movl %esp,%eax # pt_regs pointer
call do_nmi
@@ -22996,7 +23039,7 @@ index c5a9cb9..b6a5426 100644
jmp restore_all_notrace
CFI_ENDPROC
-@@ -1429,13 +1675,16 @@ nmi_espfix_stack:
+@@ -1389,13 +1635,16 @@ nmi_espfix_stack:
FIXUP_ESPFIX_STACK # %eax == %esp
xorl %edx,%edx # zero error code
call do_nmi
@@ -23014,7 +23057,7 @@ index c5a9cb9..b6a5426 100644
ENTRY(int3)
RING0_INT_FRAME
-@@ -1448,14 +1697,14 @@ ENTRY(int3)
+@@ -1408,14 +1657,14 @@ ENTRY(int3)
call do_int3
jmp ret_from_exception
CFI_ENDPROC
@@ -23031,7 +23074,7 @@ index c5a9cb9..b6a5426 100644
#ifdef CONFIG_KVM_GUEST
ENTRY(async_page_fault)
-@@ -1464,7 +1713,7 @@ ENTRY(async_page_fault)
+@@ -1424,6 +1673,6 @@ ENTRY(async_page_fault)
pushl_cfi $do_async_page_fault
jmp error_code
CFI_ENDPROC
@@ -23039,12 +23082,11 @@ index c5a9cb9..b6a5426 100644
+ENDPROC(async_page_fault)
#endif
- /*
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
-index 02553d6..81f4dc7 100644
+index c0226ab..0d1dc48 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
-@@ -60,6 +60,8 @@
+@@ -59,6 +59,8 @@
#include <asm/smap.h>
#include <asm/pgtable_types.h>
#include <linux/err.h>
@@ -23053,82 +23095,7 @@ index 02553d6..81f4dc7 100644
/* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
#include <linux/elf-em.h>
-@@ -81,8 +83,9 @@
- #ifdef CONFIG_DYNAMIC_FTRACE
-
- ENTRY(function_hook)
-+ pax_force_retaddr
- retq
--END(function_hook)
-+ENDPROC(function_hook)
-
- /* skip is set if stack has been adjusted */
- .macro ftrace_caller_setup skip=0
-@@ -123,8 +126,9 @@ GLOBAL(ftrace_graph_call)
- #endif
-
- GLOBAL(ftrace_stub)
-+ pax_force_retaddr
- retq
--END(ftrace_caller)
-+ENDPROC(ftrace_caller)
-
- ENTRY(ftrace_regs_caller)
- /* Save the current flags before compare (in SS location)*/
-@@ -192,7 +196,7 @@ ftrace_restore_flags:
- popfq
- jmp ftrace_stub
-
--END(ftrace_regs_caller)
-+ENDPROC(ftrace_regs_caller)
-
-
- #else /* ! CONFIG_DYNAMIC_FTRACE */
-@@ -213,6 +217,7 @@ ENTRY(function_hook)
- #endif
-
- GLOBAL(ftrace_stub)
-+ pax_force_retaddr
- retq
-
- trace:
-@@ -226,12 +231,13 @@ trace:
- #endif
- subq $MCOUNT_INSN_SIZE, %rdi
-
-+ pax_force_fptr ftrace_trace_function
- call *ftrace_trace_function
-
- MCOUNT_RESTORE_FRAME
-
- jmp ftrace_stub
--END(function_hook)
-+ENDPROC(function_hook)
- #endif /* CONFIG_DYNAMIC_FTRACE */
- #endif /* CONFIG_FUNCTION_TRACER */
-
-@@ -253,8 +259,9 @@ ENTRY(ftrace_graph_caller)
-
- MCOUNT_RESTORE_FRAME
-
-+ pax_force_retaddr
- retq
--END(ftrace_graph_caller)
-+ENDPROC(ftrace_graph_caller)
-
- GLOBAL(return_to_handler)
- subq $24, %rsp
-@@ -270,7 +277,9 @@ GLOBAL(return_to_handler)
- movq 8(%rsp), %rdx
- movq (%rsp), %rax
- addq $24, %rsp
-+ pax_force_fptr %rdi
- jmp *%rdi
-+ENDPROC(return_to_handler)
- #endif
-
-
-@@ -285,6 +294,431 @@ ENTRY(native_usergs_sysret64)
+@@ -81,6 +83,431 @@ ENTRY(native_usergs_sysret64)
ENDPROC(native_usergs_sysret64)
#endif /* CONFIG_PARAVIRT */
@@ -23560,7 +23527,7 @@ index 02553d6..81f4dc7 100644
.macro TRACE_IRQS_IRETQ offset=ARGOFFSET
#ifdef CONFIG_TRACE_IRQFLAGS
-@@ -321,7 +755,7 @@ ENDPROC(native_usergs_sysret64)
+@@ -117,7 +544,7 @@ ENDPROC(native_usergs_sysret64)
.endm
.macro TRACE_IRQS_IRETQ_DEBUG offset=ARGOFFSET
@@ -23569,7 +23536,7 @@ index 02553d6..81f4dc7 100644
jnc 1f
TRACE_IRQS_ON_DEBUG
1:
-@@ -359,27 +793,6 @@ ENDPROC(native_usergs_sysret64)
+@@ -155,27 +582,6 @@ ENDPROC(native_usergs_sysret64)
movq \tmp,R11+\offset(%rsp)
.endm
@@ -23597,7 +23564,7 @@ index 02553d6..81f4dc7 100644
/*
* initial frame state for interrupts (and exceptions without error code)
*/
-@@ -446,25 +859,26 @@ ENDPROC(native_usergs_sysret64)
+@@ -241,25 +647,26 @@ ENDPROC(native_usergs_sysret64)
/* save partial stack frame */
.macro SAVE_ARGS_IRQ
cld
@@ -23637,7 +23604,7 @@ index 02553d6..81f4dc7 100644
je 1f
SWAPGS
/*
-@@ -484,6 +898,18 @@ ENDPROC(native_usergs_sysret64)
+@@ -279,6 +686,18 @@ ENDPROC(native_usergs_sysret64)
0x06 /* DW_OP_deref */, \
0x08 /* DW_OP_const1u */, SS+8-RBP, \
0x22 /* DW_OP_plus */
@@ -23656,7 +23623,7 @@ index 02553d6..81f4dc7 100644
/* We entered an interrupt context - irqs are off: */
TRACE_IRQS_OFF
.endm
-@@ -515,9 +941,52 @@ ENTRY(save_paranoid)
+@@ -308,9 +727,52 @@ ENTRY(save_paranoid)
js 1f /* negative -> in kernel */
SWAPGS
xorl %ebx,%ebx
@@ -23708,10 +23675,10 @@ index 02553d6..81f4dc7 100644
+ ret
+ CFI_ENDPROC
+ENDPROC(save_paranoid_nmi)
- .popsection
/*
-@@ -539,7 +1008,7 @@ ENTRY(ret_from_fork)
+ * A newly forked process directly context switches into this address.
+@@ -331,7 +793,7 @@ ENTRY(ret_from_fork)
RESTORE_REST
@@ -23720,7 +23687,7 @@ index 02553d6..81f4dc7 100644
jz 1f
testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
-@@ -549,15 +1018,13 @@ ENTRY(ret_from_fork)
+@@ -341,15 +803,13 @@ ENTRY(ret_from_fork)
jmp ret_from_sys_call # go to the SYSRET fastpath
1:
@@ -23737,7 +23704,7 @@ index 02553d6..81f4dc7 100644
/*
* System call entry. Up to 6 arguments in registers are supported.
-@@ -594,7 +1061,7 @@ END(ret_from_fork)
+@@ -386,7 +846,7 @@ END(ret_from_fork)
ENTRY(system_call)
CFI_STARTPROC simple
CFI_SIGNAL_FRAME
@@ -23746,11 +23713,11 @@ index 02553d6..81f4dc7 100644
CFI_REGISTER rip,rcx
/*CFI_REGISTER rflags,r11*/
SWAPGS_UNSAFE_STACK
-@@ -607,16 +1074,23 @@ GLOBAL(system_call_after_swapgs)
+@@ -399,16 +859,23 @@ GLOBAL(system_call_after_swapgs)
movq %rsp,PER_CPU_VAR(old_rsp)
movq PER_CPU_VAR(kernel_stack),%rsp
-+ SAVE_ARGS 8*6,0
++ SAVE_ARGS 8*6, 0, rax_enosys=1
+ pax_enter_kernel_user
+
+#ifdef CONFIG_PAX_RANDKSTACK
@@ -23762,8 +23729,8 @@ index 02553d6..81f4dc7 100644
* and short:
*/
ENABLE_INTERRUPTS(CLBR_NONE)
-- SAVE_ARGS 8,0
- movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
+- SAVE_ARGS 8, 0, rax_enosys=1
+ movq_cfi rax,(ORIG_RAX-ARGOFFSET)
movq %rcx,RIP-ARGOFFSET(%rsp)
CFI_REL_OFFSET rip,RIP-ARGOFFSET
- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
@@ -23772,7 +23739,7 @@ index 02553d6..81f4dc7 100644
jnz tracesys
system_call_fastpath:
#if __SYSCALL_MASK == ~0
-@@ -640,10 +1114,13 @@ sysret_check:
+@@ -432,10 +899,13 @@ sysret_check:
LOCKDEP_SYS_EXIT
DISABLE_INTERRUPTS(CLBR_NONE)
TRACE_IRQS_OFF
@@ -23787,35 +23754,33 @@ index 02553d6..81f4dc7 100644
/*
* sysretq will re-enable interrupts:
*/
-@@ -702,6 +1179,9 @@ auditsys:
- movq %rax,%rsi /* 2nd arg: syscall number */
- movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */
- call __audit_syscall_entry
-+
-+ pax_erase_kstack
-+
- LOAD_ARGS 0 /* reload call-clobbered registers */
- jmp system_call_fastpath
+@@ -494,12 +964,15 @@ sysret_audit:
-@@ -723,7 +1203,7 @@ sysret_audit:
/* Do syscall tracing */
tracesys:
- #ifdef CONFIG_AUDITSYSCALL
-- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
-+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%rcx)
- jz auditsys
- #endif
- SAVE_REST
-@@ -731,12 +1211,15 @@ tracesys:
- FIXUP_TOP_OF_STACK %rdi
- movq %rsp,%rdi
- call syscall_trace_enter
+- leaq -REST_SKIP(%rsp), %rdi
++ movq %rsp, %rdi
+ movq $AUDIT_ARCH_X86_64, %rsi
+ call syscall_trace_enter_phase1
+ test %rax, %rax
+ jnz tracesys_phase2 /* if needed, run the slow path */
+- LOAD_ARGS 0 /* else restore clobbered regs */
++
++ pax_erase_kstack
+
++ LOAD_ARGS /* else restore clobbered regs */
+ jmp system_call_fastpath /* and return to the fast path */
+
+ tracesys_phase2:
+@@ -510,12 +983,14 @@ tracesys_phase2:
+ movq %rax,%rdx
+ call syscall_trace_enter_phase2
+
+ pax_erase_kstack
+
/*
* Reload arg registers from stack in case ptrace changed them.
- * We don't reload %rax because syscall_trace_enter() returned
+ * We don't reload %rax because syscall_trace_entry_phase2() returned
* the value it wants us to use in the table lookup.
*/
- LOAD_ARGS ARGOFFSET, 1
@@ -23823,7 +23788,7 @@ index 02553d6..81f4dc7 100644
RESTORE_REST
#if __SYSCALL_MASK == ~0
cmpq $__NR_syscall_max,%rax
-@@ -766,7 +1249,9 @@ GLOBAL(int_with_check)
+@@ -545,7 +1020,9 @@ GLOBAL(int_with_check)
andl %edi,%edx
jnz int_careful
andl $~TS_COMPAT,TI_status(%rcx)
@@ -23834,7 +23799,7 @@ index 02553d6..81f4dc7 100644
/* Either reschedule or signal or syscall exit tracking needed. */
/* First do a reschedule test. */
-@@ -812,7 +1297,7 @@ int_restore_rest:
+@@ -591,7 +1068,7 @@ int_restore_rest:
TRACE_IRQS_OFF
jmp int_with_check
CFI_ENDPROC
@@ -23843,7 +23808,7 @@ index 02553d6..81f4dc7 100644
.macro FORK_LIKE func
ENTRY(stub_\func)
-@@ -825,9 +1310,10 @@ ENTRY(stub_\func)
+@@ -604,9 +1081,10 @@ ENTRY(stub_\func)
DEFAULT_FRAME 0 8 /* offset 8: return address */
call sys_\func
RESTORE_TOP_OF_STACK %r11, 8
@@ -23856,7 +23821,7 @@ index 02553d6..81f4dc7 100644
.endm
.macro FIXED_FRAME label,func
-@@ -837,9 +1323,10 @@ ENTRY(\label)
+@@ -616,9 +1094,10 @@ ENTRY(\label)
FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
call \func
RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
@@ -23868,7 +23833,7 @@ index 02553d6..81f4dc7 100644
.endm
FORK_LIKE clone
-@@ -847,19 +1334,6 @@ END(\label)
+@@ -626,19 +1105,6 @@ END(\label)
FORK_LIKE vfork
FIXED_FRAME stub_iopl, sys_iopl
@@ -23888,7 +23853,7 @@ index 02553d6..81f4dc7 100644
ENTRY(stub_execve)
CFI_STARTPROC
addq $8, %rsp
-@@ -871,7 +1345,7 @@ ENTRY(stub_execve)
+@@ -650,7 +1116,7 @@ ENTRY(stub_execve)
RESTORE_REST
jmp int_ret_from_sys_call
CFI_ENDPROC
@@ -23897,7 +23862,7 @@ index 02553d6..81f4dc7 100644
/*
* sigreturn is special because it needs to restore all registers on return.
-@@ -888,7 +1362,7 @@ ENTRY(stub_rt_sigreturn)
+@@ -667,7 +1133,7 @@ ENTRY(stub_rt_sigreturn)
RESTORE_REST
jmp int_ret_from_sys_call
CFI_ENDPROC
@@ -23906,7 +23871,7 @@ index 02553d6..81f4dc7 100644
#ifdef CONFIG_X86_X32_ABI
ENTRY(stub_x32_rt_sigreturn)
-@@ -902,7 +1376,7 @@ ENTRY(stub_x32_rt_sigreturn)
+@@ -681,7 +1147,7 @@ ENTRY(stub_x32_rt_sigreturn)
RESTORE_REST
jmp int_ret_from_sys_call
CFI_ENDPROC
@@ -23915,7 +23880,7 @@ index 02553d6..81f4dc7 100644
ENTRY(stub_x32_execve)
CFI_STARTPROC
-@@ -916,7 +1390,7 @@ ENTRY(stub_x32_execve)
+@@ -695,7 +1161,7 @@ ENTRY(stub_x32_execve)
RESTORE_REST
jmp int_ret_from_sys_call
CFI_ENDPROC
@@ -23924,7 +23889,7 @@ index 02553d6..81f4dc7 100644
#endif
-@@ -953,7 +1427,7 @@ vector=vector+1
+@@ -732,7 +1198,7 @@ vector=vector+1
2: jmp common_interrupt
.endr
CFI_ENDPROC
@@ -23933,7 +23898,7 @@ index 02553d6..81f4dc7 100644
.previous
END(interrupt)
-@@ -970,8 +1444,8 @@ END(interrupt)
+@@ -749,8 +1215,8 @@ END(interrupt)
/* 0(%rsp): ~(interrupt number) */
.macro interrupt func
/* reserve pt_regs for scratch regs and rbp */
@@ -23944,7 +23909,7 @@ index 02553d6..81f4dc7 100644
SAVE_ARGS_IRQ
call \func
.endm
-@@ -998,14 +1472,14 @@ ret_from_intr:
+@@ -773,14 +1239,14 @@ ret_from_intr:
/* Restore saved previous stack */
popq %rsi
@@ -23963,7 +23928,7 @@ index 02553d6..81f4dc7 100644
je retint_kernel
/* Interrupt came from user space */
-@@ -1027,12 +1501,35 @@ retint_swapgs: /* return to user-space */
+@@ -802,12 +1268,35 @@ retint_swapgs: /* return to user-space */
* The iretq could re-enable interrupts:
*/
DISABLE_INTERRUPTS(CLBR_ANY)
@@ -23999,7 +23964,7 @@ index 02553d6..81f4dc7 100644
/*
* The iretq could re-enable interrupts:
*/
-@@ -1070,15 +1567,15 @@ native_irq_return_ldt:
+@@ -845,15 +1334,15 @@ native_irq_return_ldt:
SWAPGS
movq PER_CPU_VAR(espfix_waddr),%rdi
movq %rax,(0*8)(%rdi) /* RAX */
@@ -24020,7 +23985,7 @@ index 02553d6..81f4dc7 100644
movq %rax,(4*8)(%rdi)
andl $0xffff0000,%eax
popq_cfi %rdi
-@@ -1132,7 +1629,7 @@ ENTRY(retint_kernel)
+@@ -907,7 +1396,7 @@ ENTRY(retint_kernel)
jmp exit_intr
#endif
CFI_ENDPROC
@@ -24028,8 +23993,8 @@ index 02553d6..81f4dc7 100644
+ENDPROC(common_interrupt)
/*
- * End of kprobes section
-@@ -1151,7 +1648,7 @@ ENTRY(\sym)
+ * APIC interrupts.
+@@ -921,7 +1410,7 @@ ENTRY(\sym)
interrupt \do_sym
jmp ret_from_intr
CFI_ENDPROC
@@ -24038,67 +24003,38 @@ index 02553d6..81f4dc7 100644
.endm
#ifdef CONFIG_TRACING
-@@ -1239,7 +1736,7 @@ ENTRY(\sym)
- call \do_sym
- jmp error_exit /* %ebx: no swapgs flag */
- CFI_ENDPROC
--END(\sym)
-+ENDPROC(\sym)
- .endm
-
- .macro paranoidzeroentry sym do_sym
-@@ -1257,10 +1754,10 @@ ENTRY(\sym)
- call \do_sym
- jmp paranoid_exit /* %ebx: no swapgs flag */
- CFI_ENDPROC
--END(\sym)
-+ENDPROC(\sym)
- .endm
-
+@@ -994,7 +1483,7 @@ apicinterrupt IRQ_WORK_VECTOR \
+ /*
+ * Exception entry points.
+ */
-#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
+#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
- .macro paranoidzeroentry_ist sym do_sym ist
+
+ .macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1
ENTRY(\sym)
- INTR_FRAME
-@@ -1273,12 +1770,18 @@ ENTRY(\sym)
- TRACE_IRQS_OFF_DEBUG
- movq %rsp,%rdi /* pt_regs pointer */
- xorl %esi,%esi /* no error code */
+@@ -1045,6 +1534,12 @@ ENTRY(\sym)
+ .endif
+
+ .if \shift_ist != -1
+#ifdef CONFIG_SMP
+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
+ lea init_tss(%r13), %r13
+#else
+ lea init_tss(%rip), %r13
+#endif
- subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
- call \do_sym
- addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
- jmp paranoid_exit /* %ebx: no swapgs flag */
- CFI_ENDPROC
--END(\sym)
-+ENDPROC(\sym)
- .endm
+ subq $EXCEPTION_STKSZ, INIT_TSS_IST(\shift_ist)
+ .endif
- .macro errorentry sym do_sym
-@@ -1296,7 +1799,7 @@ ENTRY(\sym)
- call \do_sym
- jmp error_exit /* %ebx: no swapgs flag */
- CFI_ENDPROC
--END(\sym)
-+ENDPROC(\sym)
- .endm
+@@ -1061,7 +1556,7 @@ ENTRY(\sym)
+ .endif
- #ifdef CONFIG_TRACING
-@@ -1327,7 +1830,7 @@ ENTRY(\sym)
- call \do_sym
- jmp paranoid_exit /* %ebx: no swapgs flag */
CFI_ENDPROC
-END(\sym)
+ENDPROC(\sym)
.endm
- zeroentry divide_error do_divide_error
-@@ -1357,9 +1860,10 @@ gs_change:
+ #ifdef CONFIG_TRACING
+@@ -1102,9 +1597,10 @@ gs_change:
2: mfence /* workaround */
SWAPGS
popfq_cfi
@@ -24110,7 +24046,7 @@ index 02553d6..81f4dc7 100644
_ASM_EXTABLE(gs_change,bad_gs)
.section .fixup,"ax"
-@@ -1387,9 +1891,10 @@ ENTRY(do_softirq_own_stack)
+@@ -1132,9 +1628,10 @@ ENTRY(do_softirq_own_stack)
CFI_DEF_CFA_REGISTER rsp
CFI_ADJUST_CFA_OFFSET -8
decl PER_CPU_VAR(irq_count)
@@ -24121,8 +24057,8 @@ index 02553d6..81f4dc7 100644
+ENDPROC(do_softirq_own_stack)
#ifdef CONFIG_XEN
- zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
-@@ -1427,7 +1932,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
+ idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
+@@ -1172,7 +1669,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
decl PER_CPU_VAR(irq_count)
jmp error_exit
CFI_ENDPROC
@@ -24131,7 +24067,7 @@ index 02553d6..81f4dc7 100644
/*
* Hypervisor uses this for application faults while it executes.
-@@ -1486,7 +1991,7 @@ ENTRY(xen_failsafe_callback)
+@@ -1231,7 +1728,7 @@ ENTRY(xen_failsafe_callback)
SAVE_ALL
jmp error_exit
CFI_ENDPROC
@@ -24140,7 +24076,7 @@ index 02553d6..81f4dc7 100644
apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
xen_hvm_callback_vector xen_evtchn_do_upcall
-@@ -1538,18 +2043,33 @@ ENTRY(paranoid_exit)
+@@ -1278,18 +1775,33 @@ ENTRY(paranoid_exit)
DEFAULT_FRAME
DISABLE_INTERRUPTS(CLBR_NONE)
TRACE_IRQS_OFF_DEBUG
@@ -24176,7 +24112,7 @@ index 02553d6..81f4dc7 100644
jmp irq_return
paranoid_userspace:
GET_THREAD_INFO(%rcx)
-@@ -1578,7 +2098,7 @@ paranoid_schedule:
+@@ -1318,7 +1830,7 @@ paranoid_schedule:
TRACE_IRQS_OFF
jmp paranoid_userspace
CFI_ENDPROC
@@ -24185,9 +24121,9 @@ index 02553d6..81f4dc7 100644
/*
* Exception entry point. This expects an error code/orig_rax on the stack.
-@@ -1605,12 +2125,23 @@ ENTRY(error_entry)
- movq_cfi r14, R14+8
- movq_cfi r15, R15+8
+@@ -1345,12 +1857,23 @@ ENTRY(error_entry)
+ movq %r14, R14+8(%rsp)
+ movq %r15, R15+8(%rsp)
xorl %ebx,%ebx
- testl $3,CS+8(%rsp)
+ testb $3,CS+8(%rsp)
@@ -24210,7 +24146,7 @@ index 02553d6..81f4dc7 100644
ret
/*
-@@ -1644,7 +2175,7 @@ error_bad_iret:
+@@ -1385,7 +1908,7 @@ error_bad_iret:
decl %ebx /* Return to usergs */
jmp error_sti
CFI_ENDPROC
@@ -24219,7 +24155,7 @@ index 02553d6..81f4dc7 100644
/* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
-@@ -1655,7 +2186,7 @@ ENTRY(error_exit)
+@@ -1396,7 +1919,7 @@ ENTRY(error_exit)
DISABLE_INTERRUPTS(CLBR_NONE)
TRACE_IRQS_OFF
GET_THREAD_INFO(%rcx)
@@ -24228,7 +24164,7 @@ index 02553d6..81f4dc7 100644
jne retint_kernel
LOCKDEP_SYS_EXIT_IRQ
movl TI_flags(%rcx),%edx
-@@ -1664,7 +2195,7 @@ ENTRY(error_exit)
+@@ -1405,7 +1928,7 @@ ENTRY(error_exit)
jnz retint_careful
jmp retint_swapgs
CFI_ENDPROC
@@ -24237,7 +24173,7 @@ index 02553d6..81f4dc7 100644
/*
* Test if a given stack is an NMI stack or not.
-@@ -1722,9 +2253,11 @@ ENTRY(nmi)
+@@ -1463,9 +1986,11 @@ ENTRY(nmi)
* If %cs was not the kernel segment, then the NMI triggered in user
* space, which means it is definitely not nested.
*/
@@ -24250,7 +24186,7 @@ index 02553d6..81f4dc7 100644
/*
* Check the special variable on the stack to see if NMIs are
* executing.
-@@ -1758,8 +2291,7 @@ nested_nmi:
+@@ -1499,8 +2024,7 @@ nested_nmi:
1:
/* Set up the interrupted NMIs stack to jump to repeat_nmi */
@@ -24260,7 +24196,7 @@ index 02553d6..81f4dc7 100644
CFI_ADJUST_CFA_OFFSET 1*8
leaq -10*8(%rsp), %rdx
pushq_cfi $__KERNEL_DS
-@@ -1777,6 +2309,7 @@ nested_nmi_out:
+@@ -1518,6 +2042,7 @@ nested_nmi_out:
CFI_RESTORE rdx
/* No need to check faults here */
@@ -24268,7 +24204,7 @@ index 02553d6..81f4dc7 100644
INTERRUPT_RETURN
CFI_RESTORE_STATE
-@@ -1873,13 +2406,13 @@ end_repeat_nmi:
+@@ -1614,13 +2139,13 @@ end_repeat_nmi:
subq $ORIG_RAX-R15, %rsp
CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
/*
@@ -24284,7 +24220,7 @@ index 02553d6..81f4dc7 100644
DEFAULT_FRAME 0
/*
-@@ -1889,9 +2422,9 @@ end_repeat_nmi:
+@@ -1630,9 +2155,9 @@ end_repeat_nmi:
* NMI itself takes a page fault, the page fault that was preempted
* will read the information from the NMI page fault and not the
* origin fault. Save it off and restore it if it changes.
@@ -24296,7 +24232,7 @@ index 02553d6..81f4dc7 100644
/* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
movq %rsp,%rdi
-@@ -1900,31 +2433,36 @@ end_repeat_nmi:
+@@ -1641,29 +2166,34 @@ end_repeat_nmi:
/* Did the NMI take a page fault? Restore cr2 if it did */
movq %cr2, %rcx
@@ -24336,8 +24272,6 @@ index 02553d6..81f4dc7 100644
-END(ignore_sysret)
+ENDPROC(ignore_sysret)
- /*
- * End of kprobes section
diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c
index 94d857f..5bce89c 100644
--- a/arch/x86/kernel/espfix_64.c
@@ -24384,9 +24318,18 @@ index 94d857f..5bce89c 100644
unlock_done:
mutex_unlock(&espfix_init_mutex);
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
-index 1ffc32d..e52c745 100644
+index 3386dc9..28bdf81 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
+@@ -88,7 +88,7 @@ static unsigned long text_ip_addr(unsigned long ip)
+ * kernel identity mapping to modify code.
+ */
+ if (within(ip, (unsigned long)_text, (unsigned long)_etext))
+- ip = (unsigned long)__va(__pa_symbol(ip));
++ ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
+
+ return ip;
+ }
@@ -104,6 +104,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
{
unsigned char replaced[MCOUNT_INSN_SIZE];
@@ -24405,16 +24348,7 @@ index 1ffc32d..e52c745 100644
ftrace_update_func = ip;
/* Make sure the breakpoints see the ftrace_update_func update */
-@@ -306,7 +308,7 @@ static int ftrace_write(unsigned long ip, const char *val, int size)
- * kernel identity mapping to modify code.
- */
- if (within(ip, (unsigned long)_text, (unsigned long)_etext))
-- ip = (unsigned long)__va(__pa_symbol(ip));
-+ ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
-
- return probe_kernel_write((void *)ip, val, size);
- }
-@@ -316,7 +318,7 @@ static int add_break(unsigned long ip, const char *old)
+@@ -310,7 +312,7 @@ static int add_break(unsigned long ip, const char *old)
unsigned char replaced[MCOUNT_INSN_SIZE];
unsigned char brk = BREAKPOINT_INSTRUCTION;
@@ -24423,17 +24357,8 @@ index 1ffc32d..e52c745 100644
return -EFAULT;
/* Make sure it is what we expect it to be */
-@@ -664,7 +666,7 @@ ftrace_modify_code(unsigned long ip, unsigned const char *old_code,
- return ret;
-
- fail_update:
-- probe_kernel_write((void *)ip, &old_code[0], 1);
-+ probe_kernel_write((void *)ktla_ktva(ip), &old_code[0], 1);
- goto out;
- }
-
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
-index 85126cc..1bbce17 100644
+index eda1a86..8f6df48 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -67,12 +67,12 @@ again:
@@ -24477,8 +24402,8 @@ index 85126cc..1bbce17 100644
}
pmd = (physaddr & PMD_MASK) + early_pmd_flags;
pmd_p[pmd_index(address)] = pmd;
-@@ -175,7 +175,6 @@ asmlinkage void __init x86_64_start_kernel(char * real_mode_data)
- if (console_loglevel == 10)
+@@ -175,7 +175,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
+ if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
early_printk("Kernel alive\n");
- clear_page(init_level4_pgt);
@@ -25204,7 +25129,7 @@ index 05fd74f..c3548b1 100644
+EXPORT_SYMBOL(cpu_pgd);
+#endif
diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
-index d5dd808..b6432cf 100644
+index a9a4229..6f4d476 100644
--- a/arch/x86/kernel/i387.c
+++ b/arch/x86/kernel/i387.c
@@ -51,7 +51,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
@@ -25217,7 +25142,7 @@ index d5dd808..b6432cf 100644
/*
diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
-index 2e977b5..5f2c273 100644
+index e7cc537..67d7372 100644
--- a/arch/x86/kernel/i8259.c
+++ b/arch/x86/kernel/i8259.c
@@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
@@ -25226,10 +25151,10 @@ index 2e977b5..5f2c273 100644
disable_irq_nosync(irq);
- io_apic_irqs &= ~(1<<irq);
+ io_apic_irqs &= ~(1UL<<irq);
- irq_set_chip_and_handler_name(irq, &i8259A_chip, handle_level_irq,
- i8259A_chip.name);
+ irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
enable_irq(irq);
-@@ -209,7 +209,7 @@ spurious_8259A_irq:
+ }
+@@ -208,7 +208,7 @@ spurious_8259A_irq:
"spurious 8259A interrupt: IRQ%d.\n", irq);
spurious_irq_mask |= irqmask;
}
@@ -25238,7 +25163,7 @@ index 2e977b5..5f2c273 100644
/*
* Theoretically we do not have to handle this IRQ,
* but in Linux this does not cause problems and is
-@@ -332,14 +332,16 @@ static void init_8259A(int auto_eoi)
+@@ -349,14 +349,16 @@ static void init_8259A(int auto_eoi)
/* (slave's support for AEOI in flat mode is to be investigated) */
outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
@@ -25318,10 +25243,10 @@ index 4ddaf66..49d5c18 100644
regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
t->iopl = level << 12;
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
-index d99f31d..1c0f466 100644
+index 3790775..53717dc 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
-@@ -21,7 +21,7 @@
+@@ -22,7 +22,7 @@
#define CREATE_TRACE_POINTS
#include <asm/trace/irq_vectors.h>
@@ -25330,9 +25255,9 @@ index d99f31d..1c0f466 100644
/* Function pointer for generic interrupt vector handling */
void (*x86_platform_ipi_callback)(void) = NULL;
-@@ -125,9 +125,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
- seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
- seq_printf(p, " Machine check polls\n");
+@@ -132,9 +132,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
+ seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
+ seq_printf(p, " Hypervisor callback interrupts\n");
#endif
- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
@@ -25342,7 +25267,7 @@ index d99f31d..1c0f466 100644
#endif
return 0;
}
-@@ -167,7 +167,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
+@@ -174,7 +174,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
u64 arch_irq_stat(void)
{
@@ -25352,7 +25277,7 @@ index d99f31d..1c0f466 100644
}
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
-index d7fcbed..96e715a 100644
+index 63ce838..2ea3e06 100644
--- a/arch/x86/kernel/irq_32.c
+++ b/arch/x86/kernel/irq_32.c
@@ -29,6 +29,8 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);
@@ -25380,51 +25305,41 @@ index d7fcbed..96e715a 100644
if (sysctl_panic_on_stackoverflow)
panic("low stack detected by irq handler - check messages\n");
}
-@@ -59,8 +62,8 @@ static inline void print_stack_overflow(void) { }
- * per-CPU IRQ handling contexts (thread information and stack)
- */
- union irq_ctx {
-- struct thread_info tinfo;
-- u32 stack[THREAD_SIZE/sizeof(u32)];
-+ unsigned long previous_esp;
-+ u32 stack[THREAD_SIZE/sizeof(u32)];
- } __attribute__((aligned(THREAD_SIZE)));
-
- static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx);
-@@ -80,10 +83,9 @@ static void call_on_stack(void *func, void *stack)
+@@ -84,10 +87,9 @@ static inline void *current_stack(void)
static inline int
execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
{
-- union irq_ctx *curctx, *irqctx;
-+ union irq_ctx *irqctx;
- u32 *isp, arg1, arg2;
+- struct irq_stack *curstk, *irqstk;
++ struct irq_stack *irqstk;
+ u32 *isp, *prev_esp, arg1, arg2;
-- curctx = (union irq_ctx *) current_thread_info();
- irqctx = __this_cpu_read(hardirq_ctx);
+- curstk = (struct irq_stack *) current_stack();
+ irqstk = __this_cpu_read(hardirq_stack);
/*
-@@ -92,13 +94,16 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
+@@ -96,15 +98,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
* handler) we can't do that and just have to keep using the
* current stack (which is the irq stack already after all)
*/
-- if (unlikely(curctx == irqctx))
-+ if (unlikely((void *)current_stack_pointer - (void *)irqctx < THREAD_SIZE))
+- if (unlikely(curstk == irqstk))
++ if (unlikely((void *)current_stack_pointer - (void *)irqstk < THREAD_SIZE))
return 0;
- /* build the stack frame on the IRQ stack */
-- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
-- irqctx->tinfo.task = curctx->tinfo.task;
-- irqctx->tinfo.previous_esp = current_stack_pointer;
-+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
-+ irqctx->previous_esp = current_stack_pointer;
-+
+- isp = (u32 *) ((char *)irqstk + sizeof(*irqstk));
++ isp = (u32 *) ((char *)irqstk + sizeof(*irqstk) - 8);
+
+ /* Save the next esp at the bottom of the stack */
+ prev_esp = (u32 *)irqstk;
+ *prev_esp = current_stack_pointer;
+
+#ifdef CONFIG_PAX_MEMORY_UDEREF
+ __set_fs(MAKE_MM_SEG(0));
+#endif
-
++
if (unlikely(overflow))
call_on_stack(print_stack_overflow, isp);
-@@ -110,6 +115,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
+
+@@ -115,6 +121,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
: "0" (irq), "1" (desc), "2" (isp),
"D" (desc->handle_irq)
: "memory", "cc", "ecx");
@@ -25436,59 +25351,49 @@ index d7fcbed..96e715a 100644
return 1;
}
-@@ -118,48 +128,34 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
+@@ -123,32 +134,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
*/
void irq_ctx_init(int cpu)
{
-- union irq_ctx *irqctx;
+- struct irq_stack *irqstk;
-
- if (per_cpu(hardirq_ctx, cpu))
+ if (per_cpu(hardirq_stack, cpu))
return;
-- irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
+- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
- THREADINFO_GFP,
- THREAD_SIZE_ORDER));
-- memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
-- irqctx->tinfo.cpu = cpu;
-- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
--
-- per_cpu(hardirq_ctx, cpu) = irqctx;
+- per_cpu(hardirq_stack, cpu) = irqstk;
-
-- irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
+- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
- THREADINFO_GFP,
- THREAD_SIZE_ORDER));
-- memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
-- irqctx->tinfo.cpu = cpu;
-- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
--
-- per_cpu(softirq_ctx, cpu) = irqctx;
+- per_cpu(softirq_stack, cpu) = irqstk;
-
- printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
-- cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
-+ per_cpu(hardirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
-+ per_cpu(softirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
+- cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
++ per_cpu(hardirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
++ per_cpu(softirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
}
void do_softirq_own_stack(void)
{
-- struct thread_info *curctx;
- union irq_ctx *irqctx;
- u32 *isp;
+- struct thread_info *curstk;
+ struct irq_stack *irqstk;
+ u32 *isp, *prev_esp;
-- curctx = current_thread_info();
- irqctx = __this_cpu_read(softirq_ctx);
-- irqctx->tinfo.task = curctx->task;
-- irqctx->tinfo.previous_esp = current_stack_pointer;
-+ irqctx->previous_esp = current_stack_pointer;
+- curstk = current_stack();
+ irqstk = __this_cpu_read(softirq_stack);
/* build the stack frame on the softirq stack */
-- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
-+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
-+
+@@ -158,7 +155,16 @@ void do_softirq_own_stack(void)
+ prev_esp = (u32 *)irqstk;
+ *prev_esp = current_stack_pointer;
+
+#ifdef CONFIG_PAX_MEMORY_UDEREF
+ __set_fs(MAKE_MM_SEG(0));
+#endif
-
++
call_on_stack(__do_softirq, isp);
+
+#ifdef CONFIG_PAX_MEMORY_UDEREF
@@ -25498,7 +25403,7 @@ index d7fcbed..96e715a 100644
}
bool handle_irq(unsigned irq, struct pt_regs *regs)
-@@ -173,7 +169,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
+@@ -172,7 +178,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
if (unlikely(!desc))
return false;
@@ -25508,7 +25413,7 @@ index d7fcbed..96e715a 100644
print_stack_overflow();
desc->handle_irq(irq, desc);
diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
-index 4d1c746..55a22d6 100644
+index e4b503d..824fce8 100644
--- a/arch/x86/kernel/irq_64.c
+++ b/arch/x86/kernel/irq_64.c
@@ -26,6 +26,8 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
@@ -25670,10 +25575,10 @@ index 7ec1d5f..5a7d130 100644
}
diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
-index a1f5b18..9d9e077 100644
+index 93d2c04..36d0e94 100644
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
-@@ -119,9 +119,12 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
+@@ -120,9 +120,12 @@ __synthesize_relative_insn(void *from, void *to, u8 op)
s32 raddr;
} __packed *insn;
@@ -25687,7 +25592,7 @@ index a1f5b18..9d9e077 100644
}
/* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
-@@ -164,7 +167,7 @@ int __kprobes can_boost(kprobe_opcode_t *opcodes)
+@@ -168,7 +171,7 @@ int can_boost(kprobe_opcode_t *opcodes)
kprobe_opcode_t opcode;
kprobe_opcode_t *orig_opcodes = opcodes;
@@ -25696,7 +25601,7 @@ index a1f5b18..9d9e077 100644
return 0; /* Page fault may occur on this address. */
retry:
-@@ -238,9 +241,9 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
+@@ -242,9 +245,9 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
* for the first byte, we can recover the original instruction
* from it and kp->opcode.
*/
@@ -25708,7 +25613,7 @@ index a1f5b18..9d9e077 100644
}
/*
-@@ -332,7 +335,9 @@ int __kprobes __copy_instruction(u8 *dest, u8 *src)
+@@ -336,7 +339,9 @@ int __copy_instruction(u8 *dest, u8 *src)
/* Another subsystem puts a breakpoint, failed to recover */
if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
return 0;
@@ -25718,7 +25623,7 @@ index a1f5b18..9d9e077 100644
#ifdef CONFIG_X86_64
if (insn_rip_relative(&insn)) {
-@@ -359,7 +364,9 @@ int __kprobes __copy_instruction(u8 *dest, u8 *src)
+@@ -363,7 +368,9 @@ int __copy_instruction(u8 *dest, u8 *src)
return 0;
}
disp = (u8 *) dest + insn_offset_displacement(&insn);
@@ -25728,7 +25633,7 @@ index a1f5b18..9d9e077 100644
}
#endif
return insn.length;
-@@ -498,7 +505,7 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k
+@@ -505,7 +512,7 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
* nor set current_kprobe, because it doesn't use single
* stepping.
*/
@@ -25737,7 +25642,7 @@ index a1f5b18..9d9e077 100644
preempt_enable_no_resched();
return;
}
-@@ -515,9 +522,9 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k
+@@ -522,9 +529,9 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
regs->flags &= ~X86_EFLAGS_IF;
/* single step inline if the instruction is an int3 */
if (p->opcode == BREAKPOINT_INSTRUCTION)
@@ -25747,9 +25652,18 @@ index a1f5b18..9d9e077 100644
- regs->ip = (unsigned long)p->ainsn.insn;
+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
}
+ NOKPROBE_SYMBOL(setup_singlestep);
- /*
-@@ -596,7 +603,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
+@@ -574,7 +581,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
+ struct kprobe *p;
+ struct kprobe_ctlblk *kcb;
+
+- if (user_mode_vm(regs))
++ if (user_mode(regs))
+ return 0;
+
+ addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t));
+@@ -609,7 +616,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
setup_singlestep(p, regs, kcb, 0);
return 1;
}
@@ -25758,7 +25672,7 @@ index a1f5b18..9d9e077 100644
/*
* The breakpoint instruction was removed right
* after we hit it. Another cpu has removed
-@@ -642,6 +649,9 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
+@@ -656,6 +663,9 @@ static void __used kretprobe_trampoline_holder(void)
" movq %rax, 152(%rsp)\n"
RESTORE_REGS_STRING
" popfq\n"
@@ -25768,8 +25682,8 @@ index a1f5b18..9d9e077 100644
#else
" pushf\n"
SAVE_REGS_STRING
-@@ -779,7 +789,7 @@ static void __kprobes
- resume_execution(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb)
+@@ -796,7 +806,7 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs,
+ struct kprobe_ctlblk *kcb)
{
unsigned long *tos = stack_addr(regs);
- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
@@ -25777,7 +25691,7 @@ index a1f5b18..9d9e077 100644
unsigned long orig_ip = (unsigned long)p->addr;
kprobe_opcode_t *insn = p->ainsn.insn;
-@@ -961,7 +971,7 @@ kprobe_exceptions_notify(struct notifier_block *self, unsigned long val, void *d
+@@ -979,7 +989,7 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
struct die_args *args = data;
int ret = NOTIFY_DONE;
@@ -25785,20 +25699,20 @@ index a1f5b18..9d9e077 100644
+ if (args->regs && user_mode(args->regs))
return ret;
- switch (val) {
+ if (val == DIE_GPF) {
diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
-index 898160b..758cde8 100644
+index f1314d0..15f3154 100644
--- a/arch/x86/kernel/kprobes/opt.c
+++ b/arch/x86/kernel/kprobes/opt.c
@@ -79,6 +79,7 @@ found:
/* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
- static void __kprobes synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
+ static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
{
+ pax_open_kernel();
#ifdef CONFIG_X86_64
*addr++ = 0x48;
*addr++ = 0xbf;
-@@ -86,6 +87,7 @@ static void __kprobes synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long v
+@@ -86,6 +87,7 @@ static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
*addr++ = 0xb8;
#endif
*(unsigned long *)addr = val;
@@ -25806,16 +25720,16 @@ index 898160b..758cde8 100644
}
asm (
-@@ -335,7 +337,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
+@@ -337,7 +339,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
* Verify if the address gap is in 2GB range, because this uses
* a relative jump.
*/
- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
- if (abs(rel) > 0x7fffffff)
+ if (abs(rel) > 0x7fffffff) {
+ __arch_remove_optimized_kprobe(op, 0);
return -ERANGE;
-
-@@ -350,16 +352,18 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
+@@ -354,16 +356,18 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
op->optinsn.size = ret;
/* Copy arch-dep-instance from template */
@@ -25837,7 +25751,7 @@ index 898160b..758cde8 100644
(u8 *)op->kp.addr + op->optinsn.size);
flush_icache_range((unsigned long) buf,
-@@ -384,7 +388,7 @@ void __kprobes arch_optimize_kprobes(struct list_head *oplist)
+@@ -388,7 +392,7 @@ void arch_optimize_kprobes(struct list_head *oplist)
WARN_ON(kprobe_disabled(&op->kp));
/* Backup instructions which will be replaced by jump address */
@@ -25846,7 +25760,7 @@ index 898160b..758cde8 100644
RELATIVE_ADDR_SIZE);
insn_buf[0] = RELATIVEJUMP_OPCODE;
-@@ -433,7 +437,7 @@ setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
+@@ -436,7 +440,7 @@ int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
/* This kprobe is really able to run optimized path. */
op = container_of(p, struct optimized_kprobe, kp);
/* Detour through copied instructions */
@@ -25937,7 +25851,7 @@ index c37886d..d851d32 100644
error = -EINVAL;
goto out_unlock;
diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
-index 1667b1d..16492c5 100644
+index 72e8e31..f2f1605 100644
--- a/arch/x86/kernel/machine_kexec_32.c
+++ b/arch/x86/kernel/machine_kexec_32.c
@@ -25,7 +25,7 @@
@@ -25967,12 +25881,98 @@ index 1667b1d..16492c5 100644
relocate_kernel_ptr = control_page;
page_list[PA_CONTROL_PAGE] = __pa(control_page);
+diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S
+index c73aecf..4c63630 100644
+--- a/arch/x86/kernel/mcount_64.S
++++ b/arch/x86/kernel/mcount_64.S
+@@ -7,7 +7,7 @@
+ #include <linux/linkage.h>
+ #include <asm/ptrace.h>
+ #include <asm/ftrace.h>
+-
++#include <asm/alternative-asm.h>
+
+ .code64
+ .section .entry.text, "ax"
+@@ -24,8 +24,9 @@
+ #ifdef CONFIG_DYNAMIC_FTRACE
+
+ ENTRY(function_hook)
++ pax_force_retaddr
+ retq
+-END(function_hook)
++ENDPROC(function_hook)
+
+ /* skip is set if stack has been adjusted */
+ .macro ftrace_caller_setup skip=0
+@@ -62,8 +63,9 @@ GLOBAL(ftrace_graph_call)
+ #endif
+
+ GLOBAL(ftrace_stub)
++ pax_force_retaddr
+ retq
+-END(ftrace_caller)
++ENDPROC(ftrace_caller)
+
+ ENTRY(ftrace_regs_caller)
+ /* Save the current flags before compare (in SS location)*/
+@@ -127,7 +129,7 @@ GLOBAL(ftrace_regs_call)
+ popfq
+ jmp ftrace_stub
+
+-END(ftrace_regs_caller)
++ENDPROC(ftrace_regs_caller)
+
+
+ #else /* ! CONFIG_DYNAMIC_FTRACE */
+@@ -145,6 +147,7 @@ ENTRY(function_hook)
+ #endif
+
+ GLOBAL(ftrace_stub)
++ pax_force_retaddr
+ retq
+
+ trace:
+@@ -158,12 +161,13 @@ trace:
+ #endif
+ subq $MCOUNT_INSN_SIZE, %rdi
+
++ pax_force_fptr ftrace_trace_function
+ call *ftrace_trace_function
+
+ MCOUNT_RESTORE_FRAME
+
+ jmp ftrace_stub
+-END(function_hook)
++ENDPROC(function_hook)
+ #endif /* CONFIG_DYNAMIC_FTRACE */
+ #endif /* CONFIG_FUNCTION_TRACER */
+
+@@ -185,8 +189,9 @@ ENTRY(ftrace_graph_caller)
+
+ MCOUNT_RESTORE_FRAME
+
++ pax_force_retaddr
+ retq
+-END(ftrace_graph_caller)
++ENDPROC(ftrace_graph_caller)
+
+ GLOBAL(return_to_handler)
+ subq $24, %rsp
+@@ -202,5 +207,7 @@ GLOBAL(return_to_handler)
+ movq 8(%rsp), %rdx
+ movq (%rsp), %rax
+ addq $24, %rsp
++ pax_force_fptr %rdi
+ jmp *%rdi
++ENDPROC(return_to_handler)
+ #endif
diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
-index 18be189..4a9fe40 100644
+index e69f988..da078ea 100644
--- a/arch/x86/kernel/module.c
+++ b/arch/x86/kernel/module.c
-@@ -43,15 +43,60 @@ do { \
- } while (0)
+@@ -81,17 +81,62 @@ static unsigned long int get_module_load_offset(void)
+ }
#endif
-void *module_alloc(unsigned long size)
@@ -25981,10 +25981,13 @@ index 18be189..4a9fe40 100644
- if (PAGE_ALIGN(size) > MODULES_LEN)
+ if (!size || PAGE_ALIGN(size) > MODULES_LEN)
return NULL;
- return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
-- GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
-+ GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, prot,
- NUMA_NO_NODE, __builtin_return_address(0));
+ return __vmalloc_node_range(size, 1,
+ MODULES_VADDR + get_module_load_offset(),
+- MODULES_END, GFP_KERNEL | __GFP_HIGHMEM,
+- PAGE_KERNEL_EXEC, NUMA_NO_NODE,
++ MODULES_END, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
++ prot, NUMA_NO_NODE,
+ __builtin_return_address(0));
}
+void *module_alloc(unsigned long size)
@@ -26008,7 +26011,7 @@ index 18be189..4a9fe40 100644
+ return NULL;
+
+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
-+ return area ? area->addr : NULL;
++return area ? area->addr : NULL;
+}
+EXPORT_SYMBOL(module_alloc_exec);
+
@@ -26035,7 +26038,7 @@ index 18be189..4a9fe40 100644
#ifdef CONFIG_X86_32
int apply_relocate(Elf32_Shdr *sechdrs,
const char *strtab,
-@@ -62,14 +107,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
+@@ -102,14 +147,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
unsigned int i;
Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
Elf32_Sym *sym;
@@ -26055,7 +26058,7 @@ index 18be189..4a9fe40 100644
/* This is the symbol it is referring to. Note that all
undefined symbols have been resolved. */
sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
-@@ -78,11 +125,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
+@@ -118,11 +165,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
switch (ELF32_R_TYPE(rel[i].r_info)) {
case R_386_32:
/* We add the value into the location given */
@@ -26073,7 +26076,7 @@ index 18be189..4a9fe40 100644
break;
default:
pr_err("%s: Unknown relocation: %u\n",
-@@ -127,21 +178,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
+@@ -167,21 +218,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
case R_X86_64_NONE:
break;
case R_X86_64_64:
@@ -26105,7 +26108,7 @@ index 18be189..4a9fe40 100644
if ((s64)val != *(s32 *)loc)
goto overflow;
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
-index 05266b5..3432443 100644
+index c9603ac..9f88728 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -37,6 +37,7 @@
@@ -26149,19 +26152,64 @@ index 05266b5..3432443 100644
};
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
-index 6fcb49c..5b3f4ff 100644
+index c3e985d..110a36a 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
-@@ -138,7 +138,7 @@ static int __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2
- return handled;
+@@ -98,16 +98,16 @@ fs_initcall(nmi_warning_debugfs);
+
+ static void nmi_max_handler(struct irq_work *w)
+ {
+- struct nmiaction *a = container_of(w, struct nmiaction, irq_work);
++ struct nmiwork *n = container_of(w, struct nmiwork, irq_work);
+ int remainder_ns, decimal_msecs;
+- u64 whole_msecs = ACCESS_ONCE(a->max_duration);
++ u64 whole_msecs = ACCESS_ONCE(n->max_duration);
+
+ remainder_ns = do_div(whole_msecs, (1000 * 1000));
+ decimal_msecs = remainder_ns / 1000;
+
+ printk_ratelimited(KERN_INFO
+ "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
+- a->handler, whole_msecs, decimal_msecs);
++ n->action->handler, whole_msecs, decimal_msecs);
}
+ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
+@@ -134,11 +134,11 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
+ delta = sched_clock() - delta;
+ trace_nmi_handler(a->handler, (int)delta, thishandled);
+
+- if (delta < nmi_longest_ns || delta < a->max_duration)
++ if (delta < nmi_longest_ns || delta < a->work->max_duration)
+ continue;
+
+- a->max_duration = delta;
+- irq_work_queue(&a->irq_work);
++ a->work->max_duration = delta;
++ irq_work_queue(&a->work->irq_work);
+ }
+
+ rcu_read_unlock();
+@@ -148,7 +148,7 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
+ }
+ NOKPROBE_SYMBOL(nmi_handle);
+
-int __register_nmi_handler(unsigned int type, struct nmiaction *action)
+int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
{
struct nmi_desc *desc = nmi_to_desc(type);
unsigned long flags;
-@@ -162,9 +162,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
+@@ -156,7 +156,8 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
+ if (!action->handler)
+ return -EINVAL;
+
+- init_irq_work(&action->irq_work, nmi_max_handler);
++ action->work->action = action;
++ init_irq_work(&action->work->irq_work, nmi_max_handler);
+
+ spin_lock_irqsave(&desc->lock, flags);
+
+@@ -174,9 +175,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
* event confuses some handlers (kdump uses this flag)
*/
if (action->flags & NMI_FLAG_FIRST)
@@ -26173,7 +26221,7 @@ index 6fcb49c..5b3f4ff 100644
spin_unlock_irqrestore(&desc->lock, flags);
return 0;
-@@ -187,7 +187,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
+@@ -199,7 +200,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
if (!strcmp(n->name, name)) {
WARN(in_nmi(),
"Trying to free NMI (%s) from NMI context!\n", n->name);
@@ -26182,8 +26230,8 @@ index 6fcb49c..5b3f4ff 100644
break;
}
}
-@@ -512,6 +512,17 @@ static inline void nmi_nesting_postprocess(void)
- dotraplinkage notrace __kprobes void
+@@ -528,6 +529,17 @@ static inline void nmi_nesting_postprocess(void)
+ dotraplinkage notrace void
do_nmi(struct pt_regs *regs, long error_code)
{
+
@@ -26236,10 +26284,10 @@ index bbb6c73..24a58ef 100644
.lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
.unlock_kick = paravirt_nop,
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
-index 1b10af8..45bfbec 100644
+index 548d25f..f8fb99c 100644
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
-@@ -55,6 +55,9 @@ u64 _paravirt_ident_64(u64 x)
+@@ -56,6 +56,9 @@ u64 _paravirt_ident_64(u64 x)
{
return x;
}
@@ -26249,7 +26297,7 @@ index 1b10af8..45bfbec 100644
void __init default_banner(void)
{
-@@ -141,16 +144,20 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
+@@ -142,16 +145,20 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
if (opfunc == NULL)
/* If there's no function, patch it with a ud2a (BUG) */
@@ -26274,7 +26322,7 @@ index 1b10af8..45bfbec 100644
else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
-@@ -175,7 +182,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
+@@ -176,7 +183,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
if (insn_len > len || start == NULL)
insn_len = len;
else
@@ -26283,7 +26331,7 @@ index 1b10af8..45bfbec 100644
return insn_len;
}
-@@ -299,7 +306,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
+@@ -300,7 +307,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
return this_cpu_read(paravirt_lazy_mode);
}
@@ -26292,7 +26340,7 @@ index 1b10af8..45bfbec 100644
.name = "bare hardware",
.paravirt_enabled = 0,
.kernel_rpl = 0,
-@@ -310,16 +317,16 @@ struct pv_info pv_info = {
+@@ -311,16 +318,16 @@ struct pv_info pv_info = {
#endif
};
@@ -26312,7 +26360,7 @@ index 1b10af8..45bfbec 100644
.save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
.restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
.irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
-@@ -331,7 +338,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
+@@ -332,7 +339,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
#endif
};
@@ -26321,9 +26369,9 @@ index 1b10af8..45bfbec 100644
.cpuid = native_cpuid,
.get_debugreg = native_get_debugreg,
.set_debugreg = native_set_debugreg,
-@@ -389,21 +396,26 @@ __visible struct pv_cpu_ops pv_cpu_ops = {
- .end_context_switch = paravirt_nop,
- };
+@@ -395,21 +402,26 @@ NOKPROBE_SYMBOL(native_get_debugreg);
+ NOKPROBE_SYMBOL(native_set_debugreg);
+ NOKPROBE_SYMBOL(native_load_idt);
-struct pv_apic_ops pv_apic_ops = {
+struct pv_apic_ops pv_apic_ops __read_only= {
@@ -26351,7 +26399,7 @@ index 1b10af8..45bfbec 100644
.read_cr2 = native_read_cr2,
.write_cr2 = native_write_cr2,
-@@ -453,6 +465,7 @@ struct pv_mmu_ops pv_mmu_ops = {
+@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
.make_pud = PTE_IDENT,
.set_pgd = native_set_pgd,
@@ -26359,7 +26407,7 @@ index 1b10af8..45bfbec 100644
#endif
#endif /* PAGETABLE_LEVELS >= 3 */
-@@ -473,6 +486,12 @@ struct pv_mmu_ops pv_mmu_ops = {
+@@ -479,6 +492,12 @@ struct pv_mmu_ops pv_mmu_ops = {
},
.set_fixmap = native_set_fixmap,
@@ -26401,10 +26449,10 @@ index a1da673..b6f5831 100644
patch_site:
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
-index 299d493..2ccb0ee 100644
+index 0497f71..7186c0d 100644
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
-@@ -1339,7 +1339,7 @@ static void __init get_tce_space_from_tar(void)
+@@ -1347,7 +1347,7 @@ static void __init get_tce_space_from_tar(void)
tce_space = be64_to_cpu(readq(target));
tce_space = tce_space & TAR_SW_BITS;
@@ -26427,47 +26475,20 @@ index 35ccf75..7a15747 100644
#define DEBUG 1
diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
-index 6c483ba..d10ce2f 100644
+index 77dd0ad..9ec4723 100644
--- a/arch/x86/kernel/pci-swiotlb.c
+++ b/arch/x86/kernel/pci-swiotlb.c
-@@ -32,7 +32,7 @@ static void x86_swiotlb_free_coherent(struct device *dev, size_t size,
- void *vaddr, dma_addr_t dma_addr,
+@@ -33,7 +33,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,
struct dma_attrs *attrs)
{
-- swiotlb_free_coherent(dev, size, vaddr, dma_addr);
-+ swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
+ if (is_swiotlb_buffer(dma_to_phys(dev, dma_addr)))
+- swiotlb_free_coherent(dev, size, vaddr, dma_addr);
++ swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
+ else
+ dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
}
-
- static struct dma_map_ops swiotlb_dma_ops = {
-diff --git a/arch/x86/kernel/preempt.S b/arch/x86/kernel/preempt.S
-index ca7f0d5..8996469 100644
---- a/arch/x86/kernel/preempt.S
-+++ b/arch/x86/kernel/preempt.S
-@@ -3,12 +3,14 @@
- #include <asm/dwarf2.h>
- #include <asm/asm.h>
- #include <asm/calling.h>
-+#include <asm/alternative-asm.h>
-
- ENTRY(___preempt_schedule)
- CFI_STARTPROC
- SAVE_ALL
- call preempt_schedule
- RESTORE_ALL
-+ pax_force_retaddr
- ret
- CFI_ENDPROC
-
-@@ -19,6 +21,7 @@ ENTRY(___preempt_schedule_context)
- SAVE_ALL
- call preempt_schedule_context
- RESTORE_ALL
-+ pax_force_retaddr
- ret
- CFI_ENDPROC
-
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
-index 3fb8d95..254dc51 100644
+index e127dda..94e384d 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -36,7 +36,8 @@
@@ -26480,16 +26501,16 @@ index 3fb8d95..254dc51 100644
#ifdef CONFIG_X86_64
static DEFINE_PER_CPU(unsigned char, is_idle);
-@@ -92,7 +93,7 @@ void arch_task_cache_init(void)
+@@ -94,7 +95,7 @@ void arch_task_cache_init(void)
task_xstate_cachep =
kmem_cache_create("task_xstate", xstate_size,
__alignof__(union thread_xstate),
- SLAB_PANIC | SLAB_NOTRACK, NULL);
+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
+ setup_xstate_comp();
}
- /*
-@@ -105,7 +106,7 @@ void exit_thread(void)
+@@ -108,7 +109,7 @@ void exit_thread(void)
unsigned long *bp = t->io_bitmap_ptr;
if (bp) {
@@ -26498,7 +26519,7 @@ index 3fb8d95..254dc51 100644
t->io_bitmap_ptr = NULL;
clear_thread_flag(TIF_IO_BITMAP);
-@@ -125,6 +126,9 @@ void flush_thread(void)
+@@ -128,6 +129,9 @@ void flush_thread(void)
{
struct task_struct *tsk = current;
@@ -26508,7 +26529,7 @@ index 3fb8d95..254dc51 100644
flush_ptrace_hw_breakpoint(tsk);
memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
drop_init_fpu(tsk);
-@@ -271,7 +275,7 @@ static void __exit_idle(void)
+@@ -274,7 +278,7 @@ static void __exit_idle(void)
void exit_idle(void)
{
/* idle loop has pid 0 */
@@ -26575,7 +26596,7 @@ index 3fb8d95..254dc51 100644
+}
+#endif
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index 0de43e9..b0211fe 100644
+index 8f3ebfe..cbc731b 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
@@ -26609,7 +26630,7 @@ index 0de43e9..b0211fe 100644
print_symbol("EIP is at %s\n", regs->ip);
printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
-@@ -132,20 +132,21 @@ void release_thread(struct task_struct *dead_task)
+@@ -132,21 +132,22 @@ void release_thread(struct task_struct *dead_task)
int copy_thread(unsigned long clone_flags, unsigned long sp,
unsigned long arg, struct task_struct *p)
{
@@ -26621,6 +26642,7 @@ index 0de43e9..b0211fe 100644
p->thread.sp = (unsigned long) childregs;
p->thread.sp0 = (unsigned long) (childregs+1);
+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
+ memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
if (unlikely(p->flags & PF_KTHREAD)) {
/* kernel thread */
@@ -26635,7 +26657,7 @@ index 0de43e9..b0211fe 100644
childregs->fs = __KERNEL_PERCPU;
childregs->bx = sp; /* function */
childregs->bp = arg;
-@@ -252,7 +253,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -248,7 +249,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
struct thread_struct *prev = &prev_p->thread,
*next = &next_p->thread;
int cpu = smp_processor_id();
@@ -26644,7 +26666,7 @@ index 0de43e9..b0211fe 100644
fpu_switch_t fpu;
/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
-@@ -276,6 +277,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -272,6 +273,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
*/
lazy_save_gs(prev->gs);
@@ -26655,17 +26677,20 @@ index 0de43e9..b0211fe 100644
/*
* Load the per-thread Thread-Local Storage descriptor.
*/
-@@ -314,6 +319,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -310,9 +315,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
*/
arch_end_context_switch(next_p);
+- this_cpu_write(kernel_stack,
+- (unsigned long)task_stack_page(next_p) +
+- THREAD_SIZE - KERNEL_STACK_OFFSET);
+ this_cpu_write(current_task, next_p);
+ this_cpu_write(current_tinfo, &next_p->tinfo);
-+
++ this_cpu_write(kernel_stack, next->sp0);
+
/*
* Restore %gs if needed (which is common)
- */
-@@ -322,8 +330,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -322,8 +327,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
switch_fpu_finish(next_p, fpu);
@@ -26674,13 +26699,13 @@ index 0de43e9..b0211fe 100644
return prev_p;
}
-@@ -353,4 +359,3 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -353,4 +356,3 @@ unsigned long get_wchan(struct task_struct *p)
} while (count++ < 16);
return 0;
}
-
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
-index e2d26ce..d49eb67 100644
+index 5a2c029..ec8611d 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
@@ -26694,9 +26719,9 @@ index e2d26ce..d49eb67 100644
p->thread.usersp = me->thread.usersp;
+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
set_tsk_thread_flag(p, TIF_FORK);
- p->thread.fpu_counter = 0;
p->thread.io_bitmap_ptr = NULL;
-@@ -172,6 +173,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
+
+@@ -171,6 +172,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
savesegment(es, p->thread.es);
savesegment(ds, p->thread.ds);
@@ -26705,7 +26730,7 @@ index e2d26ce..d49eb67 100644
memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
if (unlikely(p->flags & PF_KTHREAD)) {
-@@ -280,7 +283,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -277,7 +280,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
struct thread_struct *prev = &prev_p->thread;
struct thread_struct *next = &next_p->thread;
int cpu = smp_processor_id();
@@ -26714,7 +26739,7 @@ index e2d26ce..d49eb67 100644
unsigned fsindex, gsindex;
fpu_switch_t fpu;
-@@ -334,6 +337,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -331,6 +334,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
if (unlikely(next->ds | prev->ds))
loadsegment(ds, next->ds);
@@ -26725,7 +26750,7 @@ index e2d26ce..d49eb67 100644
/*
* Switch FS and GS.
*
-@@ -407,6 +414,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -404,6 +411,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
prev->usersp = this_cpu_read(old_rsp);
this_cpu_write(old_rsp, next->usersp);
this_cpu_write(current_task, next_p);
@@ -26733,7 +26758,7 @@ index e2d26ce..d49eb67 100644
/*
* If it were not for PREEMPT_ACTIVE we could guarantee that the
-@@ -416,9 +424,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -413,9 +421,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
task_thread_info(prev_p)->saved_preempt_count = this_cpu_read(__preempt_count);
this_cpu_write(__preempt_count, task_thread_info(next_p)->saved_preempt_count);
@@ -26744,7 +26769,7 @@ index e2d26ce..d49eb67 100644
/*
* Now maybe reload the debug registers and handle I/O bitmaps
-@@ -487,12 +493,11 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -485,12 +491,11 @@ unsigned long get_wchan(struct task_struct *p)
if (!p || p == current || p->state == TASK_RUNNING)
return 0;
stack = (unsigned long)task_stack_page(p);
@@ -26760,29 +26785,23 @@ index e2d26ce..d49eb67 100644
ip = *(u64 *)(fp+8);
if (!in_sched_functions(ip))
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
-index 0686fe3..836eed3 100644
+index e510618..5165ac0 100644
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
-@@ -184,14 +184,13 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
- {
- unsigned long context = (unsigned long)regs & ~(THREAD_SIZE - 1);
+@@ -186,10 +186,10 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
unsigned long sp = (unsigned long)&regs->sp;
-- struct thread_info *tinfo;
+ u32 *prev_esp;
- if (context == (sp & ~(THREAD_SIZE - 1)))
+ if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
return sp;
-- tinfo = (struct thread_info *)context;
-- if (tinfo->previous_esp)
-- return tinfo->previous_esp;
-+ sp = *(unsigned long *)context;
-+ if (sp)
-+ return sp;
+- prev_esp = (u32 *)(context);
++ prev_esp = *(u32 **)(context);
+ if (prev_esp)
+ return (unsigned long)prev_esp;
- return (unsigned long)regs;
- }
-@@ -452,6 +451,20 @@ static int putreg(struct task_struct *child,
+@@ -452,6 +452,20 @@ static int putreg(struct task_struct *child,
if (child->thread.gs != value)
return do_arch_prctl(child, ARCH_SET_GS, value);
return 0;
@@ -26803,7 +26822,7 @@ index 0686fe3..836eed3 100644
#endif
}
-@@ -588,7 +601,7 @@ static void ptrace_triggered(struct perf_event *bp,
+@@ -588,7 +602,7 @@ static void ptrace_triggered(struct perf_event *bp,
static unsigned long ptrace_get_dr7(struct perf_event *bp[])
{
int i;
@@ -26812,7 +26831,7 @@ index 0686fe3..836eed3 100644
struct arch_hw_breakpoint *info;
for (i = 0; i < HBP_NUM; i++) {
-@@ -822,7 +835,7 @@ long arch_ptrace(struct task_struct *child, long request,
+@@ -822,7 +836,7 @@ long arch_ptrace(struct task_struct *child, long request,
unsigned long addr, unsigned long data)
{
int ret;
@@ -26821,7 +26840,7 @@ index 0686fe3..836eed3 100644
switch (request) {
/* read the word at location addr in the USER area. */
-@@ -907,14 +920,14 @@ long arch_ptrace(struct task_struct *child, long request,
+@@ -907,14 +921,14 @@ long arch_ptrace(struct task_struct *child, long request,
if ((int) addr < 0)
return -EIO;
ret = do_get_thread_area(child, addr,
@@ -26838,7 +26857,7 @@ index 0686fe3..836eed3 100644
break;
#endif
-@@ -1292,7 +1305,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
+@@ -1292,7 +1306,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
#ifdef CONFIG_X86_64
@@ -26847,7 +26866,7 @@ index 0686fe3..836eed3 100644
[REGSET_GENERAL] = {
.core_note_type = NT_PRSTATUS,
.n = sizeof(struct user_regs_struct) / sizeof(long),
-@@ -1333,7 +1346,7 @@ static const struct user_regset_view user_x86_64_view = {
+@@ -1333,7 +1347,7 @@ static const struct user_regset_view user_x86_64_view = {
#endif /* CONFIG_X86_64 */
#if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
@@ -26856,7 +26875,7 @@ index 0686fe3..836eed3 100644
[REGSET_GENERAL] = {
.core_note_type = NT_PRSTATUS,
.n = sizeof(struct user_regs_struct32) / sizeof(u32),
-@@ -1386,7 +1399,7 @@ static const struct user_regset_view user_x86_32_view = {
+@@ -1386,7 +1400,7 @@ static const struct user_regset_view user_x86_32_view = {
*/
u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
@@ -26865,7 +26884,7 @@ index 0686fe3..836eed3 100644
{
#ifdef CONFIG_X86_64
x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
-@@ -1421,7 +1434,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
+@@ -1421,7 +1435,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
memset(info, 0, sizeof(*info));
info->si_signo = SIGTRAP;
info->si_code = si_code;
@@ -26874,8 +26893,8 @@ index 0686fe3..836eed3 100644
}
void user_single_step_siginfo(struct task_struct *tsk,
-@@ -1441,6 +1454,10 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
- force_sig_info(SIGTRAP, &info, tsk);
+@@ -1455,6 +1469,10 @@ static void do_audit_syscall_entry(struct pt_regs *regs, u32 arch)
+ }
}
+#ifdef CONFIG_GRKERNSEC_SETXID
@@ -26883,11 +26902,11 @@ index 0686fe3..836eed3 100644
+#endif
+
/*
- * We must return the syscall number to actually look up in the table.
- * This can be -1L to skip running any syscall at all.
-@@ -1451,6 +1468,11 @@ long syscall_trace_enter(struct pt_regs *regs)
+ * We can return 0 to resume the syscall or anything else to go to phase
+ * 2. If we resume the syscall, we need to put something appropriate in
+@@ -1562,6 +1580,11 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch,
- user_exit();
+ BUG_ON(regs != task_pt_regs(current));
+#ifdef CONFIG_GRKERNSEC_SETXID
+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
@@ -26897,7 +26916,7 @@ index 0686fe3..836eed3 100644
/*
* If we stepped into a sysenter/syscall insn, it trapped in
* kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
-@@ -1506,6 +1528,11 @@ void syscall_trace_leave(struct pt_regs *regs)
+@@ -1620,6 +1643,11 @@ void syscall_trace_leave(struct pt_regs *regs)
*/
user_exit();
@@ -26942,10 +26961,10 @@ index 2f355d2..e75ed0a 100644
return ret;
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
-index c752cb4..866c432 100644
+index 17962e6..47f55db 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
-@@ -68,6 +68,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
+@@ -69,6 +69,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
void __noreturn machine_real_restart(unsigned int type)
{
@@ -26957,7 +26976,7 @@ index c752cb4..866c432 100644
local_irq_disable();
/*
-@@ -95,7 +100,29 @@ void __noreturn machine_real_restart(unsigned int type)
+@@ -96,7 +101,29 @@ void __noreturn machine_real_restart(unsigned int type)
/* Jump to the identity-mapped low memory code */
#ifdef CONFIG_X86_32
@@ -26988,16 +27007,16 @@ index c752cb4..866c432 100644
"rm" (real_mode_header->machine_real_restart_asm),
"a" (type));
#else
-@@ -470,7 +497,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
- * try to force a triple fault and then cycle between hitting the keyboard
- * controller and doing that
+@@ -500,7 +527,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
+ * This means that this function can never return, it can misbehave
+ * by not rebooting properly and hanging.
*/
-static void native_machine_emergency_restart(void)
+static void __noreturn native_machine_emergency_restart(void)
{
int i;
int attempt = 0;
-@@ -593,13 +620,13 @@ void native_machine_shutdown(void)
+@@ -620,13 +647,13 @@ void native_machine_shutdown(void)
#endif
}
@@ -27013,7 +27032,7 @@ index c752cb4..866c432 100644
{
pr_notice("machine restart\n");
-@@ -608,7 +635,7 @@ static void native_machine_restart(char *__unused)
+@@ -635,7 +662,7 @@ static void native_machine_restart(char *__unused)
__machine_emergency_restart(0);
}
@@ -27022,7 +27041,7 @@ index c752cb4..866c432 100644
{
/* Stop other cpus and apics */
machine_shutdown();
-@@ -618,7 +645,7 @@ static void native_machine_halt(void)
+@@ -645,7 +672,7 @@ static void native_machine_halt(void)
stop_this_cpu(NULL);
}
@@ -27031,7 +27050,7 @@ index c752cb4..866c432 100644
{
if (pm_power_off) {
if (!reboot_force)
-@@ -627,9 +654,10 @@ static void native_machine_power_off(void)
+@@ -654,9 +681,10 @@ static void native_machine_power_off(void)
}
/* A fallback in case there is no PM info available */
tboot_shutdown(TB_SHUTDOWN_HALT);
@@ -27071,7 +27090,7 @@ index 3fd2c69..a444264 100644
identity_mapped:
/* set return address to 0 if not preserving context */
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index ce72964..be8aea7 100644
+index ab08aa2..6d74a3a 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -110,6 +110,7 @@
@@ -27167,7 +27186,7 @@ index ce72964..be8aea7 100644
early_reserve_initrd();
-@@ -947,14 +990,14 @@ void __init setup_arch(char **cmdline_p)
+@@ -955,14 +998,14 @@ void __init setup_arch(char **cmdline_p)
if (!boot_params.hdr.root_flags)
root_mountflags &= ~MS_RDONLY;
@@ -27264,7 +27283,7 @@ index 5cdff03..80fa283 100644
* Up to this point, the boot CPU has been using .init.data
* area. Reload any changed state for the boot CPU.
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
-index b88fc86..99a7057 100644
+index ed37a76..39f936e 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp)
@@ -27276,19 +27295,20 @@ index b88fc86..99a7057 100644
#else /* !CONFIG_X86_32 */
sp = round_down(sp, 16) - 8;
#endif
-@@ -298,9 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
+@@ -298,10 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
}
if (current->mm->context.vdso)
-- restorer = VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
-+ restorer = (void __force_user *)VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
+- restorer = current->mm->context.vdso +
+- selected_vdso32->sym___kernel_sigreturn;
++ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_sigreturn);
else
- restorer = &frame->retcode;
+ restorer = (void __user *)&frame->retcode;
if (ksig->ka.sa.sa_flags & SA_RESTORER)
restorer = ksig->ka.sa.sa_restorer;
-@@ -314,7 +314,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
+@@ -315,7 +314,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
* reasons and because gdb uses it as a signature to notice
* signal handler stack frames.
*/
@@ -27297,19 +27317,20 @@ index b88fc86..99a7057 100644
if (err)
return -EFAULT;
-@@ -361,7 +361,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
+@@ -362,8 +361,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
save_altstack_ex(&frame->uc.uc_stack, regs->sp);
/* Set up to return from userspace. */
-- restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
+- restorer = current->mm->context.vdso +
+- selected_vdso32->sym___kernel_rt_sigreturn;
+ if (current->mm->context.vdso)
-+ restorer = (void __force_user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
++ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_rt_sigreturn);
+ else
+ restorer = (void __user *)&frame->retcode;
if (ksig->ka.sa.sa_flags & SA_RESTORER)
restorer = ksig->ka.sa.sa_restorer;
put_user_ex(restorer, &frame->pretcode);
-@@ -373,7 +376,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
+@@ -375,7 +376,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
* reasons and because gdb uses it as a signature to notice
* signal handler stack frames.
*/
@@ -27318,7 +27339,7 @@ index b88fc86..99a7057 100644
} put_user_catch(err);
err |= copy_siginfo_to_user(&frame->info, &ksig->info);
-@@ -609,7 +612,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
+@@ -611,7 +612,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
{
int usig = signr_convert(ksig->sig);
sigset_t *set = sigmask_to_save();
@@ -27332,7 +27353,7 @@ index b88fc86..99a7057 100644
/* Set up the stack frame */
if (is_ia32_frame()) {
-@@ -620,7 +628,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
+@@ -622,7 +628,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
} else if (is_x32_frame()) {
return x32_setup_rt_frame(ksig, cset, regs);
} else {
@@ -27342,7 +27363,7 @@ index b88fc86..99a7057 100644
}
diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
-index 7c3a5a6..f0a8961 100644
+index be8e1bd..a3d93fa 100644
--- a/arch/x86/kernel/smp.c
+++ b/arch/x86/kernel/smp.c
@@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
@@ -27355,10 +27376,10 @@ index 7c3a5a6..f0a8961 100644
.smp_prepare_cpus = native_smp_prepare_cpus,
.smp_cpus_done = native_smp_cpus_done,
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
-index 68287653..3597685 100644
+index 668d8f2..84a9d54 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
-@@ -229,14 +229,17 @@ static void notrace start_secondary(void *unused)
+@@ -194,14 +194,17 @@ static void notrace start_secondary(void *unused)
enable_start_cpu0 = 0;
@@ -27380,7 +27401,7 @@ index 68287653..3597685 100644
/*
* Check TSC synchronization with the BP:
*/
-@@ -756,8 +759,9 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
+@@ -765,8 +768,9 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
alternatives_enable_smp();
idle->thread.sp = (unsigned long) (((struct pt_regs *)
@@ -27391,24 +27412,21 @@ index 68287653..3597685 100644
#ifdef CONFIG_X86_32
/* Stack for startup_32 can be just as for start_secondary onwards */
-@@ -765,11 +769,13 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
- #else
+@@ -775,10 +779,10 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
clear_tsk_thread_flag(idle, TIF_FORK);
initial_gs = per_cpu_offset(cpu);
+ #endif
- per_cpu(kernel_stack, cpu) =
- (unsigned long)task_stack_page(idle) -
- KERNEL_STACK_OFFSET + THREAD_SIZE;
+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
- #endif
-+
+ pax_open_kernel();
early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
+ pax_close_kernel();
-+
initial_code = (unsigned long)start_secondary;
stack_start = idle->thread.sp;
-@@ -918,6 +924,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
+@@ -918,6 +922,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
/* the FPU context is blank, nobody can own it */
__cpu_disable_lazy_restore(cpu);
@@ -27423,7 +27441,7 @@ index 68287653..3597685 100644
+
err = do_boot_cpu(apicid, cpu, tidle);
if (err) {
- pr_debug("do_boot_cpu failed %d\n", err);
+ pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu);
diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
index 9b4d51d..5d28b58 100644
--- a/arch/x86/kernel/step.c
@@ -27803,7 +27821,7 @@ index 91a4496..bb87552 100644
#ifdef CONFIG_DEBUG_FS
diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
-index 24d3c91..d06b473 100644
+index 0fa2960..91eabbe 100644
--- a/arch/x86/kernel/time.c
+++ b/arch/x86/kernel/time.c
@@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
@@ -27880,10 +27898,10 @@ index 1c113db..287b42e 100644
static int trace_irq_vector_refcount;
static DEFINE_MUTEX(irq_vector_mutex);
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index b1d9002..04013df 100644
+index 07ab8e9..99c8456 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
-@@ -66,7 +66,7 @@
+@@ -67,7 +67,7 @@
#include <asm/proto.h>
/* No need to be aligned, but done to keep all IDTs defined the same way. */
@@ -27892,7 +27910,7 @@ index b1d9002..04013df 100644
#else
#include <asm/processor-flags.h>
#include <asm/setup.h>
-@@ -75,7 +75,7 @@ asmlinkage int system_call(void);
+@@ -76,7 +76,7 @@ asmlinkage int system_call(void);
#endif
/* Must be page-aligned because the real IDT is used in a fixmap. */
@@ -27901,10 +27919,10 @@ index b1d9002..04013df 100644
DECLARE_BITMAP(used_vectors, NR_VECTORS);
EXPORT_SYMBOL_GPL(used_vectors);
-@@ -107,11 +107,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
+@@ -108,11 +108,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
}
- static int __kprobes
+ static nokprobe_inline int
-do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
+do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
struct pt_regs *regs, long error_code)
@@ -27915,7 +27933,7 @@ index b1d9002..04013df 100644
/*
* Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
* On nmi (interrupt 2), do_trap should not be called.
-@@ -124,12 +124,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
+@@ -125,12 +125,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
return -1;
}
#endif
@@ -27941,16 +27959,16 @@ index b1d9002..04013df 100644
return 0;
}
-@@ -137,7 +149,7 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
+@@ -169,7 +181,7 @@ static siginfo_t *fill_trap_info(struct pt_regs *regs, int signr, int trapnr,
}
- static void __kprobes
+ static void
-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
long error_code, siginfo_t *info)
{
struct task_struct *tsk = current;
-@@ -161,7 +173,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
+@@ -193,7 +205,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
printk_ratelimit()) {
pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
@@ -27959,7 +27977,7 @@ index b1d9002..04013df 100644
regs->ip, regs->sp, error_code);
print_vma_addr(" in ", regs->ip);
pr_cont("\n");
-@@ -259,6 +271,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
+@@ -274,6 +286,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
tsk->thread.error_code = error_code;
tsk->thread.trap_nr = X86_TRAP_DF;
@@ -27971,7 +27989,7 @@ index b1d9002..04013df 100644
#ifdef CONFIG_DOUBLEFAULT
df_debug(regs, error_code);
#endif
-@@ -281,7 +298,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
+@@ -296,7 +313,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
conditional_sti(regs);
#ifdef CONFIG_X86_32
@@ -27980,7 +27998,7 @@ index b1d9002..04013df 100644
local_irq_enable();
handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
goto exit;
-@@ -289,18 +306,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
+@@ -304,18 +321,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
#endif
tsk = current;
@@ -28025,7 +28043,7 @@ index b1d9002..04013df 100644
tsk->thread.error_code = error_code;
tsk->thread.trap_nr = X86_TRAP_GP;
-@@ -404,13 +445,16 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
+@@ -427,13 +468,16 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
container_of(task_pt_regs(current),
struct bad_iret_stack, regs);
@@ -28042,8 +28060,8 @@ index b1d9002..04013df 100644
+ BUG_ON(!user_mode(&new_stack->regs));
return new_stack;
}
- #endif
-@@ -490,7 +534,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
+ NOKPROBE_SYMBOL(fixup_bad_iret);
+@@ -519,7 +563,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
/* It's safe to allow irq's after DR6 has been saved */
preempt_conditional_sti(regs);
@@ -28052,7 +28070,7 @@ index b1d9002..04013df 100644
handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
X86_TRAP_DB);
preempt_conditional_cli(regs);
-@@ -505,7 +549,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
+@@ -534,7 +578,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
* We already checked v86 mode above, so we can check for kernel mode
* by just checking the CPL of CS.
*/
@@ -28061,7 +28079,7 @@ index b1d9002..04013df 100644
tsk->thread.debugreg6 &= ~DR_STEP;
set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
regs->flags &= ~X86_EFLAGS_TF;
-@@ -537,7 +581,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
+@@ -567,7 +611,7 @@ static void math_error(struct pt_regs *regs, int error_code, int trapnr)
return;
conditional_sti(regs);
@@ -28071,7 +28089,7 @@ index b1d9002..04013df 100644
if (!fixup_exception(regs)) {
task->thread.error_code = error_code;
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
-index b20bced..17532ba 100644
+index 5054497..139f8f8 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -150,7 +150,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)
@@ -28084,10 +28102,10 @@ index b20bced..17532ba 100644
/*
diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
-index 2ed8459..7cf329f 100644
+index 5d1cbfe..2a21feb 100644
--- a/arch/x86/kernel/uprobes.c
+++ b/arch/x86/kernel/uprobes.c
-@@ -629,7 +629,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
+@@ -845,7 +845,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
int ret = NOTIFY_DONE;
/* We are only interested in userspace traps */
@@ -28096,9 +28114,9 @@ index 2ed8459..7cf329f 100644
return NOTIFY_DONE;
switch (val) {
-@@ -719,7 +719,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
+@@ -919,7 +919,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
- if (ncopied != rasize) {
+ if (nleft != rasize) {
pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
- "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
+ "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
@@ -28186,7 +28204,7 @@ index e8edcf5..27f9344 100644
goto cannot_handle;
if ((segoffs >> 16) == BIOSSEG)
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
-index da6b35a..977e9cf 100644
+index 49edf2d..c0d1362 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -26,6 +26,13 @@
@@ -28331,8 +28349,8 @@ index da6b35a..977e9cf 100644
PAGE_ALIGNED_DATA(PAGE_SIZE)
-@@ -172,12 +230,19 @@ SECTIONS
- #endif /* CONFIG_X86_64 */
+@@ -174,12 +232,19 @@ SECTIONS
+ . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
/* Init code and data - will be freed after init */
- . = ALIGN(PAGE_SIZE);
@@ -28354,7 +28372,7 @@ index da6b35a..977e9cf 100644
/*
* percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
* output PHDR, so the next output section - .init.text - should
-@@ -186,12 +251,27 @@ SECTIONS
+@@ -188,12 +253,27 @@ SECTIONS
PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
#endif
@@ -28387,7 +28405,7 @@ index da6b35a..977e9cf 100644
.x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
__x86_cpu_dev_start = .;
-@@ -262,19 +342,12 @@ SECTIONS
+@@ -264,19 +344,12 @@ SECTIONS
}
. = ALIGN(8);
@@ -28408,7 +28426,7 @@ index da6b35a..977e9cf 100644
PERCPU_SECTION(INTERNODE_CACHE_BYTES)
#endif
-@@ -293,16 +366,10 @@ SECTIONS
+@@ -295,16 +368,10 @@ SECTIONS
.smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
__smp_locks = .;
*(.smp_locks)
@@ -28426,7 +28444,7 @@ index da6b35a..977e9cf 100644
/* BSS */
. = ALIGN(PAGE_SIZE);
.bss : AT(ADDR(.bss) - LOAD_OFFSET) {
-@@ -318,6 +385,7 @@ SECTIONS
+@@ -320,6 +387,7 @@ SECTIONS
__brk_base = .;
. += 64 * 1024; /* 64k alignment slop space */
*(.brk_reservation) /* areas brk users have reserved */
@@ -28434,7 +28452,7 @@ index da6b35a..977e9cf 100644
__brk_limit = .;
}
-@@ -344,13 +412,12 @@ SECTIONS
+@@ -346,13 +414,12 @@ SECTIONS
* for the boot processor.
*/
#define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
@@ -28450,12 +28468,12 @@ index da6b35a..977e9cf 100644
#ifdef CONFIG_SMP
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
-index 09ce23a..9293938 100644
+index 957779f..74e405c 100644
--- a/arch/x86/kernel/vsyscall_64.c
+++ b/arch/x86/kernel/vsyscall_64.c
-@@ -56,15 +56,13 @@
+@@ -54,15 +54,13 @@
+
DEFINE_VVAR(int, vgetcpu_mode);
- DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data);
-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
@@ -28470,16 +28488,7 @@ index 09ce23a..9293938 100644
else if (!strcmp("none", str))
vsyscall_mode = NONE;
else
-@@ -101,7 +99,7 @@ void update_vsyscall(struct timekeeper *tk)
- vdata->monotonic_time_sec = tk->xtime_sec
- + tk->wall_to_monotonic.tv_sec;
- vdata->monotonic_time_snsec = tk->xtime_nsec
-- + (tk->wall_to_monotonic.tv_nsec
-+ + ((u64)tk->wall_to_monotonic.tv_nsec
- << tk->shift);
- while (vdata->monotonic_time_snsec >=
- (((u64)NSEC_PER_SEC) << tk->shift)) {
-@@ -323,8 +321,7 @@ do_ret:
+@@ -279,8 +277,7 @@ do_ret:
return true;
sigsegv:
@@ -28489,18 +28498,18 @@ index 09ce23a..9293938 100644
}
/*
-@@ -377,10 +374,7 @@ void __init map_vsyscall(void)
- extern char __vvar_page;
- unsigned long physaddr_vvar_page = __pa_symbol(&__vvar_page);
+@@ -331,10 +328,7 @@ void __init map_vsyscall(void)
+ extern char __vsyscall_page;
+ unsigned long physaddr_vsyscall = __pa_symbol(&__vsyscall_page);
-- __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall,
+- __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall,
- vsyscall_mode == NATIVE
- ? PAGE_KERNEL_VSYSCALL
- : PAGE_KERNEL_VVAR);
-+ __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
- BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_FIRST_PAGE) !=
- (unsigned long)VSYSCALL_START);
-
++ __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
+ BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_PAGE) !=
+ (unsigned long)VSYSCALL_ADDR);
+ }
diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
index 04068192..4d75aa6 100644
--- a/arch/x86/kernel/x8664_ksyms_64.c
@@ -28554,10 +28563,10 @@ index e48b674..a451dd9 100644
.read = native_io_apic_read,
.write = native_io_apic_write,
diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
-index dd50e26..6e07dc3 100644
+index 0de1fae..298d037 100644
--- a/arch/x86/kernel/xsave.c
+++ b/arch/x86/kernel/xsave.c
-@@ -164,18 +164,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
+@@ -167,18 +167,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
/* Setup the bytes not touched by the [f]xsave and reserved for SW. */
sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
@@ -28579,7 +28588,7 @@ index dd50e26..6e07dc3 100644
/*
* For legacy compatible, we always set FP/SSE bits in the bit
-@@ -190,7 +190,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
+@@ -193,7 +193,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
*/
xstate_bv |= XSTATE_FPSSE;
@@ -28588,7 +28597,7 @@ index dd50e26..6e07dc3 100644
return err;
}
-@@ -199,6 +199,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
+@@ -202,6 +202,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
{
int err;
@@ -28596,7 +28605,7 @@ index dd50e26..6e07dc3 100644
if (use_xsave())
err = xsave_user(buf);
else if (use_fxsr())
-@@ -309,6 +310,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
+@@ -312,6 +313,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
*/
static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
{
@@ -28605,10 +28614,10 @@ index dd50e26..6e07dc3 100644
if ((unsigned long)buf % 64 || fx_only) {
u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
-index c697625..a032162 100644
+index 88f9201..0e7f1a3 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
-@@ -156,15 +156,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
+@@ -175,15 +175,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
struct kvm_cpuid2 *cpuid,
struct kvm_cpuid_entry2 __user *entries)
{
@@ -28632,7 +28641,7 @@ index c697625..a032162 100644
vcpu->arch.cpuid_nent = cpuid->nent;
kvm_apic_set_version(vcpu);
kvm_x86_ops->cpuid_update(vcpu);
-@@ -179,15 +184,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
+@@ -196,15 +201,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
struct kvm_cpuid2 *cpuid,
struct kvm_cpuid_entry2 __user *entries)
{
@@ -28656,63 +28665,10 @@ index c697625..a032162 100644
out:
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
-index 38d3751..497a96f 100644
+index c7327a7..c3e2419 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
-@@ -2258,7 +2258,7 @@ static int em_sysenter(struct x86_emulate_ctxt *ctxt)
- * Not recognized on AMD in compat mode (but is recognized in legacy
- * mode).
- */
-- if ((ctxt->mode == X86EMUL_MODE_PROT32) && (efer & EFER_LMA)
-+ if ((ctxt->mode != X86EMUL_MODE_PROT64) && (efer & EFER_LMA)
- && !vendor_intel(ctxt))
- return emulate_ud(ctxt);
-
-@@ -2271,25 +2271,13 @@ static int em_sysenter(struct x86_emulate_ctxt *ctxt)
- setup_syscalls_segments(ctxt, &cs, &ss);
-
- ops->get_msr(ctxt, MSR_IA32_SYSENTER_CS, &msr_data);
-- switch (ctxt->mode) {
-- case X86EMUL_MODE_PROT32:
-- if ((msr_data & 0xfffc) == 0x0)
-- return emulate_gp(ctxt, 0);
-- break;
-- case X86EMUL_MODE_PROT64:
-- if (msr_data == 0x0)
-- return emulate_gp(ctxt, 0);
-- break;
-- default:
-- break;
-- }
-+ if ((msr_data & 0xfffc) == 0x0)
-+ return emulate_gp(ctxt, 0);
-
- ctxt->eflags &= ~(EFLG_VM | EFLG_IF | EFLG_RF);
-- cs_sel = (u16)msr_data;
-- cs_sel &= ~SELECTOR_RPL_MASK;
-+ cs_sel = (u16)msr_data & ~SELECTOR_RPL_MASK;
- ss_sel = cs_sel + 8;
-- ss_sel &= ~SELECTOR_RPL_MASK;
-- if (ctxt->mode == X86EMUL_MODE_PROT64 || (efer & EFER_LMA)) {
-+ if (efer & EFER_LMA) {
- cs.d = 0;
- cs.l = 1;
- }
-@@ -2298,10 +2286,11 @@ static int em_sysenter(struct x86_emulate_ctxt *ctxt)
- ops->set_segment(ctxt, ss_sel, &ss, 0, VCPU_SREG_SS);
-
- ops->get_msr(ctxt, MSR_IA32_SYSENTER_EIP, &msr_data);
-- ctxt->_eip = msr_data;
-+ ctxt->_eip = (efer & EFER_LMA) ? msr_data : (u32)msr_data;
-
- ops->get_msr(ctxt, MSR_IA32_SYSENTER_ESP, &msr_data);
-- *reg_write(ctxt, VCPU_REGS_RSP) = msr_data;
-+ *reg_write(ctxt, VCPU_REGS_RSP) = (efer & EFER_LMA) ? msr_data :
-+ (u32)msr_data;
-
- return X86EMUL_CONTINUE;
- }
-@@ -3401,7 +3390,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
+@@ -3508,7 +3508,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
int cr = ctxt->modrm_reg;
u64 efer = 0;
@@ -28721,28 +28677,17 @@ index 38d3751..497a96f 100644
0xffffffff00000000ULL,
0, 0, 0, /* CR3 checked later */
CR4_RESERVED_BITS,
-@@ -3436,7 +3425,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
+@@ -3543,7 +3543,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
ctxt->ops->get_msr(ctxt, MSR_EFER, &efer);
if (efer & EFER_LMA)
- rsvd = CR3_L_MODE_RESERVED_BITS;
+ rsvd = CR3_L_MODE_RESERVED_BITS & ~CR3_PCID_INVD;
- else if (ctxt->ops->get_cr(ctxt, 4) & X86_CR4_PAE)
- rsvd = CR3_PAE_RESERVED_BITS;
- else if (ctxt->ops->get_cr(ctxt, 0) & X86_CR0_PG)
-@@ -3668,8 +3657,8 @@ static const struct opcode group5[] = {
- };
- static const struct opcode group6[] = {
-- DI(Prot, sldt),
-- DI(Prot, str),
-+ DI(Prot | DstMem, sldt),
-+ DI(Prot | DstMem, str),
- II(Prot | Priv | SrcMem16, em_lldt, lldt),
- II(Prot | Priv | SrcMem16, em_ltr, ltr),
- N, N, N, N,
+ if (new_val & rsvd)
+ return emulate_gp(ctxt, 0);
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
-index 453e5fb..214168f 100644
+index b8345dd..f225d71 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -55,7 +55,7 @@
@@ -28755,10 +28700,10 @@ index 453e5fb..214168f 100644
#define APIC_LVT_NUM 6
/* 14 is the version for Xeon and Pentium 8.4.8*/
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
-index cba218a..1cc1bed 100644
+index fd49c86..77e1aa0 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
-@@ -331,7 +331,7 @@ retry_walk:
+@@ -343,7 +343,7 @@ retry_walk:
if (unlikely(kvm_is_error_hva(host_addr)))
goto error;
@@ -28768,10 +28713,10 @@ index cba218a..1cc1bed 100644
goto error;
walker->ptep_user[walker->level - 1] = ptep_user;
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
-index 9643eda6..c9cb765 100644
+index 7527cef..c63a838e 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
-@@ -3508,7 +3508,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
+@@ -3564,7 +3564,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
int cpu = raw_smp_processor_id();
struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
@@ -28783,7 +28728,7 @@ index 9643eda6..c9cb765 100644
load_TR_desc();
}
-@@ -3911,6 +3915,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
+@@ -3965,6 +3969,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
#endif
#endif
@@ -28795,18 +28740,10 @@ index 9643eda6..c9cb765 100644
local_irq_disable();
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
-index de42688..6e3ace5 100644
+index ed70394..c629a68 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
-@@ -441,6 +441,7 @@ struct vcpu_vmx {
- #endif
- int gs_ldt_reload_needed;
- int fs_reload_needed;
-+ unsigned long vmcs_host_cr4; /* May not match real cr4 */
- } host_state;
- struct {
- int vm86_active;
-@@ -1320,12 +1321,12 @@ static void vmcs_write64(unsigned long field, u64 value)
+@@ -1366,12 +1366,12 @@ static void vmcs_write64(unsigned long field, u64 value)
#endif
}
@@ -28821,7 +28758,7 @@ index de42688..6e3ace5 100644
{
vmcs_writel(field, vmcs_readl(field) | mask);
}
-@@ -1585,7 +1586,11 @@ static void reload_tss(void)
+@@ -1631,7 +1631,11 @@ static void reload_tss(void)
struct desc_struct *descs;
descs = (void *)gdt->address;
@@ -28833,7 +28770,7 @@ index de42688..6e3ace5 100644
load_TR_desc();
}
-@@ -1809,6 +1814,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
+@@ -1859,6 +1863,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
@@ -28844,7 +28781,7 @@ index de42688..6e3ace5 100644
rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
vmx->loaded_vmcs->cpu = cpu;
-@@ -2098,7 +2107,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
+@@ -2148,7 +2156,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
* reads and returns guest's timestamp counter "register"
* guest_tsc = host_tsc + tsc_offset -- 21.3
*/
@@ -28853,9 +28790,15 @@ index de42688..6e3ace5 100644
{
u64 host_tsc, tsc_offset;
-@@ -3027,8 +3036,11 @@ static __init int hardware_setup(void)
- if (!cpu_has_vmx_flexpriority())
- flexpriority_enabled = 0;
+@@ -3146,11 +3154,16 @@ static __init int hardware_setup(void)
+ * page upon invalidation. No need to do anything if the
+ * processor does not have the APIC_ACCESS_ADDR VMCS field.
+ */
+- kvm_x86_ops->set_apic_access_page_addr = NULL;
++ pax_open_kernel();
++ *(void **)&kvm_x86_ops->set_apic_access_page_addr = NULL;
++ pax_close_kernel();
+ }
- if (!cpu_has_vmx_tpr_shadow())
- kvm_x86_ops->update_cr8_intercept = NULL;
@@ -28867,7 +28810,7 @@ index de42688..6e3ace5 100644
if (enable_ept && !cpu_has_vmx_ept_2m_page())
kvm_disable_largepages();
-@@ -3039,13 +3051,15 @@ static __init int hardware_setup(void)
+@@ -3161,13 +3174,15 @@ static __init int hardware_setup(void)
if (!cpu_has_vmx_apicv())
enable_apicv = 0;
@@ -28887,26 +28830,18 @@ index de42688..6e3ace5 100644
if (nested)
nested_vmx_setup_ctls_msrs();
-@@ -4165,10 +4179,17 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
- u32 low32, high32;
- unsigned long tmpl;
- struct desc_ptr dt;
-+ unsigned long cr4;
+@@ -4274,7 +4289,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
+ unsigned long cr4;
vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
-- vmcs_writel(HOST_CR4, read_cr4()); /* 22.2.3, 22.2.5 */
++
+#ifndef CONFIG_PAX_PER_CPU_PGD
vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
+#endif
-+
-+ /* Save the most likely value for this task's CR4 in the VMCS. */
-+ cr4 = read_cr4();
-+ vmcs_writel(HOST_CR4, cr4); /* 22.2.3, 22.2.5 */
-+ vmx->host_state.vmcs_host_cr4 = cr4;
- vmcs_write16(HOST_CS_SELECTOR, __KERNEL_CS); /* 22.2.4 */
- #ifdef CONFIG_X86_64
-@@ -4190,7 +4211,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
+ /* Save the most likely value for this task's CR4 in the VMCS. */
+ cr4 = read_cr4();
+@@ -4301,7 +4319,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
vmx->host_idt_base = dt.address;
@@ -28915,29 +28850,7 @@ index de42688..6e3ace5 100644
rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
-@@ -7196,7 +7217,7 @@ static void atomic_switch_perf_msrs(struct vcpu_vmx *vmx)
- static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
- {
- struct vcpu_vmx *vmx = to_vmx(vcpu);
-- unsigned long debugctlmsr;
-+ unsigned long debugctlmsr, cr4;
-
- /* Record the guest's net vcpu time for enforced NMI injections. */
- if (unlikely(!cpu_has_virtual_nmis() && vmx->soft_vnmi_blocked))
-@@ -7217,6 +7238,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
- if (test_bit(VCPU_REGS_RIP, (unsigned long *)&vcpu->arch.regs_dirty))
- vmcs_writel(GUEST_RIP, vcpu->arch.regs[VCPU_REGS_RIP]);
-
-+ cr4 = read_cr4();
-+ if (unlikely(cr4 != vmx->host_state.vmcs_host_cr4)) {
-+ vmcs_writel(HOST_CR4, cr4);
-+ vmx->host_state.vmcs_host_cr4 = cr4;
-+ }
-+
- /* When single-stepping over STI and MOV SS, we must clear the
- * corresponding interruptibility bits in the guest state. Otherwise
- * vmentry fails as it then expects bit 14 (BS) in pending debug
-@@ -7275,6 +7302,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
+@@ -7622,6 +7640,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
"jmp 2f \n\t"
"1: " __ex(ASM_VMX_VMRESUME) "\n\t"
"2: "
@@ -28950,7 +28863,7 @@ index de42688..6e3ace5 100644
/* Save guest registers, load host registers, keep flags */
"mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
"pop %0 \n\t"
-@@ -7327,6 +7360,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
+@@ -7674,6 +7698,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
#endif
[cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
[wordsize]"i"(sizeof(ulong))
@@ -28962,7 +28875,7 @@ index de42688..6e3ace5 100644
: "cc", "memory"
#ifdef CONFIG_X86_64
, "rax", "rbx", "rdi", "rsi"
-@@ -7340,7 +7378,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
+@@ -7687,7 +7716,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
if (debugctlmsr)
update_debugctlmsr(debugctlmsr);
@@ -28971,7 +28884,7 @@ index de42688..6e3ace5 100644
/*
* The sysexit path does not restore ds/es, so we must set them to
* a reasonable value ourselves.
-@@ -7349,8 +7387,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
+@@ -7696,8 +7725,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
* may be executed in interrupt context, which saves and restore segments
* around it, nullifying its effect.
*/
@@ -28993,10 +28906,10 @@ index de42688..6e3ace5 100644
vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index fab97ad..bb69607 100644
+index 506488c..f8df17e 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
-@@ -688,6 +688,8 @@ EXPORT_SYMBOL_GPL(kvm_set_cr4);
+@@ -732,6 +732,8 @@ EXPORT_SYMBOL_GPL(kvm_set_cr4);
int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)
{
@@ -29004,8 +28917,8 @@ index fab97ad..bb69607 100644
+
if (cr3 == kvm_read_cr3(vcpu) && !pdptrs_changed(vcpu)) {
kvm_mmu_sync_roots(vcpu);
- kvm_mmu_flush_tlb(vcpu);
-@@ -1806,8 +1808,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
+ kvm_make_request(KVM_REQ_TLB_FLUSH, vcpu);
+@@ -1878,8 +1880,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
{
struct kvm *kvm = vcpu->kvm;
int lm = is_long_mode(vcpu);
@@ -29016,7 +28929,7 @@ index fab97ad..bb69607 100644
u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
: kvm->arch.xen_hvm_config.blob_size_32;
u32 page_num = data & ~PAGE_MASK;
-@@ -2718,6 +2720,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
+@@ -2806,6 +2808,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
if (n < msr_list.nmsrs)
goto out;
r = -EFAULT;
@@ -29025,7 +28938,7 @@ index fab97ad..bb69607 100644
if (copy_to_user(user_msr_list->indices, &msrs_to_save,
num_msrs_to_save * sizeof(u32)))
goto out;
-@@ -5532,7 +5536,7 @@ static struct notifier_block pvclock_gtod_notifier = {
+@@ -5743,7 +5747,7 @@ static struct notifier_block pvclock_gtod_notifier = {
};
#endif
@@ -29035,7 +28948,7 @@ index fab97ad..bb69607 100644
int r;
struct kvm_x86_ops *ops = opaque;
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
-index ad1fb5f..fe30b66 100644
+index aae9413..d11e829 100644
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@ -1206,9 +1206,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
@@ -29820,18 +29733,27 @@ index f2145cf..cea889d 100644
.byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
2: .byte 0xeb /* jmp <disp8> */
diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
-index 1e572c5..2a162cd 100644
+index 40a1725..5d12ac4 100644
--- a/arch/x86/lib/cmpxchg16b_emu.S
+++ b/arch/x86/lib/cmpxchg16b_emu.S
-@@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu:
+@@ -8,6 +8,7 @@
+ #include <linux/linkage.h>
+ #include <asm/dwarf2.h>
+ #include <asm/percpu.h>
++#include <asm/alternative-asm.h>
+
+ .text
- popf
+@@ -46,12 +47,14 @@ CFI_STARTPROC
+ CFI_REMEMBER_STATE
+ popfq_cfi
mov $1, %al
+ pax_force_retaddr
ret
- not_same:
- popf
+ CFI_RESTORE_STATE
+ .Lnot_same:
+ popfq_cfi
xor %al,%al
+ pax_force_retaddr
ret
@@ -30178,10 +30100,10 @@ index 2419d5f..fe52d0e 100644
CFI_RESTORE_STATE
diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
-index 7609e0e..b449b98 100644
+index 1318f75..44c30fd 100644
--- a/arch/x86/lib/csum-wrappers_64.c
+++ b/arch/x86/lib/csum-wrappers_64.c
-@@ -53,10 +53,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
+@@ -52,10 +52,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
len -= 2;
}
}
@@ -30195,7 +30117,7 @@ index 7609e0e..b449b98 100644
if (unlikely(*errp))
goto out_err;
-@@ -110,10 +112,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
+@@ -109,10 +111,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
}
*errp = 0;
@@ -31035,80 +30957,6 @@ index fc6ba17..d4d989d 100644
#endif
xor %eax,%eax
EXIT
-diff --git a/arch/x86/lib/rwlock.S b/arch/x86/lib/rwlock.S
-index 1cad221..de671ee 100644
---- a/arch/x86/lib/rwlock.S
-+++ b/arch/x86/lib/rwlock.S
-@@ -16,13 +16,34 @@ ENTRY(__write_lock_failed)
- FRAME
- 0: LOCK_PREFIX
- WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ jno 1234f
-+ LOCK_PREFIX
-+ WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
-+ int $4
-+1234:
-+ _ASM_EXTABLE(1234b, 1234b)
-+#endif
-+
- 1: rep; nop
- cmpl $WRITE_LOCK_CMP, (%__lock_ptr)
- jne 1b
- LOCK_PREFIX
- WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ jno 1234f
-+ LOCK_PREFIX
-+ WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
-+ int $4
-+1234:
-+ _ASM_EXTABLE(1234b, 1234b)
-+#endif
-+
- jnz 0b
- ENDFRAME
-+ pax_force_retaddr
- ret
- CFI_ENDPROC
- END(__write_lock_failed)
-@@ -32,13 +53,34 @@ ENTRY(__read_lock_failed)
- FRAME
- 0: LOCK_PREFIX
- READ_LOCK_SIZE(inc) (%__lock_ptr)
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ jno 1234f
-+ LOCK_PREFIX
-+ READ_LOCK_SIZE(dec) (%__lock_ptr)
-+ int $4
-+1234:
-+ _ASM_EXTABLE(1234b, 1234b)
-+#endif
-+
- 1: rep; nop
- READ_LOCK_SIZE(cmp) $1, (%__lock_ptr)
- js 1b
- LOCK_PREFIX
- READ_LOCK_SIZE(dec) (%__lock_ptr)
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ jno 1234f
-+ LOCK_PREFIX
-+ READ_LOCK_SIZE(inc) (%__lock_ptr)
-+ int $4
-+1234:
-+ _ASM_EXTABLE(1234b, 1234b)
-+#endif
-+
- js 0b
- ENDFRAME
-+ pax_force_retaddr
- ret
- CFI_ENDPROC
- END(__read_lock_failed)
diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
index 5dff5f0..cadebf4 100644
--- a/arch/x86/lib/rwsem.S
@@ -31148,18 +30996,18 @@ index 5dff5f0..cadebf4 100644
CFI_ENDPROC
ENDPROC(call_rwsem_downgrade_wake)
diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
-index a63efd6..8149fbe 100644
+index b30b5eb..2b57052 100644
--- a/arch/x86/lib/thunk_64.S
+++ b/arch/x86/lib/thunk_64.S
-@@ -8,6 +8,7 @@
- #include <linux/linkage.h>
+@@ -9,6 +9,7 @@
#include <asm/dwarf2.h>
#include <asm/calling.h>
+ #include <asm/asm.h>
+#include <asm/alternative-asm.h>
/* rdi: arg1 ... normal C conventions. rax is saved/restored. */
.macro THUNK name, func, put_ret_addr_in_rdi=0
-@@ -15,11 +16,11 @@
+@@ -16,11 +17,11 @@
\name:
CFI_STARTPROC
@@ -31174,7 +31022,7 @@ index a63efd6..8149fbe 100644
.endif
call \func
-@@ -38,8 +39,9 @@
+@@ -47,9 +48,10 @@
/* SAVE_ARGS below is used only for the .cfi directives it contains. */
CFI_STARTPROC
@@ -31186,6 +31034,7 @@ index a63efd6..8149fbe 100644
+ pax_force_retaddr
ret
CFI_ENDPROC
+ _ASM_NOKPROBE(restore)
diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
index e2f5e21..4b22130 100644
--- a/arch/x86/lib/usercopy_32.c
@@ -31896,10 +31745,10 @@ index 903ec1e..c4166b2 100644
}
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
-index a10c8c7..35a5abb 100644
+index a8612aa..5f91cf4 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
-@@ -14,11 +14,18 @@
+@@ -13,12 +13,19 @@
#include <linux/hugetlb.h> /* hstate_index_to_shift */
#include <linux/prefetch.h> /* prefetchw */
#include <linux/context_tracking.h> /* exception_enter(), ... */
@@ -31909,7 +31758,8 @@ index a10c8c7..35a5abb 100644
#include <asm/traps.h> /* dotraplinkage, ... */
#include <asm/pgalloc.h> /* pgd_*(), ... */
#include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
- #include <asm/fixmap.h> /* VSYSCALL_START */
+ #include <asm/fixmap.h> /* VSYSCALL_ADDR */
+ #include <asm/vsyscall.h> /* emulate_vsyscall */
+#include <asm/tlbflush.h>
+
+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
@@ -31918,7 +31768,7 @@ index a10c8c7..35a5abb 100644
#define CREATE_TRACE_POINTS
#include <asm/trace/exceptions.h>
-@@ -59,7 +66,7 @@ static inline int __kprobes kprobes_fault(struct pt_regs *regs)
+@@ -59,7 +66,7 @@ static nokprobe_inline int kprobes_fault(struct pt_regs *regs)
int ret = 0;
/* kprobe_running() needs smp_processor_id() */
@@ -32030,7 +31880,7 @@ index a10c8c7..35a5abb 100644
if (!ret)
break;
-@@ -281,6 +345,12 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
+@@ -281,6 +345,12 @@ static noinline int vmalloc_fault(unsigned long address)
* an interrupt in the middle of a task switch..
*/
pgd_paddr = read_cr3();
@@ -32043,7 +31893,7 @@ index a10c8c7..35a5abb 100644
pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
if (!pmd_k)
return -1;
-@@ -376,11 +446,25 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
+@@ -377,11 +447,25 @@ static noinline int vmalloc_fault(unsigned long address)
* happen within a race in page table update. In the later
* case just flush:
*/
@@ -32070,7 +31920,7 @@ index a10c8c7..35a5abb 100644
if (pgd_none(*pgd)) {
set_pgd(pgd, *pgd_ref);
arch_flush_lazy_mmu_mode();
-@@ -546,7 +630,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
+@@ -548,7 +632,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
static int is_errata100(struct pt_regs *regs, unsigned long address)
{
#ifdef CONFIG_X86_64
@@ -32079,28 +31929,38 @@ index a10c8c7..35a5abb 100644
return 1;
#endif
return 0;
-@@ -573,7 +657,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
+@@ -575,9 +659,9 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
}
static const char nx_warning[] = KERN_CRIT
-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
+ static const char smep_warning[] = KERN_CRIT
+-"unable to execute userspace code (SMEP?) (uid: %d)\n";
++"unable to execute userspace code (SMEP?) (uid: %d, task: %s, pid: %d)\n";
static void
show_fault_oops(struct pt_regs *regs, unsigned long error_code,
-@@ -582,15 +666,27 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
+@@ -586,7 +670,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
if (!oops_may_print())
return;
- if (error_code & PF_INSTR) {
+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
unsigned int level;
-
- pte_t *pte = lookup_address(address, &level);
+ pgd_t *pgd;
+ pte_t *pte;
+@@ -597,13 +681,25 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
+ pte = lookup_address_in_pgd(pgd, address, &level);
if (pte && pte_present(*pte) && !pte_exec(*pte))
- printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
+ printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
+ if (pte && pte_present(*pte) && pte_exec(*pte) &&
+ (pgd_flags(*pgd) & _PAGE_USER) &&
+ (read_cr4() & X86_CR4_SMEP))
+- printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
++ printk(smep_warning, from_kuid(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
}
+#ifdef CONFIG_PAX_KERNEXEC
@@ -32118,7 +31978,7 @@ index a10c8c7..35a5abb 100644
printk(KERN_ALERT "BUG: unable to handle kernel ");
if (address < PAGE_SIZE)
printk(KERN_CONT "NULL pointer dereference");
-@@ -771,6 +867,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
+@@ -782,6 +878,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
return;
}
#endif
@@ -32141,7 +32001,7 @@ index a10c8c7..35a5abb 100644
/* Kernel addresses are always protection faults: */
if (address >= TASK_SIZE)
error_code |= PF_PROT;
-@@ -856,7 +968,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
+@@ -867,7 +979,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
printk(KERN_ERR
"MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
@@ -32150,7 +32010,7 @@ index a10c8c7..35a5abb 100644
code = BUS_MCEERR_AR;
}
#endif
-@@ -910,6 +1022,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
+@@ -923,6 +1035,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
return 1;
}
@@ -32250,7 +32110,7 @@ index a10c8c7..35a5abb 100644
/*
* Handle a spurious fault caused by a stale TLB entry.
*
-@@ -976,6 +1181,9 @@ int show_unhandled_signals = 1;
+@@ -1008,6 +1213,9 @@ int show_unhandled_signals = 1;
static inline int
access_error(unsigned long error_code, struct vm_area_struct *vma)
{
@@ -32260,7 +32120,7 @@ index a10c8c7..35a5abb 100644
if (error_code & PF_WRITE) {
/* write, present and write, not present: */
if (unlikely(!(vma->vm_flags & VM_WRITE)))
-@@ -1010,7 +1218,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
+@@ -1042,7 +1250,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
if (error_code & PF_USER)
return false;
@@ -32269,7 +32129,7 @@ index a10c8c7..35a5abb 100644
return false;
return true;
-@@ -1038,6 +1246,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
+@@ -1070,6 +1278,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
tsk = current;
mm = tsk->mm;
@@ -32292,7 +32152,7 @@ index a10c8c7..35a5abb 100644
/*
* Detect and handle instructions that would cause a page fault for
* both a tracked kernel page and a userspace page.
-@@ -1115,7 +1339,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
+@@ -1147,7 +1371,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
* User-mode registers count as a user access even for any
* potential system fault or CPU buglet:
*/
@@ -32301,7 +32161,7 @@ index a10c8c7..35a5abb 100644
local_irq_enable();
error_code |= PF_USER;
flags |= FAULT_FLAG_USER;
-@@ -1162,6 +1386,11 @@ retry:
+@@ -1194,6 +1418,11 @@ retry:
might_sleep();
}
@@ -32313,7 +32173,7 @@ index a10c8c7..35a5abb 100644
vma = find_vma(mm, address);
if (unlikely(!vma)) {
bad_area(regs, error_code, address);
-@@ -1173,18 +1402,24 @@ retry:
+@@ -1205,18 +1434,24 @@ retry:
bad_area(regs, error_code, address);
return;
}
@@ -32349,9 +32209,9 @@ index a10c8c7..35a5abb 100644
if (unlikely(expand_stack(vma, address))) {
bad_area(regs, error_code, address);
return;
-@@ -1296,3 +1531,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
- exception_exit(prev_state);
+@@ -1333,3 +1568,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
}
+ NOKPROBE_SYMBOL(trace_do_page_fault);
#endif /* CONFIG_TRACING */
+
+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
@@ -32375,7 +32235,7 @@ index a10c8c7..35a5abb 100644
+
+#ifdef CONFIG_PAX_SEGMEXEC
+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
-+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
++ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
+ return true;
+ return false;
+ }
@@ -32785,7 +32645,7 @@ index 8b977eb..4732c33 100644
#endif /* CONFIG_HUGETLB_PAGE */
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
-index f971306..e83e0f6 100644
+index 66dba36..f8082ec 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -4,6 +4,7 @@
@@ -32803,9 +32663,9 @@ index f971306..e83e0f6 100644
+#include <asm/desc.h>
+#include <asm/bios_ebda.h>
- #include "mm_internal.h"
-
-@@ -563,7 +566,18 @@ void __init init_mem_mapping(void)
+ /*
+ * We need to define the tracepoints somewhere, and tlb.c
+@@ -570,7 +573,18 @@ void __init init_mem_mapping(void)
early_ioremap_page_table_range_init();
#endif
@@ -32824,7 +32684,7 @@ index f971306..e83e0f6 100644
__flush_tlb_all();
early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
-@@ -579,10 +593,40 @@ void __init init_mem_mapping(void)
+@@ -586,10 +600,40 @@ void __init init_mem_mapping(void)
* Access has to be given to non-kernel-ram areas as well, these contain the PCI
* mmio resources as well as potential bios/acpi data regions.
*/
@@ -32866,7 +32726,7 @@ index f971306..e83e0f6 100644
if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
return 0;
if (!page_is_ram(pagenr))
-@@ -628,8 +672,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
+@@ -635,8 +679,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
#endif
}
@@ -32985,7 +32845,7 @@ index f971306..e83e0f6 100644
(unsigned long)(&__init_begin),
(unsigned long)(&__init_end));
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
-index e395048..cd38278 100644
+index c8140e1..59257fc 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
@@ -33194,8 +33054,8 @@ index e395048..cd38278 100644
+ permanent_kmaps_init(swapper_pg_dir);
}
--pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
-+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
+-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
++pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL);
EXPORT_SYMBOL_GPL(__supported_pte_mask);
/* user-defined highmem size */
@@ -33213,7 +33073,7 @@ index e395048..cd38278 100644
((unsigned long)&_etext - (unsigned long)&_text) >> 10);
/*
-@@ -883,6 +885,7 @@ void set_kernel_text_rw(void)
+@@ -884,6 +886,7 @@ void set_kernel_text_rw(void)
if (!kernel_set_to_readonly)
return;
@@ -33221,7 +33081,7 @@ index e395048..cd38278 100644
pr_debug("Set kernel text: %lx - %lx for read write\n",
start, start+size);
-@@ -897,6 +900,7 @@ void set_kernel_text_ro(void)
+@@ -898,6 +901,7 @@ void set_kernel_text_ro(void)
if (!kernel_set_to_readonly)
return;
@@ -33229,7 +33089,7 @@ index e395048..cd38278 100644
pr_debug("Set kernel text: %lx - %lx for read only\n",
start, start+size);
-@@ -925,6 +929,7 @@ void mark_rodata_ro(void)
+@@ -926,6 +930,7 @@ void mark_rodata_ro(void)
unsigned long start = PFN_ALIGN(_text);
unsigned long size = PFN_ALIGN(_etext) - start;
@@ -33238,19 +33098,19 @@ index e395048..cd38278 100644
printk(KERN_INFO "Write protecting the kernel text: %luk\n",
size >> 10);
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
-index 2308a40..b17a80d 100644
+index 4e5dfec..6fd6dc5 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -151,7 +151,7 @@ early_param("gbpages", parse_direct_gbpages_on);
* around without checking the pgd every time.
*/
--pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP;
-+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_IOMAP);
+-pteval_t __supported_pte_mask __read_mostly = ~0;
++pteval_t __supported_pte_mask __read_only = ~_PAGE_NX;
EXPORT_SYMBOL_GPL(__supported_pte_mask);
int force_personality32;
-@@ -184,12 +184,29 @@ void sync_global_pgds(unsigned long start, unsigned long end)
+@@ -184,7 +184,12 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
for (address = start; address <= end; address += PGDIR_SIZE) {
const pgd_t *pgd_ref = pgd_offset_k(address);
@@ -33261,7 +33121,9 @@ index 2308a40..b17a80d 100644
struct page *page;
+#endif
- if (pgd_none(*pgd_ref))
+ /*
+ * When it is called after memory hot remove, pgd_none()
+@@ -195,6 +200,25 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
continue;
spin_lock(&pgd_lock);
@@ -33270,27 +33132,34 @@ index 2308a40..b17a80d 100644
+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
+ pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
+
-+ if (pgd_none(*pgd))
-+ set_pgd(pgd, *pgd_ref);
-+ else
++ if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
+ BUG_ON(pgd_page_vaddr(*pgd)
+ != pgd_page_vaddr(*pgd_ref));
++
++ if (removed) {
++ if (pgd_none(*pgd_ref) && !pgd_none(*pgd))
++ pgd_clear(pgd);
++ } else {
++ if (pgd_none(*pgd))
++ set_pgd(pgd, *pgd_ref);
++ }
++
+ pgd = pgd_offset_cpu(cpu, kernel, address);
+#else
list_for_each_entry(page, &pgd_list, lru) {
pgd_t *pgd;
spinlock_t *pgt_lock;
-@@ -198,6 +215,7 @@ void sync_global_pgds(unsigned long start, unsigned long end)
+@@ -203,6 +227,7 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
/* the pgt_lock only for Xen */
pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
spin_lock(pgt_lock);
+#endif
- if (pgd_none(*pgd))
- set_pgd(pgd, *pgd_ref);
-@@ -205,7 +223,10 @@ void sync_global_pgds(unsigned long start, unsigned long end)
+ if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
BUG_ON(pgd_page_vaddr(*pgd)
- != pgd_page_vaddr(*pgd_ref));
+@@ -216,7 +241,10 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
+ set_pgd(pgd, *pgd_ref);
+ }
+#ifndef CONFIG_PAX_PER_CPU_PGD
spin_unlock(pgt_lock);
@@ -33299,7 +33168,7 @@ index 2308a40..b17a80d 100644
}
spin_unlock(&pgd_lock);
}
-@@ -238,7 +259,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
+@@ -249,7 +277,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
{
if (pgd_none(*pgd)) {
pud_t *pud = (pud_t *)spp_getpage();
@@ -33308,7 +33177,7 @@ index 2308a40..b17a80d 100644
if (pud != pud_offset(pgd, 0))
printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
pud, pud_offset(pgd, 0));
-@@ -250,7 +271,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
+@@ -261,7 +289,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
{
if (pud_none(*pud)) {
pmd_t *pmd = (pmd_t *) spp_getpage();
@@ -33317,7 +33186,7 @@ index 2308a40..b17a80d 100644
if (pmd != pmd_offset(pud, 0))
printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
pmd, pmd_offset(pud, 0));
-@@ -279,7 +300,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
+@@ -290,7 +318,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
pmd = fill_pmd(pud, vaddr);
pte = fill_pte(pmd, vaddr);
@@ -33327,7 +33196,7 @@ index 2308a40..b17a80d 100644
/*
* It's enough to flush this one mapping.
-@@ -338,14 +361,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
+@@ -349,14 +379,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
pgd = pgd_offset_k((unsigned long)__va(phys));
if (pgd_none(*pgd)) {
pud = (pud_t *) spp_getpage();
@@ -33344,7 +33213,7 @@ index 2308a40..b17a80d 100644
}
pmd = pmd_offset(pud, phys);
BUG_ON(!pmd_none(*pmd));
-@@ -586,7 +607,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
+@@ -597,7 +625,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
prot);
spin_lock(&init_mm.page_table_lock);
@@ -33353,7 +33222,7 @@ index 2308a40..b17a80d 100644
spin_unlock(&init_mm.page_table_lock);
}
__flush_tlb_all();
-@@ -627,7 +648,7 @@ kernel_physical_mapping_init(unsigned long start,
+@@ -638,7 +666,7 @@ kernel_physical_mapping_init(unsigned long start,
page_size_mask);
spin_lock(&init_mm.page_table_lock);
@@ -33362,26 +33231,17 @@ index 2308a40..b17a80d 100644
spin_unlock(&init_mm.page_table_lock);
pgd_changed = true;
}
-@@ -1197,8 +1218,8 @@ int kern_addr_valid(unsigned long addr)
+@@ -1217,8 +1245,8 @@ static struct vm_operations_struct gate_vma_ops = {
static struct vm_area_struct gate_vma = {
- .vm_start = VSYSCALL_START,
- .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
+ .vm_start = VSYSCALL_ADDR,
+ .vm_end = VSYSCALL_ADDR + PAGE_SIZE,
- .vm_page_prot = PAGE_READONLY_EXEC,
-- .vm_flags = VM_READ | VM_EXEC
+- .vm_flags = VM_READ | VM_EXEC,
+ .vm_page_prot = PAGE_READONLY,
-+ .vm_flags = VM_READ
++ .vm_flags = VM_READ,
+ .vm_ops = &gate_vma_ops,
};
- struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
-@@ -1232,7 +1253,7 @@ int in_gate_area_no_mm(unsigned long addr)
-
- const char *arch_vma_name(struct vm_area_struct *vma)
- {
-- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
-+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
- return "[vdso]";
- if (vma == &gate_vma)
- return "[vsyscall]";
diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
index 7b179b49..6bd17777 100644
--- a/arch/x86/mm/iomap_32.c
@@ -33399,7 +33259,7 @@ index 7b179b49..6bd17777 100644
return (void *)vaddr;
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
-index 94bd247..7e48391 100644
+index af78e50..0790b03 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -56,8 +56,8 @@ static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
@@ -33413,7 +33273,7 @@ index 94bd247..7e48391 100644
return 1;
WARN_ONCE(1, "ioremap on RAM pfn 0x%lx\n", start_pfn);
-@@ -268,7 +268,7 @@ EXPORT_SYMBOL(ioremap_prot);
+@@ -280,7 +280,7 @@ EXPORT_SYMBOL(ioremap_prot);
*
* Caller must ensure there is only one unmapping for the same pointer.
*/
@@ -33422,7 +33282,7 @@ index 94bd247..7e48391 100644
{
struct vm_struct *p, *o;
-@@ -322,6 +322,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
+@@ -334,6 +334,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
/* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
if (page_is_ram(start >> PAGE_SHIFT))
@@ -33432,7 +33292,7 @@ index 94bd247..7e48391 100644
return __va(phys);
addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
-@@ -334,6 +337,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
+@@ -346,13 +349,16 @@ void *xlate_dev_mem_ptr(unsigned long phys)
void unxlate_dev_mem_ptr(unsigned long phys, void *addr)
{
if (page_is_ram(phys >> PAGE_SHIFT))
@@ -33442,17 +33302,16 @@ index 94bd247..7e48391 100644
return;
iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
-@@ -351,7 +357,7 @@ static int __init early_ioremap_debug_setup(char *str)
- early_param("early_ioremap_debug", early_ioremap_debug_setup);
+ return;
+ }
- static __initdata int after_paging_init;
-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
{
@@ -388,8 +394,7 @@ void __init early_ioremap_init(void)
- slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
+ early_ioremap_setup();
pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
- memset(bm_pte, 0, sizeof(bm_pte));
@@ -33462,10 +33321,10 @@ index 94bd247..7e48391 100644
/*
* The boot-ioremap range spans multiple pmds, for which
diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
-index d87dd6d..bf3fa66 100644
+index b4f2e7e..96c9c3e 100644
--- a/arch/x86/mm/kmemcheck/kmemcheck.c
+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
-@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
+@@ -628,9 +628,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
* memory (e.g. tracked pages)? For now, we need this to avoid
* invoking kmemcheck for PnP BIOS calls.
*/
@@ -33478,7 +33337,7 @@ index d87dd6d..bf3fa66 100644
pte = kmemcheck_pte_lookup(address);
diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
-index 25e7e13..1964579 100644
+index 919b912..9267313 100644
--- a/arch/x86/mm/mmap.c
+++ b/arch/x86/mm/mmap.c
@@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
@@ -33604,11 +33463,11 @@ index 0057a7a..95c7edd 100644
might_sleep();
if (is_enabled()) /* recheck and proper locking in *_core() */
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
-index 27aa0455..0eb1406 100644
+index 1a88370..3f598b5 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
-@@ -478,7 +478,7 @@ static bool __init numa_meminfo_cover_memory(const struct numa_meminfo *mi)
- return true;
+@@ -499,7 +499,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
+ }
}
-static int __init numa_register_memblks(struct numa_meminfo *mi)
@@ -33616,21 +33475,8 @@ index 27aa0455..0eb1406 100644
{
unsigned long uninitialized_var(pfn_align);
int i, nid;
-diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
-index 461bc82..4e091a3 100644
---- a/arch/x86/mm/pageattr-test.c
-+++ b/arch/x86/mm/pageattr-test.c
-@@ -35,7 +35,7 @@ enum {
-
- static int pte_testbit(pte_t pte)
- {
-- return pte_flags(pte) & _PAGE_UNUSED1;
-+ return pte_flags(pte) & _PAGE_CPA_TEST;
- }
-
- struct split_state {
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
-index fed892d..e380153 100644
+index 36de293..b820ddc 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -262,7 +262,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
@@ -33677,7 +33523,7 @@ index fed892d..e380153 100644
prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
return prot;
-@@ -416,23 +425,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
+@@ -420,23 +429,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
{
/* change init_mm */
@@ -33831,7 +33677,7 @@ index 9f0614d..92ae64a 100644
p += get_opcode(p, &opcode);
for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
-index 0004ac7..2ab49d0 100644
+index 6fb6927..4fc13c0 100644
--- a/arch/x86/mm/pgtable.c
+++ b/arch/x86/mm/pgtable.c
@@ -97,10 +97,71 @@ static inline void pgd_list_del(pgd_t *pgd)
@@ -34107,7 +33953,7 @@ index 0004ac7..2ab49d0 100644
paravirt_pgd_free(mm, pgd);
free_page((unsigned long)pgd);
diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
-index a69bcb8..19068ab 100644
+index 75cc097..79a097f 100644
--- a/arch/x86/mm/pgtable_32.c
+++ b/arch/x86/mm/pgtable_32.c
@@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
@@ -34180,7 +34026,7 @@ index 90555bf..f5f1828 100644
}
diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
-index dd8dda1..9e9b0f6 100644
+index ee61c36..e6fedeb 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -48,7 +48,11 @@ void leave_mm(int cpu)
@@ -34192,9 +34038,9 @@ index dd8dda1..9e9b0f6 100644
load_cr3(swapper_pg_dir);
+#endif
+
- }
- }
- EXPORT_SYMBOL_GPL(leave_mm);
+ /*
+ * This gets called in the idle path where RCU
+ * functions differently. Tracing normally
diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
new file mode 100644
index 0000000..dace51c
@@ -34239,7 +34085,7 @@ index 0000000..dace51c
+EXPORT_SYMBOL(__pax_close_userland);
+#endif
diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
-index 0149575..f746de8 100644
+index 6440221..f84b5c7 100644
--- a/arch/x86/net/bpf_jit.S
+++ b/arch/x86/net/bpf_jit.S
@@ -9,6 +9,7 @@
@@ -34250,7 +34096,7 @@ index 0149575..f746de8 100644
/*
* Calling convention :
-@@ -35,6 +36,7 @@ sk_load_word_positive_offset:
+@@ -38,6 +39,7 @@ sk_load_word_positive_offset:
jle bpf_slow_path_word
mov (SKBDATA,%rsi),%eax
bswap %eax /* ntohl() */
@@ -34258,7 +34104,7 @@ index 0149575..f746de8 100644
ret
sk_load_half:
-@@ -52,6 +54,7 @@ sk_load_half_positive_offset:
+@@ -55,6 +57,7 @@ sk_load_half_positive_offset:
jle bpf_slow_path_half
movzwl (SKBDATA,%rsi),%eax
rol $8,%ax # ntohs()
@@ -34266,32 +34112,24 @@ index 0149575..f746de8 100644
ret
sk_load_byte:
-@@ -66,6 +69,7 @@ sk_load_byte_positive_offset:
+@@ -69,6 +72,7 @@ sk_load_byte_positive_offset:
cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
jle bpf_slow_path_byte
movzbl (SKBDATA,%rsi),%eax
+ pax_force_retaddr
ret
- /**
-@@ -87,6 +91,7 @@ sk_load_byte_msh_positive_offset:
- movzbl (SKBDATA,%rsi),%ebx
- and $15,%bl
- shl $2,%bl
-+ pax_force_retaddr
- ret
-
/* rsi contains offset and can be scratched */
-@@ -109,6 +114,7 @@ bpf_slow_path_word:
+@@ -90,6 +94,7 @@ bpf_slow_path_word:
js bpf_error
- mov -12(%rbp),%eax
+ mov - MAX_BPF_STACK + 32(%rbp),%eax
bswap %eax
+ pax_force_retaddr
ret
bpf_slow_path_half:
-@@ -117,12 +123,14 @@ bpf_slow_path_half:
- mov -12(%rbp),%ax
+@@ -98,12 +103,14 @@ bpf_slow_path_half:
+ mov - MAX_BPF_STACK + 32(%rbp),%ax
rol $8,%ax
movzwl %ax,%eax
+ pax_force_retaddr
@@ -34300,20 +34138,12 @@ index 0149575..f746de8 100644
bpf_slow_path_byte:
bpf_slow_path_common(1)
js bpf_error
- movzbl -12(%rbp),%eax
-+ pax_force_retaddr
- ret
-
- bpf_slow_path_byte_msh:
-@@ -133,6 +141,7 @@ bpf_slow_path_byte_msh:
- and $15,%al
- shl $2,%al
- xchg %eax,%ebx
+ movzbl - MAX_BPF_STACK + 32(%rbp),%eax
+ pax_force_retaddr
ret
#define sk_negative_common(SIZE) \
-@@ -157,6 +166,7 @@ sk_load_word_negative_offset:
+@@ -126,6 +133,7 @@ sk_load_word_negative_offset:
sk_negative_common(4)
mov (%rax), %eax
bswap %eax
@@ -34321,7 +34151,7 @@ index 0149575..f746de8 100644
ret
bpf_slow_path_half_neg:
-@@ -168,6 +178,7 @@ sk_load_half_negative_offset:
+@@ -137,6 +145,7 @@ sk_load_half_negative_offset:
mov (%rax),%ax
rol $8,%ax
movzwl %ax,%eax
@@ -34329,333 +34159,79 @@ index 0149575..f746de8 100644
ret
bpf_slow_path_byte_neg:
-@@ -177,6 +188,7 @@ sk_load_byte_negative_offset:
+@@ -146,6 +155,7 @@ sk_load_byte_negative_offset:
.globl sk_load_byte_negative_offset
sk_negative_common(1)
movzbl (%rax), %eax
+ pax_force_retaddr
ret
- bpf_slow_path_byte_msh_neg:
-@@ -190,6 +202,7 @@ sk_load_byte_msh_negative_offset:
- and $15,%al
- shl $2,%al
- xchg %eax,%ebx
-+ pax_force_retaddr
- ret
-
bpf_error:
-@@ -197,4 +210,5 @@ bpf_error:
- xor %eax,%eax
- mov -8(%rbp),%rbx
+@@ -156,4 +166,5 @@ bpf_error:
+ mov - MAX_BPF_STACK + 16(%rbp),%r14
+ mov - MAX_BPF_STACK + 24(%rbp),%r15
leaveq
+ pax_force_retaddr
ret
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
-index af2d431..bc63cba 100644
+index 3f62734..a57894f 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
-@@ -50,13 +50,90 @@ static inline u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len)
- return ptr + len;
- }
+@@ -13,7 +13,11 @@
+ #include <linux/if_vlan.h>
+ #include <asm/cacheflush.h>
-+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
-+#define MAX_INSTR_CODE_SIZE 96
++#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
++int bpf_jit_enable __read_only;
+#else
-+#define MAX_INSTR_CODE_SIZE 64
-+#endif
-+
- #define EMIT(bytes, len) do { prog = emit_code(prog, bytes, len); } while (0)
-
- #define EMIT1(b1) EMIT(b1, 1)
- #define EMIT2(b1, b2) EMIT((b1) + ((b2) << 8), 2)
- #define EMIT3(b1, b2, b3) EMIT((b1) + ((b2) << 8) + ((b3) << 16), 3)
- #define EMIT4(b1, b2, b3, b4) EMIT((b1) + ((b2) << 8) + ((b3) << 16) + ((b4) << 24), 4)
-+
-+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
-+/* original constant will appear in ecx */
-+#define DILUTE_CONST_SEQUENCE(_off, _key) \
-+do { \
-+ /* mov ecx, randkey */ \
-+ EMIT1(0xb9); \
-+ EMIT(_key, 4); \
-+ /* xor ecx, randkey ^ off */ \
-+ EMIT2(0x81, 0xf1); \
-+ EMIT((_key) ^ (_off), 4); \
-+} while (0)
-+
-+#define EMIT1_off32(b1, _off) \
-+do { \
-+ switch (b1) { \
-+ case 0x05: /* add eax, imm32 */ \
-+ case 0x2d: /* sub eax, imm32 */ \
-+ case 0x25: /* and eax, imm32 */ \
-+ case 0x0d: /* or eax, imm32 */ \
-+ case 0xb8: /* mov eax, imm32 */ \
-+ case 0x35: /* xor eax, imm32 */ \
-+ case 0x3d: /* cmp eax, imm32 */ \
-+ case 0xa9: /* test eax, imm32 */ \
-+ DILUTE_CONST_SEQUENCE(_off, randkey); \
-+ EMIT2((b1) - 4, 0xc8); /* convert imm instruction to eax, ecx */\
-+ break; \
-+ case 0xbb: /* mov ebx, imm32 */ \
-+ DILUTE_CONST_SEQUENCE(_off, randkey); \
-+ /* mov ebx, ecx */ \
-+ EMIT2(0x89, 0xcb); \
-+ break; \
-+ case 0xbe: /* mov esi, imm32 */ \
-+ DILUTE_CONST_SEQUENCE(_off, randkey); \
-+ /* mov esi, ecx */ \
-+ EMIT2(0x89, 0xce); \
-+ break; \
-+ case 0xe8: /* call rel imm32, always to known funcs */ \
-+ EMIT1(b1); \
-+ EMIT(_off, 4); \
-+ break; \
-+ case 0xe9: /* jmp rel imm32 */ \
-+ EMIT1(b1); \
-+ EMIT(_off, 4); \
-+ /* prevent fall-through, we're not called if off = 0 */ \
-+ EMIT(0xcccccccc, 4); \
-+ EMIT(0xcccccccc, 4); \
-+ break; \
-+ default: \
-+ BUILD_BUG(); \
-+ } \
-+} while (0)
-+
-+#define EMIT2_off32(b1, b2, _off) \
-+do { \
-+ if ((b1) == 0x8d && (b2) == 0xb3) { /* lea esi, [rbx+imm32] */ \
-+ EMIT2(0x8d, 0xb3); /* lea esi, [rbx+randkey] */ \
-+ EMIT(randkey, 4); \
-+ EMIT2(0x8d, 0xb6); /* lea esi, [esi+off-randkey] */ \
-+ EMIT((_off) - randkey, 4); \
-+ } else if ((b1) == 0x69 && (b2) == 0xc0) { /* imul eax, imm32 */\
-+ DILUTE_CONST_SEQUENCE(_off, randkey); \
-+ /* imul eax, ecx */ \
-+ EMIT3(0x0f, 0xaf, 0xc1); \
-+ } else { \
-+ BUILD_BUG(); \
-+ } \
-+} while (0)
-+#else
- #define EMIT1_off32(b1, off) do { EMIT1(b1); EMIT(off, 4);} while (0)
-+#define EMIT2_off32(b1, b2, off) do { EMIT2(b1, b2); EMIT(off, 4);} while (0)
-+#endif
-
- #define CLEAR_A() EMIT2(0x31, 0xc0) /* xor %eax,%eax */
- #define CLEAR_X() EMIT2(0x31, 0xdb) /* xor %ebx,%ebx */
-@@ -91,6 +168,24 @@ do { \
- #define X86_JBE 0x76
- #define X86_JA 0x77
-
-+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
-+#define APPEND_FLOW_VERIFY() \
-+do { \
-+ /* mov ecx, randkey */ \
-+ EMIT1(0xb9); \
-+ EMIT(randkey, 4); \
-+ /* cmp ecx, randkey */ \
-+ EMIT2(0x81, 0xf9); \
-+ EMIT(randkey, 4); \
-+ /* jz after 8 int 3s */ \
-+ EMIT2(0x74, 0x08); \
-+ EMIT(0xcccccccc, 4); \
-+ EMIT(0xcccccccc, 4); \
-+} while (0)
-+#else
-+#define APPEND_FLOW_VERIFY() do { } while (0)
+ int bpf_jit_enable __read_mostly;
+#endif
-+
- #define EMIT_COND_JMP(op, offset) \
- do { \
- if (is_near(offset)) \
-@@ -98,6 +193,7 @@ do { \
- else { \
- EMIT2(0x0f, op + 0x10); \
- EMIT(offset, 4); /* jxx .+off32 */ \
-+ APPEND_FLOW_VERIFY(); \
- } \
- } while (0)
-@@ -145,55 +241,54 @@ static int pkt_type_offset(void)
- return -1;
- }
-
--struct bpf_binary_header {
-- unsigned int pages;
-- /* Note : for security reasons, bpf code will follow a randomly
-- * sized amount of int3 instructions
-- */
-- u8 image[];
--};
--
--static struct bpf_binary_header *bpf_alloc_binary(unsigned int proglen,
-+/* Note : for security reasons, bpf code will follow a randomly
-+ * sized amount of int3 instructions
-+ */
-+static u8 *bpf_alloc_binary(unsigned int proglen,
- u8 **image_ptr)
+ /*
+ * assembly code in arch/x86/net/bpf_jit.S
+@@ -174,7 +178,9 @@ static inline u8 add_2reg(u8 byte, u32 dst_reg, u32 src_reg)
+ static void jit_fill_hole(void *area, unsigned int size)
{
- unsigned int sz, hole;
-- struct bpf_binary_header *header;
-+ u8 *header;
-
- /* Most of BPF filters are really small,
- * but if some of them fill a page, allow at least
- * 128 extra bytes to insert a random section of int3
- */
-- sz = round_up(proglen + sizeof(*header) + 128, PAGE_SIZE);
-- header = module_alloc(sz);
-+ sz = round_up(proglen + 128, PAGE_SIZE);
-+ header = module_alloc_exec(sz);
- if (!header)
- return NULL;
-
+ /* fill whole space with int3 instructions */
+ pax_open_kernel();
- memset(header, 0xcc, sz); /* fill whole space with int3 instructions */
+ memset(area, 0xcc, size);
+ pax_close_kernel();
+ }
-- header->pages = sz / PAGE_SIZE;
-- hole = min(sz - (proglen + sizeof(*header)), PAGE_SIZE - sizeof(*header));
-+ hole = PAGE_SIZE - (proglen & ~PAGE_MASK);
-
- /* insert a random number of int3 instructions before BPF code */
-- *image_ptr = &header->image[prandom_u32() % hole];
-+ *image_ptr = &header[prandom_u32() % hole];
- return header;
- }
-
- void bpf_jit_compile(struct sk_filter *fp)
- {
-- u8 temp[64];
-+ u8 temp[MAX_INSTR_CODE_SIZE];
- u8 *prog;
- unsigned int proglen, oldproglen = 0;
- int ilen, i;
- int t_offset, f_offset;
- u8 t_op, f_op, seen = 0, pass;
- u8 *image = NULL;
-- struct bpf_binary_header *header = NULL;
-+ u8 *header = NULL;
- u8 *func;
- int pc_ret0 = -1; /* bpf index of first RET #0 instruction (if any) */
- unsigned int cleanup_addr; /* epilogue code offset */
- unsigned int *addrs;
- const struct sock_filter *filter = fp->insns;
- int flen = fp->len;
-+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
-+ unsigned int randkey;
-+#endif
-
- if (!bpf_jit_enable)
- return;
-@@ -203,10 +298,10 @@ void bpf_jit_compile(struct sk_filter *fp)
- return;
-
- /* Before first pass, make a rough estimation of addrs[]
-- * each bpf instruction is translated to less than 64 bytes
-+ * each bpf instruction is translated to less than MAX_INSTR_CODE_SIZE bytes
- */
- for (proglen = 0, i = 0; i < flen; i++) {
-- proglen += 64;
-+ proglen += MAX_INSTR_CODE_SIZE;
- addrs[i] = proglen;
- }
- cleanup_addr = proglen; /* epilogue address */
-@@ -285,6 +380,10 @@ void bpf_jit_compile(struct sk_filter *fp)
- for (i = 0; i < flen; i++) {
- unsigned int K = filter[i].k;
-
-+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
-+ randkey = prandom_u32();
-+#endif
-+
- switch (filter[i].code) {
- case BPF_S_ALU_ADD_X: /* A += X; */
- seen |= SEEN_XREG;
-@@ -317,10 +416,8 @@ void bpf_jit_compile(struct sk_filter *fp)
- case BPF_S_ALU_MUL_K: /* A *= K */
- if (is_imm8(K))
- EMIT3(0x6b, 0xc0, K); /* imul imm8,%eax,%eax */
-- else {
-- EMIT2(0x69, 0xc0); /* imul imm32,%eax */
-- EMIT(K, 4);
-- }
-+ else
-+ EMIT2_off32(0x69, 0xc0, K); /* imul imm32,%eax */
- break;
- case BPF_S_ALU_DIV_X: /* A /= X; */
- seen |= SEEN_XREG;
-@@ -364,7 +461,11 @@ void bpf_jit_compile(struct sk_filter *fp)
- break;
- }
- EMIT2(0x31, 0xd2); /* xor %edx,%edx */
-+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
-+ DILUTE_CONST_SEQUENCE(K, randkey);
-+#else
- EMIT1(0xb9);EMIT(K, 4); /* mov imm32,%ecx */
-+#endif
- EMIT2(0xf7, 0xf1); /* div %ecx */
- EMIT2(0x89, 0xd0); /* mov %edx,%eax */
- break;
-@@ -372,7 +473,11 @@ void bpf_jit_compile(struct sk_filter *fp)
- if (K == 1)
- break;
- EMIT2(0x31, 0xd2); /* xor %edx,%edx */
-+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
-+ DILUTE_CONST_SEQUENCE(K, randkey);
-+#else
- EMIT1(0xb9);EMIT(K, 4); /* mov imm32,%ecx */
-+#endif
- EMIT2(0xf7, 0xf1); /* div %ecx */
- break;
- case BPF_S_ALU_AND_X:
-@@ -643,8 +748,7 @@ common_load_ind: seen |= SEEN_DATAREF | SEEN_XREG;
- if (is_imm8(K)) {
- EMIT3(0x8d, 0x73, K); /* lea imm8(%rbx), %esi */
- } else {
-- EMIT2(0x8d, 0xb3); /* lea imm32(%rbx),%esi */
-- EMIT(K, 4);
-+ EMIT2_off32(0x8d, 0xb3, K); /* lea imm32(%rbx),%esi */
- }
- } else {
- EMIT2(0x89,0xde); /* mov %ebx,%esi */
-@@ -734,10 +838,12 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
- if (unlikely(proglen + ilen > oldproglen)) {
- pr_err("bpb_jit_compile fatal error\n");
- kfree(addrs);
-- module_free(NULL, header);
-+ module_free_exec(NULL, image);
- return;
- }
-+ pax_open_kernel();
- memcpy(image + proglen, temp, ilen);
-+ pax_close_kernel();
+ struct jit_context {
+@@ -894,7 +900,9 @@ common_load:
+ pr_err("bpf_jit_compile fatal error\n");
+ return -EFAULT;
}
- proglen += ilen;
- addrs[i] = proglen;
-@@ -770,7 +876,6 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
++ pax_open_kernel();
+ memcpy(image + proglen, temp, ilen);
++ pax_close_kernel();
+ }
+ proglen += ilen;
+ addrs[i] = proglen;
+@@ -966,7 +974,6 @@ void bpf_int_jit_compile(struct bpf_prog *prog)
if (image) {
bpf_flush_icache(header, image + proglen);
- set_memory_ro((unsigned long)header, header->pages);
- fp->bpf_func = (void *)image;
+ prog->bpf_func = (void *)image;
+ prog->jited = true;
}
- out:
-@@ -782,10 +887,8 @@ static void bpf_jit_free_deferred(struct work_struct *work)
- {
- struct sk_filter *fp = container_of(work, struct sk_filter, work);
+@@ -979,12 +986,8 @@ void bpf_jit_free(struct bpf_prog *fp)
unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
-- struct bpf_binary_header *header = (void *)addr;
+ struct bpf_binary_header *header = (void *)addr;
+
+- if (!fp->jited)
+- goto free_filter;
++ if (fp->jited)
++ bpf_jit_binary_free(header);
- set_memory_rw(addr, header->pages);
-- module_free(NULL, header);
-+ module_free_exec(NULL, (void *)addr);
- kfree(fp);
+- bpf_jit_binary_free(header);
+-
+-free_filter:
+ bpf_prog_unlock_free(fp);
}
-
diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
index 5d04be5..2beeaa2 100644
--- a/arch/x86/oprofile/backtrace.c
@@ -34693,7 +34269,7 @@ index 5d04be5..2beeaa2 100644
if (depth)
dump_trace(NULL, regs, (unsigned long *)stack, 0,
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
-index 6890d84..1dad1f1 100644
+index 1d2e639..f6ef82a 100644
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -23,6 +23,7 @@
@@ -34704,7 +34280,7 @@ index 6890d84..1dad1f1 100644
#include "op_counter.h"
#include "op_x86_model.h"
-@@ -774,8 +775,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
+@@ -785,8 +786,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
if (ret)
return ret;
@@ -34776,23 +34352,23 @@ index 71e8a67..6a313bb 100644
struct op_counter_config;
diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
-index 84b9d67..260e5ff 100644
+index b9958c3..24229ab 100644
--- a/arch/x86/pci/intel_mid_pci.c
+++ b/arch/x86/pci/intel_mid_pci.c
-@@ -245,7 +245,7 @@ int __init intel_mid_pci_init(void)
- pr_info("Intel MID platform detected, using MID PCI ops\n");
+@@ -250,7 +250,7 @@ int __init intel_mid_pci_init(void)
pci_mmcfg_late_init();
pcibios_enable_irq = intel_mid_pci_irq_enable;
+ pcibios_disable_irq = intel_mid_pci_irq_disable;
- pci_root_ops = intel_mid_pci_ops;
+ memcpy((void *)&pci_root_ops, &intel_mid_pci_ops, sizeof pci_root_ops);
pci_soc_mode = 1;
/* Continue with standard init */
return 1;
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
-index 372e9b8..e775a6c 100644
+index eb500c2..eab9e70 100644
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
-@@ -50,7 +50,7 @@ struct irq_router {
+@@ -51,7 +51,7 @@ struct irq_router {
struct irq_router_handler {
u16 vendor;
int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
@@ -34800,8 +34376,8 @@ index 372e9b8..e775a6c 100644
+} __do_const;
int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
- void (*pcibios_disable_irq)(struct pci_dev *dev) = NULL;
-@@ -794,7 +794,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
+ void (*pcibios_disable_irq)(struct pci_dev *dev) = pirq_disable_irq;
+@@ -791,7 +791,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
return 0;
}
@@ -34810,7 +34386,7 @@ index 372e9b8..e775a6c 100644
{ PCI_VENDOR_ID_INTEL, intel_router_probe },
{ PCI_VENDOR_ID_AL, ali_router_probe },
{ PCI_VENDOR_ID_ITE, ite_router_probe },
-@@ -821,7 +821,7 @@ static struct pci_dev *pirq_router_dev;
+@@ -818,7 +818,7 @@ static struct pci_dev *pirq_router_dev;
static void __init pirq_find_router(struct irq_router *r)
{
struct irq_routing_table *rt = pirq_table;
@@ -34819,7 +34395,7 @@ index 372e9b8..e775a6c 100644
#ifdef CONFIG_PCI_BIOS
if (!rt->signature) {
-@@ -1094,7 +1094,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
+@@ -1091,7 +1091,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
return 0;
}
@@ -34829,19 +34405,19 @@ index 372e9b8..e775a6c 100644
.callback = fix_broken_hp_bios_irq9,
.ident = "HP Pavilion N5400 Series Laptop",
diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
-index c77b24a..c979855 100644
+index 9b83b90..4112152 100644
--- a/arch/x86/pci/pcbios.c
+++ b/arch/x86/pci/pcbios.c
@@ -79,7 +79,7 @@ union bios32 {
static struct {
unsigned long address;
unsigned short segment;
--} bios32_indirect = { 0, __KERNEL_CS };
-+} bios32_indirect __read_only = { 0, __PCIBIOS_CS };
+-} bios32_indirect __initdata = { 0, __KERNEL_CS };
++} bios32_indirect __initconst = { 0, __PCIBIOS_CS };
/*
* Returns the entry point for the given service, NULL on error
-@@ -92,37 +92,80 @@ static unsigned long bios32_service(unsigned long service)
+@@ -92,37 +92,80 @@ static unsigned long __init bios32_service(unsigned long service)
unsigned long length; /* %ecx */
unsigned long entry; /* %edx */
unsigned long flags;
@@ -34932,9 +34508,9 @@ index c77b24a..c979855 100644
-static int pci_bios_present;
+static int pci_bios_present __read_only;
- static int check_pcibios(void)
+ static int __init check_pcibios(void)
{
-@@ -131,11 +174,13 @@ static int check_pcibios(void)
+@@ -131,11 +174,13 @@ static int __init check_pcibios(void)
unsigned long flags, pcibios_entry;
if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
@@ -34951,7 +34527,7 @@ index c77b24a..c979855 100644
"jc 1f\n\t"
"xor %%ah, %%ah\n"
"1:"
-@@ -144,7 +189,8 @@ static int check_pcibios(void)
+@@ -144,7 +189,8 @@ static int __init check_pcibios(void)
"=b" (ebx),
"=c" (ecx)
: "1" (PCIBIOS_PCI_BIOS_PRESENT),
@@ -35131,10 +34707,10 @@ index c77b24a..c979855 100644
}
EXPORT_SYMBOL(pcibios_set_irq_routing);
diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
-index 9ee3491..872192f 100644
+index 40e7cda..c7e6672 100644
--- a/arch/x86/platform/efi/efi_32.c
+++ b/arch/x86/platform/efi/efi_32.c
-@@ -59,11 +59,22 @@ void efi_call_phys_prelog(void)
+@@ -61,11 +61,22 @@ void __init efi_call_phys_prolog(void)
{
struct desc_ptr gdt_descr;
@@ -35157,7 +34733,7 @@ index 9ee3491..872192f 100644
gdt_descr.address = __pa(get_cpu_gdt_table(0));
gdt_descr.size = GDT_SIZE - 1;
load_gdt(&gdt_descr);
-@@ -73,11 +84,24 @@ void efi_call_phys_epilog(void)
+@@ -75,11 +86,24 @@ void __init efi_call_phys_epilog(void)
{
struct desc_ptr gdt_descr;
@@ -35183,10 +34759,10 @@ index 9ee3491..872192f 100644
local_irq_restore(efi_rt_eflags);
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
-index 666b74a..7c90b04 100644
+index 35aecb6..46177db 100644
--- a/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
-@@ -97,6 +97,11 @@ void __init efi_call_phys_prelog(void)
+@@ -99,6 +99,11 @@ void __init efi_call_phys_prolog(void)
vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
}
@@ -35198,7 +34774,7 @@ index 666b74a..7c90b04 100644
__flush_tlb_all();
}
-@@ -114,6 +119,11 @@ void __init efi_call_phys_epilog(void)
+@@ -116,6 +121,11 @@ void __init efi_call_phys_epilog(void)
for (pgd = 0; pgd < n_pgds; pgd++)
set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]);
kfree(save_pgd);
@@ -35210,8 +34786,8 @@ index 666b74a..7c90b04 100644
__flush_tlb_all();
local_irq_restore(efi_flags);
early_code_mapping_set_exec(0);
-@@ -141,8 +151,23 @@ int efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
- {
+@@ -146,8 +156,23 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
+ unsigned npages;
pgd_t *pgd;
- if (efi_enabled(EFI_OLD_MEMMAP))
@@ -35236,7 +34812,7 @@ index 666b74a..7c90b04 100644
efi_scratch.efi_pgt = (pgd_t *)(unsigned long)real_mode_header->trampoline_pgd;
pgd = __va(efi_scratch.efi_pgt);
diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
-index fbe66e6..eae5e38 100644
+index 040192b..7d3300f 100644
--- a/arch/x86/platform/efi/efi_stub_32.S
+++ b/arch/x86/platform/efi/efi_stub_32.S
@@ -6,7 +6,9 @@
@@ -35259,7 +34835,7 @@ index fbe66e6..eae5e38 100644
/*
* 0. The function can only be called in Linux kernel. So CS has been
@@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
- * The mapping of lower virtual memory has been created in prelog and
+ * The mapping of lower virtual memory has been created in prolog and
* epilog.
*/
- movl $1f, %edx
@@ -35365,73 +34941,36 @@ index fbe66e6..eae5e38 100644
.long 0
efi_rt_function_ptr:
diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
-index 88073b1..1cc2f53 100644
+index 5fcda72..cd4dc41 100644
--- a/arch/x86/platform/efi/efi_stub_64.S
+++ b/arch/x86/platform/efi/efi_stub_64.S
-@@ -7,6 +7,7 @@
- */
-
- #include <linux/linkage.h>
+@@ -11,6 +11,7 @@
+ #include <asm/msr.h>
+ #include <asm/processor-flags.h>
+ #include <asm/page_types.h>
+#include <asm/alternative-asm.h>
#define SAVE_XMM \
mov %rsp, %rax; \
-@@ -77,6 +78,7 @@ ENTRY(efi_call0)
- RESTORE_PGT
- addq $32, %rsp
- RESTORE_XMM
-+ pax_force_retaddr 0, 1
- ret
- ENDPROC(efi_call0)
-
-@@ -89,6 +91,7 @@ ENTRY(efi_call1)
- RESTORE_PGT
- addq $32, %rsp
- RESTORE_XMM
-+ pax_force_retaddr 0, 1
- ret
- ENDPROC(efi_call1)
-
-@@ -101,6 +104,7 @@ ENTRY(efi_call2)
- RESTORE_PGT
- addq $32, %rsp
- RESTORE_XMM
-+ pax_force_retaddr 0, 1
- ret
- ENDPROC(efi_call2)
-
-@@ -114,6 +118,7 @@ ENTRY(efi_call3)
- RESTORE_PGT
- addq $32, %rsp
- RESTORE_XMM
-+ pax_force_retaddr 0, 1
- ret
- ENDPROC(efi_call3)
-
-@@ -128,6 +133,7 @@ ENTRY(efi_call4)
- RESTORE_PGT
- addq $32, %rsp
- RESTORE_XMM
-+ pax_force_retaddr 0, 1
- ret
- ENDPROC(efi_call4)
-
-@@ -143,6 +149,7 @@ ENTRY(efi_call5)
- RESTORE_PGT
- addq $48, %rsp
- RESTORE_XMM
-+ pax_force_retaddr 0, 1
- ret
- ENDPROC(efi_call5)
-
-@@ -161,6 +168,7 @@ ENTRY(efi_call6)
+@@ -88,6 +89,7 @@ ENTRY(efi_call)
RESTORE_PGT
addq $48, %rsp
RESTORE_XMM
+ pax_force_retaddr 0, 1
ret
- ENDPROC(efi_call6)
+ ENDPROC(efi_call)
+@@ -245,8 +247,8 @@ efi_gdt64:
+ .long 0 /* Filled out by user */
+ .word 0
+ .quad 0x0000000000000000 /* NULL descriptor */
+- .quad 0x00af9a000000ffff /* __KERNEL_CS */
+- .quad 0x00cf92000000ffff /* __KERNEL_DS */
++ .quad 0x00af9b000000ffff /* __KERNEL_CS */
++ .quad 0x00cf93000000ffff /* __KERNEL_DS */
+ .quad 0x0080890000000000 /* TS descriptor */
+ .quad 0x0000000000000000 /* TS continued */
+ efi_gdt64_end:
diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
index 1bbedc4..eb795b5 100644
--- a/arch/x86/platform/intel-mid/intel-mid.c
@@ -35449,20 +34988,16 @@ index 1bbedc4..eb795b5 100644
static unsigned long __init intel_mid_calibrate_tsc(void)
diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
-index 46aa25c..59a68ed 100644
+index 3c1c386..59a68ed 100644
--- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
+++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
-@@ -10,10 +10,9 @@
- */
-
-
--/* __attribute__((weak)) makes these declarations overridable */
+@@ -13,6 +13,6 @@
/* For every CPU addition a new get_<cpuname>_ops interface needs
* to be added.
*/
--extern void *get_penwell_ops(void) __attribute__((weak));
--extern void *get_cloverview_ops(void) __attribute__((weak));
--extern void *get_tangier_ops(void) __attribute__((weak));
+-extern void *get_penwell_ops(void);
+-extern void *get_cloverview_ops(void);
+-extern void *get_tangier_ops(void);
+extern const void *get_penwell_ops(void);
+extern const void *get_cloverview_ops(void);
+extern const void *get_tangier_ops(void);
@@ -35512,7 +35047,7 @@ index d6ee929..3637cb5 100644
.getproplen = olpc_dt_getproplen,
.getproperty = olpc_dt_getproperty,
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
-index 424f4c9..f2a2988 100644
+index 6ec7910..ecdbb11 100644
--- a/arch/x86/power/cpu.c
+++ b/arch/x86/power/cpu.c
@@ -137,11 +137,8 @@ static void do_fpu_end(void)
@@ -35569,10 +35104,10 @@ index bad628a..a102610 100644
#endif
}
diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
-index 3497f14..cc73b92 100644
+index 7c0d7be..d24dc88 100644
--- a/arch/x86/realmode/rm/Makefile
+++ b/arch/x86/realmode/rm/Makefile
-@@ -66,5 +66,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
+@@ -67,5 +67,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
KBUILD_CFLAGS := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
-I$(srctree)/arch/x86/boot
@@ -35680,7 +35215,7 @@ index 9e7e147..25a4158 100644
jmp trampoline_start
#endif
diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
-index e812034..c747134 100644
+index 604a37e..e49702a 100644
--- a/arch/x86/tools/Makefile
+++ b/arch/x86/tools/Makefile
@@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
@@ -35691,9 +35226,9 @@ index e812034..c747134 100644
+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
hostprogs-y += relocs
relocs-objs := relocs_32.o relocs_64.o relocs_common.o
- relocs: $(obj)/relocs
+ PHONY += relocs
diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
-index cfbdbdb..1aa763c 100644
+index a5efb21..97490e9 100644
--- a/arch/x86/tools/relocs.c
+++ b/arch/x86/tools/relocs.c
@@ -1,5 +1,7 @@
@@ -35907,6 +35442,19 @@ index cfbdbdb..1aa763c 100644
if (ELF_BITS == 64)
percpu_init();
if (show_absolute_syms) {
+diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c
+index f40281e..92728c9 100644
+--- a/arch/x86/um/mem_32.c
++++ b/arch/x86/um/mem_32.c
+@@ -21,7 +21,7 @@ static int __init gate_vma_init(void)
+ gate_vma.vm_start = FIXADDR_USER_START;
+ gate_vma.vm_end = FIXADDR_USER_END;
+ gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
+- gate_vma.vm_page_prot = __P101;
++ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
+
+ return 0;
+ }
diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
index 80ffa5b..a33bd15 100644
--- a/arch/x86/um/tls_32.c
@@ -35921,202 +35469,167 @@ index 80ffa5b..a33bd15 100644
return 0;
diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
-index fd14be1..e3c79c0 100644
+index 5a4affe..9e2d522 100644
--- a/arch/x86/vdso/Makefile
+++ b/arch/x86/vdso/Makefile
-@@ -181,7 +181,7 @@ quiet_cmd_vdso = VDSO $@
+@@ -174,7 +174,7 @@ quiet_cmd_vdso = VDSO $@
-Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
--VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
-+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
+-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
++VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
+ $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
GCOV_PROFILE := n
- #
+diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/vdso/vdso2c.h
+index 0224987..c7d65a5 100644
+--- a/arch/x86/vdso/vdso2c.h
++++ b/arch/x86/vdso/vdso2c.h
+@@ -12,7 +12,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
+ unsigned long load_size = -1; /* Work around bogus warning */
+ unsigned long mapping_size;
+ ELF(Ehdr) *hdr = (ELF(Ehdr) *)raw_addr;
+- int i;
++ unsigned int i;
+ unsigned long j;
+ ELF(Shdr) *symtab_hdr = NULL, *strtab_hdr, *secstrings_hdr,
+ *alt_sec = NULL;
diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
-index d6bfb87..876ee18 100644
+index e904c27..b9eaa03 100644
--- a/arch/x86/vdso/vdso32-setup.c
+++ b/arch/x86/vdso/vdso32-setup.c
-@@ -25,6 +25,7 @@
- #include <asm/tlbflush.h>
+@@ -14,6 +14,7 @@
+ #include <asm/cpufeature.h>
+ #include <asm/processor.h>
#include <asm/vdso.h>
- #include <asm/proto.h>
+#include <asm/mman.h>
- enum {
- VDSO_DISABLED = 0,
-@@ -226,7 +227,7 @@ static inline void map_compat_vdso(int map)
- void enable_sep_cpu(void)
- {
- int cpu = get_cpu();
-- struct tss_struct *tss = &per_cpu(init_tss, cpu);
-+ struct tss_struct *tss = init_tss + cpu;
-
- if (!boot_cpu_has(X86_FEATURE_SEP)) {
- put_cpu();
-@@ -249,7 +250,7 @@ static int __init gate_vma_init(void)
- gate_vma.vm_start = FIXADDR_USER_START;
- gate_vma.vm_end = FIXADDR_USER_END;
- gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
-- gate_vma.vm_page_prot = __P101;
-+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
-
- return 0;
- }
-@@ -330,14 +331,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
- if (compat)
- addr = VDSO_HIGH_BASE;
- else {
-- addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
-+ addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, MAP_EXECUTABLE);
- if (IS_ERR_VALUE(addr)) {
- ret = addr;
- goto up_fail;
- }
- }
-
-- current->mm->context.vdso = (void *)addr;
-+ current->mm->context.vdso = addr;
-
- if (compat_uses_vma || !compat) {
- /*
-@@ -353,11 +354,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
- }
-
- current_thread_info()->sysenter_return =
-- VDSO32_SYMBOL(addr, SYSENTER_RETURN);
-+ (__force void __user *)VDSO32_SYMBOL(addr, SYSENTER_RETURN);
-
- up_fail:
- if (ret)
-- current->mm->context.vdso = NULL;
-+ current->mm->context.vdso = 0;
-
- up_write(&mm->mmap_sem);
-
-@@ -404,8 +405,14 @@ __initcall(ia32_binfmt_init);
-
- const char *arch_vma_name(struct vm_area_struct *vma)
- {
-- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
-+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
- return "[vdso]";
-+
-+#ifdef CONFIG_PAX_SEGMEXEC
-+ if (vma->vm_mm && vma->vm_mirror && vma->vm_mirror->vm_start == vma->vm_mm->context.vdso)
-+ return "[vdso]";
-+#endif
-+
- return NULL;
- }
-
-@@ -415,7 +422,7 @@ struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
- * Check to see if the corresponding task was created in compat vdso
- * mode.
- */
-- if (mm && mm->context.vdso == (void *)VDSO_HIGH_BASE)
-+ if (mm && mm->context.vdso == VDSO_HIGH_BASE)
- return &gate_vma;
- return NULL;
- }
+ #ifdef CONFIG_COMPAT_VDSO
+ #define VDSO_DEFAULT 0
diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
-index ab6ba35..7ede14e 100644
+index 208c220..54f1447 100644
--- a/arch/x86/vdso/vma.c
+++ b/arch/x86/vdso/vma.c
-@@ -16,8 +16,6 @@
+@@ -16,10 +16,9 @@
#include <asm/vdso.h>
#include <asm/page.h>
+ #include <asm/hpet.h>
++#include <asm/mman.h>
--unsigned int __read_mostly vdso_enabled = 1;
+ #if defined(CONFIG_X86_64)
+-unsigned int __read_mostly vdso64_enabled = 1;
-
- extern char vdso_start[], vdso_end[];
extern unsigned short vdso_sync_cpuid;
+ #endif
-@@ -152,12 +150,6 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
- addr = start;
- }
-
-- /*
-- * Forcibly align the final address in case we have a hardware
-- * issue that requires alignment for performance reasons.
-- */
-- addr = align_vdso_addr(addr);
--
- return addr;
- }
-
-@@ -169,30 +161,37 @@ static int setup_additional_pages(struct linux_binprm *bprm,
- unsigned size)
- {
- struct mm_struct *mm = current->mm;
-- unsigned long addr;
-+ unsigned long addr = 0;
- int ret;
+@@ -114,6 +113,11 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
+ .pages = no_pages,
+ };
-- if (!vdso_enabled)
-- return 0;
--
- down_write(&mm->mmap_sem);
-+
+#ifdef CONFIG_PAX_RANDMMAP
-+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
++ if (mm->pax_flags & MF_PAX_RANDMMAP)
++ calculate_addr = false;
+#endif
+
- addr = vdso_addr(mm->start_stack, size);
-+
-+ /*
-+ * Forcibly align the final address in case we have a hardware
-+ * issue that requires alignment for performance reasons.
-+ */
-+ addr = align_vdso_addr(addr);
-+
- addr = get_unmapped_area(NULL, addr, size, 0, 0);
+ if (calculate_addr) {
+ addr = vdso_addr(current->mm->start_stack,
+ image->size - image->sym_vvar_start);
+@@ -124,14 +128,14 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
+ down_write(&mm->mmap_sem);
+
+ addr = get_unmapped_area(NULL, addr,
+- image->size - image->sym_vvar_start, 0, 0);
++ image->size - image->sym_vvar_start, 0, MAP_EXECUTABLE);
if (IS_ERR_VALUE(addr)) {
ret = addr;
goto up_fail;
}
-- current->mm->context.vdso = (void *)addr;
-+ mm->context.vdso = addr;
+ text_start = addr - image->sym_vvar_start;
+- current->mm->context.vdso = (void __user *)text_start;
++ mm->context.vdso = text_start;
- ret = install_special_mapping(mm, addr, size,
- VM_READ|VM_EXEC|
- VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC,
- pages);
-- if (ret) {
-- current->mm->context.vdso = NULL;
-- goto up_fail;
-- }
-+ if (ret)
-+ mm->context.vdso = 0;
+ /*
+ * MAYWRITE to allow gdb to COW and set breakpoints
+@@ -176,15 +180,12 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
+ hpet_address >> PAGE_SHIFT,
+ PAGE_SIZE,
+ pgprot_noncached(PAGE_READONLY));
+-
+- if (ret)
+- goto up_fail;
+ }
+ #endif
up_fail:
+ if (ret)
+- current->mm->context.vdso = NULL;
++ current->mm->context.vdso = 0;
+
up_write(&mm->mmap_sem);
-@@ -212,10 +211,3 @@ int x32_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
- vdsox32_size);
+ return ret;
+@@ -204,8 +205,8 @@ static int load_vdso32(void)
+
+ if (selected_vdso32->sym_VDSO32_SYSENTER_RETURN)
+ current_thread_info()->sysenter_return =
+- current->mm->context.vdso +
+- selected_vdso32->sym_VDSO32_SYSENTER_RETURN;
++ (void __force_user *)(current->mm->context.vdso +
++ selected_vdso32->sym_VDSO32_SYSENTER_RETURN);
+
+ return 0;
+ }
+@@ -214,9 +215,6 @@ static int load_vdso32(void)
+ #ifdef CONFIG_X86_64
+ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
+ {
+- if (!vdso64_enabled)
+- return 0;
+-
+ return map_vdso(&vdso_image_64, true);
+ }
+
+@@ -225,12 +223,8 @@ int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
+ int uses_interp)
+ {
+ #ifdef CONFIG_X86_X32_ABI
+- if (test_thread_flag(TIF_X32)) {
+- if (!vdso64_enabled)
+- return 0;
+-
++ if (test_thread_flag(TIF_X32))
+ return map_vdso(&vdso_image_x32, true);
+- }
+ #endif
+
+ return load_vdso32();
+@@ -242,12 +236,3 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
+ return load_vdso32();
}
#endif
-
+-#ifdef CONFIG_X86_64
-static __init int vdso_setup(char *s)
-{
-- vdso_enabled = simple_strtoul(s, NULL, 0);
+- vdso64_enabled = simple_strtoul(s, NULL, 0);
- return 0;
-}
-__setup("vdso=", vdso_setup);
+-#endif
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
-index 01b9026..1e476df 100644
+index e88fda8..76ce7ce 100644
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@ -9,6 +9,7 @@ config XEN
select XEN_HAVE_PVMMU
- depends on X86_64 || (X86_32 && X86_PAE && !X86_VISWS)
+ depends on X86_64 || (X86_32 && X86_PAE)
depends on X86_TSC
+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_XEN
help
This is the Linux Xen port. Enabling this will allow the
kernel to boot in a paravirtualized environment under the
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 201d09a..2302db1 100644
+index fac5e4f..89c3525 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -123,8 +123,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
@@ -36204,7 +35717,7 @@ index 201d09a..2302db1 100644
{
if (pm_power_off)
pm_power_off();
-@@ -1455,8 +1451,11 @@ static void __ref xen_setup_gdt(int cpu)
+@@ -1456,8 +1452,11 @@ static void __ref xen_setup_gdt(int cpu)
pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;
pv_cpu_ops.load_gdt = xen_load_gdt_boot;
@@ -36218,7 +35731,7 @@ index 201d09a..2302db1 100644
pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry;
pv_cpu_ops.load_gdt = xen_load_gdt;
-@@ -1564,7 +1563,17 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1573,7 +1572,17 @@ asmlinkage __visible void __init xen_start_kernel(void)
__userpte_alloc_gfp &= ~__GFP_HIGHMEM;
/* Work out if we support NX */
@@ -36237,7 +35750,7 @@ index 201d09a..2302db1 100644
/* Get mfn list */
xen_build_dynamic_phys_to_machine();
-@@ -1592,13 +1601,6 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1601,13 +1610,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
machine_ops = xen_machine_ops;
@@ -36252,7 +35765,7 @@ index 201d09a..2302db1 100644
#ifdef CONFIG_ACPI_NUMA
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
-index c83da6f..9d019b4 100644
+index a8a1a3d..8216142 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
@@ -36264,20 +35777,19 @@ index c83da6f..9d019b4 100644
{
if (val & _PAGE_PRESENT) {
unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
-@@ -1903,8 +1903,12 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
- /* L3_k[510] -> level2_kernel_pgt
+@@ -1867,7 +1867,11 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
* L3_k[511] -> level2_fixmap_pgt */
convert_pfn_mfn(level3_kernel_pgt);
+
+ convert_pfn_mfn(level3_vmalloc_start_pgt);
+ convert_pfn_mfn(level3_vmalloc_end_pgt);
+ convert_pfn_mfn(level3_vmemmap_pgt);
-
/* L3_k[511][506] -> level1_fixmap_pgt */
+ /* L3_k[511][507] -> level1_vsyscall_pgt */
convert_pfn_mfn(level2_fixmap_pgt);
}
/* We get [511][511] and have Xen's version of level2_kernel_pgt */
-@@ -1929,11 +1933,16 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
+@@ -1892,11 +1896,16 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
@@ -36294,7 +35806,7 @@ index c83da6f..9d019b4 100644
/* Pin down new L4 */
pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE,
-@@ -2120,6 +2129,7 @@ static void __init xen_post_allocator_init(void)
+@@ -2080,6 +2089,7 @@ static void __init xen_post_allocator_init(void)
pv_mmu_ops.set_pud = xen_set_pud;
#if PAGETABLE_LEVELS == 4
pv_mmu_ops.set_pgd = xen_set_pgd;
@@ -36302,7 +35814,7 @@ index c83da6f..9d019b4 100644
#endif
/* This will work as long as patching hasn't happened yet
-@@ -2198,6 +2208,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
+@@ -2158,6 +2168,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
.pud_val = PV_CALLEE_SAVE(xen_pud_val),
.make_pud = PV_CALLEE_SAVE(xen_make_pud),
.set_pgd = xen_set_pgd_hyper,
@@ -36311,10 +35823,10 @@ index c83da6f..9d019b4 100644
.alloc_pud = xen_alloc_pmd_init,
.release_pud = xen_release_pmd_init,
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
-index a18eadd..2e2f10e 100644
+index 4c071ae..00e7049 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
-@@ -283,17 +283,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
+@@ -288,17 +288,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
if (xen_pv_domain()) {
if (!xen_feature(XENFEAT_writable_page_tables))
@@ -36334,17 +35846,17 @@ index a18eadd..2e2f10e 100644
#endif
xen_filter_cpu_maps();
-@@ -372,7 +368,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
+@@ -379,7 +375,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
#ifdef CONFIG_X86_32
/* Note: PVH is not yet supported on x86_32. */
ctxt->user_regs.fs = __KERNEL_PERCPU;
- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
+ savesegment(gs, ctxt->user_regs.gs);
#endif
- ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
+ memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));
-@@ -381,8 +377,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
- if (!xen_feature(XENFEAT_auto_translated_physmap)) {
+@@ -387,8 +383,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
+ ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
ctxt->flags = VGCF_IN_KERNEL;
ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
- ctxt->user_regs.ds = __USER_DS;
@@ -36354,7 +35866,7 @@ index a18eadd..2e2f10e 100644
ctxt->user_regs.ss = __KERNEL_DS;
xen_copy_trap_info(ctxt->trap_ctxt);
-@@ -437,13 +433,12 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle)
+@@ -446,14 +442,13 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle)
int rc;
per_cpu(current_task, cpu) = idle;
@@ -36363,14 +35875,15 @@ index a18eadd..2e2f10e 100644
irq_ctx_init(cpu);
#else
clear_tsk_thread_flag(idle, TIF_FORK);
+ #endif
- per_cpu(kernel_stack, cpu) =
- (unsigned long)task_stack_page(idle) -
- KERNEL_STACK_OFFSET + THREAD_SIZE;
+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
- #endif
+
xen_setup_runstate_info(cpu);
xen_setup_timer(cpu);
-@@ -719,7 +714,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
+@@ -732,7 +727,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
void __init xen_smp_init(void)
{
@@ -36380,32 +35893,20 @@ index a18eadd..2e2f10e 100644
}
diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
-index 33ca6e4..0ded929 100644
+index fd92a64..1f72641 100644
--- a/arch/x86/xen/xen-asm_32.S
+++ b/arch/x86/xen/xen-asm_32.S
-@@ -84,14 +84,14 @@ ENTRY(xen_iret)
- ESP_OFFSET=4 # bytes pushed onto stack
-
- /*
-- * Store vcpu_info pointer for easy access. Do it this way to
-- * avoid having to reload %fs
-+ * Store vcpu_info pointer for easy access.
- */
- #ifdef CONFIG_SMP
-- GET_THREAD_INFO(%eax)
-- movl %ss:TI_cpu(%eax), %eax
-- movl %ss:__per_cpu_offset(,%eax,4), %eax
-- mov %ss:xen_vcpu(%eax), %eax
-+ push %fs
-+ mov $(__KERNEL_PERCPU), %eax
-+ mov %eax, %fs
+@@ -99,7 +99,7 @@ ENTRY(xen_iret)
+ pushw %fs
+ movl $(__KERNEL_PERCPU), %eax
+ movl %eax, %fs
+- movl %fs:xen_vcpu, %eax
+ mov PER_CPU_VAR(xen_vcpu), %eax
-+ pop %fs
+ POP_FS
#else
movl %ss:xen_vcpu, %eax
- #endif
diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
-index 485b695..fda3e7c 100644
+index 674b2225..f1f5dc1 100644
--- a/arch/x86/xen/xen-head.S
+++ b/arch/x86/xen/xen-head.S
@@ -39,6 +39,17 @@ ENTRY(startup_xen)
@@ -36427,7 +35928,7 @@ index 485b695..fda3e7c 100644
mov %rsi,xen_start_info
mov $init_thread_union+THREAD_SIZE,%rsp
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
-index 1cb6f4c..9981524 100644
+index 28c7e0b..2acfec7 100644
--- a/arch/x86/xen/xen-ops.h
+++ b/arch/x86/xen/xen-ops.h
@@ -10,8 +10,6 @@
@@ -36500,45 +36001,42 @@ index af00795..2bb8105 100644
#define XCHAL_ICACHE_SIZE 32768 /* I-cache size in bytes or 0 */
#define XCHAL_DCACHE_SIZE 32768 /* D-cache size in bytes or 0 */
-diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
-index d8f80e7..5f41702 100644
---- a/block/blk-cgroup.c
-+++ b/block/blk-cgroup.c
-@@ -809,7 +809,7 @@ static void blkcg_css_free(struct cgroup_subsys_state *css)
- static struct cgroup_subsys_state *
- blkcg_css_alloc(struct cgroup_subsys_state *parent_css)
- {
-- static atomic64_t id_seq = ATOMIC64_INIT(0);
-+ static atomic64_unchecked_t id_seq = ATOMIC64_INIT(0);
- struct blkcg *blkcg;
-
- if (!parent_css) {
-@@ -823,7 +823,7 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css)
-
- blkcg->cfq_weight = CFQ_WEIGHT_DEFAULT;
- blkcg->cfq_leaf_weight = CFQ_WEIGHT_DEFAULT;
-- blkcg->id = atomic64_inc_return(&id_seq); /* root is 0, start from 1 */
-+ blkcg->id = atomic64_inc_return_unchecked(&id_seq); /* root is 0, start from 1 */
- done:
- spin_lock_init(&blkcg->lock);
- INIT_RADIX_TREE(&blkcg->blkg_tree, GFP_ATOMIC);
-diff --git a/block/blk-exec.c b/block/blk-exec.c
-index dbf4502..3394b6e 100644
---- a/block/blk-exec.c
-+++ b/block/blk-exec.c
-@@ -56,6 +56,7 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
- bool is_pm_resume;
-
- WARN_ON(irqs_disabled());
-+ WARN_ON(rq->cmd_type == REQ_TYPE_FS);
-
- rq->rq_disk = bd_disk;
- rq->end_io = done;
+diff --git a/block/bio.c b/block/bio.c
+index 3e6e198..5c65199 100644
+--- a/block/bio.c
++++ b/block/bio.c
+@@ -1163,7 +1163,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
+ /*
+ * Overflow, abort
+ */
+- if (end < start)
++ if (end < start || end - start > INT_MAX - nr_pages)
+ return ERR_PTR(-EINVAL);
+
+ nr_pages += end - start;
+@@ -1297,7 +1297,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
+ /*
+ * Overflow, abort
+ */
+- if (end < start)
++ if (end < start || end - start > INT_MAX - nr_pages)
+ return ERR_PTR(-EINVAL);
+
+ nr_pages += end - start;
+@@ -1559,7 +1559,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
+ const int read = bio_data_dir(bio) == READ;
+ struct bio_map_data *bmd = bio->bi_private;
+ int i;
+- char *p = bmd->sgvecs[0].iov_base;
++ char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
+
+ bio_for_each_segment_all(bvec, bio, i) {
+ char *addr = page_address(bvec->bv_page);
diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
-index 1855bf5..af12b06 100644
+index 0736729..2ec3b48 100644
--- a/block/blk-iopoll.c
+++ b/block/blk-iopoll.c
-@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll)
+@@ -74,7 +74,7 @@ void blk_iopoll_complete(struct blk_iopoll *iop)
}
EXPORT_SYMBOL(blk_iopoll_complete);
@@ -36548,10 +36046,10 @@ index 1855bf5..af12b06 100644
struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
int rearm = 0, budget = blk_iopoll_budget;
diff --git a/block/blk-map.c b/block/blk-map.c
-index ae4ae10..c470b8d 100644
+index f890d43..97b0482 100644
--- a/block/blk-map.c
+++ b/block/blk-map.c
-@@ -302,7 +302,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
+@@ -300,7 +300,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
if (!len || !kbuf)
return -EINVAL;
@@ -36560,30 +36058,8 @@ index ae4ae10..c470b8d 100644
if (do_copy)
bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
else
-diff --git a/block/blk-mq.c b/block/blk-mq.c
-index 883f720..37322f0 100644
---- a/block/blk-mq.c
-+++ b/block/blk-mq.c
-@@ -710,14 +710,9 @@ void blk_mq_insert_request(struct request *rq, bool at_head, bool run_queue,
-
- hctx = q->mq_ops->map_queue(q, ctx->cpu);
-
-- if (rq->cmd_flags & (REQ_FLUSH | REQ_FUA) &&
-- !(rq->cmd_flags & (REQ_FLUSH_SEQ))) {
-- blk_insert_flush(rq);
-- } else {
-- spin_lock(&ctx->lock);
-- __blk_mq_insert_request(hctx, rq, at_head);
-- spin_unlock(&ctx->lock);
-- }
-+ spin_lock(&ctx->lock);
-+ __blk_mq_insert_request(hctx, rq, at_head);
-+ spin_unlock(&ctx->lock);
-
- blk_mq_put_ctx(current_ctx);
-
diff --git a/block/blk-softirq.c b/block/blk-softirq.c
-index 57790c1..5e988dd 100644
+index 53b1737..08177d2e 100644
--- a/block/blk-softirq.c
+++ b/block/blk-softirq.c
@@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
@@ -36596,7 +36072,7 @@ index 57790c1..5e988dd 100644
struct list_head *cpu_list, local_list;
diff --git a/block/bsg.c b/block/bsg.c
-index 420a5a9..23834aa 100644
+index 276e869..6fe4c61 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
@@ -36627,7 +36103,7 @@ index 420a5a9..23834aa 100644
if (blk_verify_command(rq->cmd, has_write_perm))
return -EPERM;
diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
-index a0926a6..b2b14b2 100644
+index f678c73..f35aa18 100644
--- a/block/compat_ioctl.c
+++ b/block/compat_ioctl.c
@@ -156,7 +156,7 @@ static int compat_cdrom_generic_command(struct block_device *bdev, fmode_t mode,
@@ -36649,7 +36125,7 @@ index a0926a6..b2b14b2 100644
err = -EFAULT;
goto out;
diff --git a/block/genhd.c b/block/genhd.c
-index a8d586a..d9910b1 100644
+index 0a536dc..b8f7aca 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -469,21 +469,24 @@ static char *bdevt_str(dev_t devt, char *buf)
@@ -36681,7 +36157,7 @@ index a8d586a..d9910b1 100644
EXPORT_SYMBOL(blk_unregister_region);
diff --git a/block/partitions/efi.c b/block/partitions/efi.c
-index dc51f46..d5446a8 100644
+index 56d08fd..2e07090 100644
--- a/block/partitions/efi.c
+++ b/block/partitions/efi.c
@@ -293,14 +293,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
@@ -36706,7 +36182,7 @@ index dc51f46..d5446a8 100644
(u8 *) pte, count) < count) {
kfree(pte);
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
-index 4044cf7..555ae4e 100644
+index b0c2a61..10bb6ec 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
@@ -36718,7 +36194,7 @@ index 4044cf7..555ae4e 100644
{
return jiffies_to_clock_t(q->sg_timeout);
}
-@@ -224,8 +224,20 @@ EXPORT_SYMBOL(blk_verify_command);
+@@ -227,8 +227,20 @@ EXPORT_SYMBOL(blk_verify_command);
static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
struct sg_io_hdr *hdr, fmode_t mode)
{
@@ -36740,7 +36216,7 @@ index 4044cf7..555ae4e 100644
if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
return -EPERM;
-@@ -417,6 +429,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
+@@ -431,6 +443,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
int err;
unsigned int in_len, out_len, bytes, opcode, cmdlen;
char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
@@ -36749,7 +36225,7 @@ index 4044cf7..555ae4e 100644
if (!sic)
return -EINVAL;
-@@ -450,9 +464,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
+@@ -469,9 +483,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
*/
err = -EFAULT;
rq->cmd_len = cmdlen;
@@ -36770,7 +36246,7 @@ index 4044cf7..555ae4e 100644
goto error;
diff --git a/crypto/cryptd.c b/crypto/cryptd.c
-index 75c415d..0b21cd8 100644
+index 650afac1..f3307de 100644
--- a/crypto/cryptd.c
+++ b/crypto/cryptd.c
@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
@@ -36791,20 +36267,6 @@ index 75c415d..0b21cd8 100644
static void cryptd_queue_worker(struct work_struct *work);
-diff --git a/crypto/cts.c b/crypto/cts.c
-index 60b9da3..bd94058 100644
---- a/crypto/cts.c
-+++ b/crypto/cts.c
-@@ -202,7 +202,8 @@ static int cts_cbc_decrypt(struct crypto_cts_ctx *ctx,
- /* 5. Append the tail (BB - Ln) bytes of Xn (tmp) to Cn to create En */
- memcpy(s + bsize + lastn, tmp + lastn, bsize - lastn);
- /* 6. Decrypt En to create Pn-1 */
-- memset(iv, 0, sizeof(iv));
-+ memzero_explicit(iv, sizeof(iv));
-+
- sg_set_buf(&sgsrc[0], s + bsize, bsize);
- sg_set_buf(&sgdst[0], d, bsize);
- err = crypto_blkcipher_decrypt_iv(&lcldesc, sgdst, sgsrc, bsize);
diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
index c305d41..a96de79 100644
--- a/crypto/pcrypt.c
@@ -36818,120 +36280,8 @@ index c305d41..a96de79 100644
if (!ret)
kobject_uevent(&pinst->kobj, KOBJ_ADD);
-diff --git a/crypto/sha1_generic.c b/crypto/sha1_generic.c
-index fdf7c00..a3e50c3 100644
---- a/crypto/sha1_generic.c
-+++ b/crypto/sha1_generic.c
-@@ -64,7 +64,7 @@ int crypto_sha1_update(struct shash_desc *desc, const u8 *data,
- src = data + done;
- } while (done + SHA1_BLOCK_SIZE <= len);
-
-- memset(temp, 0, sizeof(temp));
-+ memzero_explicit(temp, sizeof(temp));
- partial = 0;
- }
- memcpy(sctx->buffer + partial, src, len - done);
-diff --git a/crypto/sha256_generic.c b/crypto/sha256_generic.c
-index 136381b..cde0361 100644
---- a/crypto/sha256_generic.c
-+++ b/crypto/sha256_generic.c
-@@ -210,10 +210,9 @@ static void sha256_transform(u32 *state, const u8 *input)
-
- /* clear any sensitive info... */
- a = b = c = d = e = f = g = h = t1 = t2 = 0;
-- memset(W, 0, 64 * sizeof(u32));
-+ memzero_explicit(W, 64 * sizeof(u32));
- }
-
--
- static int sha224_init(struct shash_desc *desc)
- {
- struct sha256_state *sctx = shash_desc_ctx(desc);
-@@ -316,7 +315,7 @@ static int sha224_final(struct shash_desc *desc, u8 *hash)
- sha256_final(desc, D);
-
- memcpy(hash, D, SHA224_DIGEST_SIZE);
-- memset(D, 0, SHA256_DIGEST_SIZE);
-+ memzero_explicit(D, SHA256_DIGEST_SIZE);
-
- return 0;
- }
-diff --git a/crypto/sha512_generic.c b/crypto/sha512_generic.c
-index 6c6d901..d350854 100644
---- a/crypto/sha512_generic.c
-+++ b/crypto/sha512_generic.c
-@@ -238,7 +238,7 @@ static int sha384_final(struct shash_desc *desc, u8 *hash)
- sha512_final(desc, D);
-
- memcpy(hash, D, 48);
-- memset(D, 0, 64);
-+ memzero_explicit(D, 64);
-
- return 0;
- }
-diff --git a/crypto/tgr192.c b/crypto/tgr192.c
-index f7ed2fb..321bc6f 100644
---- a/crypto/tgr192.c
-+++ b/crypto/tgr192.c
-@@ -612,7 +612,7 @@ static int tgr160_final(struct shash_desc *desc, u8 * out)
-
- tgr192_final(desc, D);
- memcpy(out, D, TGR160_DIGEST_SIZE);
-- memset(D, 0, TGR192_DIGEST_SIZE);
-+ memzero_explicit(D, TGR192_DIGEST_SIZE);
-
- return 0;
- }
-@@ -623,7 +623,7 @@ static int tgr128_final(struct shash_desc *desc, u8 * out)
-
- tgr192_final(desc, D);
- memcpy(out, D, TGR128_DIGEST_SIZE);
-- memset(D, 0, TGR192_DIGEST_SIZE);
-+ memzero_explicit(D, TGR192_DIGEST_SIZE);
-
- return 0;
- }
-diff --git a/crypto/vmac.c b/crypto/vmac.c
-index bf2d3a8..df76a81 100644
---- a/crypto/vmac.c
-+++ b/crypto/vmac.c
-@@ -613,7 +613,7 @@ static int vmac_final(struct shash_desc *pdesc, u8 *out)
- }
- mac = vmac(ctx->partial, ctx->partial_size, nonce, NULL, ctx);
- memcpy(out, &mac, sizeof(vmac_t));
-- memset(&mac, 0, sizeof(vmac_t));
-+ memzero_explicit(&mac, sizeof(vmac_t));
- memset(&ctx->__vmac_ctx, 0, sizeof(struct vmac_ctx));
- ctx->partial_size = 0;
- return 0;
-diff --git a/crypto/wp512.c b/crypto/wp512.c
-index 253db94..7ee5a04 100644
---- a/crypto/wp512.c
-+++ b/crypto/wp512.c
-@@ -1102,8 +1102,8 @@ static int wp384_final(struct shash_desc *desc, u8 *out)
- u8 D[64];
-
- wp512_final(desc, D);
-- memcpy (out, D, WP384_DIGEST_SIZE);
-- memset (D, 0, WP512_DIGEST_SIZE);
-+ memcpy(out, D, WP384_DIGEST_SIZE);
-+ memzero_explicit(D, WP512_DIGEST_SIZE);
-
- return 0;
- }
-@@ -1113,8 +1113,8 @@ static int wp256_final(struct shash_desc *desc, u8 *out)
- u8 D[64];
-
- wp512_final(desc, D);
-- memcpy (out, D, WP256_DIGEST_SIZE);
-- memset (D, 0, WP512_DIGEST_SIZE);
-+ memcpy(out, D, WP256_DIGEST_SIZE);
-+ memzero_explicit(D, WP512_DIGEST_SIZE);
-
- return 0;
- }
diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
-index 15dddc1..b61cf0c 100644
+index 6921c7f..78e1af7 100644
--- a/drivers/acpi/acpica/hwxfsleep.c
+++ b/drivers/acpi/acpica/hwxfsleep.c
@@ -63,11 +63,12 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
@@ -36953,7 +36303,7 @@ index 15dddc1..b61cf0c 100644
/*
diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
-index e5bcd91..74f050d 100644
+index 16129c7..8b675cd 100644
--- a/drivers/acpi/apei/apei-internal.h
+++ b/drivers/acpi/apei/apei-internal.h
@@ -19,7 +19,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
@@ -36966,19 +36316,19 @@ index e5bcd91..74f050d 100644
struct apei_exec_context {
u32 ip;
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
-index dab7cb7..f0d2994 100644
+index fc5f780..e5ac91a 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
-@@ -500,7 +500,7 @@ static void __ghes_print_estatus(const char *pfx,
+@@ -478,7 +478,7 @@ static void __ghes_print_estatus(const char *pfx,
const struct acpi_hest_generic *generic,
- const struct acpi_generic_status *estatus)
+ const struct acpi_hest_generic_status *estatus)
{
- static atomic_t seqno;
+ static atomic_unchecked_t seqno;
unsigned int curr_seqno;
char pfx_seq[64];
-@@ -511,7 +511,7 @@ static void __ghes_print_estatus(const char *pfx,
+@@ -489,7 +489,7 @@ static void __ghes_print_estatus(const char *pfx,
else
pfx = KERN_ERR;
}
@@ -37005,7 +36355,7 @@ index a83e3c6..c3d617f 100644
bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
if (!bgrt_kobj)
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
-index 3d8413d..95f638c 100644
+index 7556e7c..89a96bd 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -51,7 +51,7 @@ struct acpi_blacklist_item {
@@ -37041,6 +36391,35 @@ index c68e724..e863008 100644
if (!(*ppos)) {
/* parse the table header to get the table length */
if (count <= sizeof(struct acpi_table_header))
+diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
+index 6341e66..ebcf59c 100644
+--- a/drivers/acpi/device_pm.c
++++ b/drivers/acpi/device_pm.c
+@@ -1029,6 +1029,8 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze);
+
+ #endif /* CONFIG_PM_SLEEP */
+
++static void acpi_dev_pm_detach(struct device *dev, bool power_off);
++
+ static struct dev_pm_domain acpi_general_pm_domain = {
+ .ops = {
+ #ifdef CONFIG_PM_RUNTIME
+@@ -1047,6 +1049,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
+ .restore_early = acpi_subsys_resume_early,
+ #endif
+ },
++ .detach = acpi_dev_pm_detach
+ };
+
+ /**
+@@ -1116,7 +1119,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
+ acpi_device_wakeup(adev, ACPI_STATE_S0, false);
+ }
+
+- dev->pm_domain->detach = acpi_dev_pm_detach;
+ return 0;
+ }
+ EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 17f9ec5..d9a455e 100644
--- a/drivers/acpi/processor_idle.c
@@ -37055,10 +36434,10 @@ index 17f9ec5..d9a455e 100644
if (!pr->flags.power_setup_done)
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
-index 91a32ce..d77fcaf 100644
+index 13e577c..cef11ee 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
-@@ -425,11 +425,11 @@ static u32 num_counters;
+@@ -423,11 +423,11 @@ static u32 num_counters;
static struct attribute **all_attrs;
static u32 acpi_gpe_count;
@@ -37073,10 +36452,10 @@ index 91a32ce..d77fcaf 100644
static void delete_gpe_attr_array(void)
{
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
-index 36605ab..6ef6d4b 100644
+index 97683e4..655f6ba 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
-@@ -1239,7 +1239,7 @@ int ahci_kick_engine(struct ata_port *ap)
+@@ -1252,7 +1252,7 @@ int ahci_kick_engine(struct ata_port *ap)
}
EXPORT_SYMBOL_GPL(ahci_kick_engine);
@@ -37086,10 +36465,10 @@ index 36605ab..6ef6d4b 100644
unsigned long timeout_msec)
{
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
-index 538574f..4344396 100644
+index 485f7ea..9a8df4a 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
-@@ -98,7 +98,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
+@@ -99,7 +99,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
static void ata_dev_xfermask(struct ata_device *dev);
static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
@@ -37098,7 +36477,7 @@ index 538574f..4344396 100644
struct ata_force_param {
const char *name;
-@@ -4863,7 +4863,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
+@@ -4800,7 +4800,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
struct ata_port *ap;
unsigned int tag;
@@ -37107,7 +36486,7 @@ index 538574f..4344396 100644
ap = qc->ap;
qc->flags = 0;
-@@ -4879,7 +4879,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
+@@ -4816,7 +4816,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
struct ata_port *ap;
struct ata_link *link;
@@ -37116,7 +36495,7 @@ index 538574f..4344396 100644
WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
ap = qc->ap;
link = qc->dev->link;
-@@ -5998,6 +5998,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
+@@ -5920,6 +5920,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
return;
spin_lock(&lock);
@@ -37124,7 +36503,7 @@ index 538574f..4344396 100644
for (cur = ops->inherits; cur; cur = cur->inherits) {
void **inherit = (void **)cur;
-@@ -6011,8 +6012,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
+@@ -5933,8 +5934,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
if (IS_ERR(*pp))
*pp = NULL;
@@ -37135,7 +36514,7 @@ index 538574f..4344396 100644
spin_unlock(&lock);
}
-@@ -6208,7 +6210,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
+@@ -6130,7 +6132,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
/* give ports names and add SCSI hosts */
for (i = 0; i < host->n_ports; i++) {
@@ -37145,10 +36524,10 @@ index 538574f..4344396 100644
}
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
-index ef8567d..8bdbd03 100644
+index 0586f66..1a8f74a 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
-@@ -4147,7 +4147,7 @@ int ata_sas_port_init(struct ata_port *ap)
+@@ -4151,7 +4151,7 @@ int ata_sas_port_init(struct ata_port *ap)
if (rc)
return rc;
@@ -37158,7 +36537,7 @@ index ef8567d..8bdbd03 100644
}
EXPORT_SYMBOL_GPL(ata_sas_port_init);
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
-index 45b5ab3..98446b8 100644
+index 5f4e0cc..ff2c347 100644
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -53,7 +53,7 @@ enum {
@@ -37171,7 +36550,7 @@ index 45b5ab3..98446b8 100644
extern int libata_fua;
extern int libata_noacpi;
diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
-index 73492dd..ca2bff5 100644
+index 38216b9..4ec6aeb 100644
--- a/drivers/ata/pata_arasan_cf.c
+++ b/drivers/ata/pata_arasan_cf.c
@@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
@@ -37199,7 +36578,7 @@ index f9b983a..887b9d8 100644
return 0;
}
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
-index 62a7607..cc4be104 100644
+index f1a9198..f466a4a 100644
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
@@ -37239,7 +36618,7 @@ index 62a7607..cc4be104 100644
}
diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
-index 0e3f8f9..765a7a5 100644
+index 480fa6f..947067c 100644
--- a/drivers/atm/atmtcp.c
+++ b/drivers/atm/atmtcp.c
@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
@@ -37271,16 +36650,16 @@ index 0e3f8f9..765a7a5 100644
return 0;
}
-@@ -299,7 +299,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
- out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
+@@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
read_unlock(&vcc_sklist_lock);
if (!out_vcc) {
+ result = -EUNATCH;
- atomic_inc(&vcc->stats->tx_err);
+ atomic_inc_unchecked(&vcc->stats->tx_err);
goto done;
}
skb_pull(skb,sizeof(struct atmtcp_hdr));
-@@ -311,8 +311,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
+@@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
__net_timestamp(new_skb);
skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
out_vcc->push(out_vcc,new_skb);
@@ -37292,7 +36671,7 @@ index 0e3f8f9..765a7a5 100644
if (vcc->pop) vcc->pop(vcc,skb);
else dev_kfree_skb(skb);
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
-index b1955ba..b179940 100644
+index d65975a..0b87e20 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -522,7 +522,7 @@ static int rx_aal0(struct atm_vcc *vcc)
@@ -37341,7 +36720,7 @@ index b1955ba..b179940 100644
dma_complete++;
}
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
-index b41c948..a002b17 100644
+index 82f2ae0..f205c02 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
@@ -37378,7 +36757,7 @@ index b41c948..a002b17 100644
default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
-index 204814e..cede831 100644
+index d4725fc..2d4ea65 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
@@ -37438,10 +36817,10 @@ index 204814e..cede831 100644
fore200e->tx_sat++;
DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
-index aa6be26..f70a785 100644
+index c39702b..785b73b 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
-@@ -1690,7 +1690,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
+@@ -1689,7 +1689,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
@@ -37450,7 +36829,7 @@ index aa6be26..f70a785 100644
goto return_host_buffers;
}
-@@ -1717,7 +1717,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
+@@ -1716,7 +1716,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
RBRQ_LEN_ERR(he_dev->rbrq_head)
? "LEN_ERR" : "",
vcc->vpi, vcc->vci);
@@ -37459,7 +36838,7 @@ index aa6be26..f70a785 100644
goto return_host_buffers;
}
-@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
+@@ -1768,7 +1768,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
vcc->push(vcc, skb);
spin_lock(&he_dev->global_lock);
@@ -37468,7 +36847,7 @@ index aa6be26..f70a785 100644
return_host_buffers:
++pdus_assembled;
-@@ -2095,7 +2095,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
+@@ -2094,7 +2094,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
tpd->vcc->pop(tpd->vcc, tpd->skb);
else
dev_kfree_skb_any(tpd->skb);
@@ -37477,7 +36856,7 @@ index aa6be26..f70a785 100644
}
pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
return;
-@@ -2507,7 +2507,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2506,7 +2506,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
vcc->pop(vcc, skb);
else
dev_kfree_skb_any(skb);
@@ -37486,7 +36865,7 @@ index aa6be26..f70a785 100644
return -EINVAL;
}
-@@ -2518,7 +2518,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2517,7 +2517,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
vcc->pop(vcc, skb);
else
dev_kfree_skb_any(skb);
@@ -37495,7 +36874,7 @@ index aa6be26..f70a785 100644
return -EINVAL;
}
#endif
-@@ -2530,7 +2530,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2529,7 +2529,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
vcc->pop(vcc, skb);
else
dev_kfree_skb_any(skb);
@@ -37504,7 +36883,7 @@ index aa6be26..f70a785 100644
spin_unlock_irqrestore(&he_dev->global_lock, flags);
return -ENOMEM;
}
-@@ -2572,7 +2572,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2571,7 +2571,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
vcc->pop(vcc, skb);
else
dev_kfree_skb_any(skb);
@@ -37513,7 +36892,7 @@ index aa6be26..f70a785 100644
spin_unlock_irqrestore(&he_dev->global_lock, flags);
return -ENOMEM;
}
-@@ -2603,7 +2603,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2602,7 +2602,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
__enqueue_tpd(he_dev, tpd, cid);
spin_unlock_irqrestore(&he_dev->global_lock, flags);
@@ -37545,10 +36924,10 @@ index 1dc0519..1aadaf7 100644
// free the skb
hrz_kfree_skb (skb);
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
-index 1bdf104..9dc44b1 100644
+index 2b24ed0..b3d6acc 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
-@@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
+@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
else
dev_kfree_skb(skb);
@@ -37557,7 +36936,7 @@ index 1bdf104..9dc44b1 100644
}
atomic_dec(&scq->used);
-@@ -1075,13 +1075,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
+@@ -1072,13 +1072,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
if ((sb = dev_alloc_skb(64)) == NULL) {
printk("%s: Can't allocate buffers for aal0.\n",
card->name);
@@ -37573,7 +36952,7 @@ index 1bdf104..9dc44b1 100644
dev_kfree_skb(sb);
break;
}
-@@ -1098,7 +1098,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
+@@ -1095,7 +1095,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
ATM_SKB(sb)->vcc = vcc;
__net_timestamp(sb);
vcc->push(vcc, sb);
@@ -37582,7 +36961,7 @@ index 1bdf104..9dc44b1 100644
cell += ATM_CELL_PAYLOAD;
}
-@@ -1135,13 +1135,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
+@@ -1132,13 +1132,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
"(CDC: %08x)\n",
card->name, len, rpp->len, readl(SAR_REG_CDC));
recycle_rx_pool_skb(card, rpp);
@@ -37598,7 +36977,7 @@ index 1bdf104..9dc44b1 100644
return;
}
if (skb_queue_len(&rpp->queue) > 1) {
-@@ -1152,7 +1152,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
+@@ -1149,7 +1149,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
RXPRINTK("%s: Can't alloc RX skb.\n",
card->name);
recycle_rx_pool_skb(card, rpp);
@@ -37607,7 +36986,7 @@ index 1bdf104..9dc44b1 100644
return;
}
if (!atm_charge(vcc, skb->truesize)) {
-@@ -1171,7 +1171,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
+@@ -1168,7 +1168,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
__net_timestamp(skb);
vcc->push(vcc, skb);
@@ -37616,7 +36995,7 @@ index 1bdf104..9dc44b1 100644
return;
}
-@@ -1193,7 +1193,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
+@@ -1190,7 +1190,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
__net_timestamp(skb);
vcc->push(vcc, skb);
@@ -37625,7 +37004,7 @@ index 1bdf104..9dc44b1 100644
if (skb->truesize > SAR_FB_SIZE_3)
add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
-@@ -1304,14 +1304,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
+@@ -1301,14 +1301,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
if (vcc->qos.aal != ATM_AAL0) {
RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
card->name, vpi, vci);
@@ -37642,7 +37021,7 @@ index 1bdf104..9dc44b1 100644
goto drop;
}
-@@ -1330,7 +1330,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
+@@ -1327,7 +1327,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
ATM_SKB(sb)->vcc = vcc;
__net_timestamp(sb);
vcc->push(vcc, sb);
@@ -37651,7 +37030,7 @@ index 1bdf104..9dc44b1 100644
drop:
skb_pull(queue, 64);
-@@ -1955,13 +1955,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
+@@ -1952,13 +1952,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
if (vc == NULL) {
printk("%s: NULL connection in send().\n", card->name);
@@ -37667,7 +37046,7 @@ index 1bdf104..9dc44b1 100644
dev_kfree_skb(skb);
return -EINVAL;
}
-@@ -1973,14 +1973,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
+@@ -1970,14 +1970,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
break;
default:
printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
@@ -37684,7 +37063,7 @@ index 1bdf104..9dc44b1 100644
dev_kfree_skb(skb);
return -EINVAL;
}
-@@ -1988,7 +1988,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
+@@ -1985,7 +1985,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
err = queue_skb(card, vc, skb, oam);
if (err) {
@@ -37693,7 +37072,7 @@ index 1bdf104..9dc44b1 100644
dev_kfree_skb(skb);
return err;
}
-@@ -2011,7 +2011,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
+@@ -2008,7 +2008,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
skb = dev_alloc_skb(64);
if (!skb) {
printk("%s: Out of memory in send_oam().\n", card->name);
@@ -37803,7 +37182,7 @@ index 4217f29..88f547a 100644
vcc->tx_quota = vcc->tx_quota * 3 / 4;
printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
-index fa7d7019..1e404c7 100644
+index 93eaf8d..b4ca7da 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
@@ -37861,7 +37240,7 @@ index fa7d7019..1e404c7 100644
lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
-index 9587e95..b45c5cb 100644
+index 9988ac9..7c52585 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
@@ -38066,10 +37445,10 @@ index 9587e95..b45c5cb 100644
}
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
-index e3fb496..d9646bf 100644
+index 21b0bc6..b5f40ba 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
-@@ -838,7 +838,7 @@ void solos_bh(unsigned long card_arg)
+@@ -838,7 +838,7 @@ static void solos_bh(unsigned long card_arg)
}
atm_charge(vcc, skb->truesize);
vcc->push(vcc, skb);
@@ -38182,7 +37561,7 @@ index 969c3c2..9b72956 100644
}
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
-index 45d0fa7..89244c9 100644
+index 876bae5..8978785 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -1126,7 +1126,7 @@ int subsys_interface_register(struct subsys_interface *sif)
@@ -38232,7 +37611,7 @@ index 25798db..15f130e 100644
while (1) {
spin_lock(&req_lock);
diff --git a/drivers/base/node.c b/drivers/base/node.c
-index bc9f43b..29703b8 100644
+index 472168c..4af587e 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -620,7 +620,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
@@ -38245,44 +37624,43 @@ index bc9f43b..29703b8 100644
static ssize_t show_node_state(struct device *dev,
struct device_attribute *attr, char *buf)
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
-index bfb8955..4ebff34 100644
+index fb83d4a..e1797b3 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
-@@ -1809,9 +1809,9 @@ int __pm_genpd_remove_callbacks(struct device *dev, bool clear_td)
-
- if (dev->power.subsys_data->domain_data) {
- gpd_data = to_gpd_data(dev->power.subsys_data->domain_data);
-- gpd_data->ops = (struct gpd_dev_ops){ NULL };
-+ memset(&gpd_data->ops, 0, sizeof(gpd_data->ops));
- if (clear_td)
-- gpd_data->td = (struct gpd_timing_data){ 0 };
-+ memset(&gpd_data->td, 0, sizeof(gpd_data->td));
-
- if (--gpd_data->refcount == 0) {
- dev->power.subsys_data->domain_data = NULL;
-@@ -1850,7 +1850,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
+@@ -1725,7 +1725,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
{
struct cpuidle_driver *cpuidle_drv;
- struct gpd_cpu_data *cpu_data;
+ struct gpd_cpuidle_data *cpuidle_data;
- struct cpuidle_state *idle_state;
+ cpuidle_state_no_const *idle_state;
int ret = 0;
if (IS_ERR_OR_NULL(genpd) || state < 0)
-@@ -1918,7 +1918,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
+@@ -1793,7 +1793,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
{
- struct gpd_cpu_data *cpu_data;
+ struct gpd_cpuidle_data *cpuidle_data;
- struct cpuidle_state *idle_state;
+ cpuidle_state_no_const *idle_state;
int ret = 0;
if (IS_ERR_OR_NULL(genpd))
+@@ -2215,7 +2215,9 @@ int genpd_dev_pm_attach(struct device *dev)
+ return ret;
+ }
+
+- dev->pm_domain->detach = genpd_dev_pm_detach;
++ pax_open_kernel();
++ *(void **)&dev->pm_domain->detach = genpd_dev_pm_detach;
++ pax_close_kernel();
+
+ return 0;
+ }
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
-index 03e089a..0e9560c 100644
+index a9d26ed..74b8405 100644
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
-@@ -185,7 +185,7 @@ static ssize_t rtpm_status_show(struct device *dev,
+@@ -182,7 +182,7 @@ static ssize_t rtpm_status_show(struct device *dev,
return -EIO;
}
}
@@ -38292,10 +37670,10 @@ index 03e089a..0e9560c 100644
static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
-index 2d56f41..8830f19 100644
+index c2744b3..08fac19 100644
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
-@@ -29,14 +29,14 @@ bool events_check_enabled __read_mostly;
+@@ -32,14 +32,14 @@ static bool pm_abort_suspend __read_mostly;
* They need to be modified together atomically, so it's better to use one
* atomic variable to hold them both.
*/
@@ -38312,7 +37690,7 @@ index 2d56f41..8830f19 100644
*cnt = (comb >> IN_PROGRESS_BITS);
*inpr = comb & MAX_IN_PROGRESS;
-@@ -395,7 +395,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
+@@ -404,7 +404,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
ws->start_prevent_time = ws->last_time;
/* Increment the counter of events in progress. */
@@ -38321,7 +37699,7 @@ index 2d56f41..8830f19 100644
trace_wakeup_source_activate(ws->name, cec);
}
-@@ -521,7 +521,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
+@@ -530,7 +530,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
* Increment the counter of registered wakeup events and decrement the
* couter of wakeup events in progress simultaneously.
*/
@@ -38331,10 +37709,10 @@ index 2d56f41..8830f19 100644
split_counters(&cnt, &inpr);
diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
-index e8d11b6..7b1b36f 100644
+index 8d98a32..61d3165 100644
--- a/drivers/base/syscore.c
+++ b/drivers/base/syscore.c
-@@ -21,7 +21,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
+@@ -22,7 +22,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
void register_syscore_ops(struct syscore_ops *ops)
{
mutex_lock(&syscore_ops_lock);
@@ -38343,7 +37721,7 @@ index e8d11b6..7b1b36f 100644
mutex_unlock(&syscore_ops_lock);
}
EXPORT_SYMBOL_GPL(register_syscore_ops);
-@@ -33,7 +33,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
+@@ -34,7 +34,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
void unregister_syscore_ops(struct syscore_ops *ops)
{
mutex_lock(&syscore_ops_lock);
@@ -38353,10 +37731,10 @@ index e8d11b6..7b1b36f 100644
}
EXPORT_SYMBOL_GPL(unregister_syscore_ops);
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
-index 036e8ab..6221dec 100644
+index ff20f19..018f1da 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
-@@ -3011,7 +3011,7 @@ static void start_io(ctlr_info_t *h)
+@@ -3008,7 +3008,7 @@ static void start_io(ctlr_info_t *h)
while (!list_empty(&h->reqQ)) {
c = list_entry(h->reqQ.next, CommandList_struct, list);
/* can't do anything if fifo is full */
@@ -38365,7 +37743,7 @@ index 036e8ab..6221dec 100644
dev_warn(&h->pdev->dev, "fifo full\n");
break;
}
-@@ -3021,7 +3021,7 @@ static void start_io(ctlr_info_t *h)
+@@ -3018,7 +3018,7 @@ static void start_io(ctlr_info_t *h)
h->Qdepth--;
/* Tell the controller execute command */
@@ -38374,7 +37752,7 @@ index 036e8ab..6221dec 100644
/* Put job onto the completed Q */
addQ(&h->cmpQ, c);
-@@ -3447,17 +3447,17 @@ startio:
+@@ -3444,17 +3444,17 @@ startio:
static inline unsigned long get_next_completion(ctlr_info_t *h)
{
@@ -38395,7 +37773,7 @@ index 036e8ab..6221dec 100644
(h->interrupts_enabled == 0));
}
-@@ -3490,7 +3490,7 @@ static inline u32 next_command(ctlr_info_t *h)
+@@ -3487,7 +3487,7 @@ static inline u32 next_command(ctlr_info_t *h)
u32 a;
if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
@@ -38404,7 +37782,7 @@ index 036e8ab..6221dec 100644
if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
a = *(h->reply_pool_head); /* Next cmd in ring buffer */
-@@ -4047,7 +4047,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
+@@ -4044,7 +4044,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
trans_support & CFGTBL_Trans_use_short_tags);
/* Change the access methods to the performant access methods */
@@ -38413,7 +37791,7 @@ index 036e8ab..6221dec 100644
h->transMethod = CFGTBL_Trans_Performant;
return;
-@@ -4327,7 +4327,7 @@ static int cciss_pci_init(ctlr_info_t *h)
+@@ -4318,7 +4318,7 @@ static int cciss_pci_init(ctlr_info_t *h)
if (prod_index < 0)
return -ENODEV;
h->product_name = products[prod_index].product_name;
@@ -38422,7 +37800,7 @@ index 036e8ab..6221dec 100644
if (cciss_board_disabled(h)) {
dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
-@@ -5059,7 +5059,7 @@ reinit_after_soft_reset:
+@@ -5050,7 +5050,7 @@ reinit_after_soft_reset:
}
/* make sure the board interrupts are off */
@@ -38431,7 +37809,7 @@ index 036e8ab..6221dec 100644
rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
if (rc)
goto clean2;
-@@ -5109,7 +5109,7 @@ reinit_after_soft_reset:
+@@ -5100,7 +5100,7 @@ reinit_after_soft_reset:
* fake ones to scoop up any residual completions.
*/
spin_lock_irqsave(&h->lock, flags);
@@ -38440,7 +37818,7 @@ index 036e8ab..6221dec 100644
spin_unlock_irqrestore(&h->lock, flags);
free_irq(h->intr[h->intr_mode], h);
rc = cciss_request_irq(h, cciss_msix_discard_completions,
-@@ -5129,9 +5129,9 @@ reinit_after_soft_reset:
+@@ -5120,9 +5120,9 @@ reinit_after_soft_reset:
dev_info(&h->pdev->dev, "Board READY.\n");
dev_info(&h->pdev->dev,
"Waiting for stale completions to drain.\n");
@@ -38452,7 +37830,7 @@ index 036e8ab..6221dec 100644
rc = controller_reset_failed(h->cfgtable);
if (rc)
-@@ -5154,7 +5154,7 @@ reinit_after_soft_reset:
+@@ -5145,7 +5145,7 @@ reinit_after_soft_reset:
cciss_scsi_setup(h);
/* Turn the interrupts on so we can service requests */
@@ -38461,7 +37839,7 @@ index 036e8ab..6221dec 100644
/* Get the firmware version */
inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
-@@ -5226,7 +5226,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
+@@ -5217,7 +5217,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
kfree(flush_buf);
if (return_code != IO_OK)
dev_warn(&h->pdev->dev, "Error flushing cache\n");
@@ -38660,24 +38038,24 @@ index be73e9d..7fbf140 100644
cmdlist_t *reqQ;
cmdlist_t *cmpQ;
diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
-index 597f111..c700970 100644
+index 434c77d..6d3219a 100644
--- a/drivers/block/drbd/drbd_bitmap.c
+++ b/drivers/block/drbd/drbd_bitmap.c
-@@ -1042,7 +1042,7 @@ static void bm_page_io_async(struct bm_aio_ctx *ctx, int page_nr, int rw) __must
+@@ -1036,7 +1036,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
submit_bio(rw, bio);
/* this should not count as user activity and cause the
* resync to throttle -- see drbd_rs_should_slow_down(). */
-- atomic_add(len >> 9, &mdev->rs_sect_ev);
-+ atomic_add_unchecked(len >> 9, &mdev->rs_sect_ev);
+- atomic_add(len >> 9, &device->rs_sect_ev);
++ atomic_add_unchecked(len >> 9, &device->rs_sect_ev);
}
}
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
-index 0e06f0c..d98cde3 100644
+index 9b22f8f..f2932af 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
-@@ -582,7 +582,7 @@ struct drbd_epoch {
- struct drbd_tconn *tconn;
+@@ -385,7 +385,7 @@ struct drbd_epoch {
+ struct drbd_connection *connection;
struct list_head list;
unsigned int barrier_nr;
- atomic_t epoch_size; /* increased on every request added. */
@@ -38685,7 +38063,7 @@ index 0e06f0c..d98cde3 100644
atomic_t active; /* increased on every req. added, and dec on every finished. */
unsigned long flags;
};
-@@ -1022,7 +1022,7 @@ struct drbd_conf {
+@@ -946,7 +946,7 @@ struct drbd_device {
unsigned int al_tr_number;
int al_tr_cycle;
wait_queue_head_t seq_wait;
@@ -38693,10 +38071,10 @@ index 0e06f0c..d98cde3 100644
+ atomic_unchecked_t packet_seq;
unsigned int peer_seq;
spinlock_t peer_seq_lock;
- unsigned int minor;
-@@ -1032,8 +1032,8 @@ struct drbd_conf {
+ unsigned long comm_bm_set; /* communicated number of set bits. */
+@@ -955,8 +955,8 @@ struct drbd_device {
struct mutex own_state_mutex;
- struct mutex *state_mutex; /* either own_state_mutex or mdev->tconn->cstate_mutex */
+ struct mutex *state_mutex; /* either own_state_mutex or first_peer_device(device)->connection->cstate_mutex */
char congestion_reason; /* Why we where congested... */
- atomic_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
- atomic_t rs_sect_ev; /* for submitted resync data rate, both */
@@ -38705,7 +38083,7 @@ index 0e06f0c..d98cde3 100644
int rs_last_sect_ev; /* counter to compare with */
int rs_last_events; /* counter of read or write "events" (unit sectors)
* on the lower level device when we last looked. */
-@@ -1573,7 +1573,7 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
+@@ -1567,7 +1567,7 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
char __user *uoptval;
int err;
@@ -38714,83 +38092,64 @@ index 0e06f0c..d98cde3 100644
set_fs(KERNEL_DS);
if (level == SOL_SOCKET)
-diff --git a/drivers/block/drbd/drbd_interval.c b/drivers/block/drbd/drbd_interval.c
-index 04a14e0..5b8f0aa 100644
---- a/drivers/block/drbd/drbd_interval.c
-+++ b/drivers/block/drbd/drbd_interval.c
-@@ -67,9 +67,9 @@ static void augment_rotate(struct rb_node *rb_old, struct rb_node *rb_new)
- }
-
- static const struct rb_augment_callbacks augment_callbacks = {
-- augment_propagate,
-- augment_copy,
-- augment_rotate,
-+ .propagate = augment_propagate,
-+ .copy = augment_copy,
-+ .rotate = augment_rotate,
- };
-
- /**
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
-index 929468e..efb12f0 100644
+index 973c185..05d8b1a 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
-@@ -1317,7 +1317,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packet cmd,
+@@ -1328,7 +1328,7 @@ static int _drbd_send_ack(struct drbd_peer_device *peer_device, enum drbd_packet
p->sector = sector;
p->block_id = block_id;
p->blksize = blksize;
-- p->seq_num = cpu_to_be32(atomic_inc_return(&mdev->packet_seq));
-+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&mdev->packet_seq));
- return drbd_send_command(mdev, sock, cmd, sizeof(*p), NULL, 0);
+- p->seq_num = cpu_to_be32(atomic_inc_return(&peer_device->device->packet_seq));
++ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&peer_device->device->packet_seq));
+ return drbd_send_command(peer_device, sock, cmd, sizeof(*p), NULL, 0);
}
-@@ -1622,7 +1622,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
+@@ -1634,7 +1634,7 @@ int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *
return -EIO;
p->sector = cpu_to_be64(req->i.sector);
p->block_id = (unsigned long)req;
-- p->seq_num = cpu_to_be32(atomic_inc_return(&mdev->packet_seq));
-+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&mdev->packet_seq));
- dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw);
- if (mdev->state.conn >= C_SYNC_SOURCE &&
- mdev->state.conn <= C_PAUSED_SYNC_T)
-@@ -1886,8 +1886,8 @@ void drbd_init_set_defaults(struct drbd_conf *mdev)
- atomic_set(&mdev->unacked_cnt, 0);
- atomic_set(&mdev->local_cnt, 0);
- atomic_set(&mdev->pp_in_use_by_net, 0);
-- atomic_set(&mdev->rs_sect_in, 0);
-- atomic_set(&mdev->rs_sect_ev, 0);
-+ atomic_set_unchecked(&mdev->rs_sect_in, 0);
-+ atomic_set_unchecked(&mdev->rs_sect_ev, 0);
- atomic_set(&mdev->ap_in_flight, 0);
- atomic_set(&mdev->md_io_in_use, 0);
-
-@@ -2577,8 +2577,8 @@ void conn_destroy(struct kref *kref)
- {
- struct drbd_tconn *tconn = container_of(kref, struct drbd_tconn, kref);
-
-- if (atomic_read(&tconn->current_epoch->epoch_size) != 0)
-- conn_err(tconn, "epoch_size:%d\n", atomic_read(&tconn->current_epoch->epoch_size));
-+ if (atomic_read_unchecked(&tconn->current_epoch->epoch_size) != 0)
-+ conn_err(tconn, "epoch_size:%d\n", atomic_read_unchecked(&tconn->current_epoch->epoch_size));
- kfree(tconn->current_epoch);
-
- idr_destroy(&tconn->volumes);
+- p->seq_num = cpu_to_be32(atomic_inc_return(&device->packet_seq));
++ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&device->packet_seq));
+ dp_flags = bio_flags_to_wire(peer_device->connection, req->master_bio->bi_rw);
+ if (device->state.conn >= C_SYNC_SOURCE &&
+ device->state.conn <= C_PAUSED_SYNC_T)
+@@ -1915,8 +1915,8 @@ void drbd_init_set_defaults(struct drbd_device *device)
+ atomic_set(&device->unacked_cnt, 0);
+ atomic_set(&device->local_cnt, 0);
+ atomic_set(&device->pp_in_use_by_net, 0);
+- atomic_set(&device->rs_sect_in, 0);
+- atomic_set(&device->rs_sect_ev, 0);
++ atomic_set_unchecked(&device->rs_sect_in, 0);
++ atomic_set_unchecked(&device->rs_sect_ev, 0);
+ atomic_set(&device->ap_in_flight, 0);
+ atomic_set(&device->md_io.in_use, 0);
+
+@@ -2688,8 +2688,8 @@ void drbd_destroy_connection(struct kref *kref)
+ struct drbd_connection *connection = container_of(kref, struct drbd_connection, kref);
+ struct drbd_resource *resource = connection->resource;
+
+- if (atomic_read(&connection->current_epoch->epoch_size) != 0)
+- drbd_err(connection, "epoch_size:%d\n", atomic_read(&connection->current_epoch->epoch_size));
++ if (atomic_read_unchecked(&connection->current_epoch->epoch_size) != 0)
++ drbd_err(connection, "epoch_size:%d\n", atomic_read_unchecked(&connection->current_epoch->epoch_size));
+ kfree(connection->current_epoch);
+
+ idr_destroy(&connection->peer_devices);
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
-index 8c16c2f..3274b96 100644
+index 1cd47df..57c53c0 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
-@@ -3446,7 +3446,7 @@ out:
+@@ -3645,13 +3645,13 @@ finish:
- void drbd_bcast_event(struct drbd_conf *mdev, const struct sib_info *sib)
+ void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
{
- static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
+ static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
struct sk_buff *msg;
struct drbd_genlmsghdr *d_out;
unsigned seq;
-@@ -3459,7 +3459,7 @@ void drbd_bcast_event(struct drbd_conf *mdev, const struct sib_info *sib)
- return;
- }
+ int err = -ENOMEM;
- seq = atomic_inc_return(&drbd_genl_seq);
+ seq = atomic_inc_return_unchecked(&drbd_genl_seq);
@@ -38798,19 +38157,19 @@ index 8c16c2f..3274b96 100644
if (!msg)
goto failed;
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
-index d073305..958be8f 100644
+index 6960fb0..215d76b 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
-@@ -834,7 +834,7 @@ int drbd_connected(struct drbd_conf *mdev)
- {
+@@ -870,7 +870,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
+ struct drbd_device *device = peer_device->device;
int err;
-- atomic_set(&mdev->packet_seq, 0);
-+ atomic_set_unchecked(&mdev->packet_seq, 0);
- mdev->peer_seq = 0;
+- atomic_set(&device->packet_seq, 0);
++ atomic_set_unchecked(&device->packet_seq, 0);
+ device->peer_seq = 0;
- mdev->state_mutex = mdev->tconn->agreed_pro_version < 100 ?
-@@ -1193,7 +1193,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_tconn *tconn,
+ device->state_mutex = peer_device->connection->agreed_pro_version < 100 ?
+@@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
do {
next_epoch = NULL;
@@ -38819,7 +38178,7 @@ index d073305..958be8f 100644
switch (ev & ~EV_CLEANUP) {
case EV_PUT:
-@@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_tconn *tconn,
+@@ -1273,7 +1273,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
rv = FE_DESTROYED;
} else {
epoch->flags = 0;
@@ -38828,16 +38187,16 @@ index d073305..958be8f 100644
/* atomic_set(&epoch->active, 0); is already zero */
if (rv == FE_STILL_LIVE)
rv = FE_RECYCLED;
-@@ -1451,7 +1451,7 @@ static int receive_Barrier(struct drbd_tconn *tconn, struct packet_info *pi)
- conn_wait_active_ee_empty(tconn);
- drbd_flush(tconn);
+@@ -1550,7 +1550,7 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
+ conn_wait_active_ee_empty(connection);
+ drbd_flush(connection);
-- if (atomic_read(&tconn->current_epoch->epoch_size)) {
-+ if (atomic_read_unchecked(&tconn->current_epoch->epoch_size)) {
+- if (atomic_read(&connection->current_epoch->epoch_size)) {
++ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
if (epoch)
break;
-@@ -1464,11 +1464,11 @@ static int receive_Barrier(struct drbd_tconn *tconn, struct packet_info *pi)
+@@ -1564,11 +1564,11 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
}
epoch->flags = 0;
@@ -38845,146 +38204,146 @@ index d073305..958be8f 100644
+ atomic_set_unchecked(&epoch->epoch_size, 0);
atomic_set(&epoch->active, 0);
- spin_lock(&tconn->epoch_lock);
-- if (atomic_read(&tconn->current_epoch->epoch_size)) {
-+ if (atomic_read_unchecked(&tconn->current_epoch->epoch_size)) {
- list_add(&epoch->list, &tconn->current_epoch->list);
- tconn->current_epoch = epoch;
- tconn->epochs++;
-@@ -1688,7 +1688,7 @@ static int recv_resync_read(struct drbd_conf *mdev, sector_t sector, int data_si
- list_add(&peer_req->w.list, &mdev->sync_ee);
- spin_unlock_irq(&mdev->tconn->req_lock);
-
-- atomic_add(data_size >> 9, &mdev->rs_sect_ev);
-+ atomic_add_unchecked(data_size >> 9, &mdev->rs_sect_ev);
- if (drbd_submit_peer_request(mdev, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)
+ spin_lock(&connection->epoch_lock);
+- if (atomic_read(&connection->current_epoch->epoch_size)) {
++ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
+ list_add(&epoch->list, &connection->current_epoch->list);
+ connection->current_epoch = epoch;
+ connection->epochs++;
+@@ -1802,7 +1802,7 @@ static int recv_resync_read(struct drbd_peer_device *peer_device, sector_t secto
+ list_add_tail(&peer_req->w.list, &device->sync_ee);
+ spin_unlock_irq(&device->resource->req_lock);
+
+- atomic_add(pi->size >> 9, &device->rs_sect_ev);
++ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_ev);
+ if (drbd_submit_peer_request(device, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)
return 0;
-@@ -1782,7 +1782,7 @@ static int receive_RSDataReply(struct drbd_tconn *tconn, struct packet_info *pi)
- drbd_send_ack_dp(mdev, P_NEG_ACK, p, pi->size);
+@@ -1900,7 +1900,7 @@ static int receive_RSDataReply(struct drbd_connection *connection, struct packet
+ drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
}
-- atomic_add(pi->size >> 9, &mdev->rs_sect_in);
-+ atomic_add_unchecked(pi->size >> 9, &mdev->rs_sect_in);
+- atomic_add(pi->size >> 9, &device->rs_sect_in);
++ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_in);
return err;
}
-@@ -2164,7 +2164,7 @@ static int receive_Data(struct drbd_tconn *tconn, struct packet_info *pi)
+@@ -2290,7 +2290,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
- err = wait_for_and_update_peer_seq(mdev, peer_seq);
- drbd_send_ack_dp(mdev, P_NEG_ACK, p, pi->size);
-- atomic_inc(&tconn->current_epoch->epoch_size);
-+ atomic_inc_unchecked(&tconn->current_epoch->epoch_size);
- err2 = drbd_drain_block(mdev, pi->size);
+ err = wait_for_and_update_peer_seq(peer_device, peer_seq);
+ drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
+- atomic_inc(&connection->current_epoch->epoch_size);
++ atomic_inc_unchecked(&connection->current_epoch->epoch_size);
+ err2 = drbd_drain_block(peer_device, pi->size);
if (!err)
err = err2;
-@@ -2198,7 +2198,7 @@ static int receive_Data(struct drbd_tconn *tconn, struct packet_info *pi)
+@@ -2334,7 +2334,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
- spin_lock(&tconn->epoch_lock);
- peer_req->epoch = tconn->current_epoch;
+ spin_lock(&connection->epoch_lock);
+ peer_req->epoch = connection->current_epoch;
- atomic_inc(&peer_req->epoch->epoch_size);
+ atomic_inc_unchecked(&peer_req->epoch->epoch_size);
atomic_inc(&peer_req->epoch->active);
- spin_unlock(&tconn->epoch_lock);
+ spin_unlock(&connection->epoch_lock);
-@@ -2326,7 +2326,7 @@ int drbd_rs_should_slow_down(struct drbd_conf *mdev, sector_t sector)
+@@ -2479,7 +2479,7 @@ bool drbd_rs_c_min_rate_throttle(struct drbd_device *device)
curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
(int)part_stat_read(&disk->part0, sectors[1]) -
-- atomic_read(&mdev->rs_sect_ev);
-+ atomic_read_unchecked(&mdev->rs_sect_ev);
+- atomic_read(&device->rs_sect_ev);
++ atomic_read_unchecked(&device->rs_sect_ev);
- if (!mdev->rs_last_events || curr_events - mdev->rs_last_events > 64) {
- unsigned long rs_left;
-@@ -2459,7 +2459,7 @@ static int receive_DataRequest(struct drbd_tconn *tconn, struct packet_info *pi)
- mdev->bm_resync_fo = BM_SECT_TO_BIT(sector);
+ if (atomic_read(&device->ap_actlog_cnt)
+ || !device->rs_last_events || curr_events - device->rs_last_events > 64) {
+@@ -2618,7 +2618,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
+ device->use_csums = true;
} else if (pi->cmd == P_OV_REPLY) {
/* track progress, we may need to throttle */
-- atomic_add(size >> 9, &mdev->rs_sect_in);
-+ atomic_add_unchecked(size >> 9, &mdev->rs_sect_in);
+- atomic_add(size >> 9, &device->rs_sect_in);
++ atomic_add_unchecked(size >> 9, &device->rs_sect_in);
peer_req->w.cb = w_e_end_ov_reply;
- dec_rs_pending(mdev);
+ dec_rs_pending(device);
/* drbd_rs_begin_io done when we sent this request,
-@@ -2520,7 +2520,7 @@ static int receive_DataRequest(struct drbd_tconn *tconn, struct packet_info *pi)
+@@ -2691,7 +2691,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
goto out_free_e;
submit_for_resync:
-- atomic_add(size >> 9, &mdev->rs_sect_ev);
-+ atomic_add_unchecked(size >> 9, &mdev->rs_sect_ev);
+- atomic_add(size >> 9, &device->rs_sect_ev);
++ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
submit:
- inc_unacked(mdev);
-@@ -4345,7 +4345,7 @@ struct data_cmd {
+ update_receiver_timing_details(connection, drbd_submit_peer_request);
+@@ -4564,7 +4564,7 @@ struct data_cmd {
int expect_payload;
size_t pkt_size;
- int (*fn)(struct drbd_tconn *, struct packet_info *);
+ int (*fn)(struct drbd_connection *, struct packet_info *);
-};
+} __do_const;
static struct data_cmd drbd_cmd_handler[] = {
[P_DATA] = { 1, sizeof(struct p_data), receive_Data },
-@@ -4465,7 +4465,7 @@ static void conn_disconnect(struct drbd_tconn *tconn)
- if (!list_empty(&tconn->current_epoch->list))
- conn_err(tconn, "ASSERTION FAILED: tconn->current_epoch->list not empty\n");
+@@ -4678,7 +4678,7 @@ static void conn_disconnect(struct drbd_connection *connection)
+ if (!list_empty(&connection->current_epoch->list))
+ drbd_err(connection, "ASSERTION FAILED: connection->current_epoch->list not empty\n");
/* ok, no more ee's on the fly, it is safe to reset the epoch_size */
-- atomic_set(&tconn->current_epoch->epoch_size, 0);
-+ atomic_set_unchecked(&tconn->current_epoch->epoch_size, 0);
- tconn->send.seen_any_write_yet = false;
+- atomic_set(&connection->current_epoch->epoch_size, 0);
++ atomic_set_unchecked(&connection->current_epoch->epoch_size, 0);
+ connection->send.seen_any_write_yet = false;
- conn_info(tconn, "Connection closed\n");
-@@ -4947,7 +4947,7 @@ static int got_IsInSync(struct drbd_tconn *tconn, struct packet_info *pi)
- put_ldev(mdev);
+ drbd_info(connection, "Connection closed\n");
+@@ -5182,7 +5182,7 @@ static int got_IsInSync(struct drbd_connection *connection, struct packet_info *
+ put_ldev(device);
}
- dec_rs_pending(mdev);
-- atomic_add(blksize >> 9, &mdev->rs_sect_in);
-+ atomic_add_unchecked(blksize >> 9, &mdev->rs_sect_in);
+ dec_rs_pending(device);
+- atomic_add(blksize >> 9, &device->rs_sect_in);
++ atomic_add_unchecked(blksize >> 9, &device->rs_sect_in);
return 0;
}
-@@ -5221,7 +5221,7 @@ static int tconn_finish_peer_reqs(struct drbd_tconn *tconn)
+@@ -5470,7 +5470,7 @@ static int connection_finish_peer_reqs(struct drbd_connection *connection)
struct asender_cmd {
size_t pkt_size;
- int (*fn)(struct drbd_tconn *tconn, struct packet_info *);
+ int (*fn)(struct drbd_connection *connection, struct packet_info *);
-};
+} __do_const;
static struct asender_cmd asender_tbl[] = {
[P_PING] = { 0, got_Ping },
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
-index 84d3175..ccea188 100644
+index d2d1f97..6a1188f 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
-@@ -400,7 +400,7 @@ static int read_for_csum(struct drbd_conf *mdev, sector_t sector, int size)
- list_add(&peer_req->w.list, &mdev->read_ee);
- spin_unlock_irq(&mdev->tconn->req_lock);
+@@ -408,7 +408,7 @@ static int read_for_csum(struct drbd_peer_device *peer_device, sector_t sector,
+ list_add_tail(&peer_req->w.list, &device->read_ee);
+ spin_unlock_irq(&device->resource->req_lock);
-- atomic_add(size >> 9, &mdev->rs_sect_ev);
-+ atomic_add_unchecked(size >> 9, &mdev->rs_sect_ev);
- if (drbd_submit_peer_request(mdev, peer_req, READ, DRBD_FAULT_RS_RD) == 0)
+- atomic_add(size >> 9, &device->rs_sect_ev);
++ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
+ if (drbd_submit_peer_request(device, peer_req, READ, DRBD_FAULT_RS_RD) == 0)
return 0;
-@@ -498,7 +498,7 @@ static int drbd_rs_controller(struct drbd_conf *mdev)
- int max_sect;
- struct fifo_buffer *plan;
+@@ -553,7 +553,7 @@ static int drbd_rs_number_requests(struct drbd_device *device)
+ unsigned int sect_in; /* Number of sectors that came in since the last turn */
+ int number, mxb;
-- sect_in = atomic_xchg(&mdev->rs_sect_in, 0); /* Number of sectors that came in */
-+ sect_in = atomic_xchg_unchecked(&mdev->rs_sect_in, 0); /* Number of sectors that came in */
- mdev->rs_in_flight -= sect_in;
+- sect_in = atomic_xchg(&device->rs_sect_in, 0);
++ sect_in = atomic_xchg_unchecked(&device->rs_sect_in, 0);
+ device->rs_in_flight -= sect_in;
- dc = rcu_dereference(mdev->ldev->disk_conf);
-@@ -1561,8 +1561,8 @@ void drbd_rs_controller_reset(struct drbd_conf *mdev)
+ rcu_read_lock();
+@@ -1594,8 +1594,8 @@ void drbd_rs_controller_reset(struct drbd_device *device)
{
struct fifo_buffer *plan;
-- atomic_set(&mdev->rs_sect_in, 0);
-- atomic_set(&mdev->rs_sect_ev, 0);
-+ atomic_set_unchecked(&mdev->rs_sect_in, 0);
-+ atomic_set_unchecked(&mdev->rs_sect_ev, 0);
- mdev->rs_in_flight = 0;
+- atomic_set(&device->rs_sect_in, 0);
+- atomic_set(&device->rs_sect_ev, 0);
++ atomic_set_unchecked(&device->rs_sect_in, 0);
++ atomic_set_unchecked(&device->rs_sect_ev, 0);
+ device->rs_in_flight = 0;
/* Updating the RCU protected object in place is necessary since
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 66e8c3b..9b68dd9 100644
+index 6cb1beb..bf490f7 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -232,7 +232,7 @@ static int __do_lo_send_write(struct file *file,
@@ -38996,58 +38355,39 @@ index 66e8c3b..9b68dd9 100644
set_fs(old_fs);
file_end_write(file);
if (likely(bw == len))
-diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c
-index 091b9ea..f5428f8 100644
---- a/drivers/block/null_blk.c
-+++ b/drivers/block/null_blk.c
-@@ -382,15 +382,25 @@ static int null_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,
- return 0;
- }
+diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
+index e2bb8af..44b8aef 100644
+--- a/drivers/block/nvme-core.c
++++ b/drivers/block/nvme-core.c
+@@ -73,7 +73,6 @@ static LIST_HEAD(dev_list);
+ static struct task_struct *nvme_thread;
+ static struct workqueue_struct *nvme_workq;
+ static wait_queue_head_t nvme_kthread_wait;
+-static struct notifier_block nvme_nb;
+
+ static void nvme_reset_failed_dev(struct work_struct *ws);
+
+@@ -2926,6 +2925,10 @@ static struct pci_driver nvme_driver = {
+ .err_handler = &nvme_err_handler,
+ };
--static struct blk_mq_ops null_mq_ops = {
-- .queue_rq = null_queue_rq,
-- .map_queue = blk_mq_map_queue,
-+static struct blk_mq_ops null_mq_single_ops = {
-+ .queue_rq = null_queue_rq,
-+ .map_queue = blk_mq_map_queue,
- .init_hctx = null_init_hctx,
- .complete = null_softirq_done_fn,
-+ .alloc_hctx = blk_mq_alloc_single_hw_queue,
-+ .free_hctx = blk_mq_free_single_hw_queue,
++static struct notifier_block nvme_nb = {
++ .notifier_call = &nvme_cpu_notify,
+};
+
-+static struct blk_mq_ops null_mq_per_node_ops = {
-+ .queue_rq = null_queue_rq,
-+ .map_queue = blk_mq_map_queue,
-+ .init_hctx = null_init_hctx,
-+ .alloc_hctx = null_alloc_hctx,
-+ .free_hctx = null_free_hctx,
- };
-
- static struct blk_mq_reg null_mq_reg = {
-- .ops = &null_mq_ops,
-+ .ops = &null_mq_single_ops,
- .queue_depth = 64,
- .cmd_size = sizeof(struct nullb_cmd),
- .flags = BLK_MQ_F_SHOULD_MERGE,
-@@ -521,13 +531,8 @@ static int null_add_dev(void)
- null_mq_reg.queue_depth = hw_queue_depth;
- null_mq_reg.nr_hw_queues = submit_queues;
-
-- if (use_per_node_hctx) {
-- null_mq_reg.ops->alloc_hctx = null_alloc_hctx;
-- null_mq_reg.ops->free_hctx = null_free_hctx;
-- } else {
-- null_mq_reg.ops->alloc_hctx = blk_mq_alloc_single_hw_queue;
-- null_mq_reg.ops->free_hctx = blk_mq_free_single_hw_queue;
-- }
-+ if (use_per_node_hctx)
-+ null_mq_reg.ops = &null_mq_per_node_ops;
+ static int __init nvme_init(void)
+ {
+ int result;
+@@ -2942,7 +2945,6 @@ static int __init nvme_init(void)
+ else if (result > 0)
+ nvme_major = result;
- nullb->q = blk_mq_init_queue(&null_mq_reg, nullb);
- } else if (queue_mode == NULL_Q_BIO) {
+- nvme_nb.notifier_call = &nvme_cpu_notify;
+ result = register_hotcpu_notifier(&nvme_nb);
+ if (result)
+ goto unregister_blkdev;
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
-index a2af73d..c0b8f61 100644
+index 09e628da..7607aaa 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
@@ -39059,7 +38399,7 @@ index a2af73d..c0b8f61 100644
}
/*
-@@ -1888,7 +1888,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
+@@ -1890,7 +1890,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
return -EROFS;
}
pd->settings.fp = ti.fp;
@@ -39152,18 +38492,18 @@ index f038dba..bb74c08 100644
int err;
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
-index 8a3aff7..d7538c2 100644
+index 5d28a45..a538f90 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
-@@ -416,7 +416,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
+@@ -610,7 +610,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
ENSURE(reset, CDC_RESET);
ENSURE(generic_packet, CDC_GENERIC_PACKET);
cdi->mc_flags = 0;
- cdo->n_minors = 0;
- cdi->options = CDO_USE_FFLAGS;
-
- if (autoclose==1 && CDROM_CAN(CDC_CLOSE_TRAY))
-@@ -436,8 +435,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
+ cdi->options = CDO_USE_FFLAGS;
+
+ if (autoclose == 1 && CDROM_CAN(CDC_CLOSE_TRAY))
+@@ -630,8 +629,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
else
cdi->cdda_method = CDDA_OLD;
@@ -39175,17 +38515,17 @@ index 8a3aff7..d7538c2 100644
+ pax_close_kernel();
+ }
- cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
+ cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
mutex_lock(&cdrom_mutex);
-@@ -458,7 +460,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
+@@ -652,7 +654,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
if (cdi->exit)
cdi->exit(cdi);
- cdi->ops->n_minors--;
- cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
+ cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
}
-@@ -2107,7 +2108,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
+@@ -2126,7 +2127,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
*/
nr = nframes;
do {
@@ -39194,7 +38534,7 @@ index 8a3aff7..d7538c2 100644
if (cgc.buffer)
break;
-@@ -3429,7 +3430,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
+@@ -3434,7 +3435,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
struct cdrom_device_info *cdi;
int ret;
@@ -39204,7 +38544,7 @@ index 8a3aff7..d7538c2 100644
return 1;
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
-index 51e75ad..39c4c76 100644
+index 584bc31..e64a12c 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
@@ -39216,7 +38556,7 @@ index 51e75ad..39c4c76 100644
static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index 1386749..5430258 100644
+index efefd12..4f1d494 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
@@ -39251,18 +38591,10 @@ index a48e05b..6bac831 100644
kfree(usegment);
kfree(ksegment);
diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
-index 1b19239..963967b 100644
+index 09f17eb..8531d2f 100644
--- a/drivers/char/agp/frontend.c
+++ b/drivers/char/agp/frontend.c
-@@ -731,6 +731,7 @@ static int agpioc_info_wrap(struct agp_file_private *priv, void __user *arg)
-
- agp_copy_info(agp_bridge, &kerninfo);
-
-+ memset(&userinfo, 0, sizeof(userinfo));
- userinfo.version.major = kerninfo.version.major;
- userinfo.version.minor = kerninfo.version.minor;
- userinfo.bridge_id = kerninfo.device->vendor |
-@@ -819,7 +820,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
+@@ -806,7 +806,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
return -EFAULT;
@@ -39271,7 +38603,7 @@ index 1b19239..963967b 100644
return -EFAULT;
client = agp_find_client_by_pid(reserve.pid);
-@@ -849,7 +850,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
+@@ -836,7 +836,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
if (segment == NULL)
return -ENOMEM;
@@ -39305,24 +38637,11 @@ index d5d4cd8..22d561d 100644
struct hpet_info *info)
{
struct hpet_timer __iomem *timer;
-diff --git a/drivers/char/hw_random/intel-rng.c b/drivers/char/hw_random/intel-rng.c
-index 86fe45c..c0ea948 100644
---- a/drivers/char/hw_random/intel-rng.c
-+++ b/drivers/char/hw_random/intel-rng.c
-@@ -314,7 +314,7 @@ PFX "RNG, try using the 'no_fwh_detect' option.\n";
-
- if (no_fwh_detect)
- return -ENODEV;
-- printk(warning);
-+ printk("%s", warning);
- return -EBUSY;
- }
-
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
-index ec4e10f..f2a763b 100644
+index f816211..89eadea 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
-@@ -420,7 +420,7 @@ struct ipmi_smi {
+@@ -438,7 +438,7 @@ struct ipmi_smi {
struct proc_dir_entry *proc_dir;
char proc_dir_name[10];
@@ -39331,8 +38650,8 @@ index ec4e10f..f2a763b 100644
/*
* run_to_completion duplicate of smb_info, smi_info
-@@ -453,9 +453,9 @@ static DEFINE_MUTEX(smi_watchers_mutex);
-
+@@ -470,9 +470,9 @@ static LIST_HEAD(smi_watchers);
+ static DEFINE_MUTEX(smi_watchers_mutex);
#define ipmi_inc_stat(intf, stat) \
- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
@@ -39343,7 +38662,7 @@ index ec4e10f..f2a763b 100644
static int is_lan_addr(struct ipmi_addr *addr)
{
-@@ -2883,7 +2883,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
+@@ -2925,7 +2925,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
INIT_LIST_HEAD(&intf->cmd_rcvrs);
init_waitqueue_head(&intf->waitq);
for (i = 0; i < IPMI_NUM_STATS; i++)
@@ -39353,10 +38672,10 @@ index ec4e10f..f2a763b 100644
intf->proc_dir = NULL;
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
-index 8b4fa2c..5f81848 100644
+index 5c4e1f6..0ea58f9 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
-@@ -283,7 +283,7 @@ struct smi_info {
+@@ -285,7 +285,7 @@ struct smi_info {
unsigned char slave_addr;
/* Counters and things for the proc filesystem. */
@@ -39365,7 +38684,7 @@ index 8b4fa2c..5f81848 100644
struct task_struct *thread;
-@@ -292,9 +292,9 @@ struct smi_info {
+@@ -294,9 +294,9 @@ struct smi_info {
};
#define smi_inc_stat(smi, stat) \
@@ -39377,17 +38696,17 @@ index 8b4fa2c..5f81848 100644
#define SI_MAX_PARMS 4
-@@ -3349,7 +3349,7 @@ static int try_smi_init(struct smi_info *new_smi)
+@@ -3377,7 +3377,7 @@ static int try_smi_init(struct smi_info *new_smi)
atomic_set(&new_smi->req_events, 0);
- new_smi->run_to_completion = 0;
+ new_smi->run_to_completion = false;
for (i = 0; i < SI_NUM_STATS; i++)
- atomic_set(&new_smi->stats[i], 0);
+ atomic_set_unchecked(&new_smi->stats[i], 0);
- new_smi->interrupt_disabled = 1;
+ new_smi->interrupt_disabled = true;
atomic_set(&new_smi->stop_operation, 0);
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
-index 92c5937..1be4e4d 100644
+index 524b707..29d07c1 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -18,6 +18,7 @@
@@ -39435,7 +38754,7 @@ index 92c5937..1be4e4d 100644
#else
static inline int range_is_allowed(unsigned long pfn, unsigned long size)
{
-@@ -119,6 +133,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
+@@ -122,6 +136,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
while (count > 0) {
unsigned long remaining;
@@ -39443,7 +38762,7 @@ index 92c5937..1be4e4d 100644
sz = size_inside_page(p, count);
-@@ -134,7 +149,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
+@@ -137,7 +152,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
if (!ptr)
return -EFAULT;
@@ -39468,7 +38787,7 @@ index 92c5937..1be4e4d 100644
unxlate_dev_mem_ptr(p, ptr);
if (remaining)
return -EFAULT;
-@@ -363,9 +394,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
+@@ -369,9 +400,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
{
unsigned long p = *ppos;
@@ -39479,7 +38798,7 @@ index 92c5937..1be4e4d 100644
read = 0;
if (p < (unsigned long) high_memory) {
-@@ -387,6 +417,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
+@@ -393,6 +423,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
}
#endif
while (low_count > 0) {
@@ -39488,7 +38807,7 @@ index 92c5937..1be4e4d 100644
sz = size_inside_page(p, low_count);
/*
-@@ -396,7 +428,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
+@@ -402,7 +434,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
*/
kbuf = xlate_dev_kmem_ptr((char *)p);
@@ -39512,7 +38831,7 @@ index 92c5937..1be4e4d 100644
return -EFAULT;
buf += sz;
p += sz;
-@@ -821,6 +868,9 @@ static const struct memdev {
+@@ -797,6 +844,9 @@ static const struct memdev {
#ifdef CONFIG_PRINTK
[11] = { "kmsg", 0644, &kmsg_fops, NULL },
#endif
@@ -39522,7 +38841,7 @@ index 92c5937..1be4e4d 100644
};
static int memory_open(struct inode *inode, struct file *filp)
-@@ -892,7 +942,7 @@ static int __init chr_dev_init(void)
+@@ -868,7 +918,7 @@ static int __init chr_dev_init(void)
continue;
device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
@@ -39545,22 +38864,19 @@ index 9df78e2..01ba9ae 100644
*ppos = i;
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
-index 8320abd..ec48108 100644
+index 0ea9986..e7b07e4 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
-@@ -2345,9 +2345,9 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
+@@ -2345,7 +2345,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
if (debug_level >= DEBUG_LEVEL_INFO)
printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
- __FILE__, __LINE__, info->device_name, port->count);
+ __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
-- WARN_ON(!port->count);
-+ WARN_ON(!atomic_read(&port->count));
-
if (tty_port_close_start(port, tty, filp) == 0)
goto cleanup;
-@@ -2365,7 +2365,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
+@@ -2363,7 +2363,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
cleanup:
if (debug_level >= DEBUG_LEVEL_INFO)
printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
@@ -39569,7 +38885,7 @@ index 8320abd..ec48108 100644
}
/* Wait until the transmitter is empty.
-@@ -2507,7 +2507,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
+@@ -2505,7 +2505,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
if (debug_level >= DEBUG_LEVEL_INFO)
printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
@@ -39577,8 +38893,8 @@ index 8320abd..ec48108 100644
+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
/* If port is closing, signal caller to try again */
- if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING){
-@@ -2527,11 +2527,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
+ if (port->flags & ASYNC_CLOSING){
+@@ -2525,11 +2525,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
goto cleanup;
}
spin_lock(&port->lock);
@@ -39592,7 +38908,7 @@ index 8320abd..ec48108 100644
/* 1st open on this device, init hardware */
retval = startup(info, tty);
if (retval < 0)
-@@ -3920,7 +3920,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
+@@ -3918,7 +3918,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
unsigned short new_crctype;
/* return error if TTY interface open */
@@ -39601,7 +38917,7 @@ index 8320abd..ec48108 100644
return -EBUSY;
switch (encoding)
-@@ -4024,7 +4024,7 @@ static int hdlcdev_open(struct net_device *dev)
+@@ -4022,7 +4022,7 @@ static int hdlcdev_open(struct net_device *dev)
/* arbitrate between network and tty opens */
spin_lock_irqsave(&info->netlock, flags);
@@ -39610,7 +38926,7 @@ index 8320abd..ec48108 100644
printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
spin_unlock_irqrestore(&info->netlock, flags);
return -EBUSY;
-@@ -4114,7 +4114,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+@@ -4112,7 +4112,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
/* return error if TTY interface open */
@@ -39620,10 +38936,10 @@ index 8320abd..ec48108 100644
if (cmd != SIOCWANDEV)
diff --git a/drivers/char/random.c b/drivers/char/random.c
-index 8a64dbe..58488cc 100644
+index 04645c0..560e350 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
-@@ -284,9 +284,6 @@
+@@ -289,9 +289,6 @@
/*
* To allow fractional bits to be tracked, the entropy_count field is
* denominated in units of 1/8th bits.
@@ -39633,7 +38949,7 @@ index 8a64dbe..58488cc 100644
*/
#define ENTROPY_SHIFT 3
#define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
-@@ -433,9 +430,9 @@ struct entropy_store {
+@@ -439,9 +436,9 @@ struct entropy_store {
};
static void push_to_pool(struct work_struct *work);
@@ -39646,18 +38962,7 @@ index 8a64dbe..58488cc 100644
static struct entropy_store input_pool = {
.poolinfo = &poolinfo_table[0],
-@@ -524,8 +521,8 @@ static void _mix_pool_bytes(struct entropy_store *r, const void *in,
- input_rotate = (input_rotate + (i ? 7 : 14)) & 31;
- }
-
-- ACCESS_ONCE(r->input_rotate) = input_rotate;
-- ACCESS_ONCE(r->add_ptr) = i;
-+ ACCESS_ONCE_RW(r->input_rotate) = input_rotate;
-+ ACCESS_ONCE_RW(r->add_ptr) = i;
- smp_wmb();
-
- if (out)
-@@ -632,7 +629,7 @@ retry:
+@@ -635,7 +632,7 @@ retry:
/* The +2 corresponds to the /4 in the denominator */
do {
@@ -39666,7 +38971,7 @@ index 8a64dbe..58488cc 100644
unsigned int add =
((pool_size - entropy_count)*anfrac*3) >> s;
-@@ -1151,7 +1148,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
+@@ -1207,7 +1204,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
extract_buf(r, tmp);
i = min_t(int, nbytes, EXTRACT_SIZE);
@@ -39675,16 +38980,7 @@ index 8a64dbe..58488cc 100644
ret = -EFAULT;
break;
}
-@@ -1507,7 +1504,7 @@ EXPORT_SYMBOL(generate_random_uuid);
- #include <linux/sysctl.h>
-
- static int min_read_thresh = 8, min_write_thresh;
--static int max_read_thresh = INPUT_POOL_WORDS * 32;
-+static int max_read_thresh = OUTPUT_POOL_WORDS * 32;
- static int max_write_thresh = INPUT_POOL_WORDS * 32;
- static char sysctl_bootid[16];
-
-@@ -1523,7 +1520,7 @@ static char sysctl_bootid[16];
+@@ -1590,7 +1587,7 @@ static char sysctl_bootid[16];
static int proc_do_uuid(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
@@ -39693,11 +38989,11 @@ index 8a64dbe..58488cc 100644
unsigned char buf[64], tmp_uuid[16], *uuid;
uuid = table->data;
-@@ -1553,7 +1550,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
- static int proc_do_entropy(ctl_table *table, int write,
+@@ -1620,7 +1617,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
+ static int proc_do_entropy(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
-- ctl_table fake_table;
+- struct ctl_table fake_table;
+ ctl_table_no_const fake_table;
int entropy_count;
@@ -39745,11 +39041,11 @@ index 7cc1fe22..b602d6b 100644
return 0;
diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
-index b9a57fa..5bb9e38 100644
+index 565a947..dcdc06e 100644
--- a/drivers/char/tpm/tpm_acpi.c
+++ b/drivers/char/tpm/tpm_acpi.c
@@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
- virt = acpi_os_map_memory(start, len);
+ virt = acpi_os_map_iomem(start, len);
if (!virt) {
kfree(log->bios_event_log);
+ log->bios_event_log = NULL;
@@ -39760,10 +39056,10 @@ index b9a57fa..5bb9e38 100644
- memcpy_fromio(log->bios_event_log, virt, len);
+ memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
- acpi_os_unmap_memory(virt, len);
+ acpi_os_unmap_iomem(virt, len);
return 0;
diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
-index 59f7cb2..bac8b6d 100644
+index 3a56a13..f8cbd25 100644
--- a/drivers/char/tpm/tpm_eventlog.c
+++ b/drivers/char/tpm/tpm_eventlog.c
@@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
@@ -39795,7 +39091,7 @@ index 59f7cb2..bac8b6d 100644
return 0;
}
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
-index 6928d09..ff6abe8 100644
+index cf7a561..c319ce0 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -684,7 +684,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
@@ -39817,10 +39113,10 @@ index 6928d09..ff6abe8 100644
static int wait_port_writable(struct port *port, bool nonblock)
diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
-index 57a078e..c17cde8 100644
+index b9355da..9611f4e 100644
--- a/drivers/clk/clk-composite.c
+++ b/drivers/clk/clk-composite.c
-@@ -146,7 +146,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
+@@ -191,7 +191,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
struct clk *clk;
struct clk_init_data init;
struct clk_composite *composite;
@@ -39829,45 +39125,79 @@ index 57a078e..c17cde8 100644
composite = kzalloc(sizeof(*composite), GFP_KERNEL);
if (!composite) {
-diff --git a/drivers/clk/socfpga/clk.c b/drivers/clk/socfpga/clk.c
-index 5983a26..65d5f46 100644
---- a/drivers/clk/socfpga/clk.c
-+++ b/drivers/clk/socfpga/clk.c
+diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
+index dd3a78c..386d49c 100644
+--- a/drivers/clk/socfpga/clk-gate.c
++++ b/drivers/clk/socfpga/clk-gate.c
@@ -22,6 +22,7 @@
- #include <linux/clk-provider.h>
- #include <linux/io.h>
+ #include <linux/mfd/syscon.h>
#include <linux/of.h>
+ #include <linux/regmap.h>
+#include <asm/pgtable.h>
- /* Clock Manager offsets */
- #define CLKMGR_CTRL 0x0
-@@ -150,8 +151,10 @@ static __init struct clk *socfpga_clk_init(struct device_node *node,
- streq(clk_name, "periph_pll") ||
- streq(clk_name, "sdram_pll")) {
- socfpga_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
-- clk_pll_ops.enable = clk_gate_ops.enable;
-- clk_pll_ops.disable = clk_gate_ops.disable;
-+ pax_open_kernel();
-+ *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
-+ *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
-+ pax_close_kernel();
- }
+ #include "clk.h"
- clk = clk_register(NULL, &socfpga_clk->hw.hw);
-@@ -242,7 +245,7 @@ static unsigned long socfpga_clk_recalc_rate(struct clk_hw *hwclk,
- return parent_rate / div;
+@@ -174,7 +175,7 @@ static int socfpga_clk_prepare(struct clk_hw *hwclk)
+ return 0;
}
-static struct clk_ops gateclk_ops = {
+static clk_ops_no_const gateclk_ops __read_only = {
+ .prepare = socfpga_clk_prepare,
.recalc_rate = socfpga_clk_recalc_rate,
.get_parent = socfpga_clk_get_parent,
- .set_parent = socfpga_clk_set_parent,
+@@ -208,8 +209,10 @@ static void __init __socfpga_gate_init(struct device_node *node,
+ socfpga_clk->hw.reg = clk_mgr_base_addr + clk_gate[0];
+ socfpga_clk->hw.bit_idx = clk_gate[1];
+
+- gateclk_ops.enable = clk_gate_ops.enable;
+- gateclk_ops.disable = clk_gate_ops.disable;
++ pax_open_kernel();
++ *(void **)&gateclk_ops.enable = clk_gate_ops.enable;
++ *(void **)&gateclk_ops.disable = clk_gate_ops.disable;
++ pax_close_kernel();
+ }
+
+ rc = of_property_read_u32(node, "fixed-divider", &fixed_div);
+diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
+index de6da95..c98278b 100644
+--- a/drivers/clk/socfpga/clk-pll.c
++++ b/drivers/clk/socfpga/clk-pll.c
+@@ -21,6 +21,7 @@
+ #include <linux/io.h>
+ #include <linux/of.h>
+ #include <linux/of_address.h>
++#include <asm/pgtable.h>
+
+ #include "clk.h"
+
+@@ -76,7 +77,7 @@ static u8 clk_pll_get_parent(struct clk_hw *hwclk)
+ CLK_MGR_PLL_CLK_SRC_MASK;
+ }
+
+-static struct clk_ops clk_pll_ops = {
++static clk_ops_no_const clk_pll_ops __read_only = {
+ .recalc_rate = clk_pll_recalc_rate,
+ .get_parent = clk_pll_get_parent,
+ };
+@@ -120,8 +121,10 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
+ pll_clk->hw.hw.init = &init;
+
+ pll_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
+- clk_pll_ops.enable = clk_gate_ops.enable;
+- clk_pll_ops.disable = clk_gate_ops.disable;
++ pax_open_kernel();
++ *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
++ *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
++ pax_close_kernel();
+
+ clk = clk_register(NULL, &pll_clk->hw.hw);
+ if (WARN_ON(IS_ERR(clk))) {
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
-index 18448a7..d5fad43 100644
+index b0c18ed..1713a80 100644
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
-@@ -676,8 +676,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
+@@ -675,8 +675,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
per_cpu(acfreq_data, cpu) = data;
@@ -39881,7 +39211,7 @@ index 18448a7..d5fad43 100644
result = acpi_processor_register_performance(data->acpi_data, cpu);
if (result)
-@@ -810,7 +813,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
+@@ -809,7 +812,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
break;
case ACPI_ADR_SPACE_FIXED_HARDWARE:
@@ -39892,7 +39222,7 @@ index 18448a7..d5fad43 100644
break;
default:
break;
-@@ -905,8 +910,10 @@ static void __init acpi_cpufreq_boost_init(void)
+@@ -903,8 +908,10 @@ static void __init acpi_cpufreq_boost_init(void)
if (!msrs)
return;
@@ -39902,15 +39232,30 @@ index 18448a7..d5fad43 100644
+ *(bool *)&acpi_cpufreq_driver.boost_supported = true;
+ *(bool *)&acpi_cpufreq_driver.boost_enabled = boost_state(0);
+ pax_close_kernel();
- get_online_cpus();
- /* Force all MSRs to the same value */
+ cpu_notifier_register_begin();
+
+diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
+index f657c57..31d97ae 100644
+--- a/drivers/cpufreq/cpufreq-dt.c
++++ b/drivers/cpufreq/cpufreq-dt.c
+@@ -362,7 +362,9 @@ static int dt_cpufreq_probe(struct platform_device *pdev)
+ if (!IS_ERR(cpu_reg))
+ regulator_put(cpu_reg);
+
+- dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
++ pax_open_kernel();
++ *(void **)&dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
++ pax_close_kernel();
+
+ ret = cpufreq_register_driver(&dt_cpufreq_driver);
+ if (ret)
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
-index 4854f81..d9178cb 100644
+index 4473eba..a4c9dc2 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
-@@ -1985,7 +1985,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
- #endif
+@@ -2122,7 +2122,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
+ }
mutex_lock(&cpufreq_governor_mutex);
- list_del(&governor->governor_list);
@@ -39918,7 +39263,7 @@ index 4854f81..d9178cb 100644
mutex_unlock(&cpufreq_governor_mutex);
return;
}
-@@ -2215,7 +2215,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
+@@ -2338,7 +2338,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
return NOTIFY_OK;
}
@@ -39927,7 +39272,7 @@ index 4854f81..d9178cb 100644
.notifier_call = cpufreq_cpu_callback,
};
-@@ -2255,13 +2255,17 @@ int cpufreq_boost_trigger_state(int state)
+@@ -2378,13 +2378,17 @@ int cpufreq_boost_trigger_state(int state)
return 0;
write_lock_irqsave(&cpufreq_driver_lock, flags);
@@ -39946,8 +39291,8 @@ index 4854f81..d9178cb 100644
+ pax_close_kernel();
write_unlock_irqrestore(&cpufreq_driver_lock, flags);
- pr_err("%s: Cannot %s BOOST\n", __func__,
-@@ -2315,8 +2319,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
+ pr_err("%s: Cannot %s BOOST\n",
+@@ -2441,8 +2445,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
pr_debug("trying to register driver %s\n", driver_data->name);
@@ -39961,7 +39306,7 @@ index 4854f81..d9178cb 100644
write_lock_irqsave(&cpufreq_driver_lock, flags);
if (cpufreq_driver) {
-@@ -2331,8 +2338,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
+@@ -2457,8 +2464,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
* Check if driver provides function to enable boost -
* if not, use cpufreq_boost_set_sw as default
*/
@@ -39976,10 +39321,10 @@ index 4854f81..d9178cb 100644
ret = cpufreq_sysfs_create_file(&boost.attr);
if (ret) {
diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
-index e1c6433..31203ae 100644
+index 1b44496..b80ff5e 100644
--- a/drivers/cpufreq/cpufreq_governor.c
+++ b/drivers/cpufreq/cpufreq_governor.c
-@@ -191,7 +191,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
+@@ -245,7 +245,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
struct dbs_data *dbs_data;
struct od_cpu_dbs_info_s *od_dbs_info = NULL;
struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
@@ -39988,7 +39333,7 @@ index e1c6433..31203ae 100644
struct od_dbs_tuners *od_tuners = NULL;
struct cs_dbs_tuners *cs_tuners = NULL;
struct cpu_dbs_common_info *cpu_cdbs;
-@@ -257,7 +257,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
+@@ -311,7 +311,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
if ((cdata->governor == GOV_CONSERVATIVE) &&
(!policy->governor->initialized)) {
@@ -39997,7 +39342,7 @@ index e1c6433..31203ae 100644
cpufreq_register_notifier(cs_ops->notifier_block,
CPUFREQ_TRANSITION_NOTIFIER);
-@@ -277,7 +277,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
+@@ -331,7 +331,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
(policy->governor->initialized == 1)) {
@@ -40007,10 +39352,10 @@ index e1c6433..31203ae 100644
cpufreq_unregister_notifier(cs_ops->notifier_block,
CPUFREQ_TRANSITION_NOTIFIER);
diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
-index bfb9ae1..e1d3a7e 100644
+index cc401d1..8197340 100644
--- a/drivers/cpufreq/cpufreq_governor.h
+++ b/drivers/cpufreq/cpufreq_governor.h
-@@ -205,7 +205,7 @@ struct common_dbs_data {
+@@ -212,7 +212,7 @@ struct common_dbs_data {
void (*exit)(struct dbs_data *dbs_data);
/* Governor specific ops, see below */
@@ -40019,7 +39364,7 @@ index bfb9ae1..e1d3a7e 100644
};
/* Governor Per policy data */
-@@ -225,7 +225,7 @@ struct od_ops {
+@@ -232,7 +232,7 @@ struct od_ops {
unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
unsigned int freq_next, unsigned int relation);
void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
@@ -40029,10 +39374,10 @@ index bfb9ae1..e1d3a7e 100644
struct cs_ops {
struct notifier_block *notifier_block;
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
-index 18d4091..434be15 100644
+index ad3f38f..8f086cd 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
-@@ -521,7 +521,7 @@ static void od_exit(struct dbs_data *dbs_data)
+@@ -524,7 +524,7 @@ static void od_exit(struct dbs_data *dbs_data)
define_get_cpu_dbs_routines(od_cpu_dbs_info);
@@ -40041,7 +39386,7 @@ index 18d4091..434be15 100644
.powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
.powersave_bias_target = generic_powersave_bias_target,
.freq_increase = dbs_freq_increase,
-@@ -576,14 +576,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
+@@ -579,14 +579,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
(struct cpufreq_policy *, unsigned int, unsigned int),
unsigned int powersave_bias)
{
@@ -40063,10 +39408,10 @@ index 18d4091..434be15 100644
}
EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
-index 533a509..4e1860b 100644
+index 27bb6d3..4cf595c 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
-@@ -138,10 +138,10 @@ struct pstate_funcs {
+@@ -133,10 +133,10 @@ struct pstate_funcs {
struct cpu_defaults {
struct pstate_adjust_policy pid_policy;
struct pstate_funcs funcs;
@@ -40079,7 +39424,7 @@ index 533a509..4e1860b 100644
struct perf_limits {
int no_turbo;
-@@ -566,7 +566,7 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
+@@ -594,18 +594,18 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
cpu->pstate.current_pstate = pstate;
@@ -40087,11 +39432,8 @@ index 533a509..4e1860b 100644
+ pstate_funcs->set(cpu, pstate);
}
- static inline void intel_pstate_pstate_increase(struct cpudata *cpu, int steps)
-@@ -588,13 +588,13 @@ static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
+ static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
{
- sprintf(cpu->name, "Intel 2nd generation core");
-
- cpu->pstate.min_pstate = pstate_funcs.get_min();
- cpu->pstate.max_pstate = pstate_funcs.get_max();
- cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
@@ -40108,20 +39450,20 @@ index 533a509..4e1860b 100644
intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
}
-@@ -889,9 +889,9 @@ static int intel_pstate_msrs_not_valid(void)
+@@ -875,9 +875,9 @@ static int intel_pstate_msrs_not_valid(void)
rdmsrl(MSR_IA32_APERF, aperf);
rdmsrl(MSR_IA32_MPERF, mperf);
- if (!pstate_funcs.get_max() ||
-- !pstate_funcs.get_min() ||
-- !pstate_funcs.get_turbo())
+- !pstate_funcs.get_min() ||
+- !pstate_funcs.get_turbo())
+ if (!pstate_funcs->get_max() ||
-+ !pstate_funcs->get_min() ||
-+ !pstate_funcs->get_turbo())
++ !pstate_funcs->get_min() ||
++ !pstate_funcs->get_turbo())
return -ENODEV;
rdmsrl(MSR_IA32_APERF, tmp);
-@@ -905,7 +905,7 @@ static int intel_pstate_msrs_not_valid(void)
+@@ -891,7 +891,7 @@ static int intel_pstate_msrs_not_valid(void)
return 0;
}
@@ -40130,7 +39472,7 @@ index 533a509..4e1860b 100644
{
pid_params.sample_rate_ms = policy->sample_rate_ms;
pid_params.p_gain_pct = policy->p_gain_pct;
-@@ -917,12 +917,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
+@@ -903,12 +903,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
static void copy_cpu_funcs(struct pstate_funcs *funcs)
{
@@ -40145,7 +39487,7 @@ index 533a509..4e1860b 100644
#if IS_ENABLED(CONFIG_ACPI)
diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
-index 3d1cba9..0ab21d2 100644
+index 529cfd9..0e28fff 100644
--- a/drivers/cpufreq/p4-clockmod.c
+++ b/drivers/cpufreq/p4-clockmod.c
@@ -134,10 +134,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
@@ -40177,7 +39519,7 @@ index 3d1cba9..0ab21d2 100644
if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
-index 724ffbd..f06aaaa 100644
+index 9bb42ba..b01b4a2 100644
--- a/drivers/cpufreq/sparc-us3-cpufreq.c
+++ b/drivers/cpufreq/sparc-us3-cpufreq.c
@@ -18,14 +18,12 @@
@@ -40196,15 +39538,12 @@ index 724ffbd..f06aaaa 100644
/* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
* in the Safari config register.
-@@ -156,18 +154,28 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
+@@ -156,16 +154,27 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
{
-- if (cpufreq_us3_driver) {
-- cpufreq_frequency_table_put_attr(policy->cpu);
+- if (cpufreq_us3_driver)
- us3_freq_target(policy, 0);
-- }
-+ cpufreq_frequency_table_put_attr(policy->cpu);
+ us3_freq_target(policy, 0);
return 0;
@@ -40230,7 +39569,7 @@ index 724ffbd..f06aaaa 100644
if (tlb_type != cheetah && tlb_type != cheetah_plus)
return -ENODEV;
-@@ -180,55 +188,15 @@ static int __init us3_freq_init(void)
+@@ -178,55 +187,15 @@ static int __init us3_freq_init(void)
(impl == CHEETAH_IMPL ||
impl == CHEETAH_PLUS_IMPL ||
impl == JAGUAR_IMPL ||
@@ -40290,7 +39629,7 @@ index 724ffbd..f06aaaa 100644
MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
-index 4e1daca..e707b61 100644
+index 7d4a315..21bb886 100644
--- a/drivers/cpufreq/speedstep-centrino.c
+++ b/drivers/cpufreq/speedstep-centrino.c
@@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
@@ -40308,10 +39647,10 @@ index 4e1daca..e707b61 100644
if (policy->cpu != 0)
return -ENODEV;
diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
-index 06dbe7c..c2c8671 100644
+index e431d11..d0b997e 100644
--- a/drivers/cpuidle/driver.c
+++ b/drivers/cpuidle/driver.c
-@@ -202,7 +202,7 @@ static int poll_idle(struct cpuidle_device *dev,
+@@ -194,7 +194,7 @@ static int poll_idle(struct cpuidle_device *dev,
static void poll_idle_init(struct cpuidle_driver *drv)
{
@@ -40321,7 +39660,7 @@ index 06dbe7c..c2c8671 100644
snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
-index ca89412..a7b9c49 100644
+index fb9f511..213e6cc 100644
--- a/drivers/cpuidle/governor.c
+++ b/drivers/cpuidle/governor.c
@@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
@@ -40334,7 +39673,7 @@ index ca89412..a7b9c49 100644
cpuidle_curr_governor->rating < gov->rating)
cpuidle_switch_governor(gov);
diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
-index e918b6d..f87ea80 100644
+index 97c5903..023ad23 100644
--- a/drivers/cpuidle/sysfs.c
+++ b/drivers/cpuidle/sysfs.c
@@ -135,7 +135,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
@@ -40347,7 +39686,7 @@ index e918b6d..f87ea80 100644
.name = "cpuidle",
};
diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
-index 12fea3e..1e28f47 100644
+index 8d2a772..33826c9 100644
--- a/drivers/crypto/hifn_795x.c
+++ b/drivers/crypto/hifn_795x.c
@@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
@@ -40369,10 +39708,10 @@ index 12fea3e..1e28f47 100644
err = pci_request_regions(pdev, name);
if (err)
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
-index a0b2f7e..1b6f028 100644
+index 30b538d8..1610d75 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
-@@ -607,7 +607,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
+@@ -673,7 +673,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
goto err_out;
}
@@ -40381,7 +39720,7 @@ index a0b2f7e..1b6f028 100644
list_for_each_entry(devfreq, &devfreq_list, node) {
int ret = 0;
-@@ -695,7 +695,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
+@@ -761,7 +761,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
}
}
@@ -40391,10 +39730,10 @@ index a0b2f7e..1b6f028 100644
mutex_unlock(&devfreq_list_lock);
diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
-index 2e7b394..1371a64 100644
+index 42d4974..2714f36 100644
--- a/drivers/dma/sh/shdma-base.c
+++ b/drivers/dma/sh/shdma-base.c
-@@ -267,8 +267,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
+@@ -228,8 +228,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
schan->slave_id = -EINVAL;
}
@@ -40406,10 +39745,10 @@ index 2e7b394..1371a64 100644
ret = -ENOMEM;
goto edescalloc;
diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
-index 0d765c0..60b7480 100644
+index 58eb857..d7e42c8 100644
--- a/drivers/dma/sh/shdmac.c
+++ b/drivers/dma/sh/shdmac.c
-@@ -511,7 +511,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
+@@ -513,7 +513,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
return ret;
}
@@ -40435,10 +39774,10 @@ index 592af5f..bb1d583 100644
EXPORT_SYMBOL_GPL(edac_device_alloc_index);
diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
-index b335c6a..db65b44 100644
+index a6cd361..7bdbf53 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
-@@ -152,7 +152,7 @@ static const char * const edac_caps[] = {
+@@ -154,7 +154,7 @@ static const char * const edac_caps[] = {
struct dev_ch_attribute {
struct device_attribute attr;
int channel;
@@ -40447,7 +39786,7 @@ index b335c6a..db65b44 100644
#define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
struct dev_ch_attribute dev_attr_legacy_##_name = \
-@@ -1009,14 +1009,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
+@@ -1011,14 +1011,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
}
if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
@@ -40650,7 +39989,7 @@ index eb6935c..3cc2bfa 100644
#include <asm/byteorder.h>
diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
-index f477308..2795f24 100644
+index e1480ff6..1a429bd 100644
--- a/drivers/firewire/core.h
+++ b/drivers/firewire/core.h
@@ -111,6 +111,7 @@ struct fw_card_driver {
@@ -40662,10 +40001,10 @@ index f477308..2795f24 100644
void fw_card_initialize(struct fw_card *card,
const struct fw_card_driver *driver, struct device *device);
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
-index 586f2f7..3545ad2 100644
+index a66a321..f6caf20 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
-@@ -2049,10 +2049,12 @@ static void bus_reset_work(struct work_struct *work)
+@@ -2056,10 +2056,12 @@ static void bus_reset_work(struct work_struct *work)
be32_to_cpu(ohci->next_header));
}
@@ -40678,7 +40017,7 @@ index 586f2f7..3545ad2 100644
spin_unlock_irq(&ohci->lock);
-@@ -2584,8 +2586,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
+@@ -2591,8 +2593,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
unsigned long flags;
int n, ret = 0;
@@ -40716,10 +40055,10 @@ index 17afc51..0ef90cd 100644
dmi_unmap(buf);
return 0;
diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
-index 1491dd4..aa910db 100644
+index 5b53d61..72cee96 100644
--- a/drivers/firmware/efi/cper.c
+++ b/drivers/firmware/efi/cper.c
-@@ -41,12 +41,12 @@
+@@ -44,12 +44,12 @@ static char rcd_decode_str[CPER_REC_LEN];
*/
u64 cper_next_record_id(void)
{
@@ -40737,10 +40076,10 @@ index 1491dd4..aa910db 100644
EXPORT_SYMBOL_GPL(cper_next_record_id);
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
-index 4753bac..02861a2 100644
+index 8590099..d83627a 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
-@@ -120,14 +120,16 @@ static struct attribute_group efi_subsys_attr_group = {
+@@ -148,14 +148,16 @@ static struct attribute_group efi_subsys_attr_group = {
};
static struct efivars generic_efivars;
@@ -40763,10 +40102,10 @@ index 4753bac..02861a2 100644
return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
}
diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
-index 3dc2482..7bd2f61 100644
+index f256ecd..387dcb1 100644
--- a/drivers/firmware/efi/efivars.c
+++ b/drivers/firmware/efi/efivars.c
-@@ -456,7 +456,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
+@@ -589,7 +589,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
static int
create_efivars_bin_attributes(void)
{
@@ -40776,10 +40115,10 @@ index 3dc2482..7bd2f61 100644
/* new_var */
diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
-index 2a90ba6..07f3733 100644
+index 2f569aa..c95f4fb 100644
--- a/drivers/firmware/google/memconsole.c
+++ b/drivers/firmware/google/memconsole.c
-@@ -147,7 +147,9 @@ static int __init memconsole_init(void)
+@@ -155,7 +155,10 @@ static int __init memconsole_init(void)
if (!found_memconsole())
return -ENODEV;
@@ -40787,11 +40126,12 @@ index 2a90ba6..07f3733 100644
+ pax_open_kernel();
+ *(size_t *)&memconsole_bin_attr.size = memconsole_length;
+ pax_close_kernel();
-
- ret = sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
++
+ return sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
+ }
diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
-index 1e98a98..b444372 100644
+index fe49ec3..1ade794 100644
--- a/drivers/gpio/gpio-em.c
+++ b/drivers/gpio/gpio-em.c
@@ -278,7 +278,7 @@ static int em_gio_probe(struct platform_device *pdev)
@@ -40804,36 +40144,49 @@ index 1e98a98..b444372 100644
int ret;
diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
-index f5bf3c3..7baaa59 100644
+index 3784e81..73637b5 100644
--- a/drivers/gpio/gpio-ich.c
+++ b/drivers/gpio/gpio-ich.c
-@@ -71,7 +71,7 @@ struct ichx_desc {
- /* Some chipsets have quirks, let these use their own request/get */
- int (*request)(struct gpio_chip *chip, unsigned offset);
- int (*get)(struct gpio_chip *chip, unsigned offset);
+@@ -94,7 +94,7 @@ struct ichx_desc {
+ * this option allows driver caching written output values
+ */
+ bool use_outlvl_cache;
-};
+} __do_const;
static struct {
spinlock_t lock;
+diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
+index 415682f..08438b8 100644
+--- a/drivers/gpio/gpio-omap.c
++++ b/drivers/gpio/gpio-omap.c
+@@ -1162,7 +1162,7 @@ static int omap_gpio_probe(struct platform_device *pdev)
+ const struct omap_gpio_platform_data *pdata;
+ struct resource *res;
+ struct gpio_bank *bank;
+- struct irq_chip *irqc;
++ irq_chip_no_const *irqc;
+ int ret;
+
+ match = of_match_device(of_match_ptr(omap_gpio_match), dev);
diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
-index ca76ce7..68b384b 100644
+index bf6c094..6573caf 100644
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
-@@ -355,7 +355,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
+@@ -357,7 +357,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
struct gpio_rcar_priv *p;
struct resource *io, *irq;
struct gpio_chip *gpio_chip;
- struct irq_chip *irq_chip;
+ irq_chip_no_const *irq_chip;
- const char *name = dev_name(&pdev->dev);
+ struct device *dev = &pdev->dev;
+ const char *name = dev_name(dev);
int ret;
-
diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
-index 9902732..64b62dd 100644
+index dbf28fa..04dad4e 100644
--- a/drivers/gpio/gpio-vr41xx.c
+++ b/drivers/gpio/gpio-vr41xx.c
-@@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
+@@ -224,7 +224,7 @@ static int giu_get_irq(unsigned int irq)
printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
maskl, pendl, maskh, pendh);
@@ -40842,11 +40195,42 @@ index 9902732..64b62dd 100644
return -EINVAL;
}
+diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
+index c81bda0..a8ccd9f 100644
+--- a/drivers/gpio/gpiolib.c
++++ b/drivers/gpio/gpiolib.c
+@@ -539,8 +539,10 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
+ }
+
+ if (gpiochip->irqchip) {
+- gpiochip->irqchip->irq_request_resources = NULL;
+- gpiochip->irqchip->irq_release_resources = NULL;
++ pax_open_kernel();
++ *(void **)&gpiochip->irqchip->irq_request_resources = NULL;
++ *(void **)&gpiochip->irqchip->irq_release_resources = NULL;
++ pax_close_kernel();
+ gpiochip->irqchip = NULL;
+ }
+ }
+@@ -606,8 +608,11 @@ int gpiochip_irqchip_add(struct gpio_chip *gpiochip,
+ gpiochip->irqchip = NULL;
+ return -EINVAL;
+ }
+- irqchip->irq_request_resources = gpiochip_irq_reqres;
+- irqchip->irq_release_resources = gpiochip_irq_relres;
++
++ pax_open_kernel();
++ *(void **)&irqchip->irq_request_resources = gpiochip_irq_reqres;
++ *(void **)&irqchip->irq_release_resources = gpiochip_irq_relres;
++ pax_close_kernel();
+
+ /*
+ * Prepare the mapping since the irqchip shall be orthogonal to
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
-index 3b7d32d..05c2f74 100644
+index e79c8d3..a9370bc 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
-@@ -3123,7 +3123,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
+@@ -3900,7 +3900,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
goto done;
}
@@ -40856,85 +40240,89 @@ index 3b7d32d..05c2f74 100644
ret = -EFAULT;
goto done;
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
-old mode 100644
-new mode 100755
-index 345be03..65b66c0
+index bc3da32..7289357 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
-@@ -233,7 +233,7 @@ module_exit(drm_core_exit);
- /**
- * Copy and IOCTL return string to user space
- */
--static int drm_copy_field(char *buf, size_t *buf_len, const char *value)
-+static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value)
- {
- int len;
+@@ -443,7 +443,7 @@ void drm_unplug_dev(struct drm_device *dev)
-@@ -303,7 +303,7 @@ long drm_ioctl(struct file *filp,
- struct drm_file *file_priv = filp->private_data;
- struct drm_device *dev;
- const struct drm_ioctl_desc *ioctl = NULL;
-- drm_ioctl_t *func;
-+ drm_ioctl_no_const_t func;
- unsigned int nr = DRM_IOCTL_NR(cmd);
- int retcode = -EINVAL;
- char stack_kdata[128];
-@@ -380,8 +380,9 @@ long drm_ioctl(struct file *filp,
- retcode = -EFAULT;
- goto err_i1;
- }
-- } else
-+ } else if (cmd & IOC_OUT) {
- memset(kdata, 0, usize);
-+ }
+ drm_device_set_unplugged(dev);
- if (ioctl->flags & DRM_UNLOCKED)
- retcode = func(dev, kdata, file_priv);
+- if (dev->open_count == 0) {
++ if (local_read(&dev->open_count) == 0) {
+ drm_put_dev(dev);
+ }
+ mutex_unlock(&drm_global_mutex);
+diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
+index e9a2827..5df4716 100644
+--- a/drivers/gpu/drm/drm_fb_helper.c
++++ b/drivers/gpu/drm/drm_fb_helper.c
+@@ -771,7 +771,9 @@ int drm_fb_helper_setcmap(struct fb_cmap *cmap, struct fb_info *info)
+ int i, j, rc = 0;
+ int start;
+
+- drm_modeset_lock_all(dev);
++ if (__drm_modeset_lock_all(dev, !!oops_in_progress)) {
++ return -EBUSY;
++ }
+ if (!drm_fb_helper_is_bound(fb_helper)) {
+ drm_modeset_unlock_all(dev);
+ return -EBUSY;
+@@ -945,7 +947,9 @@ int drm_fb_helper_pan_display(struct fb_var_screeninfo *var,
+ int ret = 0;
+ int i;
+
+- drm_modeset_lock_all(dev);
++ if (__drm_modeset_lock_all(dev, !!oops_in_progress)) {
++ return -EBUSY;
++ }
+ if (!drm_fb_helper_is_bound(fb_helper)) {
+ drm_modeset_unlock_all(dev);
+ return -EBUSY;
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
-index 7f2af9a..1561914 100644
+index ed7bc68..0d536af 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
-@@ -97,7 +97,7 @@ int drm_open(struct inode *inode, struct file *filp)
- if (drm_device_is_unplugged(dev))
- return -ENODEV;
+@@ -89,7 +89,7 @@ int drm_open(struct inode *inode, struct file *filp)
+ return PTR_ERR(minor);
+ dev = minor->dev;
- if (!dev->open_count++)
+ if (local_inc_return(&dev->open_count) == 1)
need_setup = 1;
- mutex_lock(&dev->struct_mutex);
- old_imapping = inode->i_mapping;
-@@ -127,7 +127,7 @@ err_undo:
- iput(container_of(dev->dev_mapping, struct inode, i_data));
- dev->dev_mapping = old_mapping;
- mutex_unlock(&dev->struct_mutex);
+
+ /* share address_space across all char-devs of a single device */
+@@ -106,7 +106,7 @@ int drm_open(struct inode *inode, struct file *filp)
+ return 0;
+
+ err_undo:
- dev->open_count--;
+ local_dec(&dev->open_count);
+ drm_minor_release(minor);
return retcode;
}
- EXPORT_SYMBOL(drm_open);
-@@ -463,7 +463,7 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -376,7 +376,7 @@ int drm_release(struct inode *inode, struct file *filp)
mutex_lock(&drm_global_mutex);
- DRM_DEBUG("open_count = %d\n", dev->open_count);
+ DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
- if (dev->driver->preclose)
- dev->driver->preclose(dev, file_priv);
-@@ -472,10 +472,10 @@ int drm_release(struct inode *inode, struct file *filp)
+ mutex_lock(&dev->struct_mutex);
+ list_del(&file_priv->lhead);
+@@ -389,10 +389,10 @@ int drm_release(struct inode *inode, struct file *filp)
* Begin inline drm_release
*/
- DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
task_pid_nr(current),
- (long)old_encode_dev(file_priv->minor->device),
+ (long)old_encode_dev(file_priv->minor->kdev->devt),
- dev->open_count);
+ local_read(&dev->open_count));
/* Release any auth tokens that might point to this file_priv,
(do that under the drm_global_mutex) */
-@@ -573,7 +573,7 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -465,7 +465,7 @@ int drm_release(struct inode *inode, struct file *filp)
* End inline drm_release
*/
@@ -41005,10 +40393,10 @@ index 3d2e91c..d31c4c9 100644
item->object = NULL;
}
diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
-index 7473035..a48b9c5 100644
+index 51efebd..2b70935 100644
--- a/drivers/gpu/drm/drm_info.c
+++ b/drivers/gpu/drm/drm_info.c
-@@ -75,10 +75,13 @@ int drm_vm_info(struct seq_file *m, void *data)
+@@ -76,10 +76,13 @@ int drm_vm_info(struct seq_file *m, void *data)
struct drm_local_map *map;
struct drm_map_list *r_list;
@@ -41026,7 +40414,7 @@ index 7473035..a48b9c5 100644
const char *type;
int i;
-@@ -89,7 +92,7 @@ int drm_vm_info(struct seq_file *m, void *data)
+@@ -90,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
map = r_list->map;
if (!map)
continue;
@@ -41035,18 +40423,6 @@ index 7473035..a48b9c5 100644
type = "??";
else
type = types[map->type];
-@@ -261,7 +264,11 @@ int drm_vma_info(struct seq_file *m, void *data)
- vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
- vma->vm_flags & VM_LOCKED ? 'l' : '-',
- vma->vm_flags & VM_IO ? 'i' : '-',
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+ 0);
-+#else
- vma->vm_pgoff);
-+#endif
-
- #if defined(__i386__)
- pgprot = pgprot_val(vma->vm_page_prot);
diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
index 2f4c4343..dd12cd2 100644
--- a/drivers/gpu/drm/drm_ioc32.c
@@ -41099,37 +40475,24 @@ index 2f4c4343..dd12cd2 100644
else
ret = drm_ioctl(filp, cmd, arg);
-diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
-index 98a33c580..8fd1c2b 100644
---- a/drivers/gpu/drm/drm_stub.c
-+++ b/drivers/gpu/drm/drm_stub.c
-@@ -409,7 +409,7 @@ void drm_unplug_dev(struct drm_device *dev)
-
- drm_device_set_unplugged(dev);
-
-- if (dev->open_count == 0) {
-+ if (local_read(&dev->open_count) == 0) {
- drm_put_dev(dev);
- }
- mutex_unlock(&drm_global_mutex);
-diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
-index c22c309..ae758c3 100644
---- a/drivers/gpu/drm/drm_sysfs.c
-+++ b/drivers/gpu/drm/drm_sysfs.c
-@@ -505,7 +505,7 @@ static void drm_sysfs_release(struct device *dev)
- */
- int drm_sysfs_device_add(struct drm_minor *minor)
- {
-- char *minor_str;
-+ const char *minor_str;
- int r;
-
- if (minor->type == DRM_MINOR_CONTROL)
+diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
+index 00587a1..57a65ca 100644
+--- a/drivers/gpu/drm/drm_ioctl.c
++++ b/drivers/gpu/drm/drm_ioctl.c
+@@ -642,7 +642,7 @@ long drm_ioctl(struct file *filp,
+ struct drm_file *file_priv = filp->private_data;
+ struct drm_device *dev;
+ const struct drm_ioctl_desc *ioctl = NULL;
+- drm_ioctl_t *func;
++ drm_ioctl_no_const_t func;
+ unsigned int nr = DRM_IOCTL_NR(cmd);
+ int retcode = -EINVAL;
+ char stack_kdata[128];
diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
-index d4d16ed..8fb0b51 100644
+index 93ec5dc..82acbaf 100644
--- a/drivers/gpu/drm/i810/i810_drv.h
+++ b/drivers/gpu/drm/i810/i810_drv.h
-@@ -108,8 +108,8 @@ typedef struct drm_i810_private {
+@@ -110,8 +110,8 @@ typedef struct drm_i810_private {
int page_flipping;
wait_queue_head_t irq_queue;
@@ -41140,63 +40503,40 @@ index d4d16ed..8fb0b51 100644
int front_offset;
} drm_i810_private_t;
-diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
-index b2b46c5..feb9fe7 100644
---- a/drivers/gpu/drm/i915/i915_debugfs.c
-+++ b/drivers/gpu/drm/i915/i915_debugfs.c
-@@ -713,7 +713,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
- I915_READ(GTIMR));
- }
- seq_printf(m, "Interrupts received: %d\n",
-- atomic_read(&dev_priv->irq_received));
-+ atomic_read_unchecked(&dev_priv->irq_received));
- for_each_ring(ring, dev_priv, i) {
- if (INTEL_INFO(dev)->gen >= 6) {
- seq_printf(m,
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
-index 15a74f9..4278889 100644
+index 318ade9..1f5de55 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
-@@ -1273,7 +1273,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
- bool can_switch;
-
- spin_lock(&dev->count_lock);
-- can_switch = (dev->open_count == 0);
-+ can_switch = (local_read(&dev->open_count) == 0);
- spin_unlock(&dev->count_lock);
- return can_switch;
- }
-diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index 4677af9..cd79971 100644
---- a/drivers/gpu/drm/i915/i915_drv.h
-+++ b/drivers/gpu/drm/i915/i915_drv.h
-@@ -1362,7 +1362,7 @@ typedef struct drm_i915_private {
- drm_dma_handle_t *status_page_dmah;
- struct resource mch_res;
-
-- atomic_t irq_received;
-+ atomic_unchecked_t irq_received;
+@@ -1294,7 +1294,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
+ * locking inversion with the driver load path. And the access here is
+ * completely racy anyway. So don't bother with locking for now.
+ */
+- return dev->open_count == 0;
++ return local_read(&dev->open_count) == 0;
+ }
- /* protects the irq masks */
- spinlock_t irq_lock;
+ static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-index 768e666..68cf44d 100644
+index 1a0611b..dd1fbfc 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-@@ -860,9 +860,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
-
+@@ -866,12 +866,12 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
static int
- validate_exec_list(struct drm_i915_gem_exec_object2 *exec,
+ validate_exec_list(struct drm_device *dev,
+ struct drm_i915_gem_exec_object2 *exec,
- int count)
+ unsigned int count)
{
-- int i;
-+ unsigned int i;
unsigned relocs_total = 0;
unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
+ unsigned invalid_flags;
+- int i;
++ unsigned int i;
+ invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
+ if (USES_FULL_PPGTT(dev))
diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
-index 3c59584..500f2e9 100644
+index 2e0613e..a8b94d9 100644
--- a/drivers/gpu/drm/i915/i915_ioc32.c
+++ b/drivers/gpu/drm/i915/i915_ioc32.c
@@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
@@ -41218,11 +40558,11 @@ index 3c59584..500f2e9 100644
if (nr < DRM_COMMAND_BASE)
return drm_compat_ioctl(filp, cmd, arg);
-- if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(i915_compat_ioctls))
+- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
- fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
-
- if (fn != NULL)
-+ if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(i915_compat_ioctls)) {
++ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls)) {
+ drm_ioctl_compat_t fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
ret = (*fn) (filp, cmd, arg);
- else
@@ -41230,132 +40570,11 @@ index 3c59584..500f2e9 100644
ret = drm_ioctl(filp, cmd, arg);
return ret;
-diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 4050450..f67c5c1 100644
---- a/drivers/gpu/drm/i915/i915_irq.c
-+++ b/drivers/gpu/drm/i915/i915_irq.c
-@@ -1448,7 +1448,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
- int pipe;
- u32 pipe_stats[I915_MAX_PIPES];
-
-- atomic_inc(&dev_priv->irq_received);
-+ atomic_inc_unchecked(&dev_priv->irq_received);
-
- while (true) {
- iir = I915_READ(VLV_IIR);
-@@ -1761,7 +1761,7 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg)
- u32 de_iir, gt_iir, de_ier, sde_ier = 0;
- irqreturn_t ret = IRQ_NONE;
-
-- atomic_inc(&dev_priv->irq_received);
-+ atomic_inc_unchecked(&dev_priv->irq_received);
-
- /* We get interrupts on unclaimed registers, so check for this before we
- * do any I915_{READ,WRITE}. */
-@@ -1831,7 +1831,7 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)
- uint32_t tmp = 0;
- enum pipe pipe;
-
-- atomic_inc(&dev_priv->irq_received);
-+ atomic_inc_unchecked(&dev_priv->irq_received);
-
- master_ctl = I915_READ(GEN8_MASTER_IRQ);
- master_ctl &= ~GEN8_MASTER_IRQ_CONTROL;
-@@ -2655,7 +2655,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
- {
- drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-
-- atomic_set(&dev_priv->irq_received, 0);
-+ atomic_set_unchecked(&dev_priv->irq_received, 0);
-
- I915_WRITE(HWSTAM, 0xeffe);
-
-@@ -2673,7 +2673,7 @@ static void valleyview_irq_preinstall(struct drm_device *dev)
- drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
- int pipe;
-
-- atomic_set(&dev_priv->irq_received, 0);
-+ atomic_set_unchecked(&dev_priv->irq_received, 0);
-
- /* VLV magic */
- I915_WRITE(VLV_IMR, 0);
-@@ -2704,7 +2704,7 @@ static void gen8_irq_preinstall(struct drm_device *dev)
- struct drm_i915_private *dev_priv = dev->dev_private;
- int pipe;
-
-- atomic_set(&dev_priv->irq_received, 0);
-+ atomic_set_unchecked(&dev_priv->irq_received, 0);
-
- I915_WRITE(GEN8_MASTER_IRQ, 0);
- POSTING_READ(GEN8_MASTER_IRQ);
-@@ -3028,7 +3028,7 @@ static void gen8_irq_uninstall(struct drm_device *dev)
- if (!dev_priv)
- return;
-
-- atomic_set(&dev_priv->irq_received, 0);
-+ atomic_set_unchecked(&dev_priv->irq_received, 0);
-
- I915_WRITE(GEN8_MASTER_IRQ, 0);
-
-@@ -3122,7 +3122,7 @@ static void i8xx_irq_preinstall(struct drm_device * dev)
- drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
- int pipe;
-
-- atomic_set(&dev_priv->irq_received, 0);
-+ atomic_set_unchecked(&dev_priv->irq_received, 0);
-
- for_each_pipe(pipe)
- I915_WRITE(PIPESTAT(pipe), 0);
-@@ -3208,7 +3208,7 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg)
- I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
-
-- atomic_inc(&dev_priv->irq_received);
-+ atomic_inc_unchecked(&dev_priv->irq_received);
-
- iir = I915_READ16(IIR);
- if (iir == 0)
-@@ -3287,7 +3287,7 @@ static void i915_irq_preinstall(struct drm_device * dev)
- drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
- int pipe;
-
-- atomic_set(&dev_priv->irq_received, 0);
-+ atomic_set_unchecked(&dev_priv->irq_received, 0);
-
- if (I915_HAS_HOTPLUG(dev)) {
- I915_WRITE(PORT_HOTPLUG_EN, 0);
-@@ -3394,7 +3394,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
- int pipe, ret = IRQ_NONE;
-
-- atomic_inc(&dev_priv->irq_received);
-+ atomic_inc_unchecked(&dev_priv->irq_received);
-
- iir = I915_READ(IIR);
- do {
-@@ -3521,7 +3521,7 @@ static void i965_irq_preinstall(struct drm_device * dev)
- drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
- int pipe;
-
-- atomic_set(&dev_priv->irq_received, 0);
-+ atomic_set_unchecked(&dev_priv->irq_received, 0);
-
- I915_WRITE(PORT_HOTPLUG_EN, 0);
- I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
-@@ -3637,7 +3637,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
- I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
-
-- atomic_inc(&dev_priv->irq_received);
-+ atomic_inc_unchecked(&dev_priv->irq_received);
-
- iir = I915_READ(IIR);
-
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index c514690..84df88f 100644
+index 31b9664..5d478d3 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -10796,13 +10796,13 @@ struct intel_quirk {
+@@ -12811,13 +12811,13 @@ struct intel_quirk {
int subsystem_vendor;
int subsystem_device;
void (*hook)(struct drm_device *dev);
@@ -41371,7 +40590,7 @@ index c514690..84df88f 100644
static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
{
-@@ -10810,18 +10810,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
+@@ -12825,18 +12825,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
return 1;
}
@@ -41403,10 +40622,10 @@ index c514690..84df88f 100644
},
};
diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
-index fe45321..836fdca 100644
+index b4a2014..219ab78 100644
--- a/drivers/gpu/drm/mga/mga_drv.h
+++ b/drivers/gpu/drm/mga/mga_drv.h
-@@ -120,9 +120,9 @@ typedef struct drm_mga_private {
+@@ -122,9 +122,9 @@ typedef struct drm_mga_private {
u32 clear_cmd;
u32 maccess;
@@ -41419,7 +40638,7 @@ index fe45321..836fdca 100644
unsigned int fb_cpp;
diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
-index 86b4bb8..ae237ad 100644
+index 729bfd5..ead8823 100644
--- a/drivers/gpu/drm/mga/mga_ioc32.c
+++ b/drivers/gpu/drm/mga/mga_ioc32.c
@@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
@@ -41441,11 +40660,11 @@ index 86b4bb8..ae237ad 100644
if (nr < DRM_COMMAND_BASE)
return drm_compat_ioctl(filp, cmd, arg);
-- if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(mga_compat_ioctls))
+- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls))
- fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
-
- if (fn != NULL)
-+ if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(mga_compat_ioctls)) {
++ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls)) {
+ drm_ioctl_compat_t fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
ret = (*fn) (filp, cmd, arg);
- else
@@ -41494,10 +40713,10 @@ index 1b071b8..de8601a 100644
*sequence = cur_fence;
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
-index 4c3feaa..26391ce 100644
+index dae2c96..324dbe4 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -965,7 +965,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
+@@ -963,7 +963,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
struct bit_table {
const char id;
int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
@@ -41507,10 +40726,10 @@ index 4c3feaa..26391ce 100644
#define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
-index 74ed08a..e81b8c5 100644
+index 8ae36f2..1147a30 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
-@@ -99,7 +99,6 @@ struct nouveau_drm {
+@@ -121,7 +121,6 @@ struct nouveau_drm {
struct drm_global_reference mem_global_ref;
struct ttm_bo_global_ref bo_global_ref;
struct ttm_bo_device bdev;
@@ -41519,7 +40738,7 @@ index 74ed08a..e81b8c5 100644
struct ttm_buffer_object *,
struct ttm_mem_reg *, struct ttm_mem_reg *);
diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
-index c1a7e5a..38b8539 100644
+index 462679a..88e32a7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
@@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
@@ -41532,10 +40751,10 @@ index c1a7e5a..38b8539 100644
if (nr < DRM_COMMAND_BASE)
diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
-index d45d50d..72a5dd2 100644
+index 3d1cfcb..0542700 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
-@@ -130,11 +130,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
+@@ -127,11 +127,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
}
const struct ttm_mem_type_manager_func nouveau_vram_manager = {
@@ -41552,7 +40771,7 @@ index d45d50d..72a5dd2 100644
};
static int
-@@ -199,11 +199,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
+@@ -195,11 +195,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
}
const struct ttm_mem_type_manager_func nouveau_gart_manager = {
@@ -41568,8 +40787,8 @@ index d45d50d..72a5dd2 100644
+ .debug = nouveau_gart_manager_debug
};
- #include <core/subdev/vm/nv04.h>
-@@ -271,11 +271,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
+ /*XXX*/
+@@ -268,11 +268,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
}
const struct ttm_mem_type_manager_func nv04_gart_manager = {
@@ -41587,20 +40806,20 @@ index d45d50d..72a5dd2 100644
int
diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
-index a92fb01..35e0602 100644
+index c7592ec..dd45ebc 100644
--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
-@@ -67,7 +67,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
- bool can_switch;
-
- spin_lock(&dev->count_lock);
-- can_switch = (dev->open_count == 0);
-+ can_switch = (local_read(&dev->open_count) == 0);
- spin_unlock(&dev->count_lock);
- return can_switch;
+@@ -72,7 +72,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
+ * locking inversion with the driver load path. And the access here is
+ * completely racy anyway. So don't bother with locking for now.
+ */
+- return dev->open_count == 0;
++ return local_read(&dev->open_count) == 0;
}
+
+ static const struct vga_switcheroo_client_ops
diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
-index eb89653..613cf71 100644
+index 9782364..89bd954 100644
--- a/drivers/gpu/drm/qxl/qxl_cmd.c
+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
@@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
@@ -41638,7 +40857,7 @@ index eb89653..613cf71 100644
if (ret > 0)
ret = 0;
diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
-index c3c2bbd..bc3c0fb 100644
+index 6911b8c..89d6867 100644
--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
@@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
@@ -41657,7 +40876,7 @@ index c3c2bbd..bc3c0fb 100644
return 0;
}
diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
-index 36ed40b..0397633 100644
+index 7c6cafe..460f542 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.h
+++ b/drivers/gpu/drm/qxl/qxl_drv.h
@@ -290,10 +290,10 @@ struct qxl_device {
@@ -41676,7 +40895,7 @@ index 36ed40b..0397633 100644
wait_queue_head_t display_event;
wait_queue_head_t cursor_event;
diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
-index 0bb86e6..d41416d 100644
+index b110883..dd06418 100644
--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
@@ -181,7 +181,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
@@ -41712,7 +40931,7 @@ index 0bb86e6..d41416d 100644
return -EFAULT;
diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
-index 3485bdc..20d26e3 100644
+index 0bf1e20..42a7310 100644
--- a/drivers/gpu/drm/qxl/qxl_irq.c
+++ b/drivers/gpu/drm/qxl/qxl_irq.c
@@ -36,19 +36,19 @@ irqreturn_t qxl_irq_handler(int irq, void *arg)
@@ -41752,10 +40971,10 @@ index 3485bdc..20d26e3 100644
+ atomic_set_unchecked(&qdev->irq_received_cursor, 0);
+ atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
qdev->irq_received_error = 0;
- ret = drm_irq_install(qdev->ddev);
+ ret = drm_irq_install(qdev->ddev, qdev->ddev->pdev->irq);
qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
-index c82c1d6a9..6158c02 100644
+index 0cbc4c9..0e46686 100644
--- a/drivers/gpu/drm/qxl/qxl_ttm.c
+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
@@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
@@ -41767,7 +40986,7 @@ index c82c1d6a9..6158c02 100644
static const struct vm_operations_struct *ttm_vm_ops;
static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-@@ -147,8 +147,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
+@@ -145,8 +145,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
return r;
if (unlikely(ttm_vm_ops == NULL)) {
ttm_vm_ops = vma->vm_ops;
@@ -41778,7 +40997,7 @@ index c82c1d6a9..6158c02 100644
}
vma->vm_ops = &qxl_ttm_vm_ops;
return 0;
-@@ -561,25 +563,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
+@@ -464,25 +466,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
{
#if defined(CONFIG_DEBUG_FS)
@@ -41820,7 +41039,7 @@ index c82c1d6a9..6158c02 100644
return 0;
#endif
diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
-index 59459fe..be26b31 100644
+index 2c45ac9..5d740f8 100644
--- a/drivers/gpu/drm/r128/r128_cce.c
+++ b/drivers/gpu/drm/r128/r128_cce.c
@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
@@ -41833,10 +41052,10 @@ index 59459fe..be26b31 100644
/* We don't support anything other than bus-mastering ring mode,
* but the ring can be in either AGP or PCI space for the ring
diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
-index 5bf3f5f..7000661 100644
+index 723e5d6..102dbaf 100644
--- a/drivers/gpu/drm/r128/r128_drv.h
+++ b/drivers/gpu/drm/r128/r128_drv.h
-@@ -90,14 +90,14 @@ typedef struct drm_r128_private {
+@@ -93,14 +93,14 @@ typedef struct drm_r128_private {
int is_pci;
unsigned long cce_buffers_offset;
@@ -41854,7 +41073,7 @@ index 5bf3f5f..7000661 100644
u32 color_fmt;
unsigned int front_offset;
diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
-index b0d0fd3..a6fbbe4 100644
+index 663f38c..c689495 100644
--- a/drivers/gpu/drm/r128/r128_ioc32.c
+++ b/drivers/gpu/drm/r128/r128_ioc32.c
@@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
@@ -41876,11 +41095,11 @@ index b0d0fd3..a6fbbe4 100644
if (nr < DRM_COMMAND_BASE)
return drm_compat_ioctl(filp, cmd, arg);
-- if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(r128_compat_ioctls))
+- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls))
- fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
-
- if (fn != NULL)
-+ if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(r128_compat_ioctls)) {
++ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls)) {
+ drm_ioctl_compat_t fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
ret = (*fn) (filp, cmd, arg);
- else
@@ -41911,7 +41130,7 @@ index c2ae496..30b5993 100644
return IRQ_HANDLED;
}
diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
-index e806dac..f81d32f 100644
+index 575e986..66e62ca 100644
--- a/drivers/gpu/drm/r128/r128_state.c
+++ b/drivers/gpu/drm/r128/r128_state.c
@@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
@@ -41949,23 +41168,23 @@ index 4a85bb6..aaea819 100644
if (regcomp
(&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
-index e39026c..b32e98e 100644
+index bdf263a..0305446 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
-@@ -1128,7 +1128,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
- bool can_switch;
-
- spin_lock(&dev->count_lock);
-- can_switch = (dev->open_count == 0);
-+ can_switch = (local_read(&dev->open_count) == 0);
- spin_unlock(&dev->count_lock);
- return can_switch;
+@@ -1216,7 +1216,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
+ * locking inversion with the driver load path. And the access here is
+ * completely racy anyway. So don't bother with locking for now.
+ */
+- return dev->open_count == 0;
++ return local_read(&dev->open_count) == 0;
}
+
+ static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = {
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
-index dafd812..1bf20c7 100644
+index 46bd393..6ae4719 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.h
+++ b/drivers/gpu/drm/radeon/radeon_drv.h
-@@ -262,7 +262,7 @@ typedef struct drm_radeon_private {
+@@ -264,7 +264,7 @@ typedef struct drm_radeon_private {
/* SW interrupt */
wait_queue_head_t swi_queue;
@@ -41975,7 +41194,7 @@ index dafd812..1bf20c7 100644
uint32_t irq_enable_reg;
uint32_t r500_disp_irq_reg;
diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
-index bdb0f93..5ff558f 100644
+index 0b98ea1..0881827 100644
--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
@@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
@@ -42006,11 +41225,11 @@ index bdb0f93..5ff558f 100644
if (nr < DRM_COMMAND_BASE)
return drm_compat_ioctl(filp, cmd, arg);
-- if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(radeon_compat_ioctls))
+- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls))
- fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
-
- if (fn != NULL)
-+ if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(radeon_compat_ioctls)) {
++ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls)) {
+ drm_ioctl_compat_t fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
ret = (*fn) (filp, cmd, arg);
- else
@@ -42043,7 +41262,7 @@ index 244b19b..c19226d 100644
dev->max_vblank_count = 0x001fffff;
diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
-index 956ab7f..fbd36d8 100644
+index 535403e..5dd655b 100644
--- a/drivers/gpu/drm/radeon/radeon_state.c
+++ b/drivers/gpu/drm/radeon/radeon_state.c
@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
@@ -42065,10 +41284,10 @@ index 956ab7f..fbd36d8 100644
DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
-index 45a9a03..3cadf87 100644
+index d2510cf..63bd4ed 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
-@@ -790,7 +790,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
+@@ -936,7 +936,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
man->size = size >> PAGE_SHIFT;
}
@@ -42077,7 +41296,7 @@ index 45a9a03..3cadf87 100644
static const struct vm_operations_struct *ttm_vm_ops = NULL;
static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-@@ -831,8 +831,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
+@@ -977,8 +977,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
}
if (unlikely(ttm_vm_ops == NULL)) {
ttm_vm_ops = vma->vm_ops;
@@ -42089,10 +41308,10 @@ index 45a9a03..3cadf87 100644
vma->vm_ops = &radeon_ttm_vm_ops;
return 0;
diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
-index 9336006..ce78aa7 100644
+index 054a79f..30d9ac4 100644
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
-@@ -1057,7 +1057,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
+@@ -1242,7 +1242,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
}
for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
@@ -42102,10 +41321,10 @@ index 9336006..ce78aa7 100644
err = drm_debugfs_create_files(dc->debugfs_files,
ARRAY_SIZE(debugfs_files),
diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
-index d452faab..f8cbc6a 100644
+index f787445..2df2c65 100644
--- a/drivers/gpu/drm/tegra/dsi.c
+++ b/drivers/gpu/drm/tegra/dsi.c
-@@ -53,7 +53,7 @@ struct tegra_dsi {
+@@ -41,7 +41,7 @@ struct tegra_dsi {
struct clk *clk_lp;
struct clk *clk;
@@ -42115,10 +41334,10 @@ index d452faab..f8cbc6a 100644
struct dentry *debugfs;
diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
-index 6928015..c9853e7 100644
+index ffe2654..03c7b1c 100644
--- a/drivers/gpu/drm/tegra/hdmi.c
+++ b/drivers/gpu/drm/tegra/hdmi.c
-@@ -59,7 +59,7 @@ struct tegra_hdmi {
+@@ -60,7 +60,7 @@ struct tegra_hdmi {
bool stereo;
bool dvi;
@@ -42128,10 +41347,10 @@ index 6928015..c9853e7 100644
struct dentry *debugfs;
};
diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
-index c58eba33..83c2728 100644
+index 964387f..4eafc00 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
-@@ -141,10 +141,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
+@@ -146,10 +146,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
}
const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
@@ -42148,7 +41367,7 @@ index c58eba33..83c2728 100644
};
EXPORT_SYMBOL(ttm_bo_manager_func);
diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
-index dbc2def..0a9f710 100644
+index a1803fb..c53f6b0 100644
--- a/drivers/gpu/drm/ttm/ttm_memory.c
+++ b/drivers/gpu/drm/ttm/ttm_memory.c
@@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
@@ -42160,7 +41379,7 @@ index dbc2def..0a9f710 100644
if (unlikely(ret != 0)) {
kobject_put(&zone->kobj);
return ret;
-@@ -347,7 +347,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
+@@ -348,7 +348,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
zone->glob = glob;
glob->zone_dma32 = zone;
ret = kobject_init_and_add(
@@ -42170,7 +41389,7 @@ index dbc2def..0a9f710 100644
kobject_put(&zone->kobj);
return ret;
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
-index 76329d2..9c422dd 100644
+index 025c429..314062f 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -54,7 +54,7 @@
@@ -42247,7 +41466,7 @@ index 76329d2..9c422dd 100644
/* set zero flag for page allocation if required */
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
-index 3dfa97d..44bfcb7 100644
+index 01e1d27..aaa018a 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
@@ -56,7 +56,7 @@
@@ -42288,7 +41507,7 @@ index 3dfa97d..44bfcb7 100644
}
spin_unlock_irqrestore(&pool->lock, irq_flags);
-@@ -935,7 +935,7 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)
+@@ -936,7 +936,7 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)
struct dma_page *d_page, *next;
enum pool_type type;
bool is_cached = false;
@@ -42297,7 +41516,7 @@ index 3dfa97d..44bfcb7 100644
unsigned long irq_flags;
type = ttm_to_type(ttm->page_flags, ttm->caching_state);
-@@ -1010,7 +1010,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
+@@ -1012,7 +1012,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
static unsigned start_pool;
unsigned idx = 0;
unsigned pool_offset;
@@ -42306,7 +41525,7 @@ index 3dfa97d..44bfcb7 100644
struct device_pools *p;
unsigned long freed = 0;
-@@ -1023,7 +1023,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
+@@ -1025,7 +1025,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
goto out;
pool_offset = ++start_pool % _manager->npools;
list_for_each_entry(p, &_manager->pools, pools) {
@@ -42315,7 +41534,7 @@ index 3dfa97d..44bfcb7 100644
if (!p->dev)
continue;
-@@ -1037,7 +1037,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
+@@ -1039,7 +1039,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
shrink_pages = ttm_dma_page_pool_free(p->pool, nr_free, true);
freed += nr_free - shrink_pages;
@@ -42325,7 +41544,7 @@ index 3dfa97d..44bfcb7 100644
nr_free, shrink_pages);
}
diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
-index dbadd49..1b7457b 100644
+index 8cbcb45..a4d9cf7 100644
--- a/drivers/gpu/drm/udl/udl_fb.c
+++ b/drivers/gpu/drm/udl/udl_fb.c
@@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
@@ -42337,10 +41556,10 @@ index dbadd49..1b7457b 100644
pr_warn("released /dev/fb%d user=%d count=%d\n",
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
-index ad02732..144f5ed 100644
+index ef8c500..01030c8 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
-@@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
+@@ -53,7 +53,7 @@ typedef struct drm_via_ring_buffer {
typedef uint32_t maskarray_t[5];
typedef struct drm_via_irq {
@@ -42349,7 +41568,7 @@ index ad02732..144f5ed 100644
uint32_t pending_mask;
uint32_t enable_mask;
wait_queue_head_t irq_queue;
-@@ -75,7 +75,7 @@ typedef struct drm_via_private {
+@@ -77,7 +77,7 @@ typedef struct drm_via_private {
struct timeval last_vblank;
int last_vblank_valid;
unsigned usec_per_vblank;
@@ -42433,10 +41652,10 @@ index 1319433..a993b0c 100644
case VIA_IRQ_ABSOLUTE:
break;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
-index 0783155..b29e18e 100644
+index d26a6da..5fa41ed 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
-@@ -437,7 +437,7 @@ struct vmw_private {
+@@ -447,7 +447,7 @@ struct vmw_private {
* Fencing and IRQs.
*/
@@ -42444,12 +41663,12 @@ index 0783155..b29e18e 100644
+ atomic_unchecked_t marker_seq;
wait_queue_head_t fence_queue;
wait_queue_head_t fifo_queue;
- int fence_queue_waiters; /* Protected by hw_mutex */
+ spinlock_t waiter_lock;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
-index 6eae14d..aa311b3 100644
+index 39f2b03..d1b0a64 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
-@@ -154,7 +154,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
+@@ -152,7 +152,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
(unsigned int) min,
(unsigned int) fifo->capabilities);
@@ -42458,7 +41677,7 @@ index 6eae14d..aa311b3 100644
iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
vmw_marker_queue_init(&fifo->marker_queue);
return vmw_fifo_send_fence(dev_priv, &dummy);
-@@ -373,7 +373,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
+@@ -372,7 +372,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
if (reserveable)
iowrite32(bytes, fifo_mem +
SVGA_FIFO_RESERVED);
@@ -42467,7 +41686,7 @@ index 6eae14d..aa311b3 100644
} else {
need_bounce = true;
}
-@@ -493,7 +493,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
+@@ -492,7 +492,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
fm = vmw_fifo_reserve(dev_priv, bytes);
if (unlikely(fm == NULL)) {
@@ -42476,7 +41695,7 @@ index 6eae14d..aa311b3 100644
ret = -ENOMEM;
(void)vmw_fallback_wait(dev_priv, false, true, *seqno,
false, 3*HZ);
-@@ -501,7 +501,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
+@@ -500,7 +500,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
}
do {
@@ -42486,7 +41705,7 @@ index 6eae14d..aa311b3 100644
if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
-index b1273e8..9c274fd 100644
+index 170b61b..fec7348 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
@@ -164,9 +164,9 @@ static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
@@ -42505,10 +41724,10 @@ index b1273e8..9c274fd 100644
+ .debug = vmw_gmrid_man_debug
};
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
-index 47b7094..698ba09 100644
+index 69c8ce2..cacb0ab 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
-@@ -236,7 +236,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
+@@ -235,7 +235,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
int ret;
num_clips = arg->num_clips;
@@ -42517,7 +41736,7 @@ index 47b7094..698ba09 100644
if (unlikely(num_clips == 0))
return 0;
-@@ -320,7 +320,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
+@@ -318,7 +318,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
int ret;
num_clips = arg->num_clips;
@@ -42527,10 +41746,10 @@ index 47b7094..698ba09 100644
if (unlikely(num_clips == 0))
return 0;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
-index 0c42376..6febe77 100644
+index 9fe9827..0aa2fc0 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
-@@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
+@@ -102,7 +102,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
* emitted. Then the fence is stale and signaled.
*/
@@ -42539,7 +41758,7 @@ index 0c42376..6febe77 100644
> VMW_FENCE_WRAP);
return ret;
-@@ -138,7 +138,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
+@@ -133,7 +133,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
if (fifo_idle)
down_read(&fifo_state->rwsem);
@@ -42549,10 +41768,10 @@ index 0c42376..6febe77 100644
for (;;) {
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
-index 8a8725c2..afed796 100644
+index efd1ffd..0ae13ca 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
-@@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
+@@ -135,7 +135,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
while (!vmw_lag_lt(queue, us)) {
spin_lock(&queue->lock);
if (list_empty(&queue->head))
@@ -42584,10 +41803,10 @@ index 37ac7b5..d52a5c9 100644
/* copy over all the bus versions */
if (dev->bus && dev->bus->pm) {
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
-index d92c7d9..ba3e5c0 100644
+index dfaccfc..bfea740 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
-@@ -2433,7 +2433,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
+@@ -2507,7 +2507,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
int hid_add_device(struct hid_device *hdev)
{
@@ -42596,7 +41815,7 @@ index d92c7d9..ba3e5c0 100644
int ret;
if (WARN_ON(hdev->status & HID_STAT_ADDED))
-@@ -2467,7 +2467,7 @@ int hid_add_device(struct hid_device *hdev)
+@@ -2549,7 +2549,7 @@ int hid_add_device(struct hid_device *hdev)
/* XXX hack, any other cleaner solution after the driver core
* is converted to allow more than 20 bytes as the device name? */
dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
@@ -42605,6 +41824,321 @@ index d92c7d9..ba3e5c0 100644
hid_debug_register(hdev, dev_name(&hdev->dev));
ret = device_add(&hdev->dev);
+diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
+index 71f5692..147d3da 100644
+--- a/drivers/hid/hid-logitech-dj.c
++++ b/drivers/hid/hid-logitech-dj.c
+@@ -658,6 +658,12 @@ static int logi_dj_raw_event(struct hid_device *hdev,
+ * device (via hid_input_report() ) and return 1 so hid-core does not do
+ * anything else with it.
+ */
++ if ((dj_report->device_index < DJ_DEVICE_INDEX_MIN) ||
++ (dj_report->device_index > DJ_DEVICE_INDEX_MAX)) {
++ dev_err(&hdev->dev, "%s: invalid device index:%d\n",
++ __func__, dj_report->device_index);
++ return false;
++ }
+
+ /* case 1) */
+ if (data[0] != REPORT_ID_DJ_SHORT)
+diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
+index bc4269e..b6e6102 100644
+--- a/drivers/hid/hid-sony.c
++++ b/drivers/hid/hid-sony.c
+@@ -798,6 +798,12 @@ union sixaxis_output_report_01 {
+ __u8 buf[36];
+ };
+
++#define DS4_REPORT_0x02_SIZE 37
++#define DS4_REPORT_0x05_SIZE 32
++#define DS4_REPORT_0x11_SIZE 78
++#define DS4_REPORT_0x81_SIZE 7
++#define SIXAXIS_REPORT_0xF2_SIZE 18
++
+ static spinlock_t sony_dev_list_lock;
+ static LIST_HEAD(sony_device_list);
+ static DEFINE_IDA(sony_device_id_allocator);
+@@ -811,6 +817,7 @@ struct sony_sc {
+ struct work_struct state_worker;
+ struct power_supply battery;
+ int device_id;
++ __u8 *output_report_dmabuf;
+
+ #ifdef CONFIG_SONY_FF
+ __u8 left;
+@@ -1142,9 +1149,20 @@ static int sixaxis_set_operational_usb(struct hid_device *hdev)
+
+ static int sixaxis_set_operational_bt(struct hid_device *hdev)
+ {
+- unsigned char buf[] = { 0xf4, 0x42, 0x03, 0x00, 0x00 };
+- return hid_hw_raw_request(hdev, buf[0], buf, sizeof(buf),
++ static const __u8 report[] = { 0xf4, 0x42, 0x03, 0x00, 0x00 };
++ __u8 *buf;
++ int ret;
++
++ buf = kmemdup(report, sizeof(report), GFP_KERNEL);
++ if (!buf)
++ return -ENOMEM;
++
++ ret = hid_hw_raw_request(hdev, buf[0], buf, sizeof(report),
+ HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
++
++ kfree(buf);
++
++ return ret;
+ }
+
+ /*
+@@ -1153,10 +1171,19 @@ static int sixaxis_set_operational_bt(struct hid_device *hdev)
+ */
+ static int dualshock4_set_operational_bt(struct hid_device *hdev)
+ {
+- __u8 buf[37] = { 0 };
++ __u8 *buf;
++ int ret;
+
+- return hid_hw_raw_request(hdev, 0x02, buf, sizeof(buf),
++ buf = kmalloc(DS4_REPORT_0x02_SIZE, GFP_KERNEL);
++ if (!buf)
++ return -ENOMEM;
++
++ ret = hid_hw_raw_request(hdev, 0x02, buf, DS4_REPORT_0x02_SIZE,
+ HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
++
++ kfree(buf);
++
++ return ret;
+ }
+
+ static void sixaxis_set_leds_from_id(int id, __u8 values[MAX_LEDS])
+@@ -1471,9 +1498,7 @@ error_leds:
+
+ static void sixaxis_state_worker(struct work_struct *work)
+ {
+- struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
+- int n;
+- union sixaxis_output_report_01 report = {
++ static const union sixaxis_output_report_01 default_report = {
+ .buf = {
+ 0x01,
+ 0x00, 0xff, 0x00, 0xff, 0x00,
+@@ -1485,20 +1510,27 @@ static void sixaxis_state_worker(struct work_struct *work)
+ 0x00, 0x00, 0x00, 0x00, 0x00
+ }
+ };
++ struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
++ struct sixaxis_output_report *report =
++ (struct sixaxis_output_report *)sc->output_report_dmabuf;
++ int n;
++
++ /* Initialize the report with default values */
++ memcpy(report, &default_report, sizeof(struct sixaxis_output_report));
+
+ #ifdef CONFIG_SONY_FF
+- report.data.rumble.right_motor_on = sc->right ? 1 : 0;
+- report.data.rumble.left_motor_force = sc->left;
++ report->rumble.right_motor_on = sc->right ? 1 : 0;
++ report->rumble.left_motor_force = sc->left;
+ #endif
+
+- report.data.leds_bitmap |= sc->led_state[0] << 1;
+- report.data.leds_bitmap |= sc->led_state[1] << 2;
+- report.data.leds_bitmap |= sc->led_state[2] << 3;
+- report.data.leds_bitmap |= sc->led_state[3] << 4;
++ report->leds_bitmap |= sc->led_state[0] << 1;
++ report->leds_bitmap |= sc->led_state[1] << 2;
++ report->leds_bitmap |= sc->led_state[2] << 3;
++ report->leds_bitmap |= sc->led_state[3] << 4;
+
+ /* Set flag for all leds off, required for 3rd party INTEC controller */
+- if ((report.data.leds_bitmap & 0x1E) == 0)
+- report.data.leds_bitmap |= 0x20;
++ if ((report->leds_bitmap & 0x1E) == 0)
++ report->leds_bitmap |= 0x20;
+
+ /*
+ * The LEDs in the report are indexed in reverse order to their
+@@ -1511,28 +1543,30 @@ static void sixaxis_state_worker(struct work_struct *work)
+ */
+ for (n = 0; n < 4; n++) {
+ if (sc->led_delay_on[n] || sc->led_delay_off[n]) {
+- report.data.led[3 - n].duty_off = sc->led_delay_off[n];
+- report.data.led[3 - n].duty_on = sc->led_delay_on[n];
++ report->led[3 - n].duty_off = sc->led_delay_off[n];
++ report->led[3 - n].duty_on = sc->led_delay_on[n];
+ }
+ }
+
+- hid_hw_raw_request(sc->hdev, report.data.report_id, report.buf,
+- sizeof(report), HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
++ hid_hw_raw_request(sc->hdev, report->report_id, (__u8 *)report,
++ sizeof(struct sixaxis_output_report),
++ HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
+ }
+
+ static void dualshock4_state_worker(struct work_struct *work)
+ {
+ struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
+ struct hid_device *hdev = sc->hdev;
++ __u8 *buf = sc->output_report_dmabuf;
+ int offset;
+
+- __u8 buf[78] = { 0 };
+-
+ if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) {
++ memset(buf, 0, DS4_REPORT_0x05_SIZE);
+ buf[0] = 0x05;
+ buf[1] = 0xFF;
+ offset = 4;
+ } else {
++ memset(buf, 0, DS4_REPORT_0x11_SIZE);
+ buf[0] = 0x11;
+ buf[1] = 0xB0;
+ buf[3] = 0x0F;
+@@ -1560,12 +1594,33 @@ static void dualshock4_state_worker(struct work_struct *work)
+ buf[offset++] = sc->led_delay_off[3];
+
+ if (sc->quirks & DUALSHOCK4_CONTROLLER_USB)
+- hid_hw_output_report(hdev, buf, 32);
++ hid_hw_output_report(hdev, buf, DS4_REPORT_0x05_SIZE);
+ else
+- hid_hw_raw_request(hdev, 0x11, buf, 78,
++ hid_hw_raw_request(hdev, 0x11, buf, DS4_REPORT_0x11_SIZE,
+ HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
+ }
+
++static int sony_allocate_output_report(struct sony_sc *sc)
++{
++ if (sc->quirks & SIXAXIS_CONTROLLER)
++ sc->output_report_dmabuf =
++ kmalloc(sizeof(union sixaxis_output_report_01),
++ GFP_KERNEL);
++ else if (sc->quirks & DUALSHOCK4_CONTROLLER_BT)
++ sc->output_report_dmabuf = kmalloc(DS4_REPORT_0x11_SIZE,
++ GFP_KERNEL);
++ else if (sc->quirks & DUALSHOCK4_CONTROLLER_USB)
++ sc->output_report_dmabuf = kmalloc(DS4_REPORT_0x05_SIZE,
++ GFP_KERNEL);
++ else
++ return 0;
++
++ if (!sc->output_report_dmabuf)
++ return -ENOMEM;
++
++ return 0;
++}
++
+ #ifdef CONFIG_SONY_FF
+ static int sony_play_effect(struct input_dev *dev, void *data,
+ struct ff_effect *effect)
+@@ -1754,6 +1809,7 @@ static int sony_get_bt_devaddr(struct sony_sc *sc)
+
+ static int sony_check_add(struct sony_sc *sc)
+ {
++ __u8 *buf = NULL;
+ int n, ret;
+
+ if ((sc->quirks & DUALSHOCK4_CONTROLLER_BT) ||
+@@ -1769,36 +1825,44 @@ static int sony_check_add(struct sony_sc *sc)
+ return 0;
+ }
+ } else if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) {
+- __u8 buf[7];
++ buf = kmalloc(DS4_REPORT_0x81_SIZE, GFP_KERNEL);
++ if (!buf)
++ return -ENOMEM;
+
+ /*
+ * The MAC address of a DS4 controller connected via USB can be
+ * retrieved with feature report 0x81. The address begins at
+ * offset 1.
+ */
+- ret = hid_hw_raw_request(sc->hdev, 0x81, buf, sizeof(buf),
+- HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
++ ret = hid_hw_raw_request(sc->hdev, 0x81, buf,
++ DS4_REPORT_0x81_SIZE, HID_FEATURE_REPORT,
++ HID_REQ_GET_REPORT);
+
+- if (ret != 7) {
++ if (ret != DS4_REPORT_0x81_SIZE) {
+ hid_err(sc->hdev, "failed to retrieve feature report 0x81 with the DualShock 4 MAC address\n");
+- return ret < 0 ? ret : -EINVAL;
++ ret = ret < 0 ? ret : -EINVAL;
++ goto out_free;
+ }
+
+ memcpy(sc->mac_address, &buf[1], sizeof(sc->mac_address));
+ } else if (sc->quirks & SIXAXIS_CONTROLLER_USB) {
+- __u8 buf[18];
++ buf = kmalloc(SIXAXIS_REPORT_0xF2_SIZE, GFP_KERNEL);
++ if (!buf)
++ return -ENOMEM;
+
+ /*
+ * The MAC address of a Sixaxis controller connected via USB can
+ * be retrieved with feature report 0xf2. The address begins at
+ * offset 4.
+ */
+- ret = hid_hw_raw_request(sc->hdev, 0xf2, buf, sizeof(buf),
+- HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
++ ret = hid_hw_raw_request(sc->hdev, 0xf2, buf,
++ SIXAXIS_REPORT_0xF2_SIZE, HID_FEATURE_REPORT,
++ HID_REQ_GET_REPORT);
+
+- if (ret != 18) {
++ if (ret != SIXAXIS_REPORT_0xF2_SIZE) {
+ hid_err(sc->hdev, "failed to retrieve feature report 0xf2 with the Sixaxis MAC address\n");
+- return ret < 0 ? ret : -EINVAL;
++ ret = ret < 0 ? ret : -EINVAL;
++ goto out_free;
+ }
+
+ /*
+@@ -1811,7 +1875,13 @@ static int sony_check_add(struct sony_sc *sc)
+ return 0;
+ }
+
+- return sony_check_add_dev_list(sc);
++ ret = sony_check_add_dev_list(sc);
++
++out_free:
++
++ kfree(buf);
++
++ return ret;
+ }
+
+ static int sony_set_device_id(struct sony_sc *sc)
+@@ -1895,6 +1965,12 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
+ return ret;
+ }
+
++ ret = sony_allocate_output_report(sc);
++ if (ret < 0) {
++ hid_err(hdev, "failed to allocate the output report buffer\n");
++ goto err_stop;
++ }
++
+ ret = sony_set_device_id(sc);
+ if (ret < 0) {
+ hid_err(hdev, "failed to allocate the device id\n");
+@@ -1984,6 +2060,7 @@ err_stop:
+ if (sc->quirks & SONY_BATTERY_SUPPORT)
+ sony_battery_remove(sc);
+ sony_cancel_work_sync(sc);
++ kfree(sc->output_report_dmabuf);
+ sony_remove_dev_list(sc);
+ sony_release_device_id(sc);
+ hid_hw_stop(hdev);
+@@ -2004,6 +2081,8 @@ static void sony_remove(struct hid_device *hdev)
+
+ sony_cancel_work_sync(sc);
+
++ kfree(sc->output_report_dmabuf);
++
+ sony_remove_dev_list(sc);
+
+ sony_release_device_id(sc);
diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
index c13fb5b..55a3802 100644
--- a/drivers/hid/hid-wiimote-debug.c
@@ -42618,42 +42152,11 @@ index c13fb5b..55a3802 100644
return -EFAULT;
*off += size;
-diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
-index cedc6da..2c3da2a 100644
---- a/drivers/hid/uhid.c
-+++ b/drivers/hid/uhid.c
-@@ -47,7 +47,7 @@ struct uhid_device {
- struct mutex report_lock;
- wait_queue_head_t report_wait;
- atomic_t report_done;
-- atomic_t report_id;
-+ atomic_unchecked_t report_id;
- struct uhid_event report_buf;
- };
-
-@@ -163,7 +163,7 @@ static int uhid_hid_get_raw(struct hid_device *hid, unsigned char rnum,
-
- spin_lock_irqsave(&uhid->qlock, flags);
- ev->type = UHID_FEATURE;
-- ev->u.feature.id = atomic_inc_return(&uhid->report_id);
-+ ev->u.feature.id = atomic_inc_return_unchecked(&uhid->report_id);
- ev->u.feature.rnum = rnum;
- ev->u.feature.rtype = report_type;
-
-@@ -446,7 +446,7 @@ static int uhid_dev_feature_answer(struct uhid_device *uhid,
- spin_lock_irqsave(&uhid->qlock, flags);
-
- /* id for old report; drop it silently */
-- if (atomic_read(&uhid->report_id) != ev->u.feature_answer.id)
-+ if (atomic_read_unchecked(&uhid->report_id) != ev->u.feature_answer.id)
- goto unlock;
- if (atomic_read(&uhid->report_done))
- goto unlock;
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
-index e99e71a..e4ae549 100644
+index 433f72a..2926005 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
-@@ -365,8 +365,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
+@@ -366,8 +366,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
unsigned long flags;
int ret = 0;
@@ -42665,7 +42168,7 @@ index e99e71a..e4ae549 100644
ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
if (ret)
diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
-index bcb4950..61dba6c 100644
+index 3e4235c..877d0e5 100644
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -112,7 +112,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
@@ -42677,7 +42180,7 @@ index bcb4950..61dba6c 100644
__asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
"=a"(hv_status_lo) : "d" (control_hi),
-@@ -154,7 +154,7 @@ int hv_init(void)
+@@ -156,7 +156,7 @@ int hv_init(void)
/* See if the hypercall page is already set */
rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
@@ -42687,7 +42190,7 @@ index bcb4950..61dba6c 100644
if (!virtaddr)
goto cleanup;
diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
-index 393fd8a..079e13f 100644
+index 5e90c5d..d8fcefb 100644
--- a/drivers/hv/hv_balloon.c
+++ b/drivers/hv/hv_balloon.c
@@ -470,7 +470,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
@@ -42744,7 +42247,7 @@ index 393fd8a..079e13f 100644
resp.hdr.size = sizeof(struct dm_unballoon_response);
vmbus_sendpacket(dm_device.dev->channel, &resp,
-@@ -1238,7 +1238,7 @@ static void version_resp(struct hv_dynmem_device *dm,
+@@ -1239,7 +1239,7 @@ static void version_resp(struct hv_dynmem_device *dm,
memset(&version_req, 0, sizeof(struct dm_version_request));
version_req.hdr.type = DM_VERSION_REQUEST;
version_req.hdr.size = sizeof(struct dm_version_request);
@@ -42753,7 +42256,7 @@ index 393fd8a..079e13f 100644
version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
version_req.is_last_attempt = 1;
-@@ -1408,7 +1408,7 @@ static int balloon_probe(struct hv_device *dev,
+@@ -1409,7 +1409,7 @@ static int balloon_probe(struct hv_device *dev,
memset(&version_req, 0, sizeof(struct dm_version_request));
version_req.hdr.type = DM_VERSION_REQUEST;
version_req.hdr.size = sizeof(struct dm_version_request);
@@ -42762,7 +42265,7 @@ index 393fd8a..079e13f 100644
version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
version_req.is_last_attempt = 0;
-@@ -1439,7 +1439,7 @@ static int balloon_probe(struct hv_device *dev,
+@@ -1440,7 +1440,7 @@ static int balloon_probe(struct hv_device *dev,
memset(&cap_msg, 0, sizeof(struct dm_capabilities));
cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
cap_msg.hdr.size = sizeof(struct dm_capabilities);
@@ -42772,10 +42275,10 @@ index 393fd8a..079e13f 100644
cap_msg.caps.cap_bits.balloon = 1;
cap_msg.caps.cap_bits.hot_add = 1;
diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
-index e055176..c22ff1f 100644
+index c386d8d..d6004c4 100644
--- a/drivers/hv/hyperv_vmbus.h
+++ b/drivers/hv/hyperv_vmbus.h
-@@ -602,7 +602,7 @@ enum vmbus_connect_state {
+@@ -611,7 +611,7 @@ enum vmbus_connect_state {
struct vmbus_connection {
enum vmbus_connect_state conn_state;
@@ -42785,10 +42288,10 @@ index e055176..c22ff1f 100644
/*
* Represents channel interrupts. Each bit position represents a
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
-index 077bb1b..d433d74 100644
+index 4d6b269..2e23b86 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
-@@ -844,10 +844,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
+@@ -807,10 +807,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
{
int ret = 0;
@@ -42837,7 +42340,7 @@ index 3288f13..71cfb4e 100644
for (grp = groups; grp->format; grp++) {
diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
-index ae208f6..48b6c5b 100644
+index cccef87..06ce8ec 100644
--- a/drivers/hwmon/asus_atk0110.c
+++ b/drivers/hwmon/asus_atk0110.c
@@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
@@ -42865,10 +42368,10 @@ index ae208f6..48b6c5b 100644
{
sysfs_attr_init(&attr->attr);
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
-index 1599310..cd9525c 100644
+index d76f0b7..55ae976 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
-@@ -823,7 +823,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
+@@ -784,7 +784,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
return NOTIFY_OK;
}
@@ -42878,10 +42381,10 @@ index 1599310..cd9525c 100644
};
diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
-index 632f1dc..57e6a58 100644
+index 7a8a6fb..015c1fd 100644
--- a/drivers/hwmon/ibmaem.c
+++ b/drivers/hwmon/ibmaem.c
-@@ -926,7 +926,7 @@ static int aem_register_sensors(struct aem_data *data,
+@@ -924,7 +924,7 @@ static int aem_register_sensors(struct aem_data *data,
struct aem_rw_sensor_template *rw)
{
struct device *dev = &data->pdev->dev;
@@ -42891,10 +42394,10 @@ index 632f1dc..57e6a58 100644
/* Set up read-only sensors */
diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
-index 708081b..fe2d4ab 100644
+index 14c82da..09b25d7 100644
--- a/drivers/hwmon/iio_hwmon.c
+++ b/drivers/hwmon/iio_hwmon.c
-@@ -73,7 +73,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
+@@ -61,7 +61,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct iio_hwmon_state *st;
@@ -42903,11 +42406,30 @@ index 708081b..fe2d4ab 100644
int ret, i;
int in_i = 1, temp_i = 1, curr_i = 1;
enum iio_chan_type type;
+diff --git a/drivers/hwmon/nct6683.c b/drivers/hwmon/nct6683.c
+index 7710f46..427a28d 100644
+--- a/drivers/hwmon/nct6683.c
++++ b/drivers/hwmon/nct6683.c
+@@ -397,11 +397,11 @@ static struct attribute_group *
+ nct6683_create_attr_group(struct device *dev, struct sensor_template_group *tg,
+ int repeat)
+ {
+- struct sensor_device_attribute_2 *a2;
+- struct sensor_device_attribute *a;
++ sensor_device_attribute_2_no_const *a2;
++ sensor_device_attribute_no_const *a;
+ struct sensor_device_template **t;
+ struct sensor_device_attr_u *su;
+- struct attribute_group *group;
++ attribute_group_no_const *group;
+ struct attribute **attrs;
+ int i, j, count;
+
diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
-index 38d5a63..cf2c2ea 100644
+index 504cbdd..35d6f25 100644
--- a/drivers/hwmon/nct6775.c
+++ b/drivers/hwmon/nct6775.c
-@@ -944,10 +944,10 @@ static struct attribute_group *
+@@ -943,10 +943,10 @@ static struct attribute_group *
nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
int repeat)
{
@@ -43023,7 +42545,7 @@ index 97cd45a..ac54d8b 100644
}
diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
-index 38944e9..ae9e5ed 100644
+index 8df43c5..b07b91d 100644
--- a/drivers/hwmon/via-cputemp.c
+++ b/drivers/hwmon/via-cputemp.c
@@ -296,7 +296,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
@@ -43036,10 +42558,10 @@ index 38944e9..ae9e5ed 100644
};
diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
-index 41fc683..a39cfea 100644
+index 65e3240..e6c511d 100644
--- a/drivers/i2c/busses/i2c-amd756-s4882.c
+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
-@@ -43,7 +43,7 @@
+@@ -39,7 +39,7 @@
extern struct i2c_adapter amd756_smbus;
static struct i2c_adapter *s4882_adapter;
@@ -43049,7 +42571,7 @@ index 41fc683..a39cfea 100644
/* Wrapper access functions for multiplexed SMBus */
static DEFINE_MUTEX(amd756_lock);
diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
-index 721f7eb..0fd2a09 100644
+index b19a310..d6eece0 100644
--- a/drivers/i2c/busses/i2c-diolan-u2c.c
+++ b/drivers/i2c/busses/i2c-diolan-u2c.c
@@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
@@ -43062,10 +42584,10 @@ index 721f7eb..0fd2a09 100644
int ret = 0;
int actual;
diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
-index b170bdf..3c76427 100644
+index 88eda09..cf40434 100644
--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
-@@ -41,7 +41,7 @@
+@@ -37,7 +37,7 @@
extern struct i2c_adapter *nforce2_smbus;
static struct i2c_adapter *s4985_adapter;
@@ -43075,10 +42597,10 @@ index b170bdf..3c76427 100644
/* Wrapper access functions for multiplexed SMBus */
static DEFINE_MUTEX(nforce2_lock);
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
-index 80b47e8..1a6040d9 100644
+index 71c7a39..71dd3e0 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
-@@ -277,7 +277,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
+@@ -272,7 +272,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
break;
}
@@ -43101,10 +42623,10 @@ index 0b510ba..4fbb5085 100644
}
}
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
-index acc911a..8700c3c 100644
+index af3e76d..96dfe5e 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
-@@ -527,7 +527,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
+@@ -555,7 +555,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
}
static
@@ -43114,7 +42636,7 @@ index acc911a..8700c3c 100644
struct iio_chan_spec const *chan,
ssize_t (*readfunc)(struct device *dev,
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
-index c323917..6ddea8b 100644
+index e28a494..f7c2671 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
@@ -43328,7 +42850,7 @@ index 9f5ad7c..588cd84 100644
}
}
diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
-index 41b1195..27971a0 100644
+index ec7a298..8742e59 100644
--- a/drivers/infiniband/hw/cxgb4/mem.c
+++ b/drivers/infiniband/hw/cxgb4/mem.c
@@ -249,7 +249,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
@@ -43340,7 +42862,7 @@ index 41b1195..27971a0 100644
if (c4iw_fatal_error(rdev))
return -EIO;
-@@ -266,7 +266,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
+@@ -270,7 +270,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
if (rdev->stats.stag.cur > rdev->stats.stag.max)
rdev->stats.stag.max = rdev->stats.stag.cur;
mutex_unlock(&rdev->stats.lock);
@@ -43349,41 +42871,6 @@ index 41b1195..27971a0 100644
}
PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
__func__, stag_state, type, pdid, stag_idx);
-diff --git a/drivers/infiniband/hw/ipath/ipath_dma.c b/drivers/infiniband/hw/ipath/ipath_dma.c
-index 644c2c7..ecf0879 100644
---- a/drivers/infiniband/hw/ipath/ipath_dma.c
-+++ b/drivers/infiniband/hw/ipath/ipath_dma.c
-@@ -176,17 +176,17 @@ static void ipath_dma_free_coherent(struct ib_device *dev, size_t size,
- }
-
- struct ib_dma_mapping_ops ipath_dma_mapping_ops = {
-- ipath_mapping_error,
-- ipath_dma_map_single,
-- ipath_dma_unmap_single,
-- ipath_dma_map_page,
-- ipath_dma_unmap_page,
-- ipath_map_sg,
-- ipath_unmap_sg,
-- ipath_sg_dma_address,
-- ipath_sg_dma_len,
-- ipath_sync_single_for_cpu,
-- ipath_sync_single_for_device,
-- ipath_dma_alloc_coherent,
-- ipath_dma_free_coherent
-+ .mapping_error = ipath_mapping_error,
-+ .map_single = ipath_dma_map_single,
-+ .unmap_single = ipath_dma_unmap_single,
-+ .map_page = ipath_dma_map_page,
-+ .unmap_page = ipath_dma_unmap_page,
-+ .map_sg = ipath_map_sg,
-+ .unmap_sg = ipath_unmap_sg,
-+ .dma_address = ipath_sg_dma_address,
-+ .dma_len = ipath_sg_dma_len,
-+ .sync_single_for_cpu = ipath_sync_single_for_cpu,
-+ .sync_single_for_device = ipath_sync_single_for_device,
-+ .alloc_coherent = ipath_dma_alloc_coherent,
-+ .free_coherent = ipath_dma_free_coherent
- };
diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
index 79b3dbc..96e5fcc 100644
--- a/drivers/infiniband/hw/ipath/ipath_rc.c
@@ -43439,7 +42926,7 @@ index 1f95bba..9530f87 100644
sdata, wqe->wr.wr.atomic.swap);
goto send_comp;
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
-index f2a3f48..673ec79 100644
+index 82a7dd8..8fb6ba6 100644
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -98,7 +98,7 @@ __be64 mlx4_ib_gen_node_guid(void)
@@ -43452,10 +42939,10 @@ index f2a3f48..673ec79 100644
}
diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
-index 25b2cdf..099ff97 100644
+index ed327e6..ca1739e0 100644
--- a/drivers/infiniband/hw/mlx4/mcg.c
+++ b/drivers/infiniband/hw/mlx4/mcg.c
-@@ -1040,7 +1040,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
+@@ -1041,7 +1041,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
{
char name[20];
@@ -43465,10 +42952,10 @@ index 25b2cdf..099ff97 100644
ctx->mcg_wq = create_singlethread_workqueue(name);
if (!ctx->mcg_wq)
diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
-index a230683..3723f2d 100644
+index 6eb743f..a7b0f6d 100644
--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
-@@ -408,7 +408,7 @@ struct mlx4_ib_demux_ctx {
+@@ -426,7 +426,7 @@ struct mlx4_ib_demux_ctx {
struct list_head mcg_mgid0_list;
struct workqueue_struct *mcg_wq;
struct mlx4_ib_demux_pv_ctx **tun;
@@ -43518,7 +43005,7 @@ index 9d3e5c1..6f166df 100644
void *in_mad, void *response_mad)
{
diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
-index 87897b9..7e79542 100644
+index ded76c1..0cf0a08 100644
--- a/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/drivers/infiniband/hw/mthca/mthca_main.c
@@ -692,7 +692,7 @@ err_close:
@@ -43562,7 +43049,7 @@ index ed9a989..6aa5dc2 100644
int list_len, u64 iova, u64 total_size,
u32 access, struct mthca_mr *mr)
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
-index 42dde06..1257310 100644
+index 415f8e1..e34214e 100644
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@@ -764,7 +764,7 @@ unlock:
@@ -43575,10 +43062,10 @@ index 42dde06..1257310 100644
struct mthca_dev *dev = to_mdev(ibcq->device);
struct mthca_cq *cq = to_mcq(ibcq);
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
-index 353c7b0..c6ce921 100644
+index 3b2a6dc..bce26ff 100644
--- a/drivers/infiniband/hw/nes/nes.c
+++ b/drivers/infiniband/hw/nes/nes.c
-@@ -98,7 +98,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
+@@ -97,7 +97,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
LIST_HEAD(nes_adapter_list);
static LIST_HEAD(nes_dev_list);
@@ -43587,7 +43074,7 @@ index 353c7b0..c6ce921 100644
static unsigned int ee_flsh_adapter;
static unsigned int sysfs_nonidx_addr;
-@@ -269,7 +269,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
+@@ -278,7 +278,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
struct nes_adapter *nesadapter = nesdev->nesadapter;
@@ -43597,10 +43084,10 @@ index 353c7b0..c6ce921 100644
/* Free the control structures */
diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
-index 33cc589..3bd6538 100644
+index bd9d132..70d84f4 100644
--- a/drivers/infiniband/hw/nes/nes.h
+++ b/drivers/infiniband/hw/nes/nes.h
-@@ -177,17 +177,17 @@ extern unsigned int nes_debug_level;
+@@ -180,17 +180,17 @@ extern unsigned int nes_debug_level;
extern unsigned int wqm_quanta;
extern struct list_head nes_adapter_list;
@@ -43629,7 +43116,7 @@ index 33cc589..3bd6538 100644
extern u32 mh_detected;
extern u32 mh_pauses_sent;
extern u32 cm_packets_sent;
-@@ -196,16 +196,16 @@ extern u32 cm_packets_created;
+@@ -199,16 +199,16 @@ extern u32 cm_packets_created;
extern u32 cm_packets_received;
extern u32 cm_packets_dropped;
extern u32 cm_packets_retrans;
@@ -43656,10 +43143,10 @@ index 33cc589..3bd6538 100644
extern u32 int_mod_timer_init;
extern u32 int_mod_cq_depth_256;
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
-index 9c9f2f5..2559190 100644
+index 6f09a72..cf4399d 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
-@@ -68,14 +68,14 @@ u32 cm_packets_dropped;
+@@ -69,14 +69,14 @@ u32 cm_packets_dropped;
u32 cm_packets_retrans;
u32 cm_packets_created;
u32 cm_packets_received;
@@ -43681,7 +43168,7 @@ index 9c9f2f5..2559190 100644
static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
-@@ -133,28 +133,28 @@ static void print_core(struct nes_cm_core *core);
+@@ -135,28 +135,28 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
/* instance of function pointers for client API */
/* set address of this instance to cm_core->cm_ops at cm_core alloc */
static struct nes_cm_ops nes_cm_api = {
@@ -43728,7 +43215,7 @@ index 9c9f2f5..2559190 100644
int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
{
-@@ -1272,7 +1272,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
+@@ -1436,7 +1436,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
kfree(listener);
listener = NULL;
ret = 0;
@@ -43737,7 +43224,7 @@ index 9c9f2f5..2559190 100644
} else {
spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
}
-@@ -1465,7 +1465,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
+@@ -1637,7 +1637,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
cm_node->rem_mac);
add_hte_node(cm_core, cm_node);
@@ -43746,7 +43233,7 @@ index 9c9f2f5..2559190 100644
return cm_node;
}
-@@ -1523,7 +1523,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
+@@ -1698,7 +1698,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
}
atomic_dec(&cm_core->node_cnt);
@@ -43755,7 +43242,7 @@ index 9c9f2f5..2559190 100644
nesqp = cm_node->nesqp;
if (nesqp) {
nesqp->cm_node = NULL;
-@@ -1587,7 +1587,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
+@@ -1762,7 +1762,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
static void drop_packet(struct sk_buff *skb)
{
@@ -43764,7 +43251,7 @@ index 9c9f2f5..2559190 100644
dev_kfree_skb_any(skb);
}
-@@ -1650,7 +1650,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
+@@ -1825,7 +1825,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
{
int reset = 0; /* whether to send reset in case of err.. */
@@ -43773,7 +43260,7 @@ index 9c9f2f5..2559190 100644
nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
" refcnt=%d\n", cm_node, cm_node->state,
atomic_read(&cm_node->ref_count));
-@@ -2291,7 +2291,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
+@@ -2492,7 +2492,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
rem_ref_cm_node(cm_node->cm_core, cm_node);
return NULL;
}
@@ -43782,7 +43269,7 @@ index 9c9f2f5..2559190 100644
loopbackremotenode->loopbackpartner = cm_node;
loopbackremotenode->tcp_cntxt.rcv_wscale =
NES_CM_DEFAULT_RCV_WND_SCALE;
-@@ -2566,7 +2566,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
+@@ -2773,7 +2773,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
else {
rem_ref_cm_node(cm_core, cm_node);
@@ -43791,7 +43278,7 @@ index 9c9f2f5..2559190 100644
dev_kfree_skb_any(skb);
}
break;
-@@ -2874,7 +2874,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
+@@ -3081,7 +3081,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
if ((cm_id) && (cm_id->event_handler)) {
if (issue_disconn) {
@@ -43800,7 +43287,7 @@ index 9c9f2f5..2559190 100644
cm_event.event = IW_CM_EVENT_DISCONNECT;
cm_event.status = disconn_status;
cm_event.local_addr = cm_id->local_addr;
-@@ -2896,7 +2896,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
+@@ -3103,7 +3103,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
}
if (issue_close) {
@@ -43809,7 +43296,7 @@ index 9c9f2f5..2559190 100644
nes_disconnect(nesqp, 1);
cm_id->provider_data = nesqp;
-@@ -3034,7 +3034,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
+@@ -3241,7 +3241,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
@@ -43818,7 +43305,7 @@ index 9c9f2f5..2559190 100644
nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
netdev_refcnt_read(nesvnic->netdev));
-@@ -3223,7 +3223,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
+@@ -3439,7 +3439,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
struct nes_cm_core *cm_core;
u8 *start_buff;
@@ -43827,7 +43314,7 @@ index 9c9f2f5..2559190 100644
cm_node = (struct nes_cm_node *)cm_id->provider_data;
loopback = cm_node->loopbackpartner;
cm_core = cm_node->cm_core;
-@@ -3285,7 +3285,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
+@@ -3504,7 +3504,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
ntohs(laddr->sin_port));
@@ -43836,7 +43323,7 @@ index 9c9f2f5..2559190 100644
nesqp->active_conn = 1;
/* cache the cm_id in the qp */
-@@ -3397,7 +3397,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
+@@ -3649,7 +3649,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
return err;
}
@@ -43845,7 +43332,7 @@ index 9c9f2f5..2559190 100644
}
cm_id->add_ref(cm_id);
-@@ -3504,7 +3504,7 @@ static void cm_event_connected(struct nes_cm_event *event)
+@@ -3756,7 +3756,7 @@ static void cm_event_connected(struct nes_cm_event *event)
if (nesqp->destroyed)
return;
@@ -43854,7 +43341,7 @@ index 9c9f2f5..2559190 100644
nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
" local port 0x%04X. jiffies = %lu.\n",
nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
-@@ -3685,7 +3685,7 @@ static void cm_event_reset(struct nes_cm_event *event)
+@@ -3941,7 +3941,7 @@ static void cm_event_reset(struct nes_cm_event *event)
cm_id->add_ref(cm_id);
ret = cm_id->event_handler(cm_id, &cm_event);
@@ -43863,7 +43350,7 @@ index 9c9f2f5..2559190 100644
cm_event.event = IW_CM_EVENT_CLOSE;
cm_event.status = 0;
cm_event.provider_data = cm_id->provider_data;
-@@ -3725,7 +3725,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
+@@ -3981,7 +3981,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
return;
cm_id = cm_node->cm_id;
@@ -43872,7 +43359,7 @@ index 9c9f2f5..2559190 100644
nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
cm_node, cm_id, jiffies);
-@@ -3769,7 +3769,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
+@@ -4030,7 +4030,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
return;
cm_id = cm_node->cm_id;
@@ -43979,7 +43466,7 @@ index 49eb511..a774366 100644
/**
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
-index eb62461..2b7fc71 100644
+index fef067c..6a25ccd 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -46,9 +46,9 @@
@@ -44004,7 +43491,7 @@ index eb62461..2b7fc71 100644
switch (init_attr->qp_type) {
case IB_QPT_RC:
if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
-@@ -1466,7 +1466,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
+@@ -1468,7 +1468,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
struct iw_cm_event cm_event;
int ret = 0;
@@ -44014,7 +43501,7 @@ index eb62461..2b7fc71 100644
/* Blow away the connection if it exists. */
diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
-index 1946101..09766d2 100644
+index c00ae09..04e91be 100644
--- a/drivers/infiniband/hw/qib/qib.h
+++ b/drivers/infiniband/hw/qib/qib.h
@@ -52,6 +52,7 @@
@@ -44025,24 +43512,24 @@ index 1946101..09766d2 100644
#include "qib_common.h"
#include "qib_verbs.h"
-diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
-index fb787c3..1469995 100644
---- a/drivers/input/evdev.c
-+++ b/drivers/input/evdev.c
-@@ -422,7 +422,7 @@ static int evdev_open(struct inode *inode, struct file *file)
-
- err_free_client:
- evdev_detach_client(evdev, client);
-- kfree(client);
-+ kvfree(client);
- return error;
- }
-
+diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
+index cdc7df4..a2fdfdb 100644
+--- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
++++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
+@@ -156,7 +156,7 @@ static size_t ipoib_get_size(const struct net_device *dev)
+ nla_total_size(2); /* IFLA_IPOIB_UMCAST */
+ }
+
+-static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
++static struct rtnl_link_ops ipoib_link_ops = {
+ .kind = "ipoib",
+ .maxtype = IFLA_IPOIB_MAX,
+ .policy = ipoib_policy,
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
-index 24c41ba..102d71f 100644
+index e29c04e..adbf68c 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
-@@ -490,14 +490,14 @@ EXPORT_SYMBOL(gameport_set_phys);
+@@ -527,14 +527,14 @@ EXPORT_SYMBOL(gameport_set_phys);
*/
static void gameport_init_port(struct gameport *gameport)
{
@@ -44060,10 +43547,10 @@ index 24c41ba..102d71f 100644
gameport->dev.release = gameport_release_port;
if (gameport->parent)
diff --git a/drivers/input/input.c b/drivers/input/input.c
-index 29ca0bb..f4bc2e3 100644
+index 0f175f5..4c481c0 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
-@@ -1774,7 +1774,7 @@ EXPORT_SYMBOL_GPL(input_class);
+@@ -1775,7 +1775,7 @@ EXPORT_SYMBOL_GPL(input_class);
*/
struct input_dev *input_allocate_device(void)
{
@@ -44072,10 +43559,10 @@ index 29ca0bb..f4bc2e3 100644
struct input_dev *dev;
dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
-@@ -1789,7 +1789,7 @@ struct input_dev *input_allocate_device(void)
+@@ -1790,7 +1790,7 @@ struct input_dev *input_allocate_device(void)
INIT_LIST_HEAD(&dev->node);
- dev_set_name(&dev->dev, "input%ld",
+ dev_set_name(&dev->dev, "input%lu",
- (unsigned long) atomic_inc_return(&input_no) - 1);
+ (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
@@ -44094,10 +43581,10 @@ index 4a95b22..874c182 100644
#include <linux/gameport.h>
#include <linux/jiffies.h>
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
-index 517829f..5e075c3 100644
+index fc55f0d..11e2aa6 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
-@@ -737,7 +737,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
+@@ -886,7 +886,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
static int xpad_led_probe(struct usb_xpad *xpad)
{
@@ -44106,7 +43593,7 @@ index 517829f..5e075c3 100644
long led_no;
struct xpad_led *led;
struct led_classdev *led_cdev;
-@@ -750,7 +750,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
+@@ -899,7 +899,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
if (!led)
return -ENOMEM;
@@ -44116,10 +43603,10 @@ index 517829f..5e075c3 100644
snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
led->xpad = xpad;
diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
-index e204f26..8459f15 100644
+index afed8e2..3aa8a18 100644
--- a/drivers/input/misc/ims-pcu.c
+++ b/drivers/input/misc/ims-pcu.c
-@@ -1621,7 +1621,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
+@@ -1851,7 +1851,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
{
@@ -44127,21 +43614,21 @@ index e204f26..8459f15 100644
+ static atomic_unchecked_t device_no = ATOMIC_INIT(0);
const struct ims_pcu_device_info *info;
- u8 device_id;
-@@ -1653,7 +1653,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
+ int error;
+@@ -1882,7 +1882,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
}
/* Device appears to be operable, complete initialization */
- pcu->device_no = atomic_inc_return(&device_no) - 1;
+ pcu->device_no = atomic_inc_return_unchecked(&device_no) - 1;
- error = ims_pcu_setup_backlight(pcu);
- if (error)
+ /*
+ * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
-index 2f0b39d..7370f13 100644
+index f4cf664..3204fda 100644
--- a/drivers/input/mouse/psmouse.h
+++ b/drivers/input/mouse/psmouse.h
-@@ -116,7 +116,7 @@ struct psmouse_attribute {
+@@ -117,7 +117,7 @@ struct psmouse_attribute {
ssize_t (*set)(struct psmouse *psmouse, void *data,
const char *buf, size_t count);
bool protect;
@@ -44164,7 +43651,7 @@ index b604564..3f14ae4 100644
return count;
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
-index b29134d..394deb0 100644
+index d399b8b..4913ede 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
@@ -44179,9 +43666,9 @@ index b29134d..394deb0 100644
@@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
mutex_init(&serio->drv_mutex);
device_initialize(&serio->dev);
- dev_set_name(&serio->dev, "serio%ld",
-- (long)atomic_inc_return(&serio_no) - 1);
-+ (long)atomic_inc_return_unchecked(&serio_no) - 1);
+ dev_set_name(&serio->dev, "serio%lu",
+- (unsigned long)atomic_inc_return(&serio_no) - 1);
++ (unsigned long)atomic_inc_return_unchecked(&serio_no) - 1);
serio->dev.bus = &serio_bus;
serio->dev.release = serio_release_port;
serio->dev.groups = serio_device_attr_groups;
@@ -44208,10 +43695,10 @@ index c9a02fe..0debc75 100644
INIT_LIST_HEAD(&serio_raw->client_list);
init_waitqueue_head(&serio_raw->wait);
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
-index 9cbef59..26db8e4 100644
+index 505a9ad..356734c 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
-@@ -878,11 +878,21 @@ static void copy_cmd_to_buffer(struct amd_iommu *iommu,
+@@ -823,11 +823,21 @@ static void copy_cmd_to_buffer(struct amd_iommu *iommu,
static void build_completion_wait(struct iommu_cmd *cmd, u64 address)
{
@@ -44235,24 +43722,37 @@ index 9cbef59..26db8e4 100644
cmd->data[2] = 1;
CMD_SET_TYPE(cmd, CMD_COMPL_WAIT);
}
+diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
+index 60558f7..5a02369 100644
+--- a/drivers/iommu/arm-smmu.c
++++ b/drivers/iommu/arm-smmu.c
+@@ -934,7 +934,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
+ cfg->irptndx = cfg->cbndx;
+ }
+
+- ACCESS_ONCE(smmu_domain->smmu) = smmu;
++ ACCESS_ONCE_RW(smmu_domain->smmu) = smmu;
+ arm_smmu_init_context_bank(smmu_domain);
+ spin_unlock_irqrestore(&smmu_domain->lock, flags);
+
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
-index e5555fc..937986d 100644
+index ed8b048..7fbcc01 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
-@@ -588,7 +588,7 @@ static struct notifier_block iommu_bus_nb = {
- static void iommu_bus_init(struct bus_type *bus, struct iommu_ops *ops)
+@@ -802,7 +802,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
+ static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
{
- bus_register_notifier(bus, &iommu_bus_nb);
-- bus_for_each_dev(bus, NULL, ops, add_iommu_group);
-+ bus_for_each_dev(bus, NULL, (void *)ops, add_iommu_group);
- }
-
- /**
+ int err;
+- struct notifier_block *nb;
++ notifier_block_no_const *nb;
+ struct iommu_callback_data cb = {
+ .ops = ops,
+ };
diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
-index 228632c9..edfe331 100644
+index 74a1767..5a359e8 100644
--- a/drivers/iommu/irq_remapping.c
+++ b/drivers/iommu/irq_remapping.c
-@@ -356,7 +356,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
+@@ -361,7 +361,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
void panic_if_irq_remap(const char *msg)
{
if (irq_remapping_enabled)
@@ -44261,7 +43761,7 @@ index 228632c9..edfe331 100644
}
static void ir_ack_apic_edge(struct irq_data *data)
-@@ -377,10 +377,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
+@@ -382,10 +382,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
void irq_remap_modify_chip_defaults(struct irq_chip *chip)
{
@@ -44279,10 +43779,10 @@ index 228632c9..edfe331 100644
bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
-index 12698ee..a58a958 100644
+index 38493ff..001538b 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
-@@ -85,7 +85,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
+@@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
* Supported arch specific GIC irq extension.
* Default make them NULL.
*/
@@ -44291,7 +43791,7 @@ index 12698ee..a58a958 100644
.irq_eoi = NULL,
.irq_mask = NULL,
.irq_unmask = NULL,
-@@ -337,7 +337,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
+@@ -311,7 +311,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
chained_irq_exit(chip, desc);
}
@@ -44300,6 +43800,19 @@ index 12698ee..a58a958 100644
.name = "GIC",
.irq_mask = gic_mask_irq,
.irq_unmask = gic_unmask_irq,
+diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c
+index 542e850..1bb094c 100644
+--- a/drivers/irqchip/irq-renesas-intc-irqpin.c
++++ b/drivers/irqchip/irq-renesas-intc-irqpin.c
+@@ -353,7 +353,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
+ struct intc_irqpin_iomem *i;
+ struct resource *io[INTC_IRQPIN_REG_NR];
+ struct resource *irq;
+- struct irq_chip *irq_chip;
++ irq_chip_no_const *irq_chip;
+ void (*enable_fn)(struct irq_data *d);
+ void (*disable_fn)(struct irq_data *d);
+ const char *name = dev_name(dev);
diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
index 8777065..a4a9967 100644
--- a/drivers/irqchip/irq-renesas-irqc.c
@@ -44314,7 +43827,7 @@ index 8777065..a4a9967 100644
int ret;
int k;
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
-index ac6f72b..81150f2 100644
+index 6a2df32..dc962f1 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -81,8 +81,8 @@ struct capiminor {
@@ -44355,10 +43868,10 @@ index ac6f72b..81150f2 100644
capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
capimsg_setu16(skb->data, 16, len); /* Data length */
diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
-index c44950d..10ac276 100644
+index aecec6d..11e13c5 100644
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
-@@ -2564,22 +2564,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
+@@ -2565,22 +2565,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
static const struct gigaset_ops gigops = {
@@ -44469,10 +43982,10 @@ index 8c91fd5..14f13ce 100644
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
-index d0a41cb..b953e50 100644
+index a8e652d..edadaa4 100644
--- a/drivers/isdn/gigaset/usb-gigaset.c
+++ b/drivers/isdn/gigaset/usb-gigaset.c
-@@ -547,7 +547,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
+@@ -548,7 +548,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
memcpy(cs->hw.usb->bchars, buf, 6);
return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
@@ -44481,7 +43994,7 @@ index d0a41cb..b953e50 100644
}
static void gigaset_freebcshw(struct bc_state *bcs)
-@@ -869,22 +869,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
+@@ -867,22 +867,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
}
static const struct gigaset_ops ops = {
@@ -44542,11 +44055,24 @@ index 4d9b195..455075c 100644
return -EFAULT;
} else {
memcpy(buf, dp, left);
+diff --git a/drivers/isdn/hardware/eicon/message.c b/drivers/isdn/hardware/eicon/message.c
+index a82e542..f766a79 100644
+--- a/drivers/isdn/hardware/eicon/message.c
++++ b/drivers/isdn/hardware/eicon/message.c
+@@ -1474,7 +1474,7 @@ static byte connect_res(dword Id, word Number, DIVA_CAPI_ADAPTER *a,
+ add_ai(plci, &parms[5]);
+ sig_req(plci, REJECT, 0);
+ }
+- else if (Reject == 1 || Reject > 9)
++ else if (Reject == 1 || Reject >= 9)
+ {
+ add_ai(plci, &parms[5]);
+ sig_req(plci, HANGUP, 0);
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
-index 9bb12ba..d4262f7 100644
+index 9b856e1..fa03c92 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
-@@ -1651,6 +1651,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
+@@ -1654,6 +1654,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
} else
return -EINVAL;
case IIOCDBGVAR:
@@ -44573,10 +44099,10 @@ index 91d5730..336523e 100644
/* The following should better go into a dedicated source file such that
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
-index 3c5f249..5fac4d0 100644
+index bc91261..2ef7e36 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
-@@ -1508,9 +1508,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
+@@ -1503,9 +1503,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
#ifdef ISDN_DEBUG_MODEM_OPEN
printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
@@ -44588,7 +44114,7 @@ index 3c5f249..5fac4d0 100644
port->tty = tty;
/*
* Start up serial port
-@@ -1554,7 +1554,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
+@@ -1549,7 +1549,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
#endif
return;
}
@@ -44597,7 +44123,7 @@ index 3c5f249..5fac4d0 100644
/*
* Uh, oh. tty->count is 1, which means that the tty
* structure will be freed. Info->count should always
-@@ -1563,15 +1563,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
+@@ -1558,15 +1558,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
* serial port won't be shutdown.
*/
printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
@@ -44619,7 +44145,7 @@ index 3c5f249..5fac4d0 100644
#ifdef ISDN_DEBUG_MODEM_OPEN
printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
#endif
-@@ -1625,7 +1625,7 @@ isdn_tty_hangup(struct tty_struct *tty)
+@@ -1620,7 +1620,7 @@ isdn_tty_hangup(struct tty_struct *tty)
if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
return;
isdn_tty_shutdown(info);
@@ -44628,7 +44154,7 @@ index 3c5f249..5fac4d0 100644
port->flags &= ~ASYNC_NORMAL_ACTIVE;
port->tty = NULL;
wake_up_interruptible(&port->open_wait);
-@@ -1970,7 +1970,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
+@@ -1965,7 +1965,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
modem_info *info = &dev->mdm.info[i];
@@ -44665,7 +44191,7 @@ index e2d4e58..40cd045 100644
/* error message helper function */
diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
-index 53d487f..cae33fe 100644
+index 6a7447c..cae33fe 100644
--- a/drivers/isdn/icn/icn.c
+++ b/drivers/isdn/icn/icn.c
@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
@@ -44677,43 +44203,11 @@ index 53d487f..cae33fe 100644
return -EFAULT;
} else
memcpy(msg, buf, count);
-@@ -1155,7 +1155,7 @@ icn_command(isdn_ctrl *c, icn_card *card)
- ulong a;
- ulong flags;
- int i;
-- char cbuf[60];
-+ char cbuf[80];
- isdn_ctrl cmd;
- icn_cdef cdef;
- char __user *arg;
-@@ -1309,7 +1309,6 @@ icn_command(isdn_ctrl *c, icn_card *card)
- break;
- if ((c->arg & 255) < ICN_BCH) {
- char *p;
-- char dial[50];
- char dcode[4];
-
- a = c->arg;
-@@ -1321,10 +1320,10 @@ icn_command(isdn_ctrl *c, icn_card *card)
- } else
- /* Normal Dial */
- strcpy(dcode, "CAL");
-- strcpy(dial, p);
-- sprintf(cbuf, "%02d;D%s_R%s,%02d,%02d,%s\n", (int) (a + 1),
-- dcode, dial, c->parm.setup.si1,
-- c->parm.setup.si2, c->parm.setup.eazmsn);
-+ snprintf(cbuf, sizeof(cbuf),
-+ "%02d;D%s_R%s,%02d,%02d,%s\n", (int) (a + 1),
-+ dcode, p, c->parm.setup.si1,
-+ c->parm.setup.si2, c->parm.setup.eazmsn);
- i = icn_writecmd(cbuf, strlen(cbuf), 0, card);
- }
- break;
diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
-index a4f05c5..1433bc5 100644
+index 87f7dff..7300125 100644
--- a/drivers/isdn/mISDN/dsp_cmx.c
+++ b/drivers/isdn/mISDN/dsp_cmx.c
-@@ -1628,7 +1628,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
+@@ -1625,7 +1625,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
static u16 dsp_count; /* last sample count */
static int dsp_count_valid; /* if we have last sample count */
@@ -44723,7 +44217,7 @@ index a4f05c5..1433bc5 100644
{
struct dsp_conf *conf;
diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
-index d93e245..e7ece6b 100644
+index f58a354..fbae176 100644
--- a/drivers/leds/leds-clevo-mail.c
+++ b/drivers/leds/leds-clevo-mail.c
@@ -40,7 +40,7 @@ static int __init clevo_mail_led_dmi_callback(const struct dmi_system_id *id)
@@ -44736,7 +44230,7 @@ index d93e245..e7ece6b 100644
.callback = clevo_mail_led_dmi_callback,
.ident = "Clevo D410J",
diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
-index 5b8f938..b73d657 100644
+index 046cb70..6b20d39 100644
--- a/drivers/leds/leds-ss4200.c
+++ b/drivers/leds/leds-ss4200.c
@@ -91,7 +91,7 @@ MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");
@@ -44749,10 +44243,10 @@ index 5b8f938..b73d657 100644
.callback = ss4200_led_dmi_callback,
.ident = "Intel SS4200-E",
diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
-index 0bf1e4e..b4bf44e 100644
+index 6590558..a74c5dd 100644
--- a/drivers/lguest/core.c
+++ b/drivers/lguest/core.c
-@@ -97,9 +97,17 @@ static __init int map_switcher(void)
+@@ -96,9 +96,17 @@ static __init int map_switcher(void)
* The end address needs +1 because __get_vm_area allocates an
* extra guard page, so we need space for that.
*/
@@ -44770,7 +44264,7 @@ index 0bf1e4e..b4bf44e 100644
if (!switcher_vma) {
err = -ENOMEM;
printk("lguest: could not map switcher pages high\n");
-@@ -124,7 +132,7 @@ static __init int map_switcher(void)
+@@ -121,7 +129,7 @@ static __init int map_switcher(void)
* Now the Switcher is mapped at the right address, we can't fail!
* Copy in the compiled-in Switcher code (from x86/switcher_32.S).
*/
@@ -44780,7 +44274,7 @@ index 0bf1e4e..b4bf44e 100644
printk(KERN_INFO "lguest: mapped switcher at %p\n",
diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
-index bfb39bb..08a603b 100644
+index e8b55c3..3514c37 100644
--- a/drivers/lguest/page_tables.c
+++ b/drivers/lguest/page_tables.c
@@ -559,7 +559,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
@@ -44900,7 +44394,7 @@ index 40634b0..4f5855e 100644
// Every interrupt can come to us here
// But we must truly tell each apart.
diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
-index 7ef7461..5a09dac 100644
+index a08e3ee..df8ade2 100644
--- a/drivers/md/bcache/closure.h
+++ b/drivers/md/bcache/closure.h
@@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
@@ -44913,10 +44407,10 @@ index 7ef7461..5a09dac 100644
cl->fn = fn;
cl->wq = wq;
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
-index 8e51b3a..bc6febf 100644
+index da3604e..7789cb4c 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
-@@ -1775,7 +1775,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
+@@ -1771,7 +1771,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
chunk_kb ? "KB" : "B");
if (bitmap->storage.file) {
seq_printf(seq, ", file: ");
@@ -44926,7 +44420,7 @@ index 8e51b3a..bc6febf 100644
seq_printf(seq, "\n");
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
-index 5152142..623d141 100644
+index 0be9381..114262b 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -1769,7 +1769,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
@@ -45015,7 +44509,7 @@ index 7dfdb5c..4caada6 100644
return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
-index 28a9012..9c0f6a5 100644
+index 87f86c7..a1a4100 100644
--- a/drivers/md/dm-stats.c
+++ b/drivers/md/dm-stats.c
@@ -382,7 +382,7 @@ do_sync_free:
@@ -45039,7 +44533,7 @@ index 28a9012..9c0f6a5 100644
rcu_read_lock();
diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
-index d1600d2..4c3af3a 100644
+index f8b37d4..5c5cafd 100644
--- a/drivers/md/dm-stripe.c
+++ b/drivers/md/dm-stripe.c
@@ -21,7 +21,7 @@ struct stripe {
@@ -45051,7 +44545,7 @@ index d1600d2..4c3af3a 100644
};
struct stripe_c {
-@@ -186,7 +186,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
+@@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
kfree(sc);
return r;
}
@@ -45060,7 +44554,7 @@ index d1600d2..4c3af3a 100644
}
ti->private = sc;
-@@ -330,7 +330,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
+@@ -332,7 +332,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
DMEMIT("%d ", sc->stripes);
for (i = 0; i < sc->stripes; i++) {
DMEMIT("%s ", sc->stripe[i].dev->name);
@@ -45069,7 +44563,7 @@ index d1600d2..4c3af3a 100644
'D' : 'A';
}
buffer[i] = '\0';
-@@ -375,8 +375,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
+@@ -377,8 +377,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
*/
for (i = 0; i < sc->stripes; i++)
if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
@@ -45081,19 +44575,10 @@ index d1600d2..4c3af3a 100644
schedule_work(&sc->trigger_event);
}
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
-index 6a7f2b8..fea0bde 100644
+index b2bd1eb..38f7a44 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
-@@ -274,7 +274,7 @@ static struct dm_dev_internal *find_device(struct list_head *l, dev_t dev)
- static int open_dev(struct dm_dev_internal *d, dev_t dev,
- struct mapped_device *md)
- {
-- static char *_claim_ptr = "I belong to device-mapper";
-+ static char _claim_ptr[] = "I belong to device-mapper";
- struct block_device *bdev;
-
- int r;
-@@ -342,7 +342,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
+@@ -303,7 +303,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
if (!dev_size)
return 0;
@@ -45125,10 +44610,10 @@ index e9d33ad..dae9880d 100644
pmd->bl_info.value_type.inc = data_block_inc;
pmd->bl_info.value_type.dec = data_block_dec;
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
-index 65ee3a0..1852af9 100644
+index 62c5136..aede7f1 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
-@@ -187,9 +187,9 @@ struct mapped_device {
+@@ -183,9 +183,9 @@ struct mapped_device {
/*
* Event handling.
*/
@@ -45140,7 +44625,7 @@ index 65ee3a0..1852af9 100644
struct list_head uevent_list;
spinlock_t uevent_lock; /* Protect access to uevent_list */
-@@ -1899,8 +1899,8 @@ static struct mapped_device *alloc_dev(int minor)
+@@ -2071,8 +2071,8 @@ static struct mapped_device *alloc_dev(int minor)
spin_lock_init(&md->deferred_lock);
atomic_set(&md->holders, 1);
atomic_set(&md->open_count, 0);
@@ -45149,9 +44634,9 @@ index 65ee3a0..1852af9 100644
+ atomic_set_unchecked(&md->event_nr, 0);
+ atomic_set_unchecked(&md->uevent_seq, 0);
INIT_LIST_HEAD(&md->uevent_list);
+ INIT_LIST_HEAD(&md->table_devices);
spin_lock_init(&md->uevent_lock);
-
-@@ -2054,7 +2054,7 @@ static void event_callback(void *context)
+@@ -2228,7 +2228,7 @@ static void event_callback(void *context)
dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
@@ -45160,7 +44645,7 @@ index 65ee3a0..1852af9 100644
wake_up(&md->eventq);
}
-@@ -2747,18 +2747,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
+@@ -2921,18 +2921,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
uint32_t dm_next_uevent_seq(struct mapped_device *md)
{
@@ -45183,10 +44668,10 @@ index 65ee3a0..1852af9 100644
void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
diff --git a/drivers/md/md.c b/drivers/md/md.c
-index 40959ee..ba57756 100644
+index 9233c71..ed5243a 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
-@@ -194,10 +194,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
+@@ -190,10 +190,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
* start build, activate spare
*/
static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
@@ -45199,7 +44684,7 @@ index 40959ee..ba57756 100644
wake_up(&md_event_waiters);
}
EXPORT_SYMBOL_GPL(md_new_event);
-@@ -207,7 +207,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
+@@ -203,7 +203,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
*/
static void md_new_event_inintr(struct mddev *mddev)
{
@@ -45208,7 +44693,7 @@ index 40959ee..ba57756 100644
wake_up(&md_event_waiters);
}
-@@ -1462,7 +1462,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
+@@ -1426,7 +1426,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
(le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
@@ -45217,7 +44702,7 @@ index 40959ee..ba57756 100644
rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
-@@ -1713,7 +1713,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
+@@ -1677,7 +1677,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
else
sb->resync_offset = cpu_to_le64(0);
@@ -45226,7 +44711,7 @@ index 40959ee..ba57756 100644
sb->raid_disks = cpu_to_le32(mddev->raid_disks);
sb->size = cpu_to_le64(mddev->dev_sectors);
-@@ -2725,7 +2725,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
+@@ -2547,7 +2547,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
static ssize_t
errors_show(struct md_rdev *rdev, char *page)
{
@@ -45235,7 +44720,7 @@ index 40959ee..ba57756 100644
}
static ssize_t
-@@ -2734,7 +2734,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
+@@ -2556,7 +2556,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
char *e;
unsigned long n = simple_strtoul(buf, &e, 10);
if (*buf && (*e == 0 || *e == '\n')) {
@@ -45244,7 +44729,7 @@ index 40959ee..ba57756 100644
return len;
}
return -EINVAL;
-@@ -3183,8 +3183,8 @@ int md_rdev_init(struct md_rdev *rdev)
+@@ -3000,8 +3000,8 @@ int md_rdev_init(struct md_rdev *rdev)
rdev->sb_loaded = 0;
rdev->bb_page = NULL;
atomic_set(&rdev->nr_pending, 0);
@@ -45255,7 +44740,7 @@ index 40959ee..ba57756 100644
INIT_LIST_HEAD(&rdev->same_set);
init_waitqueue_head(&rdev->blocked_wait);
-@@ -7079,7 +7079,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
+@@ -6855,7 +6855,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
spin_unlock(&pers_lock);
seq_printf(seq, "\n");
@@ -45264,7 +44749,7 @@ index 40959ee..ba57756 100644
return 0;
}
if (v == (void*)2) {
-@@ -7182,7 +7182,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
+@@ -6958,7 +6958,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
return error;
seq = file->private_data;
@@ -45273,7 +44758,7 @@ index 40959ee..ba57756 100644
return error;
}
-@@ -7196,7 +7196,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
+@@ -6975,7 +6975,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
/* always allow read */
mask = POLLIN | POLLRDNORM;
@@ -45282,7 +44767,7 @@ index 40959ee..ba57756 100644
mask |= POLLERR | POLLPRI;
return mask;
}
-@@ -7240,7 +7240,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
+@@ -7022,7 +7022,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
(int)part_stat_read(&disk->part0, sectors[1]) -
@@ -45292,7 +44777,7 @@ index 40959ee..ba57756 100644
* as sync_io is counted when a request starts, and
* disk_stats is counted when it completes.
diff --git a/drivers/md/md.h b/drivers/md/md.h
-index 07bba96..2d6788c 100644
+index 03cec5b..0a658c1 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -94,13 +94,13 @@ struct md_rdev {
@@ -45311,11 +44796,11 @@ index 07bba96..2d6788c 100644
* for reporting to userspace and storing
* in superblock.
*/
-@@ -449,7 +449,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
+@@ -448,7 +448,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
{
-- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
+- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
}
@@ -45355,10 +44840,10 @@ index 3e6d115..ffecdeb 100644
/*----------------------------------------------------------------*/
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
-index 55de4f6..b1c57fe 100644
+index 40b35be..a327e11 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
-@@ -1936,7 +1936,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
+@@ -1931,7 +1931,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
if (r1_sync_page_io(rdev, sect, s,
bio->bi_io_vec[idx].bv_page,
READ) != 0)
@@ -45367,7 +44852,7 @@ index 55de4f6..b1c57fe 100644
}
sectors -= s;
sect += s;
-@@ -2170,7 +2170,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
+@@ -2164,7 +2164,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
!test_bit(Faulty, &rdev->flags)) {
if (r1_sync_page_io(rdev, sect, s,
conf->tmppage, READ)) {
@@ -45377,10 +44862,10 @@ index 55de4f6..b1c57fe 100644
"md/raid1:%s: read error corrected "
"(%d sectors at %llu on %s)\n",
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
-index a46124e..caf0bd55 100644
+index 32e282f..5cec803 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
-@@ -1948,7 +1948,7 @@ static void end_sync_read(struct bio *bio, int error)
+@@ -1944,7 +1944,7 @@ static void end_sync_read(struct bio *bio, int error)
/* The write handler will notice the lack of
* R10BIO_Uptodate and record any errors etc
*/
@@ -45389,7 +44874,7 @@ index a46124e..caf0bd55 100644
&conf->mirrors[d].rdev->corrected_errors);
/* for reconstruct, we always reschedule after a read.
-@@ -2306,7 +2306,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
+@@ -2301,7 +2301,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
{
struct timespec cur_time_mon;
unsigned long hours_since_last;
@@ -45398,7 +44883,7 @@ index a46124e..caf0bd55 100644
ktime_get_ts(&cur_time_mon);
-@@ -2328,9 +2328,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
+@@ -2323,9 +2323,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
* overflowing the shift of read_errors by hours_since_last.
*/
if (hours_since_last >= 8 * sizeof(read_errors))
@@ -45410,7 +44895,7 @@ index a46124e..caf0bd55 100644
}
static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
-@@ -2384,8 +2384,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
+@@ -2379,8 +2379,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
return;
check_decay_read_errors(mddev, rdev);
@@ -45421,7 +44906,7 @@ index a46124e..caf0bd55 100644
char b[BDEVNAME_SIZE];
bdevname(rdev->bdev, b);
-@@ -2393,7 +2393,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
+@@ -2388,7 +2388,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
"md/raid10:%s: %s: Raid device exceeded "
"read_error threshold [cur %d:max %d]\n",
mdname(mddev), b,
@@ -45430,7 +44915,7 @@ index a46124e..caf0bd55 100644
printk(KERN_NOTICE
"md/raid10:%s: %s: Failing raid device\n",
mdname(mddev), b);
-@@ -2548,7 +2548,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
+@@ -2543,7 +2543,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
sect +
choose_data_offset(r10_bio, rdev)),
bdevname(rdev->bdev, b));
@@ -45440,10 +44925,10 @@ index a46124e..caf0bd55 100644
rdev_dec_pending(rdev, mddev);
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
-index 175584a..1561092 100644
+index c1b0d52..07a0a5d 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
-@@ -1711,6 +1711,10 @@ static int grow_one_stripe(struct r5conf *conf, int hash)
+@@ -1730,6 +1730,10 @@ static int grow_one_stripe(struct r5conf *conf, int hash)
return 1;
}
@@ -45454,7 +44939,7 @@ index 175584a..1561092 100644
static int grow_stripes(struct r5conf *conf, int num)
{
struct kmem_cache *sc;
-@@ -1722,7 +1726,11 @@ static int grow_stripes(struct r5conf *conf, int num)
+@@ -1741,7 +1745,11 @@ static int grow_stripes(struct r5conf *conf, int num)
"raid%d-%s", conf->level, mdname(conf->mddev));
else
sprintf(conf->cache_name[0],
@@ -45466,7 +44951,7 @@ index 175584a..1561092 100644
sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
conf->active_name = 0;
-@@ -1995,21 +2003,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
+@@ -2017,21 +2025,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
mdname(conf->mddev), STRIPE_SECTORS,
(unsigned long long)s,
bdevname(rdev->bdev, b));
@@ -45492,7 +44977,7 @@ index 175584a..1561092 100644
if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
printk_ratelimited(
KERN_WARNING
-@@ -2037,7 +2045,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
+@@ -2059,7 +2067,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
mdname(conf->mddev),
(unsigned long long)s,
bdn);
@@ -45514,6 +44999,18 @@ index 983db75..ef9248c 100644
struct device *clsdev;
int minor;
int id;
+diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
+index 6ad22b6..6e90e2a 100644
+--- a/drivers/media/dvb-frontends/af9033.h
++++ b/drivers/media/dvb-frontends/af9033.h
+@@ -96,6 +96,6 @@ struct af9033_ops {
+ int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
+ int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
+ int onoff);
+-};
++} __no_const;
+
+ #endif /* AF9033_H */
diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
index 9b6c3bb..baeb5c7 100644
--- a/drivers/media/dvb-frontends/dib3000.h
@@ -45527,8 +45024,34 @@ index 9b6c3bb..baeb5c7 100644
#if IS_ENABLED(CONFIG_DVB_DIB3000MB)
extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
+diff --git a/drivers/media/dvb-frontends/dib7000p.h b/drivers/media/dvb-frontends/dib7000p.h
+index 1fea0e9..321ce8f 100644
+--- a/drivers/media/dvb-frontends/dib7000p.h
++++ b/drivers/media/dvb-frontends/dib7000p.h
+@@ -64,7 +64,7 @@ struct dib7000p_ops {
+ int (*get_adc_power)(struct dvb_frontend *fe);
+ int (*slave_reset)(struct dvb_frontend *fe);
+ struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
+-};
++} __no_const;
+
+ #if IS_ENABLED(CONFIG_DVB_DIB7000P)
+ void *dib7000p_attach(struct dib7000p_ops *ops);
+diff --git a/drivers/media/dvb-frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h
+index 84cc103..5780c54 100644
+--- a/drivers/media/dvb-frontends/dib8000.h
++++ b/drivers/media/dvb-frontends/dib8000.h
+@@ -61,7 +61,7 @@ struct dib8000_ops {
+ int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
+ int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
+ struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
+-};
++} __no_const;
+
+ #if IS_ENABLED(CONFIG_DVB_DIB8000)
+ void *dib8000_attach(struct dib8000_ops *ops);
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
-index ed8cb90..5ef7f79 100644
+index ce27e6d..b70435a 100644
--- a/drivers/media/pci/cx88/cx88-video.c
+++ b/drivers/media/pci/cx88/cx88-video.c
@@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
@@ -45557,8 +45080,73 @@ index 802642d..5534900 100644
/* Parameter declarations */
static int cardtype[IVTV_MAX_CARDS];
+diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
+index 8cbe6b4..ea3601c 100644
+--- a/drivers/media/pci/solo6x10/solo6x10-core.c
++++ b/drivers/media/pci/solo6x10/solo6x10-core.c
+@@ -424,7 +424,7 @@ static void solo_device_release(struct device *dev)
+
+ static int solo_sysfs_init(struct solo_dev *solo_dev)
+ {
+- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
++ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
+ struct device *dev = &solo_dev->dev;
+ const char *driver;
+ int i;
+diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
+index c7141f2..5301fec 100644
+--- a/drivers/media/pci/solo6x10/solo6x10-g723.c
++++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
+@@ -351,7 +351,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
+
+ int solo_g723_init(struct solo_dev *solo_dev)
+ {
+- static struct snd_device_ops ops = { NULL };
++ static struct snd_device_ops ops = { };
+ struct snd_card *card;
+ struct snd_kcontrol_new kctl;
+ char name[32];
+diff --git a/drivers/media/pci/solo6x10/solo6x10-p2m.c b/drivers/media/pci/solo6x10/solo6x10-p2m.c
+index 8c84846..27b4f83 100644
+--- a/drivers/media/pci/solo6x10/solo6x10-p2m.c
++++ b/drivers/media/pci/solo6x10/solo6x10-p2m.c
+@@ -73,7 +73,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
+
+ /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
+ if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
+- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
++ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
+ if (p2m_id < 0)
+ p2m_id = -p2m_id;
+ }
+diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
+index 72017b7..dd37ae6 100644
+--- a/drivers/media/pci/solo6x10/solo6x10.h
++++ b/drivers/media/pci/solo6x10/solo6x10.h
+@@ -219,7 +219,7 @@ struct solo_dev {
+
+ /* P2M DMA Engine */
+ struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
+- atomic_t p2m_count;
++ atomic_unchecked_t p2m_count;
+ int p2m_jiffies;
+ unsigned int p2m_timeouts;
+
+diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
+index 63f0b64..a017c1c 100644
+--- a/drivers/media/pci/tw68/tw68-core.c
++++ b/drivers/media/pci/tw68/tw68-core.c
+@@ -60,7 +60,7 @@ static unsigned int card[] = {[0 ... (TW68_MAXBOARDS - 1)] = UNSET };
+ module_param_array(card, int, NULL, 0444);
+ MODULE_PARM_DESC(card, "card type");
+
+-static atomic_t tw68_instance = ATOMIC_INIT(0);
++static atomic_unchecked_t tw68_instance = ATOMIC_INIT(0);
+
+ /* ------------------------------------------------------------------ */
+
diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
-index dfd0a21..6bbb465 100644
+index 64ab6fb..ef4a8b9 100644
--- a/drivers/media/platform/omap/omap_vout.c
+++ b/drivers/media/platform/omap/omap_vout.c
@@ -63,7 +63,6 @@ enum omap_vout_channels {
@@ -45569,7 +45157,7 @@ index dfd0a21..6bbb465 100644
/* Variables configurable through module params*/
static u32 video1_numbuffers = 3;
static u32 video2_numbuffers = 3;
-@@ -1014,6 +1013,12 @@ static int omap_vout_open(struct file *file)
+@@ -1012,6 +1011,12 @@ static int omap_vout_open(struct file *file)
{
struct videobuf_queue *q;
struct omap_vout_device *vout = NULL;
@@ -45582,7 +45170,7 @@ index dfd0a21..6bbb465 100644
vout = video_drvdata(file);
v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
-@@ -1031,10 +1036,6 @@ static int omap_vout_open(struct file *file)
+@@ -1029,10 +1034,6 @@ static int omap_vout_open(struct file *file)
vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
q = &vout->vbq;
@@ -45633,7 +45221,7 @@ index b713403..53cb5ad 100644
if (done && done != layer->shadow_buf)
vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
-index c5059ba..2649f28 100644
+index b4d2696..91df48e 100644
--- a/drivers/media/platform/s5p-tv/mixer_video.c
+++ b/drivers/media/platform/s5p-tv/mixer_video.c
@@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
@@ -45687,7 +45275,7 @@ index c5059ba..2649f28 100644
/* retrieve update selection rectangle */
res.left = target->x_offset;
-@@ -955,13 +955,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -954,13 +954,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
mxr_output_get(mdev);
mxr_layer_update_output(layer);
@@ -45703,7 +45291,7 @@ index c5059ba..2649f28 100644
mxr_streamer_get(mdev);
return 0;
-@@ -1031,7 +1031,7 @@ static int stop_streaming(struct vb2_queue *vq)
+@@ -1030,7 +1030,7 @@ static void stop_streaming(struct vb2_queue *vq)
spin_unlock_irqrestore(&layer->enq_slock, flags);
/* disabling layer in hardware */
@@ -45712,7 +45300,7 @@ index c5059ba..2649f28 100644
/* remove one streamer */
mxr_streamer_put(mdev);
/* allow changes in output configuration */
-@@ -1070,8 +1070,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
+@@ -1068,8 +1068,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
void mxr_layer_release(struct mxr_layer *layer)
{
@@ -45723,7 +45311,7 @@ index c5059ba..2649f28 100644
}
void mxr_base_layer_release(struct mxr_layer *layer)
-@@ -1097,7 +1097,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
+@@ -1095,7 +1095,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
layer->mdev = mdev;
layer->idx = idx;
@@ -45745,26 +45333,11 @@ index c9388c4..ce71ece 100644
.release = mxr_vp_layer_release,
.buffer_set = mxr_vp_buffer_set,
.stream_set = mxr_vp_stream_set,
-diff --git a/drivers/media/platform/vivi.c b/drivers/media/platform/vivi.c
-index 2d4e73b..8b4d5b6 100644
---- a/drivers/media/platform/vivi.c
-+++ b/drivers/media/platform/vivi.c
-@@ -58,8 +58,8 @@ MODULE_AUTHOR("Mauro Carvalho Chehab, Ted Walther and John Sokol");
- MODULE_LICENSE("Dual BSD/GPL");
- MODULE_VERSION(VIVI_VERSION);
-
--static unsigned video_nr = -1;
--module_param(video_nr, uint, 0644);
-+static int video_nr = -1;
-+module_param(video_nr, int, 0644);
- MODULE_PARM_DESC(video_nr, "videoX start number, -1 is autodetect");
-
- static unsigned n_devs = 1;
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
-index 545c04c..a14bded 100644
+index 82affae..42833ec 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
-@@ -324,6 +324,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
+@@ -333,6 +333,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
unsigned char readbuf[RDS_BUFFER];
int i = 0;
@@ -45773,15 +45346,18 @@ index 545c04c..a14bded 100644
mutex_lock(&dev->lock);
if (dev->rdsstat == 0)
cadet_start_rds(dev);
-@@ -339,7 +341,7 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
- while (i < count && dev->rdsin != dev->rdsout)
+@@ -349,8 +351,9 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
readbuf[i++] = dev->rdsbuf[dev->rdsout++];
+ mutex_unlock(&dev->lock);
- if (i && copy_to_user(data, readbuf, i))
-+ if (i > sizeof(readbuf) || copy_to_user(data, readbuf, i))
- i = -EFAULT;
- unlock:
- mutex_unlock(&dev->lock);
+- return -EFAULT;
++ if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
++ i = -EFAULT;
++
+ return i;
+ }
+
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index 5236035..c622c74 100644
--- a/drivers/media/radio/radio-maxiradio.c
@@ -45822,7 +45398,7 @@ index 8654e0d..0608a64 100644
static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
{
diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
-index 2fd9009..278cc1e 100644
+index 633022b..7f10754 100644
--- a/drivers/media/radio/radio-si476x.c
+++ b/drivers/media/radio/radio-si476x.c
@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
@@ -46261,19 +45837,6 @@ index c890fe4..f9b2ae6 100644
}
static void cinergyt2_fe_release(struct dvb_frontend *fe)
-diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
-index a1c641e..3007da9 100644
---- a/drivers/media/usb/dvb-usb/cxusb.c
-+++ b/drivers/media/usb/dvb-usb/cxusb.c
-@@ -1112,7 +1112,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
-
- struct dib0700_adapter_state {
- int (*set_param_save) (struct dvb_frontend *);
--};
-+} __no_const;
-
- static int dib7070_set_param_override(struct dvb_frontend *fe)
- {
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
index 733a7ff..f8b52e3 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
@@ -46348,7 +45911,7 @@ index 733a7ff..f8b52e3 100644
}
EXPORT_SYMBOL(usb_cypress_load_firmware);
diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
-index ae0f56a..ec71784 100644
+index 1a3df10..57997a5 100644
--- a/drivers/media/usb/dvb-usb/dw2102.c
+++ b/drivers/media/usb/dvb-usb/dw2102.c
@@ -118,7 +118,7 @@ struct su3000_state {
@@ -46361,7 +45924,7 @@ index ae0f56a..ec71784 100644
/* debug */
static int dvb_usb_dw2102_debug;
diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
-index 98d24ae..bc22415 100644
+index 6b0b8b6b..4038398 100644
--- a/drivers/media/usb/dvb-usb/technisat-usb2.c
+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
@@ -87,8 +87,11 @@ struct technisat_usb2_state {
@@ -46435,13 +45998,13 @@ index 98d24ae..bc22415 100644
+ if (led == NULL)
+ return -ENOMEM;
- if (disable_led_control && state != LED_OFF)
+ if (disable_led_control && state != TECH_LED_OFF)
return 0;
+ led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
+
switch (state) {
- case LED_ON:
+ case TECH_LED_ON:
led[1] = 0x82;
@@ -263,16 +274,22 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
@@ -46567,33 +46130,15 @@ index 98d24ae..bc22415 100644
}
diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
-index fca336b..fb70ab7 100644
+index e502a5f..2a27f40 100644
--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
-@@ -328,7 +328,7 @@ struct v4l2_buffer32 {
- __u32 reserved;
- };
-
--static int get_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
-+static int get_v4l2_plane32(struct v4l2_plane __user *up, struct v4l2_plane32 __user *up32,
- enum v4l2_memory memory)
- {
- void __user *up_pln;
-@@ -357,7 +357,7 @@ static int get_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
- return 0;
- }
-
--static int put_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
-+static int put_v4l2_plane32(struct v4l2_plane __user *up, struct v4l2_plane32 __user *up32,
- enum v4l2_memory memory)
- {
- if (copy_in_user(up32, up, 2 * sizeof(__u32)) ||
@@ -427,7 +427,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
* by passing a very big num_planes value */
uplane = compat_alloc_user_space(num_planes *
sizeof(struct v4l2_plane));
-- kp->m.planes = uplane;
-+ kp->m.planes = (struct v4l2_plane __force_kernel *)uplane;
+- kp->m.planes = (__force struct v4l2_plane *)uplane;
++ kp->m.planes = (__force_kernel struct v4l2_plane *)uplane;
while (--num_planes >= 0) {
ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
@@ -46601,64 +46146,49 @@ index fca336b..fb70ab7 100644
if (num_planes == 0)
return 0;
-- uplane = kp->m.planes;
+- uplane = (__force struct v4l2_plane __user *)kp->m.planes;
+ uplane = (struct v4l2_plane __force_user *)kp->m.planes;
if (get_user(p, &up->m.planes))
return -EFAULT;
uplane32 = compat_ptr(p);
-@@ -552,7 +552,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
- get_user(kp->capability, &up->capability) ||
- get_user(kp->flags, &up->flags))
+@@ -562,7 +562,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
+ get_user(kp->flags, &up->flags) ||
+ copy_from_user(&kp->fmt, &up->fmt, sizeof(up->fmt)))
return -EFAULT;
-- kp->base = compat_ptr(tmp);
-+ kp->base = (void __force_kernel *)compat_ptr(tmp);
- get_v4l2_pix_format(&kp->fmt, &up->fmt);
+- kp->base = (__force void *)compat_ptr(tmp);
++ kp->base = (__force_kernel void *)compat_ptr(tmp);
return 0;
}
-@@ -658,7 +658,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
+
+@@ -667,7 +667,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
n * sizeof(struct v4l2_ext_control32)))
return -EFAULT;
kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
-- kp->controls = kcontrols;
-+ kp->controls = (struct v4l2_ext_control __force_kernel *)kcontrols;
+- kp->controls = (__force struct v4l2_ext_control *)kcontrols;
++ kp->controls = (__force_kernel struct v4l2_ext_control *)kcontrols;
while (--n >= 0) {
- if (copy_in_user(kcontrols, ucontrols, sizeof(*ucontrols)))
- return -EFAULT;
-@@ -680,7 +680,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
- static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext_controls32 __user *up)
+ u32 id;
+
+@@ -694,7 +694,7 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
{
struct v4l2_ext_control32 __user *ucontrols;
-- struct v4l2_ext_control __user *kcontrols = kp->controls;
-+ struct v4l2_ext_control __user *kcontrols = (struct v4l2_ext_control __force_user *)kp->controls;
+ struct v4l2_ext_control __user *kcontrols =
+- (__force struct v4l2_ext_control __user *)kp->controls;
++ (struct v4l2_ext_control __force_user *)kp->controls;
int n = kp->count;
compat_caddr_t p;
-@@ -774,7 +774,7 @@ static int put_v4l2_subdev_edid32(struct v4l2_subdev_edid *kp, struct v4l2_subde
- put_user(kp->start_block, &up->start_block) ||
- put_user(kp->blocks, &up->blocks) ||
- put_user(tmp, &up->edid) ||
-- copy_to_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
-+ copy_to_user(up->reserved, kp->reserved, sizeof(kp->reserved)))
+@@ -778,7 +778,7 @@ static int get_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
+ get_user(tmp, &up->edid) ||
+ copy_from_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
return -EFAULT;
+- kp->edid = (__force u8 *)compat_ptr(tmp);
++ kp->edid = (__force_kernel u8 *)compat_ptr(tmp);
return 0;
}
-diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
-index 6ff002b..6b9316b 100644
---- a/drivers/media/v4l2-core/v4l2-ctrls.c
-+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
-@@ -1401,8 +1401,8 @@ static int validate_new(const struct v4l2_ctrl *ctrl,
- return 0;
- case V4L2_CTRL_TYPE_STRING:
-- len = strlen(c->string);
-- if (len < ctrl->minimum)
-+ len = strlen_user(c->string);
-+ if (!len || len < ctrl->minimum)
- return -ERANGE;
- if ((len - ctrl->minimum) % ctrl->step)
- return -ERANGE;
diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
-index 02d1b63..5fd6b16 100644
+index 015f92a..59e311e 100644
--- a/drivers/media/v4l2-core/v4l2-device.c
+++ b/drivers/media/v4l2-core/v4l2-device.c
@@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
@@ -46674,10 +46204,10 @@ index 02d1b63..5fd6b16 100644
if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
-index 707aef7..93b8ac0 100644
+index 9ccb19a..d131468 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1942,7 +1942,8 @@ struct v4l2_ioctl_info {
+@@ -2142,7 +2142,8 @@ struct v4l2_ioctl_info {
struct file *file, void *fh, void *p);
} u;
void (*debug)(const void *arg, bool write_only);
@@ -46687,7 +46217,7 @@ index 707aef7..93b8ac0 100644
/* This control needs a priority check */
#define INFO_FL_PRIO (1 << 0)
-@@ -2123,7 +2124,7 @@ static long __video_do_ioctl(struct file *file,
+@@ -2326,7 +2327,7 @@ static long __video_do_ioctl(struct file *file,
struct video_device *vfd = video_devdata(file);
const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
bool write_only = false;
@@ -46696,47 +46226,47 @@ index 707aef7..93b8ac0 100644
const struct v4l2_ioctl_info *info;
void *fh = file->private_data;
struct v4l2_fh *vfh = NULL;
-@@ -2197,7 +2198,7 @@ done:
- }
-
- static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
-- void * __user *user_ptr, void ***kernel_ptr)
-+ void __user **user_ptr, void ***kernel_ptr)
- {
- int ret = 0;
-
-@@ -2213,7 +2214,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
+@@ -2413,7 +2414,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
ret = -EINVAL;
break;
}
- *user_ptr = (void __user *)buf->m.planes;
+ *user_ptr = (void __force_user *)buf->m.planes;
- *kernel_ptr = (void *)&buf->m.planes;
+ *kernel_ptr = (void **)&buf->m.planes;
*array_size = sizeof(struct v4l2_plane) * buf->length;
ret = 1;
-@@ -2248,7 +2249,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
+@@ -2430,7 +2431,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
+ ret = -EINVAL;
+ break;
+ }
+- *user_ptr = (void __user *)edid->edid;
++ *user_ptr = (void __force_user *)edid->edid;
+ *kernel_ptr = (void **)&edid->edid;
+ *array_size = edid->blocks * 128;
+ ret = 1;
+@@ -2448,7 +2449,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
ret = -EINVAL;
break;
}
- *user_ptr = (void __user *)ctrls->controls;
+ *user_ptr = (void __force_user *)ctrls->controls;
- *kernel_ptr = (void *)&ctrls->controls;
+ *kernel_ptr = (void **)&ctrls->controls;
*array_size = sizeof(struct v4l2_ext_control)
* ctrls->count;
-@@ -2349,7 +2350,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
+@@ -2549,7 +2550,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
}
if (has_array_args) {
-- *kernel_ptr = user_ptr;
+- *kernel_ptr = (void __force *)user_ptr;
+ *kernel_ptr = (void __force_kernel *)user_ptr;
if (copy_to_user(user_ptr, mbuf, array_size))
err = -EFAULT;
goto out_array_args;
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
-index 570b18a..f880314 100644
+index 187f836..679544b 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
-@@ -6755,8 +6755,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
+@@ -6746,8 +6746,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
@@ -46750,7 +46280,7 @@ index 570b18a..f880314 100644
/*
* Rounding UP to nearest 4-kB boundary here...
*/
-@@ -6769,7 +6774,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
+@@ -6760,7 +6765,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
ioc->facts.GlobalCredits);
seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
@@ -46763,7 +46293,7 @@ index 570b18a..f880314 100644
seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
-index 00d339c..2ea899d 100644
+index 0707fa2..70ca794 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
@@ -46814,35 +46344,6 @@ index 00d339c..2ea899d 100644
static inline struct sas_port *
mptsas_get_port(struct mptsas_phyinfo *phy_info)
{
-diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
-index 727819c..ad74694 100644
---- a/drivers/message/fusion/mptscsih.c
-+++ b/drivers/message/fusion/mptscsih.c
-@@ -1271,15 +1271,16 @@ mptscsih_info(struct Scsi_Host *SChost)
-
- h = shost_priv(SChost);
-
-- if (h) {
-- if (h->info_kbuf == NULL)
-- if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
-- return h->info_kbuf;
-- h->info_kbuf[0] = '\0';
-+ if (!h)
-+ return NULL;
-
-- mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
-- h->info_kbuf[size-1] = '\0';
-- }
-+ if (h->info_kbuf == NULL)
-+ if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
-+ return h->info_kbuf;
-+ h->info_kbuf[0] = '\0';
-+
-+ mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
-+ h->info_kbuf[size-1] = '\0';
-
- return h->info_kbuf;
- }
diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
index b7d87cd..3fb36da 100644
--- a/drivers/message/i2o/i2o_proc.c
@@ -47008,7 +46509,7 @@ index b7d87cd..3fb36da 100644
token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
-index a8c08f3..155fe3d 100644
+index 92752fb..a7494f6 100644
--- a/drivers/message/i2o/iop.c
+++ b/drivers/message/i2o/iop.c
@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
@@ -47025,7 +46526,7 @@ index a8c08f3..155fe3d 100644
list_add(&entry->list, &c->context_list);
-@@ -1077,7 +1077,7 @@ struct i2o_controller *i2o_iop_alloc(void)
+@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
#if BITS_PER_LONG == 64
spin_lock_init(&c->context_list_lock);
@@ -47035,7 +46536,7 @@ index a8c08f3..155fe3d 100644
#endif
diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
-index d1a22aa..d0f7bf7 100644
+index b2c7e3b..85aa4764 100644
--- a/drivers/mfd/ab8500-debugfs.c
+++ b/drivers/mfd/ab8500-debugfs.c
@@ -100,7 +100,7 @@ static int irq_last;
@@ -47048,7 +46549,7 @@ index d1a22aa..d0f7bf7 100644
static u8 avg_sample = SAMPLE_16;
diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
-index a83eed5..62a58a9 100644
+index c880c89..45a7c68 100644
--- a/drivers/mfd/max8925-i2c.c
+++ b/drivers/mfd/max8925-i2c.c
@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
@@ -47061,7 +46562,7 @@ index a83eed5..62a58a9 100644
if (node && !pdata) {
diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
-index d657331..0d9a80f 100644
+index 7612d89..70549c2 100644
--- a/drivers/mfd/tps65910.c
+++ b/drivers/mfd/tps65910.c
@@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
@@ -47074,10 +46575,10 @@ index d657331..0d9a80f 100644
if (!irq) {
dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
-index 9aa6d1e..1631bfc 100644
+index 1b772ef..01e77d33 100644
--- a/drivers/mfd/twl4030-irq.c
+++ b/drivers/mfd/twl4030-irq.c
-@@ -35,6 +35,7 @@
+@@ -34,6 +34,7 @@
#include <linux/of.h>
#include <linux/irqdomain.h>
#include <linux/i2c/twl.h>
@@ -47085,7 +46586,7 @@ index 9aa6d1e..1631bfc 100644
#include "twl-core.h"
-@@ -726,10 +727,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
+@@ -729,10 +730,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
* Install an irq handler for each of the SIH modules;
* clone dummy irq_chip since PIH can't *do* anything
*/
@@ -47117,10 +46618,10 @@ index 464419b..64bae8d 100644
c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
"c2port%d", c2dev->id);
diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
-index 9c34e57..b981cda 100644
+index 3f2b625..945e179 100644
--- a/drivers/misc/eeprom/sunxi_sid.c
+++ b/drivers/misc/eeprom/sunxi_sid.c
-@@ -127,7 +127,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
+@@ -126,7 +126,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, sid_data);
@@ -47154,10 +46655,10 @@ index 36f5d52..32311c3 100644
if (memcmp(before, after, BREAK_INSTR_SIZE)) {
printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
-index 036effe..b3a6336 100644
+index 3ef4627..8d00486 100644
--- a/drivers/misc/lis3lv02d/lis3lv02d.c
+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
-@@ -498,7 +498,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
+@@ -497,7 +497,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
* the lid is closed. This leads to interrupts as soon as a little move
* is done.
*/
@@ -47166,7 +46667,7 @@ index 036effe..b3a6336 100644
wake_up_interruptible(&lis3->misc_wait);
kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
-@@ -584,7 +584,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
+@@ -583,7 +583,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
if (lis3->pm_dev)
pm_runtime_get_sync(lis3->pm_dev);
@@ -47175,7 +46676,7 @@ index 036effe..b3a6336 100644
return 0;
}
-@@ -616,7 +616,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
+@@ -615,7 +615,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
add_wait_queue(&lis3->misc_wait, &wait);
while (true) {
set_current_state(TASK_INTERRUPTIBLE);
@@ -47184,7 +46685,7 @@ index 036effe..b3a6336 100644
if (data)
break;
-@@ -657,7 +657,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
+@@ -656,7 +656,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
struct lis3lv02d, miscdev);
poll_wait(file, &lis3->misc_wait, wait);
@@ -47510,10 +47011,10 @@ index 82dc574..8539ab2 100644
break;
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
-index df72c47..7e2aad4 100644
+index a11451f..9e1bbad 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
-@@ -575,7 +575,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
+@@ -574,7 +574,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
if (idata->ic.postsleep_min_us)
usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
@@ -47523,10 +47024,10 @@ index df72c47..7e2aad4 100644
goto cmd_rel_host;
}
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
-index e5b5eeb..7bf2212 100644
+index 7911e05..d0f9dda 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
-@@ -247,7 +247,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
+@@ -267,7 +267,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
void *data_buf;
int is_on_stack;
@@ -47536,10 +47037,10 @@ index e5b5eeb..7bf2212 100644
/*
* dma onto stack is unsafe/nonportable, but callers to this
diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
-index 6bf24ab..13d0293b 100644
+index 01b99e8..5c325e3 100644
--- a/drivers/mmc/host/dw_mmc.h
+++ b/drivers/mmc/host/dw_mmc.h
-@@ -258,5 +258,5 @@ struct dw_mci_drv_data {
+@@ -265,5 +265,5 @@ struct dw_mci_drv_data {
int (*parse_dt)(struct dw_mci *host);
int (*execute_tuning)(struct dw_mci_slot *slot, u32 opcode,
struct dw_mci_tuning_data *tuning_data);
@@ -47547,11 +47048,11 @@ index 6bf24ab..13d0293b 100644
+} __do_const;
#endif /* _DW_MMC_H_ */
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
-index b931226..df6a085 100644
+index 43af791..86f4c48 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
-@@ -1504,7 +1504,9 @@ static int mmci_probe(struct amba_device *dev,
- }
+@@ -1628,7 +1628,9 @@ static int mmci_probe(struct amba_device *dev,
+ mmc->caps |= MMC_CAP_CMD23;
if (variant->busy_detect) {
- mmci_ops.card_busy = mmci_card_busy;
@@ -47559,13 +47060,28 @@ index b931226..df6a085 100644
+ *(void **)&mmci_ops.card_busy = mmci_card_busy;
+ pax_close_kernel();
mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
+ mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
+ mmc->max_busy_timeout = 0;
+diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
+index 9c2b9cb..cebb09a 100644
+--- a/drivers/mmc/host/omap_hsmmc.c
++++ b/drivers/mmc/host/omap_hsmmc.c
+@@ -2113,7 +2113,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
+
+ if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
+ dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
+- omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
++ pax_open_kernel();
++ *(void **)&omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
++ pax_close_kernel();
}
+ pm_runtime_enable(host->dev);
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
-index b841bb7..d82712f5 100644
+index 587ee0e..b3bbcab 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
-@@ -1031,9 +1031,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
+@@ -1054,9 +1054,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
host->mmc->caps |= MMC_CAP_1_8V_DDR;
}
@@ -47581,13 +47097,13 @@ index b841bb7..d82712f5 100644
if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
-index 6debda9..2ba7427 100644
+index 0ce6eb1..8dcce1b 100644
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
-@@ -668,9 +668,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
+@@ -584,9 +584,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
* we can use overriding functions instead of default.
*/
- if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK) {
+ if (sc->no_divider) {
- sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
- sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
- sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
@@ -47600,10 +47116,10 @@ index 6debda9..2ba7427 100644
/* It supports additional host capabilities if needed */
diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
-index 096993f..f02c23b 100644
+index 423666b..81ff5eb 100644
--- a/drivers/mtd/chips/cfi_cmdset_0020.c
+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
-@@ -669,7 +669,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
+@@ -666,7 +666,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
size_t totlen = 0, thislen;
int ret = 0;
size_t buflen = 0;
@@ -47613,7 +47129,7 @@ index 096993f..f02c23b 100644
if (!ECCBUF_SIZE) {
/* We should fall back to a general writev implementation.
diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
-index c07cd57..61c4fbd 100644
+index b3b7ca1..5dd4634 100644
--- a/drivers/mtd/nand/denali.c
+++ b/drivers/mtd/nand/denali.c
@@ -24,6 +24,7 @@
@@ -47625,10 +47141,10 @@ index c07cd57..61c4fbd 100644
#include "denali.h"
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
-index ca6369f..0ce9fed 100644
+index 959cb9b..8520fe5 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
-@@ -369,7 +369,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
+@@ -386,7 +386,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
/* first try to map the upper buffer directly */
if (virt_addr_valid(this->upper_buf) &&
@@ -47650,7 +47166,7 @@ index 51b9d6a..52af9a7 100644
#include <linux/mtd/nand.h>
#include <linux/mtd/nftl.h>
diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
-index cf49c22..971b133 100644
+index c23184a..4115c41 100644
--- a/drivers/mtd/sm_ftl.c
+++ b/drivers/mtd/sm_ftl.c
@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
@@ -47662,11 +47178,24 @@ index cf49c22..971b133 100644
struct attribute **attributes;
struct sm_sysfs_attribute *vendor_attribute;
char *vendor;
+diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
+index a5115fb..81b03f6 100644
+--- a/drivers/net/bonding/bond_main.c
++++ b/drivers/net/bonding/bond_main.c
+@@ -3749,7 +3749,7 @@ int bond_3ad_xor_xmit(struct sk_buff *skb, struct net_device *dev)
+ bond_dev_queue_xmit(bond, skb, slave->dev);
+ } else {
+ dev_kfree_skb_any(skb);
+- atomic_long_inc(&dev->tx_dropped);
++ atomic_long_inc_unchecked(&dev->tx_dropped);
+ }
+
+ return NETDEV_TX_OK;
diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
-index 70651f8..7eb1bdf 100644
+index 45f09a6..f154f8d 100644
--- a/drivers/net/bonding/bond_netlink.c
+++ b/drivers/net/bonding/bond_netlink.c
-@@ -542,7 +542,7 @@ nla_put_failure:
+@@ -585,7 +585,7 @@ nla_put_failure:
return -EMSGSIZE;
}
@@ -47689,10 +47218,10 @@ index 5e40a8b..126bfda 100644
.priv_size = sizeof(struct cfhsi),
.setup = cfhsi_setup,
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
-index 9e7d95d..d447b88 100644
+index 98d73aa..63ef9da 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
-@@ -104,7 +104,7 @@ config CAN_JANZ_ICAN3
+@@ -98,7 +98,7 @@ config CAN_JANZ_ICAN3
config CAN_FLEXCAN
tristate "Support for Freescale FLEXCAN based chips"
@@ -47702,10 +47231,10 @@ index 9e7d95d..d447b88 100644
Say Y here if you want to support for Freescale FlexCAN.
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
-index 1468c46..1f8e748 100644
+index 4b008c9..2b1151f 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
-@@ -760,7 +760,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
+@@ -872,7 +872,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
return -EOPNOTSUPP;
}
@@ -47728,10 +47257,10 @@ index 4e94057..32032ff 100644
.setup = vcan_setup,
};
diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
-index bd8f84b..68ba9f1 100644
+index ff435fb..d408b1f 100644
--- a/drivers/net/dummy.c
+++ b/drivers/net/dummy.c
-@@ -155,7 +155,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])
+@@ -149,7 +149,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])
return 0;
}
@@ -47741,7 +47270,7 @@ index bd8f84b..68ba9f1 100644
.setup = dummy_setup,
.validate = dummy_validate,
diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
-index 455d4c3..3353ee7 100644
+index 1d162cc..b546a75 100644
--- a/drivers/net/ethernet/8390/ax88796.c
+++ b/drivers/net/ethernet/8390/ax88796.c
@@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
@@ -47757,11 +47286,702 @@ index 455d4c3..3353ee7 100644
}
if (!request_mem_region(mem->start, mem_size, pdev->name)) {
+diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
+index 4efc435..4ab9e14 100644
+--- a/drivers/net/ethernet/altera/altera_tse_main.c
++++ b/drivers/net/ethernet/altera/altera_tse_main.c
+@@ -1224,7 +1224,7 @@ static int tse_shutdown(struct net_device *dev)
+ return 0;
+ }
+
+-static struct net_device_ops altera_tse_netdev_ops = {
++static net_device_ops_no_const altera_tse_netdev_ops __read_only = {
+ .ndo_open = tse_open,
+ .ndo_stop = tse_shutdown,
+ .ndo_start_xmit = tse_start_xmit,
+@@ -1461,11 +1461,13 @@ static int altera_tse_probe(struct platform_device *pdev)
+ ndev->netdev_ops = &altera_tse_netdev_ops;
+ altera_tse_set_ethtool_ops(ndev);
+
++ pax_open_kernel();
+ altera_tse_netdev_ops.ndo_set_rx_mode = tse_set_rx_mode;
+
+ if (priv->hash_filter)
+ altera_tse_netdev_ops.ndo_set_rx_mode =
+ tse_set_rx_mode_hashfilter;
++ pax_close_kernel();
+
+ /* Scatter/gather IO is not supported,
+ * so it is turned off
+diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
+index caade30..3e257d9 100644
+--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
++++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
+@@ -1072,14 +1072,14 @@ do { \
+ * operations, everything works on mask values.
+ */
+ #define XMDIO_READ(_pdata, _mmd, _reg) \
+- ((_pdata)->hw_if.read_mmd_regs((_pdata), 0, \
++ ((_pdata)->hw_if->read_mmd_regs((_pdata), 0, \
+ MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))
+
+ #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask) \
+ (XMDIO_READ((_pdata), _mmd, _reg) & _mask)
+
+ #define XMDIO_WRITE(_pdata, _mmd, _reg, _val) \
+- ((_pdata)->hw_if.write_mmd_regs((_pdata), 0, \
++ ((_pdata)->hw_if->write_mmd_regs((_pdata), 0, \
+ MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))
+
+ #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val) \
+diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
+index 8a50b01..39c1ad0 100644
+--- a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
++++ b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
+@@ -187,7 +187,7 @@ static int xgbe_dcb_ieee_setets(struct net_device *netdev,
+
+ memcpy(pdata->ets, ets, sizeof(*pdata->ets));
+
+- pdata->hw_if.config_dcb_tc(pdata);
++ pdata->hw_if->config_dcb_tc(pdata);
+
+ return 0;
+ }
+@@ -226,7 +226,7 @@ static int xgbe_dcb_ieee_setpfc(struct net_device *netdev,
+
+ memcpy(pdata->pfc, pfc, sizeof(*pdata->pfc));
+
+- pdata->hw_if.config_dcb_pfc(pdata);
++ pdata->hw_if->config_dcb_pfc(pdata);
+
+ return 0;
+ }
+diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
+index 6fc5da0..61ac2cb 100644
+--- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
++++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
+@@ -235,7 +235,7 @@ err_ring:
+
+ static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
+ {
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+ struct xgbe_channel *channel;
+ struct xgbe_ring *ring;
+ struct xgbe_ring_data *rdata;
+@@ -276,7 +276,7 @@ static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
+
+ static void xgbe_wrapper_rx_descriptor_init(struct xgbe_prv_data *pdata)
+ {
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+ struct xgbe_channel *channel;
+ struct xgbe_ring *ring;
+ struct xgbe_ring_desc *rdesc;
+@@ -505,7 +505,7 @@ err_out:
+ static void xgbe_realloc_skb(struct xgbe_channel *channel)
+ {
+ struct xgbe_prv_data *pdata = channel->pdata;
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+ struct xgbe_ring *ring = channel->rx_ring;
+ struct xgbe_ring_data *rdata;
+ struct sk_buff *skb = NULL;
+@@ -546,17 +546,12 @@ static void xgbe_realloc_skb(struct xgbe_channel *channel)
+ DBGPR("<--xgbe_realloc_skb\n");
+ }
+
+-void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *desc_if)
+-{
+- DBGPR("-->xgbe_init_function_ptrs_desc\n");
+-
+- desc_if->alloc_ring_resources = xgbe_alloc_ring_resources;
+- desc_if->free_ring_resources = xgbe_free_ring_resources;
+- desc_if->map_tx_skb = xgbe_map_tx_skb;
+- desc_if->realloc_skb = xgbe_realloc_skb;
+- desc_if->unmap_skb = xgbe_unmap_skb;
+- desc_if->wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init;
+- desc_if->wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init;
+-
+- DBGPR("<--xgbe_init_function_ptrs_desc\n");
+-}
++const struct xgbe_desc_if default_xgbe_desc_if = {
++ .alloc_ring_resources = xgbe_alloc_ring_resources,
++ .free_ring_resources = xgbe_free_ring_resources,
++ .map_tx_skb = xgbe_map_tx_skb,
++ .realloc_skb = xgbe_realloc_skb,
++ .unmap_skb = xgbe_unmap_skb,
++ .wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init,
++ .wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init,
++};
+diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
+index 9da3a03..022f15c 100644
+--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
++++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
+@@ -2462,7 +2462,7 @@ static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
+
+ static int xgbe_init(struct xgbe_prv_data *pdata)
+ {
+- struct xgbe_desc_if *desc_if = &pdata->desc_if;
++ struct xgbe_desc_if *desc_if = pdata->desc_if;
+ int ret;
+
+ DBGPR("-->xgbe_init\n");
+@@ -2524,101 +2524,96 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
+ return 0;
+ }
+
+-void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
+-{
+- DBGPR("-->xgbe_init_function_ptrs\n");
+-
+- hw_if->tx_complete = xgbe_tx_complete;
+-
+- hw_if->set_promiscuous_mode = xgbe_set_promiscuous_mode;
+- hw_if->set_all_multicast_mode = xgbe_set_all_multicast_mode;
+- hw_if->add_mac_addresses = xgbe_add_mac_addresses;
+- hw_if->set_mac_address = xgbe_set_mac_address;
+-
+- hw_if->enable_rx_csum = xgbe_enable_rx_csum;
+- hw_if->disable_rx_csum = xgbe_disable_rx_csum;
+-
+- hw_if->enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping;
+- hw_if->disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping;
+- hw_if->enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering;
+- hw_if->disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering;
+- hw_if->update_vlan_hash_table = xgbe_update_vlan_hash_table;
+-
+- hw_if->read_mmd_regs = xgbe_read_mmd_regs;
+- hw_if->write_mmd_regs = xgbe_write_mmd_regs;
+-
+- hw_if->set_gmii_speed = xgbe_set_gmii_speed;
+- hw_if->set_gmii_2500_speed = xgbe_set_gmii_2500_speed;
+- hw_if->set_xgmii_speed = xgbe_set_xgmii_speed;
+-
+- hw_if->enable_tx = xgbe_enable_tx;
+- hw_if->disable_tx = xgbe_disable_tx;
+- hw_if->enable_rx = xgbe_enable_rx;
+- hw_if->disable_rx = xgbe_disable_rx;
+-
+- hw_if->powerup_tx = xgbe_powerup_tx;
+- hw_if->powerdown_tx = xgbe_powerdown_tx;
+- hw_if->powerup_rx = xgbe_powerup_rx;
+- hw_if->powerdown_rx = xgbe_powerdown_rx;
+-
+- hw_if->pre_xmit = xgbe_pre_xmit;
+- hw_if->dev_read = xgbe_dev_read;
+- hw_if->enable_int = xgbe_enable_int;
+- hw_if->disable_int = xgbe_disable_int;
+- hw_if->init = xgbe_init;
+- hw_if->exit = xgbe_exit;
++const struct xgbe_hw_if default_xgbe_hw_if = {
++ .tx_complete = xgbe_tx_complete,
++
++ .set_promiscuous_mode = xgbe_set_promiscuous_mode,
++ .set_all_multicast_mode = xgbe_set_all_multicast_mode,
++ .add_mac_addresses = xgbe_add_mac_addresses,
++ .set_mac_address = xgbe_set_mac_address,
++
++ .enable_rx_csum = xgbe_enable_rx_csum,
++ .disable_rx_csum = xgbe_disable_rx_csum,
++
++ .enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping,
++ .disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping,
++ .enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering,
++ .disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering,
++ .update_vlan_hash_table = xgbe_update_vlan_hash_table,
++
++ .read_mmd_regs = xgbe_read_mmd_regs,
++ .write_mmd_regs = xgbe_write_mmd_regs,
++
++ .set_gmii_speed = xgbe_set_gmii_speed,
++ .set_gmii_2500_speed = xgbe_set_gmii_2500_speed,
++ .set_xgmii_speed = xgbe_set_xgmii_speed,
++
++ .enable_tx = xgbe_enable_tx,
++ .disable_tx = xgbe_disable_tx,
++ .enable_rx = xgbe_enable_rx,
++ .disable_rx = xgbe_disable_rx,
++
++ .powerup_tx = xgbe_powerup_tx,
++ .powerdown_tx = xgbe_powerdown_tx,
++ .powerup_rx = xgbe_powerup_rx,
++ .powerdown_rx = xgbe_powerdown_rx,
++
++ .pre_xmit = xgbe_pre_xmit,
++ .dev_read = xgbe_dev_read,
++ .enable_int = xgbe_enable_int,
++ .disable_int = xgbe_disable_int,
++ .init = xgbe_init,
++ .exit = xgbe_exit,
+
+ /* Descriptor related Sequences have to be initialized here */
+- hw_if->tx_desc_init = xgbe_tx_desc_init;
+- hw_if->rx_desc_init = xgbe_rx_desc_init;
+- hw_if->tx_desc_reset = xgbe_tx_desc_reset;
+- hw_if->rx_desc_reset = xgbe_rx_desc_reset;
+- hw_if->is_last_desc = xgbe_is_last_desc;
+- hw_if->is_context_desc = xgbe_is_context_desc;
++ .tx_desc_init = xgbe_tx_desc_init,
++ .rx_desc_init = xgbe_rx_desc_init,
++ .tx_desc_reset = xgbe_tx_desc_reset,
++ .rx_desc_reset = xgbe_rx_desc_reset,
++ .is_last_desc = xgbe_is_last_desc,
++ .is_context_desc = xgbe_is_context_desc,
+
+ /* For FLOW ctrl */
+- hw_if->config_tx_flow_control = xgbe_config_tx_flow_control;
+- hw_if->config_rx_flow_control = xgbe_config_rx_flow_control;
++ .config_tx_flow_control = xgbe_config_tx_flow_control,
++ .config_rx_flow_control = xgbe_config_rx_flow_control,
+
+ /* For RX coalescing */
+- hw_if->config_rx_coalesce = xgbe_config_rx_coalesce;
+- hw_if->config_tx_coalesce = xgbe_config_tx_coalesce;
+- hw_if->usec_to_riwt = xgbe_usec_to_riwt;
+- hw_if->riwt_to_usec = xgbe_riwt_to_usec;
++ .config_rx_coalesce = xgbe_config_rx_coalesce,
++ .config_tx_coalesce = xgbe_config_tx_coalesce,
++ .usec_to_riwt = xgbe_usec_to_riwt,
++ .riwt_to_usec = xgbe_riwt_to_usec,
+
+ /* For RX and TX threshold config */
+- hw_if->config_rx_threshold = xgbe_config_rx_threshold;
+- hw_if->config_tx_threshold = xgbe_config_tx_threshold;
++ .config_rx_threshold = xgbe_config_rx_threshold,
++ .config_tx_threshold = xgbe_config_tx_threshold,
+
+ /* For RX and TX Store and Forward Mode config */
+- hw_if->config_rsf_mode = xgbe_config_rsf_mode;
+- hw_if->config_tsf_mode = xgbe_config_tsf_mode;
++ .config_rsf_mode = xgbe_config_rsf_mode,
++ .config_tsf_mode = xgbe_config_tsf_mode,
+
+ /* For TX DMA Operating on Second Frame config */
+- hw_if->config_osp_mode = xgbe_config_osp_mode;
++ .config_osp_mode = xgbe_config_osp_mode,
+
+ /* For RX and TX PBL config */
+- hw_if->config_rx_pbl_val = xgbe_config_rx_pbl_val;
+- hw_if->get_rx_pbl_val = xgbe_get_rx_pbl_val;
+- hw_if->config_tx_pbl_val = xgbe_config_tx_pbl_val;
+- hw_if->get_tx_pbl_val = xgbe_get_tx_pbl_val;
+- hw_if->config_pblx8 = xgbe_config_pblx8;
++ .config_rx_pbl_val = xgbe_config_rx_pbl_val,
++ .get_rx_pbl_val = xgbe_get_rx_pbl_val,
++ .config_tx_pbl_val = xgbe_config_tx_pbl_val,
++ .get_tx_pbl_val = xgbe_get_tx_pbl_val,
++ .config_pblx8 = xgbe_config_pblx8,
+
+ /* For MMC statistics support */
+- hw_if->tx_mmc_int = xgbe_tx_mmc_int;
+- hw_if->rx_mmc_int = xgbe_rx_mmc_int;
+- hw_if->read_mmc_stats = xgbe_read_mmc_stats;
++ .tx_mmc_int = xgbe_tx_mmc_int,
++ .rx_mmc_int = xgbe_rx_mmc_int,
++ .read_mmc_stats = xgbe_read_mmc_stats,
+
+ /* For PTP config */
+- hw_if->config_tstamp = xgbe_config_tstamp;
+- hw_if->update_tstamp_addend = xgbe_update_tstamp_addend;
+- hw_if->set_tstamp_time = xgbe_set_tstamp_time;
+- hw_if->get_tstamp_time = xgbe_get_tstamp_time;
+- hw_if->get_tx_tstamp = xgbe_get_tx_tstamp;
++ .config_tstamp = xgbe_config_tstamp,
++ .update_tstamp_addend = xgbe_update_tstamp_addend,
++ .set_tstamp_time = xgbe_set_tstamp_time,
++ .get_tstamp_time = xgbe_get_tstamp_time,
++ .get_tx_tstamp = xgbe_get_tx_tstamp,
+
+ /* For Data Center Bridging config */
+- hw_if->config_dcb_tc = xgbe_config_dcb_tc;
+- hw_if->config_dcb_pfc = xgbe_config_dcb_pfc;
+-
+- DBGPR("<--xgbe_init_function_ptrs\n");
+-}
++ .config_dcb_tc = xgbe_config_dcb_tc,
++ .config_dcb_pfc = xgbe_config_dcb_pfc,
++};
+diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
+index 2349ea9..a83a677 100644
+--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
++++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
+@@ -154,7 +154,7 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
+
+ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
+ {
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+ struct xgbe_channel *channel;
+ enum xgbe_int int_id;
+ unsigned int i;
+@@ -176,7 +176,7 @@ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
+
+ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
+ {
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+ struct xgbe_channel *channel;
+ enum xgbe_int int_id;
+ unsigned int i;
+@@ -199,7 +199,7 @@ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
+ static irqreturn_t xgbe_isr(int irq, void *data)
+ {
+ struct xgbe_prv_data *pdata = data;
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+ struct xgbe_channel *channel;
+ unsigned int dma_isr, dma_ch_isr;
+ unsigned int mac_isr, mac_tssr;
+@@ -446,7 +446,7 @@ static void xgbe_napi_disable(struct xgbe_prv_data *pdata, unsigned int del)
+
+ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
+ {
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+
+ DBGPR("-->xgbe_init_tx_coalesce\n");
+
+@@ -460,7 +460,7 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
+
+ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
+ {
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+
+ DBGPR("-->xgbe_init_rx_coalesce\n");
+
+@@ -474,7 +474,7 @@ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
+
+ static void xgbe_free_tx_skbuff(struct xgbe_prv_data *pdata)
+ {
+- struct xgbe_desc_if *desc_if = &pdata->desc_if;
++ struct xgbe_desc_if *desc_if = pdata->desc_if;
+ struct xgbe_channel *channel;
+ struct xgbe_ring *ring;
+ struct xgbe_ring_data *rdata;
+@@ -499,7 +499,7 @@ static void xgbe_free_tx_skbuff(struct xgbe_prv_data *pdata)
+
+ static void xgbe_free_rx_skbuff(struct xgbe_prv_data *pdata)
+ {
+- struct xgbe_desc_if *desc_if = &pdata->desc_if;
++ struct xgbe_desc_if *desc_if = pdata->desc_if;
+ struct xgbe_channel *channel;
+ struct xgbe_ring *ring;
+ struct xgbe_ring_data *rdata;
+@@ -525,7 +525,7 @@ static void xgbe_free_rx_skbuff(struct xgbe_prv_data *pdata)
+ static void xgbe_adjust_link(struct net_device *netdev)
+ {
+ struct xgbe_prv_data *pdata = netdev_priv(netdev);
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+ struct phy_device *phydev = pdata->phydev;
+ int new_state = 0;
+
+@@ -633,7 +633,7 @@ static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
+ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
+ {
+ struct xgbe_prv_data *pdata = netdev_priv(netdev);
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+ unsigned long flags;
+
+ DBGPR("-->xgbe_powerdown\n");
+@@ -671,7 +671,7 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
+ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
+ {
+ struct xgbe_prv_data *pdata = netdev_priv(netdev);
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+ unsigned long flags;
+
+ DBGPR("-->xgbe_powerup\n");
+@@ -708,7 +708,7 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
+
+ static int xgbe_start(struct xgbe_prv_data *pdata)
+ {
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+ struct net_device *netdev = pdata->netdev;
+
+ DBGPR("-->xgbe_start\n");
+@@ -734,7 +734,7 @@ static int xgbe_start(struct xgbe_prv_data *pdata)
+
+ static void xgbe_stop(struct xgbe_prv_data *pdata)
+ {
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+ struct net_device *netdev = pdata->netdev;
+
+ DBGPR("-->xgbe_stop\n");
+@@ -754,7 +754,7 @@ static void xgbe_stop(struct xgbe_prv_data *pdata)
+
+ static void xgbe_restart_dev(struct xgbe_prv_data *pdata, unsigned int reset)
+ {
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+
+ DBGPR("-->xgbe_restart_dev\n");
+
+@@ -951,7 +951,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
+ return -ERANGE;
+ }
+
+- pdata->hw_if.config_tstamp(pdata, mac_tscr);
++ pdata->hw_if->config_tstamp(pdata, mac_tscr);
+
+ memcpy(&pdata->tstamp_config, &config, sizeof(config));
+
+@@ -1089,8 +1089,8 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
+ static int xgbe_open(struct net_device *netdev)
+ {
+ struct xgbe_prv_data *pdata = netdev_priv(netdev);
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
+- struct xgbe_desc_if *desc_if = &pdata->desc_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
++ struct xgbe_desc_if *desc_if = pdata->desc_if;
+ int ret;
+
+ DBGPR("-->xgbe_open\n");
+@@ -1170,8 +1170,8 @@ err_phy_init:
+ static int xgbe_close(struct net_device *netdev)
+ {
+ struct xgbe_prv_data *pdata = netdev_priv(netdev);
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
+- struct xgbe_desc_if *desc_if = &pdata->desc_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
++ struct xgbe_desc_if *desc_if = pdata->desc_if;
+
+ DBGPR("-->xgbe_close\n");
+
+@@ -1205,8 +1205,8 @@ static int xgbe_close(struct net_device *netdev)
+ static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
+ {
+ struct xgbe_prv_data *pdata = netdev_priv(netdev);
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
+- struct xgbe_desc_if *desc_if = &pdata->desc_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
++ struct xgbe_desc_if *desc_if = pdata->desc_if;
+ struct xgbe_channel *channel;
+ struct xgbe_ring *ring;
+ struct xgbe_packet_data *packet;
+@@ -1275,7 +1275,7 @@ tx_netdev_return:
+ static void xgbe_set_rx_mode(struct net_device *netdev)
+ {
+ struct xgbe_prv_data *pdata = netdev_priv(netdev);
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+ unsigned int pr_mode, am_mode;
+
+ DBGPR("-->xgbe_set_rx_mode\n");
+@@ -1294,7 +1294,7 @@ static void xgbe_set_rx_mode(struct net_device *netdev)
+ static int xgbe_set_mac_address(struct net_device *netdev, void *addr)
+ {
+ struct xgbe_prv_data *pdata = netdev_priv(netdev);
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+ struct sockaddr *saddr = addr;
+
+ DBGPR("-->xgbe_set_mac_address\n");
+@@ -1361,7 +1361,7 @@ static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
+
+ DBGPR("-->%s\n", __func__);
+
+- pdata->hw_if.read_mmc_stats(pdata);
++ pdata->hw_if->read_mmc_stats(pdata);
+
+ s->rx_packets = pstats->rxframecount_gb;
+ s->rx_bytes = pstats->rxoctetcount_gb;
+@@ -1388,7 +1388,7 @@ static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
+ u16 vid)
+ {
+ struct xgbe_prv_data *pdata = netdev_priv(netdev);
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+
+ DBGPR("-->%s\n", __func__);
+
+@@ -1404,7 +1404,7 @@ static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
+ u16 vid)
+ {
+ struct xgbe_prv_data *pdata = netdev_priv(netdev);
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+
+ DBGPR("-->%s\n", __func__);
+
+@@ -1464,7 +1464,7 @@ static int xgbe_set_features(struct net_device *netdev,
+ netdev_features_t features)
+ {
+ struct xgbe_prv_data *pdata = netdev_priv(netdev);
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+ netdev_features_t rxcsum, rxvlan, rxvlan_filter;
+
+ rxcsum = pdata->netdev_features & NETIF_F_RXCSUM;
+@@ -1520,7 +1520,7 @@ struct net_device_ops *xgbe_get_netdev_ops(void)
+ static void xgbe_rx_refresh(struct xgbe_channel *channel)
+ {
+ struct xgbe_prv_data *pdata = channel->pdata;
+- struct xgbe_desc_if *desc_if = &pdata->desc_if;
++ struct xgbe_desc_if *desc_if = pdata->desc_if;
+ struct xgbe_ring *ring = channel->rx_ring;
+ struct xgbe_ring_data *rdata;
+
+@@ -1536,8 +1536,8 @@ static void xgbe_rx_refresh(struct xgbe_channel *channel)
+ static int xgbe_tx_poll(struct xgbe_channel *channel)
+ {
+ struct xgbe_prv_data *pdata = channel->pdata;
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
+- struct xgbe_desc_if *desc_if = &pdata->desc_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
++ struct xgbe_desc_if *desc_if = pdata->desc_if;
+ struct xgbe_ring *ring = channel->tx_ring;
+ struct xgbe_ring_data *rdata;
+ struct xgbe_ring_desc *rdesc;
+@@ -1589,7 +1589,7 @@ static int xgbe_tx_poll(struct xgbe_channel *channel)
+ static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
+ {
+ struct xgbe_prv_data *pdata = channel->pdata;
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+ struct xgbe_ring *ring = channel->rx_ring;
+ struct xgbe_ring_data *rdata;
+ struct xgbe_packet_data *packet;
+diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
+index 49508ec..2617cca 100644
+--- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
++++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
+@@ -203,7 +203,7 @@ static void xgbe_get_ethtool_stats(struct net_device *netdev,
+
+ DBGPR("-->%s\n", __func__);
+
+- pdata->hw_if.read_mmc_stats(pdata);
++ pdata->hw_if->read_mmc_stats(pdata);
+ for (i = 0; i < XGBE_STATS_COUNT; i++) {
+ stat = (u8 *)pdata + xgbe_gstring_stats[i].stat_offset;
+ *data++ = *(u64 *)stat;
+@@ -378,7 +378,7 @@ static int xgbe_get_coalesce(struct net_device *netdev,
+ struct ethtool_coalesce *ec)
+ {
+ struct xgbe_prv_data *pdata = netdev_priv(netdev);
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+ unsigned int riwt;
+
+ DBGPR("-->xgbe_get_coalesce\n");
+@@ -401,7 +401,7 @@ static int xgbe_set_coalesce(struct net_device *netdev,
+ struct ethtool_coalesce *ec)
+ {
+ struct xgbe_prv_data *pdata = netdev_priv(netdev);
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+ unsigned int rx_frames, rx_riwt, rx_usecs;
+ unsigned int tx_frames, tx_usecs;
+
+diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
+index f5a8fa0..0bb58ff 100644
+--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
++++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
+@@ -209,12 +209,6 @@ static void xgbe_default_config(struct xgbe_prv_data *pdata)
+ DBGPR("<--xgbe_default_config\n");
+ }
+
+-static void xgbe_init_all_fptrs(struct xgbe_prv_data *pdata)
+-{
+- xgbe_init_function_ptrs_dev(&pdata->hw_if);
+- xgbe_init_function_ptrs_desc(&pdata->desc_if);
+-}
+-
+ static int xgbe_probe(struct platform_device *pdev)
+ {
+ struct xgbe_prv_data *pdata;
+@@ -327,9 +321,8 @@ static int xgbe_probe(struct platform_device *pdev)
+ netdev->base_addr = (unsigned long)pdata->xgmac_regs;
+
+ /* Set all the function pointers */
+- xgbe_init_all_fptrs(pdata);
+- hw_if = &pdata->hw_if;
+- desc_if = &pdata->desc_if;
++ hw_if = pdata->hw_if = &default_xgbe_hw_if;
++ desc_if = pdata->desc_if = &default_xgbe_desc_if;
+
+ /* Issue software reset to device */
+ hw_if->exit(pdata);
+diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
+index 363b210..b241389 100644
+--- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
++++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
+@@ -126,7 +126,7 @@
+ static int xgbe_mdio_read(struct mii_bus *mii, int prtad, int mmd_reg)
+ {
+ struct xgbe_prv_data *pdata = mii->priv;
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+ int mmd_data;
+
+ DBGPR_MDIO("-->xgbe_mdio_read: prtad=%#x mmd_reg=%#x\n",
+@@ -143,7 +143,7 @@ static int xgbe_mdio_write(struct mii_bus *mii, int prtad, int mmd_reg,
+ u16 mmd_val)
+ {
+ struct xgbe_prv_data *pdata = mii->priv;
+- struct xgbe_hw_if *hw_if = &pdata->hw_if;
++ struct xgbe_hw_if *hw_if = pdata->hw_if;
+ int mmd_data = mmd_val;
+
+ DBGPR_MDIO("-->xgbe_mdio_write: prtad=%#x mmd_reg=%#x mmd_data=%#x\n",
+diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
+index a1bf9d1c..84adcab 100644
+--- a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
++++ b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
+@@ -129,7 +129,7 @@ static cycle_t xgbe_cc_read(const struct cyclecounter *cc)
+ tstamp_cc);
+ u64 nsec;
+
+- nsec = pdata->hw_if.get_tstamp_time(pdata);
++ nsec = pdata->hw_if->get_tstamp_time(pdata);
+
+ return nsec;
+ }
+@@ -158,7 +158,7 @@ static int xgbe_adjfreq(struct ptp_clock_info *info, s32 delta)
+
+ spin_lock_irqsave(&pdata->tstamp_lock, flags);
+
+- pdata->hw_if.update_tstamp_addend(pdata, addend);
++ pdata->hw_if->update_tstamp_addend(pdata, addend);
+
+ spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
+
+diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
+index 789957d..d7d0245 100644
+--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
++++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
+@@ -583,8 +583,8 @@ struct xgbe_prv_data {
+
+ int irq_number;
+
+- struct xgbe_hw_if hw_if;
+- struct xgbe_desc_if desc_if;
++ const struct xgbe_hw_if *hw_if;
++ const struct xgbe_desc_if *desc_if;
+
+ /* AXI DMA settings */
+ unsigned int axdomain;
+@@ -697,6 +697,9 @@ struct xgbe_prv_data {
+ #endif
+ };
+
++extern const struct xgbe_hw_if default_xgbe_hw_if;
++extern const struct xgbe_desc_if default_xgbe_desc_if;
++
+ /* Function prototypes*/
+
+ void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *);
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
-index a89a40f..5a8a2ac 100644
+index adcacda..fa6e0ae 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
-@@ -1062,7 +1062,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
+@@ -1065,7 +1065,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
{
/* RX_MODE controlling object */
@@ -47771,7 +47991,7 @@ index a89a40f..5a8a2ac 100644
/* multicast configuration controlling object */
bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
-index 0fb6ff2..78fd55c 100644
+index 7bc2924..2112002 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
@@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
@@ -47796,10 +48016,10 @@ index 0fb6ff2..78fd55c 100644
}
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
-index 00d7f21..2cddec4 100644
+index e97275f..52e28bc 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
-@@ -1321,8 +1321,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
+@@ -1409,8 +1409,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
/********************* RX MODE ****************/
@@ -47810,7 +48030,7 @@ index 00d7f21..2cddec4 100644
/**
* bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
-index 04321e5..b51cdc4 100644
+index 31c9f82..e65e986 100644
--- a/drivers/net/ethernet/broadcom/tg3.h
+++ b/drivers/net/ethernet/broadcom/tg3.h
@@ -150,6 +150,7 @@
@@ -47822,10 +48042,10 @@ index 04321e5..b51cdc4 100644
#define CHIPREV_ID_5752_A0_HW 0x5000
#define CHIPREV_ID_5752_A0 0x6000
diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
-index 13f9636..228040f 100644
+index 903466e..b285864 100644
--- a/drivers/net/ethernet/brocade/bna/bna_enet.c
+++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
-@@ -1690,10 +1690,10 @@ bna_cb_ioceth_reset(void *arg)
+@@ -1693,10 +1693,10 @@ bna_cb_ioceth_reset(void *arg)
}
static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
@@ -47840,26 +48060,6 @@ index 13f9636..228040f 100644
};
static void bna_attr_init(struct bna_ioceth *ioceth)
-diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
-index 669eeb4..1566ef0 100644
---- a/drivers/net/ethernet/brocade/bna/bnad.c
-+++ b/drivers/net/ethernet/brocade/bna/bnad.c
-@@ -552,6 +552,7 @@ bnad_cq_setup_skb_frags(struct bna_rcb *rcb, struct sk_buff *skb,
-
- len = (vec == nvecs) ?
- last_fraglen : unmap->vector.len;
-+ skb->truesize += unmap->vector.len;
- totlen += len;
-
- skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags,
-@@ -563,7 +564,6 @@ bnad_cq_setup_skb_frags(struct bna_rcb *rcb, struct sk_buff *skb,
-
- skb->len += totlen;
- skb->data_len += totlen;
-- skb->truesize += totlen;
- }
-
- static inline void
diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
index 8cffcdf..aadf043 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
@@ -47874,10 +48074,10 @@ index 8cffcdf..aadf043 100644
#define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
-index 34e2488..07e2079 100644
+index 279873c..11e1921 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
-@@ -2120,7 +2120,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
+@@ -2365,7 +2365,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
int i;
struct adapter *ap = netdev2adap(dev);
@@ -47887,10 +48087,10 @@ index 34e2488..07e2079 100644
if (is_t4(ap->params.chip)) {
diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
-index c05b66d..ed69872 100644
+index cf8b6ff..274271e 100644
--- a/drivers/net/ethernet/dec/tulip/de4x5.c
+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
-@@ -5388,7 +5388,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+@@ -5387,7 +5387,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
for (i=0; i<ETH_ALEN; i++) {
tmp.addr[i] = dev->dev_addr[i];
}
@@ -47899,7 +48099,7 @@ index c05b66d..ed69872 100644
break;
case DE4X5_SET_HWADDR: /* Set the hardware address */
-@@ -5428,7 +5428,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+@@ -5427,7 +5427,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
spin_lock_irqsave(&lp->lock, flags);
memcpy(&statbuf, &lp->pktStats, ioc->len);
spin_unlock_irqrestore(&lp->lock, flags);
@@ -47909,10 +48109,10 @@ index c05b66d..ed69872 100644
break;
}
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
-index 80bfa03..1114364 100644
+index d2975fa..8aaec07 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
-@@ -534,7 +534,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
+@@ -537,7 +537,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
if (wrapped)
newacc += 65536;
@@ -47921,18 +48121,8 @@ index 80bfa03..1114364 100644
}
static void populate_erx_stats(struct be_adapter *adapter,
-@@ -4002,6 +4002,9 @@ static int be_ndo_bridge_setlink(struct net_device *dev,
- if (nla_type(attr) != IFLA_BRIDGE_MODE)
- continue;
-
-+ if (nla_len(attr) < sizeof(mode))
-+ return -EINVAL;
-+
- mode = nla_get_u16(attr);
- if (mode != BRIDGE_MODE_VEPA && mode != BRIDGE_MODE_VEB)
- return -EINVAL;
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
-index c11ecbc..13bb299 100644
+index c77fa4a..7fd42fc 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -30,6 +30,8 @@
@@ -47945,7 +48135,7 @@ index c11ecbc..13bb299 100644
#include "ftgmac100.h"
diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
-index 8be5b40..081bc1b 100644
+index 4ff1adc..0ea6bf4 100644
--- a/drivers/net/ethernet/faraday/ftmac100.c
+++ b/drivers/net/ethernet/faraday/ftmac100.c
@@ -31,6 +31,8 @@
@@ -47957,11 +48147,24 @@ index 8be5b40..081bc1b 100644
#include "ftmac100.h"
+diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c
+index 76d7070..f6971182 100644
+--- a/drivers/net/ethernet/freescale/gianfar_ethtool.c
++++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c
+@@ -1581,7 +1581,7 @@ static int gfar_write_filer_table(struct gfar_private *priv,
+ return -EBUSY;
+
+ /* Fill regular entries */
+- for (; i < MAX_FILER_IDX - 1 && (tab->fe[i].ctrl | tab->fe[i].ctrl);
++ for (; i < MAX_FILER_IDX - 1 && (tab->fe[i].ctrl | tab->fe[i].prop);
+ i++)
+ gfar_write_filer(priv, i, tab->fe[i].ctrl, tab->fe[i].prop);
+ /* Fill the rest with fall-troughs */
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
-index e33ec6c..f54cfe7 100644
+index 537b621..07f87ce 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
-@@ -436,7 +436,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
+@@ -401,7 +401,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
/* Update the base adjustement value. */
@@ -47970,25 +48173,11 @@ index e33ec6c..f54cfe7 100644
smp_mb(); /* Force the above update. */
}
-diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
-index 18076c4..c2cb27f 100644
---- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
-+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
-@@ -7571,6 +7571,9 @@ static int ixgbe_ndo_bridge_setlink(struct net_device *dev,
- if (nla_type(attr) != IFLA_BRIDGE_MODE)
- continue;
-
-+ if (nla_len(attr) < sizeof(mode))
-+ return -EINVAL;
-+
- mode = nla_get_u16(attr);
- if (mode == BRIDGE_MODE_VEPA) {
- reg = 0;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
-index 5184e2a..acb28c3 100644
+index 5fd4b52..87aa34b 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
-@@ -776,7 +776,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
+@@ -794,7 +794,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
}
/* update the base incval used to calculate frequency adjustment */
@@ -47997,25 +48186,40 @@ index 5184e2a..acb28c3 100644
smp_mb();
/* need lock to prevent incorrect read while modifying cyclecounter */
-diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
-index dff0977..6df4b1d 100644
---- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
-+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
-@@ -1270,6 +1270,9 @@ int ixgbe_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, bool setting)
- struct ixgbe_hw *hw = &adapter->hw;
- u32 regval;
-
-+ if (vf >= adapter->num_vfs)
-+ return -EINVAL;
-+
- adapter->vfinfo[vf].spoofchk_enabled = setting;
+diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+index 11ff28b..375d659 100644
+--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
++++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+@@ -458,8 +458,8 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
+ wmb();
+
+ /* we want to dirty this cache line once */
+- ACCESS_ONCE(ring->last_nr_txbb) = last_nr_txbb;
+- ACCESS_ONCE(ring->cons) = ring_cons + txbbs_skipped;
++ ACCESS_ONCE_RW(ring->last_nr_txbb) = last_nr_txbb;
++ ACCESS_ONCE_RW(ring->cons) = ring_cons + txbbs_skipped;
+
+ netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
- regval = IXGBE_READ_REG(hw, IXGBE_PFVFSPOOF(vf_target_reg));
+diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+index de10dbb..8b54f29 100644
+--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
++++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+@@ -233,7 +233,8 @@ do { \
+ extern int mlx4_log_num_mgm_entry_size;
+ extern int log_mtts_per_seg;
+
+-#define MLX4_MAX_NUM_SLAVES (MLX4_MAX_NUM_PF + MLX4_MAX_NUM_VF)
++#define MLX4_MAX_NUM_SLAVES (min(MLX4_MAX_NUM_PF + MLX4_MAX_NUM_VF, \
++ MLX4_MFUNC_MAX))
+ #define ALL_SLAVES 0xff
+
+ struct mlx4_bitmap {
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
-index 9eeddbd..6d9e10d 100644
+index f5e4b82..db0c7a9 100644
--- a/drivers/net/ethernet/neterion/s2io.c
+++ b/drivers/net/ethernet/neterion/s2io.c
-@@ -6992,7 +6992,9 @@ static int s2io_add_isr(struct s2io_nic *sp)
+@@ -6987,7 +6987,9 @@ static int s2io_add_isr(struct s2io_nic *sp)
if (sp->s2io_entries[i].in_use == MSIX_FLG) {
if (sp->s2io_entries[i].type ==
MSIX_RING_TYPE) {
@@ -48026,7 +48230,7 @@ index 9eeddbd..6d9e10d 100644
dev->name, i);
err = request_irq(sp->entries[i].vector,
s2io_msix_ring_handle,
-@@ -7001,7 +7003,9 @@ static int s2io_add_isr(struct s2io_nic *sp)
+@@ -6996,7 +6998,9 @@ static int s2io_add_isr(struct s2io_nic *sp)
sp->s2io_entries[i].arg);
} else if (sp->s2io_entries[i].type ==
MSIX_ALARM_TYPE) {
@@ -48037,7 +48241,7 @@ index 9eeddbd..6d9e10d 100644
dev->name, i);
err = request_irq(sp->entries[i].vector,
s2io_msix_fifo_handle,
-@@ -8159,7 +8163,8 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
+@@ -8154,7 +8158,8 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
"%s: UDP Fragmentation Offload(UFO) enabled\n",
dev->name);
/* Initialize device name */
@@ -48048,10 +48252,10 @@ index 9eeddbd..6d9e10d 100644
if (vlan_tag_strip)
sp->vlan_strip_flag = 1;
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
-index 089b713..28d87ae 100644
+index 2bbd01f..e8baa64 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
-@@ -3461,7 +3461,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
+@@ -3457,7 +3457,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
struct __vxge_hw_fifo *fifo;
struct vxge_hw_fifo_config *config;
u32 txdl_size, txdl_per_memblock;
@@ -48063,7 +48267,7 @@ index 089b713..28d87ae 100644
struct __vxge_hw_virtualpath *vpath;
if ((vp == NULL) || (attr == NULL)) {
-@@ -3544,8 +3547,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
+@@ -3540,8 +3543,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
goto exit;
}
@@ -48073,11 +48277,11 @@ index 089b713..28d87ae 100644
__vxge_hw_mempool_create(vpath->hldev,
fifo->config->memblock_size,
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
-index 90a2dda..47e620e 100644
+index 2bb48d5..d1a865d 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
-@@ -2088,7 +2088,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
- adapter->max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
+@@ -2324,7 +2324,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
+ max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
} else if (ret == QLC_83XX_DEFAULT_OPMODE) {
ahw->nic_mode = QLCNIC_DEFAULT_MODE;
- adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
@@ -48085,8 +48289,8 @@ index 90a2dda..47e620e 100644
+ *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
+ pax_close_kernel();
ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
- adapter->max_sds_rings = QLCNIC_MAX_SDS_RINGS;
- adapter->max_tx_rings = QLCNIC_MAX_TX_RINGS;
+ max_sds_rings = QLCNIC_MAX_SDS_RINGS;
+ max_tx_rings = QLCNIC_MAX_TX_RINGS;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
index be7d7a6..a8983f8 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
@@ -48119,23 +48323,23 @@ index be7d7a6..a8983f8 100644
default:
dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
-index 7763962..c3499a7 100644
+index c9f57fb..208bdc1 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
-@@ -1108,7 +1108,7 @@ int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
- struct qlcnic_dump_entry *entry;
+@@ -1285,7 +1285,7 @@ flash_temp:
+ int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
+ {
struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
- struct qlcnic_dump_template_hdr *tmpl_hdr = fw_dump->tmpl_hdr;
- static const struct qlcnic_dump_operations *fw_dump_ops;
+ const struct qlcnic_dump_operations *fw_dump_ops;
- struct device *dev = &adapter->pdev->dev;
- struct qlcnic_hardware_context *ahw;
- void *temp_buffer;
+ struct qlcnic_83xx_dump_template_hdr *hdr_83xx;
+ u32 entry_offset, dump, no_entries, buf_offset = 0;
+ int i, k, ops_cnt, ops_index, dump_size = 0;
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
-index 3ff7bc3..366091b 100644
+index cf154f7..c948d1b 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
-@@ -758,22 +758,22 @@ struct rtl8169_private {
+@@ -788,22 +788,22 @@ struct rtl8169_private {
struct mdio_ops {
void (*write)(struct rtl8169_private *, int, int);
int (*read)(struct rtl8169_private *, int);
@@ -48163,10 +48367,10 @@ index 3ff7bc3..366091b 100644
int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
int (*get_settings)(struct net_device *, struct ethtool_cmd *);
diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
-index d7a3682..9ce272a 100644
+index 6b861e3..204ac86 100644
--- a/drivers/net/ethernet/sfc/ptp.c
+++ b/drivers/net/ethernet/sfc/ptp.c
-@@ -825,7 +825,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
+@@ -822,7 +822,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
ptp->start.dma_addr);
/* Clear flag that signals MC ready */
@@ -48176,7 +48380,7 @@ index d7a3682..9ce272a 100644
MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
EFX_BUG_ON_PARANOID(rc);
diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
-index 50617c5..b13724c 100644
+index 08c483b..2c4a553 100644
--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
@@ -48191,23 +48395,59 @@ index 50617c5..b13724c 100644
/* To mask all all interrupts.*/
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
-index 7b594ce..1f6c5708 100644
+index 2f48f79..8ae1a1a 100644
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
-@@ -100,7 +100,7 @@ struct rndis_device {
-
+@@ -171,7 +171,7 @@ struct rndis_device {
enum rndis_device_state state;
bool link_state;
+ bool link_change;
- atomic_t new_req_id;
+ atomic_unchecked_t new_req_id;
spinlock_t request_lock;
struct list_head req_list;
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
+index 7d76c95..63d7a64 100644
+--- a/drivers/net/hyperv/netvsc.c
++++ b/drivers/net/hyperv/netvsc.c
+@@ -716,7 +716,7 @@ int netvsc_send(struct hv_device *device,
+ u64 req_id;
+ unsigned int section_index = NETVSC_INVALID_INDEX;
+ u32 msg_size = 0;
+- struct sk_buff *skb;
++ struct sk_buff *skb = NULL;
+ u16 q_idx = packet->q_idx;
+
+
+@@ -743,8 +743,6 @@ int netvsc_send(struct hv_device *device,
+ packet);
+ skb = (struct sk_buff *)
+ (unsigned long)packet->send_completion_tid;
+- if (skb)
+- dev_kfree_skb_any(skb);
+ packet->page_buf_cnt = 0;
+ }
+ }
+@@ -807,6 +805,13 @@ int netvsc_send(struct hv_device *device,
+ packet, ret);
+ }
+
++ if (ret != 0) {
++ if (section_index != NETVSC_INVALID_INDEX)
++ netvsc_free_send_slot(net_device, section_index);
++ } else if (skb) {
++ dev_kfree_skb_any(skb);
++ }
++
+ return ret;
+ }
+
diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
-index b54fd25..9bd2bae 100644
+index 2b86f0b..ecc996f 100644
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
-@@ -103,7 +103,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
+@@ -102,7 +102,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
* template
*/
set = &rndis_msg->msg.set_req;
@@ -48216,7 +48456,7 @@ index b54fd25..9bd2bae 100644
/* Add to the request list */
spin_lock_irqsave(&dev->request_lock, flags);
-@@ -770,7 +770,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
+@@ -911,7 +911,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
/* Setup the rndis set */
halt = &request->request_msg.msg.halt_req;
@@ -48226,10 +48466,10 @@ index b54fd25..9bd2bae 100644
/* Ignore return since this msg is optional. */
rndis_filter_send_request(dev, request);
diff --git a/drivers/net/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c
-index 6adbef8..cd6a5f1 100644
+index 6cbc56a..5f7e6c8 100644
--- a/drivers/net/ieee802154/fakehard.c
+++ b/drivers/net/ieee802154/fakehard.c
-@@ -364,7 +364,7 @@ static int ieee802154fake_probe(struct platform_device *pdev)
+@@ -365,7 +365,7 @@ static int ieee802154fake_probe(struct platform_device *pdev)
phy->transmit_power = 0xbf;
dev->netdev_ops = &fake_ops;
@@ -48239,10 +48479,10 @@ index 6adbef8..cd6a5f1 100644
priv = netdev_priv(dev);
priv->phy = phy;
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
-index d7b2e94..0812ae9 100644
+index 34f846b..4a0d5b1 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
-@@ -252,7 +252,7 @@ static int ifb_validate(struct nlattr *tb[], struct nlattr *data[])
+@@ -253,7 +253,7 @@ static int ifb_validate(struct nlattr *tb[], struct nlattr *data[])
return 0;
}
@@ -48252,10 +48492,19 @@ index d7b2e94..0812ae9 100644
.priv_size = sizeof(struct ifb_private),
.setup = ifb_setup,
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
-index fbf7dcd..ad71499 100644
+index bfb0b6e..5c396ce 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
-@@ -993,13 +993,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
+@@ -335,7 +335,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,
+ free_nskb:
+ kfree_skb(nskb);
+ err:
+- atomic_long_inc(&skb->dev->rx_dropped);
++ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
+ }
+
+ static void macvlan_flush_sources(struct macvlan_port *port,
+@@ -1454,13 +1454,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
int macvlan_link_register(struct rtnl_link_ops *ops)
{
/* common fields */
@@ -48278,7 +48527,7 @@ index fbf7dcd..ad71499 100644
return rtnl_link_register(ops);
};
-@@ -1053,7 +1055,7 @@ static int macvlan_device_event(struct notifier_block *unused,
+@@ -1540,7 +1542,7 @@ static int macvlan_device_event(struct notifier_block *unused,
return NOTIFY_DONE;
}
@@ -48288,7 +48537,7 @@ index fbf7dcd..ad71499 100644
};
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
-index 07c942b..bce8b8a 100644
+index 880cc09..6a68ba6 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -422,7 +422,7 @@ static void macvtap_setup(struct net_device *dev)
@@ -48300,7 +48549,7 @@ index 07c942b..bce8b8a 100644
.kind = "macvtap",
.setup = macvtap_setup,
.newlink = macvtap_newlink,
-@@ -1023,7 +1023,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
+@@ -1020,7 +1020,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
}
ret = 0;
@@ -48309,7 +48558,7 @@ index 07c942b..bce8b8a 100644
put_user(q->flags, &ifr->ifr_flags))
ret = -EFAULT;
macvtap_put_vlan(vlan);
-@@ -1193,7 +1193,7 @@ static int macvtap_device_event(struct notifier_block *unused,
+@@ -1190,7 +1190,7 @@ static int macvtap_device_event(struct notifier_block *unused,
return NOTIFY_DONE;
}
@@ -48319,10 +48568,10 @@ index 07c942b..bce8b8a 100644
};
diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
-index d2bb12b..d6c921e 100644
+index 34924df..a747360 100644
--- a/drivers/net/nlmon.c
+++ b/drivers/net/nlmon.c
-@@ -162,7 +162,7 @@ static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
+@@ -154,7 +154,7 @@ static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
return 0;
}
@@ -48345,10 +48594,10 @@ index 602c625..b5edc7f 100644
state->stats.comp_packets++;
} else {
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
-index 5a1897d..e860630 100644
+index 794a473..9fd437b 100644
--- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
-@@ -999,7 +999,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+@@ -1020,7 +1020,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
struct ppp_stats stats;
struct ppp_comp_stats cstats;
@@ -48356,7 +48605,7 @@ index 5a1897d..e860630 100644
switch (cmd) {
case SIOCGPPPSTATS:
-@@ -1021,8 +1020,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+@@ -1042,8 +1041,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
break;
case SIOCGPPPVER:
@@ -48367,10 +48616,10 @@ index 5a1897d..e860630 100644
err = 0;
break;
diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
-index 1252d9c..80e660b 100644
+index 079f7ad..b2a2bfa7 100644
--- a/drivers/net/slip/slhc.c
+++ b/drivers/net/slip/slhc.c
-@@ -488,7 +488,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
+@@ -487,7 +487,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
register struct tcphdr *thp;
register struct iphdr *ip;
register struct cstate *cs;
@@ -48380,10 +48629,10 @@ index 1252d9c..80e660b 100644
/* We've got a compressed packet; read the change byte */
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
-index 32efe83..cef96b8 100644
+index 9c505c4..5d0c879 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
-@@ -2098,7 +2098,7 @@ static unsigned int team_get_num_rx_queues(void)
+@@ -2102,7 +2102,7 @@ static unsigned int team_get_num_rx_queues(void)
return TEAM_DEFAULT_NUM_RX_QUEUES;
}
@@ -48392,7 +48641,7 @@ index 32efe83..cef96b8 100644
.kind = DRV_NAME,
.priv_size = sizeof(struct team),
.setup = team_setup,
-@@ -2886,7 +2886,7 @@ static int team_device_event(struct notifier_block *unused,
+@@ -2892,7 +2892,7 @@ static int team_device_event(struct notifier_block *unused,
return NOTIFY_DONE;
}
@@ -48402,10 +48651,10 @@ index 32efe83..cef96b8 100644
};
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
-index ec63314..465e154 100644
+index 9dd3746..74f191e 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
-@@ -1436,7 +1436,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
+@@ -1426,7 +1426,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
return -EINVAL;
}
@@ -48414,7 +48663,7 @@ index ec63314..465e154 100644
.kind = DRV_NAME,
.priv_size = sizeof(struct tun_struct),
.setup = tun_setup,
-@@ -1882,7 +1882,7 @@ unlock:
+@@ -1868,7 +1868,7 @@ unlock:
}
static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
@@ -48423,7 +48672,7 @@ index ec63314..465e154 100644
{
struct tun_file *tfile = file->private_data;
struct tun_struct *tun;
-@@ -1895,6 +1895,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
+@@ -1881,6 +1881,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
unsigned int ifindex;
int ret;
@@ -48434,7 +48683,7 @@ index ec63314..465e154 100644
if (copy_from_user(&ifr, argp, ifreq_len))
return -EFAULT;
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
-index 660bd5e..ac59452 100644
+index babda7d..e40c90a 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -71,7 +71,7 @@
@@ -48446,7 +48695,7 @@ index 660bd5e..ac59452 100644
#define MOD_AUTHOR "Option Wireless"
#define MOD_DESCRIPTION "USB High Speed Option driver"
-@@ -1179,7 +1179,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
+@@ -1178,7 +1178,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
struct urb *urb;
urb = serial->rx_urb[0];
@@ -48455,7 +48704,7 @@ index 660bd5e..ac59452 100644
count = put_rxbuf_data(urb, serial);
if (count == -1)
return;
-@@ -1217,7 +1217,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
+@@ -1216,7 +1216,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
DUMP1(urb->transfer_buffer, urb->actual_length);
/* Anyone listening? */
@@ -48464,7 +48713,7 @@ index 660bd5e..ac59452 100644
return;
if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
-@@ -1287,8 +1287,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
+@@ -1278,8 +1278,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
tty_port_tty_set(&serial->port, tty);
/* check for port already opened, if not set the termios */
@@ -48474,7 +48723,7 @@ index 660bd5e..ac59452 100644
serial->rx_state = RX_IDLE;
/* Force default termio settings */
_hso_serial_set_termios(tty, NULL);
-@@ -1300,7 +1299,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
+@@ -1289,7 +1288,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
result = hso_start_serial_device(serial->parent, GFP_KERNEL);
if (result) {
hso_stop_serial_device(serial->parent);
@@ -48483,7 +48732,7 @@ index 660bd5e..ac59452 100644
kref_put(&serial->parent->ref, hso_serial_ref_free);
}
} else {
-@@ -1337,10 +1336,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
+@@ -1326,10 +1325,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
/* reset the rts and dtr */
/* do the actual close */
@@ -48497,7 +48746,7 @@ index 660bd5e..ac59452 100644
tty_port_tty_set(&serial->port, NULL);
if (!usb_gone)
hso_stop_serial_device(serial->parent);
-@@ -1416,7 +1415,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
+@@ -1404,7 +1403,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
/* the actual setup */
spin_lock_irqsave(&serial->serial_lock, flags);
@@ -48506,7 +48755,7 @@ index 660bd5e..ac59452 100644
_hso_serial_set_termios(tty, old);
else
tty->termios = *old;
-@@ -1885,7 +1884,7 @@ static void intr_callback(struct urb *urb)
+@@ -1873,7 +1872,7 @@ static void intr_callback(struct urb *urb)
D1("Pending read interrupt on port %d\n", i);
spin_lock(&serial->serial_lock);
if (serial->rx_state == RX_IDLE &&
@@ -48515,7 +48764,7 @@ index 660bd5e..ac59452 100644
/* Setup and send a ctrl req read on
* port i */
if (!serial->rx_urb_filled[0]) {
-@@ -3061,7 +3060,7 @@ static int hso_resume(struct usb_interface *iface)
+@@ -3047,7 +3046,7 @@ static int hso_resume(struct usb_interface *iface)
/* Start all serial ports */
for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
if (serial_table[i] && (serial_table[i]->interface == iface)) {
@@ -48525,18 +48774,18 @@ index 660bd5e..ac59452 100644
hso_start_serial_device(serial_table[i], GFP_NOIO);
hso_kick_transmit(dev2ser(serial_table[i]));
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
-index adb12f3..48005ab 100644
+index c6554c7..7e2ebd7 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
-@@ -513,7 +513,7 @@ struct r8152 {
- void (*disable)(struct r8152 *);
- void (*down)(struct r8152 *);
+@@ -577,7 +577,7 @@ struct r8152 {
void (*unload)(struct r8152 *);
+ int (*eee_get)(struct r8152 *, struct ethtool_eee *);
+ int (*eee_set)(struct r8152 *, struct ethtool_eee *);
- } rtl_ops;
+ } __no_const rtl_ops;
int intr_interval;
- u32 msg_enable;
+ u32 saved_wolopts;
diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index a2515887..6d13233 100644
--- a/drivers/net/usb/sierra_net.c
@@ -48560,10 +48809,10 @@ index a2515887..6d13233 100644
/* we will have to manufacture ethernet headers, prepare template */
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
-index 841b608..198a8b7 100644
+index b0bc8ea..3af931b5 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
-@@ -47,7 +47,7 @@ module_param(gso, bool, 0444);
+@@ -48,7 +48,7 @@ module_param(gso, bool, 0444);
#define RECEIVE_AVG_WEIGHT 64
/* Minimum alignment for mergeable packet buffers. */
@@ -48573,10 +48822,10 @@ index 841b608..198a8b7 100644
#define VIRTNET_DRIVER_VERSION "1.0.0"
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
-index 5988910..be561a2 100644
+index 42b2d6a5..2a2cb41 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
-@@ -2851,7 +2851,7 @@ nla_put_failure:
+@@ -2695,7 +2695,7 @@ nla_put_failure:
return -EMSGSIZE;
}
@@ -48585,7 +48834,7 @@ index 5988910..be561a2 100644
.kind = "vxlan",
.maxtype = IFLA_VXLAN_MAX,
.policy = vxlan_policy,
-@@ -2898,7 +2898,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
+@@ -2742,7 +2742,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
return NOTIFY_DONE;
}
@@ -48710,24 +48959,6 @@ index 5920c99..ff2e4a5 100644
};
static void
-diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
-index 5895f19..fa9fdfa 100644
---- a/drivers/net/wan/x25_asy.c
-+++ b/drivers/net/wan/x25_asy.c
-@@ -122,8 +122,12 @@ static int x25_asy_change_mtu(struct net_device *dev, int newmtu)
- {
- struct x25_asy *sl = netdev_priv(dev);
- unsigned char *xbuff, *rbuff;
-- int len = 2 * newmtu;
-+ int len;
-
-+ if (newmtu > 65534)
-+ return -EINVAL;
-+
-+ len = 2 * newmtu;
- xbuff = kmalloc(len + 4, GFP_ATOMIC);
- rbuff = kmalloc(len + 4, GFP_ATOMIC);
-
diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
index feacc3b..5bac0de 100644
--- a/drivers/net/wan/z85230.c
@@ -48794,10 +49025,10 @@ index 0b60295..b8bfa5b 100644
if (rd == NULL) {
result = -ENOMEM;
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
-index edf4b57..68b51c0 100644
+index e71a2ce..2268d61 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
-@@ -7843,7 +7843,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
+@@ -7846,7 +7846,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
struct airo_info *ai = dev->ml_priv;
int ridcode;
int enabled;
@@ -48807,7 +49038,7 @@ index edf4b57..68b51c0 100644
/* Only super-user can write RIDs */
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
-index 99b3bfa..9559372 100644
+index da92bfa..5a9001a 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
@@ -48820,10 +49051,10 @@ index 99b3bfa..9559372 100644
return msecs_to_jiffies((s->poll_timeout[2] << 16)
| (s->poll_timeout[1] << 8)
diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
-index edc57ab..ff49e0a 100644
+index 676bd4e..0b807a3 100644
--- a/drivers/net/wireless/ath/ath10k/htc.c
+++ b/drivers/net/wireless/ath/ath10k/htc.c
-@@ -831,7 +831,10 @@ void ath10k_htc_stop(struct ath10k_htc *htc)
+@@ -848,7 +848,10 @@ int ath10k_htc_start(struct ath10k_htc *htc)
/* registered target arrival callback from the HIF layer */
int ath10k_htc_init(struct ath10k *ar)
{
@@ -48835,7 +49066,7 @@ index edc57ab..ff49e0a 100644
struct ath10k_htc_ep *ep = NULL;
struct ath10k_htc *htc = &ar->htc;
-@@ -841,8 +844,6 @@ int ath10k_htc_init(struct ath10k *ar)
+@@ -857,8 +860,6 @@ int ath10k_htc_init(struct ath10k *ar)
ath10k_htc_reset_endpoint_states(htc);
/* setup HIF layer callbacks */
@@ -48845,10 +49076,10 @@ index edc57ab..ff49e0a 100644
/* Get HIF default pipe for HTC message exchange */
diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
-index 4716d33..a688310 100644
+index 527179c..a890150 100644
--- a/drivers/net/wireless/ath/ath10k/htc.h
+++ b/drivers/net/wireless/ath/ath10k/htc.h
-@@ -271,13 +271,13 @@ enum ath10k_htc_ep_id {
+@@ -270,13 +270,13 @@ enum ath10k_htc_ep_id {
struct ath10k_htc_ops {
void (*target_send_suspend_complete)(struct ath10k *ar);
@@ -48865,7 +49096,7 @@ index 4716d33..a688310 100644
/* service connection information */
struct ath10k_htc_svc_conn_req {
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
-index 741b38d..b7ae41b 100644
+index 2a93519..7052786 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
@@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
@@ -48920,9 +49151,9 @@ index 741b38d..b7ae41b 100644
- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
| (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
- | SM(i->txpower, AR_XmitPower)
+ | SM(i->txpower, AR_XmitPower0)
| (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
-@@ -289,19 +289,19 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
+@@ -289,27 +289,27 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
| (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
(i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
@@ -48947,8 +49178,19 @@ index 741b38d..b7ae41b 100644
| set11nRateFlags(i->rates, 1)
| set11nRateFlags(i->rates, 2)
| set11nRateFlags(i->rates, 3)
+ | SM(i->rtscts_rate, AR_RTSCTSRate);
+
+- ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower, AR_XmitPower1);
+- ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower, AR_XmitPower2);
+- ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower, AR_XmitPower3);
++ ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower, AR_XmitPower1);
++ ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower, AR_XmitPower2);
++ ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower, AR_XmitPower3);
+ }
+
+ static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
-index 729ffbf..49f50e3 100644
+index 057b165..98ae88f 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
@@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
@@ -49038,9 +49280,9 @@ index 729ffbf..49f50e3 100644
- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
| (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
- | SM(i->txpower, AR_XmitPower)
+ | SM(i->txpower, AR_XmitPower0)
| (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
-@@ -135,22 +135,22 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
+@@ -135,26 +135,26 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
ctl12 |= SM(val, AR_PAPRDChainMask);
@@ -49066,14 +49308,21 @@ index 729ffbf..49f50e3 100644
- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
+
+- ACCESS_ONCE(ads->ctl20) = SM(i->txpower, AR_XmitPower1);
+- ACCESS_ONCE(ads->ctl21) = SM(i->txpower, AR_XmitPower2);
+- ACCESS_ONCE(ads->ctl22) = SM(i->txpower, AR_XmitPower3);
++ ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower, AR_XmitPower1);
++ ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower, AR_XmitPower2);
++ ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower, AR_XmitPower3);
}
static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
-index 32ae0a4..90fdaf5 100644
+index e8e8dd2..030f80e 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -629,7 +629,7 @@ struct ath_hw_private_ops {
+@@ -630,7 +630,7 @@ struct ath_hw_private_ops {
/* ANI */
void (*ani_cache_ini_regs)(struct ath_hw *ah);
@@ -49082,7 +49331,7 @@ index 32ae0a4..90fdaf5 100644
/**
* struct ath_spec_scan - parameters for Atheros spectral scan
-@@ -706,7 +706,7 @@ struct ath_hw_ops {
+@@ -708,7 +708,7 @@ struct ath_hw_ops {
#ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
#endif
@@ -49091,11 +49340,44 @@ index 32ae0a4..90fdaf5 100644
struct ath_nf_limits {
s16 max;
+diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
+index 4f18a6b..b07d92f 100644
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -2454,16 +2454,18 @@ void ath9k_fill_chanctx_ops(void)
+ if (!ath9k_is_chanctx_enabled())
+ return;
+
+- ath9k_ops.hw_scan = ath9k_hw_scan;
+- ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
+- ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
+- ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
+- ath9k_ops.add_chanctx = ath9k_add_chanctx;
+- ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
+- ath9k_ops.change_chanctx = ath9k_change_chanctx;
+- ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
+- ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
+- ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
++ pax_open_kernel();
++ *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
++ *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
++ *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
++ *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
++ *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
++ *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
++ *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
++ *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
++ *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
++ *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
++ pax_close_kernel();
+ }
+
+ #endif
diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
-index 92190da..f3a4c4c 100644
+index 058a9f2..d5cb1ba 100644
--- a/drivers/net/wireless/b43/phy_lp.c
+++ b/drivers/net/wireless/b43/phy_lp.c
-@@ -2514,7 +2514,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
+@@ -2502,7 +2502,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
{
struct ssb_bus *bus = dev->dev->sdev->bus;
@@ -49105,10 +49387,10 @@ index 92190da..f3a4c4c 100644
u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
u16 old_comm15, scale;
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
-index 0487461..fd9e84a 100644
+index dc1d20c..f7a4f06 100644
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
-@@ -3638,7 +3638,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+@@ -3633,7 +3633,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
*/
if (il3945_mod_params.disable_hw_scan) {
D_INFO("Disabling hw_scan\n");
@@ -49120,7 +49402,7 @@ index 0487461..fd9e84a 100644
D_INFO("*** LOAD DRIVER ***\n");
diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
-index d2fe259..0c4c682 100644
+index 0ffb6ff..c0b7f0e 100644
--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
@@ -49228,7 +49510,7 @@ index d2fe259..0c4c682 100644
int rts;
if (!priv->cfg->ht_params)
-@@ -2205,7 +2205,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
+@@ -2204,7 +2204,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
{
struct iwl_priv *priv = file->private_data;
char buf[8];
@@ -49237,7 +49519,7 @@ index d2fe259..0c4c682 100644
memset(buf, 0, sizeof(buf));
buf_size = min(count, sizeof(buf) - 1);
-@@ -2239,7 +2239,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
+@@ -2238,7 +2238,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
struct iwl_priv *priv = file->private_data;
u32 event_log_flag;
char buf[8];
@@ -49246,7 +49528,7 @@ index d2fe259..0c4c682 100644
/* check that the interface is up */
if (!iwl_is_ready(priv))
-@@ -2293,7 +2293,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
+@@ -2292,7 +2292,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
struct iwl_priv *priv = file->private_data;
char buf[8];
u32 calib_disabled;
@@ -49255,32 +49537,11 @@ index d2fe259..0c4c682 100644
memset(buf, 0, sizeof(buf));
buf_size = min(count, sizeof(buf) - 1);
-diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
-index ea7e70c..bc0c45f 100644
---- a/drivers/net/wireless/iwlwifi/dvm/main.c
-+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
-@@ -1127,7 +1127,7 @@ static void iwl_option_config(struct iwl_priv *priv)
- static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
- {
- struct iwl_nvm_data *data = priv->nvm_data;
-- char *debug_msg;
-+ static const char debug_msg[] = "Device SKU: 24GHz %s %s, 52GHz %s %s, 11.n %s %s\n";
-
- if (data->sku_cap_11n_enable &&
- !priv->cfg->ht_params) {
-@@ -1141,7 +1141,6 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
- return -EINVAL;
- }
-
-- debug_msg = "Device SKU: 24GHz %s %s, 52GHz %s %s, 11.n %s %s\n";
- IWL_DEBUG_INFO(priv, debug_msg,
- data->sku_cap_band_24GHz_enable ? "" : "NOT", "enabled",
- data->sku_cap_band_52GHz_enable ? "" : "NOT", "enabled",
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
-index fb62927..2748d8c 100644
+index dd2f3f8..fb1ae88 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
-@@ -1373,7 +1373,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
+@@ -1689,7 +1689,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
char buf[8];
@@ -49289,7 +49550,7 @@ index fb62927..2748d8c 100644
u32 reset_flag;
memset(buf, 0, sizeof(buf));
-@@ -1394,7 +1394,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
+@@ -1710,7 +1710,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
{
struct iwl_trans *trans = file->private_data;
char buf[8];
@@ -49299,10 +49560,10 @@ index fb62927..2748d8c 100644
memset(buf, 0, sizeof(buf));
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
-index 505ff60..6a1c9aa 100644
+index c9ad4cf..49a2fa0 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -2543,20 +2543,20 @@ static int __init init_mac80211_hwsim(void)
+@@ -2577,20 +2577,20 @@ static int __init init_mac80211_hwsim(void)
if (channels < 1)
return -EINVAL;
@@ -49338,7 +49599,7 @@ index 505ff60..6a1c9aa 100644
spin_lock_init(&hwsim_radio_lock);
INIT_LIST_HEAD(&hwsim_radios);
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
-index 5028557..91cf394 100644
+index 1a4facd..a2ecbbd 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
@@ -49351,7 +49612,7 @@ index 5028557..91cf394 100644
tmp = cpu_to_le32(rts_threshold);
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
-index 5d45a1a..6f5f041 100644
+index d13f25c..2573994 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -375,7 +375,7 @@ struct rt2x00_intf {
@@ -49364,7 +49625,7 @@ index 5d45a1a..6f5f041 100644
static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
-index 22d49d5..dd5e4d7 100644
+index 66ff364..3ce34f7 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -224,9 +224,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
@@ -49380,10 +49641,10 @@ index 22d49d5..dd5e4d7 100644
hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
hdr->seq_ctrl |= cpu_to_le16(seqno);
diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
-index e2b3d9c..67a5184 100644
+index b661f896..ddf7d2b 100644
--- a/drivers/net/wireless/ti/wl1251/sdio.c
+++ b/drivers/net/wireless/ti/wl1251/sdio.c
-@@ -271,13 +271,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
+@@ -282,13 +282,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
@@ -49406,7 +49667,7 @@ index e2b3d9c..67a5184 100644
wl1251_info("using SDIO interrupt");
}
diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
-index be7129b..4161356 100644
+index 0bccf12..3d95068 100644
--- a/drivers/net/wireless/ti/wl12xx/main.c
+++ b/drivers/net/wireless/ti/wl12xx/main.c
@@ -656,7 +656,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
@@ -49432,10 +49693,10 @@ index be7129b..4161356 100644
wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
-index ec37b16..7e34d66 100644
+index 7af1936..128bb35 100644
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
-@@ -1823,8 +1823,10 @@ static int wl18xx_setup(struct wl1271 *wl)
+@@ -1916,8 +1916,10 @@ static int wl18xx_setup(struct wl1271 *wl)
}
if (!checksum_param) {
@@ -49461,6 +49722,40 @@ index a912dc0..a8225ba 100644
u16 int_num;
ZD_ASSERT(in_interrupt());
+diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
+index d752d1c..23e3203 100644
+--- a/drivers/net/xen-netback/interface.c
++++ b/drivers/net/xen-netback/interface.c
+@@ -578,6 +578,7 @@ int xenvif_connect(struct xenvif_queue *queue, unsigned long tx_ring_ref,
+ goto err_rx_unbind;
+ }
+ queue->task = task;
++ get_task_struct(task);
+
+ task = kthread_create(xenvif_dealloc_kthread,
+ (void *)queue, "%s-dealloc", queue->name);
+@@ -634,6 +635,7 @@ void xenvif_disconnect(struct xenvif *vif)
+
+ if (queue->task) {
+ kthread_stop(queue->task);
++ put_task_struct(queue->task);
+ queue->task = NULL;
+ }
+
+diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
+index c39aace..e18728d 100644
+--- a/drivers/net/xen-netback/netback.c
++++ b/drivers/net/xen-netback/netback.c
+@@ -2111,8 +2111,7 @@ int xenvif_kthread_guest_rx(void *data)
+ */
+ if (unlikely(vif->disabled && queue->id == 0)) {
+ xenvif_carrier_off(vif);
+- xenvif_rx_queue_purge(queue);
+- continue;
++ break;
+ }
+
+ if (!skb_queue_empty(&queue->rx_queue))
diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
index 683671a..4519fc2 100644
--- a/drivers/nfc/nfcwilink.c
@@ -49619,7 +49914,7 @@ index 3f49345..c750d0b 100644
return __oprofilefs_create_file(root, name,
&atomic_ro_fops, 0444, val);
diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
-index 61be1d9..dec05d7 100644
+index bdef916..88c7dee 100644
--- a/drivers/oprofile/timer_int.c
+++ b/drivers/oprofile/timer_int.c
@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
@@ -49632,10 +49927,10 @@ index 61be1d9..dec05d7 100644
};
diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
-index 92ed045..62d39bd7 100644
+index 3b47080..6cd05dd 100644
--- a/drivers/parport/procfs.c
+++ b/drivers/parport/procfs.c
-@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write,
+@@ -64,7 +64,7 @@ static int do_active_device(struct ctl_table *table, int write,
*ppos += len;
@@ -49644,7 +49939,7 @@ index 92ed045..62d39bd7 100644
}
#ifdef CONFIG_PARPORT_1284
-@@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table, int write,
+@@ -106,7 +106,7 @@ static int do_autoprobe(struct ctl_table *table, int write,
*ppos += len;
@@ -49654,7 +49949,7 @@ index 92ed045..62d39bd7 100644
#endif /* IEEE1284.3 support. */
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
-index 8dcccff..35d701d 100644
+index 6ca2399..68d866b 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
@@ -49669,7 +49964,7 @@ index 8dcccff..35d701d 100644
return retval;
diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
-index 7536eef..52dc8fa 100644
+index 66b7bbe..26bee78 100644
--- a/drivers/pci/hotplug/cpcihp_generic.c
+++ b/drivers/pci/hotplug/cpcihp_generic.c
@@ -73,7 +73,6 @@ static u16 port;
@@ -49700,7 +49995,7 @@ index 7536eef..52dc8fa 100644
status = cpci_hp_register_controller(&generic_hpc);
diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
-index e8c4a7c..7046f5c 100644
+index 7ecf34e..effed62 100644
--- a/drivers/pci/hotplug/cpcihp_zt5550.c
+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
@@ -59,7 +59,6 @@
@@ -49711,7 +50006,7 @@ index e8c4a7c..7046f5c 100644
static struct cpci_hp_controller zt5550_hpc;
/* Primary cPCI bus bridge device */
-@@ -205,6 +204,10 @@ static int zt5550_hc_disable_irq(void)
+@@ -204,6 +203,10 @@ static int zt5550_hc_disable_irq(void)
return 0;
}
@@ -49722,13 +50017,13 @@ index e8c4a7c..7046f5c 100644
static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
{
int status;
-@@ -216,16 +219,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
+@@ -215,16 +218,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
dbg("returned from zt5550_hc_config");
memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
- zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
zt5550_hpc.ops = &zt5550_hpc_ops;
- if(!poll) {
+ if (!poll) {
zt5550_hpc.irq = hc_dev->irq;
zt5550_hpc.irq_flags = IRQF_SHARED;
zt5550_hpc.dev_id = hc_dev;
@@ -49745,28 +50040,25 @@ index e8c4a7c..7046f5c 100644
info("using ENUM# polling mode");
}
diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
-index 76ba8a1..20ca857 100644
+index 1e08ff8c..3cd145f 100644
--- a/drivers/pci/hotplug/cpqphp_nvram.c
+++ b/drivers/pci/hotplug/cpqphp_nvram.c
-@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_start)
+@@ -425,8 +425,10 @@ static u32 store_HRT (void __iomem *rom_start)
void compaq_nvram_init (void __iomem *rom_start)
{
-+
+#ifndef CONFIG_PAX_KERNEXEC
- if (rom_start) {
+ if (rom_start)
compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
- }
+#endif
-+
+
dbg("int15 entry = %p\n", compaq_int15_entry_point);
- /* initialize our int15 lock */
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
-index cfa92a9..29539c5 100644
+index 56d8486..f26113f 100644
--- a/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/drivers/pci/hotplug/pci_hotplug_core.c
-@@ -441,8 +441,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
+@@ -436,8 +436,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
return -EINVAL;
}
@@ -49780,7 +50072,7 @@ index cfa92a9..29539c5 100644
mutex_lock(&pci_hp_mutex);
/*
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
-index 53b58de..4479896 100644
+index 07aa722..84514b4 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
@@ -49793,10 +50085,10 @@ index 53b58de..4479896 100644
int retval = -ENOMEM;
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
-index ced17f2..185c792 100644
+index 084587d..4a8f9df 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
-@@ -524,8 +524,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
+@@ -488,8 +488,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
{
struct attribute **msi_attrs;
struct attribute *msi_attr;
@@ -49807,7 +50099,7 @@ index ced17f2..185c792 100644
const struct attribute_group **msi_irq_groups;
struct msi_desc *entry;
int ret = -ENOMEM;
-@@ -589,7 +589,7 @@ error_attrs:
+@@ -549,7 +549,7 @@ error_attrs:
count = 0;
msi_attr = msi_attrs[count];
while (msi_attr) {
@@ -49817,10 +50109,10 @@ index ced17f2..185c792 100644
kfree(msi_dev_attr);
++count;
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
-index a943c6c..ad1a3cc 100644
+index 2c6643f..3a6d8e0 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
-@@ -1112,7 +1112,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
+@@ -1133,7 +1133,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
{
/* allocate attribute structure, piggyback attribute name */
int name_len = write_combine ? 13 : 10;
@@ -49829,7 +50121,7 @@ index a943c6c..ad1a3cc 100644
int retval;
res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
-@@ -1297,7 +1297,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
+@@ -1310,7 +1310,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
static int pci_create_capabilities_sysfs(struct pci_dev *dev)
{
int retval;
@@ -49838,7 +50130,7 @@ index a943c6c..ad1a3cc 100644
/* If the device has VPD, try to expose it in sysfs. */
if (dev->vpd) {
-@@ -1344,7 +1344,7 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
+@@ -1357,7 +1357,7 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
{
int retval;
int rom_size = 0;
@@ -49848,7 +50140,7 @@ index a943c6c..ad1a3cc 100644
if (!sysfs_initialized)
return -EACCES;
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
-index 4df38df..b6bb7fe 100644
+index b5defca..e3664cc 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -93,7 +93,7 @@ struct pci_vpd_ops {
@@ -49878,12 +50170,12 @@ index e1e7026..d28dd33 100644
#define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
-index 5b428db..553e4e3 100644
+index 3010ffc..5e2e133 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
-@@ -175,7 +175,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
+@@ -177,7 +177,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
struct pci_bus_region region, inverted_region;
- bool bar_too_big = false, bar_disabled = false;
+ bool bar_too_big = false, bar_too_high = false, bar_invalid = false;
- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
@@ -49891,7 +50183,7 @@ index 5b428db..553e4e3 100644
/* No printks while decoding is disabled! */
if (!dev->mmio_always_on) {
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
-index 46d1378..30e452b 100644
+index 3f155e7..0f4b1f0 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
@@ -49912,10 +50204,10 @@ index 46d1378..30e452b 100644
&proc_bus_pci_dev_operations);
proc_initialized = 1;
diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
-index 7f3aad0..7d604bb 100644
+index d866db8..c827d1f 100644
--- a/drivers/platform/chrome/chromeos_laptop.c
+++ b/drivers/platform/chrome/chromeos_laptop.c
-@@ -406,7 +406,7 @@ static struct chromeos_laptop cr48 = {
+@@ -479,7 +479,7 @@ static struct chromeos_laptop cr48 = {
.callback = chromeos_laptop_dmi_matched, \
.driver_data = (void *)&board_
@@ -49924,11 +50216,33 @@ index 7f3aad0..7d604bb 100644
{
.ident = "Samsung Series 5 550",
.matches = {
+diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
+index c5af23b..3d62d5e 100644
+--- a/drivers/platform/x86/alienware-wmi.c
++++ b/drivers/platform/x86/alienware-wmi.c
+@@ -150,7 +150,7 @@ struct wmax_led_args {
+ } __packed;
+
+ static struct platform_device *platform_device;
+-static struct device_attribute *zone_dev_attrs;
++static device_attribute_no_const *zone_dev_attrs;
+ static struct attribute **zone_attrs;
+ static struct platform_zone *zone_data;
+
+@@ -161,7 +161,7 @@ static struct platform_driver platform_driver = {
+ }
+ };
+
+-static struct attribute_group zone_attribute_group = {
++static attribute_group_no_const zone_attribute_group = {
+ .name = "rgb_zones",
+ };
+
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
-index c5e082f..d6307a0 100644
+index 21fc932..ee9394a 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
-@@ -1595,6 +1595,10 @@ static int show_dsts(struct seq_file *m, void *data)
+@@ -1590,6 +1590,10 @@ static int show_dsts(struct seq_file *m, void *data)
int err;
u32 retval = -1;
@@ -49939,7 +50253,7 @@ index c5e082f..d6307a0 100644
err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
if (err < 0)
-@@ -1611,6 +1615,10 @@ static int show_devs(struct seq_file *m, void *data)
+@@ -1606,6 +1610,10 @@ static int show_devs(struct seq_file *m, void *data)
int err;
u32 retval = -1;
@@ -49950,7 +50264,7 @@ index c5e082f..d6307a0 100644
err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
&retval);
-@@ -1635,6 +1643,10 @@ static int show_call(struct seq_file *m, void *data)
+@@ -1630,6 +1638,10 @@ static int show_call(struct seq_file *m, void *data)
union acpi_object *obj;
acpi_status status;
@@ -50000,10 +50314,10 @@ index 70222f2..8c8ce66 100644
acpi_status status;
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
-index 8f8551a..3ace3ca 100644
+index 26ad9ff..7c52909 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
-@@ -2451,7 +2451,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
+@@ -2527,7 +2527,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
}
/* High speed charging function */
@@ -50012,8 +50326,53 @@ index 8f8551a..3ace3ca 100644
static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
struct device_attribute *attr,
+@@ -2601,7 +2601,7 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
+ }
+
+ /* low battery function */
+-static struct device_attribute *lowbatt_handle;
++static device_attribute_no_const *lowbatt_handle;
+
+ static ssize_t sony_nc_lowbatt_store(struct device *dev,
+ struct device_attribute *attr,
+@@ -2667,7 +2667,7 @@ static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
+ }
+
+ /* fan speed function */
+-static struct device_attribute *fan_handle, *hsf_handle;
++static device_attribute_no_const *fan_handle, *hsf_handle;
+
+ static ssize_t sony_nc_hsfan_store(struct device *dev,
+ struct device_attribute *attr,
+@@ -2774,7 +2774,7 @@ static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
+ }
+
+ /* USB charge function */
+-static struct device_attribute *uc_handle;
++static device_attribute_no_const *uc_handle;
+
+ static ssize_t sony_nc_usb_charge_store(struct device *dev,
+ struct device_attribute *attr,
+@@ -2848,7 +2848,7 @@ static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
+ }
+
+ /* Panel ID function */
+-static struct device_attribute *panel_handle;
++static device_attribute_no_const *panel_handle;
+
+ static ssize_t sony_nc_panelid_show(struct device *dev,
+ struct device_attribute *attr, char *buffer)
+@@ -2895,7 +2895,7 @@ static void sony_nc_panelid_cleanup(struct platform_device *pd)
+ }
+
+ /* smart connect function */
+-static struct device_attribute *sc_handle;
++static device_attribute_no_const *sc_handle;
+
+ static ssize_t sony_nc_smart_conn_store(struct device *dev,
+ struct device_attribute *attr,
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
-index e2a91c8..986cc9f 100644
+index cf0f893..5955997 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
@@ -50025,114 +50384,7 @@ index e2a91c8..986cc9f 100644
{
/* log only what the user can fix... */
const u32 wantedmask = hotkey_driver_mask &
-@@ -2321,11 +2321,6 @@ static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m)
- }
- }
-
--static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
-- struct tp_nvram_state *newn,
-- const u32 event_mask)
--{
--
- #define TPACPI_COMPARE_KEY(__scancode, __member) \
- do { \
- if ((event_mask & (1 << __scancode)) && \
-@@ -2339,36 +2334,42 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
- tpacpi_hotkey_send_key(__scancode); \
- } while (0)
-
-- void issue_volchange(const unsigned int oldvol,
-- const unsigned int newvol)
-- {
-- unsigned int i = oldvol;
-+static void issue_volchange(const unsigned int oldvol,
-+ const unsigned int newvol,
-+ const u32 event_mask)
-+{
-+ unsigned int i = oldvol;
-
-- while (i > newvol) {
-- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
-- i--;
-- }
-- while (i < newvol) {
-- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
-- i++;
-- }
-+ while (i > newvol) {
-+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
-+ i--;
- }
-+ while (i < newvol) {
-+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
-+ i++;
-+ }
-+}
-
-- void issue_brightnesschange(const unsigned int oldbrt,
-- const unsigned int newbrt)
-- {
-- unsigned int i = oldbrt;
-+static void issue_brightnesschange(const unsigned int oldbrt,
-+ const unsigned int newbrt,
-+ const u32 event_mask)
-+{
-+ unsigned int i = oldbrt;
-
-- while (i > newbrt) {
-- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
-- i--;
-- }
-- while (i < newbrt) {
-- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
-- i++;
-- }
-+ while (i > newbrt) {
-+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
-+ i--;
-+ }
-+ while (i < newbrt) {
-+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
-+ i++;
- }
-+}
-
-+static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
-+ struct tp_nvram_state *newn,
-+ const u32 event_mask)
-+{
- TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle);
- TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle);
- TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF7, display_toggle);
-@@ -2402,7 +2403,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
- oldn->volume_level != newn->volume_level) {
- /* recently muted, or repeated mute keypress, or
- * multiple presses ending in mute */
-- issue_volchange(oldn->volume_level, newn->volume_level);
-+ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_MUTE);
- }
- } else {
-@@ -2412,7 +2413,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
- }
- if (oldn->volume_level != newn->volume_level) {
-- issue_volchange(oldn->volume_level, newn->volume_level);
-+ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
- } else if (oldn->volume_toggle != newn->volume_toggle) {
- /* repeated vol up/down keypress at end of scale ? */
- if (newn->volume_level == 0)
-@@ -2425,7 +2426,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
- /* handle brightness */
- if (oldn->brightness_level != newn->brightness_level) {
- issue_brightnesschange(oldn->brightness_level,
-- newn->brightness_level);
-+ newn->brightness_level,
-+ event_mask);
- } else if (oldn->brightness_toggle != newn->brightness_toggle) {
- /* repeated key presses that didn't change state */
- if (newn->brightness_level == 0)
-@@ -2434,10 +2436,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
+@@ -2438,10 +2438,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
&& !tp_features.bright_unkfw)
TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
}
@@ -50145,10 +50397,10 @@ index e2a91c8..986cc9f 100644
/*
* Polling driver
diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
-index 769d265..a3a05ca 100644
+index 438d4c7..ca8a2fb 100644
--- a/drivers/pnp/pnpbios/bioscalls.c
+++ b/drivers/pnp/pnpbios/bioscalls.c
-@@ -58,7 +58,7 @@ do { \
+@@ -59,7 +59,7 @@ do { \
set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
} while(0)
@@ -50157,7 +50409,7 @@ index 769d265..a3a05ca 100644
(unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
/*
-@@ -95,7 +95,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
+@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
cpu = get_cpu();
save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
@@ -50168,7 +50420,7 @@ index 769d265..a3a05ca 100644
/* On some boxes IRQ's during PnP BIOS calls are deadly. */
spin_lock_irqsave(&pnp_bios_lock, flags);
-@@ -133,7 +136,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
+@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
:"memory");
spin_unlock_irqrestore(&pnp_bios_lock, flags);
@@ -50179,7 +50431,7 @@ index 769d265..a3a05ca 100644
put_cpu();
/* If we get here and this is set then the PnP BIOS faulted on us. */
-@@ -467,7 +473,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
+@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
return status;
}
@@ -50188,7 +50440,7 @@ index 769d265..a3a05ca 100644
{
int i;
-@@ -475,6 +481,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
+@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
pnp_bios_callpoint.offset = header->fields.pm16offset;
pnp_bios_callpoint.segment = PNP_CS16;
@@ -50197,35 +50449,13 @@ index 769d265..a3a05ca 100644
for_each_possible_cpu(i) {
struct desc_struct *gdt = get_cpu_gdt_table(i);
if (!gdt)
-@@ -486,4 +494,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
+@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
(unsigned long)__va(header->fields.pm16dseg));
}
+
+ pax_close_kernel();
}
-diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
-index bacddd1..65ea100 100644
---- a/drivers/pnp/resource.c
-+++ b/drivers/pnp/resource.c
-@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
- return 1;
-
- /* check if the resource is valid */
-- if (*irq < 0 || *irq > 15)
-+ if (*irq > 15)
- return 0;
-
- /* check if the resource is reserved */
-@@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
- return 1;
-
- /* check if the resource is valid */
-- if (*dma < 0 || *dma == 4 || *dma > 7)
-+ if (*dma == 4 || *dma > 7)
- return 0;
-
- /* check if the resource is reserved */
diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
index 0c52e2a..3421ab7 100644
--- a/drivers/power/pda_power.c
@@ -50271,7 +50501,7 @@ index cc439fd..8fa30df 100644
#endif /* CONFIG_SYSFS */
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
-index 2660664..75fcb04 100644
+index 694e8cd..9f03483 100644
--- a/drivers/power/power_supply_core.c
+++ b/drivers/power/power_supply_core.c
@@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
@@ -50286,7 +50516,7 @@ index 2660664..75fcb04 100644
static bool __power_supply_is_supplied_by(struct power_supply *supplier,
struct power_supply *supply)
-@@ -628,7 +631,7 @@ static int __init power_supply_class_init(void)
+@@ -637,7 +640,7 @@ static int __init power_supply_class_init(void)
return PTR_ERR(power_supply_class);
power_supply_class->dev_uevent = power_supply_uevent;
@@ -50296,10 +50526,10 @@ index 2660664..75fcb04 100644
return 0;
}
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
-index 44420d1..967126e 100644
+index 62653f5..d0bb485 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
-@@ -230,17 +230,15 @@ static struct attribute_group power_supply_attr_group = {
+@@ -238,17 +238,15 @@ static struct attribute_group power_supply_attr_group = {
.is_visible = power_supply_attr_is_visible,
};
@@ -50508,11 +50738,37 @@ index 84419af..268ede8 100644
power_zone->zone_dev_attrs[count++] =
&dev_attr_energy_uj.attr;
}
+diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
+index 9c5d414..c7900ce 100644
+--- a/drivers/ptp/ptp_private.h
++++ b/drivers/ptp/ptp_private.h
+@@ -51,7 +51,7 @@ struct ptp_clock {
+ struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
+ wait_queue_head_t tsev_wq;
+ int defunct; /* tells readers to go away when clock is being removed */
+- struct device_attribute *pin_dev_attr;
++ device_attribute_no_const *pin_dev_attr;
+ struct attribute **pin_attr;
+ struct attribute_group pin_attr_group;
+ };
+diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
+index 302e626..12579af 100644
+--- a/drivers/ptp/ptp_sysfs.c
++++ b/drivers/ptp/ptp_sysfs.c
+@@ -280,7 +280,7 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
+ goto no_pin_attr;
+
+ for (i = 0; i < n_pins; i++) {
+- struct device_attribute *da = &ptp->pin_dev_attr[i];
++ device_attribute_no_const *da = &ptp->pin_dev_attr[i];
+ sysfs_attr_init(&da->attr);
+ da->attr.name = info->pin_config[i].name;
+ da->attr.mode = 0644;
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
-index afca1bc..86840b8 100644
+index fc6fb54..b8c794b 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
-@@ -3366,7 +3366,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
+@@ -3569,7 +3569,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
{
const struct regulation_constraints *constraints = NULL;
const struct regulator_init_data *init_data;
@@ -50521,8 +50777,8 @@ index afca1bc..86840b8 100644
struct regulator_dev *rdev;
struct device *dev;
int ret, i;
-@@ -3436,7 +3436,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
- rdev->dev.of_node = config->of_node;
+@@ -3643,7 +3643,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
+ rdev->dev.class = &regulator_class;
rdev->dev.parent = dev;
dev_set_name(&rdev->dev, "regulator.%d",
- atomic_inc_return(&regulator_no) - 1);
@@ -50531,10 +50787,10 @@ index afca1bc..86840b8 100644
if (ret != 0) {
put_device(&rdev->dev);
diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
-index 8d94d3d..653b623 100644
+index 7eee2ca..4024513 100644
--- a/drivers/regulator/max8660.c
+++ b/drivers/regulator/max8660.c
-@@ -420,8 +420,10 @@ static int max8660_probe(struct i2c_client *client,
+@@ -424,8 +424,10 @@ static int max8660_probe(struct i2c_client *client,
max8660->shadow_regs[MAX8660_OVER1] = 5;
} else {
/* Otherwise devices can be toggled via software */
@@ -50548,10 +50804,10 @@ index 8d94d3d..653b623 100644
/*
diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
-index 892aa1e..ebd1b9c 100644
+index dbedf17..18ff6b7 100644
--- a/drivers/regulator/max8973-regulator.c
+++ b/drivers/regulator/max8973-regulator.c
-@@ -406,9 +406,11 @@ static int max8973_probe(struct i2c_client *client,
+@@ -403,9 +403,11 @@ static int max8973_probe(struct i2c_client *client,
if (!pdata || !pdata->enable_ext_control) {
max->desc.enable_reg = MAX8973_VOUT;
max->desc.enable_mask = MAX8973_VOUT_ENABLE;
@@ -50567,29 +50823,29 @@ index 892aa1e..ebd1b9c 100644
if (pdata) {
diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
-index f374fa5..26f0683 100644
+index 793b662..85f74cd 100644
--- a/drivers/regulator/mc13892-regulator.c
+++ b/drivers/regulator/mc13892-regulator.c
-@@ -582,10 +582,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
- }
+@@ -584,10 +584,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
mc13xxx_unlock(mc13892);
-- mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
+ /* update mc13892_vcam ops */
+ pax_open_kernel();
-+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
- = mc13892_vcam_set_mode;
-- mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
-+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
- = mc13892_vcam_get_mode;
+ memcpy(&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
+ sizeof(struct regulator_ops));
+- mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
+- mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
++ *(void **)&mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
++ *(void **)&mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
+ pax_close_kernel();
+ mc13892_regulators[MC13892_VCAM].desc.ops = &mc13892_vcam_ops;
mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
- ARRAY_SIZE(mc13892_regulators));
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
-index cae212f..58a3980 100644
+index 5b2e761..c8c8a4a 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
-@@ -777,7 +777,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
+@@ -789,7 +789,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
hpet_rtc_timer_init();
/* export at least the first block of NVRAM */
@@ -50622,7 +50878,7 @@ index d049393..bb20be0 100644
case RTC_PIE_ON:
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
-index 4e75345..09f8663 100644
+index bb43cf7..ee4d274 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -107,7 +107,7 @@ struct ds1307 {
@@ -50649,47 +50905,6 @@ index 11880c1..b823aa4 100644
ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
if (ret)
-diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
-index 14b5f8d..cc9bd26 100644
---- a/drivers/scsi/aic7xxx/aic79xx_pci.c
-+++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
-@@ -827,7 +827,7 @@ ahd_pci_intr(struct ahd_softc *ahd)
- for (bit = 0; bit < 8; bit++) {
-
- if ((pci_status[i] & (0x1 << bit)) != 0) {
-- static const char *s;
-+ const char *s;
-
- s = pci_status_strings[bit];
- if (i == 7/*TARG*/ && bit == 3)
-@@ -887,23 +887,15 @@ ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat)
-
- for (bit = 0; bit < 8; bit++) {
-
-- if ((split_status[i] & (0x1 << bit)) != 0) {
-- static const char *s;
--
-- s = split_status_strings[bit];
-- printk(s, ahd_name(ahd),
-+ if ((split_status[i] & (0x1 << bit)) != 0)
-+ printk(split_status_strings[bit], ahd_name(ahd),
- split_status_source[i]);
-- }
-
- if (i > 1)
- continue;
-
-- if ((sg_split_status[i] & (0x1 << bit)) != 0) {
-- static const char *s;
--
-- s = split_status_strings[bit];
-- printk(s, ahd_name(ahd), "SG");
-- }
-+ if ((sg_split_status[i] & (0x1 << bit)) != 0)
-+ printk(split_status_strings[bit], ahd_name(ahd), "SG");
- }
- }
- /*
diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
index e693af6..2e525b6 100644
--- a/drivers/scsi/bfa/bfa_fcpim.h
@@ -50704,7 +50919,7 @@ index e693af6..2e525b6 100644
void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
-index a3ab5cc..8143622 100644
+index 0f19455..ef7adb5 100644
--- a/drivers/scsi/bfa/bfa_fcs.c
+++ b/drivers/scsi/bfa/bfa_fcs.c
@@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
@@ -50863,7 +51078,7 @@ index 045c4e1..13de803 100644
error = bus_register(&fcoe_bus_type);
if (error)
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
-index f28ea07..34b16d3 100644
+index 6de80e3..a11e0ac 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -42,7 +42,7 @@
@@ -50875,7 +51090,7 @@ index f28ea07..34b16d3 100644
static void scsi_host_cls_release(struct device *dev)
-@@ -369,7 +369,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
+@@ -392,7 +392,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
* subtract one because we increment first then return, but we need to
* know what the next host number was before increment
*/
@@ -50885,19 +51100,23 @@ index f28ea07..34b16d3 100644
/* These three are default values which can be overridden */
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
-index 528bff5..84963854 100644
+index cef5d49..01e280e 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
-@@ -571,7 +571,7 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
+@@ -701,10 +701,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
unsigned long flags;
+ if (h->transMethod & CFGTBL_Trans_io_accel1)
+- return h->access.command_completed(h, q);
++ return h->access->command_completed(h, q);
+
if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
- return h->access.command_completed(h, q);
+ return h->access->command_completed(h, q);
if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
a = rq->head[rq->current_entry];
-@@ -3474,7 +3474,7 @@ static void start_io(struct ctlr_info *h)
+@@ -5454,7 +5454,7 @@ static void start_io(struct ctlr_info *h, unsigned long *flags)
while (!list_empty(&h->reqQ)) {
c = list_entry(h->reqQ.next, struct CommandList, list);
/* can't do anything if fifo is full */
@@ -50906,16 +51125,16 @@ index 528bff5..84963854 100644
h->fifo_recently_full = 1;
dev_warn(&h->pdev->dev, "fifo full\n");
break;
-@@ -3498,7 +3498,7 @@ static void start_io(struct ctlr_info *h)
+@@ -5476,7 +5476,7 @@ static void start_io(struct ctlr_info *h, unsigned long *flags)
/* Tell the controller execute command */
- spin_unlock_irqrestore(&h->lock, flags);
+ spin_unlock_irqrestore(&h->lock, *flags);
- h->access.submit_command(h, c);
+ h->access->submit_command(h, c);
- spin_lock_irqsave(&h->lock, flags);
+ spin_lock_irqsave(&h->lock, *flags);
}
- spin_unlock_irqrestore(&h->lock, flags);
-@@ -3506,17 +3506,17 @@ static void start_io(struct ctlr_info *h)
+ }
+@@ -5492,17 +5492,17 @@ static void lock_and_start_io(struct ctlr_info *h)
static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
{
@@ -50936,7 +51155,7 @@ index 528bff5..84963854 100644
(h->interrupts_enabled == 0);
}
-@@ -4442,7 +4442,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
+@@ -6445,7 +6445,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
if (prod_index < 0)
return -ENODEV;
h->product_name = products[prod_index].product_name;
@@ -50945,16 +51164,16 @@ index 528bff5..84963854 100644
pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
-@@ -4712,7 +4712,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
- {
+@@ -6790,7 +6790,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
unsigned long flags;
+ u32 lockup_detected;
- h->access.set_intr_mask(h, HPSA_INTR_OFF);
+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
spin_lock_irqsave(&h->lock, flags);
- h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
- spin_unlock_irqrestore(&h->lock, flags);
-@@ -4843,7 +4843,7 @@ reinit_after_soft_reset:
+ lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
+ if (!lockup_detected) {
+@@ -7037,7 +7037,7 @@ reinit_after_soft_reset:
}
/* make sure the board interrupts are off */
@@ -50963,7 +51182,7 @@ index 528bff5..84963854 100644
if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
goto clean2;
-@@ -4877,7 +4877,7 @@ reinit_after_soft_reset:
+@@ -7072,7 +7072,7 @@ reinit_after_soft_reset:
* fake ones to scoop up any residual completions.
*/
spin_lock_irqsave(&h->lock, flags);
@@ -50972,7 +51191,7 @@ index 528bff5..84963854 100644
spin_unlock_irqrestore(&h->lock, flags);
free_irqs(h);
rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
-@@ -4896,9 +4896,9 @@ reinit_after_soft_reset:
+@@ -7091,9 +7091,9 @@ reinit_after_soft_reset:
dev_info(&h->pdev->dev, "Board READY.\n");
dev_info(&h->pdev->dev,
"Waiting for stale completions to drain.\n");
@@ -50984,8 +51203,8 @@ index 528bff5..84963854 100644
rc = controller_reset_failed(h->cfgtable);
if (rc)
-@@ -4919,7 +4919,7 @@ reinit_after_soft_reset:
- }
+@@ -7119,7 +7119,7 @@ reinit_after_soft_reset:
+ h->drv_req_rescan = 0;
/* Turn the interrupts on so we can service requests */
- h->access.set_intr_mask(h, HPSA_INTR_ON);
@@ -50993,7 +51212,7 @@ index 528bff5..84963854 100644
hpsa_hba_inquiry(h);
hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
-@@ -4988,7 +4988,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
+@@ -7184,7 +7184,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
* To write all data in the battery backed cache to disks
*/
hpsa_flush_cache(h);
@@ -51002,29 +51221,53 @@ index 528bff5..84963854 100644
hpsa_free_irqs_and_disable_msix(h);
}
-@@ -5162,7 +5162,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 use_short_tags)
- return;
- }
- /* Change the access methods to the performant access methods */
-- h->access = SA5_performant_access;
-+ h->access = &SA5_performant_access;
- h->transMethod = CFGTBL_Trans_Performant;
- }
+@@ -7302,7 +7302,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
+ CFGTBL_Trans_enable_directed_msix |
+ (trans_support & (CFGTBL_Trans_io_accel1 |
+ CFGTBL_Trans_io_accel2));
+- struct access_method access = SA5_performant_access;
++ struct access_method *access = &SA5_performant_access;
+ /* This is a bit complicated. There are 8 registers on
+ * the controller which we write to to tell it 8 different
+@@ -7344,7 +7344,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
+ * perform the superfluous readl() after each command submission.
+ */
+ if (trans_support & (CFGTBL_Trans_io_accel1 | CFGTBL_Trans_io_accel2))
+- access = SA5_performant_access_no_read;
++ access = &SA5_performant_access_no_read;
+
+ /* Controller spec: zero out this buffer. */
+ for (i = 0; i < h->nreply_queues; i++)
+@@ -7374,12 +7374,12 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
+ * enable outbound interrupt coalescing in accelerator mode;
+ */
+ if (trans_support & CFGTBL_Trans_io_accel1) {
+- access = SA5_ioaccel_mode1_access;
++ access = &SA5_ioaccel_mode1_access;
+ writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
+ writel(4, &h->cfgtable->HostWrite.CoalIntCount);
+ } else {
+ if (trans_support & CFGTBL_Trans_io_accel2) {
+- access = SA5_ioaccel_mode2_access;
++ access = &SA5_ioaccel_mode2_access;
+ writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
+ writel(4, &h->cfgtable->HostWrite.CoalIntCount);
+ }
diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
-index 01c3283..4655219 100644
+index 24472ce..8782caf 100644
--- a/drivers/scsi/hpsa.h
+++ b/drivers/scsi/hpsa.h
-@@ -79,7 +79,7 @@ struct ctlr_info {
+@@ -127,7 +127,7 @@ struct ctlr_info {
unsigned int msix_vector;
unsigned int msi_vector;
int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
- struct access_method access;
+ struct access_method *access;
+ char hba_mode_enabled;
/* queue and queue Info */
- struct list_head reqQ;
-@@ -388,19 +388,19 @@ static bool SA5_performant_intr_pending(struct ctlr_info *h)
+@@ -536,43 +536,43 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
}
static struct access_method SA5_access = {
@@ -51040,6 +51283,32 @@ index 01c3283..4655219 100644
+ .command_completed = SA5_completed,
};
+ static struct access_method SA5_ioaccel_mode1_access = {
+- SA5_submit_command,
+- SA5_performant_intr_mask,
+- SA5_fifo_full,
+- SA5_ioaccel_mode1_intr_pending,
+- SA5_ioaccel_mode1_completed,
++ .submit_command = SA5_submit_command,
++ .set_intr_mask = SA5_performant_intr_mask,
++ .fifo_full = SA5_fifo_full,
++ .intr_pending = SA5_ioaccel_mode1_intr_pending,
++ .command_completed = SA5_ioaccel_mode1_completed,
+ };
+
+ static struct access_method SA5_ioaccel_mode2_access = {
+- SA5_submit_command_ioaccel2,
+- SA5_performant_intr_mask,
+- SA5_fifo_full,
+- SA5_performant_intr_pending,
+- SA5_performant_completed,
++ .submit_command = SA5_submit_command_ioaccel2,
++ .set_intr_mask = SA5_performant_intr_mask,
++ .fifo_full = SA5_fifo_full,
++ .intr_pending = SA5_performant_intr_pending,
++ .command_completed = SA5_performant_completed,
+ };
+
static struct access_method SA5_performant_access = {
- SA5_submit_command,
- SA5_performant_intr_mask,
@@ -51053,6 +51322,19 @@ index 01c3283..4655219 100644
+ .command_completed = SA5_performant_completed,
};
+ static struct access_method SA5_performant_access_no_read = {
+- SA5_submit_command_no_read,
+- SA5_performant_intr_mask,
+- SA5_fifo_full,
+- SA5_performant_intr_pending,
+- SA5_performant_completed,
++ .submit_command = SA5_submit_command_no_read,
++ .set_intr_mask = SA5_performant_intr_mask,
++ .fifo_full = SA5_fifo_full,
++ .intr_pending = SA5_performant_intr_pending,
++ .command_completed = SA5_performant_completed,
+ };
+
struct board_type {
diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
index 1b3a094..068e683 100644
@@ -51200,7 +51482,7 @@ index 1b3a094..068e683 100644
}
EXPORT_SYMBOL(fc_exch_update_stats);
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
-index d289583..b745eec 100644
+index 766098a..1c6c971 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -554,7 +554,7 @@ static struct ata_port_operations sas_sata_ops = {
@@ -51213,10 +51495,10 @@ index d289583..b745eec 100644
.qc_issue = sas_ata_qc_issue,
.qc_fill_rtf = sas_ata_qc_fill_rtf,
diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
-index 4e1b75c..0bbdfa9 100644
+index 434e903..5a4a79b 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
-@@ -432,7 +432,7 @@ struct lpfc_vport {
+@@ -430,7 +430,7 @@ struct lpfc_vport {
struct dentry *debug_nodelist;
struct dentry *vport_debugfs_root;
struct lpfc_debugfs_trc *disc_trc;
@@ -51225,7 +51507,7 @@ index 4e1b75c..0bbdfa9 100644
#endif
uint8_t stat_data_enabled;
uint8_t stat_data_blocked;
-@@ -865,8 +865,8 @@ struct lpfc_hba {
+@@ -880,8 +880,8 @@ struct lpfc_hba {
struct timer_list fabric_block_timer;
unsigned long bit_flags;
#define FABRIC_COMANDS_BLOCKED 0
@@ -51235,8 +51517,8 @@ index 4e1b75c..0bbdfa9 100644
+ atomic_unchecked_t num_cmd_success;
unsigned long last_rsrc_error_time;
unsigned long last_ramp_down_time;
- unsigned long last_ramp_up_time;
-@@ -902,7 +902,7 @@ struct lpfc_hba {
+ #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
+@@ -916,7 +916,7 @@ struct lpfc_hba {
struct dentry *debug_slow_ring_trc;
struct lpfc_debugfs_trc *slow_ring_trc;
@@ -51246,7 +51528,7 @@ index 4e1b75c..0bbdfa9 100644
struct dentry *idiag_root;
struct dentry *idiag_pci_cfg;
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
-index b800cc9..16b6a91 100644
+index 786a2af..562c6a2 100644
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
@@ -51310,7 +51592,7 @@ index b800cc9..16b6a91 100644
dtp->jif = jiffies;
#endif
return;
-@@ -4168,7 +4168,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
+@@ -4268,7 +4268,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
"slow_ring buffer\n");
goto debug_failed;
}
@@ -51319,7 +51601,7 @@ index b800cc9..16b6a91 100644
memset(phba->slow_ring_trc, 0,
(sizeof(struct lpfc_debugfs_trc) *
lpfc_debugfs_max_slow_ring_trc));
-@@ -4214,7 +4214,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
+@@ -4314,7 +4314,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
"buffer\n");
goto debug_failed;
}
@@ -51329,10 +51611,10 @@ index b800cc9..16b6a91 100644
snprintf(name, sizeof(name), "discovery_trace");
vport->debug_disc_trc =
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
-index 68c94cc..8c27be5 100644
+index 0b2c53a..aec2b45 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
-@@ -10949,8 +10949,10 @@ lpfc_init(void)
+@@ -11290,8 +11290,10 @@ lpfc_init(void)
"misc_register returned with status %d", error);
if (lpfc_enable_npiv) {
@@ -51346,28 +51628,19 @@ index 68c94cc..8c27be5 100644
lpfc_transport_template =
fc_attach_transport(&lpfc_transport_functions);
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
-index b2ede05..aaf482ca 100644
+index b99399f..d29dc75 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
-@@ -353,7 +353,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
- uint32_t evt_posted;
+@@ -383,7 +383,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
+ unsigned long expires;
spin_lock_irqsave(&phba->hbalock, flags);
- atomic_inc(&phba->num_rsrc_err);
+ atomic_inc_unchecked(&phba->num_rsrc_err);
phba->last_rsrc_error_time = jiffies;
- if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
-@@ -394,7 +394,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport *vport,
- unsigned long flags;
- struct lpfc_hba *phba = vport->phba;
- uint32_t evt_posted;
-- atomic_inc(&phba->num_cmd_success);
-+ atomic_inc_unchecked(&phba->num_cmd_success);
-
- if (vport->cfg_lun_queue_depth <= queue_depth)
- return;
-@@ -438,8 +438,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
+ expires = phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL;
+@@ -425,8 +425,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
unsigned long num_rsrc_err, num_cmd_success;
int i;
@@ -51378,18 +51651,7 @@ index b2ede05..aaf482ca 100644
/*
* The error and success command counters are global per
-@@ -467,8 +467,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
- }
- }
- lpfc_destroy_vport_work_array(phba, vports);
-- atomic_set(&phba->num_rsrc_err, 0);
-- atomic_set(&phba->num_cmd_success, 0);
-+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
-+ atomic_set_unchecked(&phba->num_cmd_success, 0);
- }
-
- /**
-@@ -502,8 +502,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
+@@ -454,8 +454,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
}
}
lpfc_destroy_vport_work_array(phba, vports);
@@ -51401,10 +51663,10 @@ index b2ede05..aaf482ca 100644
/**
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
-index 6fd7d40..b444223 100644
+index c80ed04..e674f01 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
-@@ -1557,7 +1557,7 @@ _scsih_get_resync(struct device *dev)
+@@ -1561,7 +1561,7 @@ _scsih_get_resync(struct device *dev)
{
struct scsi_device *sdev = to_scsi_device(dev);
struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
@@ -51413,7 +51675,7 @@ index 6fd7d40..b444223 100644
unsigned long flags;
Mpi2RaidVolPage0_t vol_pg0;
Mpi2ConfigReply_t mpi_reply;
-@@ -1609,7 +1609,7 @@ _scsih_get_state(struct device *dev)
+@@ -1613,7 +1613,7 @@ _scsih_get_state(struct device *dev)
{
struct scsi_device *sdev = to_scsi_device(dev);
struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
@@ -51422,16 +51684,16 @@ index 6fd7d40..b444223 100644
unsigned long flags;
Mpi2RaidVolPage0_t vol_pg0;
Mpi2ConfigReply_t mpi_reply;
-@@ -6637,7 +6637,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
- struct fw_event_work *fw_event)
- {
- Mpi2EventDataIrOperationStatus_t *event_data = fw_event->event_data;
+@@ -6663,7 +6663,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
+ Mpi2EventDataIrOperationStatus_t *event_data =
+ (Mpi2EventDataIrOperationStatus_t *)
+ fw_event->event_data;
- static struct _raid_device *raid_device;
+ struct _raid_device *raid_device;
unsigned long flags;
u16 handle;
-@@ -7108,7 +7108,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
+@@ -7134,7 +7134,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
u64 sas_address;
struct _sas_device *sas_device;
struct _sas_node *expander_device;
@@ -51441,7 +51703,7 @@ index 6fd7d40..b444223 100644
unsigned long flags;
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
-index be8ce54..94ed33a 100644
+index bcb64eb..f08cf71 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
@@ -51494,7 +51756,7 @@ index be8ce54..94ed33a 100644
return;
fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
-@@ -5322,8 +5322,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
+@@ -5312,8 +5312,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
init_waitqueue_head(&pinstance->reset_wait_q);
atomic_set(&pinstance->outstanding_cmds, 0);
@@ -51505,7 +51767,7 @@ index be8ce54..94ed33a 100644
INIT_LIST_HEAD(&pinstance->free_res_q);
INIT_LIST_HEAD(&pinstance->used_res_q);
-@@ -6036,7 +6036,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
+@@ -6026,7 +6026,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
/* Schedule worker thread to handle CCN and take care of adding and
* removing devices to OS
*/
@@ -51548,10 +51810,10 @@ index e1d150f..6c6df44 100644
/* To indicate add/delete/modify during CCN */
u8 change_detected;
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
-index 4a0d7c9..3d658d7 100644
+index 82b92c4..3178171 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
-@@ -2038,7 +2038,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
+@@ -2192,7 +2192,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
return 0;
}
@@ -51560,7 +51822,7 @@ index 4a0d7c9..3d658d7 100644
.show_host_node_name = 1,
.show_host_port_name = 1,
-@@ -2086,7 +2086,7 @@ struct fc_function_template qla2xxx_transport_functions = {
+@@ -2240,7 +2240,7 @@ struct fc_function_template qla2xxx_transport_functions = {
.bsg_timeout = qla24xx_bsg_timeout,
};
@@ -51570,10 +51832,10 @@ index 4a0d7c9..3d658d7 100644
.show_host_node_name = 1,
.show_host_port_name = 1,
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
-index 1f42662..bf9836c 100644
+index b1865a7..a7723d3 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
-@@ -546,8 +546,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *);
+@@ -571,8 +571,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *, size_t);
struct device_attribute;
extern struct device_attribute *qla2x00_host_attrs[];
struct fc_function_template;
@@ -51585,10 +51847,10 @@ index 1f42662..bf9836c 100644
extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
extern void qla2x00_init_host_attr(scsi_qla_host_t *);
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
-index 23c1b0c..e8035ca 100644
+index db3dbd9..2492392 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
-@@ -1491,8 +1491,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
+@@ -1507,8 +1507,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
!pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
/* Ok, a 64bit DMA mask is applicable. */
ha->flags.enable_64bit_addressing = 1;
@@ -51602,10 +51864,10 @@ index 23c1b0c..e8035ca 100644
}
}
diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
-index aa67bb9..06d0e2a 100644
+index 8f6d0fb..1b21097 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
-@@ -303,7 +303,7 @@ struct ddb_entry {
+@@ -305,7 +305,7 @@ struct ddb_entry {
* (4000 only) */
atomic_t relogin_timer; /* Max Time to wait for
* relogin to complete */
@@ -51615,10 +51877,10 @@ index aa67bb9..06d0e2a 100644
uint32_t default_time2wait; /* Default Min time between
* relogins (+aens) */
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
-index c21adc3..1b4155f 100644
+index 199fcf7..3c3a918 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
-@@ -4463,12 +4463,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
+@@ -4496,12 +4496,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
*/
if (!iscsi_is_session_online(cls_sess)) {
/* Reset retry relogin timer */
@@ -51633,7 +51895,7 @@ index c21adc3..1b4155f 100644
ddb_entry->default_time2wait + 4));
set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
atomic_set(&ddb_entry->retry_relogin_timer,
-@@ -6552,7 +6552,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
+@@ -6609,7 +6609,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
atomic_set(&ddb_entry->relogin_timer, 0);
@@ -51643,10 +51905,10 @@ index c21adc3..1b4155f 100644
ddb_entry->default_relogin_timeout =
(def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
-index d8afec8..3ec7152 100644
+index 79c77b4..ef6ec0b 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
-@@ -658,7 +658,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
+@@ -645,7 +645,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
struct Scsi_Host *host = cmd->device->host;
int rtn = 0;
@@ -51656,10 +51918,10 @@ index d8afec8..3ec7152 100644
/* check if the device is still usable */
if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
-index 64e487a..384f684 100644
+index 17fb051..937fbbd 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
-@@ -1482,7 +1482,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
+@@ -1583,7 +1583,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
shost = sdev->host;
scsi_init_cmd_errh(cmd);
cmd->result = DID_NO_CONNECT << 16;
@@ -51668,7 +51930,7 @@ index 64e487a..384f684 100644
/*
* SCSI request completion path will do scsi_device_unbusy(),
-@@ -1508,9 +1508,9 @@ static void scsi_softirq_done(struct request *rq)
+@@ -1606,9 +1606,9 @@ static void scsi_softirq_done(struct request *rq)
INIT_LIST_HEAD(&cmd->eh_entry);
@@ -51681,10 +51943,10 @@ index 64e487a..384f684 100644
disposition = scsi_decide_disposition(cmd);
if (disposition != SUCCESS &&
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
-index 665acbf..d18fab4 100644
+index f4cb7b3..dfa79c4 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
-@@ -734,7 +734,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
+@@ -805,7 +805,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
char *buf) \
{ \
struct scsi_device *sdev = to_scsi_device(dev); \
@@ -51693,24 +51955,11 @@ index 665acbf..d18fab4 100644
return snprintf(buf, 20, "0x%llx\n", count); \
} \
static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
-diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
-index 84a1fdf..693b0d6 100644
---- a/drivers/scsi/scsi_tgt_lib.c
-+++ b/drivers/scsi/scsi_tgt_lib.c
-@@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,
- int err;
-
- dprintk("%lx %u\n", uaddr, len);
-- err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);
-+ err = blk_rq_map_user(q, rq, NULL, (void __user *)uaddr, len, GFP_KERNEL);
- if (err) {
- /*
- * TODO: need to fixup sg_tablesize, max_segment_size,
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
-index 4628fd5..a94a1c2 100644
+index 5d6f348..18778a6b 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
-@@ -497,7 +497,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
+@@ -501,7 +501,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
* Netlink Infrastructure
*/
@@ -51719,7 +51968,7 @@ index 4628fd5..a94a1c2 100644
/**
* fc_get_event_number - Obtain the next sequential FC event number
-@@ -510,7 +510,7 @@ static atomic_t fc_event_seq;
+@@ -514,7 +514,7 @@ static atomic_t fc_event_seq;
u32
fc_get_event_number(void)
{
@@ -51728,7 +51977,7 @@ index 4628fd5..a94a1c2 100644
}
EXPORT_SYMBOL(fc_get_event_number);
-@@ -654,7 +654,7 @@ static __init int fc_transport_init(void)
+@@ -658,7 +658,7 @@ static __init int fc_transport_init(void)
{
int error;
@@ -51737,7 +51986,7 @@ index 4628fd5..a94a1c2 100644
error = transport_class_register(&fc_host_class);
if (error)
-@@ -844,7 +844,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
+@@ -848,7 +848,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
char *cp;
*val = simple_strtoul(buf, &cp, 0);
@@ -51747,7 +51996,7 @@ index 4628fd5..a94a1c2 100644
/*
* Check for overflow; dev_loss_tmo is u32
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
-index fd8ffe6..fd0bebf 100644
+index 67d43e3..8cee73c 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -79,7 +79,7 @@ struct iscsi_internal {
@@ -51768,7 +52017,7 @@ index fd8ffe6..fd0bebf 100644
if (target_id == ISCSI_MAX_TARGET) {
id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
-@@ -4511,7 +4511,7 @@ static __init int iscsi_transport_init(void)
+@@ -4515,7 +4515,7 @@ static __init int iscsi_transport_init(void)
printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
ISCSI_TRANSPORT_VERSION);
@@ -51778,11 +52027,11 @@ index fd8ffe6..fd0bebf 100644
err = class_register(&iscsi_transport_class);
if (err)
diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
-index e3e794e..f72f20c 100644
+index ae45bd9..c32a586 100644
--- a/drivers/scsi/scsi_transport_srp.c
+++ b/drivers/scsi/scsi_transport_srp.c
-@@ -36,7 +36,7 @@
- #include "scsi_transport_srp_internal.h"
+@@ -35,7 +35,7 @@
+ #include "scsi_priv.h"
struct srp_host_attrs {
- atomic_t next_port_id;
@@ -51790,7 +52039,7 @@ index e3e794e..f72f20c 100644
};
#define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
-@@ -101,7 +101,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
+@@ -100,7 +100,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
struct Scsi_Host *shost = dev_to_shost(dev);
struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
@@ -51799,7 +52048,7 @@ index e3e794e..f72f20c 100644
return 0;
}
-@@ -735,7 +735,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
+@@ -734,7 +734,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
rport_fast_io_fail_timedout);
INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
@@ -51809,10 +52058,24 @@ index e3e794e..f72f20c 100644
transport_setup_device(&rport->dev);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
-index e8abb73..faa6fbe 100644
+index cfba74c..4cdf6a1 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
-@@ -2967,7 +2967,7 @@ static int sd_probe(struct device *dev)
+@@ -2818,9 +2818,11 @@ static int sd_revalidate_disk(struct gendisk *disk)
+ */
+ sd_set_flush_flag(sdkp);
+
+- max_xfer = min_not_zero(queue_max_hw_sectors(sdkp->disk->queue),
+- sdkp->max_xfer_blocks);
++ max_xfer = sdkp->max_xfer_blocks;
+ max_xfer <<= ilog2(sdp->sector_size) - 9;
++
++ max_xfer = min_not_zero(queue_max_hw_sectors(sdkp->disk->queue),
++ max_xfer);
+ blk_queue_max_hw_sectors(sdkp->disk->queue, max_xfer);
+ set_capacity(disk, sdkp->capacity);
+ sd_config_write_same(sdkp);
+@@ -3022,7 +3024,7 @@ static int sd_probe(struct device *dev)
sdkp->disk = gd;
sdkp->index = index;
atomic_set(&sdkp->openers, 0);
@@ -51822,10 +52085,10 @@ index e8abb73..faa6fbe 100644
if (!sdp->request_queue->rq_timeout) {
if (sdp->type != TYPE_MOD)
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
-index df5e961..df6b97f 100644
+index 6035444..c82edd4 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
-@@ -1102,7 +1102,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
+@@ -1138,7 +1138,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
sdp->disk->disk_name,
MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
NULL,
@@ -51834,11 +52097,24 @@ index df5e961..df6b97f 100644
case BLKTRACESTART:
return blk_trace_startstop(sdp->device->request_queue, 1);
case BLKTRACESTOP:
+diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
+index 11a5043..e36f04c 100644
+--- a/drivers/soc/tegra/fuse/fuse-tegra.c
++++ b/drivers/soc/tegra/fuse/fuse-tegra.c
+@@ -70,7 +70,7 @@ static ssize_t fuse_read(struct file *fd, struct kobject *kobj,
+ return i;
+ }
+
+-static struct bin_attribute fuse_bin_attr = {
++static bin_attribute_no_const fuse_bin_attr = {
+ .attr = { .name = "fuse", .mode = S_IRUGO, },
+ .read = fuse_read,
+ };
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
-index fbf3b22..f5c8b60 100644
+index 50f20f2..6bd81e0 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
-@@ -1980,7 +1980,7 @@ int spi_bus_unlock(struct spi_master *master)
+@@ -2224,7 +2224,7 @@ int spi_bus_unlock(struct spi_master *master)
EXPORT_SYMBOL_GPL(spi_bus_unlock);
/* portable code must never pass more than 32 bytes */
@@ -51848,7 +52124,7 @@ index fbf3b22..f5c8b60 100644
static u8 *buf;
diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
-index 2c61783..4d49e4e 100644
+index b41429f..2de5373 100644
--- a/drivers/staging/android/timed_output.c
+++ b/drivers/staging/android/timed_output.c
@@ -25,7 +25,7 @@
@@ -51860,7 +52136,7 @@ index 2c61783..4d49e4e 100644
static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
char *buf)
-@@ -63,7 +63,7 @@ static int create_timed_output_class(void)
+@@ -65,7 +65,7 @@ static int create_timed_output_class(void)
timed_output_class = class_create(THIS_MODULE, "timed_output");
if (IS_ERR(timed_output_class))
return PTR_ERR(timed_output_class);
@@ -51869,7 +52145,7 @@ index 2c61783..4d49e4e 100644
timed_output_class->dev_groups = timed_output_groups;
}
-@@ -81,7 +81,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
+@@ -83,7 +83,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
if (ret < 0)
return ret;
@@ -51879,7 +52155,7 @@ index 2c61783..4d49e4e 100644
MKDEV(0, tdev->index), NULL, "%s", tdev->name);
if (IS_ERR(tdev->dev))
diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
-index fe47cd3..19a1bd1 100644
+index 001348c..cfaac8a 100644
--- a/drivers/staging/gdm724x/gdm_tty.c
+++ b/drivers/staging/gdm724x/gdm_tty.c
@@ -44,7 +44,7 @@
@@ -51892,41 +52168,23 @@ index fe47cd3..19a1bd1 100644
static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c
-index 236ed66..dd9cd74 100644
+index 9cb222e..8766f26 100644
--- a/drivers/staging/imx-drm/imx-drm-core.c
+++ b/drivers/staging/imx-drm/imx-drm-core.c
-@@ -488,7 +488,7 @@ int imx_drm_add_crtc(struct drm_crtc *crtc,
- goto err_busy;
- }
-
-- if (imxdrm->drm->open_count) {
-+ if (local_read(&imxdrm->drm->open_count)) {
- ret = -EBUSY;
- goto err_busy;
- }
-@@ -576,7 +576,7 @@ int imx_drm_add_encoder(struct drm_encoder *encoder,
-
- mutex_lock(&imxdrm->mutex);
-
-- if (imxdrm->drm->open_count) {
-+ if (local_read(&imxdrm->drm->open_count)) {
- ret = -EBUSY;
- goto err_busy;
- }
-@@ -715,7 +715,7 @@ int imx_drm_add_connector(struct drm_connector *connector,
+@@ -357,7 +357,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
+ if (imxdrm->pipes >= MAX_CRTC)
+ return -EINVAL;
- mutex_lock(&imxdrm->mutex);
+- if (imxdrm->drm->open_count)
++ if (local_read(&imxdrm->drm->open_count))
+ return -EBUSY;
-- if (imxdrm->drm->open_count) {
-+ if (local_read(&imxdrm->drm->open_count)) {
- ret = -EBUSY;
- goto err_busy;
- }
+ imx_drm_crtc = kzalloc(sizeof(*imx_drm_crtc), GFP_KERNEL);
diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
-index 7a6d85e..1304fbe 100644
+index 503b2d7..c904931 100644
--- a/drivers/staging/line6/driver.c
+++ b/drivers/staging/line6/driver.c
-@@ -458,7 +458,7 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
+@@ -463,7 +463,7 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
{
struct usb_device *usbdev = line6->usbdev;
int ret;
@@ -51935,7 +52193,7 @@ index 7a6d85e..1304fbe 100644
/* query the serial number: */
ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,
-@@ -471,27 +471,34 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
+@@ -476,27 +476,34 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
return ret;
}
@@ -51974,7 +52232,7 @@ index 7a6d85e..1304fbe 100644
/* receive the result: */
ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
-@@ -515,7 +522,7 @@ int line6_write_data(struct usb_line6 *line6, int address, void *data,
+@@ -520,7 +527,7 @@ int line6_write_data(struct usb_line6 *line6, int address, void *data,
{
struct usb_device *usbdev = line6->usbdev;
int ret;
@@ -51983,7 +52241,7 @@ index 7a6d85e..1304fbe 100644
ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,
USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
-@@ -528,26 +535,34 @@ int line6_write_data(struct usb_line6 *line6, int address, void *data,
+@@ -533,26 +540,34 @@ int line6_write_data(struct usb_line6 *line6, int address, void *data,
return ret;
}
@@ -52022,7 +52280,7 @@ index 7a6d85e..1304fbe 100644
}
diff --git a/drivers/staging/line6/toneport.c b/drivers/staging/line6/toneport.c
-index af2e7e5..e558d65 100644
+index 6943715..0a93632 100644
--- a/drivers/staging/line6/toneport.c
+++ b/drivers/staging/line6/toneport.c
@@ -11,6 +11,7 @@
@@ -52033,7 +52291,7 @@ index af2e7e5..e558d65 100644
#include <sound/control.h>
#include "audio.h"
-@@ -304,14 +305,20 @@ static void toneport_destruct(struct usb_interface *interface)
+@@ -307,14 +308,20 @@ static void toneport_destruct(struct usb_interface *interface)
*/
static void toneport_setup(struct usb_line6_toneport *toneport)
{
@@ -52058,7 +52316,7 @@ index af2e7e5..e558d65 100644
/* enable device: */
toneport_send_cmd(usbdev, 0x0301, 0x0000);
diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
-index 3f8020c..649fded 100644
+index a94f336..6a1924d 100644
--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
@@ -488,13 +488,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
@@ -52081,10 +52339,10 @@ index 3f8020c..649fded 100644
srpc_service_t brw_test_service;
diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
-index 050723a..fa6fdf1 100644
+index df04ab7..1deb1ac 100644
--- a/drivers/staging/lustre/lnet/selftest/framework.c
+++ b/drivers/staging/lustre/lnet/selftest/framework.c
-@@ -1635,12 +1635,10 @@ static srpc_service_t sfw_services[] =
+@@ -1632,12 +1632,10 @@ static srpc_service_t sfw_services[] = {
extern sfw_test_client_ops_t ping_test_client;
extern srpc_service_t ping_test_service;
@@ -52097,7 +52355,7 @@ index 050723a..fa6fdf1 100644
extern void brw_init_test_service(void);
-@@ -1684,12 +1682,10 @@ sfw_startup (void)
+@@ -1681,12 +1679,10 @@ sfw_startup (void)
INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
@@ -52136,10 +52394,10 @@ index 750cac4..e4d751f 100644
srpc_service_t ping_test_service;
void ping_init_test_service(void)
diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
-index ec4bb5e..740c6dd 100644
+index 14ac46f..eca2c16 100644
--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
-@@ -1141,7 +1141,7 @@ struct ldlm_callback_suite {
+@@ -1139,7 +1139,7 @@ struct ldlm_callback_suite {
ldlm_completion_callback lcs_completion;
ldlm_blocking_callback lcs_blocking;
ldlm_glimpse_callback lcs_glimpse;
@@ -52149,10 +52407,10 @@ index ec4bb5e..740c6dd 100644
/* ldlm_lockd.c */
int ldlm_del_waiting_lock(struct ldlm_lock *lock);
diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
-index c3470ce..2bef527 100644
+index 2a88b80..62e7e5f 100644
--- a/drivers/staging/lustre/lustre/include/obd.h
+++ b/drivers/staging/lustre/lustre/include/obd.h
-@@ -1426,7 +1426,7 @@ struct md_ops {
+@@ -1362,7 +1362,7 @@ struct md_ops {
* lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
* wrapper function in include/linux/obd_class.h.
*/
@@ -52162,54 +52420,54 @@ index c3470ce..2bef527 100644
struct lsm_operations {
void (*lsm_free)(struct lov_stripe_md *);
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
-index c9aae13..60ea292 100644
+index b798daa..b28ca8f 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
-@@ -239,7 +239,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
+@@ -258,7 +258,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
int added = (mode == LCK_NL);
int overlaps = 0;
int splitted = 0;
- const struct ldlm_callback_suite null_cbs = { NULL };
+ const struct ldlm_callback_suite null_cbs = { };
- CDEBUG(D_DLMTRACE, "flags %#llx owner "LPU64" pid %u mode %u start "
- LPU64" end "LPU64"\n", *flags,
+ CDEBUG(D_DLMTRACE, "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",
+ *flags, new->l_policy_data.l_flock.owner,
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
-index e947b91..f408990 100644
+index bbe2c68..c6b4275 100644
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
-@@ -217,7 +217,7 @@ DECLARE_PROC_HANDLER(proc_debug_mb)
- int LL_PROC_PROTO(proc_console_max_delay_cs)
+@@ -236,7 +236,7 @@ int proc_console_max_delay_cs(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
int rc, max_delay_cs;
-- ctl_table_t dummy = *table;
+- struct ctl_table dummy = *table;
+ ctl_table_no_const dummy = *table;
- cfs_duration_t d;
+ long d;
dummy.data = &max_delay_cs;
-@@ -248,7 +248,7 @@ int LL_PROC_PROTO(proc_console_max_delay_cs)
- int LL_PROC_PROTO(proc_console_min_delay_cs)
+@@ -268,7 +268,7 @@ int proc_console_min_delay_cs(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
int rc, min_delay_cs;
-- ctl_table_t dummy = *table;
+- struct ctl_table dummy = *table;
+ ctl_table_no_const dummy = *table;
- cfs_duration_t d;
+ long d;
dummy.data = &min_delay_cs;
-@@ -279,7 +279,7 @@ int LL_PROC_PROTO(proc_console_min_delay_cs)
- int LL_PROC_PROTO(proc_console_backoff)
+@@ -300,7 +300,7 @@ int proc_console_backoff(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
int rc, backoff;
-- ctl_table_t dummy = *table;
+- struct ctl_table dummy = *table;
+ ctl_table_no_const dummy = *table;
dummy.data = &backoff;
dummy.proc_handler = &proc_dointvec;
diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
-index 24ae26d..9d09cab 100644
+index 2c4fc74..b04ca79 100644
--- a/drivers/staging/lustre/lustre/libcfs/module.c
+++ b/drivers/staging/lustre/lustre/libcfs/module.c
-@@ -313,11 +313,11 @@ out:
+@@ -315,11 +315,11 @@ out:
struct cfs_psdev_ops libcfs_psdev_ops = {
@@ -52227,10 +52485,10 @@ index 24ae26d..9d09cab 100644
extern int insert_proc(void);
diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c
-index 52b7731..d604da0 100644
+index b0bb709..0117c96 100644
--- a/drivers/staging/lustre/lustre/llite/dir.c
+++ b/drivers/staging/lustre/lustre/llite/dir.c
-@@ -660,7 +660,7 @@ int ll_dir_setdirstripe(struct inode *dir, struct lmv_user_md *lump,
+@@ -661,7 +661,7 @@ int ll_dir_setdirstripe(struct inode *dir, struct lmv_user_md *lump,
int mode;
int err;
@@ -52239,76 +52497,11 @@ index 52b7731..d604da0 100644
op_data = ll_prep_md_op_data(NULL, dir, NULL, filename,
strlen(filename), mode, LUSTRE_OPC_MKDIR,
lump);
-diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c
-index 6cfdb9e..1ddab59 100644
---- a/drivers/staging/lustre/lustre/llite/llite_lib.c
-+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
-@@ -576,7 +576,7 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
- if (sb->s_root == NULL) {
- CERROR("%s: can't make root dentry\n",
- ll_get_fsname(sb, NULL, 0));
-- GOTO(out_root, err = -ENOMEM);
-+ GOTO(out_lock_cn_cb, err = -ENOMEM);
- }
-
- /* kernel >= 2.6.38 store dentry operations in sb->s_d_op. */
-diff --git a/drivers/staging/media/solo6x10/solo6x10-core.c b/drivers/staging/media/solo6x10/solo6x10-core.c
-index 480b7c4..6846324 100644
---- a/drivers/staging/media/solo6x10/solo6x10-core.c
-+++ b/drivers/staging/media/solo6x10/solo6x10-core.c
-@@ -434,7 +434,7 @@ static void solo_device_release(struct device *dev)
-
- static int solo_sysfs_init(struct solo_dev *solo_dev)
- {
-- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
-+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
- struct device *dev = &solo_dev->dev;
- const char *driver;
- int i;
-diff --git a/drivers/staging/media/solo6x10/solo6x10-g723.c b/drivers/staging/media/solo6x10/solo6x10-g723.c
-index 1db18c7..35e6afc 100644
---- a/drivers/staging/media/solo6x10/solo6x10-g723.c
-+++ b/drivers/staging/media/solo6x10/solo6x10-g723.c
-@@ -355,7 +355,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
-
- int solo_g723_init(struct solo_dev *solo_dev)
- {
-- static struct snd_device_ops ops = { NULL };
-+ static struct snd_device_ops ops = { };
- struct snd_card *card;
- struct snd_kcontrol_new kctl;
- char name[32];
-diff --git a/drivers/staging/media/solo6x10/solo6x10-p2m.c b/drivers/staging/media/solo6x10/solo6x10-p2m.c
-index 7f2f247..d999137 100644
---- a/drivers/staging/media/solo6x10/solo6x10-p2m.c
-+++ b/drivers/staging/media/solo6x10/solo6x10-p2m.c
-@@ -77,7 +77,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
-
- /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
- if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
-- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
-+ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
- if (p2m_id < 0)
- p2m_id = -p2m_id;
- }
-diff --git a/drivers/staging/media/solo6x10/solo6x10.h b/drivers/staging/media/solo6x10/solo6x10.h
-index 8964f8b..36eb087 100644
---- a/drivers/staging/media/solo6x10/solo6x10.h
-+++ b/drivers/staging/media/solo6x10/solo6x10.h
-@@ -237,7 +237,7 @@ struct solo_dev {
-
- /* P2M DMA Engine */
- struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
-- atomic_t p2m_count;
-+ atomic_unchecked_t p2m_count;
- int p2m_jiffies;
- unsigned int p2m_timeouts;
-
diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
-index a0f4868..139f1fb 100644
+index b2b6c3c..302e4e4 100644
--- a/drivers/staging/octeon/ethernet-rx.c
+++ b/drivers/staging/octeon/ethernet-rx.c
-@@ -417,11 +417,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
+@@ -416,11 +416,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
/* Increment RX stats for virtual ports */
if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
#ifdef CONFIG_64BIT
@@ -52324,7 +52517,7 @@ index a0f4868..139f1fb 100644
#endif
}
netif_receive_skb(skb);
-@@ -432,9 +432,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
+@@ -431,9 +431,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
dev->name);
*/
#ifdef CONFIG_64BIT
@@ -52337,10 +52530,10 @@ index a0f4868..139f1fb 100644
dev_kfree_skb_irq(skb);
}
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
-index 089dc4b..c9a687e 100644
+index 8f9e3fb..d283fb9 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
-@@ -253,11 +253,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
+@@ -247,11 +247,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
* since the RX tasklet also increments it.
*/
#ifdef CONFIG_64BIT
@@ -52357,33 +52550,20 @@ index 089dc4b..c9a687e 100644
}
diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
-index c274b34..f84de76 100644
+index 9191993..30e9817 100644
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
-@@ -271,7 +271,7 @@ struct hal_ops {
- s32 (*c2h_handler)(struct adapter *padapter,
- struct c2h_evt_hdr *c2h_evt);
- c2h_id_filter c2h_id_filter_ccx;
+@@ -225,7 +225,7 @@ struct hal_ops {
+
+ void (*hal_notch_filter)(struct adapter *adapter, bool enable);
+ void (*hal_reset_security_engine)(struct adapter *adapter);
-};
+} __no_const;
enum rt_eeprom_type {
EEPROM_93C46,
-diff --git a/drivers/staging/rtl8188eu/include/rtw_io.h b/drivers/staging/rtl8188eu/include/rtw_io.h
-index 3d1dfcc..ff5620a 100644
---- a/drivers/staging/rtl8188eu/include/rtw_io.h
-+++ b/drivers/staging/rtl8188eu/include/rtw_io.h
-@@ -126,7 +126,7 @@ struct _io_ops {
- u32 (*_write_scsi)(struct intf_hdl *pintfhdl, u32 cnt, u8 *pmem);
- void (*_read_port_cancel)(struct intf_hdl *pintfhdl);
- void (*_write_port_cancel)(struct intf_hdl *pintfhdl);
--};
-+} __no_const;
-
- struct io_req {
- struct list_head list;
diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
-index dc23395..cf7e9b1 100644
+index 070cc03..6806e37 100644
--- a/drivers/staging/rtl8712/rtl871x_io.h
+++ b/drivers/staging/rtl8712/rtl871x_io.h
@@ -108,7 +108,7 @@ struct _io_ops {
@@ -52395,98 +52575,50 @@ index dc23395..cf7e9b1 100644
struct io_req {
struct list_head list;
-diff --git a/drivers/staging/sbe-2t3e3/netdev.c b/drivers/staging/sbe-2t3e3/netdev.c
-index 1f5088b..0e59820 100644
---- a/drivers/staging/sbe-2t3e3/netdev.c
-+++ b/drivers/staging/sbe-2t3e3/netdev.c
-@@ -51,7 +51,7 @@ static int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
- t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
-
- if (rlen)
-- if (copy_to_user(data, &resp, rlen))
-+ if (rlen > sizeof resp || copy_to_user(data, &resp, rlen))
- return -EFAULT;
-
- return 0;
-diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
-index a863a98..d272795 100644
---- a/drivers/staging/usbip/vhci.h
-+++ b/drivers/staging/usbip/vhci.h
-@@ -83,7 +83,7 @@ struct vhci_hcd {
- unsigned resuming:1;
- unsigned long re_timeout;
-
-- atomic_t seqnum;
-+ atomic_unchecked_t seqnum;
-
- /*
- * NOTE:
-diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
-index 72391ef..7c6717a 100644
---- a/drivers/staging/usbip/vhci_hcd.c
-+++ b/drivers/staging/usbip/vhci_hcd.c
-@@ -440,7 +440,7 @@ static void vhci_tx_urb(struct urb *urb)
-
- spin_lock(&vdev->priv_lock);
-
-- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
-+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
- if (priv->seqnum == 0xffff)
- dev_info(&urb->dev->dev, "seqnum max\n");
-
-@@ -686,7 +686,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
- return -ENOMEM;
- }
-
-- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
-+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
- if (unlink->seqnum == 0xffff)
- pr_info("seqnum max\n");
-
-@@ -890,7 +890,7 @@ static int vhci_start(struct usb_hcd *hcd)
- vdev->rhport = rhport;
- }
-
-- atomic_set(&vhci->seqnum, 0);
-+ atomic_set_unchecked(&vhci->seqnum, 0);
- spin_lock_init(&vhci->lock);
-
- hcd->power_budget = 0; /* no limit */
-diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
-index d07fcb5..358e1e1 100644
---- a/drivers/staging/usbip/vhci_rx.c
-+++ b/drivers/staging/usbip/vhci_rx.c
-@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
- if (!urb) {
- pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
- pr_info("max seqnum %d\n",
-- atomic_read(&the_controller->seqnum));
-+ atomic_read_unchecked(&the_controller->seqnum));
- usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
- return;
- }
+diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
+index 2bf2e2f..84421c9 100644
+--- a/drivers/staging/unisys/visorchipset/visorchipset.h
++++ b/drivers/staging/unisys/visorchipset/visorchipset.h
+@@ -228,7 +228,7 @@ typedef struct {
+ void (*device_resume)(ulong busNo, ulong devNo);
+ int (*get_channel_info)(uuid_le typeGuid, ulong *minSize,
+ ulong *maxSize);
+-} VISORCHIPSET_BUSDEV_NOTIFIERS;
++} __no_const VISORCHIPSET_BUSDEV_NOTIFIERS;
+
+ /* These functions live inside visorchipset, and will be called to indicate
+ * responses to specific events (by code outside of visorchipset).
+@@ -243,7 +243,7 @@ typedef struct {
+ void (*device_destroy)(ulong busNo, ulong devNo, int response);
+ void (*device_pause)(ulong busNo, ulong devNo, int response);
+ void (*device_resume)(ulong busNo, ulong devNo, int response);
+-} VISORCHIPSET_BUSDEV_RESPONDERS;
++} __no_const VISORCHIPSET_BUSDEV_RESPONDERS;
+
+ /** Register functions (in the bus driver) to get called by visorchipset
+ * whenever a bus or device appears for which this service partition is
diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
-index 6eecd53..1025c8b 100644
+index ae0dade..803d53a 100644
--- a/drivers/staging/vt6655/hostap.c
+++ b/drivers/staging/vt6655/hostap.c
-@@ -69,14 +69,13 @@ static int msglevel = MSG_LEVEL_INFO;
+@@ -65,14 +65,13 @@
*
*/
+static net_device_ops_no_const apdev_netdev_ops;
+
- static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
+ static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
{
- PSDevice apdev_priv;
+ struct vnt_private *apdev_priv;
struct net_device *dev = pDevice->dev;
int ret;
- const struct net_device_ops apdev_netdev_ops = {
- .ndo_start_xmit = pDevice->tx_80211,
- };
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
+ pr_debug("%s: Enabling hostapd mode\n", dev->name);
-@@ -88,6 +87,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
+@@ -84,6 +83,8 @@ static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
*apdev_priv = *pDevice;
eth_hw_addr_inherit(pDevice->apdev, dev);
@@ -52495,48 +52627,8 @@ index 6eecd53..1025c8b 100644
pDevice->apdev->netdev_ops = &apdev_netdev_ops;
pDevice->apdev->type = ARPHRD_IEEE80211;
-@@ -385,6 +386,9 @@ static int hostap_set_generic_element(PSDevice pDevice,
- {
- PSMgmtObject pMgmt = pDevice->pMgmt;
-
-+ if (param->u.generic_elem.len > sizeof(pMgmt->abyWPAIE))
-+ return -EINVAL;
-+
- memcpy(pMgmt->abyWPAIE,
- param->u.generic_elem.data,
- param->u.generic_elem.len
-diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
-index 67ba48b..24e602f 100644
---- a/drivers/staging/vt6656/hostap.c
-+++ b/drivers/staging/vt6656/hostap.c
-@@ -60,14 +60,13 @@ static int msglevel =MSG_LEVEL_INFO;
- *
- */
-
-+static net_device_ops_no_const apdev_netdev_ops;
-+
- static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
- {
- struct vnt_private *apdev_priv;
- struct net_device *dev = pDevice->dev;
- int ret;
-- const struct net_device_ops apdev_netdev_ops = {
-- .ndo_start_xmit = pDevice->tx_80211,
-- };
-
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
-
-@@ -79,6 +78,8 @@ static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
- *apdev_priv = *pDevice;
- memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
-
-+ /* only half broken now */
-+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
- pDevice->apdev->netdev_ops = &apdev_netdev_ops;
-
- pDevice->apdev->type = ARPHRD_IEEE80211;
diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
-index 24884ca..26c8220 100644
+index e7e9372..161f530 100644
--- a/drivers/target/sbp/sbp_target.c
+++ b/drivers/target/sbp/sbp_target.c
@@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
@@ -52558,10 +52650,10 @@ index 24884ca..26c8220 100644
login->tgt_agt = sbp_target_agent_register(login);
if (IS_ERR(login->tgt_agt)) {
diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
-index 38b4be2..c68af1c 100644
+index 24fa5d1..fae56f1 100644
--- a/drivers/target/target_core_device.c
+++ b/drivers/target/target_core_device.c
-@@ -1526,7 +1526,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
+@@ -1532,7 +1532,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
spin_lock_init(&dev->se_tmr_lock);
spin_lock_init(&dev->qf_cmd_lock);
sema_init(&dev->caw_sem, 1);
@@ -52571,20 +52663,37 @@ index 38b4be2..c68af1c 100644
spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
INIT_LIST_HEAD(&dev->t10_pr.registration_list);
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
-index e6463ef..357ef0a 100644
+index be877bf..7be9cd4 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
-@@ -1154,7 +1154,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
+@@ -1168,7 +1168,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
* Used to determine when ORDERED commands should go from
* Dormant to Active status.
*/
- cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
+ cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
- smp_mb__after_atomic_inc();
pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
cmd->se_ordered_id, cmd->sam_task_attr,
+ dev->transport->name);
+diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
+index edc1cce..769e4cb 100644
+--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
++++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
+@@ -209,8 +209,10 @@ static int int3400_thermal_probe(struct platform_device *pdev)
+ platform_set_drvdata(pdev, priv);
+
+ if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
+- int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
+- int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
++ pax_open_kernel();
++ *(void **)&int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
++ *(void **)&int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
++ pax_close_kernel();
+ }
+ priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
+ priv, &int3400_thermal_ops,
diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
-index 04b1be7..5eff86d 100644
+index 62143ba..ae21165 100644
--- a/drivers/thermal/of-thermal.c
+++ b/drivers/thermal/of-thermal.c
@@ -30,6 +30,7 @@
@@ -52608,7 +52717,7 @@ index 04b1be7..5eff86d 100644
mutex_unlock(&tzd->lock);
return tzd;
-@@ -461,8 +464,10 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
+@@ -473,8 +476,10 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
return;
mutex_lock(&tzd->lock);
@@ -52622,7 +52731,7 @@ index 04b1be7..5eff86d 100644
tz->get_temp = NULL;
tz->get_trend = NULL;
diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
-index a57bb5a..1f727d33 100644
+index fd66f57..48e6376 100644
--- a/drivers/tty/cyclades.c
+++ b/drivers/tty/cyclades.c
@@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
@@ -52648,7 +52757,7 @@ index a57bb5a..1f727d33 100644
struct tty_struct *tty;
struct tty_ldisc *ld;
diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
-index 0ff7fda..dbc7d52 100644
+index 4fcec1d..5a036f7 100644
--- a/drivers/tty/hvc/hvc_console.c
+++ b/drivers/tty/hvc/hvc_console.c
@@ -342,7 +342,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
@@ -52922,7 +53031,7 @@ index 7ae6c29..05c6dba 100644
pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
-index 17ee3bf..8d2520d 100644
+index 345cebb..d5a1e9e 100644
--- a/drivers/tty/ipwireless/tty.c
+++ b/drivers/tty/ipwireless/tty.c
@@ -28,6 +28,7 @@
@@ -52933,10 +53042,10 @@ index 17ee3bf..8d2520d 100644
#include "tty.h"
#include "network.h"
-@@ -98,10 +99,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
- mutex_unlock(&tty->ipw_tty_mutex);
+@@ -93,10 +94,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
return -ENODEV;
- }
+
+ mutex_lock(&tty->ipw_tty_mutex);
- if (tty->port.count == 0)
+ if (atomic_read(&tty->port.count) == 0)
tty->tx_bytes_queued = 0;
@@ -52946,7 +53055,7 @@ index 17ee3bf..8d2520d 100644
tty->port.tty = linux_tty;
linux_tty->driver_data = tty;
-@@ -117,9 +118,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
+@@ -112,9 +113,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
static void do_ipw_close(struct ipw_tty *tty)
{
@@ -52957,7 +53066,7 @@ index 17ee3bf..8d2520d 100644
struct tty_struct *linux_tty = tty->port.tty;
if (linux_tty != NULL) {
-@@ -140,7 +139,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
+@@ -135,7 +134,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
return;
mutex_lock(&tty->ipw_tty_mutex);
@@ -52966,7 +53075,7 @@ index 17ee3bf..8d2520d 100644
mutex_unlock(&tty->ipw_tty_mutex);
return;
}
-@@ -163,7 +162,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
+@@ -158,7 +157,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
mutex_lock(&tty->ipw_tty_mutex);
@@ -52975,7 +53084,7 @@ index 17ee3bf..8d2520d 100644
mutex_unlock(&tty->ipw_tty_mutex);
return;
}
-@@ -202,7 +201,7 @@ static int ipw_write(struct tty_struct *linux_tty,
+@@ -197,7 +196,7 @@ static int ipw_write(struct tty_struct *linux_tty,
return -ENODEV;
mutex_lock(&tty->ipw_tty_mutex);
@@ -52984,7 +53093,7 @@ index 17ee3bf..8d2520d 100644
mutex_unlock(&tty->ipw_tty_mutex);
return -EINVAL;
}
-@@ -242,7 +241,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
+@@ -237,7 +236,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
if (!tty)
return -ENODEV;
@@ -52993,7 +53102,7 @@ index 17ee3bf..8d2520d 100644
return -EINVAL;
room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
-@@ -284,7 +283,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
+@@ -279,7 +278,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
if (!tty)
return 0;
@@ -53002,7 +53111,7 @@ index 17ee3bf..8d2520d 100644
return 0;
return tty->tx_bytes_queued;
-@@ -365,7 +364,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
+@@ -360,7 +359,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
if (!tty)
return -ENODEV;
@@ -53011,7 +53120,7 @@ index 17ee3bf..8d2520d 100644
return -EINVAL;
return get_control_lines(tty);
-@@ -381,7 +380,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
+@@ -376,7 +375,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
if (!tty)
return -ENODEV;
@@ -53020,7 +53129,7 @@ index 17ee3bf..8d2520d 100644
return -EINVAL;
return set_control_lines(tty, set, clear);
-@@ -395,7 +394,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
+@@ -390,7 +389,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
if (!tty)
return -ENODEV;
@@ -53029,7 +53138,7 @@ index 17ee3bf..8d2520d 100644
return -EINVAL;
/* FIXME: Exactly how is the tty object locked here .. */
-@@ -551,7 +550,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
+@@ -546,7 +545,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
* are gone */
mutex_lock(&ttyj->ipw_tty_mutex);
}
@@ -53039,7 +53148,7 @@ index 17ee3bf..8d2520d 100644
ipwireless_disassociate_network_ttys(network,
ttyj->channel_idx);
diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
-index 1deaca4..c8582d4 100644
+index 14c54e0..1efd4f2 100644
--- a/drivers/tty/moxa.c
+++ b/drivers/tty/moxa.c
@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
@@ -53052,7 +53161,7 @@ index 1deaca4..c8582d4 100644
tty_port_tty_set(&ch->port, tty);
mutex_lock(&ch->port.mutex);
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
-index 2ebe47b..3205833 100644
+index c434376..114ce13 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
@@ -53064,7 +53173,7 @@ index 2ebe47b..3205833 100644
kfree(dlci);
return NULL;
}
-@@ -2954,7 +2954,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
+@@ -2958,7 +2958,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
struct gsm_dlci *dlci = tty->driver_data;
struct tty_port *port = &dlci->port;
@@ -53074,7 +53183,7 @@ index 2ebe47b..3205833 100644
dlci->modem_rx = 0;
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
-index 850e232..59a0ccd 100644
+index 47ca0f3..3c0b803 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -115,7 +115,7 @@ struct n_tty_data {
@@ -53086,7 +53195,7 @@ index 850e232..59a0ccd 100644
size_t line_start;
/* protected by output lock */
-@@ -2526,6 +2526,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
+@@ -2523,6 +2523,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
{
*ops = tty_ldisc_N_TTY;
ops->owner = NULL;
@@ -53096,10 +53205,10 @@ index 850e232..59a0ccd 100644
}
EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
-index 25c9bc7..24077b7 100644
+index 7c4447a..70fbc1e 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
-@@ -790,8 +790,10 @@ static void __init unix98_pty_init(void)
+@@ -830,8 +830,10 @@ static void __init unix98_pty_init(void)
panic("Couldn't register Unix98 pts driver");
/* Now create the /dev/ptmx special device */
@@ -53143,7 +53252,7 @@ index 383c4c7..d408e21 100644
clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
spin_unlock_irqrestore(&info->port.lock, flags);
diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
-index 1274499..f541382 100644
+index aa28209..e08fb85 100644
--- a/drivers/tty/serial/ioc4_serial.c
+++ b/drivers/tty/serial/ioc4_serial.c
@@ -437,7 +437,7 @@ struct ioc4_soft {
@@ -53173,6 +53282,21 @@ index 1274499..f541382 100644
&soft->is_intr_type[intr_type].is_num_intrs);
this_mir = this_ir = pending_intrs(soft, intr_type);
+diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
+index 129dc5b..1da5bb8 100644
+--- a/drivers/tty/serial/kgdb_nmi.c
++++ b/drivers/tty/serial/kgdb_nmi.c
+@@ -53,7 +53,9 @@ static int kgdb_nmi_console_setup(struct console *co, char *options)
+ * I/O utilities that messages sent to the console will automatically
+ * be displayed on the dbg_io.
+ */
+- dbg_io_ops->is_console = true;
++ pax_open_kernel();
++ *(int *)&dbg_io_ops->is_console = true;
++ pax_close_kernel();
+
+ return 0;
+ }
diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
index a260cde..6b2b5ce 100644
--- a/drivers/tty/serial/kgdboc.c
@@ -53280,10 +53404,10 @@ index a260cde..6b2b5ce 100644
/* This is only available if kgdboc is a built in for early debugging */
static int __init kgdboc_early_init(char *opt)
diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
-index c0f2b3e..7e3f80c 100644
+index 4b6c783..9a19db3 100644
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
-@@ -897,7 +897,7 @@ static struct uart_driver msm_uart_driver = {
+@@ -1028,7 +1028,7 @@ static struct uart_driver msm_uart_driver = {
.cons = MSM_CONSOLE,
};
@@ -53291,8 +53415,8 @@ index c0f2b3e..7e3f80c 100644
+static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
static const struct of_device_id msm_uartdm_table[] = {
- { .compatible = "qcom,msm-uartdm" },
-@@ -912,7 +912,7 @@ static int __init msm_serial_probe(struct platform_device *pdev)
+ { .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
+@@ -1047,7 +1047,7 @@ static int msm_serial_probe(struct platform_device *pdev)
int irq;
if (pdev->id == -1)
@@ -53302,10 +53426,10 @@ index c0f2b3e..7e3f80c 100644
if (unlikely(pdev->id < 0 || pdev->id >= UART_NR))
return -ENXIO;
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
-index 7d3a3f5..0ac875e 100644
+index 587d63b..48423a6 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
-@@ -463,11 +463,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
+@@ -478,11 +478,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
}
}
@@ -53319,10 +53443,10 @@ index 7d3a3f5..0ac875e 100644
+ if (s3c24xx_serial_has_interrupt_mask(port))
+ return s3c64xx_serial_startup(port);
+
- dbg("s3c24xx_serial_startup: port=%p (%08lx,%p)\n",
- port->mapbase, port->membase);
+ dbg("s3c24xx_serial_startup: port=%p (%08llx,%p)\n",
+ port, (unsigned long long)port->mapbase, port->membase);
-@@ -1145,10 +1150,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
+@@ -1159,10 +1164,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
/* setup info for port */
port->dev = &platdev->dev;
@@ -53334,10 +53458,19 @@ index 7d3a3f5..0ac875e 100644
if (cfg->uart_flags & UPF_CONS_FLOW) {
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
-index 27b5554..3075055 100644
+index a28dee9..168ba47 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
-@@ -1451,7 +1451,7 @@ static void uart_hangup(struct tty_struct *tty)
+@@ -1339,7 +1339,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
+
+ pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
+
+- if (!port->count || tty_port_close_start(port, tty, filp) == 0)
++ if (!atomic_read(&port->count) || tty_port_close_start(port, tty, filp) == 0)
+ return;
+
+ /*
+@@ -1466,7 +1466,7 @@ static void uart_hangup(struct tty_struct *tty)
uart_flush_buffer(tty);
uart_shutdown(tty, state);
spin_lock_irqsave(&port->lock, flags);
@@ -53346,7 +53479,7 @@ index 27b5554..3075055 100644
clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
spin_unlock_irqrestore(&port->lock, flags);
tty_port_tty_set(port, NULL);
-@@ -1547,7 +1547,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
+@@ -1564,7 +1564,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
goto end;
}
@@ -53355,16 +53488,7 @@ index 27b5554..3075055 100644
if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
retval = -ENXIO;
goto err_dec_count;
-@@ -1575,7 +1575,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
- /*
- * Make sure the device is in D0 state.
- */
-- if (port->count == 1)
-+ if (atomic_read(&port->count) == 1)
- uart_change_pm(state, UART_PM_STATE_ON);
-
- /*
-@@ -1593,7 +1593,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
+@@ -1596,7 +1596,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
end:
return retval;
err_dec_count:
@@ -53374,7 +53498,7 @@ index 27b5554..3075055 100644
goto end;
}
diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
-index 5ae14b4..2c1288f 100644
+index b799170..87dafd5 100644
--- a/drivers/tty/synclink.c
+++ b/drivers/tty/synclink.c
@@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
@@ -53406,7 +53530,7 @@ index 5ae14b4..2c1288f 100644
info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
info->port.tty = NULL;
-@@ -3297,12 +3297,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
+@@ -3296,10 +3296,10 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
if (debug_level >= DEBUG_LEVEL_INFO)
printk("%s(%d):block_til_ready before block on %s count=%d\n",
@@ -53414,14 +53538,12 @@ index 5ae14b4..2c1288f 100644
+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
spin_lock_irqsave(&info->irq_spinlock, flags);
- if (!tty_hung_up_p(filp)) {
- extra_count = true;
-- port->count--;
-+ atomic_dec(&port->count);
- }
+- port->count--;
++ atomic_dec(&port->count);
spin_unlock_irqrestore(&info->irq_spinlock, flags);
port->blocked_open++;
-@@ -3331,7 +3331,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
+
+@@ -3327,7 +3327,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
if (debug_level >= DEBUG_LEVEL_INFO)
printk("%s(%d):block_til_ready blocking on %s count=%d\n",
@@ -53430,10 +53552,10 @@ index 5ae14b4..2c1288f 100644
tty_unlock(tty);
schedule();
-@@ -3343,12 +3343,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
+@@ -3339,12 +3339,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
/* FIXME: Racy on hangup during close wait */
- if (extra_count)
+ if (!tty_hung_up_p(filp))
- port->count++;
+ atomic_inc(&port->count);
port->blocked_open--;
@@ -53445,7 +53567,7 @@ index 5ae14b4..2c1288f 100644
if (!retval)
port->flags |= ASYNC_NORMAL_ACTIVE;
-@@ -3400,7 +3400,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
+@@ -3396,7 +3396,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
if (debug_level >= DEBUG_LEVEL_INFO)
printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
@@ -53453,8 +53575,8 @@ index 5ae14b4..2c1288f 100644
+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
/* If port is closing, signal caller to try again */
- if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
-@@ -3419,10 +3419,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
+ if (info->port.flags & ASYNC_CLOSING){
+@@ -3415,10 +3415,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
spin_unlock_irqrestore(&info->netlock, flags);
goto cleanup;
}
@@ -53467,7 +53589,7 @@ index 5ae14b4..2c1288f 100644
/* 1st open on this device, init hardware */
retval = startup(info);
if (retval < 0)
-@@ -3446,8 +3446,8 @@ cleanup:
+@@ -3442,8 +3442,8 @@ cleanup:
if (retval) {
if (tty->count == 1)
info->port.tty = NULL; /* tty layer will release tty struct */
@@ -53478,7 +53600,7 @@ index 5ae14b4..2c1288f 100644
}
return retval;
-@@ -7665,7 +7665,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
+@@ -7661,7 +7661,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
unsigned short new_crctype;
/* return error if TTY interface open */
@@ -53487,7 +53609,7 @@ index 5ae14b4..2c1288f 100644
return -EBUSY;
switch (encoding)
-@@ -7760,7 +7760,7 @@ static int hdlcdev_open(struct net_device *dev)
+@@ -7756,7 +7756,7 @@ static int hdlcdev_open(struct net_device *dev)
/* arbitrate between network and tty opens */
spin_lock_irqsave(&info->netlock, flags);
@@ -53496,7 +53618,7 @@ index 5ae14b4..2c1288f 100644
printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
spin_unlock_irqrestore(&info->netlock, flags);
return -EBUSY;
-@@ -7846,7 +7846,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+@@ -7842,7 +7842,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
/* return error if TTY interface open */
@@ -53506,7 +53628,7 @@ index 5ae14b4..2c1288f 100644
if (cmd != SIOCWANDEV)
diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
-index c359a91..959fc26 100644
+index 0e8c39b..e0cb171 100644
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
@@ -53517,7 +53639,7 @@ index c359a91..959fc26 100644
+ DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
/* If port is closing, signal caller to try again */
- if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
+ if (info->port.flags & ASYNC_CLOSING){
@@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
mutex_unlock(&info->port.mutex);
goto cleanup;
@@ -53605,26 +53727,26 @@ index c359a91..959fc26 100644
port->pending_bh && !port->bh_running &&
!port->bh_requested) {
DBGISR(("%s bh queued\n", port->device_name));
-@@ -3302,7 +3302,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
+@@ -3299,7 +3299,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
+ add_wait_queue(&port->open_wait, &wait);
+
spin_lock_irqsave(&info->lock, flags);
- if (!tty_hung_up_p(filp)) {
- extra_count = true;
-- port->count--;
-+ atomic_dec(&port->count);
- }
+- port->count--;
++ atomic_dec(&port->count);
spin_unlock_irqrestore(&info->lock, flags);
port->blocked_open++;
-@@ -3339,7 +3339,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
+
+@@ -3335,7 +3335,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
remove_wait_queue(&port->open_wait, &wait);
- if (extra_count)
+ if (!tty_hung_up_p(filp))
- port->count++;
+ atomic_inc(&port->count);
port->blocked_open--;
if (!retval)
diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
-index 144202e..4ccb07d 100644
+index c3f9091..abe4601 100644
--- a/drivers/tty/synclinkmp.c
+++ b/drivers/tty/synclinkmp.c
@@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
@@ -53635,7 +53757,7 @@ index 144202e..4ccb07d 100644
+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
/* If port is closing, signal caller to try again */
- if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
+ if (info->port.flags & ASYNC_CLOSING){
@@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
spin_unlock_irqrestore(&info->netlock, flags);
goto cleanup;
@@ -53714,7 +53836,7 @@ index 144202e..4ccb07d 100644
return -EBUSY;
if (cmd != SIOCWANDEV)
-@@ -2620,7 +2620,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
+@@ -2621,7 +2621,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
* do not request bottom half processing if the
* device is not open in a normal mode.
*/
@@ -53723,7 +53845,7 @@ index 144202e..4ccb07d 100644
port->pending_bh && !port->bh_running &&
!port->bh_requested ) {
if ( debug_level >= DEBUG_LEVEL_ISR )
-@@ -3318,12 +3318,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
+@@ -3318,10 +3318,10 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
if (debug_level >= DEBUG_LEVEL_INFO)
printk("%s(%d):%s block_til_ready() before block, count=%d\n",
@@ -53731,14 +53853,12 @@ index 144202e..4ccb07d 100644
+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
spin_lock_irqsave(&info->lock, flags);
- if (!tty_hung_up_p(filp)) {
- extra_count = true;
-- port->count--;
-+ atomic_dec(&port->count);
- }
+- port->count--;
++ atomic_dec(&port->count);
spin_unlock_irqrestore(&info->lock, flags);
port->blocked_open++;
-@@ -3352,7 +3352,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
+
+@@ -3349,7 +3349,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
if (debug_level >= DEBUG_LEVEL_INFO)
printk("%s(%d):%s block_til_ready() count=%d\n",
@@ -53747,10 +53867,10 @@ index 144202e..4ccb07d 100644
tty_unlock(tty);
schedule();
-@@ -3363,12 +3363,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
+@@ -3359,12 +3359,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
+ set_current_state(TASK_RUNNING);
remove_wait_queue(&port->open_wait, &wait);
-
- if (extra_count)
+ if (!tty_hung_up_p(filp))
- port->count++;
+ atomic_inc(&port->count);
port->blocked_open--;
@@ -53763,10 +53883,10 @@ index 144202e..4ccb07d 100644
if (!retval)
port->flags |= ASYNC_NORMAL_ACTIVE;
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
-index ce396ec..04a37be 100644
+index 42bad18..447d7a2 100644
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
-@@ -1075,7 +1075,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
+@@ -1084,7 +1084,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
size_t count, loff_t *ppos)
{
@@ -53776,10 +53896,10 @@ index ce396ec..04a37be 100644
if (get_user(c, buf))
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
-index 25d0741..36e7237 100644
+index 0508a1d..b610592 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
-@@ -3480,7 +3480,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
+@@ -3498,7 +3498,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
void tty_default_fops(struct file_operations *fops)
{
@@ -53829,10 +53949,10 @@ index 2d822aa..a566234 100644
raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
}
diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
-index 3f746c8..2f2fcaa 100644
+index 1b93357..ea9f82c 100644
--- a/drivers/tty/tty_port.c
+++ b/drivers/tty/tty_port.c
-@@ -235,7 +235,7 @@ void tty_port_hangup(struct tty_port *port)
+@@ -237,7 +237,7 @@ void tty_port_hangup(struct tty_port *port)
unsigned long flags;
spin_lock_irqsave(&port->lock, flags);
@@ -53841,16 +53961,16 @@ index 3f746c8..2f2fcaa 100644
port->flags &= ~ASYNC_NORMAL_ACTIVE;
tty = port->tty;
if (tty)
-@@ -393,7 +393,7 @@ int tty_port_block_til_ready(struct tty_port *port,
+@@ -399,7 +399,7 @@ int tty_port_block_til_ready(struct tty_port *port,
+
/* The port lock protects the port counts */
spin_lock_irqsave(&port->lock, flags);
- if (!tty_hung_up_p(filp))
-- port->count--;
-+ atomic_dec(&port->count);
+- port->count--;
++ atomic_dec(&port->count);
port->blocked_open++;
spin_unlock_irqrestore(&port->lock, flags);
-@@ -435,7 +435,7 @@ int tty_port_block_til_ready(struct tty_port *port,
+@@ -441,7 +441,7 @@ int tty_port_block_til_ready(struct tty_port *port,
we must not mess that up further */
spin_lock_irqsave(&port->lock, flags);
if (!tty_hung_up_p(filp))
@@ -53859,7 +53979,7 @@ index 3f746c8..2f2fcaa 100644
port->blocked_open--;
if (retval == 0)
port->flags |= ASYNC_NORMAL_ACTIVE;
-@@ -469,19 +469,19 @@ int tty_port_close_start(struct tty_port *port,
+@@ -479,19 +479,19 @@ int tty_port_close_start(struct tty_port *port,
return 0;
}
@@ -53886,17 +54006,17 @@ index 3f746c8..2f2fcaa 100644
spin_unlock_irqrestore(&port->lock, flags);
return 0;
}
-@@ -563,7 +563,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
+@@ -592,7 +592,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
+ struct file *filp)
{
spin_lock_irq(&port->lock);
- if (!tty_hung_up_p(filp))
-- ++port->count;
-+ atomic_inc(&port->count);
+- ++port->count;
++ atomic_inc(&port->count);
spin_unlock_irq(&port->lock);
tty_port_tty_set(port, tty);
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
-index d0e3a44..5f8b754 100644
+index c039cfe..0b463b0 100644
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
@@ -53957,7 +54077,7 @@ index d0e3a44..5f8b754 100644
ret = -EPERM;
goto reterr;
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
-index a673e5b..36e5d32 100644
+index 60fa627..7214965 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -25,6 +25,7 @@
@@ -53968,16 +54088,7 @@ index a673e5b..36e5d32 100644
#define UIO_MAX_DEVICES (1U << MINORBITS)
-@@ -32,7 +33,7 @@ struct uio_device {
- struct module *owner;
- struct device *dev;
- int minor;
-- atomic_t event;
-+ atomic_unchecked_t event;
- struct fasync_struct *async_queue;
- wait_queue_head_t wait;
- struct uio_info *info;
-@@ -243,7 +244,7 @@ static ssize_t event_show(struct device *dev,
+@@ -231,7 +232,7 @@ static ssize_t event_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct uio_device *idev = dev_get_drvdata(dev);
@@ -53986,7 +54097,7 @@ index a673e5b..36e5d32 100644
}
static DEVICE_ATTR_RO(event);
-@@ -405,7 +406,7 @@ void uio_event_notify(struct uio_info *info)
+@@ -393,7 +394,7 @@ void uio_event_notify(struct uio_info *info)
{
struct uio_device *idev = info->uio_dev;
@@ -53995,7 +54106,7 @@ index a673e5b..36e5d32 100644
wake_up_interruptible(&idev->wait);
kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
}
-@@ -458,7 +459,7 @@ static int uio_open(struct inode *inode, struct file *filep)
+@@ -446,7 +447,7 @@ static int uio_open(struct inode *inode, struct file *filep)
}
listener->dev = idev;
@@ -54004,7 +54115,7 @@ index a673e5b..36e5d32 100644
filep->private_data = listener;
if (idev->info->open) {
-@@ -509,7 +510,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
+@@ -497,7 +498,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
return -EIO;
poll_wait(filep, &idev->wait, wait);
@@ -54013,7 +54124,7 @@ index a673e5b..36e5d32 100644
return POLLIN | POLLRDNORM;
return 0;
}
-@@ -534,7 +535,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
+@@ -522,7 +523,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
do {
set_current_state(TASK_INTERRUPTIBLE);
@@ -54022,7 +54133,7 @@ index a673e5b..36e5d32 100644
if (event_count != listener->event_count) {
if (copy_to_user(buf, &event_count, count))
retval = -EFAULT;
-@@ -591,9 +592,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
+@@ -579,9 +580,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
static int uio_find_mem_index(struct vm_area_struct *vma)
{
struct uio_device *idev = vma->vm_private_data;
@@ -54037,7 +54148,7 @@ index a673e5b..36e5d32 100644
return -1;
return (int)vma->vm_pgoff;
}
-@@ -825,7 +830,7 @@ int __uio_register_device(struct module *owner,
+@@ -813,7 +818,7 @@ int __uio_register_device(struct module *owner,
idev->owner = owner;
idev->info = info;
init_waitqueue_head(&idev->wait);
@@ -54174,11 +54285,11 @@ index 2a3bbdf..91d72cf 100644
file->f_version = event_count;
return POLLIN | POLLRDNORM;
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
-index 9ca7716..a2ccc2e 100644
+index 0b59731..46ee7d1 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
- struct dev_state *ps = file->private_data;
+ struct usb_dev_state *ps = file->private_data;
struct usb_device *dev = ps->dev;
ssize_t ret = 0;
- unsigned len;
@@ -54214,10 +54325,10 @@ index 9ca7716..a2ccc2e 100644
dev->rawdescriptors[i] + (*ppos - pos),
min(len, alloclen))) {
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
-index ef6ec13b..5c6e68e 100644
+index a6efb41..6f72549b 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
-@@ -1550,7 +1550,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
+@@ -1551,7 +1551,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
*/
usb_get_urb(urb);
atomic_inc(&urb->use_count);
@@ -54226,7 +54337,7 @@ index ef6ec13b..5c6e68e 100644
usbmon_urb_submit(&hcd->self, urb);
/* NOTE requirements on root-hub callers (usbfs and the hub
-@@ -1577,7 +1577,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
+@@ -1578,7 +1578,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
urb->hcpriv = NULL;
INIT_LIST_HEAD(&urb->urb_list);
atomic_dec(&urb->use_count);
@@ -54236,18 +54347,18 @@ index ef6ec13b..5c6e68e 100644
wake_up(&usb_kill_urb_queue);
usb_put_urb(urb);
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index d2bd9d7..1ddb53a 100644
+index b649fef..c7107a0 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -27,6 +27,7 @@
- #include <linux/freezer.h>
+@@ -26,6 +26,7 @@
+ #include <linux/mutex.h>
#include <linux/random.h>
#include <linux/pm_qos.h>
+#include <linux/grsecurity.h>
#include <asm/uaccess.h>
#include <asm/byteorder.h>
-@@ -4554,6 +4555,10 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
+@@ -4666,6 +4667,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
goto done;
return;
}
@@ -54259,7 +54370,7 @@ index d2bd9d7..1ddb53a 100644
unit_load = 150;
else
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
-index f829a1a..e6c334a 100644
+index f7b7713..23d07ec 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
@@ -54273,7 +54384,7 @@ index f829a1a..e6c334a 100644
{
@@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
* If successful, 0. Otherwise a negative error number. The number of actual
- * bytes transferred will be stored in the @actual_length paramater.
+ * bytes transferred will be stored in the @actual_length parameter.
*/
-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
+int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
@@ -54303,7 +54414,7 @@ index 1236c60..d47a51c 100644
static DEVICE_ATTR_RO(urbnum);
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
-index 4d11449..f4ccabf 100644
+index 2dd2362..1135437 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -433,7 +433,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
@@ -54356,23 +54467,23 @@ index 8cfc319..4868255 100644
return 0;
}
-diff --git a/drivers/usb/gadget/f_uac1.c b/drivers/usb/gadget/f_uac1.c
-index 2b4c82d..06a8ee6 100644
---- a/drivers/usb/gadget/f_uac1.c
-+++ b/drivers/usb/gadget/f_uac1.c
-@@ -13,6 +13,7 @@
- #include <linux/kernel.h>
+diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
+index f7b2032..fbb340c 100644
+--- a/drivers/usb/gadget/function/f_uac1.c
++++ b/drivers/usb/gadget/function/f_uac1.c
+@@ -14,6 +14,7 @@
+ #include <linux/module.h>
#include <linux/device.h>
#include <linux/atomic.h>
+#include <linux/module.h>
#include "u_uac1.h"
-diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c
-index ad0aca8..8ff84865 100644
---- a/drivers/usb/gadget/u_serial.c
-+++ b/drivers/usb/gadget/u_serial.c
-@@ -733,9 +733,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
+diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
+index 491082a..dfd7d17 100644
+--- a/drivers/usb/gadget/function/u_serial.c
++++ b/drivers/usb/gadget/function/u_serial.c
+@@ -729,9 +729,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
spin_lock_irq(&port->port_lock);
/* already open? Great. */
@@ -54384,7 +54495,7 @@ index ad0aca8..8ff84865 100644
/* currently opening/closing? wait ... */
} else if (port->openclose) {
-@@ -794,7 +794,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
+@@ -790,7 +790,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
tty->driver_data = port;
port->port.tty = tty;
@@ -54393,7 +54504,7 @@ index ad0aca8..8ff84865 100644
port->openclose = false;
/* if connected, start the I/O stream */
-@@ -836,11 +836,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
+@@ -832,11 +832,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
spin_lock_irq(&port->port_lock);
@@ -54408,7 +54519,7 @@ index ad0aca8..8ff84865 100644
goto exit;
}
-@@ -850,7 +850,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
+@@ -846,7 +846,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
* and sleep if necessary
*/
port->openclose = true;
@@ -54417,7 +54528,7 @@ index ad0aca8..8ff84865 100644
gser = port->port_usb;
if (gser && gser->disconnect)
-@@ -1066,7 +1066,7 @@ static int gs_closed(struct gs_port *port)
+@@ -1062,7 +1062,7 @@ static int gs_closed(struct gs_port *port)
int cond;
spin_lock_irq(&port->port_lock);
@@ -54426,7 +54537,7 @@ index ad0aca8..8ff84865 100644
spin_unlock_irq(&port->port_lock);
return cond;
}
-@@ -1209,7 +1209,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
+@@ -1205,7 +1205,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
/* if it's already open, start I/O ... and notify the serial
* protocol about open/close status (connect/disconnect).
*/
@@ -54435,7 +54546,7 @@ index ad0aca8..8ff84865 100644
pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
gs_start_io(port);
if (gser->connect)
-@@ -1256,7 +1256,7 @@ void gserial_disconnect(struct gserial *gser)
+@@ -1252,7 +1252,7 @@ void gserial_disconnect(struct gserial *gser)
port->port_usb = NULL;
gser->ioport = NULL;
@@ -54444,7 +54555,7 @@ index ad0aca8..8ff84865 100644
wake_up_interruptible(&port->drain_wait);
if (port->port.tty)
tty_hangup(port->port.tty);
-@@ -1272,7 +1272,7 @@ void gserial_disconnect(struct gserial *gser)
+@@ -1268,7 +1268,7 @@ void gserial_disconnect(struct gserial *gser)
/* finally, free any unused/unusable I/O buffers */
spin_lock_irqsave(&port->port_lock, flags);
@@ -54453,11 +54564,11 @@ index ad0aca8..8ff84865 100644
gs_buf_free(&port->port_write_buf);
gs_free_requests(gser->out, &port->read_pool, NULL);
gs_free_requests(gser->out, &port->read_queue, NULL);
-diff --git a/drivers/usb/gadget/u_uac1.c b/drivers/usb/gadget/u_uac1.c
-index 7a55fea..cc0ed4f 100644
---- a/drivers/usb/gadget/u_uac1.c
-+++ b/drivers/usb/gadget/u_uac1.c
-@@ -16,6 +16,7 @@
+diff --git a/drivers/usb/gadget/function/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
+index a44a07f..ecea924 100644
+--- a/drivers/usb/gadget/function/u_uac1.c
++++ b/drivers/usb/gadget/function/u_uac1.c
+@@ -17,6 +17,7 @@
#include <linux/ctype.h>
#include <linux/random.h>
#include <linux/syscalls.h>
@@ -54466,10 +54577,10 @@ index 7a55fea..cc0ed4f 100644
#include "u_uac1.h"
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
-index 7d6f64c..37a1efc 100644
+index 5728829..fefc6bf 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
-@@ -780,7 +780,7 @@ static struct urb *request_single_step_set_feature_urb(
+@@ -771,7 +771,7 @@ static struct urb *request_single_step_set_feature_urb(
urb->transfer_flags = URB_DIR_IN;
usb_get_urb(urb);
atomic_inc(&urb->use_count);
@@ -54478,7 +54589,7 @@ index 7d6f64c..37a1efc 100644
urb->setup_dma = dma_map_single(
hcd->self.controller,
urb->setup_packet,
-@@ -847,7 +847,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
+@@ -838,7 +838,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
urb->status = -EINPROGRESS;
usb_get_urb(urb);
atomic_inc(&urb->use_count);
@@ -54488,10 +54599,10 @@ index 7d6f64c..37a1efc 100644
if (!retval && !wait_for_completion_timeout(&done,
msecs_to_jiffies(2000))) {
diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
-index e076699..6b3b875 100644
+index 1db0626..4948782 100644
--- a/drivers/usb/host/hwa-hc.c
+++ b/drivers/usb/host/hwa-hc.c
-@@ -301,7 +301,10 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
+@@ -337,7 +337,10 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
struct wahc *wa = &hwahc->wa;
struct device *dev = &wa->usb_iface->dev;
@@ -54503,7 +54614,7 @@ index e076699..6b3b875 100644
/* Set the stream index */
result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
-@@ -320,10 +323,12 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
+@@ -356,10 +359,12 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
WUSB_REQ_SET_WUSB_MAS,
USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
0, wa->usb_iface->cur_altsetting->desc.bInterfaceNumber,
@@ -54518,11 +54629,11 @@ index e076699..6b3b875 100644
}
diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
-index ba6a5d6..f88f7f3 100644
+index b3d245e..99549ed 100644
--- a/drivers/usb/misc/appledisplay.c
+++ b/drivers/usb/misc/appledisplay.c
-@@ -83,7 +83,7 @@ struct appledisplay {
- spinlock_t lock;
+@@ -84,7 +84,7 @@ struct appledisplay {
+ struct mutex sysfslock; /* concurrent read and write */
};
-static atomic_t count_displays = ATOMIC_INIT(0);
@@ -54530,7 +54641,7 @@ index ba6a5d6..f88f7f3 100644
static struct workqueue_struct *wq;
static void appledisplay_complete(struct urb *urb)
-@@ -281,7 +281,7 @@ static int appledisplay_probe(struct usb_interface *iface,
+@@ -288,7 +288,7 @@ static int appledisplay_probe(struct usb_interface *iface,
/* Register backlight device */
snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
@@ -54580,7 +54691,7 @@ index 29fa1c3..a57b08e 100644
struct usb_serial *serial;
int retval = -ENODEV;
diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
-index 75f70f0..d467e1a 100644
+index 307e339..6aa97cb 100644
--- a/drivers/usb/storage/usb.h
+++ b/drivers/usb/storage/usb.h
@@ -63,7 +63,7 @@ struct us_unusual_dev {
@@ -54592,11 +54703,68 @@ index 75f70f0..d467e1a 100644
/* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
+diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
+index a863a98..d272795 100644
+--- a/drivers/usb/usbip/vhci.h
++++ b/drivers/usb/usbip/vhci.h
+@@ -83,7 +83,7 @@ struct vhci_hcd {
+ unsigned resuming:1;
+ unsigned long re_timeout;
+
+- atomic_t seqnum;
++ atomic_unchecked_t seqnum;
+
+ /*
+ * NOTE:
+diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
+index c02374b..32d47a9 100644
+--- a/drivers/usb/usbip/vhci_hcd.c
++++ b/drivers/usb/usbip/vhci_hcd.c
+@@ -439,7 +439,7 @@ static void vhci_tx_urb(struct urb *urb)
+
+ spin_lock(&vdev->priv_lock);
+
+- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
++ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
+ if (priv->seqnum == 0xffff)
+ dev_info(&urb->dev->dev, "seqnum max\n");
+
+@@ -686,7 +686,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
+ return -ENOMEM;
+ }
+
+- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
++ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
+ if (unlink->seqnum == 0xffff)
+ pr_info("seqnum max\n");
+
+@@ -891,7 +891,7 @@ static int vhci_start(struct usb_hcd *hcd)
+ vdev->rhport = rhport;
+ }
+
+- atomic_set(&vhci->seqnum, 0);
++ atomic_set_unchecked(&vhci->seqnum, 0);
+ spin_lock_init(&vhci->lock);
+
+ hcd->power_budget = 0; /* no limit */
+diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
+index 00e4a54..d676f85 100644
+--- a/drivers/usb/usbip/vhci_rx.c
++++ b/drivers/usb/usbip/vhci_rx.c
+@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
+ if (!urb) {
+ pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
+ pr_info("max seqnum %d\n",
+- atomic_read(&the_controller->seqnum));
++ atomic_read_unchecked(&the_controller->seqnum));
+ usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
+ return;
+ }
diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
-index a2ef84b..aa7c2b8 100644
+index edc7267..9f65ce2 100644
--- a/drivers/usb/wusbcore/wa-hc.h
+++ b/drivers/usb/wusbcore/wa-hc.h
-@@ -225,7 +225,7 @@ struct wahc {
+@@ -240,7 +240,7 @@ struct wahc {
spinlock_t xfer_list_lock;
struct work_struct xfer_enqueue_work;
struct work_struct xfer_error_work;
@@ -54605,20 +54773,20 @@ index a2ef84b..aa7c2b8 100644
kernel_ulong_t quirks;
};
-@@ -287,7 +287,7 @@ static inline void wa_init(struct wahc *wa)
+@@ -305,7 +305,7 @@ static inline void wa_init(struct wahc *wa)
INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
wa->dto_in_use = 0;
- atomic_set(&wa->xfer_id_count, 1);
+ atomic_set_unchecked(&wa->xfer_id_count, 1);
- }
-
- /**
+ /* init the buf in URBs */
+ for (index = 0; index < WA_MAX_BUF_IN_URBS; ++index)
+ usb_init_urb(&(wa->buf_in_urbs[index]));
diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
-index 3cd96e9..bd7c58d 100644
+index 69af4fd..da390d7 100644
--- a/drivers/usb/wusbcore/wa-xfer.c
+++ b/drivers/usb/wusbcore/wa-xfer.c
-@@ -312,7 +312,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
+@@ -314,7 +314,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
*/
static void wa_xfer_id_init(struct wa_xfer *xfer)
{
@@ -54628,10 +54796,10 @@ index 3cd96e9..bd7c58d 100644
/* Return the xfer's ID. */
diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
-index 21271d8..45b55a0 100644
+index f018d8d..ccab63f 100644
--- a/drivers/vfio/vfio.c
+++ b/drivers/vfio/vfio.c
-@@ -487,7 +487,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
+@@ -481,7 +481,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
return 0;
/* TODO Prevent device auto probing */
@@ -54710,10 +54878,23 @@ index 5174eba..451e6bc 100644
return 0;
}
-diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
+diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
+index 84a110a..96312c3 100644
+--- a/drivers/video/backlight/kb3886_bl.c
++++ b/drivers/video/backlight/kb3886_bl.c
+@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
+ static unsigned long kb3886bl_flags;
+ #define KB3886BL_SUSPENDED 0x01
+
+-static struct dmi_system_id kb3886bl_device_table[] __initdata = {
++static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
+ {
+ .ident = "Sahara Touch-iT",
+ .matches = {
+diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
index 1b0b233..6f34c2c 100644
---- a/drivers/video/arcfb.c
-+++ b/drivers/video/arcfb.c
+--- a/drivers/video/fbdev/arcfb.c
++++ b/drivers/video/fbdev/arcfb.c
@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
return -ENOSPC;
@@ -54723,10 +54904,10 @@ index 1b0b233..6f34c2c 100644
count = fbmemlength - p;
err = -ENOSPC;
}
-diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
-index 52108be..c7c110d 100644
---- a/drivers/video/aty/aty128fb.c
-+++ b/drivers/video/aty/aty128fb.c
+diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
+index aedf2fb..47c9aca 100644
+--- a/drivers/video/fbdev/aty/aty128fb.c
++++ b/drivers/video/fbdev/aty/aty128fb.c
@@ -149,7 +149,7 @@ enum {
};
@@ -54736,10 +54917,10 @@ index 52108be..c7c110d 100644
"AGP",
"PCI",
"PRO AGP",
-diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
-index 28fafbf..ae91651 100644
---- a/drivers/video/aty/atyfb_base.c
-+++ b/drivers/video/aty/atyfb_base.c
+diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
+index 37ec09b..98f8862 100644
+--- a/drivers/video/fbdev/aty/atyfb_base.c
++++ b/drivers/video/fbdev/aty/atyfb_base.c
@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
par->accel_flags = var->accel_flags; /* hack */
@@ -54757,12 +54938,12 @@ index 28fafbf..ae91651 100644
info->flags |= FBINFO_HWACCEL_DISABLED;
}
-diff --git a/drivers/video/aty/mach64_cursor.c b/drivers/video/aty/mach64_cursor.c
-index 0fe02e2..ab01b26 100644
---- a/drivers/video/aty/mach64_cursor.c
-+++ b/drivers/video/aty/mach64_cursor.c
+diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
+index 2fa0317..4983f2a 100644
+--- a/drivers/video/fbdev/aty/mach64_cursor.c
++++ b/drivers/video/fbdev/aty/mach64_cursor.c
@@ -8,6 +8,7 @@
- #include "../fb_draw.h"
+ #include "../core/fb_draw.h"
#include <asm/io.h>
+#include <asm/pgtable.h>
@@ -54780,24 +54961,11 @@ index 0fe02e2..ab01b26 100644
return 0;
}
-diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
-index 84a110a..96312c3 100644
---- a/drivers/video/backlight/kb3886_bl.c
-+++ b/drivers/video/backlight/kb3886_bl.c
-@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
- static unsigned long kb3886bl_flags;
- #define KB3886BL_SUSPENDED 0x01
-
--static struct dmi_system_id kb3886bl_device_table[] __initdata = {
-+static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
- {
- .ident = "Sahara Touch-iT",
- .matches = {
-diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
-index 900aa4e..6d49418 100644
---- a/drivers/video/fb_defio.c
-+++ b/drivers/video/fb_defio.c
-@@ -206,7 +206,9 @@ void fb_deferred_io_init(struct fb_info *info)
+diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
+index d6cab1f..112f680 100644
+--- a/drivers/video/fbdev/core/fb_defio.c
++++ b/drivers/video/fbdev/core/fb_defio.c
+@@ -207,7 +207,9 @@ void fb_deferred_io_init(struct fb_info *info)
BUG_ON(!fbdefio);
mutex_init(&fbdefio->lock);
@@ -54808,7 +54976,7 @@ index 900aa4e..6d49418 100644
INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
INIT_LIST_HEAD(&fbdefio->pagelist);
if (fbdefio->delay == 0) /* set a default of 1 s */
-@@ -237,7 +239,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
+@@ -238,7 +240,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
page->mapping = NULL;
}
@@ -54817,38 +54985,11 @@ index 900aa4e..6d49418 100644
mutex_destroy(&fbdefio->lock);
}
EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
-diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
-index 7309ac7..be3c49c 100644
---- a/drivers/video/fbmem.c
-+++ b/drivers/video/fbmem.c
-@@ -433,7 +433,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
- image->dx += image->width + 8;
- }
- } else if (rotate == FB_ROTATE_UD) {
-- for (x = 0; x < num && image->dx >= 0; x++) {
-+ for (x = 0; x < num && (__s32)image->dx >= 0; x++) {
- info->fbops->fb_imageblit(info, image);
- image->dx -= image->width + 8;
- }
-@@ -445,7 +445,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
- image->dy += image->height + 8;
- }
- } else if (rotate == FB_ROTATE_CCW) {
-- for (x = 0; x < num && image->dy >= 0; x++) {
-+ for (x = 0; x < num && (__s32)image->dy >= 0; x++) {
- info->fbops->fb_imageblit(info, image);
- image->dy -= image->height + 8;
- }
-@@ -1179,7 +1179,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
- return -EFAULT;
- if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
- return -EINVAL;
-- if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
-+ if (con2fb.framebuffer >= FB_MAX)
- return -EINVAL;
- if (!registered_fb[con2fb.framebuffer])
- request_module("fb%d", con2fb.framebuffer);
-@@ -1300,7 +1300,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
+diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
+index 0705d88..d9429bf 100644
+--- a/drivers/video/fbdev/core/fbmem.c
++++ b/drivers/video/fbdev/core/fbmem.c
+@@ -1301,7 +1301,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
__u32 data;
int err;
@@ -54857,11 +54998,11 @@ index 7309ac7..be3c49c 100644
data = (__u32) (unsigned long) fix->smem_start;
err |= put_user(data, &fix32->smem_start);
-diff --git a/drivers/video/hyperv_fb.c b/drivers/video/hyperv_fb.c
-index 130708f..cdac1a9 100644
---- a/drivers/video/hyperv_fb.c
-+++ b/drivers/video/hyperv_fb.c
-@@ -233,7 +233,7 @@ static uint screen_fb_size;
+diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
+index 4254336..282567e 100644
+--- a/drivers/video/fbdev/hyperv_fb.c
++++ b/drivers/video/fbdev/hyperv_fb.c
+@@ -240,7 +240,7 @@ static uint screen_fb_size;
static inline int synthvid_send(struct hv_device *hdev,
struct synthvid_msg *msg)
{
@@ -54870,7 +55011,7 @@ index 130708f..cdac1a9 100644
int ret;
msg->pipe_hdr.type = PIPE_MSG_DATA;
-@@ -241,7 +241,7 @@ static inline int synthvid_send(struct hv_device *hdev,
+@@ -248,7 +248,7 @@ static inline int synthvid_send(struct hv_device *hdev,
ret = vmbus_sendpacket(hdev->channel, msg,
msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
@@ -54879,10 +55020,10 @@ index 130708f..cdac1a9 100644
VM_PKT_DATA_INBAND, 0);
if (ret)
-diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
+diff --git a/drivers/video/fbdev/i810/i810_accel.c b/drivers/video/fbdev/i810/i810_accel.c
index 7672d2e..b56437f 100644
---- a/drivers/video/i810/i810_accel.c
-+++ b/drivers/video/i810/i810_accel.c
+--- a/drivers/video/fbdev/i810/i810_accel.c
++++ b/drivers/video/fbdev/i810/i810_accel.c
@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
}
}
@@ -54891,6 +55032,544 @@ index 7672d2e..b56437f 100644
i810_report_error(mmio);
par->dev_flags |= LOCKUP;
info->pixmap.scan_align = 1;
+diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
+index a01147f..5d896f8 100644
+--- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
++++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
+@@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
+
+ #ifdef CONFIG_FB_MATROX_MYSTIQUE
+ struct matrox_switch matrox_mystique = {
+- MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
++ .preinit = MGA1064_preinit,
++ .reset = MGA1064_reset,
++ .init = MGA1064_init,
++ .restore = MGA1064_restore,
+ };
+ EXPORT_SYMBOL(matrox_mystique);
+ #endif
+
+ #ifdef CONFIG_FB_MATROX_G
+ struct matrox_switch matrox_G100 = {
+- MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
++ .preinit = MGAG100_preinit,
++ .reset = MGAG100_reset,
++ .init = MGAG100_init,
++ .restore = MGAG100_restore,
+ };
+ EXPORT_SYMBOL(matrox_G100);
+ #endif
+diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
+index 195ad7c..09743fc 100644
+--- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
++++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
+@@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
+ }
+
+ struct matrox_switch matrox_millennium = {
+- Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
++ .preinit = Ti3026_preinit,
++ .reset = Ti3026_reset,
++ .init = Ti3026_init,
++ .restore = Ti3026_restore
+ };
+ EXPORT_SYMBOL(matrox_millennium);
+ #endif
+diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
+index fe92eed..106e085 100644
+--- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
++++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
+@@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
+ struct mb862xxfb_par *par = info->par;
+
+ if (info->var.bits_per_pixel == 32) {
+- info->fbops->fb_fillrect = cfb_fillrect;
+- info->fbops->fb_copyarea = cfb_copyarea;
+- info->fbops->fb_imageblit = cfb_imageblit;
++ pax_open_kernel();
++ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
++ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
++ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
++ pax_close_kernel();
+ } else {
+ outreg(disp, GC_L0EM, 3);
+- info->fbops->fb_fillrect = mb86290fb_fillrect;
+- info->fbops->fb_copyarea = mb86290fb_copyarea;
+- info->fbops->fb_imageblit = mb86290fb_imageblit;
++ pax_open_kernel();
++ *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
++ *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
++ *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
++ pax_close_kernel();
+ }
+ outreg(draw, GDC_REG_DRAW_BASE, 0);
+ outreg(draw, GDC_REG_MODE_MISC, 0x8000);
+diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
+index def0412..fed6529 100644
+--- a/drivers/video/fbdev/nvidia/nvidia.c
++++ b/drivers/video/fbdev/nvidia/nvidia.c
+@@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
+ info->fix.line_length = (info->var.xres_virtual *
+ info->var.bits_per_pixel) >> 3;
+ if (info->var.accel_flags) {
+- info->fbops->fb_imageblit = nvidiafb_imageblit;
+- info->fbops->fb_fillrect = nvidiafb_fillrect;
+- info->fbops->fb_copyarea = nvidiafb_copyarea;
+- info->fbops->fb_sync = nvidiafb_sync;
++ pax_open_kernel();
++ *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
++ *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
++ *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
++ *(void **)&info->fbops->fb_sync = nvidiafb_sync;
++ pax_close_kernel();
+ info->pixmap.scan_align = 4;
+ info->flags &= ~FBINFO_HWACCEL_DISABLED;
+ info->flags |= FBINFO_READS_FAST;
+ NVResetGraphics(info);
+ } else {
+- info->fbops->fb_imageblit = cfb_imageblit;
+- info->fbops->fb_fillrect = cfb_fillrect;
+- info->fbops->fb_copyarea = cfb_copyarea;
+- info->fbops->fb_sync = NULL;
++ pax_open_kernel();
++ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
++ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
++ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
++ *(void **)&info->fbops->fb_sync = NULL;
++ pax_close_kernel();
+ info->pixmap.scan_align = 1;
+ info->flags |= FBINFO_HWACCEL_DISABLED;
+ info->flags &= ~FBINFO_READS_FAST;
+@@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
+ info->pixmap.size = 8 * 1024;
+ info->pixmap.flags = FB_PIXMAP_SYSTEM;
+
+- if (!hwcur)
+- info->fbops->fb_cursor = NULL;
++ if (!hwcur) {
++ pax_open_kernel();
++ *(void **)&info->fbops->fb_cursor = NULL;
++ pax_close_kernel();
++ }
+
+ info->var.accel_flags = (!noaccel);
+
+diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/video/fbdev/omap2/dss/display.c
+index 2412a0d..294215b 100644
+--- a/drivers/video/fbdev/omap2/dss/display.c
++++ b/drivers/video/fbdev/omap2/dss/display.c
+@@ -161,12 +161,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
+ if (dssdev->name == NULL)
+ dssdev->name = dssdev->alias;
+
++ pax_open_kernel();
+ if (drv && drv->get_resolution == NULL)
+- drv->get_resolution = omapdss_default_get_resolution;
++ *(void **)&drv->get_resolution = omapdss_default_get_resolution;
+ if (drv && drv->get_recommended_bpp == NULL)
+- drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
++ *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
+ if (drv && drv->get_timings == NULL)
+- drv->get_timings = omapdss_default_get_timings;
++ *(void **)&drv->get_timings = omapdss_default_get_timings;
++ pax_close_kernel();
+
+ mutex_lock(&panel_list_mutex);
+ list_add_tail(&dssdev->panel_list, &panel_list);
+diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
+index 83433cb..71e9b98 100644
+--- a/drivers/video/fbdev/s1d13xxxfb.c
++++ b/drivers/video/fbdev/s1d13xxxfb.c
+@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
+
+ switch(prod_id) {
+ case S1D13506_PROD_ID: /* activate acceleration */
+- s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
+- s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
++ pax_open_kernel();
++ *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
++ *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
++ pax_close_kernel();
+ info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
+ FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
+ break;
+diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
+index 2bcc84a..29dd1ea 100644
+--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
++++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
+@@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
+ }
+
+ static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
+- lcdc_sys_write_index,
+- lcdc_sys_write_data,
+- lcdc_sys_read_data,
++ .write_index = lcdc_sys_write_index,
++ .write_data = lcdc_sys_write_data,
++ .read_data = lcdc_sys_read_data,
+ };
+
+ static int sh_mobile_lcdc_sginit(struct fb_info *info,
+diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
+index d513ed6..90b0de9 100644
+--- a/drivers/video/fbdev/smscufx.c
++++ b/drivers/video/fbdev/smscufx.c
+@@ -1175,7 +1175,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
+ fb_deferred_io_cleanup(info);
+ kfree(info->fbdefio);
+ info->fbdefio = NULL;
+- info->fbops->fb_mmap = ufx_ops_mmap;
++ pax_open_kernel();
++ *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
++ pax_close_kernel();
+ }
+
+ pr_debug("released /dev/fb%d user=%d count=%d",
+diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
+index 046d51d..be564da 100644
+--- a/drivers/video/fbdev/udlfb.c
++++ b/drivers/video/fbdev/udlfb.c
+@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
+ dlfb_urb_completion(urb);
+
+ error:
+- atomic_add(bytes_sent, &dev->bytes_sent);
+- atomic_add(bytes_identical, &dev->bytes_identical);
+- atomic_add(width*height*2, &dev->bytes_rendered);
++ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
++ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
++ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
+ end_cycles = get_cycles();
+- atomic_add(((unsigned int) ((end_cycles - start_cycles)
++ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
+ >> 10)), /* Kcycles */
+ &dev->cpu_kcycles_used);
+
+@@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
+ dlfb_urb_completion(urb);
+
+ error:
+- atomic_add(bytes_sent, &dev->bytes_sent);
+- atomic_add(bytes_identical, &dev->bytes_identical);
+- atomic_add(bytes_rendered, &dev->bytes_rendered);
++ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
++ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
++ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
+ end_cycles = get_cycles();
+- atomic_add(((unsigned int) ((end_cycles - start_cycles)
++ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
+ >> 10)), /* Kcycles */
+ &dev->cpu_kcycles_used);
+ }
+@@ -993,7 +993,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
+ fb_deferred_io_cleanup(info);
+ kfree(info->fbdefio);
+ info->fbdefio = NULL;
+- info->fbops->fb_mmap = dlfb_ops_mmap;
++ pax_open_kernel();
++ *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
++ pax_close_kernel();
+ }
+
+ pr_warn("released /dev/fb%d user=%d count=%d\n",
+@@ -1376,7 +1378,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
+ struct fb_info *fb_info = dev_get_drvdata(fbdev);
+ struct dlfb_data *dev = fb_info->par;
+ return snprintf(buf, PAGE_SIZE, "%u\n",
+- atomic_read(&dev->bytes_rendered));
++ atomic_read_unchecked(&dev->bytes_rendered));
+ }
+
+ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
+@@ -1384,7 +1386,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
+ struct fb_info *fb_info = dev_get_drvdata(fbdev);
+ struct dlfb_data *dev = fb_info->par;
+ return snprintf(buf, PAGE_SIZE, "%u\n",
+- atomic_read(&dev->bytes_identical));
++ atomic_read_unchecked(&dev->bytes_identical));
+ }
+
+ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
+@@ -1392,7 +1394,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
+ struct fb_info *fb_info = dev_get_drvdata(fbdev);
+ struct dlfb_data *dev = fb_info->par;
+ return snprintf(buf, PAGE_SIZE, "%u\n",
+- atomic_read(&dev->bytes_sent));
++ atomic_read_unchecked(&dev->bytes_sent));
+ }
+
+ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
+@@ -1400,7 +1402,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
+ struct fb_info *fb_info = dev_get_drvdata(fbdev);
+ struct dlfb_data *dev = fb_info->par;
+ return snprintf(buf, PAGE_SIZE, "%u\n",
+- atomic_read(&dev->cpu_kcycles_used));
++ atomic_read_unchecked(&dev->cpu_kcycles_used));
+ }
+
+ static ssize_t edid_show(
+@@ -1460,10 +1462,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
+ struct fb_info *fb_info = dev_get_drvdata(fbdev);
+ struct dlfb_data *dev = fb_info->par;
+
+- atomic_set(&dev->bytes_rendered, 0);
+- atomic_set(&dev->bytes_identical, 0);
+- atomic_set(&dev->bytes_sent, 0);
+- atomic_set(&dev->cpu_kcycles_used, 0);
++ atomic_set_unchecked(&dev->bytes_rendered, 0);
++ atomic_set_unchecked(&dev->bytes_identical, 0);
++ atomic_set_unchecked(&dev->bytes_sent, 0);
++ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
+
+ return count;
+ }
+diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
+index 509d452..7c9d2de 100644
+--- a/drivers/video/fbdev/uvesafb.c
++++ b/drivers/video/fbdev/uvesafb.c
+@@ -19,6 +19,7 @@
+ #include <linux/io.h>
+ #include <linux/mutex.h>
+ #include <linux/slab.h>
++#include <linux/moduleloader.h>
+ #include <video/edid.h>
+ #include <video/uvesafb.h>
+ #ifdef CONFIG_X86
+@@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
+ if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
+ par->pmi_setpal = par->ypan = 0;
+ } else {
++
++#ifdef CONFIG_PAX_KERNEXEC
++#ifdef CONFIG_MODULES
++ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
++#endif
++ if (!par->pmi_code) {
++ par->pmi_setpal = par->ypan = 0;
++ return 0;
++ }
++#endif
++
+ par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
+ + task->t.regs.edi);
++
++#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
++ pax_open_kernel();
++ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
++ pax_close_kernel();
++
++ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
++ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
++#else
+ par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
+ par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
++#endif
++
+ printk(KERN_INFO "uvesafb: protected mode interface info at "
+ "%04x:%04x\n",
+ (u16)task->t.regs.es, (u16)task->t.regs.edi);
+@@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
+ par->ypan = ypan;
+
+ if (par->pmi_setpal || par->ypan) {
++#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
+ if (__supported_pte_mask & _PAGE_NX) {
+ par->pmi_setpal = par->ypan = 0;
+ printk(KERN_WARNING "uvesafb: NX protection is active, "
+ "better not use the PMI.\n");
+- } else {
++ } else
++#endif
+ uvesafb_vbe_getpmi(task, par);
+- }
+ }
+ #else
+ /* The protected mode interface is not available on non-x86. */
+@@ -1453,8 +1477,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
+ info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
+
+ /* Disable blanking if the user requested so. */
+- if (!blank)
+- info->fbops->fb_blank = NULL;
++ if (!blank) {
++ pax_open_kernel();
++ *(void **)&info->fbops->fb_blank = NULL;
++ pax_close_kernel();
++ }
+
+ /*
+ * Find out how much IO memory is required for the mode with
+@@ -1525,8 +1552,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
+ info->flags = FBINFO_FLAG_DEFAULT |
+ (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
+
+- if (!par->ypan)
+- info->fbops->fb_pan_display = NULL;
++ if (!par->ypan) {
++ pax_open_kernel();
++ *(void **)&info->fbops->fb_pan_display = NULL;
++ pax_close_kernel();
++ }
+ }
+
+ static void uvesafb_init_mtrr(struct fb_info *info)
+@@ -1787,6 +1817,11 @@ out_mode:
+ out:
+ kfree(par->vbe_modes);
+
++#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
++ if (par->pmi_code)
++ module_free_exec(NULL, par->pmi_code);
++#endif
++
+ framebuffer_release(info);
+ return err;
+ }
+@@ -1811,6 +1846,11 @@ static int uvesafb_remove(struct platform_device *dev)
+ kfree(par->vbe_state_orig);
+ kfree(par->vbe_state_saved);
+
++#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
++ if (par->pmi_code)
++ module_free_exec(NULL, par->pmi_code);
++#endif
++
+ framebuffer_release(info);
+ }
+ return 0;
+diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
+index 6170e7f..dd63031 100644
+--- a/drivers/video/fbdev/vesafb.c
++++ b/drivers/video/fbdev/vesafb.c
+@@ -9,6 +9,7 @@
+ */
+
+ #include <linux/module.h>
++#include <linux/moduleloader.h>
+ #include <linux/kernel.h>
+ #include <linux/errno.h>
+ #include <linux/string.h>
+@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
+ static int vram_total; /* Set total amount of memory */
+ static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
+ static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
+-static void (*pmi_start)(void) __read_mostly;
+-static void (*pmi_pal) (void) __read_mostly;
++static void (*pmi_start)(void) __read_only;
++static void (*pmi_pal) (void) __read_only;
+ static int depth __read_mostly;
+ static int vga_compat __read_mostly;
+ /* --------------------------------------------------------------------- */
+@@ -233,6 +234,7 @@ static int vesafb_probe(struct platform_device *dev)
+ unsigned int size_remap;
+ unsigned int size_total;
+ char *option = NULL;
++ void *pmi_code = NULL;
+
+ /* ignore error return of fb_get_options */
+ fb_get_options("vesafb", &option);
+@@ -279,10 +281,6 @@ static int vesafb_probe(struct platform_device *dev)
+ size_remap = size_total;
+ vesafb_fix.smem_len = size_remap;
+
+-#ifndef __i386__
+- screen_info.vesapm_seg = 0;
+-#endif
+-
+ if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
+ printk(KERN_WARNING
+ "vesafb: cannot reserve video memory at 0x%lx\n",
+@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
+ printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
+ vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
+
++#ifdef __i386__
++
++#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
++ pmi_code = module_alloc_exec(screen_info.vesapm_size);
++ if (!pmi_code)
++#elif !defined(CONFIG_PAX_KERNEXEC)
++ if (0)
++#endif
++
++#endif
++ screen_info.vesapm_seg = 0;
++
+ if (screen_info.vesapm_seg) {
+- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
+- screen_info.vesapm_seg,screen_info.vesapm_off);
++ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
++ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
+ }
+
+ if (screen_info.vesapm_seg < 0xc000)
+@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
+
+ if (ypan || pmi_setpal) {
+ unsigned short *pmi_base;
++
+ pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
+- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
+- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
++
++#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
++ pax_open_kernel();
++ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
++#else
++ pmi_code = pmi_base;
++#endif
++
++ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
++ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
++
++#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
++ pmi_start = ktva_ktla(pmi_start);
++ pmi_pal = ktva_ktla(pmi_pal);
++ pax_close_kernel();
++#endif
++
+ printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
+ if (pmi_base[3]) {
+ printk(KERN_INFO "vesafb: pmi: ports = ");
+@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
+ info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
+ (ypan ? FBINFO_HWACCEL_YPAN : 0);
+
+- if (!ypan)
+- info->fbops->fb_pan_display = NULL;
++ if (!ypan) {
++ pax_open_kernel();
++ *(void **)&info->fbops->fb_pan_display = NULL;
++ pax_close_kernel();
++ }
+
+ if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
+ err = -ENOMEM;
+@@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
+ fb_info(info, "%s frame buffer device\n", info->fix.id);
+ return 0;
+ err:
++
++#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
++ module_free_exec(NULL, pmi_code);
++#endif
++
+ if (info->screen_base)
+ iounmap(info->screen_base);
+ framebuffer_release(info);
+diff --git a/drivers/video/fbdev/via/via_clock.h b/drivers/video/fbdev/via/via_clock.h
+index 88714ae..16c2e11 100644
+--- a/drivers/video/fbdev/via/via_clock.h
++++ b/drivers/video/fbdev/via/via_clock.h
+@@ -56,7 +56,7 @@ struct via_clock {
+
+ void (*set_engine_pll_state)(u8 state);
+ void (*set_engine_pll)(struct via_pll_config config);
+-};
++} __no_const;
+
+
+ static inline u32 get_pll_internal_frequency(u32 ref_freq,
diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
index 3c14e43..2630570 100644
--- a/drivers/video/logo/logo_linux_clut224.ppm
@@ -57619,545 +58298,6 @@ index 3c14e43..2630570 100644
+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
+4 4 4 4 4 4
-diff --git a/drivers/video/matrox/matroxfb_DAC1064.c b/drivers/video/matrox/matroxfb_DAC1064.c
-index a01147f..5d896f8 100644
---- a/drivers/video/matrox/matroxfb_DAC1064.c
-+++ b/drivers/video/matrox/matroxfb_DAC1064.c
-@@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
-
- #ifdef CONFIG_FB_MATROX_MYSTIQUE
- struct matrox_switch matrox_mystique = {
-- MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
-+ .preinit = MGA1064_preinit,
-+ .reset = MGA1064_reset,
-+ .init = MGA1064_init,
-+ .restore = MGA1064_restore,
- };
- EXPORT_SYMBOL(matrox_mystique);
- #endif
-
- #ifdef CONFIG_FB_MATROX_G
- struct matrox_switch matrox_G100 = {
-- MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
-+ .preinit = MGAG100_preinit,
-+ .reset = MGAG100_reset,
-+ .init = MGAG100_init,
-+ .restore = MGAG100_restore,
- };
- EXPORT_SYMBOL(matrox_G100);
- #endif
-diff --git a/drivers/video/matrox/matroxfb_Ti3026.c b/drivers/video/matrox/matroxfb_Ti3026.c
-index 195ad7c..09743fc 100644
---- a/drivers/video/matrox/matroxfb_Ti3026.c
-+++ b/drivers/video/matrox/matroxfb_Ti3026.c
-@@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
- }
-
- struct matrox_switch matrox_millennium = {
-- Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
-+ .preinit = Ti3026_preinit,
-+ .reset = Ti3026_reset,
-+ .init = Ti3026_init,
-+ .restore = Ti3026_restore
- };
- EXPORT_SYMBOL(matrox_millennium);
- #endif
-diff --git a/drivers/video/mb862xx/mb862xxfb_accel.c b/drivers/video/mb862xx/mb862xxfb_accel.c
-index fe92eed..106e085 100644
---- a/drivers/video/mb862xx/mb862xxfb_accel.c
-+++ b/drivers/video/mb862xx/mb862xxfb_accel.c
-@@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
- struct mb862xxfb_par *par = info->par;
-
- if (info->var.bits_per_pixel == 32) {
-- info->fbops->fb_fillrect = cfb_fillrect;
-- info->fbops->fb_copyarea = cfb_copyarea;
-- info->fbops->fb_imageblit = cfb_imageblit;
-+ pax_open_kernel();
-+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
-+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
-+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
-+ pax_close_kernel();
- } else {
- outreg(disp, GC_L0EM, 3);
-- info->fbops->fb_fillrect = mb86290fb_fillrect;
-- info->fbops->fb_copyarea = mb86290fb_copyarea;
-- info->fbops->fb_imageblit = mb86290fb_imageblit;
-+ pax_open_kernel();
-+ *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
-+ *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
-+ *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
-+ pax_close_kernel();
- }
- outreg(draw, GDC_REG_DRAW_BASE, 0);
- outreg(draw, GDC_REG_MODE_MISC, 0x8000);
-diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
-index def0412..fed6529 100644
---- a/drivers/video/nvidia/nvidia.c
-+++ b/drivers/video/nvidia/nvidia.c
-@@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
- info->fix.line_length = (info->var.xres_virtual *
- info->var.bits_per_pixel) >> 3;
- if (info->var.accel_flags) {
-- info->fbops->fb_imageblit = nvidiafb_imageblit;
-- info->fbops->fb_fillrect = nvidiafb_fillrect;
-- info->fbops->fb_copyarea = nvidiafb_copyarea;
-- info->fbops->fb_sync = nvidiafb_sync;
-+ pax_open_kernel();
-+ *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
-+ *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
-+ *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
-+ *(void **)&info->fbops->fb_sync = nvidiafb_sync;
-+ pax_close_kernel();
- info->pixmap.scan_align = 4;
- info->flags &= ~FBINFO_HWACCEL_DISABLED;
- info->flags |= FBINFO_READS_FAST;
- NVResetGraphics(info);
- } else {
-- info->fbops->fb_imageblit = cfb_imageblit;
-- info->fbops->fb_fillrect = cfb_fillrect;
-- info->fbops->fb_copyarea = cfb_copyarea;
-- info->fbops->fb_sync = NULL;
-+ pax_open_kernel();
-+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
-+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
-+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
-+ *(void **)&info->fbops->fb_sync = NULL;
-+ pax_close_kernel();
- info->pixmap.scan_align = 1;
- info->flags |= FBINFO_HWACCEL_DISABLED;
- info->flags &= ~FBINFO_READS_FAST;
-@@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
- info->pixmap.size = 8 * 1024;
- info->pixmap.flags = FB_PIXMAP_SYSTEM;
-
-- if (!hwcur)
-- info->fbops->fb_cursor = NULL;
-+ if (!hwcur) {
-+ pax_open_kernel();
-+ *(void **)&info->fbops->fb_cursor = NULL;
-+ pax_close_kernel();
-+ }
-
- info->var.accel_flags = (!noaccel);
-
-diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c
-index 669a81f..e216d76 100644
---- a/drivers/video/omap2/dss/display.c
-+++ b/drivers/video/omap2/dss/display.c
-@@ -137,12 +137,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
- snprintf(dssdev->alias, sizeof(dssdev->alias),
- "display%d", disp_num_counter++);
-
-+ pax_open_kernel();
- if (drv && drv->get_resolution == NULL)
-- drv->get_resolution = omapdss_default_get_resolution;
-+ *(void **)&drv->get_resolution = omapdss_default_get_resolution;
- if (drv && drv->get_recommended_bpp == NULL)
-- drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
-+ *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
- if (drv && drv->get_timings == NULL)
-- drv->get_timings = omapdss_default_get_timings;
-+ *(void **)&drv->get_timings = omapdss_default_get_timings;
-+ pax_close_kernel();
-
- mutex_lock(&panel_list_mutex);
- list_add_tail(&dssdev->panel_list, &panel_list);
-diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
-index 83433cb..71e9b98 100644
---- a/drivers/video/s1d13xxxfb.c
-+++ b/drivers/video/s1d13xxxfb.c
-@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
-
- switch(prod_id) {
- case S1D13506_PROD_ID: /* activate acceleration */
-- s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
-- s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
-+ pax_open_kernel();
-+ *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
-+ *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
-+ pax_close_kernel();
- info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
- FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
- break;
-diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
-index 2bcc84a..29dd1ea 100644
---- a/drivers/video/sh_mobile_lcdcfb.c
-+++ b/drivers/video/sh_mobile_lcdcfb.c
-@@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
- }
-
- static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
-- lcdc_sys_write_index,
-- lcdc_sys_write_data,
-- lcdc_sys_read_data,
-+ .write_index = lcdc_sys_write_index,
-+ .write_data = lcdc_sys_write_data,
-+ .read_data = lcdc_sys_read_data,
- };
-
- static int sh_mobile_lcdc_sginit(struct fb_info *info,
-diff --git a/drivers/video/smscufx.c b/drivers/video/smscufx.c
-index d513ed6..90b0de9 100644
---- a/drivers/video/smscufx.c
-+++ b/drivers/video/smscufx.c
-@@ -1175,7 +1175,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
- fb_deferred_io_cleanup(info);
- kfree(info->fbdefio);
- info->fbdefio = NULL;
-- info->fbops->fb_mmap = ufx_ops_mmap;
-+ pax_open_kernel();
-+ *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
-+ pax_close_kernel();
- }
-
- pr_debug("released /dev/fb%d user=%d count=%d",
-diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
-index 77b890e..458e666 100644
---- a/drivers/video/udlfb.c
-+++ b/drivers/video/udlfb.c
-@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
- dlfb_urb_completion(urb);
-
- error:
-- atomic_add(bytes_sent, &dev->bytes_sent);
-- atomic_add(bytes_identical, &dev->bytes_identical);
-- atomic_add(width*height*2, &dev->bytes_rendered);
-+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
-+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
-+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
- end_cycles = get_cycles();
-- atomic_add(((unsigned int) ((end_cycles - start_cycles)
-+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
- >> 10)), /* Kcycles */
- &dev->cpu_kcycles_used);
-
-@@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
- dlfb_urb_completion(urb);
-
- error:
-- atomic_add(bytes_sent, &dev->bytes_sent);
-- atomic_add(bytes_identical, &dev->bytes_identical);
-- atomic_add(bytes_rendered, &dev->bytes_rendered);
-+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
-+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
-+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
- end_cycles = get_cycles();
-- atomic_add(((unsigned int) ((end_cycles - start_cycles)
-+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
- >> 10)), /* Kcycles */
- &dev->cpu_kcycles_used);
- }
-@@ -993,7 +993,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
- fb_deferred_io_cleanup(info);
- kfree(info->fbdefio);
- info->fbdefio = NULL;
-- info->fbops->fb_mmap = dlfb_ops_mmap;
-+ pax_open_kernel();
-+ *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
-+ pax_close_kernel();
- }
-
- pr_warn("released /dev/fb%d user=%d count=%d\n",
-@@ -1376,7 +1378,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
- struct fb_info *fb_info = dev_get_drvdata(fbdev);
- struct dlfb_data *dev = fb_info->par;
- return snprintf(buf, PAGE_SIZE, "%u\n",
-- atomic_read(&dev->bytes_rendered));
-+ atomic_read_unchecked(&dev->bytes_rendered));
- }
-
- static ssize_t metrics_bytes_identical_show(struct device *fbdev,
-@@ -1384,7 +1386,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
- struct fb_info *fb_info = dev_get_drvdata(fbdev);
- struct dlfb_data *dev = fb_info->par;
- return snprintf(buf, PAGE_SIZE, "%u\n",
-- atomic_read(&dev->bytes_identical));
-+ atomic_read_unchecked(&dev->bytes_identical));
- }
-
- static ssize_t metrics_bytes_sent_show(struct device *fbdev,
-@@ -1392,7 +1394,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
- struct fb_info *fb_info = dev_get_drvdata(fbdev);
- struct dlfb_data *dev = fb_info->par;
- return snprintf(buf, PAGE_SIZE, "%u\n",
-- atomic_read(&dev->bytes_sent));
-+ atomic_read_unchecked(&dev->bytes_sent));
- }
-
- static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
-@@ -1400,7 +1402,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
- struct fb_info *fb_info = dev_get_drvdata(fbdev);
- struct dlfb_data *dev = fb_info->par;
- return snprintf(buf, PAGE_SIZE, "%u\n",
-- atomic_read(&dev->cpu_kcycles_used));
-+ atomic_read_unchecked(&dev->cpu_kcycles_used));
- }
-
- static ssize_t edid_show(
-@@ -1460,10 +1462,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
- struct fb_info *fb_info = dev_get_drvdata(fbdev);
- struct dlfb_data *dev = fb_info->par;
-
-- atomic_set(&dev->bytes_rendered, 0);
-- atomic_set(&dev->bytes_identical, 0);
-- atomic_set(&dev->bytes_sent, 0);
-- atomic_set(&dev->cpu_kcycles_used, 0);
-+ atomic_set_unchecked(&dev->bytes_rendered, 0);
-+ atomic_set_unchecked(&dev->bytes_identical, 0);
-+ atomic_set_unchecked(&dev->bytes_sent, 0);
-+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
-
- return count;
- }
-diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
-index 256fba7..6e75516 100644
---- a/drivers/video/uvesafb.c
-+++ b/drivers/video/uvesafb.c
-@@ -19,6 +19,7 @@
- #include <linux/io.h>
- #include <linux/mutex.h>
- #include <linux/slab.h>
-+#include <linux/moduleloader.h>
- #include <video/edid.h>
- #include <video/uvesafb.h>
- #ifdef CONFIG_X86
-@@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
- if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
- par->pmi_setpal = par->ypan = 0;
- } else {
-+
-+#ifdef CONFIG_PAX_KERNEXEC
-+#ifdef CONFIG_MODULES
-+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
-+#endif
-+ if (!par->pmi_code) {
-+ par->pmi_setpal = par->ypan = 0;
-+ return 0;
-+ }
-+#endif
-+
- par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
- + task->t.regs.edi);
-+
-+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
-+ pax_open_kernel();
-+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
-+ pax_close_kernel();
-+
-+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
-+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
-+#else
- par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
- par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
-+#endif
-+
- printk(KERN_INFO "uvesafb: protected mode interface info at "
- "%04x:%04x\n",
- (u16)task->t.regs.es, (u16)task->t.regs.edi);
-@@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
- par->ypan = ypan;
-
- if (par->pmi_setpal || par->ypan) {
-+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
- if (__supported_pte_mask & _PAGE_NX) {
- par->pmi_setpal = par->ypan = 0;
- printk(KERN_WARNING "uvesafb: NX protection is active, "
- "better not use the PMI.\n");
-- } else {
-+ } else
-+#endif
- uvesafb_vbe_getpmi(task, par);
-- }
- }
- #else
- /* The protected mode interface is not available on non-x86. */
-@@ -1453,8 +1477,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
- info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
-
- /* Disable blanking if the user requested so. */
-- if (!blank)
-- info->fbops->fb_blank = NULL;
-+ if (!blank) {
-+ pax_open_kernel();
-+ *(void **)&info->fbops->fb_blank = NULL;
-+ pax_close_kernel();
-+ }
-
- /*
- * Find out how much IO memory is required for the mode with
-@@ -1530,8 +1557,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
- info->flags = FBINFO_FLAG_DEFAULT |
- (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
-
-- if (!par->ypan)
-- info->fbops->fb_pan_display = NULL;
-+ if (!par->ypan) {
-+ pax_open_kernel();
-+ *(void **)&info->fbops->fb_pan_display = NULL;
-+ pax_close_kernel();
-+ }
- }
-
- static void uvesafb_init_mtrr(struct fb_info *info)
-@@ -1792,6 +1822,11 @@ out_mode:
- out:
- kfree(par->vbe_modes);
-
-+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
-+ if (par->pmi_code)
-+ module_free_exec(NULL, par->pmi_code);
-+#endif
-+
- framebuffer_release(info);
- return err;
- }
-@@ -1816,6 +1851,12 @@ static int uvesafb_remove(struct platform_device *dev)
- kfree(par->vbe_modes);
- kfree(par->vbe_state_orig);
- kfree(par->vbe_state_saved);
-+
-+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
-+ if (par->pmi_code)
-+ module_free_exec(NULL, par->pmi_code);
-+#endif
-+
- }
-
- framebuffer_release(info);
-diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
-index 1c7da3b..56ea0bd 100644
---- a/drivers/video/vesafb.c
-+++ b/drivers/video/vesafb.c
-@@ -9,6 +9,7 @@
- */
-
- #include <linux/module.h>
-+#include <linux/moduleloader.h>
- #include <linux/kernel.h>
- #include <linux/errno.h>
- #include <linux/string.h>
-@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
- static int vram_total; /* Set total amount of memory */
- static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
- static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
--static void (*pmi_start)(void) __read_mostly;
--static void (*pmi_pal) (void) __read_mostly;
-+static void (*pmi_start)(void) __read_only;
-+static void (*pmi_pal) (void) __read_only;
- static int depth __read_mostly;
- static int vga_compat __read_mostly;
- /* --------------------------------------------------------------------- */
-@@ -234,6 +235,7 @@ static int vesafb_probe(struct platform_device *dev)
- unsigned int size_remap;
- unsigned int size_total;
- char *option = NULL;
-+ void *pmi_code = NULL;
-
- /* ignore error return of fb_get_options */
- fb_get_options("vesafb", &option);
-@@ -280,10 +282,6 @@ static int vesafb_probe(struct platform_device *dev)
- size_remap = size_total;
- vesafb_fix.smem_len = size_remap;
-
--#ifndef __i386__
-- screen_info.vesapm_seg = 0;
--#endif
--
- if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
- printk(KERN_WARNING
- "vesafb: cannot reserve video memory at 0x%lx\n",
-@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
- printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
- vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
-
-+#ifdef __i386__
-+
-+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
-+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
-+ if (!pmi_code)
-+#elif !defined(CONFIG_PAX_KERNEXEC)
-+ if (0)
-+#endif
-+
-+#endif
-+ screen_info.vesapm_seg = 0;
-+
- if (screen_info.vesapm_seg) {
-- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
-- screen_info.vesapm_seg,screen_info.vesapm_off);
-+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
-+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
- }
-
- if (screen_info.vesapm_seg < 0xc000)
-@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
-
- if (ypan || pmi_setpal) {
- unsigned short *pmi_base;
-+
- pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
-- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
-- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
-+
-+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
-+ pax_open_kernel();
-+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
-+#else
-+ pmi_code = pmi_base;
-+#endif
-+
-+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
-+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
-+
-+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
-+ pmi_start = ktva_ktla(pmi_start);
-+ pmi_pal = ktva_ktla(pmi_pal);
-+ pax_close_kernel();
-+#endif
-+
- printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
- if (pmi_base[3]) {
- printk(KERN_INFO "vesafb: pmi: ports = ");
-@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
- info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
- (ypan ? FBINFO_HWACCEL_YPAN : 0);
-
-- if (!ypan)
-- info->fbops->fb_pan_display = NULL;
-+ if (!ypan) {
-+ pax_open_kernel();
-+ *(void **)&info->fbops->fb_pan_display = NULL;
-+ pax_close_kernel();
-+ }
-
- if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
- err = -ENOMEM;
-@@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
- fb_info(info, "%s frame buffer device\n", info->fix.id);
- return 0;
- err:
-+
-+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
-+ module_free_exec(NULL, pmi_code);
-+#endif
-+
- if (info->screen_base)
- iounmap(info->screen_base);
- framebuffer_release(info);
-diff --git a/drivers/video/via/via_clock.h b/drivers/video/via/via_clock.h
-index 88714ae..16c2e11 100644
---- a/drivers/video/via/via_clock.h
-+++ b/drivers/video/via/via_clock.h
-@@ -56,7 +56,7 @@ struct via_clock {
-
- void (*set_engine_pll_state)(u8 state);
- void (*set_engine_pll)(struct via_pll_config config);
--};
-+} __no_const;
-
-
- static inline u32 get_pll_internal_frequency(u32 ref_freq,
diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
index fef20db..d28b1ab 100644
--- a/drivers/xen/xenfs/xenstored.c
@@ -58176,7 +58316,7 @@ index fef20db..d28b1ab 100644
return -ENOMEM;
return 0;
diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
-index c71e886..61d3d44b 100644
+index eb14e05..5156de7 100644
--- a/fs/9p/vfs_addr.c
+++ b/fs/9p/vfs_addr.c
@@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
@@ -58189,7 +58329,7 @@ index c71e886..61d3d44b 100644
if (retval > 0)
retval = 0;
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
-index bb7991c..481e21a 100644
+index 296482f..183ddc3 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
@@ -58199,8 +58339,8 @@ index bb7991c..481e21a 100644
- char *s = nd_get_link(nd);
+ const char *s = nd_get_link(nd);
- p9_debug(P9_DEBUG_VFS, " %s %s\n",
- dentry->d_name.name, IS_ERR(s) ? "<error>" : s);
+ p9_debug(P9_DEBUG_VFS, " %pd %s\n",
+ dentry, IS_ERR(s) ? "<error>" : s);
diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
index 370b24c..ff0be7b 100644
--- a/fs/Kconfig.binfmt
@@ -58215,7 +58355,7 @@ index 370b24c..ff0be7b 100644
A.out (Assembler.OUTput) is a set of formats for libraries and
executables used in the earliest versions of UNIX. Linux used
diff --git a/fs/afs/inode.c b/fs/afs/inode.c
-index ce25d75..dc09eeb 100644
+index 2946712..f737435 100644
--- a/fs/afs/inode.c
+++ b/fs/afs/inode.c
@@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
@@ -58237,10 +58377,10 @@ index ce25d75..dc09eeb 100644
&data);
if (!inode) {
diff --git a/fs/aio.c b/fs/aio.c
-index 2f7e8c2..6c0f6ec 100644
+index 14b9315..365980f 100644
--- a/fs/aio.c
+++ b/fs/aio.c
-@@ -389,7 +389,7 @@ static int aio_setup_ring(struct kioctx *ctx)
+@@ -388,7 +388,7 @@ static int aio_setup_ring(struct kioctx *ctx)
size += sizeof(struct io_event) * nr_events;
nr_pages = PFN_UP(size);
@@ -58330,7 +58470,7 @@ index 2722387..56059b5 100644
{
if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
-index ca0ba15..0fa3257 100644
+index 929dec0..84bd914 100644
--- a/fs/binfmt_aout.c
+++ b/fs/binfmt_aout.c
@@ -16,6 +16,7 @@
@@ -58372,7 +58512,7 @@ index ca0ba15..0fa3257 100644
if (ex.a_data + ex.a_bss > rlim)
return -ENOMEM;
-@@ -264,6 +271,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
+@@ -261,6 +268,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
install_exec_creds(bprm);
@@ -58400,17 +58540,17 @@ index ca0ba15..0fa3257 100644
if (N_MAGIC(ex) == OMAGIC) {
unsigned long text_addr, map_size;
loff_t pos;
-@@ -321,7 +349,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
- }
+@@ -312,7 +340,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
+ return error;
error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
- PROT_READ | PROT_WRITE | PROT_EXEC,
+ PROT_READ | PROT_WRITE,
MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
fd_offset + ex.a_text);
- if (error != N_DATADDR(ex)) {
+ if (error != N_DATADDR(ex))
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
-index 67be295..83e2f86 100644
+index d8fc060..cbd44d5 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -34,6 +34,7 @@
@@ -58421,16 +58561,16 @@ index 67be295..83e2f86 100644
#include <asm/uaccess.h>
#include <asm/param.h>
#include <asm/page.h>
-@@ -48,7 +49,7 @@
+@@ -47,7 +48,7 @@
+
static int load_elf_binary(struct linux_binprm *bprm);
- static int load_elf_library(struct file *);
static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
- int, int, unsigned long);
+ int, int, unsigned long) __intentional_overflow(-1);
- /*
- * If we don't support core dumping, then supply a NULL so we
-@@ -60,6 +61,14 @@ static int elf_core_dump(struct coredump_params *cprm);
+ #ifdef CONFIG_USELIB
+ static int load_elf_library(struct file *);
+@@ -65,6 +66,14 @@ static int elf_core_dump(struct coredump_params *cprm);
#define elf_core_dump NULL
#endif
@@ -58445,7 +58585,7 @@ index 67be295..83e2f86 100644
#if ELF_EXEC_PAGESIZE > PAGE_SIZE
#define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
#else
-@@ -79,6 +88,15 @@ static struct linux_binfmt elf_format = {
+@@ -84,6 +93,15 @@ static struct linux_binfmt elf_format = {
.load_binary = load_elf_binary,
.load_shlib = load_elf_library,
.core_dump = elf_core_dump,
@@ -58461,7 +58601,7 @@ index 67be295..83e2f86 100644
.min_coredump = ELF_EXEC_PAGESIZE,
};
-@@ -86,6 +104,8 @@ static struct linux_binfmt elf_format = {
+@@ -91,6 +109,8 @@ static struct linux_binfmt elf_format = {
static int set_brk(unsigned long start, unsigned long end)
{
@@ -58470,7 +58610,7 @@ index 67be295..83e2f86 100644
start = ELF_PAGEALIGN(start);
end = ELF_PAGEALIGN(end);
if (end > start) {
-@@ -94,7 +114,7 @@ static int set_brk(unsigned long start, unsigned long end)
+@@ -99,7 +119,7 @@ static int set_brk(unsigned long start, unsigned long end)
if (BAD_ADDR(addr))
return addr;
}
@@ -58479,7 +58619,7 @@ index 67be295..83e2f86 100644
return 0;
}
-@@ -155,12 +175,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
+@@ -160,12 +180,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
elf_addr_t __user *u_rand_bytes;
const char *k_platform = ELF_PLATFORM;
const char *k_base_platform = ELF_BASE_PLATFORM;
@@ -58494,7 +58634,7 @@ index 67be295..83e2f86 100644
/*
* In some cases (e.g. Hyper-Threading), we want to avoid L1
-@@ -202,8 +223,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
+@@ -207,8 +228,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
* Generate 16 random bytes for userspace PRNG seeding.
*/
get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
@@ -58509,7 +58649,7 @@ index 67be295..83e2f86 100644
if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
return -EFAULT;
-@@ -318,9 +343,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
+@@ -323,9 +348,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
return -EFAULT;
current->mm->env_end = p;
@@ -58522,7 +58662,7 @@ index 67be295..83e2f86 100644
return -EFAULT;
return 0;
}
-@@ -388,15 +415,14 @@ static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)
+@@ -393,15 +420,14 @@ static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)
an ELF header */
static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
@@ -58541,7 +58681,7 @@ index 67be295..83e2f86 100644
unsigned long total_size;
int retval, i, size;
-@@ -442,6 +468,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
+@@ -447,6 +473,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
goto out_close;
}
@@ -58553,7 +58693,7 @@ index 67be295..83e2f86 100644
eppnt = elf_phdata;
for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
if (eppnt->p_type == PT_LOAD) {
-@@ -465,8 +496,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
+@@ -470,8 +501,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
map_addr = elf_map(interpreter, load_addr + vaddr,
eppnt, elf_prot, elf_type, total_size);
total_size = 0;
@@ -58562,7 +58702,7 @@ index 67be295..83e2f86 100644
error = map_addr;
if (BAD_ADDR(map_addr))
goto out_close;
-@@ -485,8 +514,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
+@@ -490,8 +519,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
k = load_addr + eppnt->p_vaddr;
if (BAD_ADDR(k) ||
eppnt->p_filesz > eppnt->p_memsz ||
@@ -58573,7 +58713,7 @@ index 67be295..83e2f86 100644
error = -ENOMEM;
goto out_close;
}
-@@ -525,9 +554,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
+@@ -530,9 +559,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
/* Map the last of the bss segment */
@@ -58588,7 +58728,7 @@ index 67be295..83e2f86 100644
}
error = load_addr;
-@@ -538,6 +569,336 @@ out:
+@@ -543,6 +574,336 @@ out:
return error;
}
@@ -58925,7 +59065,7 @@ index 67be295..83e2f86 100644
/*
* These are the functions used to load ELF style executables and shared
* libraries. There is no binary dependent code anywhere else.
-@@ -551,6 +912,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
+@@ -556,6 +917,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
{
unsigned int random_variable = 0;
@@ -58937,7 +59077,7 @@ index 67be295..83e2f86 100644
if ((current->flags & PF_RANDOMIZE) &&
!(current->personality & ADDR_NO_RANDOMIZE)) {
random_variable = get_random_int() & STACK_RND_MASK;
-@@ -569,7 +935,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
+@@ -574,7 +940,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
unsigned long load_addr = 0, load_bias = 0;
int load_addr_set = 0;
char * elf_interpreter = NULL;
@@ -58946,13 +59086,7 @@ index 67be295..83e2f86 100644
struct elf_phdr *elf_ppnt, *elf_phdata;
unsigned long elf_bss, elf_brk;
int retval, i;
-@@ -579,12 +945,12 @@ static int load_elf_binary(struct linux_binprm *bprm)
- unsigned long start_code, end_code, start_data, end_data;
- unsigned long reloc_func_desc __maybe_unused = 0;
- int executable_stack = EXSTACK_DEFAULT;
-- unsigned long def_flags = 0;
- struct pt_regs *regs = current_pt_regs();
- struct {
+@@ -589,6 +955,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
struct elfhdr elf_ex;
struct elfhdr interp_elf_ex;
} *loc;
@@ -58960,13 +59094,7 @@ index 67be295..83e2f86 100644
loc = kmalloc(sizeof(*loc), GFP_KERNEL);
if (!loc) {
-@@ -720,11 +1086,82 @@ static int load_elf_binary(struct linux_binprm *bprm)
- goto out_free_dentry;
-
- /* OK, This is the point of no return */
-- current->mm->def_flags = def_flags;
-+ current->mm->def_flags = 0;
-
+@@ -726,6 +1093,77 @@ static int load_elf_binary(struct linux_binprm *bprm)
/* Do this immediately, since STACK_TOP as used in setup_arg_pages
may depend on the personality. */
SET_PERSONALITY(loc->elf_ex);
@@ -59044,7 +59172,7 @@ index 67be295..83e2f86 100644
if (elf_read_implies_exec(loc->elf_ex, executable_stack))
current->personality |= READ_IMPLIES_EXEC;
-@@ -814,6 +1251,20 @@ static int load_elf_binary(struct linux_binprm *bprm)
+@@ -811,6 +1249,20 @@ static int load_elf_binary(struct linux_binprm *bprm)
#else
load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
#endif
@@ -59065,7 +59193,7 @@ index 67be295..83e2f86 100644
}
error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
-@@ -846,9 +1297,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
+@@ -842,9 +1294,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
* allowed task size. Note that p_filesz must always be
* <= p_memsz so it is only necessary to check p_memsz.
*/
@@ -59076,13 +59204,12 @@ index 67be295..83e2f86 100644
+ elf_ppnt->p_memsz > pax_task_size ||
+ pax_task_size - elf_ppnt->p_memsz < k) {
/* set_brk can never work. Avoid overflows. */
- send_sig(SIGKILL, current, 0);
retval = -EINVAL;
-@@ -887,17 +1338,45 @@ static int load_elf_binary(struct linux_binprm *bprm)
+ goto out_free_dentry;
+@@ -880,16 +1332,43 @@ static int load_elf_binary(struct linux_binprm *bprm)
+ if (retval)
goto out_free_dentry;
- }
if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
-- send_sig(SIGSEGV, current, 0);
- retval = -EFAULT; /* Nobody gets to see this, but.. */
- goto out_free_dentry;
+ /*
@@ -59114,10 +59241,8 @@ index 67be295..83e2f86 100644
+ up_write(&current->mm->mmap_sem);
+ if (retval == 0)
+ retval = set_brk(start + size, start + size + PAGE_SIZE);
-+ if (retval < 0) {
-+ send_sig(SIGKILL, current, 0);
++ if (retval < 0)
+ goto out_free_dentry;
-+ }
+ }
+#endif
+
@@ -59130,7 +59255,7 @@ index 67be295..83e2f86 100644
load_bias);
if (!IS_ERR((void *)elf_entry)) {
/*
-@@ -1119,7 +1598,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
+@@ -1115,7 +1594,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
* Decide what to dump of a segment, part, all or none.
*/
static unsigned long vma_dump_size(struct vm_area_struct *vma,
@@ -59139,7 +59264,7 @@ index 67be295..83e2f86 100644
{
#define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
-@@ -1157,7 +1636,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
+@@ -1153,7 +1632,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
if (vma->vm_file == NULL)
return 0;
@@ -59148,7 +59273,7 @@ index 67be295..83e2f86 100644
goto whole;
/*
-@@ -1364,9 +1843,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
+@@ -1360,9 +1839,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
{
elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
int i = 0;
@@ -59160,7 +59285,7 @@ index 67be295..83e2f86 100644
fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
}
-@@ -1375,7 +1854,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
+@@ -1371,7 +1850,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
{
mm_segment_t old_fs = get_fs();
set_fs(KERNEL_DS);
@@ -59169,7 +59294,7 @@ index 67be295..83e2f86 100644
set_fs(old_fs);
fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
}
-@@ -1999,14 +2478,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
+@@ -1995,14 +2474,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
}
static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
@@ -59186,7 +59311,7 @@ index 67be295..83e2f86 100644
return size;
}
-@@ -2097,7 +2576,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2093,7 +2572,7 @@ static int elf_core_dump(struct coredump_params *cprm)
dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
@@ -59195,7 +59320,7 @@ index 67be295..83e2f86 100644
offset += elf_core_extra_data_size();
e_shoff = offset;
-@@ -2125,7 +2604,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2121,7 +2600,7 @@ static int elf_core_dump(struct coredump_params *cprm)
phdr.p_offset = offset;
phdr.p_vaddr = vma->vm_start;
phdr.p_paddr = 0;
@@ -59204,7 +59329,7 @@ index 67be295..83e2f86 100644
phdr.p_memsz = vma->vm_end - vma->vm_start;
offset += phdr.p_filesz;
phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
-@@ -2158,7 +2637,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2154,7 +2633,7 @@ static int elf_core_dump(struct coredump_params *cprm)
unsigned long addr;
unsigned long end;
@@ -59213,7 +59338,7 @@ index 67be295..83e2f86 100644
for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
struct page *page;
-@@ -2199,6 +2678,167 @@ out:
+@@ -2195,6 +2674,167 @@ out:
#endif /* CONFIG_ELF_CORE */
@@ -59381,42 +59506,11 @@ index 67be295..83e2f86 100644
static int __init init_elf_binfmt(void)
{
register_binfmt(&elf_format);
-diff --git a/fs/bio.c b/fs/bio.c
-index 8754e7b..0669094 100644
---- a/fs/bio.c
-+++ b/fs/bio.c
-@@ -1145,7 +1145,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
- /*
- * Overflow, abort
- */
-- if (end < start)
-+ if (end < start || end - start > INT_MAX - nr_pages)
- return ERR_PTR(-EINVAL);
-
- nr_pages += end - start;
-@@ -1279,7 +1279,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
- /*
- * Overflow, abort
- */
-- if (end < start)
-+ if (end < start || end - start > INT_MAX - nr_pages)
- return ERR_PTR(-EINVAL);
-
- nr_pages += end - start;
-@@ -1541,7 +1541,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
- const int read = bio_data_dir(bio) == READ;
- struct bio_map_data *bmd = bio->bi_private;
- int i;
-- char *p = bmd->sgvecs[0].iov_base;
-+ char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
-
- bio_for_each_segment_all(bvec, bio, i) {
- char *addr = page_address(bvec->bv_page);
diff --git a/fs/block_dev.c b/fs/block_dev.c
-index 1e86823..8e34695 100644
+index 1d9c9f3..2905786 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
-@@ -637,7 +637,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
+@@ -697,7 +697,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
else if (bdev->bd_contains == bdev)
return true; /* is a whole device which isn't held */
@@ -59426,10 +59520,10 @@ index 1e86823..8e34695 100644
else if (whole->bd_holder != NULL)
return false; /* is a partition of a held device */
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
-index cbd3a7d6f..c6a2881 100644
+index 150822e..75bb326 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
-@@ -1216,9 +1216,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
+@@ -1173,9 +1173,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
free_extent_buffer(buf);
add_root_to_dirty_list(root);
} else {
@@ -59446,10 +59540,10 @@ index cbd3a7d6f..c6a2881 100644
WARN_ON(trans->transid != btrfs_header_generation(parent));
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
-index 12e3556..eea9bcf 100644
+index de4e70f..b41dc45 100644
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
-@@ -459,7 +459,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
+@@ -462,7 +462,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
static void finish_one_item(struct btrfs_delayed_root *delayed_root)
{
@@ -59458,7 +59552,7 @@ index 12e3556..eea9bcf 100644
if ((atomic_dec_return(&delayed_root->items) <
BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
waitqueue_active(&delayed_root->wait))
-@@ -1409,7 +1409,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
+@@ -1412,7 +1412,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
{
@@ -59467,7 +59561,7 @@ index 12e3556..eea9bcf 100644
if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
return 1;
-@@ -1433,7 +1433,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
+@@ -1436,7 +1436,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
int seq;
int ret;
@@ -59499,10 +59593,10 @@ index f70119f..ab5894d 100644
spin_lock_init(&delayed_root->lock);
init_waitqueue_head(&delayed_root->wait);
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
-index 0b72006..264c7de 100644
+index 4399f0c..a34d8b4 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
-@@ -3494,9 +3494,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
+@@ -3953,9 +3953,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
for (i = 0; i < num_types; i++) {
struct btrfs_space_info *tmp;
@@ -59515,7 +59609,7 @@ index 0b72006..264c7de 100644
info = NULL;
rcu_read_lock();
list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
-@@ -3518,10 +3521,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
+@@ -3977,10 +3980,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
memcpy(dest, &space, sizeof(space));
dest++;
space_args.total_spaces++;
@@ -59527,10 +59621,10 @@ index 0b72006..264c7de 100644
up_read(&info->groups_sem);
}
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
-index d04db81..96e54f1 100644
+index cde9c03..ad4d4db 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
-@@ -268,7 +268,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
+@@ -271,7 +271,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
function, line, errstr);
return;
}
@@ -59540,10 +59634,10 @@ index d04db81..96e54f1 100644
wake_up(&root->fs_info->transaction_wait);
wake_up(&root->fs_info->transaction_blocked_wait);
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
-index ff286f3..8153a14 100644
+index b2e7bb4..3719201 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
-@@ -437,7 +437,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
+@@ -480,7 +480,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
for (set = 0; set < FEAT_MAX; set++) {
int i;
struct attribute *attrs[2];
@@ -59552,11 +59646,50 @@ index ff286f3..8153a14 100644
.name = "features",
.attrs = attrs,
};
+diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c
+index 2299bfd..4098e72 100644
+--- a/fs/btrfs/tests/free-space-tests.c
++++ b/fs/btrfs/tests/free-space-tests.c
+@@ -463,7 +463,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
+ * extent entry.
+ */
+ use_bitmap_op = cache->free_space_ctl->op->use_bitmap;
+- cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
++ pax_open_kernel();
++ *(void **)&cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
++ pax_close_kernel();
+
+ /*
+ * Extent entry covering free space range [128Mb - 256Kb, 128Mb - 128Kb[
+@@ -870,7 +872,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
+ if (ret)
+ return ret;
+
+- cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
++ pax_open_kernel();
++ *(void **)&cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
++ pax_close_kernel();
+ __btrfs_remove_free_space_cache(cache->free_space_ctl);
+
+ return 0;
+diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
+index 154990c..d0cf699 100644
+--- a/fs/btrfs/tree-log.h
++++ b/fs/btrfs/tree-log.h
+@@ -43,7 +43,7 @@ static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx)
+ static inline void btrfs_set_log_full_commit(struct btrfs_fs_info *fs_info,
+ struct btrfs_trans_handle *trans)
+ {
+- ACCESS_ONCE(fs_info->last_trans_log_full_commit) = trans->transid;
++ ACCESS_ONCE_RW(fs_info->last_trans_log_full_commit) = trans->transid;
+ }
+
+ static inline int btrfs_need_log_full_commit(struct btrfs_fs_info *fs_info,
diff --git a/fs/buffer.c b/fs/buffer.c
-index eef21c6..10a8304 100644
+index 20805db..2e8fc69 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
-@@ -3450,7 +3450,7 @@ void __init buffer_init(void)
+@@ -3417,7 +3417,7 @@ void __init buffer_init(void)
bh_cachep = kmem_cache_create("buffer_head",
sizeof(struct buffer_head), 0,
(SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
@@ -59566,7 +59699,7 @@ index eef21c6..10a8304 100644
/*
diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
-index 622f469..e8d2d55 100644
+index fbb08e9..0fda764 100644
--- a/fs/cachefiles/bind.c
+++ b/fs/cachefiles/bind.c
@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
@@ -59586,7 +59719,7 @@ index 622f469..e8d2d55 100644
cache->brun_percent < 100);
diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
-index 0a1467b..6a53245 100644
+index ce1b115..4a6852c 100644
--- a/fs/cachefiles/daemon.c
+++ b/fs/cachefiles/daemon.c
@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
@@ -59607,7 +59740,7 @@ index 0a1467b..6a53245 100644
return -EOPNOTSUPP;
/* drag the command string into the kernel so we can parse it */
-@@ -386,7 +386,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
+@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
if (args[0] != '%' || args[1] != '\0')
return -EINVAL;
@@ -59616,7 +59749,7 @@ index 0a1467b..6a53245 100644
return cachefiles_daemon_range_error(cache, args);
cache->fstop_percent = fstop;
-@@ -458,7 +458,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
+@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
if (args[0] != '%' || args[1] != '\0')
return -EINVAL;
@@ -59626,10 +59759,10 @@ index 0a1467b..6a53245 100644
cache->bstop_percent = bstop;
diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
-index 5349473..d6c0b93 100644
+index 8c52472..c4e3a69 100644
--- a/fs/cachefiles/internal.h
+++ b/fs/cachefiles/internal.h
-@@ -59,7 +59,7 @@ struct cachefiles_cache {
+@@ -66,7 +66,7 @@ struct cachefiles_cache {
wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
struct rb_root active_nodes; /* active nodes (can't be culled) */
rwlock_t active_lock; /* lock for active_nodes */
@@ -59638,7 +59771,7 @@ index 5349473..d6c0b93 100644
unsigned frun_percent; /* when to stop culling (% files) */
unsigned fcull_percent; /* when to start culling (% files) */
unsigned fstop_percent; /* when to stop allocating (% files) */
-@@ -171,19 +171,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
+@@ -178,19 +178,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
* proc.c
*/
#ifdef CONFIG_CACHEFILES_HISTOGRAM
@@ -59664,10 +59797,10 @@ index 5349473..d6c0b93 100644
#else
diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
-index ca65f39..48921e3 100644
+index e12f189..ed17244 100644
--- a/fs/cachefiles/namei.c
+++ b/fs/cachefiles/namei.c
-@@ -317,7 +317,7 @@ try_again:
+@@ -312,7 +312,7 @@ try_again:
/* first step is to make up a grave dentry in the graveyard */
sprintf(nbuffer, "%08x%08x",
(uint32_t) get_seconds(),
@@ -59706,24 +59839,11 @@ index eccd339..4c1d995 100644
if (x == 0 && y == 0 && z == 0)
return 0;
-diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
-index ebaff36..7e3ea26 100644
---- a/fs/cachefiles/rdwr.c
-+++ b/fs/cachefiles/rdwr.c
-@@ -950,7 +950,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
- old_fs = get_fs();
- set_fs(KERNEL_DS);
- ret = file->f_op->write(
-- file, (const void __user *) data, len, &pos);
-+ file, (const void __force_user *) data, len, &pos);
- set_fs(old_fs);
- kunmap(page);
- file_end_write(file);
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
-index 5e0982a..ca18377 100644
+index 695e788..f4a9d4d 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
-@@ -128,6 +128,8 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx)
+@@ -129,6 +129,8 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx,
struct dentry *dentry, *last;
struct ceph_dentry_info *di;
int err = 0;
@@ -59732,10 +59852,10 @@ index 5e0982a..ca18377 100644
/* claim ref on last dentry we returned */
last = fi->dentry;
-@@ -183,7 +185,12 @@ more:
+@@ -192,7 +194,12 @@ more:
+
dout(" %llu (%llu) dentry %p %.*s %p\n", di->offset, ctx->pos,
dentry, dentry->d_name.len, dentry->d_name.name, dentry->d_inode);
- ctx->pos = di->offset;
- if (!dir_emit(ctx, dentry->d_name.name,
+ name = dentry->d_name.name;
+ if (name == dentry->d_iname) {
@@ -59746,7 +59866,7 @@ index 5e0982a..ca18377 100644
dentry->d_name.len,
ceph_translate_ino(dentry->d_sb, dentry->d_inode->i_ino),
dentry->d_inode->i_mode >> 12)) {
-@@ -248,7 +255,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
+@@ -250,7 +257,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
struct ceph_mds_client *mdsc = fsc->mdsc;
unsigned frag = fpos_frag(ctx->pos);
@@ -59755,21 +59875,8 @@ index 5e0982a..ca18377 100644
int err;
u32 ftype;
struct ceph_mds_reply_info_parsed *rinfo;
-diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c
-index dc66c9e..5fa0c34 100644
---- a/fs/ceph/ioctl.c
-+++ b/fs/ceph/ioctl.c
-@@ -42,7 +42,7 @@ static long __validate_layout(struct ceph_mds_client *mdsc,
- /* validate striping parameters */
- if ((l->object_size & ~PAGE_MASK) ||
- (l->stripe_unit & ~PAGE_MASK) ||
-- (l->stripe_unit != 0 &&
-+ ((unsigned)l->stripe_unit != 0 &&
- ((unsigned)l->object_size % (unsigned)l->stripe_unit)))
- return -EINVAL;
-
diff --git a/fs/ceph/super.c b/fs/ceph/super.c
-index 10a4ccb..92dbc5e 100644
+index f6e1237..796ffd1 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -895,7 +895,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
@@ -59791,7 +59898,7 @@ index 10a4ccb..92dbc5e 100644
sb->s_bdi = &fsc->backing_dev_info;
return err;
diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
-index f3ac415..3d2420c 100644
+index 44ec726..11a056f 100644
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -286,8 +286,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
@@ -59834,11 +59941,25 @@ index f3ac415..3d2420c 100644
if (server->ops->print_stats)
server->ops->print_stats(m, tcon);
}
+@@ -615,9 +615,11 @@ cifs_security_flags_handle_must_flags(unsigned int *flags)
+ *flags = CIFSSEC_MUST_NTLMV2;
+ else if ((*flags & CIFSSEC_MUST_NTLM) == CIFSSEC_MUST_NTLM)
+ *flags = CIFSSEC_MUST_NTLM;
+- else if ((*flags & CIFSSEC_MUST_LANMAN) == CIFSSEC_MUST_LANMAN)
++ else if (CIFSSEC_MUST_LANMAN &&
++ (*flags & CIFSSEC_MUST_LANMAN) == CIFSSEC_MUST_LANMAN)
+ *flags = CIFSSEC_MUST_LANMAN;
+- else if ((*flags & CIFSSEC_MUST_PLNTXT) == CIFSSEC_MUST_PLNTXT)
++ else if (CIFSSEC_MUST_PLNTXT &&
++ (*flags & CIFSSEC_MUST_PLNTXT) == CIFSSEC_MUST_PLNTXT)
+ *flags = CIFSSEC_MUST_PLNTXT;
+
+ *flags |= signflags;
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
-index 7c6b73c..a8f0db2 100644
+index 9d7996e..35ad5cf4 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
-@@ -1068,7 +1068,7 @@ cifs_init_request_bufs(void)
+@@ -1093,7 +1093,7 @@ cifs_init_request_bufs(void)
*/
cifs_req_cachep = kmem_cache_create("cifs_request",
CIFSMaxBufSize + max_hdr_size, 0,
@@ -59847,7 +59968,7 @@ index 7c6b73c..a8f0db2 100644
if (cifs_req_cachep == NULL)
return -ENOMEM;
-@@ -1095,7 +1095,7 @@ cifs_init_request_bufs(void)
+@@ -1120,7 +1120,7 @@ cifs_init_request_bufs(void)
efficient to alloc 1 per page off the slab compared to 17K (5page)
alloc of large cifs buffers even when page debugging is on */
cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
@@ -59856,7 +59977,7 @@ index 7c6b73c..a8f0db2 100644
NULL);
if (cifs_sm_req_cachep == NULL) {
mempool_destroy(cifs_req_poolp);
-@@ -1180,8 +1180,8 @@ init_cifs(void)
+@@ -1205,8 +1205,8 @@ init_cifs(void)
atomic_set(&bufAllocCount, 0);
atomic_set(&smBufAllocCount, 0);
#ifdef CONFIG_CIFS_STATS2
@@ -59868,10 +59989,10 @@ index 7c6b73c..a8f0db2 100644
atomic_set(&midCount, 0);
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
-index 5d12d69..161d0ce 100644
+index 02a33e5..3a28b5a 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
-@@ -803,35 +803,35 @@ struct cifs_tcon {
+@@ -823,35 +823,35 @@ struct cifs_tcon {
__u16 Flags; /* optional support bits */
enum statusEnum tidStatus;
#ifdef CONFIG_CIFS_STATS
@@ -59931,7 +60052,7 @@ index 5d12d69..161d0ce 100644
} smb2_stats;
#endif /* CONFIG_CIFS_SMB2 */
} stats;
-@@ -1167,7 +1167,7 @@ convert_delimiter(char *path, char delim)
+@@ -1192,7 +1192,7 @@ convert_delimiter(char *path, char delim)
}
#ifdef CONFIG_CIFS_STATS
@@ -59940,7 +60061,7 @@ index 5d12d69..161d0ce 100644
static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
unsigned int bytes)
-@@ -1533,8 +1533,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
+@@ -1559,8 +1559,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
/* Various Debug counters */
GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
#ifdef CONFIG_CIFS_STATS2
@@ -59952,10 +60073,37 @@ index 5d12d69..161d0ce 100644
GLOBAL_EXTERN atomic_t smBufAllocCount;
GLOBAL_EXTERN atomic_t midCount;
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
-index d375322..88c3ead 100644
+index 3e4d00a..4132187 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
-@@ -1900,10 +1900,14 @@ static int cifs_writepages(struct address_space *mapping,
+@@ -366,6 +366,7 @@ void cifsFileInfo_put(struct cifsFileInfo *cifs_file)
+ struct cifsLockInfo *li, *tmp;
+ struct cifs_fid fid;
+ struct cifs_pending_open open;
++ bool oplock_break_cancelled;
+
+ spin_lock(&cifs_file_list_lock);
+ if (--cifs_file->count > 0) {
+@@ -397,7 +398,7 @@ void cifsFileInfo_put(struct cifsFileInfo *cifs_file)
+ }
+ spin_unlock(&cifs_file_list_lock);
+
+- cancel_work_sync(&cifs_file->oplock_break);
++ oplock_break_cancelled = cancel_work_sync(&cifs_file->oplock_break);
+
+ if (!tcon->need_reconnect && !cifs_file->invalidHandle) {
+ struct TCP_Server_Info *server = tcon->ses->server;
+@@ -409,6 +410,9 @@ void cifsFileInfo_put(struct cifsFileInfo *cifs_file)
+ _free_xid(xid);
+ }
+
++ if (oplock_break_cancelled)
++ cifs_done_oplock_break(cifsi);
++
+ cifs_del_pending_open(&open);
+
+ /*
+@@ -2056,10 +2060,14 @@ static int cifs_writepages(struct address_space *mapping,
index = mapping->writeback_index; /* Start from prev offset */
end = -1;
} else {
@@ -59972,9 +60120,9 @@ index d375322..88c3ead 100644
+ }
scanned = true;
}
- retry:
+ server = cifs_sb_master_tcon(cifs_sb)->ses->server;
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
-index 3b0c62e..f7d090c 100644
+index b7415d5..3984ec0 100644
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@ -170,7 +170,7 @@ cifs_buf_get(void)
@@ -59996,10 +60144,10 @@ index 3b0c62e..f7d090c 100644
}
diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
-index e9ad8d3..6395e45 100644
+index d297903..1cb7516 100644
--- a/fs/cifs/smb1ops.c
+++ b/fs/cifs/smb1ops.c
-@@ -626,27 +626,27 @@ static void
+@@ -622,27 +622,27 @@ static void
cifs_clear_stats(struct cifs_tcon *tcon)
{
#ifdef CONFIG_CIFS_STATS
@@ -60048,7 +60196,7 @@ index e9ad8d3..6395e45 100644
#endif
}
-@@ -655,36 +655,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
+@@ -651,36 +651,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
{
#ifdef CONFIG_CIFS_STATS
seq_printf(m, " Oplocks breaks: %d",
@@ -60105,10 +60253,10 @@ index e9ad8d3..6395e45 100644
}
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
-index 34a17d4..9ca186f 100644
+index c5f521b..1a40865 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
-@@ -364,8 +364,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
+@@ -417,8 +417,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
#ifdef CONFIG_CIFS_STATS
int i;
for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
@@ -60119,7 +60267,7 @@ index 34a17d4..9ca186f 100644
}
#endif
}
-@@ -405,65 +405,65 @@ static void
+@@ -458,65 +458,65 @@ static void
smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
{
#ifdef CONFIG_CIFS_STATS
@@ -60226,10 +60374,10 @@ index 34a17d4..9ca186f 100644
}
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
-index 3487929..47a6ebf2 100644
+index 8f1672b..af339c07 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
-@@ -2100,8 +2100,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
+@@ -2145,8 +2145,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
default:
cifs_dbg(VFS, "info level %u isn't supported\n",
srch_inf->info_level);
@@ -60239,8 +60387,21 @@ index 3487929..47a6ebf2 100644
}
req->FileIndex = cpu_to_le32(index);
+diff --git a/fs/cifs/smbencrypt.c b/fs/cifs/smbencrypt.c
+index 6c15663..a4232ec 100644
+--- a/fs/cifs/smbencrypt.c
++++ b/fs/cifs/smbencrypt.c
+@@ -221,7 +221,7 @@ E_md4hash(const unsigned char *passwd, unsigned char *p16,
+ }
+
+ rc = mdfour(p16, (unsigned char *) wpwd, len * sizeof(__le16));
+- memset(wpwd, 0, 129 * sizeof(__le16));
++ memzero_explicit(wpwd, sizeof(wpwd));
+
+ return rc;
+ }
diff --git a/fs/coda/cache.c b/fs/coda/cache.c
-index 1da168c..8bc7ff6 100644
+index 46ee6f2..89a9e7f 100644
--- a/fs/coda/cache.c
+++ b/fs/coda/cache.c
@@ -24,7 +24,7 @@
@@ -60288,7 +60449,7 @@ index 1da168c..8bc7ff6 100644
return hit;
diff --git a/fs/compat.c b/fs/compat.c
-index 6af20de..fec3fbb 100644
+index b13df99..6f6f4a3 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -54,7 +54,7 @@
@@ -60300,7 +60461,7 @@ index 6af20de..fec3fbb 100644
int compat_printk(const char *fmt, ...)
{
-@@ -488,7 +488,7 @@ compat_sys_io_setup(unsigned nr_reqs, u32 __user *ctx32p)
+@@ -512,7 +512,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p)
set_fs(KERNEL_DS);
/* The __user pointer cast is valid because of the set_fs() */
@@ -60309,7 +60470,7 @@ index 6af20de..fec3fbb 100644
set_fs(oldfs);
/* truncating is ok because it's a user address */
if (!ret)
-@@ -546,7 +546,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
+@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
goto out;
ret = -EINVAL;
@@ -60318,7 +60479,7 @@ index 6af20de..fec3fbb 100644
goto out;
if (nr_segs > fast_segs) {
ret = -ENOMEM;
-@@ -834,6 +834,7 @@ struct compat_old_linux_dirent {
+@@ -844,6 +844,7 @@ struct compat_old_linux_dirent {
struct compat_readdir_callback {
struct dir_context ctx;
struct compat_old_linux_dirent __user *dirent;
@@ -60326,7 +60487,7 @@ index 6af20de..fec3fbb 100644
int result;
};
-@@ -851,6 +852,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
+@@ -861,6 +862,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
buf->result = -EOVERFLOW;
return -EOVERFLOW;
}
@@ -60337,7 +60498,7 @@ index 6af20de..fec3fbb 100644
buf->result++;
dirent = buf->dirent;
if (!access_ok(VERIFY_WRITE, dirent,
-@@ -882,6 +887,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
+@@ -892,6 +897,7 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
if (!f.file)
return -EBADF;
@@ -60345,7 +60506,7 @@ index 6af20de..fec3fbb 100644
error = iterate_dir(f.file, &buf.ctx);
if (buf.result)
error = buf.result;
-@@ -901,6 +907,7 @@ struct compat_getdents_callback {
+@@ -911,6 +917,7 @@ struct compat_getdents_callback {
struct dir_context ctx;
struct compat_linux_dirent __user *current_dir;
struct compat_linux_dirent __user *previous;
@@ -60353,7 +60514,7 @@ index 6af20de..fec3fbb 100644
int count;
int error;
};
-@@ -922,6 +929,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
+@@ -932,6 +939,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
buf->error = -EOVERFLOW;
return -EOVERFLOW;
}
@@ -60364,7 +60525,7 @@ index 6af20de..fec3fbb 100644
dirent = buf->previous;
if (dirent) {
if (__put_user(offset, &dirent->d_off))
-@@ -967,6 +978,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
+@@ -977,6 +988,7 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
if (!f.file)
return -EBADF;
@@ -60372,7 +60533,7 @@ index 6af20de..fec3fbb 100644
error = iterate_dir(f.file, &buf.ctx);
if (error >= 0)
error = buf.error;
-@@ -987,6 +999,7 @@ struct compat_getdents_callback64 {
+@@ -997,6 +1009,7 @@ struct compat_getdents_callback64 {
struct dir_context ctx;
struct linux_dirent64 __user *current_dir;
struct linux_dirent64 __user *previous;
@@ -60380,7 +60541,7 @@ index 6af20de..fec3fbb 100644
int count;
int error;
};
-@@ -1003,6 +1016,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
+@@ -1013,6 +1026,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
buf->error = -EINVAL; /* only used if we fail.. */
if (reclen > buf->count)
return -EINVAL;
@@ -60391,7 +60552,7 @@ index 6af20de..fec3fbb 100644
dirent = buf->previous;
if (dirent) {
-@@ -1052,6 +1069,7 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
+@@ -1062,6 +1079,7 @@ COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd,
if (!f.file)
return -EBADF;
@@ -60400,7 +60561,7 @@ index 6af20de..fec3fbb 100644
if (error >= 0)
error = buf.error;
diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
-index a81147e..20bf2b5 100644
+index 4d24d17..4f8c09e 100644
--- a/fs/compat_binfmt_elf.c
+++ b/fs/compat_binfmt_elf.c
@@ -30,11 +30,13 @@
@@ -60418,7 +60579,7 @@ index a81147e..20bf2b5 100644
/*
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
-index 3881610..d4599d0 100644
+index afec645..9c65620 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
@@ -60450,7 +60611,7 @@ index 3881610..d4599d0 100644
return -EFAULT;
return ioctl_preallocate(file, p);
-@@ -1617,8 +1617,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
+@@ -1618,8 +1618,8 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
{
unsigned int a, b;
@@ -60462,7 +60623,7 @@ index 3881610..d4599d0 100644
return 1;
if (a < b)
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
-index e081acb..911df21 100644
+index 668dcab..daebcd6 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -1548,7 +1548,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
@@ -60490,10 +60651,10 @@ index e081acb..911df21 100644
/*
* We'll have a dentry and an inode for
diff --git a/fs/coredump.c b/fs/coredump.c
-index a93f7e6..d58bcbe 100644
+index b5c86ff..0dac262 100644
--- a/fs/coredump.c
+++ b/fs/coredump.c
-@@ -442,8 +442,8 @@ static void wait_for_dump_helpers(struct file *file)
+@@ -450,8 +450,8 @@ static void wait_for_dump_helpers(struct file *file)
struct pipe_inode_info *pipe = file->private_data;
pipe_lock(pipe);
@@ -60504,7 +60665,7 @@ index a93f7e6..d58bcbe 100644
wake_up_interruptible_sync(&pipe->wait);
kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
pipe_unlock(pipe);
-@@ -452,11 +452,11 @@ static void wait_for_dump_helpers(struct file *file)
+@@ -460,11 +460,11 @@ static void wait_for_dump_helpers(struct file *file)
* We actually want wait_event_freezable() but then we need
* to clear TIF_SIGPENDING and improve dump_interrupted().
*/
@@ -60519,7 +60680,7 @@ index a93f7e6..d58bcbe 100644
pipe_unlock(pipe);
}
-@@ -503,7 +503,9 @@ void do_coredump(const siginfo_t *siginfo)
+@@ -511,7 +511,9 @@ void do_coredump(const siginfo_t *siginfo)
struct files_struct *displaced;
bool need_nonrelative = false;
bool core_dumped = false;
@@ -60530,7 +60691,7 @@ index a93f7e6..d58bcbe 100644
struct coredump_params cprm = {
.siginfo = siginfo,
.regs = signal_pt_regs(),
-@@ -516,12 +518,17 @@ void do_coredump(const siginfo_t *siginfo)
+@@ -524,12 +526,17 @@ void do_coredump(const siginfo_t *siginfo)
.mm_flags = mm->flags,
};
@@ -60550,7 +60711,7 @@ index a93f7e6..d58bcbe 100644
goto fail;
cred = prepare_creds();
-@@ -540,7 +547,7 @@ void do_coredump(const siginfo_t *siginfo)
+@@ -548,7 +555,7 @@ void do_coredump(const siginfo_t *siginfo)
need_nonrelative = true;
}
@@ -60559,7 +60720,7 @@ index a93f7e6..d58bcbe 100644
if (retval < 0)
goto fail_creds;
-@@ -583,7 +590,7 @@ void do_coredump(const siginfo_t *siginfo)
+@@ -591,7 +598,7 @@ void do_coredump(const siginfo_t *siginfo)
}
cprm.limit = RLIM_INFINITY;
@@ -60568,7 +60729,7 @@ index a93f7e6..d58bcbe 100644
if (core_pipe_limit && (core_pipe_limit < dump_count)) {
printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
task_tgid_vnr(current), current->comm);
-@@ -615,6 +622,8 @@ void do_coredump(const siginfo_t *siginfo)
+@@ -623,6 +630,8 @@ void do_coredump(const siginfo_t *siginfo)
} else {
struct inode *inode;
@@ -60577,7 +60738,7 @@ index a93f7e6..d58bcbe 100644
if (cprm.limit < binfmt->min_coredump)
goto fail_unlock;
-@@ -673,7 +682,7 @@ close_fail:
+@@ -681,7 +690,7 @@ close_fail:
filp_close(cprm.file, NULL);
fail_dropcount:
if (ispipe)
@@ -60586,7 +60747,7 @@ index a93f7e6..d58bcbe 100644
fail_unlock:
kfree(cn.corename);
coredump_finish(mm, core_dumped);
-@@ -694,6 +703,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
+@@ -702,6 +711,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
struct file *file = cprm->file;
loff_t pos = file->f_pos;
ssize_t n;
@@ -60596,19 +60757,28 @@ index a93f7e6..d58bcbe 100644
return 0;
while (nr) {
diff --git a/fs/dcache.c b/fs/dcache.c
-index 4366127..581b312 100644
+index 03dca3c..15f326d 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
-@@ -250,7 +250,7 @@ static void __d_free(struct rcu_head *head)
- */
- static void d_free(struct dentry *dentry)
- {
+@@ -508,7 +508,7 @@ static void __dentry_kill(struct dentry *dentry)
+ * dentry_iput drops the locks, at which point nobody (except
+ * transient RCU lookups) can reach this dentry.
+ */
- BUG_ON((int)dentry->d_lockref.count > 0);
+ BUG_ON((int)__lockref_read(&dentry->d_lockref) > 0);
this_cpu_dec(nr_dentry);
if (dentry->d_op && dentry->d_op->d_release)
dentry->d_op->d_release(dentry);
-@@ -596,7 +596,7 @@ repeat:
+@@ -561,7 +561,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
+ struct dentry *parent = dentry->d_parent;
+ if (IS_ROOT(dentry))
+ return NULL;
+- if (unlikely((int)dentry->d_lockref.count < 0))
++ if (unlikely((int)__lockref_read(&dentry->d_lockref) < 0))
+ return NULL;
+ if (likely(spin_trylock(&parent->d_lock)))
+ return parent;
+@@ -638,7 +638,7 @@ repeat:
dentry->d_flags |= DCACHE_REFERENCED;
dentry_lru_add(dentry);
@@ -60617,16 +60787,7 @@ index 4366127..581b312 100644
spin_unlock(&dentry->d_lock);
return;
-@@ -651,7 +651,7 @@ int d_invalidate(struct dentry * dentry)
- * We also need to leave mountpoints alone,
- * directory or not.
- */
-- if (dentry->d_lockref.count > 1 && dentry->d_inode) {
-+ if (__lockref_read(&dentry->d_lockref) > 1 && dentry->d_inode) {
- if (S_ISDIR(dentry->d_inode->i_mode) || d_mountpoint(dentry)) {
- spin_unlock(&dentry->d_lock);
- return -EBUSY;
-@@ -667,7 +667,7 @@ EXPORT_SYMBOL(d_invalidate);
+@@ -653,7 +653,7 @@ EXPORT_SYMBOL(dput);
/* This must be called with d_lock held */
static inline void __dget_dlock(struct dentry *dentry)
{
@@ -60635,7 +60796,7 @@ index 4366127..581b312 100644
}
static inline void __dget(struct dentry *dentry)
-@@ -708,8 +708,8 @@ repeat:
+@@ -694,8 +694,8 @@ repeat:
goto repeat;
}
rcu_read_unlock();
@@ -60646,25 +60807,39 @@ index 4366127..581b312 100644
spin_unlock(&ret->d_lock);
return ret;
}
-@@ -792,7 +792,7 @@ restart:
+@@ -773,9 +773,9 @@ restart:
spin_lock(&inode->i_lock);
- hlist_for_each_entry(dentry, &inode->i_dentry, d_alias) {
+ hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
spin_lock(&dentry->d_lock);
- if (!dentry->d_lockref.count) {
+ if (!__lockref_read(&dentry->d_lockref)) {
- /*
- * inform the fs via d_prune that this dentry
- * is about to be unhashed and destroyed.
-@@ -884,7 +884,7 @@ static void shrink_dentry_list(struct list_head *list)
+ struct dentry *parent = lock_parent(dentry);
+- if (likely(!dentry->d_lockref.count)) {
++ if (likely(!__lockref_read(&dentry->d_lockref))) {
+ __dentry_kill(dentry);
+ dput(parent);
+ goto restart;
+@@ -810,7 +810,7 @@ static void shrink_dentry_list(struct list_head *list)
* We found an inuse dentry which was not removed from
* the LRU because of laziness during lookup. Do not free it.
*/
-- if (dentry->d_lockref.count) {
-+ if (__lockref_read(&dentry->d_lockref)) {
+- if ((int)dentry->d_lockref.count > 0) {
++ if ((int)__lockref_read(&dentry->d_lockref) > 0) {
spin_unlock(&dentry->d_lock);
- continue;
- }
-@@ -930,7 +930,7 @@ dentry_lru_isolate(struct list_head *item, spinlock_t *lru_lock, void *arg)
+ if (parent)
+ spin_unlock(&parent->d_lock);
+@@ -848,8 +848,8 @@ static void shrink_dentry_list(struct list_head *list)
+ dentry = parent;
+ while (dentry && !lockref_put_or_lock(&dentry->d_lockref)) {
+ parent = lock_parent(dentry);
+- if (dentry->d_lockref.count != 1) {
+- dentry->d_lockref.count--;
++ if (__lockref_read(&dentry->d_lockref) != 1) {
++ __lockref_inc(&dentry->d_lockref);
+ spin_unlock(&dentry->d_lock);
+ if (parent)
+ spin_unlock(&parent->d_lock);
+@@ -889,7 +889,7 @@ dentry_lru_isolate(struct list_head *item, spinlock_t *lru_lock, void *arg)
* counts, just remove them from the LRU. Otherwise give them
* another pass through the LRU.
*/
@@ -60673,56 +60848,43 @@ index 4366127..581b312 100644
d_lru_isolate(dentry);
spin_unlock(&dentry->d_lock);
return LRU_REMOVED;
-@@ -1159,6 +1159,7 @@ out_unlock:
- return;
+@@ -1225,7 +1225,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
+ } else {
+ if (dentry->d_flags & DCACHE_LRU_LIST)
+ d_lru_del(dentry);
+- if (!dentry->d_lockref.count) {
++ if (!__lockref_read(&dentry->d_lockref)) {
+ d_shrink_add(dentry, &data->dispose);
+ data->found++;
+ }
+@@ -1273,7 +1273,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
+ return D_WALK_CONTINUE;
- rename_retry:
-+ done_seqretry(&rename_lock, seq);
- if (!retry)
- return;
- seq = 1;
-@@ -1268,7 +1269,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
- * loop in shrink_dcache_parent() might not make any progress
- * and loop forever.
- */
-- if (dentry->d_lockref.count) {
-+ if (__lockref_read(&dentry->d_lockref)) {
- dentry_lru_del(dentry);
- } else if (!(dentry->d_flags & DCACHE_SHRINK_LIST)) {
- /*
-@@ -1322,11 +1323,11 @@ static enum d_walk_ret umount_collect(void *_data, struct dentry *dentry)
- struct select_data *data = _data;
- enum d_walk_ret ret = D_WALK_CONTINUE;
+ /* root with refcount 1 is fine */
+- if (dentry == _data && dentry->d_lockref.count == 1)
++ if (dentry == _data && __lockref_read(&dentry->d_lockref) == 1)
+ return D_WALK_CONTINUE;
-- if (dentry->d_lockref.count) {
-+ if (__lockref_read(&dentry->d_lockref)) {
- dentry_lru_del(dentry);
- if (likely(!list_empty(&dentry->d_subdirs)))
- goto out;
-- if (dentry == data->start && dentry->d_lockref.count == 1)
-+ if (dentry == data->start && __lockref_read(&dentry->d_lockref) == 1)
- goto out;
- printk(KERN_ERR
- "BUG: Dentry %p{i=%lx,n=%s}"
-@@ -1336,7 +1337,7 @@ static enum d_walk_ret umount_collect(void *_data, struct dentry *dentry)
+ printk(KERN_ERR "BUG: Dentry %p{i=%lx,n=%pd} "
+@@ -1282,7 +1282,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
dentry->d_inode ?
dentry->d_inode->i_ino : 0UL,
- dentry->d_name.name,
+ dentry,
- dentry->d_lockref.count,
+ __lockref_read(&dentry->d_lockref),
dentry->d_sb->s_type->name,
dentry->d_sb->s_id);
- BUG();
-@@ -1494,7 +1495,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
- */
+ WARN_ON(1);
+@@ -1423,7 +1423,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
if (name->len > DNAME_INLINE_LEN-1) {
-- dname = kmalloc(name->len + 1, GFP_KERNEL);
-+ dname = kmalloc(round_up(name->len + 1, sizeof(unsigned long)), GFP_KERNEL);
- if (!dname) {
+ size_t size = offsetof(struct external_name, name[1]);
+- struct external_name *p = kmalloc(size + name->len, GFP_KERNEL);
++ struct external_name *p = kmalloc(round_up(size + name->len, sizeof(unsigned long)), GFP_KERNEL);
+ if (!p) {
kmem_cache_free(dentry_cache, dentry);
return NULL;
-@@ -1512,7 +1513,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
+@@ -1443,7 +1443,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
smp_wmb();
dentry->d_name.name = dname;
@@ -60731,7 +60893,17 @@ index 4366127..581b312 100644
dentry->d_flags = 0;
spin_lock_init(&dentry->d_lock);
seqcount_init(&dentry->d_seq);
-@@ -2275,7 +2276,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
+@@ -1452,6 +1452,9 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
+ dentry->d_sb = sb;
+ dentry->d_op = NULL;
+ dentry->d_fsdata = NULL;
++#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
++ atomic_set(&dentry->chroot_refcnt, 0);
++#endif
+ INIT_HLIST_BL_NODE(&dentry->d_hash);
+ INIT_LIST_HEAD(&dentry->d_lru);
+ INIT_LIST_HEAD(&dentry->d_subdirs);
+@@ -2183,7 +2186,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
goto next;
}
@@ -60740,7 +60912,7 @@ index 4366127..581b312 100644
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-@@ -2374,7 +2375,7 @@ again:
+@@ -2282,7 +2285,7 @@ again:
spin_lock(&dentry->d_lock);
inode = dentry->d_inode;
isdir = S_ISDIR(inode->i_mode);
@@ -60749,7 +60921,7 @@ index 4366127..581b312 100644
if (!spin_trylock(&inode->i_lock)) {
spin_unlock(&dentry->d_lock);
cpu_relax();
-@@ -3318,7 +3319,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
+@@ -3308,7 +3311,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
dentry->d_flags |= DCACHE_GENOCIDE;
@@ -60758,7 +60930,7 @@ index 4366127..581b312 100644
}
}
return D_WALK_CONTINUE;
-@@ -3434,7 +3435,8 @@ void __init vfs_caches_init(unsigned long mempages)
+@@ -3424,7 +3427,8 @@ void __init vfs_caches_init(unsigned long mempages)
mempages -= reserve;
names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
@@ -60769,10 +60941,10 @@ index 4366127..581b312 100644
dcache_init();
inode_init();
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
-index 1576195..49a19ae 100644
+index 05f2960..b012481 100644
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
-@@ -415,7 +415,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
+@@ -416,7 +416,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
*/
struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
{
@@ -60785,10 +60957,10 @@ index 1576195..49a19ae 100644
}
EXPORT_SYMBOL_GPL(debugfs_create_dir);
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
-index a85ceb7..5097313b 100644
+index 1686dc2..9611c50 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
-@@ -673,7 +673,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
+@@ -664,7 +664,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
old_fs = get_fs();
set_fs(get_ds());
rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
@@ -60811,7 +60983,7 @@ index e4141f2..d8263e8 100644
i += packet_length_size;
if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
diff --git a/fs/exec.c b/fs/exec.c
-index ea4449d..cbad96a 100644
+index 7302b75..b917171 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -56,8 +56,20 @@
@@ -60881,7 +61053,7 @@ index ea4449d..cbad96a 100644
write_unlock(&binfmt_lock);
}
-@@ -181,18 +208,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
+@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
int write)
{
struct page *page;
@@ -60903,7 +61075,7 @@ index ea4449d..cbad96a 100644
return NULL;
if (write) {
-@@ -208,6 +227,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
+@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
if (size <= ARG_MAX)
return page;
@@ -60921,7 +61093,7 @@ index ea4449d..cbad96a 100644
/*
* Limit to 1/4-th the stack size for the argv+env strings.
* This ensures that:
-@@ -267,6 +297,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
+@@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
vma->vm_end = STACK_TOP_MAX;
vma->vm_start = vma->vm_end - PAGE_SIZE;
vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
@@ -60933,7 +61105,7 @@ index ea4449d..cbad96a 100644
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
INIT_LIST_HEAD(&vma->anon_vma_chain);
-@@ -277,6 +312,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
+@@ -279,6 +314,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
mm->stack_vm = mm->total_vm = 1;
up_write(&mm->mmap_sem);
bprm->p = vma->vm_end - sizeof(void *);
@@ -60946,7 +61118,7 @@ index ea4449d..cbad96a 100644
return 0;
err:
up_write(&mm->mmap_sem);
-@@ -397,7 +438,7 @@ struct user_arg_ptr {
+@@ -395,7 +436,7 @@ struct user_arg_ptr {
} ptr;
};
@@ -60955,7 +61127,7 @@ index ea4449d..cbad96a 100644
{
const char __user *native;
-@@ -406,14 +447,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
+@@ -404,14 +445,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
compat_uptr_t compat;
if (get_user(compat, argv.ptr.compat + nr))
@@ -60972,7 +61144,7 @@ index ea4449d..cbad96a 100644
return native;
}
-@@ -432,7 +473,7 @@ static int count(struct user_arg_ptr argv, int max)
+@@ -430,7 +471,7 @@ static int count(struct user_arg_ptr argv, int max)
if (!p)
break;
@@ -60981,7 +61153,7 @@ index ea4449d..cbad96a 100644
return -EFAULT;
if (i >= max)
-@@ -467,7 +508,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
+@@ -465,7 +506,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
ret = -EFAULT;
str = get_user_arg_ptr(argv, argc);
@@ -60990,7 +61162,7 @@ index ea4449d..cbad96a 100644
goto out;
len = strnlen_user(str, MAX_ARG_STRLEN);
-@@ -549,7 +590,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
+@@ -547,7 +588,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
int r;
mm_segment_t oldfs = get_fs();
struct user_arg_ptr argv = {
@@ -60999,7 +61171,7 @@ index ea4449d..cbad96a 100644
};
set_fs(KERNEL_DS);
-@@ -584,7 +625,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
+@@ -582,7 +623,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
unsigned long new_end = old_end - shift;
struct mmu_gather tlb;
@@ -61009,7 +61181,7 @@ index ea4449d..cbad96a 100644
/*
* ensure there are no vmas between where we want to go
-@@ -593,6 +635,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
+@@ -591,6 +633,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
if (vma != find_vma(mm, new_start))
return -EFAULT;
@@ -61020,7 +61192,7 @@ index ea4449d..cbad96a 100644
/*
* cover the whole range: [new_start, old_end)
*/
-@@ -673,10 +719,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
+@@ -671,10 +717,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
stack_top = arch_align_stack(stack_top);
stack_top = PAGE_ALIGN(stack_top);
@@ -61031,7 +61203,7 @@ index ea4449d..cbad96a 100644
stack_shift = vma->vm_end - stack_top;
bprm->p -= stack_shift;
-@@ -688,8 +730,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
+@@ -686,8 +728,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
bprm->exec -= stack_shift;
down_write(&mm->mmap_sem);
@@ -61060,7 +61232,7 @@ index ea4449d..cbad96a 100644
/*
* Adjust stack execute permissions; explicitly enable for
* EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
-@@ -708,13 +770,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
+@@ -706,13 +768,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
goto out_unlock;
BUG_ON(prev != vma);
@@ -61074,7 +61246,7 @@ index ea4449d..cbad96a 100644
/* mprotect_fixup is overkill to remove the temporary stack flags */
vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
-@@ -738,6 +793,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
+@@ -736,6 +791,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
#endif
current->mm->start_stack = bprm->p;
ret = expand_stack(vma, stack_base);
@@ -61102,7 +61274,7 @@ index ea4449d..cbad96a 100644
if (ret)
ret = -EFAULT;
-@@ -773,6 +849,8 @@ static struct file *do_open_exec(struct filename *name)
+@@ -771,6 +847,8 @@ static struct file *do_open_exec(struct filename *name)
fsnotify_open(file);
@@ -61111,7 +61283,7 @@ index ea4449d..cbad96a 100644
err = deny_write_access(file);
if (err)
goto exit;
-@@ -802,7 +880,7 @@ int kernel_read(struct file *file, loff_t offset,
+@@ -800,7 +878,7 @@ int kernel_read(struct file *file, loff_t offset,
old_fs = get_fs();
set_fs(get_ds());
/* The cast to a user pointer is valid due to the set_fs() */
@@ -61120,7 +61292,7 @@ index ea4449d..cbad96a 100644
set_fs(old_fs);
return result;
}
-@@ -847,6 +925,7 @@ static int exec_mmap(struct mm_struct *mm)
+@@ -845,6 +923,7 @@ static int exec_mmap(struct mm_struct *mm)
tsk->mm = mm;
tsk->active_mm = mm;
activate_mm(active_mm, mm);
@@ -61128,7 +61300,7 @@ index ea4449d..cbad96a 100644
tsk->mm->vmacache_seqnum = 0;
vmacache_flush(tsk);
task_unlock(tsk);
-@@ -1261,7 +1340,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
+@@ -1243,7 +1322,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
}
rcu_read_unlock();
@@ -61137,7 +61309,7 @@ index ea4449d..cbad96a 100644
bprm->unsafe |= LSM_UNSAFE_SHARE;
else
p->fs->in_exec = 1;
-@@ -1437,6 +1516,31 @@ static int exec_binprm(struct linux_binprm *bprm)
+@@ -1424,6 +1503,31 @@ static int exec_binprm(struct linux_binprm *bprm)
return ret;
}
@@ -61169,7 +61341,7 @@ index ea4449d..cbad96a 100644
/*
* sys_execve() executes a new program.
*/
-@@ -1444,6 +1548,11 @@ static int do_execve_common(struct filename *filename,
+@@ -1431,6 +1535,11 @@ static int do_execve_common(struct filename *filename,
struct user_arg_ptr argv,
struct user_arg_ptr envp)
{
@@ -61181,7 +61353,7 @@ index ea4449d..cbad96a 100644
struct linux_binprm *bprm;
struct file *file;
struct files_struct *displaced;
-@@ -1452,6 +1561,8 @@ static int do_execve_common(struct filename *filename,
+@@ -1439,6 +1548,8 @@ static int do_execve_common(struct filename *filename,
if (IS_ERR(filename))
return PTR_ERR(filename);
@@ -61190,7 +61362,7 @@ index ea4449d..cbad96a 100644
/*
* We move the actual failure in case of RLIMIT_NPROC excess from
* set*uid() to execve() because too many poorly written programs
-@@ -1489,11 +1600,21 @@ static int do_execve_common(struct filename *filename,
+@@ -1476,11 +1587,21 @@ static int do_execve_common(struct filename *filename,
if (IS_ERR(file))
goto out_unmark;
@@ -61212,7 +61384,7 @@ index ea4449d..cbad96a 100644
retval = bprm_mm_init(bprm);
if (retval)
goto out_unmark;
-@@ -1510,24 +1631,70 @@ static int do_execve_common(struct filename *filename,
+@@ -1497,24 +1618,70 @@ static int do_execve_common(struct filename *filename,
if (retval < 0)
goto out;
@@ -61287,7 +61459,7 @@ index ea4449d..cbad96a 100644
current->fs->in_exec = 0;
current->in_execve = 0;
acct_update_integrals(current);
-@@ -1538,6 +1705,14 @@ static int do_execve_common(struct filename *filename,
+@@ -1525,6 +1692,14 @@ static int do_execve_common(struct filename *filename,
put_files_struct(displaced);
return retval;
@@ -61302,7 +61474,7 @@ index ea4449d..cbad96a 100644
out:
if (bprm->mm) {
acct_arg_size(bprm, 0);
-@@ -1629,3 +1804,312 @@ asmlinkage long compat_sys_execve(const char __user * filename,
+@@ -1616,3 +1791,312 @@ COMPAT_SYSCALL_DEFINE3(execve, const char __user *, filename,
return compat_do_execve(getname(filename), argv, envp);
}
#endif
@@ -61633,7 +61805,7 @@ index 9f9992b..8b59411 100644
}
return 1;
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
-index 20d6697..f77da76 100644
+index 170dc41..62f6b18 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -264,10 +264,8 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
@@ -61685,7 +61857,7 @@ index 9142614..97484fa 100644
cleanup:
brelse(bh);
diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
-index 22548f5..41521d8 100644
+index 158b5d4..2432610 100644
--- a/fs/ext3/balloc.c
+++ b/fs/ext3/balloc.c
@@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
@@ -61702,7 +61874,7 @@ index 22548f5..41521d8 100644
}
return 1;
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
-index 0498390..df00300 100644
+index eb742d0..c19f705 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -649,10 +649,8 @@ static int ext3_show_options(struct seq_file *seq, struct dentry *root)
@@ -61754,10 +61926,10 @@ index c6874be..f8a6ae8 100644
static int
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
-index 6ea7b14..8fa16d9 100644
+index 83a6f49..d4e4d03 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
-@@ -534,8 +534,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
+@@ -557,8 +557,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
/* Hm, nope. Are (enough) root reserved clusters available? */
if (uid_eq(sbi->s_resuid, current_fsuid()) ||
(!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
@@ -61769,10 +61941,10 @@ index 6ea7b14..8fa16d9 100644
if (free_clusters >= (nclusters + dirty_clusters +
resv_clusters))
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
-index 2a6830a..d25d59c 100644
+index c55a1fa..9904ebb 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
-@@ -1269,19 +1269,19 @@ struct ext4_sb_info {
+@@ -1279,19 +1279,19 @@ struct ext4_sb_info {
unsigned long s_mb_last_start;
/* stats for buddy allocator */
@@ -61802,26 +61974,11 @@ index 2a6830a..d25d59c 100644
atomic_t s_lock_busy;
/* locality groups */
-diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c
-index e6574d7..c30cbe2 100644
---- a/fs/ext4/indirect.c
-+++ b/fs/ext4/indirect.c
-@@ -1345,8 +1345,8 @@ static int free_hole_blocks(handle_t *handle, struct inode *inode,
- if (level == 0 ||
- (bh && all_zeroes((__le32 *)bh->b_data,
- (__le32 *)bh->b_data + addr_per_block))) {
-- ext4_free_data(handle, inode, parent_bh, &blk, &blk+1);
-- *i_data = 0;
-+ ext4_free_data(handle, inode, parent_bh,
-+ i_data, i_data + 1);
- }
- brelse(bh);
- bh = NULL;
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
-index 7620133..212880d 100644
+index dbfe15c..9a6ee8d 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
-@@ -1884,7 +1884,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
+@@ -1901,7 +1901,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
if (EXT4_SB(sb)->s_mb_stats)
@@ -61830,7 +61987,7 @@ index 7620133..212880d 100644
break;
}
-@@ -2193,7 +2193,7 @@ repeat:
+@@ -2211,7 +2211,7 @@ repeat:
ac->ac_status = AC_STATUS_CONTINUE;
ac->ac_flags |= EXT4_MB_HINT_FIRST;
cr = 3;
@@ -61839,7 +61996,7 @@ index 7620133..212880d 100644
goto repeat;
}
}
-@@ -2701,25 +2701,25 @@ int ext4_mb_release(struct super_block *sb)
+@@ -2717,25 +2717,25 @@ int ext4_mb_release(struct super_block *sb)
if (sbi->s_mb_stats) {
ext4_msg(sb, KERN_INFO,
"mballoc: %u blocks %u reqs (%u success)",
@@ -61875,7 +62032,7 @@ index 7620133..212880d 100644
}
free_percpu(sbi->s_locality_groups);
-@@ -3173,16 +3173,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
+@@ -3191,16 +3191,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
@@ -61898,7 +62055,7 @@ index 7620133..212880d 100644
}
if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
-@@ -3609,7 +3609,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
+@@ -3627,7 +3627,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
trace_ext4_mb_new_inode_pa(ac, pa);
ext4_mb_use_inode_pa(ac, pa);
@@ -61907,7 +62064,7 @@ index 7620133..212880d 100644
ei = EXT4_I(ac->ac_inode);
grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
-@@ -3669,7 +3669,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
+@@ -3687,7 +3687,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
trace_ext4_mb_new_group_pa(ac, pa);
ext4_mb_use_group_pa(ac, pa);
@@ -61916,7 +62073,7 @@ index 7620133..212880d 100644
grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
lg = ac->ac_lg;
-@@ -3758,7 +3758,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
+@@ -3776,7 +3776,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
* from the bitmap and continue.
*/
}
@@ -61925,7 +62082,7 @@ index 7620133..212880d 100644
return err;
}
-@@ -3776,7 +3776,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
+@@ -3794,7 +3794,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
@@ -61935,7 +62092,7 @@ index 7620133..212880d 100644
return 0;
diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
-index 1268a1b..adf949f 100644
+index 8313ca3..8a37d08 100644
--- a/fs/ext4/mmp.c
+++ b/fs/ext4/mmp.c
@@ -111,7 +111,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
@@ -61948,10 +62105,10 @@ index 1268a1b..adf949f 100644
"MMP failure info: last update time: %llu, last update "
"node: %s, last update device: %s\n",
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index 9fb3e6c..9a82508 100644
+index 2c9e686..6a40edc 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
-@@ -1268,7 +1268,7 @@ static ext4_fsblk_t get_sb_block(void **data)
+@@ -1254,7 +1254,7 @@ static ext4_fsblk_t get_sb_block(void **data)
}
#define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
@@ -61960,7 +62117,7 @@ index 9fb3e6c..9a82508 100644
"Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
#ifdef CONFIG_QUOTA
-@@ -2442,7 +2442,7 @@ struct ext4_attr {
+@@ -2434,7 +2434,7 @@ struct ext4_attr {
int offset;
int deprecated_val;
} u;
@@ -61970,10 +62127,10 @@ index 9fb3e6c..9a82508 100644
static int parse_strtoull(const char *buf,
unsigned long long max, unsigned long long *value)
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
-index 8825154..af51586 100644
+index 1e09fc7..0400dd4 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
-@@ -394,7 +394,7 @@ static int
+@@ -399,7 +399,7 @@ static int
ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
char *buffer, size_t buffer_size)
{
@@ -61982,7 +62139,7 @@ index 8825154..af51586 100644
for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
const struct xattr_handler *handler =
-@@ -411,9 +411,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
+@@ -416,9 +416,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
buffer += size;
}
rest -= size;
@@ -61994,88 +62151,21 @@ index 8825154..af51586 100644
}
static int
-diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c
-index 6df8d3d..b8b92c2 100644
---- a/fs/fat/namei_vfat.c
-+++ b/fs/fat/namei_vfat.c
-@@ -736,7 +736,12 @@ static struct dentry *vfat_lookup(struct inode *dir, struct dentry *dentry,
- }
-
- alias = d_find_alias(inode);
-- if (alias && !vfat_d_anon_disconn(alias)) {
-+ /*
-+ * Checking "alias->d_parent == dentry->d_parent" to make sure
-+ * FS is not corrupted (especially double linked dir).
-+ */
-+ if (alias && alias->d_parent == dentry->d_parent &&
-+ !vfat_d_anon_disconn(alias)) {
- /*
- * This inode has non anonymous-DCACHE_DISCONNECTED
- * dentry. This means, the user did ->lookup() by an
-@@ -755,12 +760,9 @@ static struct dentry *vfat_lookup(struct inode *dir, struct dentry *dentry,
-
- out:
- mutex_unlock(&MSDOS_SB(sb)->s_lock);
-- dentry->d_time = dentry->d_parent->d_inode->i_version;
-- dentry = d_splice_alias(inode, dentry);
-- if (dentry)
-- dentry->d_time = dentry->d_parent->d_inode->i_version;
-- return dentry;
--
-+ if (!inode)
-+ dentry->d_time = dir->i_version;
-+ return d_splice_alias(inode, dentry);
- error:
- mutex_unlock(&MSDOS_SB(sb)->s_lock);
- return ERR_PTR(err);
-@@ -793,7 +795,6 @@ static int vfat_create(struct inode *dir, struct dentry *dentry, umode_t mode,
- inode->i_mtime = inode->i_atime = inode->i_ctime = ts;
- /* timestamp is already written, so mark_inode_dirty() is unneeded. */
-
-- dentry->d_time = dentry->d_parent->d_inode->i_version;
- d_instantiate(dentry, inode);
- out:
- mutex_unlock(&MSDOS_SB(sb)->s_lock);
-@@ -824,6 +825,7 @@ static int vfat_rmdir(struct inode *dir, struct dentry *dentry)
- clear_nlink(inode);
- inode->i_mtime = inode->i_atime = CURRENT_TIME_SEC;
- fat_detach(inode);
-+ dentry->d_time = dir->i_version;
- out:
- mutex_unlock(&MSDOS_SB(sb)->s_lock);
-
-@@ -849,6 +851,7 @@ static int vfat_unlink(struct inode *dir, struct dentry *dentry)
- clear_nlink(inode);
- inode->i_mtime = inode->i_atime = CURRENT_TIME_SEC;
- fat_detach(inode);
-+ dentry->d_time = dir->i_version;
- out:
- mutex_unlock(&MSDOS_SB(sb)->s_lock);
-
-@@ -889,7 +892,6 @@ static int vfat_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
- inode->i_mtime = inode->i_atime = inode->i_ctime = ts;
- /* timestamp is already written, so mark_inode_dirty() is unneeded. */
-
-- dentry->d_time = dentry->d_parent->d_inode->i_version;
- d_instantiate(dentry, inode);
-
- mutex_unlock(&MSDOS_SB(sb)->s_lock);
diff --git a/fs/fcntl.c b/fs/fcntl.c
-index ef68665..5deacdc 100644
+index 99d440a..eb979d1 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
-@@ -106,6 +106,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
- if (err)
- return err;
-
+@@ -102,6 +102,10 @@ void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
+ int force)
+ {
+ security_file_set_fowner(filp);
+ if (gr_handle_chroot_fowner(pid, type))
-+ return -ENOENT;
++ return;
+ if (gr_check_protected_task_fowner(pid, type))
-+ return -EACCES;
-+
++ return;
f_modown(filp, pid, type, force);
- return 0;
}
+ EXPORT_SYMBOL(__f_setown);
diff --git a/fs/fhandle.c b/fs/fhandle.c
index 999ff5c..2281df9 100644
--- a/fs/fhandle.c
@@ -62120,7 +62210,7 @@ index 999ff5c..2281df9 100644
retval = -EFAULT;
goto out_handle;
diff --git a/fs/file.c b/fs/file.c
-index eb56a13..ccee850 100644
+index ab3eb6a..8de2392 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -16,6 +16,7 @@
@@ -62131,7 +62221,7 @@ index eb56a13..ccee850 100644
#include <linux/fdtable.h>
#include <linux/bitops.h>
#include <linux/interrupt.h>
-@@ -141,7 +142,7 @@ out:
+@@ -139,7 +140,7 @@ out:
* Return <0 error code on error; 1 on successful completion.
* The files->file_lock should be held on entry, and will be held on exit.
*/
@@ -62140,7 +62230,7 @@ index eb56a13..ccee850 100644
__releases(files->file_lock)
__acquires(files->file_lock)
{
-@@ -186,7 +187,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
+@@ -184,7 +185,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
* expanded and execution may have blocked.
* The files->file_lock should be held on entry, and will be held on exit.
*/
@@ -62149,7 +62239,7 @@ index eb56a13..ccee850 100644
{
struct fdtable *fdt;
-@@ -807,6 +808,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
+@@ -800,6 +801,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
if (!file)
return __close_fd(files, fd);
@@ -62157,7 +62247,7 @@ index eb56a13..ccee850 100644
if (fd >= rlimit(RLIMIT_NOFILE))
return -EBADF;
-@@ -833,6 +835,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
+@@ -826,6 +828,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
if (unlikely(oldfd == newfd))
return -EINVAL;
@@ -62165,7 +62255,7 @@ index eb56a13..ccee850 100644
if (newfd >= rlimit(RLIMIT_NOFILE))
return -EBADF;
-@@ -888,6 +891,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
+@@ -881,6 +884,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
int f_dupfd(unsigned int from, struct file *file, unsigned flags)
{
int err;
@@ -62174,10 +62264,10 @@ index eb56a13..ccee850 100644
return -EINVAL;
err = alloc_fd(from, flags);
diff --git a/fs/filesystems.c b/fs/filesystems.c
-index 92567d9..fcd8cbf 100644
+index 5797d45..7d7d79a 100644
--- a/fs/filesystems.c
+++ b/fs/filesystems.c
-@@ -273,7 +273,11 @@ struct file_system_type *get_fs_type(const char *name)
+@@ -275,7 +275,11 @@ struct file_system_type *get_fs_type(const char *name)
int len = dot ? dot - name : strlen(name);
fs = __get_fs_type(name, len);
@@ -62190,7 +62280,7 @@ index 92567d9..fcd8cbf 100644
if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
diff --git a/fs/fs_struct.c b/fs/fs_struct.c
-index 7dca743..543d620 100644
+index 7dca743..f5e007d 100644
--- a/fs/fs_struct.c
+++ b/fs/fs_struct.c
@@ -4,6 +4,7 @@
@@ -62201,15 +62291,27 @@ index 7dca743..543d620 100644
#include "internal.h"
/*
-@@ -19,6 +20,7 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
+@@ -15,14 +16,18 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
+ struct path old_root;
+
+ path_get(path);
++ gr_inc_chroot_refcnts(path->dentry, path->mnt);
+ spin_lock(&fs->lock);
write_seqcount_begin(&fs->seq);
old_root = fs->root;
fs->root = *path;
+ gr_set_chroot_entries(current, path);
write_seqcount_end(&fs->seq);
spin_unlock(&fs->lock);
- if (old_root.dentry)
-@@ -67,6 +69,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
+- if (old_root.dentry)
++ if (old_root.dentry) {
++ gr_inc_chroot_refcnts(old_root.dentry, old_root.mnt);
+ path_put(&old_root);
++ }
+ }
+
+ /*
+@@ -67,6 +72,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
int hits = 0;
spin_lock(&fs->lock);
write_seqcount_begin(&fs->seq);
@@ -62220,7 +62322,15 @@ index 7dca743..543d620 100644
hits += replace_path(&fs->root, old_root, new_root);
hits += replace_path(&fs->pwd, old_root, new_root);
write_seqcount_end(&fs->seq);
-@@ -99,7 +105,8 @@ void exit_fs(struct task_struct *tsk)
+@@ -85,6 +94,7 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
+
+ void free_fs_struct(struct fs_struct *fs)
+ {
++ gr_dec_chroot_refcnts(fs->root.dentry, fs->root.mnt);
+ path_put(&fs->root);
+ path_put(&fs->pwd);
+ kmem_cache_free(fs_cachep, fs);
+@@ -99,7 +109,8 @@ void exit_fs(struct task_struct *tsk)
task_lock(tsk);
spin_lock(&fs->lock);
tsk->fs = NULL;
@@ -62230,7 +62340,7 @@ index 7dca743..543d620 100644
spin_unlock(&fs->lock);
task_unlock(tsk);
if (kill)
-@@ -112,7 +119,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
+@@ -112,7 +123,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
/* We don't need to lock fs - think why ;-) */
if (fs) {
@@ -62239,7 +62349,7 @@ index 7dca743..543d620 100644
fs->in_exec = 0;
spin_lock_init(&fs->lock);
seqcount_init(&fs->seq);
-@@ -121,6 +128,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
+@@ -121,6 +132,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
spin_lock(&old->lock);
fs->root = old->root;
path_get(&fs->root);
@@ -62249,7 +62359,7 @@ index 7dca743..543d620 100644
fs->pwd = old->pwd;
path_get(&fs->pwd);
spin_unlock(&old->lock);
-@@ -139,8 +149,9 @@ int unshare_fs_struct(void)
+@@ -139,8 +153,9 @@ int unshare_fs_struct(void)
task_lock(current);
spin_lock(&fs->lock);
@@ -62260,7 +62370,7 @@ index 7dca743..543d620 100644
spin_unlock(&fs->lock);
task_unlock(current);
-@@ -153,13 +164,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
+@@ -153,13 +168,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
int current_umask(void)
{
@@ -62277,7 +62387,7 @@ index 7dca743..543d620 100644
.seq = SEQCNT_ZERO(init_fs.seq),
.umask = 0022,
diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
-index 29d7feb..303644d 100644
+index 89acec7..a575262 100644
--- a/fs/fscache/cookie.c
+++ b/fs/fscache/cookie.c
@@ -19,7 +19,7 @@
@@ -62383,7 +62493,7 @@ index 29d7feb..303644d 100644
/* Only permit invalidation of data files. Invalidating an index will
* require the caller to release all its attachments to the tree rooted
-@@ -477,10 +477,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
+@@ -476,10 +476,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
{
struct fscache_object *object;
@@ -62396,7 +62506,7 @@ index 29d7feb..303644d 100644
_leave(" [no cookie]");
return;
}
-@@ -581,12 +581,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
+@@ -580,12 +580,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
*/
void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
{
@@ -62412,7 +62522,7 @@ index 29d7feb..303644d 100644
_leave(" [no cookie]");
return;
}
-@@ -687,7 +687,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
+@@ -686,7 +686,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
goto inconsistent;
@@ -62422,10 +62532,10 @@ index 29d7feb..303644d 100644
__fscache_use_cookie(cookie);
if (fscache_submit_op(object, op) < 0)
diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
-index 4226f66..0fb3f45 100644
+index 7872a62..d91b19f 100644
--- a/fs/fscache/internal.h
+++ b/fs/fscache/internal.h
-@@ -133,8 +133,8 @@ extern void fscache_operation_gc(struct work_struct *);
+@@ -137,8 +137,8 @@ extern void fscache_operation_gc(struct work_struct *);
extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
extern int fscache_wait_for_operation_activation(struct fscache_object *,
struct fscache_operation *,
@@ -62436,7 +62546,7 @@ index 4226f66..0fb3f45 100644
void (*)(struct fscache_operation *));
extern void fscache_invalidate_writes(struct fscache_cookie *);
-@@ -153,101 +153,101 @@ extern void fscache_proc_cleanup(void);
+@@ -157,101 +157,101 @@ extern void fscache_proc_cleanup(void);
* stats.c
*/
#ifdef CONFIG_FSCACHE_STATS
@@ -62619,7 +62729,7 @@ index 4226f66..0fb3f45 100644
extern atomic_t fscache_n_cop_alloc_object;
extern atomic_t fscache_n_cop_lookup_object;
-@@ -272,6 +272,11 @@ static inline void fscache_stat(atomic_t *stat)
+@@ -276,6 +276,11 @@ static inline void fscache_stat(atomic_t *stat)
atomic_inc(stat);
}
@@ -62631,7 +62741,7 @@ index 4226f66..0fb3f45 100644
static inline void fscache_stat_d(atomic_t *stat)
{
atomic_dec(stat);
-@@ -284,6 +289,7 @@ extern const struct file_operations fscache_stats_fops;
+@@ -288,6 +293,7 @@ extern const struct file_operations fscache_stats_fops;
#define __fscache_stat(stat) (NULL)
#define fscache_stat(stat) do {} while (0)
@@ -62640,7 +62750,7 @@ index 4226f66..0fb3f45 100644
#endif
diff --git a/fs/fscache/object.c b/fs/fscache/object.c
-index d3b4539..ed0c659 100644
+index da032da..0076ce7 100644
--- a/fs/fscache/object.c
+++ b/fs/fscache/object.c
@@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
@@ -62736,7 +62846,7 @@ index d3b4539..ed0c659 100644
break;
default:
-@@ -992,7 +992,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
+@@ -993,7 +993,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
{
const struct fscache_state *s;
@@ -62745,7 +62855,7 @@ index d3b4539..ed0c659 100644
fscache_stat(&fscache_n_cop_invalidate_object);
s = _fscache_invalidate_object(object, event);
fscache_stat_d(&fscache_n_cop_invalidate_object);
-@@ -1007,7 +1007,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
+@@ -1008,7 +1008,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
{
_enter("{OBJ%x},%d", object->debug_id, event);
@@ -62755,7 +62865,7 @@ index d3b4539..ed0c659 100644
object->cache->ops->update_object(object);
fscache_stat_d(&fscache_n_cop_update_object);
diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
-index 318071a..379938b 100644
+index e7b87a0..a85d47a 100644
--- a/fs/fscache/operation.c
+++ b/fs/fscache/operation.c
@@ -17,7 +17,7 @@
@@ -62776,7 +62886,7 @@ index 318071a..379938b 100644
switch (op->flags & FSCACHE_OP_TYPE) {
case FSCACHE_OP_ASYNC:
_debug("queue async");
-@@ -73,7 +73,7 @@ static void fscache_run_op(struct fscache_object *object,
+@@ -72,7 +72,7 @@ static void fscache_run_op(struct fscache_object *object,
wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
if (op->processor)
fscache_enqueue_operation(op);
@@ -62785,7 +62895,7 @@ index 318071a..379938b 100644
}
/*
-@@ -105,11 +105,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
+@@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
if (object->n_in_progress > 0) {
atomic_inc(&op->usage);
list_add_tail(&op->pend_link, &object->pending_ops);
@@ -62799,7 +62909,7 @@ index 318071a..379938b 100644
fscache_start_operations(object);
} else {
ASSERTCMP(object->n_in_progress, ==, 0);
-@@ -125,7 +125,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
+@@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
object->n_exclusive++; /* reads and writes must wait */
atomic_inc(&op->usage);
list_add_tail(&op->pend_link, &object->pending_ops);
@@ -62808,7 +62918,7 @@ index 318071a..379938b 100644
ret = 0;
} else {
/* If we're in any other state, there must have been an I/O
-@@ -212,11 +212,11 @@ int fscache_submit_op(struct fscache_object *object,
+@@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_object *object,
if (object->n_exclusive > 0) {
atomic_inc(&op->usage);
list_add_tail(&op->pend_link, &object->pending_ops);
@@ -62822,7 +62932,7 @@ index 318071a..379938b 100644
fscache_start_operations(object);
} else {
ASSERTCMP(object->n_exclusive, ==, 0);
-@@ -228,10 +228,10 @@ int fscache_submit_op(struct fscache_object *object,
+@@ -227,10 +227,10 @@ int fscache_submit_op(struct fscache_object *object,
object->n_ops++;
atomic_inc(&op->usage);
list_add_tail(&op->pend_link, &object->pending_ops);
@@ -62835,7 +62945,7 @@ index 318071a..379938b 100644
op->state = FSCACHE_OP_ST_CANCELLED;
ret = -ENOBUFS;
} else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
-@@ -310,7 +310,7 @@ int fscache_cancel_op(struct fscache_operation *op,
+@@ -309,7 +309,7 @@ int fscache_cancel_op(struct fscache_operation *op,
ret = -EBUSY;
if (op->state == FSCACHE_OP_ST_PENDING) {
ASSERT(!list_empty(&op->pend_link));
@@ -62844,7 +62954,7 @@ index 318071a..379938b 100644
list_del_init(&op->pend_link);
if (do_cancel)
do_cancel(op);
-@@ -342,7 +342,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
+@@ -341,7 +341,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
while (!list_empty(&object->pending_ops)) {
op = list_entry(object->pending_ops.next,
struct fscache_operation, pend_link);
@@ -62853,7 +62963,7 @@ index 318071a..379938b 100644
list_del_init(&op->pend_link);
ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
-@@ -414,7 +414,7 @@ void fscache_put_operation(struct fscache_operation *op)
+@@ -413,7 +413,7 @@ void fscache_put_operation(struct fscache_operation *op)
op->state, ==, FSCACHE_OP_ST_CANCELLED);
op->state = FSCACHE_OP_ST_DEAD;
@@ -62862,7 +62972,7 @@ index 318071a..379938b 100644
if (op->release) {
op->release(op);
-@@ -433,7 +433,7 @@ void fscache_put_operation(struct fscache_operation *op)
+@@ -432,7 +432,7 @@ void fscache_put_operation(struct fscache_operation *op)
* lock, and defer it otherwise */
if (!spin_trylock(&object->lock)) {
_debug("defer put");
@@ -62871,7 +62981,7 @@ index 318071a..379938b 100644
cache = object->cache;
spin_lock(&cache->op_gc_list_lock);
-@@ -486,7 +486,7 @@ void fscache_operation_gc(struct work_struct *work)
+@@ -485,7 +485,7 @@ void fscache_operation_gc(struct work_struct *work)
_debug("GC DEFERRED REL OBJ%x OP%x",
object->debug_id, op->debug_id);
@@ -62881,10 +62991,10 @@ index 318071a..379938b 100644
ASSERTCMP(atomic_read(&op->usage), ==, 0);
ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
diff --git a/fs/fscache/page.c b/fs/fscache/page.c
-index 7f5c658..6c1e164 100644
+index de33b3f..8be4d29 100644
--- a/fs/fscache/page.c
+++ b/fs/fscache/page.c
-@@ -61,7 +61,7 @@ try_again:
+@@ -74,7 +74,7 @@ try_again:
val = radix_tree_lookup(&cookie->stores, page->index);
if (!val) {
rcu_read_unlock();
@@ -62893,7 +63003,7 @@ index 7f5c658..6c1e164 100644
__fscache_uncache_page(cookie, page);
return true;
}
-@@ -91,11 +91,11 @@ try_again:
+@@ -104,11 +104,11 @@ try_again:
spin_unlock(&cookie->stores_lock);
if (xpage) {
@@ -62908,7 +63018,7 @@ index 7f5c658..6c1e164 100644
}
wake_up_bit(&cookie->flags, 0);
-@@ -110,11 +110,11 @@ page_busy:
+@@ -123,11 +123,11 @@ page_busy:
* sleeping on memory allocation, so we may need to impose a timeout
* too. */
if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
@@ -62919,10 +63029,10 @@ index 7f5c658..6c1e164 100644
- fscache_stat(&fscache_n_store_vmscan_wait);
+ fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
- __fscache_wait_on_page_write(cookie, page);
- gfp &= ~__GFP_WAIT;
- goto try_again;
-@@ -140,7 +140,7 @@ static void fscache_end_page_write(struct fscache_object *object,
+ if (!release_page_wait_timeout(cookie, page))
+ _debug("fscache writeout timeout page: %p{%lx}",
+ page, page->index);
+@@ -156,7 +156,7 @@ static void fscache_end_page_write(struct fscache_object *object,
FSCACHE_COOKIE_STORING_TAG);
if (!radix_tree_tag_get(&cookie->stores, page->index,
FSCACHE_COOKIE_PENDING_TAG)) {
@@ -62931,7 +63041,7 @@ index 7f5c658..6c1e164 100644
xpage = radix_tree_delete(&cookie->stores, page->index);
}
spin_unlock(&cookie->stores_lock);
-@@ -161,7 +161,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
+@@ -177,7 +177,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
_enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
@@ -62940,7 +63050,7 @@ index 7f5c658..6c1e164 100644
if (fscache_object_is_active(object)) {
fscache_stat(&fscache_n_cop_attr_changed);
-@@ -188,11 +188,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
+@@ -204,11 +204,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
@@ -62954,16 +63064,16 @@ index 7f5c658..6c1e164 100644
_leave(" = -ENOMEM");
return -ENOMEM;
}
-@@ -214,7 +214,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
+@@ -230,7 +230,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
if (fscache_submit_exclusive_op(object, op) < 0)
- goto nobufs;
+ goto nobufs_dec;
spin_unlock(&cookie->lock);
- fscache_stat(&fscache_n_attr_changed_ok);
+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
fscache_put_operation(op);
_leave(" = 0");
return 0;
-@@ -225,7 +225,7 @@ nobufs:
+@@ -242,7 +242,7 @@ nobufs:
kfree(op);
if (wake_cookie)
__fscache_wake_unused_cookie(cookie);
@@ -62972,7 +63082,7 @@ index 7f5c658..6c1e164 100644
_leave(" = %d", -ENOBUFS);
return -ENOBUFS;
}
-@@ -264,7 +264,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
+@@ -281,7 +281,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
/* allocate a retrieval operation and attempt to submit it */
op = kzalloc(sizeof(*op), GFP_NOIO);
if (!op) {
@@ -62981,7 +63091,7 @@ index 7f5c658..6c1e164 100644
return NULL;
}
-@@ -294,13 +294,13 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
+@@ -311,12 +311,12 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
return 0;
}
@@ -62990,14 +63100,13 @@ index 7f5c658..6c1e164 100644
jif = jiffies;
if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
- fscache_wait_bit_interruptible,
TASK_INTERRUPTIBLE) != 0) {
- fscache_stat(&fscache_n_retrievals_intr);
+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
_leave(" = -ERESTARTSYS");
return -ERESTARTSYS;
}
-@@ -329,8 +329,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
+@@ -345,8 +345,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
*/
int fscache_wait_for_operation_activation(struct fscache_object *object,
struct fscache_operation *op,
@@ -63008,16 +63117,16 @@ index 7f5c658..6c1e164 100644
void (*do_cancel)(struct fscache_operation *))
{
int ret;
-@@ -340,7 +340,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
+@@ -356,7 +356,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
_debug(">>> WT");
if (stat_op_waits)
- fscache_stat(stat_op_waits);
+ fscache_stat_unchecked(stat_op_waits);
if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
- fscache_wait_bit_interruptible,
TASK_INTERRUPTIBLE) != 0) {
-@@ -358,7 +358,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
+ ret = fscache_cancel_op(op, do_cancel);
+@@ -373,7 +373,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
check_if_dead:
if (op->state == FSCACHE_OP_ST_CANCELLED) {
if (stat_object_dead)
@@ -63026,7 +63135,7 @@ index 7f5c658..6c1e164 100644
_leave(" = -ENOBUFS [cancelled]");
return -ENOBUFS;
}
-@@ -366,7 +366,7 @@ check_if_dead:
+@@ -381,7 +381,7 @@ check_if_dead:
pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
fscache_cancel_op(op, do_cancel);
if (stat_object_dead)
@@ -63035,7 +63144,7 @@ index 7f5c658..6c1e164 100644
return -ENOBUFS;
}
return 0;
-@@ -394,7 +394,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
+@@ -409,7 +409,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
_enter("%p,%p,,,", cookie, page);
@@ -63044,7 +63153,7 @@ index 7f5c658..6c1e164 100644
if (hlist_empty(&cookie->backing_objects))
goto nobufs;
-@@ -436,7 +436,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
+@@ -451,7 +451,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
goto nobufs_unlock_dec;
spin_unlock(&cookie->lock);
@@ -63053,7 +63162,7 @@ index 7f5c658..6c1e164 100644
/* pin the netfs read context in case we need to do the actual netfs
* read because we've encountered a cache read failure */
-@@ -467,15 +467,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
+@@ -482,15 +482,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
error:
if (ret == -ENOMEM)
@@ -63074,7 +63183,7 @@ index 7f5c658..6c1e164 100644
fscache_put_retrieval(op);
_leave(" = %d", ret);
-@@ -490,7 +490,7 @@ nobufs_unlock:
+@@ -505,7 +505,7 @@ nobufs_unlock:
__fscache_wake_unused_cookie(cookie);
kfree(op);
nobufs:
@@ -63083,7 +63192,7 @@ index 7f5c658..6c1e164 100644
_leave(" = -ENOBUFS");
return -ENOBUFS;
}
-@@ -529,7 +529,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
+@@ -544,7 +544,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
_enter("%p,,%d,,,", cookie, *nr_pages);
@@ -63092,7 +63201,7 @@ index 7f5c658..6c1e164 100644
if (hlist_empty(&cookie->backing_objects))
goto nobufs;
-@@ -567,7 +567,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
+@@ -582,7 +582,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
goto nobufs_unlock_dec;
spin_unlock(&cookie->lock);
@@ -63101,7 +63210,7 @@ index 7f5c658..6c1e164 100644
/* pin the netfs read context in case we need to do the actual netfs
* read because we've encountered a cache read failure */
-@@ -598,15 +598,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
+@@ -613,15 +613,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
error:
if (ret == -ENOMEM)
@@ -63122,7 +63231,7 @@ index 7f5c658..6c1e164 100644
fscache_put_retrieval(op);
_leave(" = %d", ret);
-@@ -621,7 +621,7 @@ nobufs_unlock:
+@@ -636,7 +636,7 @@ nobufs_unlock:
if (wake_cookie)
__fscache_wake_unused_cookie(cookie);
nobufs:
@@ -63131,7 +63240,7 @@ index 7f5c658..6c1e164 100644
_leave(" = -ENOBUFS");
return -ENOBUFS;
}
-@@ -646,7 +646,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
+@@ -661,7 +661,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
_enter("%p,%p,,,", cookie, page);
@@ -63140,7 +63249,7 @@ index 7f5c658..6c1e164 100644
if (hlist_empty(&cookie->backing_objects))
goto nobufs;
-@@ -680,7 +680,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
+@@ -695,7 +695,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
goto nobufs_unlock_dec;
spin_unlock(&cookie->lock);
@@ -63149,7 +63258,7 @@ index 7f5c658..6c1e164 100644
ret = fscache_wait_for_operation_activation(
object, &op->op,
-@@ -697,11 +697,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
+@@ -712,11 +712,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
error:
if (ret == -ERESTARTSYS)
@@ -63164,7 +63273,7 @@ index 7f5c658..6c1e164 100644
fscache_put_retrieval(op);
_leave(" = %d", ret);
-@@ -715,7 +715,7 @@ nobufs_unlock:
+@@ -730,7 +730,7 @@ nobufs_unlock:
if (wake_cookie)
__fscache_wake_unused_cookie(cookie);
nobufs:
@@ -63173,7 +63282,7 @@ index 7f5c658..6c1e164 100644
_leave(" = -ENOBUFS");
return -ENOBUFS;
}
-@@ -791,7 +791,7 @@ static void fscache_write_op(struct fscache_operation *_op)
+@@ -806,7 +806,7 @@ static void fscache_write_op(struct fscache_operation *_op)
spin_lock(&cookie->stores_lock);
@@ -63182,7 +63291,7 @@ index 7f5c658..6c1e164 100644
/* find a page to store */
page = NULL;
-@@ -802,7 +802,7 @@ static void fscache_write_op(struct fscache_operation *_op)
+@@ -817,7 +817,7 @@ static void fscache_write_op(struct fscache_operation *_op)
page = results[0];
_debug("gang %d [%lx]", n, page->index);
if (page->index > op->store_limit) {
@@ -63191,7 +63300,7 @@ index 7f5c658..6c1e164 100644
goto superseded;
}
-@@ -814,7 +814,7 @@ static void fscache_write_op(struct fscache_operation *_op)
+@@ -829,7 +829,7 @@ static void fscache_write_op(struct fscache_operation *_op)
spin_unlock(&cookie->stores_lock);
spin_unlock(&object->lock);
@@ -63200,7 +63309,7 @@ index 7f5c658..6c1e164 100644
fscache_stat(&fscache_n_cop_write_page);
ret = object->cache->ops->write_page(op, page);
fscache_stat_d(&fscache_n_cop_write_page);
-@@ -918,7 +918,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
+@@ -933,7 +933,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
ASSERT(PageFsCache(page));
@@ -63209,7 +63318,7 @@ index 7f5c658..6c1e164 100644
if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
_leave(" = -ENOBUFS [invalidating]");
-@@ -977,7 +977,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
+@@ -992,7 +992,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
spin_unlock(&cookie->stores_lock);
spin_unlock(&object->lock);
@@ -63218,7 +63327,7 @@ index 7f5c658..6c1e164 100644
op->store_limit = object->store_limit;
__fscache_use_cookie(cookie);
-@@ -986,8 +986,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
+@@ -1001,8 +1001,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
spin_unlock(&cookie->lock);
radix_tree_preload_end();
@@ -63229,7 +63338,7 @@ index 7f5c658..6c1e164 100644
/* the work queue now carries its own ref on the object */
fscache_put_operation(&op->op);
-@@ -995,14 +995,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
+@@ -1010,14 +1010,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
return 0;
already_queued:
@@ -63246,7 +63355,7 @@ index 7f5c658..6c1e164 100644
_leave(" = 0");
return 0;
-@@ -1024,14 +1024,14 @@ nobufs:
+@@ -1039,14 +1039,14 @@ nobufs:
kfree(op);
if (wake_cookie)
__fscache_wake_unused_cookie(cookie);
@@ -63263,7 +63372,7 @@ index 7f5c658..6c1e164 100644
_leave(" = -ENOMEM");
return -ENOMEM;
}
-@@ -1049,7 +1049,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
+@@ -1064,7 +1064,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
ASSERTCMP(page, !=, NULL);
@@ -63272,7 +63381,7 @@ index 7f5c658..6c1e164 100644
/* cache withdrawal may beat us to it */
if (!PageFsCache(page))
-@@ -1100,7 +1100,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
+@@ -1115,7 +1115,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
struct fscache_cookie *cookie = op->op.object->cookie;
#ifdef CONFIG_FSCACHE_STATS
@@ -63664,10 +63773,10 @@ index 40d13c7..ddf52b9 100644
seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
atomic_read(&fscache_n_cop_alloc_object),
diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
-index b96a49b..9bfdc47 100644
+index 966ace8..030a03a 100644
--- a/fs/fuse/cuse.c
+++ b/fs/fuse/cuse.c
-@@ -606,10 +606,12 @@ static int __init cuse_init(void)
+@@ -611,10 +611,12 @@ static int __init cuse_init(void)
INIT_LIST_HEAD(&cuse_conntbl[i]);
/* inherit and extend fuse_dev_operations */
@@ -63685,10 +63794,10 @@ index b96a49b..9bfdc47 100644
cuse_class = class_create(THIS_MODULE, "cuse");
if (IS_ERR(cuse_class))
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
-index 6eb13c6..4389620 100644
+index ca88731..8e9c55d 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
-@@ -1323,7 +1323,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
+@@ -1318,7 +1318,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
ret = 0;
pipe_lock(pipe);
@@ -63697,7 +63806,7 @@ index 6eb13c6..4389620 100644
send_sig(SIGPIPE, current, 0);
if (!ret)
ret = -EPIPE;
-@@ -1352,7 +1352,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
+@@ -1347,7 +1347,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
page_nr++;
ret += buf->len;
@@ -63707,10 +63816,10 @@ index 6eb13c6..4389620 100644
}
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
-index 342f0239..d67794c 100644
+index dbab798..fefa22b 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
-@@ -1419,7 +1419,7 @@ static char *read_link(struct dentry *dentry)
+@@ -1474,7 +1474,7 @@ static char *read_link(struct dentry *dentry)
return link;
}
@@ -63720,10 +63829,10 @@ index 342f0239..d67794c 100644
if (!IS_ERR(link))
free_page((unsigned long) link);
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
-index fe649d3..c679164 100644
+index fd62cae..3494dfa 100644
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
-@@ -898,7 +898,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
+@@ -908,7 +908,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
{
@@ -63733,10 +63842,10 @@ index fe649d3..c679164 100644
__putname(s);
}
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
-index a4a8ed5..9e017c0 100644
+index 1e2872b..7aea000 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
-@@ -152,6 +152,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
+@@ -154,6 +154,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
struct mm_struct *mm = current->mm;
struct vm_area_struct *vma;
struct hstate *h = hstate_file(file);
@@ -63744,7 +63853,7 @@ index a4a8ed5..9e017c0 100644
struct vm_unmapped_area_info info;
if (len & ~huge_page_mask(h))
-@@ -165,17 +166,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
+@@ -167,17 +168,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
return addr;
}
@@ -63773,7 +63882,7 @@ index a4a8ed5..9e017c0 100644
info.high_limit = TASK_SIZE;
info.align_mask = PAGE_MASK & ~huge_page_mask(h);
info.align_offset = 0;
-@@ -908,7 +918,7 @@ static struct file_system_type hugetlbfs_fs_type = {
+@@ -919,7 +929,7 @@ static struct file_system_type hugetlbfs_fs_type = {
};
MODULE_ALIAS_FS("hugetlbfs");
@@ -63783,10 +63892,10 @@ index a4a8ed5..9e017c0 100644
static int can_do_hugetlb_shm(void)
{
diff --git a/fs/inode.c b/fs/inode.c
-index e846a32..bb06bd0 100644
+index 26753ba..d19eb34 100644
--- a/fs/inode.c
+++ b/fs/inode.c
-@@ -839,16 +839,20 @@ unsigned int get_next_ino(void)
+@@ -840,16 +840,20 @@ unsigned int get_next_ino(void)
unsigned int *p = &get_cpu_var(last_ino);
unsigned int res = *p;
@@ -63839,10 +63948,10 @@ index 09ed551..45684f8 100644
/*
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
-index e2b7483..855bca3 100644
+index 93e897e..a863de4 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
-@@ -884,7 +884,7 @@ static int __init init_jfs_fs(void)
+@@ -893,7 +893,7 @@ static int __init init_jfs_fs(void)
jfs_inode_cachep =
kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
@@ -63852,10 +63961,10 @@ index e2b7483..855bca3 100644
if (jfs_inode_cachep == NULL)
return -ENOMEM;
diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
-index 39c0143..79e8b68 100644
+index 1c77193..ba73e66 100644
--- a/fs/kernfs/dir.c
+++ b/fs/kernfs/dir.c
-@@ -28,7 +28,7 @@ DEFINE_MUTEX(kernfs_mutex);
+@@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
*
* Returns 31 bit hash of ns + name (so it fits in an off_t )
*/
@@ -63864,32 +63973,24 @@ index 39c0143..79e8b68 100644
{
unsigned long hash = init_name_hash();
unsigned int len = strlen(name);
-@@ -729,11 +729,19 @@ static int kernfs_iop_mkdir(struct inode *dir, struct dentry *dentry,
- {
- struct kernfs_node *parent = dir->i_private;
- struct kernfs_dir_ops *kdops = kernfs_root(parent)->dir_ops;
-+ int ret;
-
- if (!kdops || !kdops->mkdir)
- return -EPERM;
+@@ -829,6 +829,12 @@ static int kernfs_iop_mkdir(struct inode *dir, struct dentry *dentry,
+ ret = scops->mkdir(parent, dentry->d_name.name, mode);
-- return kdops->mkdir(parent, dentry->d_name.name, mode);
-+ ret = kdops->mkdir(parent, dentry->d_name.name, mode);
+ kernfs_put_active(parent);
+
+ if (!ret) {
+ struct dentry *dentry_ret = kernfs_iop_lookup(dir, dentry, 0);
+ ret = PTR_ERR_OR_ZERO(dentry_ret);
+ }
+
-+ return ret;
+ return ret;
}
- static int kernfs_iop_rmdir(struct inode *dir, struct dentry *dentry)
diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
-index d29640b..32d2b6b 100644
+index 4429d6d..9831f52 100644
--- a/fs/kernfs/file.c
+++ b/fs/kernfs/file.c
-@@ -33,7 +33,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
+@@ -34,7 +34,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
struct kernfs_open_node {
atomic_t refcnt;
@@ -63898,7 +63999,7 @@ index d29640b..32d2b6b 100644
wait_queue_head_t poll;
struct list_head files; /* goes through kernfs_open_file.list */
};
-@@ -149,7 +149,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
+@@ -163,7 +163,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
{
struct kernfs_open_file *of = sf->private;
@@ -63907,7 +64008,7 @@ index d29640b..32d2b6b 100644
return of->kn->attr.ops->seq_show(sf, v);
}
-@@ -353,12 +353,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
+@@ -375,12 +375,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
return ret;
}
@@ -63923,7 +64024,7 @@ index d29640b..32d2b6b 100644
if (!of->vm_ops)
return -EINVAL;
-@@ -559,7 +559,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
+@@ -581,7 +581,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
return -ENOMEM;
atomic_set(&new_on->refcnt, 0);
@@ -63932,7 +64033,7 @@ index d29640b..32d2b6b 100644
init_waitqueue_head(&new_on->poll);
INIT_LIST_HEAD(&new_on->files);
goto retry;
-@@ -756,7 +756,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
+@@ -787,7 +787,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
kernfs_put_active(kn);
@@ -63941,20 +64042,20 @@ index d29640b..32d2b6b 100644
goto trigger;
return DEFAULT_POLLMASK;
-@@ -781,7 +781,7 @@ void kernfs_notify(struct kernfs_node *kn)
- if (!WARN_ON(kernfs_type(kn) != KERNFS_FILE)) {
- on = kn->attr.open;
- if (on) {
-- atomic_inc(&on->event);
-+ atomic_inc_unchecked(&on->event);
- wake_up_interruptible(&on->poll);
- }
+@@ -818,7 +818,7 @@ repeat:
+
+ on = kn->attr.open;
+ if (on) {
+- atomic_inc(&on->event);
++ atomic_inc_unchecked(&on->event);
+ wake_up_interruptible(&on->poll);
}
+
diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
-index 4d45705..b35e0bd 100644
+index 8a19889..4c3069a 100644
--- a/fs/kernfs/symlink.c
+++ b/fs/kernfs/symlink.c
-@@ -132,7 +132,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
+@@ -128,7 +128,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
void *cookie)
{
@@ -63964,20 +64065,20 @@ index 4d45705..b35e0bd 100644
free_page((unsigned long)page);
}
diff --git a/fs/libfs.c b/fs/libfs.c
-index a184424..944ddce 100644
+index 005843c..06c4191 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
-@@ -159,6 +159,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
+@@ -160,6 +160,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
- struct dentry *next = list_entry(p, struct dentry, d_u.d_child);
+ struct dentry *next = list_entry(p, struct dentry, d_child);
+ char d_name[sizeof(next->d_iname)];
+ const unsigned char *name;
+
spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
if (!simple_positive(next)) {
spin_unlock(&next->d_lock);
-@@ -167,7 +170,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
+@@ -168,7 +171,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
spin_unlock(&next->d_lock);
spin_unlock(&dentry->d_lock);
@@ -63991,7 +64092,7 @@ index a184424..944ddce 100644
next->d_inode->i_ino, dt_type(next->d_inode)))
return 0;
spin_lock(&dentry->d_lock);
-@@ -999,7 +1007,7 @@ EXPORT_SYMBOL(noop_fsync);
+@@ -1027,7 +1035,7 @@ EXPORT_SYMBOL(noop_fsync);
void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
void *cookie)
{
@@ -64019,18 +64120,19 @@ index acd3947..1f896e2 100644
memcpy(c->data, &cookie, 4);
c->len=4;
diff --git a/fs/locks.c b/fs/locks.c
-index 2c61c4e..ee5c867 100644
+index 59e2f90..bd69071 100644
--- a/fs/locks.c
+++ b/fs/locks.c
-@@ -2218,16 +2218,16 @@ void locks_remove_flock(struct file *filp)
- return;
+@@ -2374,7 +2374,7 @@ void locks_remove_file(struct file *filp)
+ locks_remove_posix(filp, filp);
if (filp->f_op->flock) {
- struct file_lock fl = {
+ struct file_lock flock = {
+ .fl_owner = filp,
.fl_pid = current->tgid,
.fl_file = filp,
- .fl_flags = FL_FLOCK,
+@@ -2382,9 +2382,9 @@ void locks_remove_file(struct file *filp)
.fl_type = F_UNLCK,
.fl_end = OFFSET_MAX,
};
@@ -64044,21 +64146,21 @@ index 2c61c4e..ee5c867 100644
spin_lock(&inode->i_lock);
diff --git a/fs/mount.h b/fs/mount.h
-index b29e42f..5ea7fdf 100644
+index f82c628..9492b99 100644
--- a/fs/mount.h
+++ b/fs/mount.h
@@ -11,7 +11,7 @@ struct mnt_namespace {
u64 seq; /* Sequence number to prevent loops */
wait_queue_head_t poll;
- int event;
+ u64 event;
-};
+} __randomize_layout;
struct mnt_pcp {
int mnt_count;
-@@ -57,7 +57,7 @@ struct mount {
+@@ -62,7 +62,7 @@ struct mount {
int mnt_expiry_mark; /* true if marked for expiry */
- int mnt_pinned;
+ struct hlist_head mnt_pins;
struct path mnt_ex_mountpoint;
-};
+} __randomize_layout;
@@ -64066,10 +64168,10 @@ index b29e42f..5ea7fdf 100644
#define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
diff --git a/fs/namei.c b/fs/namei.c
-index 0dd72c8..34dd17d 100644
+index db5fe86..ac769e4 100644
--- a/fs/namei.c
+++ b/fs/namei.c
-@@ -331,17 +331,34 @@ int generic_permission(struct inode *inode, int mask)
+@@ -331,17 +331,32 @@ int generic_permission(struct inode *inode, int mask)
if (ret != -EACCES)
return ret;
@@ -64085,10 +64187,9 @@ index 0dd72c8..34dd17d 100644
- return 0;
if (!(mask & MAY_WRITE))
- if (capable_wrt_inode_uidgid(inode,
-+ if (capable_wrt_inode_uidgid_nolog(inode,
-+ CAP_DAC_OVERRIDE) ||
-+ capable_wrt_inode_uidgid(inode,
- CAP_DAC_READ_SEARCH))
+- CAP_DAC_READ_SEARCH))
++ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
++ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
return 0;
+ if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
+ return 0;
@@ -64107,7 +64208,7 @@ index 0dd72c8..34dd17d 100644
* Read/write DACs are always overridable.
* Executable DACs are overridable when there is
* at least one exec bit set.
-@@ -350,14 +367,6 @@ int generic_permission(struct inode *inode, int mask)
+@@ -350,14 +365,6 @@ int generic_permission(struct inode *inode, int mask)
if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
return 0;
@@ -64121,8 +64222,8 @@ index 0dd72c8..34dd17d 100644
-
return -EACCES;
}
-
-@@ -821,7 +830,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
+ EXPORT_SYMBOL(generic_permission);
+@@ -824,7 +831,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
{
struct dentry *dentry = link->dentry;
int error;
@@ -64131,7 +64232,7 @@ index 0dd72c8..34dd17d 100644
BUG_ON(nd->flags & LOOKUP_RCU);
-@@ -842,6 +851,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
+@@ -845,6 +852,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
if (error)
goto out_put_nd_path;
@@ -64144,45 +64245,7 @@ index 0dd72c8..34dd17d 100644
nd->last_type = LAST_BIND;
*p = dentry->d_inode->i_op->follow_link(dentry, nd);
error = PTR_ERR(*p);
-@@ -1131,6 +1146,7 @@ static bool __follow_mount_rcu(struct nameidata *nd, struct path *path,
-
- static int follow_dotdot_rcu(struct nameidata *nd)
- {
-+ struct inode *inode = nd->inode;
- if (!nd->root.mnt)
- set_root_rcu(nd);
-
-@@ -1144,6 +1160,7 @@ static int follow_dotdot_rcu(struct nameidata *nd)
- struct dentry *parent = old->d_parent;
- unsigned seq;
-
-+ inode = parent->d_inode;
- seq = read_seqcount_begin(&parent->d_seq);
- if (read_seqcount_retry(&old->d_seq, nd->seq))
- goto failed;
-@@ -1153,6 +1170,7 @@ static int follow_dotdot_rcu(struct nameidata *nd)
- }
- if (!follow_up_rcu(&nd->path))
- break;
-+ inode = nd->path.dentry->d_inode;
- nd->seq = read_seqcount_begin(&nd->path.dentry->d_seq);
- }
- while (d_mountpoint(nd->path.dentry)) {
-@@ -1162,11 +1180,12 @@ static int follow_dotdot_rcu(struct nameidata *nd)
- break;
- nd->path.mnt = &mounted->mnt;
- nd->path.dentry = mounted->mnt.mnt_root;
-+ inode = nd->path.dentry->d_inode;
- nd->seq = read_seqcount_begin(&nd->path.dentry->d_seq);
- if (!read_seqretry(&mount_lock, nd->m_seq))
- goto failed;
- }
-- nd->inode = nd->path.dentry->d_inode;
-+ nd->inode = inode;
- return 0;
-
- failed:
-@@ -1593,6 +1612,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
+@@ -1608,6 +1621,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
if (res)
break;
res = walk_component(nd, path, LOOKUP_FOLLOW);
@@ -64191,8 +64254,8 @@ index 0dd72c8..34dd17d 100644
put_link(nd, &link, cookie);
} while (res > 0);
-@@ -1665,7 +1686,7 @@ EXPORT_SYMBOL(full_name_hash);
- static inline unsigned long hash_name(const char *name, unsigned int *hashp)
+@@ -1680,7 +1695,7 @@ EXPORT_SYMBOL(full_name_hash);
+ static inline u64 hash_name(const char *name)
{
unsigned long a, b, adata, bdata, mask, hash, len;
- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
@@ -64200,23 +64263,7 @@ index 0dd72c8..34dd17d 100644
hash = a = 0;
len = -sizeof(unsigned long);
-@@ -1894,7 +1915,14 @@ static int path_init(int dfd, const char *name, unsigned int flags,
- }
-
- nd->inode = nd->path.dentry->d_inode;
-- return 0;
-+ if (!(flags & LOOKUP_RCU))
-+ return 0;
-+ if (likely(!read_seqcount_retry(&nd->path.dentry->d_seq, nd->seq)))
-+ return 0;
-+ if (!(nd->flags & LOOKUP_ROOT))
-+ nd->root.mnt = NULL;
-+ rcu_read_unlock();
-+ return -ECHILD;
- }
-
- static inline int lookup_last(struct nameidata *nd, struct path *path)
-@@ -1949,6 +1977,8 @@ static int path_lookupat(int dfd, const char *name,
+@@ -1969,6 +1984,8 @@ static int path_lookupat(int dfd, const char *name,
if (err)
break;
err = lookup_last(nd, &path);
@@ -64225,7 +64272,7 @@ index 0dd72c8..34dd17d 100644
put_link(nd, &link, cookie);
}
}
-@@ -1956,6 +1986,13 @@ static int path_lookupat(int dfd, const char *name,
+@@ -1976,6 +1993,13 @@ static int path_lookupat(int dfd, const char *name,
if (!err)
err = complete_walk(nd);
@@ -64239,7 +64286,7 @@ index 0dd72c8..34dd17d 100644
if (!err && nd->flags & LOOKUP_DIRECTORY) {
if (!d_can_lookup(nd->path.dentry)) {
path_put(&nd->path);
-@@ -1983,8 +2020,15 @@ static int filename_lookup(int dfd, struct filename *name,
+@@ -2004,8 +2028,15 @@ static int filename_lookup(int dfd, struct filename *name,
retval = path_lookupat(dfd, name->name,
flags | LOOKUP_REVAL, nd);
@@ -64256,7 +64303,7 @@ index 0dd72c8..34dd17d 100644
return retval;
}
-@@ -2559,6 +2603,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
+@@ -2582,6 +2613,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
if (flag & O_NOATIME && !inode_owner_or_capable(inode))
return -EPERM;
@@ -64270,7 +64317,7 @@ index 0dd72c8..34dd17d 100644
return 0;
}
-@@ -2790,7 +2841,7 @@ looked_up:
+@@ -2813,7 +2851,7 @@ looked_up:
* cleared otherwise prior to returning.
*/
static int lookup_open(struct nameidata *nd, struct path *path,
@@ -64279,7 +64326,7 @@ index 0dd72c8..34dd17d 100644
const struct open_flags *op,
bool got_write, int *opened)
{
-@@ -2825,6 +2876,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
+@@ -2848,6 +2886,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
/* Negative dentry, just create the file */
if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
umode_t mode = op->mode;
@@ -64297,7 +64344,7 @@ index 0dd72c8..34dd17d 100644
if (!IS_POSIXACL(dir->d_inode))
mode &= ~current_umask();
/*
-@@ -2846,6 +2908,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
+@@ -2869,6 +2918,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
nd->flags & LOOKUP_EXCL);
if (error)
goto out_dput;
@@ -64306,7 +64353,7 @@ index 0dd72c8..34dd17d 100644
}
out_no_open:
path->dentry = dentry;
-@@ -2860,7 +2924,7 @@ out_dput:
+@@ -2883,7 +2934,7 @@ out_dput:
/*
* Handle the last step of open()
*/
@@ -64315,7 +64362,7 @@ index 0dd72c8..34dd17d 100644
struct file *file, const struct open_flags *op,
int *opened, struct filename *name)
{
-@@ -2910,6 +2974,15 @@ static int do_last(struct nameidata *nd, struct path *path,
+@@ -2933,6 +2984,15 @@ static int do_last(struct nameidata *nd, struct path *path,
if (error)
return error;
@@ -64331,7 +64378,7 @@ index 0dd72c8..34dd17d 100644
audit_inode(name, dir, LOOKUP_PARENT);
error = -EISDIR;
/* trailing slashes? */
-@@ -2929,7 +3002,7 @@ retry_lookup:
+@@ -2952,7 +3012,7 @@ retry_lookup:
*/
}
mutex_lock(&dir->d_inode->i_mutex);
@@ -64340,7 +64387,7 @@ index 0dd72c8..34dd17d 100644
mutex_unlock(&dir->d_inode->i_mutex);
if (error <= 0) {
-@@ -2953,11 +3026,28 @@ retry_lookup:
+@@ -2976,11 +3036,28 @@ retry_lookup:
goto finish_open_created;
}
@@ -64370,7 +64417,7 @@ index 0dd72c8..34dd17d 100644
/*
* If atomic_open() acquired write access it is dropped now due to
-@@ -2998,6 +3088,11 @@ finish_lookup:
+@@ -3021,6 +3098,11 @@ finish_lookup:
}
}
BUG_ON(inode != path->dentry->d_inode);
@@ -64382,15 +64429,7 @@ index 0dd72c8..34dd17d 100644
return 1;
}
-@@ -3007,7 +3102,6 @@ finish_lookup:
- save_parent.dentry = nd->path.dentry;
- save_parent.mnt = mntget(path->mnt);
- nd->path.dentry = path->dentry;
--
- }
- nd->inode = inode;
- /* Why this, you ask? _Now_ we might have grown LOOKUP_JUMPED... */
-@@ -3017,7 +3111,18 @@ finish_open:
+@@ -3040,7 +3122,18 @@ finish_open:
path_put(&save_parent);
return error;
}
@@ -64409,7 +64448,7 @@ index 0dd72c8..34dd17d 100644
error = -EISDIR;
if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
goto out;
-@@ -3181,7 +3286,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
+@@ -3207,7 +3300,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
if (unlikely(error))
goto out;
@@ -64418,7 +64457,7 @@ index 0dd72c8..34dd17d 100644
while (unlikely(error > 0)) { /* trailing symlink */
struct path link = path;
void *cookie;
-@@ -3199,7 +3304,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
+@@ -3225,7 +3318,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
error = follow_link(&link, nd, &cookie);
if (unlikely(error))
break;
@@ -64427,7 +64466,7 @@ index 0dd72c8..34dd17d 100644
put_link(nd, &link, cookie);
}
out:
-@@ -3299,9 +3404,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname,
+@@ -3325,9 +3418,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname,
goto unlock;
error = -EEXIST;
@@ -64441,7 +64480,7 @@ index 0dd72c8..34dd17d 100644
/*
* Special case - lookup gave negative, but... we had foo/bar/
* From the vfs_mknod() POV we just have a negative dentry -
-@@ -3353,6 +3460,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
+@@ -3379,6 +3474,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
}
EXPORT_SYMBOL(user_path_create);
@@ -64462,7 +64501,7 @@ index 0dd72c8..34dd17d 100644
int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
{
int error = may_create(dir, dentry);
-@@ -3415,6 +3536,17 @@ retry:
+@@ -3442,6 +3551,17 @@ retry:
if (!IS_POSIXACL(path.dentry->d_inode))
mode &= ~current_umask();
@@ -64480,16 +64519,16 @@ index 0dd72c8..34dd17d 100644
error = security_path_mknod(&path, dentry, mode, dev);
if (error)
goto out;
-@@ -3431,6 +3563,8 @@ retry:
+@@ -3457,6 +3577,8 @@ retry:
+ error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
break;
}
- out:
+ if (!error)
+ gr_handle_create(dentry, path.mnt);
+ out:
done_path_create(&path, dentry);
if (retry_estale(error, lookup_flags)) {
- lookup_flags |= LOOKUP_REVAL;
-@@ -3483,9 +3617,16 @@ retry:
+@@ -3511,9 +3633,16 @@ retry:
if (!IS_POSIXACL(path.dentry->d_inode))
mode &= ~current_umask();
@@ -64506,7 +64545,7 @@ index 0dd72c8..34dd17d 100644
done_path_create(&path, dentry);
if (retry_estale(error, lookup_flags)) {
lookup_flags |= LOOKUP_REVAL;
-@@ -3566,6 +3707,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
+@@ -3597,6 +3726,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
struct filename *name;
struct dentry *dentry;
struct nameidata nd;
@@ -64515,7 +64554,7 @@ index 0dd72c8..34dd17d 100644
unsigned int lookup_flags = 0;
retry:
name = user_path_parent(dfd, pathname, &nd, lookup_flags);
-@@ -3598,10 +3741,21 @@ retry:
+@@ -3629,10 +3760,21 @@ retry:
error = -ENOENT;
goto exit3;
}
@@ -64537,7 +64576,7 @@ index 0dd72c8..34dd17d 100644
exit3:
dput(dentry);
exit2:
-@@ -3691,6 +3845,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
+@@ -3725,6 +3867,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
struct nameidata nd;
struct inode *inode = NULL;
struct inode *delegated_inode = NULL;
@@ -64546,7 +64585,7 @@ index 0dd72c8..34dd17d 100644
unsigned int lookup_flags = 0;
retry:
name = user_path_parent(dfd, pathname, &nd, lookup_flags);
-@@ -3717,10 +3873,22 @@ retry_deleg:
+@@ -3751,10 +3895,22 @@ retry_deleg:
if (d_is_negative(dentry))
goto slashes;
ihold(inode);
@@ -64569,7 +64608,7 @@ index 0dd72c8..34dd17d 100644
exit2:
dput(dentry);
}
-@@ -3808,9 +3976,17 @@ retry:
+@@ -3843,9 +3999,17 @@ retry:
if (IS_ERR(dentry))
goto out_putname;
@@ -64587,7 +64626,7 @@ index 0dd72c8..34dd17d 100644
done_path_create(&path, dentry);
if (retry_estale(error, lookup_flags)) {
lookup_flags |= LOOKUP_REVAL;
-@@ -3913,6 +4089,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
+@@ -3949,6 +4113,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
struct dentry *new_dentry;
struct path old_path, new_path;
struct inode *delegated_inode = NULL;
@@ -64595,7 +64634,7 @@ index 0dd72c8..34dd17d 100644
int how = 0;
int error;
-@@ -3936,7 +4113,7 @@ retry:
+@@ -3972,7 +4137,7 @@ retry:
if (error)
return error;
@@ -64604,7 +64643,7 @@ index 0dd72c8..34dd17d 100644
(how & LOOKUP_REVAL));
error = PTR_ERR(new_dentry);
if (IS_ERR(new_dentry))
-@@ -3948,11 +4125,28 @@ retry:
+@@ -3984,11 +4149,28 @@ retry:
error = may_linkat(&old_path);
if (unlikely(error))
goto out_dput;
@@ -64633,39 +64672,48 @@ index 0dd72c8..34dd17d 100644
done_path_create(&new_path, new_dentry);
if (delegated_inode) {
error = break_deleg_wait(&delegated_inode);
-@@ -4239,6 +4433,12 @@ retry_deleg:
+@@ -4304,6 +4486,20 @@ retry_deleg:
if (new_dentry == trap)
goto exit5;
++ if (gr_bad_chroot_rename(old_dentry, oldnd.path.mnt, new_dentry, newnd.path.mnt)) {
++ /* use EXDEV error to cause 'mv' to switch to an alternative
++ * method for usability
++ */
++ error = -EXDEV;
++ goto exit5;
++ }
++
+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
-+ to);
++ to, flags);
+ if (error)
+ goto exit5;
+
error = security_path_rename(&oldnd.path, old_dentry,
- &newnd.path, new_dentry);
+ &newnd.path, new_dentry, flags);
if (error)
-@@ -4246,6 +4446,9 @@ retry_deleg:
+@@ -4311,6 +4507,9 @@ retry_deleg:
error = vfs_rename(old_dir->d_inode, old_dentry,
- new_dir->d_inode, new_dentry,
- &delegated_inode);
+ new_dir->d_inode, new_dentry,
+ &delegated_inode, flags);
+ if (!error)
+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
-+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0);
++ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0, flags);
exit5:
dput(new_dentry);
exit4:
-@@ -4282,6 +4485,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
+@@ -4367,14 +4566,24 @@ EXPORT_SYMBOL(vfs_whiteout);
- int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
+ int readlink_copy(char __user *buffer, int buflen, const char *link)
{
+ char tmpbuf[64];
+ const char *newlink;
- int len;
+ int len = PTR_ERR(link);
++
+ if (IS_ERR(link))
+ goto out;
- len = PTR_ERR(link);
-@@ -4291,7 +4496,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
len = strlen(link);
if (len > (unsigned) buflen)
len = buflen;
@@ -64682,10 +64730,10 @@ index 0dd72c8..34dd17d 100644
out:
return len;
diff --git a/fs/namespace.c b/fs/namespace.c
-index 039f380..4239636 100644
+index bbde147..f4deeba 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -1373,6 +1373,9 @@ static int do_umount(struct mount *mnt, int flags)
+@@ -1447,6 +1447,9 @@ static int do_umount(struct mount *mnt, int flags)
if (!(sb->s_flags & MS_RDONLY))
retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
up_write(&sb->s_umount);
@@ -64695,7 +64743,7 @@ index 039f380..4239636 100644
return retval;
}
-@@ -1395,6 +1398,9 @@ static int do_umount(struct mount *mnt, int flags)
+@@ -1469,6 +1472,9 @@ static int do_umount(struct mount *mnt, int flags)
}
unlock_mount_hash();
namespace_unlock();
@@ -64705,7 +64753,7 @@ index 039f380..4239636 100644
return retval;
}
-@@ -1414,7 +1420,7 @@ static inline bool may_mount(void)
+@@ -1519,7 +1525,7 @@ static inline bool may_mount(void)
* unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
*/
@@ -64714,7 +64762,7 @@ index 039f380..4239636 100644
{
struct path path;
struct mount *mnt;
-@@ -1459,7 +1465,7 @@ out:
+@@ -1564,7 +1570,7 @@ out:
/*
* The 2.0 compatible umount. No flags.
*/
@@ -64723,7 +64771,7 @@ index 039f380..4239636 100644
{
return sys_umount(name, 0);
}
-@@ -2514,6 +2520,16 @@ long do_mount(const char *dev_name, const char *dir_name,
+@@ -2632,6 +2638,16 @@ long do_mount(const char *dev_name, const char __user *dir_name,
MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
MS_STRICTATIME);
@@ -64740,17 +64788,18 @@ index 039f380..4239636 100644
if (flags & MS_REMOUNT)
retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
data_page);
-@@ -2528,6 +2544,9 @@ long do_mount(const char *dev_name, const char *dir_name,
+@@ -2645,7 +2661,10 @@ long do_mount(const char *dev_name, const char __user *dir_name,
+ retval = do_new_mount(&path, type_page, flags, mnt_flags,
dev_name, data_page);
dput_out:
- path_put(&path);
++ gr_log_mount(dev_name, &path, retval);
+
-+ gr_log_mount(dev_name, dir_name, retval);
+ path_put(&path);
+
return retval;
}
-@@ -2545,7 +2564,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
+@@ -2663,7 +2682,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
* number incrementing at 10Ghz will take 12,427 years to wrap which
* is effectively never, so we can ignore the possibility.
*/
@@ -64759,7 +64808,7 @@ index 039f380..4239636 100644
static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
{
-@@ -2560,7 +2579,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
+@@ -2678,7 +2697,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
kfree(new_ns);
return ERR_PTR(ret);
}
@@ -64768,7 +64817,7 @@ index 039f380..4239636 100644
atomic_set(&new_ns->count, 1);
new_ns->root = NULL;
INIT_LIST_HEAD(&new_ns->list);
-@@ -2570,7 +2589,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
+@@ -2688,7 +2707,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
return new_ns;
}
@@ -64777,7 +64826,7 @@ index 039f380..4239636 100644
struct user_namespace *user_ns, struct fs_struct *new_fs)
{
struct mnt_namespace *new_ns;
-@@ -2691,8 +2710,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
+@@ -2809,8 +2828,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
}
EXPORT_SYMBOL(mount_subtree);
@@ -64788,7 +64837,7 @@ index 039f380..4239636 100644
{
int ret;
char *kernel_type;
-@@ -2805,6 +2824,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
+@@ -2916,6 +2935,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
if (error)
goto out2;
@@ -64800,7 +64849,7 @@ index 039f380..4239636 100644
get_fs_root(current->fs, &root);
old_mp = lock_mount(&old);
error = PTR_ERR(old_mp);
-@@ -3076,7 +3100,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
+@@ -3187,7 +3211,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
!ns_capable(current_user_ns(), CAP_SYS_ADMIN))
return -EPERM;
@@ -64823,10 +64872,10 @@ index f4ccfe6..a5cf064 100644
static struct callback_op callback_ops[];
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
-index 6659ce5..1e6de9b 100644
+index 00689a8..b162632 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
-@@ -1189,16 +1189,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
+@@ -1232,16 +1232,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
}
@@ -64847,10 +64896,10 @@ index 6659ce5..1e6de9b 100644
void nfs_fattr_init(struct nfs_fattr *fattr)
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
-index 86f5d3e..ae2d35a 100644
+index 0beb023..3f685ec 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
-@@ -1169,7 +1169,7 @@ struct nfsd4_operation {
+@@ -1198,7 +1198,7 @@ struct nfsd4_operation {
nfsd4op_rsize op_rsize_bop;
stateid_getter op_get_currentstateid;
stateid_setter op_set_currentstateid;
@@ -64860,10 +64909,10 @@ index 86f5d3e..ae2d35a 100644
static struct nfsd4_operation nfsd4_ops[];
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
-index dd1afa3..509afd1 100644
+index 2a77603..68e0e37 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
-@@ -1542,7 +1542,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
+@@ -1543,7 +1543,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
@@ -64873,19 +64922,21 @@ index dd1afa3..509afd1 100644
[OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
[OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
-index 6040da8..e8607ce 100644
+index 122f691..a00e2e0 100644
--- a/fs/nfsd/nfscache.c
+++ b/fs/nfsd/nfscache.c
-@@ -518,14 +518,17 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
- {
- struct svc_cacherep *rp = rqstp->rq_cacherep;
+@@ -537,7 +537,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
+ u32 hash;
+ struct nfsd_drc_bucket *b;
- int len;
+ long len;
size_t bufsize = 0;
if (!rp)
- return;
+@@ -546,11 +546,14 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
+ hash = nfsd_cache_hash(rp->c_xid);
+ b = &drc_hashtbl[hash];
- len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
- len >>= 2;
@@ -64896,8 +64947,12 @@ index 6040da8..e8607ce 100644
+ }
/* Don't cache excessive amounts of data and XDR failures */
- if (!statp || len > (256 >> 2)) {
-@@ -536,7 +539,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
+- if (!statp || len > (256 >> 2)) {
++ if (!statp || len > (256 >> 2) || len < 0) {
+ nfsd_reply_cache_free(b, rp);
+ return;
+ }
+@@ -558,7 +561,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
switch (cachetype) {
case RC_REPLSTAT:
if (len != 1)
@@ -64907,19 +64962,19 @@ index 6040da8..e8607ce 100644
break;
case RC_REPLBUFF:
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
-index eea5ad1..5a84ac7 100644
+index 989129e..42e019e 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
-@@ -843,7 +843,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
- } else {
- oldfs = get_fs();
- set_fs(KERNEL_DS);
-- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
-+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
- set_fs(oldfs);
- }
+@@ -872,7 +872,7 @@ __be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,
-@@ -934,7 +934,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
+ oldfs = get_fs();
+ set_fs(KERNEL_DS);
+- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
++ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
+ set_fs(oldfs);
+ return nfsd_finish_read(file, count, host_err);
+ }
+@@ -960,7 +960,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
/* Write the data. */
oldfs = get_fs(); set_fs(KERNEL_DS);
@@ -64928,7 +64983,7 @@ index eea5ad1..5a84ac7 100644
set_fs(oldfs);
if (host_err < 0)
goto out_nfserr;
-@@ -1479,7 +1479,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
+@@ -1502,7 +1502,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
*/
oldfs = get_fs(); set_fs(KERNEL_DS);
@@ -65043,10 +65098,10 @@ index a80a741..7b96e1b 100644
}
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
-index de6323e..4931489 100644
+index c991616..5ae51af 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
-@@ -251,8 +251,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
+@@ -216,8 +216,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
fd = fanotify_event_metadata.fd;
ret = -EFAULT;
@@ -65056,35 +65111,9 @@ index de6323e..4931489 100644
+ copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
goto out_close_fd;
- ret = prepare_for_access_response(group, event, fd);
-@@ -742,6 +742,8 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags)
- oevent->path.mnt = NULL;
- oevent->path.dentry = NULL;
-
-+ if (force_o_largefile())
-+ event_f_flags |= O_LARGEFILE;
- group->fanotify_data.f_flags = event_f_flags;
#ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
- oevent->response = 0;
-diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
-index 43ab1e1..9c8187e 100644
---- a/fs/notify/inotify/inotify_fsnotify.c
-+++ b/fs/notify/inotify/inotify_fsnotify.c
-@@ -165,8 +165,10 @@ static void inotify_free_group_priv(struct fsnotify_group *group)
- /* ideally the idr is empty and we won't hit the BUG in the callback */
- idr_for_each(&group->inotify_data.idr, idr_callback, group);
- idr_destroy(&group->inotify_data.idr);
-- atomic_dec(&group->inotify_data.user->inotify_devs);
-- free_uid(group->inotify_data.user);
-+ if (group->inotify_data.user) {
-+ atomic_dec(&group->inotify_data.user->inotify_devs);
-+ free_uid(group->inotify_data.user);
-+ }
- }
-
- static void inotify_free_event(struct fsnotify_event *fsn_event)
diff --git a/fs/notify/notification.c b/fs/notify/notification.c
-index 1e58402..bb2d6f4 100644
+index a95d8e0..a91a5fd 100644
--- a/fs/notify/notification.c
+++ b/fs/notify/notification.c
@@ -48,7 +48,7 @@
@@ -65119,10 +65148,10 @@ index 9e38daf..5727cae 100644
"inode 0x%lx or driver bug.", vdir->i_ino);
goto err_out;
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
-index 86ddab9..cedba51 100644
+index 643faa4..ef9027e 100644
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
-@@ -1282,7 +1282,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
+@@ -1280,7 +1280,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
char *addr;
size_t total = 0;
unsigned len;
@@ -65132,10 +65161,10 @@ index 86ddab9..cedba51 100644
do {
len = PAGE_CACHE_SIZE - ofs;
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
-index 82650d5..db37dcf 100644
+index 9e1e112..241a52a 100644
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
-@@ -685,7 +685,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
+@@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
if (!silent)
ntfs_error(sb, "Primary boot sector is invalid.");
} else if (!silent)
@@ -65144,7 +65173,7 @@ index 82650d5..db37dcf 100644
if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
if (bh_primary)
brelse(bh_primary);
-@@ -701,7 +701,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
+@@ -704,7 +704,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
goto hotfix_primary_boot_sector;
brelse(bh_backup);
} else if (!silent)
@@ -65153,7 +65182,7 @@ index 82650d5..db37dcf 100644
/* Try to read NT3.51- backup boot sector. */
if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
-@@ -712,7 +712,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
+@@ -715,7 +715,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
"sector.");
brelse(bh_backup);
} else if (!silent)
@@ -65175,24 +65204,11 @@ index 0440134..d52c93a 100644
bail:
if (handle)
-diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
-index b242762..04fc642 100644
---- a/fs/ocfs2/namei.c
-+++ b/fs/ocfs2/namei.c
-@@ -166,7 +166,7 @@ bail_add:
- * NOTE: This dentry already has ->d_op set from
- * ocfs2_get_parent() and ocfs2_get_dentry()
- */
-- if (ret)
-+ if (!IS_ERR_OR_NULL(ret))
- dentry = ret;
-
- status = ocfs2_dentry_attach_lock(dentry, inode,
diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
-index 553f53c..aaf5133 100644
+index bbec539..7b266d5 100644
--- a/fs/ocfs2/ocfs2.h
+++ b/fs/ocfs2/ocfs2.h
-@@ -235,11 +235,11 @@ enum ocfs2_vol_state
+@@ -236,11 +236,11 @@ enum ocfs2_vol_state
struct ocfs2_alloc_stats
{
@@ -65210,10 +65226,10 @@ index 553f53c..aaf5133 100644
enum ocfs2_local_alloc_state
diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
-index 47ae266..6e8b793 100644
+index 0cb889a..6a26b24 100644
--- a/fs/ocfs2/suballoc.c
+++ b/fs/ocfs2/suballoc.c
-@@ -866,7 +866,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
+@@ -867,7 +867,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
mlog_errno(status);
goto bail;
}
@@ -65222,7 +65238,7 @@ index 47ae266..6e8b793 100644
/* You should never ask for this much metadata */
BUG_ON(bits_wanted >
-@@ -1992,7 +1992,7 @@ int ocfs2_claim_metadata(handle_t *handle,
+@@ -2014,7 +2014,7 @@ int ocfs2_claim_metadata(handle_t *handle,
mlog_errno(status);
goto bail;
}
@@ -65231,7 +65247,7 @@ index 47ae266..6e8b793 100644
*suballoc_loc = res.sr_bg_blkno;
*suballoc_bit_start = res.sr_bit_offset;
-@@ -2156,7 +2156,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
+@@ -2180,7 +2180,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
res->sr_bits);
@@ -65240,7 +65256,7 @@ index 47ae266..6e8b793 100644
BUG_ON(res->sr_bits != 1);
-@@ -2198,7 +2198,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
+@@ -2222,7 +2222,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
mlog_errno(status);
goto bail;
}
@@ -65249,7 +65265,7 @@ index 47ae266..6e8b793 100644
BUG_ON(res.sr_bits != 1);
-@@ -2302,7 +2302,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
+@@ -2326,7 +2326,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
cluster_start,
num_clusters);
if (!status)
@@ -65258,7 +65274,7 @@ index 47ae266..6e8b793 100644
} else {
if (min_clusters > (osb->bitmap_cpg - 1)) {
/* The only paths asking for contiguousness
-@@ -2328,7 +2328,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
+@@ -2352,7 +2352,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
res.sr_bg_blkno,
res.sr_bit_offset);
@@ -65268,7 +65284,7 @@ index 47ae266..6e8b793 100644
}
}
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
-index 49d84f8..4807e0b 100644
+index 93c85bc..02f68a4 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
@@ -65288,9 +65304,9 @@ index 49d84f8..4807e0b 100644
out += snprintf(buf + out, len - out,
"%10s => State: %u Descriptor: %llu Size: %u bits "
-@@ -2123,11 +2123,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
- spin_lock_init(&osb->osb_xattr_lock);
- ocfs2_init_steal_slots(osb);
+@@ -2104,11 +2104,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
+
+ mutex_init(&osb->system_file_mutex);
- atomic_set(&osb->alloc_stats.moves, 0);
- atomic_set(&osb->alloc_stats.local_data, 0);
@@ -65306,7 +65322,7 @@ index 49d84f8..4807e0b 100644
/* Copy the blockcheck stats from the superblock probe */
osb->osb_ecc_stats = *stats;
diff --git a/fs/open.c b/fs/open.c
-index 2ed7325..4e77ac3 100644
+index de92c13..52d2a6c 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -32,6 +32,8 @@
@@ -65336,7 +65352,7 @@ index 2ed7325..4e77ac3 100644
if (!error)
error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
sb_end_write(inode->i_sb);
-@@ -361,6 +367,9 @@ retry:
+@@ -380,6 +386,9 @@ retry:
if (__mnt_is_readonly(path.mnt))
res = -EROFS;
@@ -65346,7 +65362,7 @@ index 2ed7325..4e77ac3 100644
out_path_release:
path_put(&path);
if (retry_estale(res, lookup_flags)) {
-@@ -392,6 +401,8 @@ retry:
+@@ -411,6 +420,8 @@ retry:
if (error)
goto dput_and_out;
@@ -65355,7 +65371,7 @@ index 2ed7325..4e77ac3 100644
set_fs_pwd(current->fs, &path);
dput_and_out:
-@@ -421,6 +432,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
+@@ -440,6 +451,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
goto out_putf;
error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
@@ -65369,7 +65385,7 @@ index 2ed7325..4e77ac3 100644
if (!error)
set_fs_pwd(current->fs, &f.file->f_path);
out_putf:
-@@ -450,7 +468,13 @@ retry:
+@@ -469,7 +487,13 @@ retry:
if (error)
goto dput_and_out;
@@ -65383,7 +65399,7 @@ index 2ed7325..4e77ac3 100644
error = 0;
dput_and_out:
path_put(&path);
-@@ -474,6 +498,16 @@ static int chmod_common(struct path *path, umode_t mode)
+@@ -493,6 +517,16 @@ static int chmod_common(struct path *path, umode_t mode)
return error;
retry_deleg:
mutex_lock(&inode->i_mutex);
@@ -65400,7 +65416,7 @@ index 2ed7325..4e77ac3 100644
error = security_path_chmod(path, mode);
if (error)
goto out_unlock;
-@@ -539,6 +573,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
+@@ -558,6 +592,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
uid = make_kuid(current_user_ns(), user);
gid = make_kgid(current_user_ns(), group);
@@ -65410,7 +65426,7 @@ index 2ed7325..4e77ac3 100644
newattrs.ia_valid = ATTR_CTIME;
if (user != (uid_t) -1) {
if (!uid_valid(uid))
-@@ -982,6 +1019,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
+@@ -1002,6 +1039,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
} else {
fsnotify_open(f);
fd_install(fd, f);
@@ -65419,7 +65435,7 @@ index 2ed7325..4e77ac3 100644
}
putname(tmp);
diff --git a/fs/pipe.c b/fs/pipe.c
-index 78fd0d0..f71fc09 100644
+index 21981e5..3d5f55c 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
@@ -65440,7 +65456,7 @@ index 78fd0d0..f71fc09 100644
mutex_unlock(&pipe->mutex);
}
EXPORT_SYMBOL(pipe_unlock);
-@@ -449,9 +449,9 @@ redo:
+@@ -292,9 +292,9 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
}
if (bufs) /* More to do? */
continue;
@@ -65452,8 +65468,8 @@ index 78fd0d0..f71fc09 100644
/* syscall merging: Usually we must not sleep
* if O_NONBLOCK is set, or if we got some data.
* But if a writer sleeps in kernel space, then
-@@ -513,7 +513,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
- ret = 0;
+@@ -351,7 +351,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
+
__pipe_lock(pipe);
- if (!pipe->readers) {
@@ -65461,7 +65477,7 @@ index 78fd0d0..f71fc09 100644
send_sig(SIGPIPE, current, 0);
ret = -EPIPE;
goto out;
-@@ -562,7 +562,7 @@ redo1:
+@@ -387,7 +387,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
for (;;) {
int bufs;
@@ -65470,7 +65486,7 @@ index 78fd0d0..f71fc09 100644
send_sig(SIGPIPE, current, 0);
if (!ret)
ret = -EPIPE;
-@@ -653,9 +653,9 @@ redo2:
+@@ -455,9 +455,9 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
do_wakeup = 0;
}
@@ -65482,7 +65498,7 @@ index 78fd0d0..f71fc09 100644
}
out:
__pipe_unlock(pipe);
-@@ -710,7 +710,7 @@ pipe_poll(struct file *filp, poll_table *wait)
+@@ -512,7 +512,7 @@ pipe_poll(struct file *filp, poll_table *wait)
mask = 0;
if (filp->f_mode & FMODE_READ) {
mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
@@ -65491,7 +65507,7 @@ index 78fd0d0..f71fc09 100644
mask |= POLLHUP;
}
-@@ -720,7 +720,7 @@ pipe_poll(struct file *filp, poll_table *wait)
+@@ -522,7 +522,7 @@ pipe_poll(struct file *filp, poll_table *wait)
* Most Unices do not set POLLERR for FIFOs but on Linux they
* behave exactly like pipes for poll().
*/
@@ -65500,7 +65516,7 @@ index 78fd0d0..f71fc09 100644
mask |= POLLERR;
}
-@@ -732,7 +732,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
+@@ -534,7 +534,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
int kill = 0;
spin_lock(&inode->i_lock);
@@ -65509,7 +65525,7 @@ index 78fd0d0..f71fc09 100644
inode->i_pipe = NULL;
kill = 1;
}
-@@ -749,11 +749,11 @@ pipe_release(struct inode *inode, struct file *file)
+@@ -551,11 +551,11 @@ pipe_release(struct inode *inode, struct file *file)
__pipe_lock(pipe);
if (file->f_mode & FMODE_READ)
@@ -65524,7 +65540,7 @@ index 78fd0d0..f71fc09 100644
wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
-@@ -818,7 +818,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
+@@ -620,7 +620,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
kfree(pipe);
}
@@ -65533,7 +65549,7 @@ index 78fd0d0..f71fc09 100644
/*
* pipefs_dname() is called from d_path().
-@@ -848,8 +848,9 @@ static struct inode * get_pipe_inode(void)
+@@ -650,8 +650,9 @@ static struct inode * get_pipe_inode(void)
goto fail_iput;
inode->i_pipe = pipe;
@@ -65545,7 +65561,7 @@ index 78fd0d0..f71fc09 100644
inode->i_fop = &pipefifo_fops;
/*
-@@ -1028,17 +1029,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
+@@ -830,17 +831,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
spin_lock(&inode->i_lock);
if (inode->i_pipe) {
pipe = inode->i_pipe;
@@ -65566,7 +65582,7 @@ index 78fd0d0..f71fc09 100644
spin_unlock(&inode->i_lock);
free_pipe_info(pipe);
pipe = inode->i_pipe;
-@@ -1063,10 +1064,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
+@@ -865,10 +866,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
* opened, even when there is no process writing the FIFO.
*/
pipe->r_counter++;
@@ -65579,7 +65595,7 @@ index 78fd0d0..f71fc09 100644
if ((filp->f_flags & O_NONBLOCK)) {
/* suppress POLLHUP until we have
* seen a writer */
-@@ -1085,14 +1086,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
+@@ -887,14 +888,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
* errno=ENXIO when there is no process reading the FIFO.
*/
ret = -ENXIO;
@@ -65597,7 +65613,7 @@ index 78fd0d0..f71fc09 100644
if (wait_for_partner(pipe, &pipe->r_counter))
goto err_wr;
}
-@@ -1106,11 +1107,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
+@@ -908,11 +909,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
* the process can at least talk to itself.
*/
@@ -65612,7 +65628,7 @@ index 78fd0d0..f71fc09 100644
wake_up_partner(pipe);
break;
-@@ -1124,13 +1125,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
+@@ -926,13 +927,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
return 0;
err_rd:
@@ -65745,7 +65761,7 @@ index 2183fcf..3c32a98 100644
help
Various /proc files exist to monitor process memory utilization:
diff --git a/fs/proc/array.c b/fs/proc/array.c
-index baf3464..5b394ec 100644
+index cd3653e..9b9b79a 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -60,6 +60,7 @@
@@ -65837,7 +65853,7 @@ index baf3464..5b394ec 100644
/* scale priority and nice values from timeslices to -20..20 */
/* to make it look like a "normal" Unix priority/nice value */
priority = task_prio(task);
-@@ -495,9 +546,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
+@@ -490,9 +541,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
seq_put_decimal_ull(m, ' ', vsize);
seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
seq_put_decimal_ull(m, ' ', rsslim);
@@ -65853,7 +65869,7 @@ index baf3464..5b394ec 100644
seq_put_decimal_ull(m, ' ', esp);
seq_put_decimal_ull(m, ' ', eip);
/* The signal information here is obsolete.
-@@ -519,7 +576,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
+@@ -514,7 +571,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
@@ -65866,7 +65882,7 @@ index baf3464..5b394ec 100644
seq_put_decimal_ull(m, ' ', mm->start_data);
seq_put_decimal_ull(m, ' ', mm->end_data);
seq_put_decimal_ull(m, ' ', mm->start_brk);
-@@ -557,8 +618,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
+@@ -552,8 +613,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task)
{
unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
@@ -65883,12 +65899,12 @@ index baf3464..5b394ec 100644
if (mm) {
size = task_statm(mm, &shared, &text, &data, &resident);
mmput(mm);
-@@ -581,6 +649,21 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
+@@ -576,6 +644,20 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
return 0;
}
+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
-+int proc_pid_ipaddr(struct task_struct *task, char *buffer)
++int proc_pid_ipaddr(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task)
+{
+ unsigned long flags;
+ u32 curr_ip = 0;
@@ -65897,8 +65913,7 @@ index baf3464..5b394ec 100644
+ curr_ip = task->signal->curr_ip;
+ unlock_task_sighand(task, &flags);
+ }
-+
-+ return sprintf(buffer, "%pI4\n", &curr_ip);
++ return seq_printf(m, "%pI4\n", &curr_ip);
+}
+#endif
+
@@ -65906,7 +65921,7 @@ index baf3464..5b394ec 100644
static struct pid *
get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 489ba8c..72265d6 100644
+index 7dc3ea8..a08077e 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -113,6 +113,14 @@ struct pid_entry {
@@ -65924,18 +65939,8 @@ index 489ba8c..72265d6 100644
#define NOD(NAME, MODE, IOP, FOP, OP) { \
.name = (NAME), \
.len = sizeof(NAME) - 1, \
-@@ -210,6 +218,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
- if (!mm->arg_end)
- goto out_mm; /* Shh! No looking before we're done */
-
-+ if (gr_acl_handle_procpidmem(task))
-+ goto out_mm;
-+
- len = mm->arg_end - mm->arg_start;
-
- if (len > PAGE_SIZE)
-@@ -237,12 +248,28 @@ out:
- return res;
+@@ -208,12 +216,28 @@ static int proc_pid_cmdline(struct seq_file *m, struct pid_namespace *ns,
+ return 0;
}
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
@@ -65944,10 +65949,10 @@ index 489ba8c..72265d6 100644
+ _mm->pax_flags & MF_PAX_SEGMEXEC))
+#endif
+
- static int proc_pid_auxv(struct task_struct *task, char *buffer)
+ static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
+ struct pid *pid, struct task_struct *task)
{
struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
- int res = PTR_ERR(mm);
if (mm && !IS_ERR(mm)) {
unsigned int nwords = 0;
+
@@ -65963,7 +65968,7 @@ index 489ba8c..72265d6 100644
do {
nwords += 2;
} while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
-@@ -256,7 +283,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
+@@ -225,7 +249,7 @@ static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
}
@@ -65972,7 +65977,7 @@ index 489ba8c..72265d6 100644
/*
* Provides a wchan file via kallsyms in a proper one-value-per-file format.
* Returns the resolved symbol. If that fails, simply return the address.
-@@ -295,7 +322,7 @@ static void unlock_trace(struct task_struct *task)
+@@ -265,7 +289,7 @@ static void unlock_trace(struct task_struct *task)
mutex_unlock(&task->signal->cred_guard_mutex);
}
@@ -65981,16 +65986,16 @@ index 489ba8c..72265d6 100644
#define MAX_STACK_TRACE_DEPTH 64
-@@ -518,7 +545,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
- return count;
+@@ -456,7 +480,7 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
+ return 0;
}
-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
- static int proc_pid_syscall(struct task_struct *task, char *buffer)
+ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
+ struct pid *pid, struct task_struct *task)
{
- long nr;
-@@ -547,7 +574,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
+@@ -486,7 +510,7 @@ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
/************************************************************************/
/* permission checks */
@@ -65999,7 +66004,7 @@ index 489ba8c..72265d6 100644
{
struct task_struct *task;
int allowed = 0;
-@@ -557,7 +584,10 @@ static int proc_fd_access_allowed(struct inode *inode)
+@@ -496,7 +520,10 @@ static int proc_fd_access_allowed(struct inode *inode)
*/
task = get_proc_task(inode);
if (task) {
@@ -66011,7 +66016,7 @@ index 489ba8c..72265d6 100644
put_task_struct(task);
}
return allowed;
-@@ -588,10 +618,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
+@@ -527,10 +554,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
struct task_struct *task,
int hide_pid_min)
{
@@ -66047,7 +66052,7 @@ index 489ba8c..72265d6 100644
return ptrace_may_access(task, PTRACE_MODE_READ);
}
-@@ -609,7 +664,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
+@@ -548,7 +600,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
put_task_struct(task);
if (!has_perms) {
@@ -66059,22 +66064,22 @@ index 489ba8c..72265d6 100644
/*
* Let's make getdents(), stat(), and open()
* consistent with each other. If a process
-@@ -707,6 +766,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
- if (!task)
- return -ESRCH;
+@@ -609,6 +665,10 @@ struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)
-+ if (gr_acl_handle_procpidmem(task)) {
-+ put_task_struct(task);
-+ return -EPERM;
-+ }
-+
- mm = mm_access(task, mode);
- put_task_struct(task);
+ if (task) {
+ mm = mm_access(task, mode);
++ if (!IS_ERR_OR_NULL(mm) && gr_acl_handle_procpidmem(task)) {
++ mmput(mm);
++ mm = ERR_PTR(-EPERM);
++ }
+ put_task_struct(task);
-@@ -722,6 +786,10 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
+ if (!IS_ERR_OR_NULL(mm)) {
+@@ -630,6 +690,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
+ return PTR_ERR(mm);
file->private_data = mm;
-
++
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
+ file->f_version = current->exec_id;
+#endif
@@ -66082,7 +66087,7 @@ index 489ba8c..72265d6 100644
return 0;
}
-@@ -743,6 +811,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
+@@ -651,6 +716,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
ssize_t copied;
char *page;
@@ -66100,7 +66105,7 @@ index 489ba8c..72265d6 100644
if (!mm)
return 0;
-@@ -755,7 +834,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
+@@ -663,7 +739,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
goto free;
while (count > 0) {
@@ -66109,7 +66114,7 @@ index 489ba8c..72265d6 100644
if (write && copy_from_user(page, buf, this_len)) {
copied = -EFAULT;
-@@ -847,6 +926,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
+@@ -755,6 +831,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
if (!mm)
return 0;
@@ -66123,7 +66128,7 @@ index 489ba8c..72265d6 100644
page = (char *)__get_free_page(GFP_TEMPORARY);
if (!page)
return -ENOMEM;
-@@ -856,7 +942,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
+@@ -764,7 +847,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
goto free;
while (count > 0) {
size_t this_len, max_len;
@@ -66132,7 +66137,7 @@ index 489ba8c..72265d6 100644
if (src >= (mm->env_end - mm->env_start))
break;
-@@ -1467,7 +1553,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
+@@ -1378,7 +1461,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
int error = -EACCES;
/* Are we allowed to snoop on the tasks file descriptors? */
@@ -66141,7 +66146,7 @@ index 489ba8c..72265d6 100644
goto out;
error = PROC_I(inode)->op.proc_get_link(dentry, &path);
-@@ -1511,8 +1597,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
+@@ -1422,8 +1505,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
struct path path;
/* Are we allowed to snoop on the tasks file descriptors? */
@@ -66162,7 +66167,7 @@ index 489ba8c..72265d6 100644
error = PROC_I(inode)->op.proc_get_link(dentry, &path);
if (error)
-@@ -1562,7 +1658,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
+@@ -1473,7 +1566,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
rcu_read_lock();
cred = __task_cred(task);
inode->i_uid = cred->euid;
@@ -66174,7 +66179,7 @@ index 489ba8c..72265d6 100644
rcu_read_unlock();
}
security_task_to_inode(task, inode);
-@@ -1598,10 +1698,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
+@@ -1509,10 +1606,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
return -ENOENT;
}
if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
@@ -66194,7 +66199,7 @@ index 489ba8c..72265d6 100644
}
}
rcu_read_unlock();
-@@ -1639,11 +1748,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
+@@ -1550,11 +1656,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
if (task) {
if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
@@ -66215,7 +66220,7 @@ index 489ba8c..72265d6 100644
rcu_read_unlock();
} else {
inode->i_uid = GLOBAL_ROOT_UID;
-@@ -2178,6 +2296,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
+@@ -2085,6 +2200,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
if (!task)
goto out_no_task;
@@ -66225,7 +66230,7 @@ index 489ba8c..72265d6 100644
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2208,6 +2329,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
+@@ -2115,6 +2233,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
if (!task)
return -ENOENT;
@@ -66235,39 +66240,39 @@ index 489ba8c..72265d6 100644
if (!dir_emit_dots(file, ctx))
goto out;
-@@ -2648,7 +2772,7 @@ static const struct pid_entry tgid_base_stuff[] = {
+@@ -2557,7 +2678,7 @@ static const struct pid_entry tgid_base_stuff[] = {
REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
#endif
REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
- INF("syscall", S_IRUGO, proc_pid_syscall),
+ ONE("syscall", S_IRUSR, proc_pid_syscall),
#endif
- INF("cmdline", S_IRUGO, proc_pid_cmdline),
-@@ -2673,10 +2797,10 @@ static const struct pid_entry tgid_base_stuff[] = {
+ ONE("cmdline", S_IRUGO, proc_pid_cmdline),
+@@ -2582,10 +2703,10 @@ static const struct pid_entry tgid_base_stuff[] = {
#ifdef CONFIG_SECURITY
DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
#endif
-#ifdef CONFIG_KALLSYMS
+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
- INF("wchan", S_IRUGO, proc_pid_wchan),
+ ONE("wchan", S_IRUGO, proc_pid_wchan),
#endif
-#ifdef CONFIG_STACKTRACE
+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
- ONE("stack", S_IRUGO, proc_pid_stack),
+ ONE("stack", S_IRUSR, proc_pid_stack),
#endif
#ifdef CONFIG_SCHEDSTATS
-@@ -2710,6 +2834,9 @@ static const struct pid_entry tgid_base_stuff[] = {
+@@ -2619,6 +2740,9 @@ static const struct pid_entry tgid_base_stuff[] = {
#ifdef CONFIG_HARDWALL
- INF("hardwall", S_IRUGO, proc_pid_hardwall),
+ ONE("hardwall", S_IRUGO, proc_pid_hardwall),
#endif
+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
-+ INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
++ ONE("ipaddr", S_IRUSR, proc_pid_ipaddr),
+#endif
#ifdef CONFIG_USER_NS
REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
-@@ -2841,7 +2968,14 @@ static int proc_pid_instantiate(struct inode *dir,
+@@ -2748,7 +2872,14 @@ static int proc_pid_instantiate(struct inode *dir,
if (!inode)
goto out;
@@ -66282,7 +66287,7 @@ index 489ba8c..72265d6 100644
inode->i_op = &proc_tgid_base_inode_operations;
inode->i_fop = &proc_tgid_base_operations;
inode->i_flags|=S_IMMUTABLE;
-@@ -2879,7 +3013,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
+@@ -2786,7 +2917,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
if (!task)
goto out;
@@ -66294,26 +66299,26 @@ index 489ba8c..72265d6 100644
put_task_struct(task);
out:
return ERR_PTR(result);
-@@ -2985,7 +3123,7 @@ static const struct pid_entry tid_base_stuff[] = {
+@@ -2900,7 +3035,7 @@ static const struct pid_entry tid_base_stuff[] = {
REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
#endif
REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
- INF("syscall", S_IRUGO, proc_pid_syscall),
+ ONE("syscall", S_IRUSR, proc_pid_syscall),
#endif
- INF("cmdline", S_IRUGO, proc_pid_cmdline),
-@@ -3012,10 +3150,10 @@ static const struct pid_entry tid_base_stuff[] = {
+ ONE("cmdline", S_IRUGO, proc_pid_cmdline),
+@@ -2927,10 +3062,10 @@ static const struct pid_entry tid_base_stuff[] = {
#ifdef CONFIG_SECURITY
DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
#endif
-#ifdef CONFIG_KALLSYMS
+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
- INF("wchan", S_IRUGO, proc_pid_wchan),
+ ONE("wchan", S_IRUGO, proc_pid_wchan),
#endif
-#ifdef CONFIG_STACKTRACE
+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
- ONE("stack", S_IRUGO, proc_pid_stack),
+ ONE("stack", S_IRUSR, proc_pid_stack),
#endif
#ifdef CONFIG_SCHEDSTATS
diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
@@ -66349,10 +66354,10 @@ index 50493ed..248166b 100644
}
fs_initcall(proc_devices_init);
diff --git a/fs/proc/fd.c b/fs/proc/fd.c
-index 985ea88..d118a0a 100644
+index e11d7c5..9128ce06 100644
--- a/fs/proc/fd.c
+++ b/fs/proc/fd.c
-@@ -25,7 +25,8 @@ static int seq_show(struct seq_file *m, void *v)
+@@ -26,7 +26,8 @@ static int seq_show(struct seq_file *m, void *v)
if (!task)
return -ENOENT;
@@ -66387,7 +66392,7 @@ index 985ea88..d118a0a 100644
}
diff --git a/fs/proc/generic.c b/fs/proc/generic.c
-index b7f268e..3bea6b7 100644
+index 317b726..e329aed 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -23,6 +23,7 @@
@@ -66516,7 +66521,7 @@ index b7f268e..3bea6b7 100644
struct proc_dir_entry *parent,
const struct file_operations *proc_fops,
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
-index 124fc43..8afbb02 100644
+index 333080d..0a35ec4 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -23,11 +23,17 @@
@@ -66564,7 +66569,7 @@ index 124fc43..8afbb02 100644
if (de->size)
inode->i_size = de->size;
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
-index 651d09a..6a4b495 100644
+index aa7a0ee..f2318df 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -46,9 +46,10 @@ struct proc_dir_entry {
@@ -66579,7 +66584,7 @@ index 651d09a..6a4b495 100644
union proc_op {
int (*proc_get_link)(struct dentry *, struct path *);
-@@ -67,7 +68,7 @@ struct proc_inode {
+@@ -66,7 +67,7 @@ struct proc_inode {
struct ctl_table *sysctl_entry;
struct proc_ns ns;
struct inode vfs_inode;
@@ -66588,19 +66593,20 @@ index 651d09a..6a4b495 100644
/*
* General functions
-@@ -155,6 +156,9 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
+@@ -154,6 +155,10 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
struct pid *, struct task_struct *);
extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
struct pid *, struct task_struct *);
+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
-+extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
++extern int proc_pid_ipaddr(struct seq_file *, struct pid_namespace *,
++ struct pid *, struct task_struct *);
+#endif
/*
* base.c
-@@ -181,9 +185,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
- extern spinlock_t proc_subdir_lock;
-
+@@ -178,9 +183,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
+ * generic.c
+ */
extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
+extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
@@ -66627,7 +66633,7 @@ index a352d57..cb94a5c 100644
}
fs_initcall(proc_interrupts_init);
diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
-index 39e6ef3..2f9cb5e 100644
+index 91a4e64..cb007c0 100644
--- a/fs/proc/kcore.c
+++ b/fs/proc/kcore.c
@@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
@@ -66689,7 +66695,7 @@ index 39e6ef3..2f9cb5e 100644
return -EPERM;
if (kcore_need_update)
diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
-index 136e548..1f88922 100644
+index aa1eee0..03dda72 100644
--- a/fs/proc/meminfo.c
+++ b/fs/proc/meminfo.c
@@ -187,7 +187,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
@@ -66715,7 +66721,7 @@ index d4a3574..b421ce9 100644
seq_putc(m, '\n');
diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
-index 4677bb7..dad3045 100644
+index a63af3e..b4f262a 100644
--- a/fs/proc/proc_net.c
+++ b/fs/proc/proc_net.c
@@ -23,9 +23,27 @@
@@ -66781,7 +66787,7 @@ index 4677bb7..dad3045 100644
net = get_proc_net(inode);
if (net == NULL)
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
-index 7129046..6914844 100644
+index f92d5dd..26398ac 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -11,13 +11,21 @@
@@ -66873,7 +66879,7 @@ index 7129046..6914844 100644
d_add(child, inode);
}
} else {
-@@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
+@@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, struct ctl_table *table,
if ((*pos)++ < ctx->pos)
return true;
@@ -66979,13 +66985,13 @@ index 7129046..6914844 100644
kfree(ctl_table_arg);
goto out;
diff --git a/fs/proc/root.c b/fs/proc/root.c
-index 87dbcbe..55e1b4d 100644
+index 094e44d..085a877 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
-@@ -186,7 +186,15 @@ void __init proc_root_init(void)
- #ifdef CONFIG_PROC_DEVICETREE
- proc_device_tree_init();
+@@ -188,7 +188,15 @@ void __init proc_root_init(void)
+ proc_mkdir("openprom", NULL);
#endif
+ proc_tty_init();
+#ifdef CONFIG_GRKERNSEC_PROC_ADD
+#ifdef CONFIG_GRKERNSEC_PROC_USER
+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
@@ -66999,12 +67005,12 @@ index 87dbcbe..55e1b4d 100644
}
diff --git a/fs/proc/stat.c b/fs/proc/stat.c
-index dbd0272..3cd5915 100644
+index 510413eb..34d9a8c 100644
--- a/fs/proc/stat.c
+++ b/fs/proc/stat.c
@@ -11,6 +11,7 @@
#include <linux/irqnr.h>
- #include <asm/cputime.h>
+ #include <linux/cputime.h>
#include <linux/tick.h>
+#include <linux/grsecurity.h>
@@ -67116,7 +67122,7 @@ index dbd0272..3cd5915 100644
seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index c4b2646..84f0d7b 100644
+index 4e0388c..fc6a0e1 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -13,12 +13,19 @@
@@ -67176,7 +67182,7 @@ index c4b2646..84f0d7b 100644
}
unsigned long task_vsize(struct mm_struct *mm)
-@@ -271,13 +295,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -282,13 +306,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
}
@@ -67195,7 +67201,7 @@ index c4b2646..84f0d7b 100644
seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
-@@ -287,7 +311,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -298,7 +322,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
flags & VM_WRITE ? 'w' : '-',
flags & VM_EXEC ? 'x' : '-',
flags & VM_MAYSHARE ? 's' : 'p',
@@ -67207,7 +67213,7 @@ index c4b2646..84f0d7b 100644
MAJOR(dev), MINOR(dev), ino);
/*
-@@ -296,7 +324,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -307,7 +335,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
*/
if (file) {
seq_pad(m, ' ');
@@ -67216,7 +67222,7 @@ index c4b2646..84f0d7b 100644
goto done;
}
-@@ -322,8 +350,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -338,8 +366,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
* Thread stack in /proc/PID/task/TID/maps or
* the main process stack.
*/
@@ -67228,21 +67234,20 @@ index c4b2646..84f0d7b 100644
name = "[stack]";
} else {
/* Thread stack in /proc/PID/maps */
-@@ -347,6 +376,13 @@ static int show_map(struct seq_file *m, void *v, int is_pid)
- struct proc_maps_private *priv = m->private;
- struct task_struct *task = priv->task;
+@@ -359,6 +388,12 @@ done:
+ static int show_map(struct seq_file *m, void *v, int is_pid)
+ {
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
+ if (current->exec_id != m->exec_id) {
+ gr_log_badprocpid("maps");
+ return 0;
+ }
+#endif
-+
- show_map_vma(m, vma, is_pid);
-
- if (m->count < m->size) /* vma is copied successfully */
-@@ -587,12 +623,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
+ show_map_vma(m, v, is_pid);
+ m_cache_vma(m, v);
+ return 0;
+@@ -594,12 +629,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
.private = &mss,
};
@@ -67271,7 +67276,7 @@ index c4b2646..84f0d7b 100644
show_map_vma(m, vma, is_pid);
seq_printf(m,
-@@ -610,7 +657,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
+@@ -617,7 +663,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
"KernelPageSize: %8lu kB\n"
"MMUPageSize: %8lu kB\n"
"Locked: %8lu kB\n",
@@ -67283,7 +67288,7 @@ index c4b2646..84f0d7b 100644
mss.resident >> 10,
(unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
mss.shared_clean >> 10,
-@@ -1388,6 +1439,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
+@@ -1447,6 +1497,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
char buffer[64];
int nid;
@@ -67297,9 +67302,9 @@ index c4b2646..84f0d7b 100644
if (!mm)
return 0;
-@@ -1405,11 +1463,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
- mpol_to_str(buffer, sizeof(buffer), pol);
- mpol_cond_put(pol);
+@@ -1468,11 +1525,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
+ mpol_to_str(buffer, sizeof(buffer), proc_priv->task_mempolicy);
+ }
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
@@ -67308,14 +67313,14 @@ index c4b2646..84f0d7b 100644
+#endif
if (file) {
- seq_printf(m, " file=");
+ seq_puts(m, " file=");
- seq_path(m, &file->f_path, "\n\t= ");
+ seq_path(m, &file->f_path, "\n\t\\= ");
} else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
- seq_printf(m, " heap");
+ seq_puts(m, " heap");
} else {
diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
-index 678455d..ebd3245 100644
+index 599ec2e..f1413ae 100644
--- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c
@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
@@ -67327,17 +67332,17 @@ index 678455d..ebd3245 100644
sbytes += kobjsize(current->fs);
else
bytes += kobjsize(current->fs);
-@@ -161,7 +161,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
+@@ -180,7 +180,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
if (file) {
seq_pad(m, ' ');
- seq_path(m, &file->f_path, "");
+ seq_path(m, &file->f_path, "\n\\");
} else if (mm) {
- pid_t tid = vm_is_stack(priv->task, vma, is_pid);
+ pid_t tid = pid_of_stack(priv, vma, is_pid);
diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
-index 88d4585..c10bfeb 100644
+index a90d6d35..d08047c 100644
--- a/fs/proc/vmcore.c
+++ b/fs/proc/vmcore.c
@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
@@ -67385,7 +67390,7 @@ index 88d4585..c10bfeb 100644
/*
diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
-index b00fcc9..e0c6381 100644
+index d3fb2b6..43a8140 100644
--- a/fs/qnx6/qnx6.h
+++ b/fs/qnx6/qnx6.h
@@ -74,7 +74,7 @@ enum {
@@ -67407,10 +67412,10 @@ index b00fcc9..e0c6381 100644
if (sbi->s_bytesex == BYTESEX_LE)
return le32_to_cpu((__force __le32)n);
diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
-index 72d2917..c917c12 100644
+index bb2869f..d34ada8 100644
--- a/fs/quota/netlink.c
+++ b/fs/quota/netlink.c
-@@ -45,7 +45,7 @@ static struct genl_family quota_genl_family = {
+@@ -44,7 +44,7 @@ static struct genl_family quota_genl_family = {
void quota_send_warning(struct kqid qid, dev_t dev,
const char warntype)
{
@@ -67419,7 +67424,7 @@ index 72d2917..c917c12 100644
struct sk_buff *skb;
void *msg_head;
int ret;
-@@ -61,7 +61,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
+@@ -60,7 +60,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
"VFS: Not enough memory to send quota warning.\n");
return;
}
@@ -67429,10 +67434,10 @@ index 72d2917..c917c12 100644
if (!msg_head) {
printk(KERN_ERR
diff --git a/fs/read_write.c b/fs/read_write.c
-index 28cc9c8..208e4fb 100644
+index 7d9318c..51b336f 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
-@@ -450,7 +450,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
+@@ -495,7 +495,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
old_fs = get_fs();
set_fs(get_ds());
@@ -67442,10 +67447,10 @@ index 28cc9c8..208e4fb 100644
count = MAX_RW_COUNT;
if (file->f_op->write)
diff --git a/fs/readdir.c b/fs/readdir.c
-index 5b53d99..a6c3049 100644
+index 33fd922..e0d6094 100644
--- a/fs/readdir.c
+++ b/fs/readdir.c
-@@ -17,6 +17,7 @@
+@@ -18,6 +18,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
#include <linux/unistd.h>
@@ -67453,7 +67458,7 @@ index 5b53d99..a6c3049 100644
#include <asm/uaccess.h>
-@@ -69,6 +70,7 @@ struct old_linux_dirent {
+@@ -71,6 +72,7 @@ struct old_linux_dirent {
struct readdir_callback {
struct dir_context ctx;
struct old_linux_dirent __user * dirent;
@@ -67461,7 +67466,7 @@ index 5b53d99..a6c3049 100644
int result;
};
-@@ -86,6 +88,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
+@@ -88,6 +90,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
buf->result = -EOVERFLOW;
return -EOVERFLOW;
}
@@ -67472,7 +67477,7 @@ index 5b53d99..a6c3049 100644
buf->result++;
dirent = buf->dirent;
if (!access_ok(VERIFY_WRITE, dirent,
-@@ -117,6 +123,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
+@@ -119,6 +125,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
if (!f.file)
return -EBADF;
@@ -67480,7 +67485,7 @@ index 5b53d99..a6c3049 100644
error = iterate_dir(f.file, &buf.ctx);
if (buf.result)
error = buf.result;
-@@ -142,6 +149,7 @@ struct getdents_callback {
+@@ -144,6 +151,7 @@ struct getdents_callback {
struct dir_context ctx;
struct linux_dirent __user * current_dir;
struct linux_dirent __user * previous;
@@ -67488,7 +67493,7 @@ index 5b53d99..a6c3049 100644
int count;
int error;
};
-@@ -163,6 +171,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
+@@ -165,6 +173,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
buf->error = -EOVERFLOW;
return -EOVERFLOW;
}
@@ -67499,7 +67504,7 @@ index 5b53d99..a6c3049 100644
dirent = buf->previous;
if (dirent) {
if (__put_user(offset, &dirent->d_off))
-@@ -208,6 +220,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
+@@ -210,6 +222,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
if (!f.file)
return -EBADF;
@@ -67507,7 +67512,7 @@ index 5b53d99..a6c3049 100644
error = iterate_dir(f.file, &buf.ctx);
if (error >= 0)
error = buf.error;
-@@ -226,6 +239,7 @@ struct getdents_callback64 {
+@@ -228,6 +241,7 @@ struct getdents_callback64 {
struct dir_context ctx;
struct linux_dirent64 __user * current_dir;
struct linux_dirent64 __user * previous;
@@ -67515,7 +67520,7 @@ index 5b53d99..a6c3049 100644
int count;
int error;
};
-@@ -241,6 +255,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
+@@ -243,6 +257,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
buf->error = -EINVAL; /* only used if we fail.. */
if (reclen > buf->count)
return -EINVAL;
@@ -67526,7 +67531,7 @@ index 5b53d99..a6c3049 100644
dirent = buf->previous;
if (dirent) {
if (__put_user(offset, &dirent->d_off))
-@@ -288,6 +306,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
+@@ -290,6 +308,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
if (!f.file)
return -EBADF;
@@ -67535,23 +67540,23 @@ index 5b53d99..a6c3049 100644
if (error >= 0)
error = buf.error;
diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
-index 9a3c68c..767933e 100644
+index 9c02d96..6562c10 100644
--- a/fs/reiserfs/do_balan.c
+++ b/fs/reiserfs/do_balan.c
-@@ -1546,7 +1546,7 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */
+@@ -1887,7 +1887,7 @@ void do_balance(struct tree_balance *tb, struct item_head *ih,
return;
}
-- atomic_inc(&(fs_generation(tb->tb_sb)));
-+ atomic_inc_unchecked(&(fs_generation(tb->tb_sb)));
+- atomic_inc(&fs_generation(tb->tb_sb));
++ atomic_inc_unchecked(&fs_generation(tb->tb_sb));
do_balance_starts(tb);
- /* balance leaf returns 0 except if combining L R and S into
+ /*
diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
-index ee382ef..f4eb6eb5 100644
+index aca73dd..e3c558d 100644
--- a/fs/reiserfs/item_ops.c
+++ b/fs/reiserfs/item_ops.c
-@@ -725,18 +725,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
+@@ -724,18 +724,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
}
static struct item_operations errcatch_ops = {
@@ -67580,9 +67585,9 @@ index ee382ef..f4eb6eb5 100644
+ .print_vi = errcatch_print_vi
};
- //////////////////////////////////////////////////////////////////////////////
+ #if ! (TYPE_STAT_DATA == 0 && TYPE_INDIRECT == 1 && TYPE_DIRECT == 2 && TYPE_DIRENTRY == 3)
diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
-index 02b0b7d..c85018b 100644
+index 621b9f3..af527fd 100644
--- a/fs/reiserfs/procfs.c
+++ b/fs/reiserfs/procfs.c
@@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
@@ -67595,20 +67600,20 @@ index 02b0b7d..c85018b 100644
SF(s_do_balance), SF(s_unneeded_left_neighbor),
SF(s_good_search_by_key_reada), SF(s_bmaps),
diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
-index 8d06adf..7e1c9f8 100644
+index 1894d96..1dfd1c2 100644
--- a/fs/reiserfs/reiserfs.h
+++ b/fs/reiserfs/reiserfs.h
-@@ -453,7 +453,7 @@ struct reiserfs_sb_info {
+@@ -576,7 +576,7 @@ struct reiserfs_sb_info {
/* Comment? -Hans */
wait_queue_head_t s_wait;
- /* To be obsoleted soon by per buffer seals.. -Hans */
-- atomic_t s_generation_counter; // increased by one every time the
-+ atomic_unchecked_t s_generation_counter; // increased by one every time the
- // tree gets re-balanced
- unsigned long s_properties; /* File system properties. Currently holds
- on-disk FS format */
-@@ -1972,7 +1972,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
- #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
+ /* increased by one every time the tree gets re-balanced */
+- atomic_t s_generation_counter;
++ atomic_unchecked_t s_generation_counter;
+
+ /* File system properties. Currently holds on-disk FS format */
+ unsigned long s_properties;
+@@ -2297,7 +2297,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
+ #define REISERFS_USER_MEM 1 /* user memory mode */
#define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
-#define get_generation(s) atomic_read (&fs_generation(s))
@@ -67617,10 +67622,10 @@ index 8d06adf..7e1c9f8 100644
#define __fs_changed(gen,s) (gen != get_generation (s))
#define fs_changed(gen,s) \
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
-index 2c80335..04d987d 100644
+index b27ef35..d9c6c18 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
-@@ -1783,6 +1783,10 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
+@@ -1857,6 +1857,10 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO);
sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
@@ -67628,9 +67633,9 @@ index 2c80335..04d987d 100644
+ /* turn on user xattrs by default */
+ sbi->s_mount_opt |= (1 << REISERFS_XATTRS_USER);
+#endif
- /* no preallocation minimum, be smart in
- reiserfs_file_write instead */
+ /* no preallocation minimum, be smart in reiserfs_file_write instead */
sbi->s_alloc_options.preallocmin = 0;
+ /* Preallocate by 16 blocks (17-1) at once */
diff --git a/fs/select.c b/fs/select.c
index 467bb1c..cf9d65a 100644
--- a/fs/select.c
@@ -67652,19 +67657,33 @@ index 467bb1c..cf9d65a 100644
return -EINVAL;
diff --git a/fs/seq_file.c b/fs/seq_file.c
-index 1d641bb..9ca7f61 100644
+index 3857b72..0b7281e 100644
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
-@@ -10,6 +10,8 @@
- #include <linux/seq_file.h>
+@@ -12,6 +12,8 @@
#include <linux/slab.h>
#include <linux/cred.h>
+ #include <linux/mm.h>
+#include <linux/sched.h>
+#include <linux/grsecurity.h>
#include <asm/uaccess.h>
#include <asm/page.h>
-@@ -60,6 +62,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
+@@ -34,12 +36,7 @@ static void seq_set_overflow(struct seq_file *m)
+
+ static void *seq_buf_alloc(unsigned long size)
+ {
+- void *buf;
+-
+- buf = kmalloc(size, GFP_KERNEL | __GFP_NOWARN);
+- if (!buf && size > PAGE_SIZE)
+- buf = vmalloc(size);
+- return buf;
++ return kmalloc(size, GFP_KERNEL | GFP_USERCOPY);
+ }
+
+ /**
+@@ -72,6 +69,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
#ifdef CONFIG_USER_NS
p->user_ns = file->f_cred->user_ns;
#endif
@@ -67674,7 +67693,7 @@ index 1d641bb..9ca7f61 100644
/*
* Wrappers around seq_open(e.g. swaps_open) need to be
-@@ -82,6 +87,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
+@@ -94,6 +94,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
}
EXPORT_SYMBOL(seq_open);
@@ -67691,25 +67710,7 @@ index 1d641bb..9ca7f61 100644
static int traverse(struct seq_file *m, loff_t offset)
{
loff_t pos = 0, index;
-@@ -96,7 +111,7 @@ static int traverse(struct seq_file *m, loff_t offset)
- return 0;
- }
- if (!m->buf) {
-- m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
-+ m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL | GFP_USERCOPY);
- if (!m->buf)
- return -ENOMEM;
- }
-@@ -137,7 +152,7 @@ Eoverflow:
- m->op->stop(m, p);
- kfree(m->buf);
- m->count = 0;
-- m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
-+ m->buf = kmalloc(m->size <<= 1, GFP_KERNEL | GFP_USERCOPY);
- return !m->buf ? -ENOMEM : -EAGAIN;
- }
-
-@@ -153,7 +168,7 @@ Eoverflow:
+@@ -165,7 +175,7 @@ Eoverflow:
ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
{
struct seq_file *m = file->private_data;
@@ -67718,25 +67719,7 @@ index 1d641bb..9ca7f61 100644
loff_t pos;
size_t n;
void *p;
-@@ -192,7 +207,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
-
- /* grab buffer if we didn't have one */
- if (!m->buf) {
-- m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
-+ m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL | GFP_USERCOPY);
- if (!m->buf)
- goto Enomem;
- }
-@@ -234,7 +249,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
- m->op->stop(m, p);
- kfree(m->buf);
- m->count = 0;
-- m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
-+ m->buf = kmalloc(m->size <<= 1, GFP_KERNEL | GFP_USERCOPY);
- if (!m->buf)
- goto Enomem;
- m->version = 0;
-@@ -584,7 +599,7 @@ static void single_stop(struct seq_file *p, void *v)
+@@ -596,7 +606,7 @@ static void single_stop(struct seq_file *p, void *v)
int single_open(struct file *file, int (*show)(struct seq_file *, void *),
void *data)
{
@@ -67745,16 +67728,7 @@ index 1d641bb..9ca7f61 100644
int res = -ENOMEM;
if (op) {
-@@ -605,7 +620,7 @@ EXPORT_SYMBOL(single_open);
- int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
- void *data, size_t size)
- {
-- char *buf = kmalloc(size, GFP_KERNEL);
-+ char *buf = kmalloc(size, GFP_KERNEL | GFP_USERCOPY);
- int ret;
- if (!buf)
- return -ENOMEM;
-@@ -620,6 +635,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
+@@ -632,6 +642,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
}
EXPORT_SYMBOL(single_open_size);
@@ -67773,10 +67747,10 @@ index 1d641bb..9ca7f61 100644
{
const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
diff --git a/fs/splice.c b/fs/splice.c
-index 12028fa..a6f2619 100644
+index 75c6058..770d40c 100644
--- a/fs/splice.c
+++ b/fs/splice.c
-@@ -196,7 +196,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
+@@ -193,7 +193,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
pipe_lock(pipe);
for (;;) {
@@ -67785,7 +67759,7 @@ index 12028fa..a6f2619 100644
send_sig(SIGPIPE, current, 0);
if (!ret)
ret = -EPIPE;
-@@ -219,7 +219,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
+@@ -216,7 +216,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
page_nr++;
ret += buf->len;
@@ -67794,7 +67768,7 @@ index 12028fa..a6f2619 100644
do_wakeup = 1;
if (!--spd->nr_pages)
-@@ -250,9 +250,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
+@@ -247,9 +247,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
do_wakeup = 0;
}
@@ -67806,7 +67780,7 @@ index 12028fa..a6f2619 100644
}
pipe_unlock(pipe);
-@@ -583,7 +583,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
+@@ -576,7 +576,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
old_fs = get_fs();
set_fs(get_ds());
/* The cast to a user pointer is valid due to the set_fs() */
@@ -67815,7 +67789,7 @@ index 12028fa..a6f2619 100644
set_fs(old_fs);
return res;
-@@ -598,7 +598,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
+@@ -591,7 +591,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
old_fs = get_fs();
set_fs(get_ds());
/* The cast to a user pointer is valid due to the set_fs() */
@@ -67824,7 +67798,7 @@ index 12028fa..a6f2619 100644
set_fs(old_fs);
return res;
-@@ -651,7 +651,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
+@@ -644,7 +644,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
goto err;
this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
@@ -67833,7 +67807,7 @@ index 12028fa..a6f2619 100644
vec[i].iov_len = this_len;
spd.pages[i] = page;
spd.nr_pages++;
-@@ -847,7 +847,7 @@ int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_desc *sd,
+@@ -783,7 +783,7 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
ops->release(pipe, buf);
pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
pipe->nrbufs--;
@@ -67842,8 +67816,8 @@ index 12028fa..a6f2619 100644
sd->need_wakeup = true;
}
-@@ -872,10 +872,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
- int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
+@@ -807,10 +807,10 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
+ static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
{
while (!pipe->nrbufs) {
- if (!pipe->writers)
@@ -67855,7 +67829,16 @@ index 12028fa..a6f2619 100644
return 0;
if (sd->flags & SPLICE_F_NONBLOCK)
-@@ -1197,7 +1197,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
+@@ -1040,7 +1040,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
+ ops->release(pipe, buf);
+ pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
+ pipe->nrbufs--;
+- if (pipe->files)
++ if (atomic_read(&pipe->files))
+ sd.need_wakeup = true;
+ } else {
+ buf->offset += ret;
+@@ -1200,7 +1200,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
* out of the pipe right after the splice_to_pipe(). So set
* PIPE_READERS appropriately.
*/
@@ -67864,7 +67847,7 @@ index 12028fa..a6f2619 100644
current->splice_pipe = pipe;
}
-@@ -1493,6 +1493,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
+@@ -1497,6 +1497,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
partial[buffers].offset = off;
partial[buffers].len = plen;
@@ -67872,7 +67855,7 @@ index 12028fa..a6f2619 100644
off = 0;
len -= plen;
-@@ -1795,9 +1796,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
+@@ -1733,9 +1734,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
ret = -ERESTARTSYS;
break;
}
@@ -67884,7 +67867,7 @@ index 12028fa..a6f2619 100644
if (flags & SPLICE_F_NONBLOCK) {
ret = -EAGAIN;
break;
-@@ -1829,7 +1830,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
+@@ -1767,7 +1768,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
pipe_lock(pipe);
while (pipe->nrbufs >= pipe->buffers) {
@@ -67893,7 +67876,7 @@ index 12028fa..a6f2619 100644
send_sig(SIGPIPE, current, 0);
ret = -EPIPE;
break;
-@@ -1842,9 +1843,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
+@@ -1780,9 +1781,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
ret = -ERESTARTSYS;
break;
}
@@ -67905,7 +67888,7 @@ index 12028fa..a6f2619 100644
}
pipe_unlock(pipe);
-@@ -1880,14 +1881,14 @@ retry:
+@@ -1818,14 +1819,14 @@ retry:
pipe_double_lock(ipipe, opipe);
do {
@@ -67922,7 +67905,7 @@ index 12028fa..a6f2619 100644
break;
/*
-@@ -1984,7 +1985,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
+@@ -1922,7 +1923,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
pipe_double_lock(ipipe, opipe);
do {
@@ -67931,7 +67914,7 @@ index 12028fa..a6f2619 100644
send_sig(SIGPIPE, current, 0);
if (!ret)
ret = -EPIPE;
-@@ -2029,7 +2030,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
+@@ -1967,7 +1968,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
* return EAGAIN if we have the potential of some data in the
* future, otherwise just return 0
*/
@@ -67980,10 +67963,10 @@ index ae0c3ce..9ee641c 100644
generic_fillattr(inode, stat);
return 0;
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
-index ee0d761..b346c58 100644
+index 0b45ff4..847de5b 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
-@@ -62,9 +62,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
+@@ -41,9 +41,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
{
struct kernfs_node *parent, *kn;
@@ -68000,7 +67983,7 @@ index ee0d761..b346c58 100644
if (kobj->parent)
parent = kobj->parent->sd;
else
-@@ -73,11 +80,22 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
+@@ -52,11 +59,22 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
if (!parent)
return -ENOENT;
@@ -68040,7 +68023,7 @@ index 69d4889..a810bd4 100644
if (sbi->s_bytesex == BYTESEX_PDP)
return PDP_swab((__force __u32)n);
diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
-index e18b988..f1d4ad0f 100644
+index fb08b0c..65fcc7e 100644
--- a/fs/ubifs/io.c
+++ b/fs/ubifs/io.c
@@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
@@ -68052,298 +68035,6 @@ index e18b988..f1d4ad0f 100644
{
int err;
-diff --git a/fs/udf/dir.c b/fs/udf/dir.c
-index a012c51..a7690b4 100644
---- a/fs/udf/dir.c
-+++ b/fs/udf/dir.c
-@@ -167,7 +167,8 @@ static int udf_readdir(struct file *file, struct dir_context *ctx)
- continue;
- }
-
-- flen = udf_get_filename(dir->i_sb, nameptr, fname, lfi);
-+ flen = udf_get_filename(dir->i_sb, nameptr, lfi, fname,
-+ UDF_NAME_LEN);
- if (!flen)
- continue;
-
-diff --git a/fs/udf/inode.c b/fs/udf/inode.c
-index 287cd5f..5252259 100644
---- a/fs/udf/inode.c
-+++ b/fs/udf/inode.c
-@@ -51,7 +51,6 @@ MODULE_LICENSE("GPL");
-
- static umode_t udf_convert_permissions(struct fileEntry *);
- static int udf_update_inode(struct inode *, int);
--static void udf_fill_inode(struct inode *, struct buffer_head *);
- static int udf_sync_inode(struct inode *inode);
- static int udf_alloc_i_data(struct inode *inode, size_t size);
- static sector_t inode_getblk(struct inode *, sector_t, int *, int *);
-@@ -1278,15 +1277,27 @@ update_time:
- */
- #define UDF_MAX_ICB_NESTING 1024
-
--static void __udf_read_inode(struct inode *inode)
-+static int udf_read_inode(struct inode *inode)
- {
- struct buffer_head *bh = NULL;
- struct fileEntry *fe;
-+ struct extendedFileEntry *efe;
- uint16_t ident;
- struct udf_inode_info *iinfo = UDF_I(inode);
-+ struct udf_sb_info *sbi = UDF_SB(inode->i_sb);
-+ struct kernel_lb_addr *iloc = &iinfo->i_location;
-+ unsigned int link_count;
- unsigned int indirections = 0;
-+ int ret = -EIO;
-
- reread:
-+ if (iloc->logicalBlockNum >=
-+ sbi->s_partmaps[iloc->partitionReferenceNum].s_partition_len) {
-+ udf_debug("block=%d, partition=%d out of range\n",
-+ iloc->logicalBlockNum, iloc->partitionReferenceNum);
-+ return -EIO;
-+ }
-+
- /*
- * Set defaults, but the inode is still incomplete!
- * Note: get_new_inode() sets the following on a new inode:
-@@ -1299,29 +1310,26 @@ reread:
- * i_nlink = 1
- * i_op = NULL;
- */
-- bh = udf_read_ptagged(inode->i_sb, &iinfo->i_location, 0, &ident);
-+ bh = udf_read_ptagged(inode->i_sb, iloc, 0, &ident);
- if (!bh) {
- udf_err(inode->i_sb, "(ino %ld) failed !bh\n", inode->i_ino);
-- make_bad_inode(inode);
-- return;
-+ return -EIO;
- }
-
- if (ident != TAG_IDENT_FE && ident != TAG_IDENT_EFE &&
- ident != TAG_IDENT_USE) {
- udf_err(inode->i_sb, "(ino %ld) failed ident=%d\n",
- inode->i_ino, ident);
-- brelse(bh);
-- make_bad_inode(inode);
-- return;
-+ goto out;
- }
-
- fe = (struct fileEntry *)bh->b_data;
-+ efe = (struct extendedFileEntry *)bh->b_data;
-
- if (fe->icbTag.strategyType == cpu_to_le16(4096)) {
- struct buffer_head *ibh;
-
-- ibh = udf_read_ptagged(inode->i_sb, &iinfo->i_location, 1,
-- &ident);
-+ ibh = udf_read_ptagged(inode->i_sb, iloc, 1, &ident);
- if (ident == TAG_IDENT_IE && ibh) {
- struct kernel_lb_addr loc;
- struct indirectEntry *ie;
-@@ -1330,7 +1338,6 @@ reread:
- loc = lelb_to_cpu(ie->indirectICB.extLocation);
-
- if (ie->indirectICB.extLength) {
-- brelse(bh);
- brelse(ibh);
- memcpy(&iinfo->i_location, &loc,
- sizeof(struct kernel_lb_addr));
-@@ -1339,9 +1346,9 @@ reread:
- "too many ICBs in ICB hierarchy"
- " (max %d supported)\n",
- UDF_MAX_ICB_NESTING);
-- make_bad_inode(inode);
-- return;
-+ goto out;
- }
-+ brelse(bh);
- goto reread;
- }
- }
-@@ -1349,26 +1356,8 @@ reread:
- } else if (fe->icbTag.strategyType != cpu_to_le16(4)) {
- udf_err(inode->i_sb, "unsupported strategy type: %d\n",
- le16_to_cpu(fe->icbTag.strategyType));
-- brelse(bh);
-- make_bad_inode(inode);
-- return;
-+ goto out;
- }
-- udf_fill_inode(inode, bh);
--
-- brelse(bh);
--}
--
--static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
--{
-- struct fileEntry *fe;
-- struct extendedFileEntry *efe;
-- struct udf_sb_info *sbi = UDF_SB(inode->i_sb);
-- struct udf_inode_info *iinfo = UDF_I(inode);
-- unsigned int link_count;
--
-- fe = (struct fileEntry *)bh->b_data;
-- efe = (struct extendedFileEntry *)bh->b_data;
--
- if (fe->icbTag.strategyType == cpu_to_le16(4))
- iinfo->i_strat4096 = 0;
- else /* if (fe->icbTag.strategyType == cpu_to_le16(4096)) */
-@@ -1385,11 +1374,10 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
- if (fe->descTag.tagIdent == cpu_to_le16(TAG_IDENT_EFE)) {
- iinfo->i_efe = 1;
- iinfo->i_use = 0;
-- if (udf_alloc_i_data(inode, inode->i_sb->s_blocksize -
-- sizeof(struct extendedFileEntry))) {
-- make_bad_inode(inode);
-- return;
-- }
-+ ret = udf_alloc_i_data(inode, inode->i_sb->s_blocksize -
-+ sizeof(struct extendedFileEntry));
-+ if (ret)
-+ goto out;
- memcpy(iinfo->i_ext.i_data,
- bh->b_data + sizeof(struct extendedFileEntry),
- inode->i_sb->s_blocksize -
-@@ -1397,11 +1385,10 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
- } else if (fe->descTag.tagIdent == cpu_to_le16(TAG_IDENT_FE)) {
- iinfo->i_efe = 0;
- iinfo->i_use = 0;
-- if (udf_alloc_i_data(inode, inode->i_sb->s_blocksize -
-- sizeof(struct fileEntry))) {
-- make_bad_inode(inode);
-- return;
-- }
-+ ret = udf_alloc_i_data(inode, inode->i_sb->s_blocksize -
-+ sizeof(struct fileEntry));
-+ if (ret)
-+ goto out;
- memcpy(iinfo->i_ext.i_data,
- bh->b_data + sizeof(struct fileEntry),
- inode->i_sb->s_blocksize - sizeof(struct fileEntry));
-@@ -1411,18 +1398,18 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
- iinfo->i_lenAlloc = le32_to_cpu(
- ((struct unallocSpaceEntry *)bh->b_data)->
- lengthAllocDescs);
-- if (udf_alloc_i_data(inode, inode->i_sb->s_blocksize -
-- sizeof(struct unallocSpaceEntry))) {
-- make_bad_inode(inode);
-- return;
-- }
-+ ret = udf_alloc_i_data(inode, inode->i_sb->s_blocksize -
-+ sizeof(struct unallocSpaceEntry));
-+ if (ret)
-+ goto out;
- memcpy(iinfo->i_ext.i_data,
- bh->b_data + sizeof(struct unallocSpaceEntry),
- inode->i_sb->s_blocksize -
- sizeof(struct unallocSpaceEntry));
-- return;
-+ return 0;
- }
-
-+ ret = -EIO;
- read_lock(&sbi->s_cred_lock);
- i_uid_write(inode, le32_to_cpu(fe->uid));
- if (!uid_valid(inode->i_uid) ||
-@@ -1496,6 +1483,20 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
- iinfo->i_checkpoint = le32_to_cpu(efe->checkpoint);
- }
-
-+ /* Sanity checks for files in ICB so that we don't get confused later */
-+ if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) {
-+ /*
-+ * For file in ICB data is stored in allocation descriptor
-+ * so sizes should match
-+ */
-+ if (iinfo->i_lenAlloc != inode->i_size)
-+ goto out;
-+ /* File in ICB has to fit in there... */
-+ if (inode->i_size > inode->i_sb->s_blocksize -
-+ udf_file_entry_alloc_offset(inode))
-+ goto out;
-+ }
-+
- switch (fe->icbTag.fileType) {
- case ICBTAG_FILE_TYPE_DIRECTORY:
- inode->i_op = &udf_dir_inode_operations;
-@@ -1544,8 +1545,7 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
- default:
- udf_err(inode->i_sb, "(ino %ld) failed unknown file type=%d\n",
- inode->i_ino, fe->icbTag.fileType);
-- make_bad_inode(inode);
-- return;
-+ goto out;
- }
- if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) {
- struct deviceSpec *dsea =
-@@ -1556,8 +1556,12 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
- le32_to_cpu(dsea->minorDeviceIdent)));
- /* Developer ID ??? */
- } else
-- make_bad_inode(inode);
-+ goto out;
- }
-+ ret = 0;
-+out:
-+ brelse(bh);
-+ return ret;
- }
-
- static int udf_alloc_i_data(struct inode *inode, size_t size)
-@@ -1671,7 +1675,7 @@ static int udf_update_inode(struct inode *inode, int do_sync)
- FE_PERM_U_DELETE | FE_PERM_U_CHATTR));
- fe->permissions = cpu_to_le32(udfperms);
-
-- if (S_ISDIR(inode->i_mode))
-+ if (S_ISDIR(inode->i_mode) && inode->i_nlink > 0)
- fe->fileLinkCount = cpu_to_le16(inode->i_nlink - 1);
- else
- fe->fileLinkCount = cpu_to_le16(inode->i_nlink);
-@@ -1837,32 +1841,23 @@ struct inode *udf_iget(struct super_block *sb, struct kernel_lb_addr *ino)
- {
- unsigned long block = udf_get_lb_pblock(sb, ino, 0);
- struct inode *inode = iget_locked(sb, block);
-+ int err;
-
- if (!inode)
-- return NULL;
-+ return ERR_PTR(-ENOMEM);
-
-- if (inode->i_state & I_NEW) {
-- memcpy(&UDF_I(inode)->i_location, ino, sizeof(struct kernel_lb_addr));
-- __udf_read_inode(inode);
-- unlock_new_inode(inode);
-- }
--
-- if (is_bad_inode(inode))
-- goto out_iput;
-+ if (!(inode->i_state & I_NEW))
-+ return inode;
-
-- if (ino->logicalBlockNum >= UDF_SB(sb)->
-- s_partmaps[ino->partitionReferenceNum].s_partition_len) {
-- udf_debug("block=%d, partition=%d out of range\n",
-- ino->logicalBlockNum, ino->partitionReferenceNum);
-- make_bad_inode(inode);
-- goto out_iput;
-+ memcpy(&UDF_I(inode)->i_location, ino, sizeof(struct kernel_lb_addr));
-+ err = udf_read_inode(inode);
-+ if (err < 0) {
-+ iget_failed(inode);
-+ return ERR_PTR(err);
- }
-+ unlock_new_inode(inode);
-
- return inode;
--
-- out_iput:
-- iput(inode);
-- return NULL;
- }
-
- int udf_add_aext(struct inode *inode, struct extent_position *epos,
diff --git a/fs/udf/misc.c b/fs/udf/misc.c
index c175b4d..8f36a16 100644
--- a/fs/udf/misc.c
@@ -68357,445 +68048,6 @@ index c175b4d..8f36a16 100644
u8 checksum = 0;
int i;
for (i = 0; i < sizeof(struct tag); ++i)
-diff --git a/fs/udf/namei.c b/fs/udf/namei.c
-index 9737cba..e5ae1c3 100644
---- a/fs/udf/namei.c
-+++ b/fs/udf/namei.c
-@@ -233,7 +233,8 @@ static struct fileIdentDesc *udf_find_entry(struct inode *dir,
- if (!lfi)
- continue;
-
-- flen = udf_get_filename(dir->i_sb, nameptr, fname, lfi);
-+ flen = udf_get_filename(dir->i_sb, nameptr, lfi, fname,
-+ UDF_NAME_LEN);
- if (flen && udf_match(flen, fname, child->len, child->name))
- goto out_ok;
- }
-@@ -270,9 +271,8 @@ static struct dentry *udf_lookup(struct inode *dir, struct dentry *dentry,
- NULL, 0),
- };
- inode = udf_iget(dir->i_sb, lb);
-- if (!inode) {
-- return ERR_PTR(-EACCES);
-- }
-+ if (IS_ERR(inode))
-+ return inode;
- } else
- #endif /* UDF_RECOVERY */
-
-@@ -285,9 +285,8 @@ static struct dentry *udf_lookup(struct inode *dir, struct dentry *dentry,
-
- loc = lelb_to_cpu(cfi.icb.extLocation);
- inode = udf_iget(dir->i_sb, &loc);
-- if (!inode) {
-- return ERR_PTR(-EACCES);
-- }
-+ if (IS_ERR(inode))
-+ return ERR_CAST(inode);
- }
-
- return d_splice_alias(inode, dentry);
-@@ -1221,7 +1220,7 @@ static struct dentry *udf_get_parent(struct dentry *child)
- struct udf_fileident_bh fibh;
-
- if (!udf_find_entry(child->d_inode, &dotdot, &fibh, &cfi))
-- goto out_unlock;
-+ return ERR_PTR(-EACCES);
-
- if (fibh.sbh != fibh.ebh)
- brelse(fibh.ebh);
-@@ -1229,12 +1228,10 @@ static struct dentry *udf_get_parent(struct dentry *child)
-
- tloc = lelb_to_cpu(cfi.icb.extLocation);
- inode = udf_iget(child->d_inode->i_sb, &tloc);
-- if (!inode)
-- goto out_unlock;
-+ if (IS_ERR(inode))
-+ return ERR_CAST(inode);
-
- return d_obtain_alias(inode);
--out_unlock:
-- return ERR_PTR(-EACCES);
- }
-
-
-@@ -1251,8 +1248,8 @@ static struct dentry *udf_nfs_get_inode(struct super_block *sb, u32 block,
- loc.partitionReferenceNum = partref;
- inode = udf_iget(sb, &loc);
-
-- if (inode == NULL)
-- return ERR_PTR(-ENOMEM);
-+ if (IS_ERR(inode))
-+ return ERR_CAST(inode);
-
- if (generation && inode->i_generation != generation) {
- iput(inode);
-diff --git a/fs/udf/super.c b/fs/udf/super.c
-index 3306b9f..a1e0eda 100644
---- a/fs/udf/super.c
-+++ b/fs/udf/super.c
-@@ -956,12 +956,14 @@ struct inode *udf_find_metadata_inode_efe(struct super_block *sb,
-
- metadata_fe = udf_iget(sb, &addr);
-
-- if (metadata_fe == NULL)
-+ if (IS_ERR(metadata_fe)) {
- udf_warn(sb, "metadata inode efe not found\n");
-- else if (UDF_I(metadata_fe)->i_alloc_type != ICBTAG_FLAG_AD_SHORT) {
-+ return metadata_fe;
-+ }
-+ if (UDF_I(metadata_fe)->i_alloc_type != ICBTAG_FLAG_AD_SHORT) {
- udf_warn(sb, "metadata inode efe does not have short allocation descriptors!\n");
- iput(metadata_fe);
-- metadata_fe = NULL;
-+ return ERR_PTR(-EIO);
- }
-
- return metadata_fe;
-@@ -973,6 +975,7 @@ static int udf_load_metadata_files(struct super_block *sb, int partition)
- struct udf_part_map *map;
- struct udf_meta_data *mdata;
- struct kernel_lb_addr addr;
-+ struct inode *fe;
-
- map = &sbi->s_partmaps[partition];
- mdata = &map->s_type_specific.s_metadata;
-@@ -981,22 +984,24 @@ static int udf_load_metadata_files(struct super_block *sb, int partition)
- udf_debug("Metadata file location: block = %d part = %d\n",
- mdata->s_meta_file_loc, map->s_partition_num);
-
-- mdata->s_metadata_fe = udf_find_metadata_inode_efe(sb,
-- mdata->s_meta_file_loc, map->s_partition_num);
--
-- if (mdata->s_metadata_fe == NULL) {
-+ fe = udf_find_metadata_inode_efe(sb, mdata->s_meta_file_loc,
-+ map->s_partition_num);
-+ if (IS_ERR(fe)) {
- /* mirror file entry */
- udf_debug("Mirror metadata file location: block = %d part = %d\n",
- mdata->s_mirror_file_loc, map->s_partition_num);
-
-- mdata->s_mirror_fe = udf_find_metadata_inode_efe(sb,
-- mdata->s_mirror_file_loc, map->s_partition_num);
-+ fe = udf_find_metadata_inode_efe(sb, mdata->s_mirror_file_loc,
-+ map->s_partition_num);
-
-- if (mdata->s_mirror_fe == NULL) {
-+ if (IS_ERR(fe)) {
- udf_err(sb, "Both metadata and mirror metadata inode efe can not found\n");
-- return -EIO;
-+ return PTR_ERR(fe);
- }
-- }
-+ mdata->s_mirror_fe = fe;
-+ } else
-+ mdata->s_metadata_fe = fe;
-+
-
- /*
- * bitmap file entry
-@@ -1010,15 +1015,16 @@ static int udf_load_metadata_files(struct super_block *sb, int partition)
- udf_debug("Bitmap file location: block = %d part = %d\n",
- addr.logicalBlockNum, addr.partitionReferenceNum);
-
-- mdata->s_bitmap_fe = udf_iget(sb, &addr);
-- if (mdata->s_bitmap_fe == NULL) {
-+ fe = udf_iget(sb, &addr);
-+ if (IS_ERR(fe)) {
- if (sb->s_flags & MS_RDONLY)
- udf_warn(sb, "bitmap inode efe not found but it's ok since the disc is mounted read-only\n");
- else {
- udf_err(sb, "bitmap inode efe not found and attempted read-write mount\n");
-- return -EIO;
-+ return PTR_ERR(fe);
- }
-- }
-+ } else
-+ mdata->s_bitmap_fe = fe;
- }
-
- udf_debug("udf_load_metadata_files Ok\n");
-@@ -1106,13 +1112,15 @@ static int udf_fill_partdesc_info(struct super_block *sb,
- phd->unallocSpaceTable.extPosition),
- .partitionReferenceNum = p_index,
- };
-+ struct inode *inode;
-
-- map->s_uspace.s_table = udf_iget(sb, &loc);
-- if (!map->s_uspace.s_table) {
-+ inode = udf_iget(sb, &loc);
-+ if (IS_ERR(inode)) {
- udf_debug("cannot load unallocSpaceTable (part %d)\n",
- p_index);
-- return -EIO;
-+ return PTR_ERR(inode);
- }
-+ map->s_uspace.s_table = inode;
- map->s_partition_flags |= UDF_PART_FLAG_UNALLOC_TABLE;
- udf_debug("unallocSpaceTable (part %d) @ %ld\n",
- p_index, map->s_uspace.s_table->i_ino);
-@@ -1139,14 +1147,15 @@ static int udf_fill_partdesc_info(struct super_block *sb,
- phd->freedSpaceTable.extPosition),
- .partitionReferenceNum = p_index,
- };
-+ struct inode *inode;
-
-- map->s_fspace.s_table = udf_iget(sb, &loc);
-- if (!map->s_fspace.s_table) {
-+ inode = udf_iget(sb, &loc);
-+ if (IS_ERR(inode)) {
- udf_debug("cannot load freedSpaceTable (part %d)\n",
- p_index);
-- return -EIO;
-+ return PTR_ERR(inode);
- }
--
-+ map->s_fspace.s_table = inode;
- map->s_partition_flags |= UDF_PART_FLAG_FREED_TABLE;
- udf_debug("freedSpaceTable (part %d) @ %ld\n",
- p_index, map->s_fspace.s_table->i_ino);
-@@ -1173,6 +1182,7 @@ static void udf_find_vat_block(struct super_block *sb, int p_index,
- struct udf_part_map *map = &sbi->s_partmaps[p_index];
- sector_t vat_block;
- struct kernel_lb_addr ino;
-+ struct inode *inode;
-
- /*
- * VAT file entry is in the last recorded block. Some broken disks have
-@@ -1181,10 +1191,13 @@ static void udf_find_vat_block(struct super_block *sb, int p_index,
- ino.partitionReferenceNum = type1_index;
- for (vat_block = start_block;
- vat_block >= map->s_partition_root &&
-- vat_block >= start_block - 3 &&
-- !sbi->s_vat_inode; vat_block--) {
-+ vat_block >= start_block - 3; vat_block--) {
- ino.logicalBlockNum = vat_block - map->s_partition_root;
-- sbi->s_vat_inode = udf_iget(sb, &ino);
-+ inode = udf_iget(sb, &ino);
-+ if (!IS_ERR(inode)) {
-+ sbi->s_vat_inode = inode;
-+ break;
-+ }
- }
- }
-
-@@ -2200,10 +2213,10 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)
- /* assign inodes by physical block number */
- /* perhaps it's not extensible enough, but for now ... */
- inode = udf_iget(sb, &rootdir);
-- if (!inode) {
-+ if (IS_ERR(inode)) {
- udf_err(sb, "Error in udf_iget, block=%d, partition=%d\n",
- rootdir.logicalBlockNum, rootdir.partitionReferenceNum);
-- ret = -EIO;
-+ ret = PTR_ERR(inode);
- goto error_out;
- }
-
-diff --git a/fs/udf/symlink.c b/fs/udf/symlink.c
-index d89f324..0422b7b 100644
---- a/fs/udf/symlink.c
-+++ b/fs/udf/symlink.c
-@@ -30,49 +30,73 @@
- #include <linux/buffer_head.h>
- #include "udf_i.h"
-
--static void udf_pc_to_char(struct super_block *sb, unsigned char *from,
-- int fromlen, unsigned char *to)
-+static int udf_pc_to_char(struct super_block *sb, unsigned char *from,
-+ int fromlen, unsigned char *to, int tolen)
- {
- struct pathComponent *pc;
- int elen = 0;
-+ int comp_len;
- unsigned char *p = to;
-
-+ /* Reserve one byte for terminating \0 */
-+ tolen--;
- while (elen < fromlen) {
- pc = (struct pathComponent *)(from + elen);
-+ elen += sizeof(struct pathComponent);
- switch (pc->componentType) {
- case 1:
- /*
- * Symlink points to some place which should be agreed
- * upon between originator and receiver of the media. Ignore.
- */
-- if (pc->lengthComponentIdent > 0)
-+ if (pc->lengthComponentIdent > 0) {
-+ elen += pc->lengthComponentIdent;
- break;
-+ }
- /* Fall through */
- case 2:
-+ if (tolen == 0)
-+ return -ENAMETOOLONG;
- p = to;
- *p++ = '/';
-+ tolen--;
- break;
- case 3:
-+ if (tolen < 3)
-+ return -ENAMETOOLONG;
- memcpy(p, "../", 3);
- p += 3;
-+ tolen -= 3;
- break;
- case 4:
-+ if (tolen < 2)
-+ return -ENAMETOOLONG;
- memcpy(p, "./", 2);
- p += 2;
-+ tolen -= 2;
- /* that would be . - just ignore */
- break;
- case 5:
-- p += udf_get_filename(sb, pc->componentIdent, p,
-- pc->lengthComponentIdent);
-+ elen += pc->lengthComponentIdent;
-+ if (elen > fromlen)
-+ return -EIO;
-+ comp_len = udf_get_filename(sb, pc->componentIdent,
-+ pc->lengthComponentIdent,
-+ p, tolen);
-+ p += comp_len;
-+ tolen -= comp_len;
-+ if (tolen == 0)
-+ return -ENAMETOOLONG;
- *p++ = '/';
-+ tolen--;
- break;
- }
-- elen += sizeof(struct pathComponent) + pc->lengthComponentIdent;
- }
- if (p > to + 1)
- p[-1] = '\0';
- else
- p[0] = '\0';
-+ return 0;
- }
-
- static int udf_symlink_filler(struct file *file, struct page *page)
-@@ -108,8 +132,10 @@ static int udf_symlink_filler(struct file *file, struct page *page)
- symlink = bh->b_data;
- }
-
-- udf_pc_to_char(inode->i_sb, symlink, inode->i_size, p);
-+ err = udf_pc_to_char(inode->i_sb, symlink, inode->i_size, p, PAGE_SIZE);
- brelse(bh);
-+ if (err)
-+ goto out_unlock_inode;
-
- up_read(&iinfo->i_data_sem);
- SetPageUptodate(page);
-diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h
-index be7dabb..6b10c98 100644
---- a/fs/udf/udfdecl.h
-+++ b/fs/udf/udfdecl.h
-@@ -143,7 +143,6 @@ extern int udf_expand_file_adinicb(struct inode *);
- extern struct buffer_head *udf_expand_dir_adinicb(struct inode *, int *, int *);
- extern struct buffer_head *udf_bread(struct inode *, int, int, int *);
- extern int udf_setsize(struct inode *, loff_t);
--extern void udf_read_inode(struct inode *);
- extern void udf_evict_inode(struct inode *);
- extern int udf_write_inode(struct inode *, struct writeback_control *wbc);
- extern long udf_block_map(struct inode *, sector_t);
-@@ -201,7 +200,8 @@ udf_get_lb_pblock(struct super_block *sb, struct kernel_lb_addr *loc,
- }
-
- /* unicode.c */
--extern int udf_get_filename(struct super_block *, uint8_t *, uint8_t *, int);
-+extern int udf_get_filename(struct super_block *, uint8_t *, int, uint8_t *,
-+ int);
- extern int udf_put_filename(struct super_block *, const uint8_t *, uint8_t *,
- int);
- extern int udf_build_ustr(struct ustr *, dstring *, int);
-diff --git a/fs/udf/unicode.c b/fs/udf/unicode.c
-index 44b815e..d29c06f 100644
---- a/fs/udf/unicode.c
-+++ b/fs/udf/unicode.c
-@@ -28,7 +28,8 @@
-
- #include "udf_sb.h"
-
--static int udf_translate_to_linux(uint8_t *, uint8_t *, int, uint8_t *, int);
-+static int udf_translate_to_linux(uint8_t *, int, uint8_t *, int, uint8_t *,
-+ int);
-
- static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen)
- {
-@@ -333,8 +334,8 @@ try_again:
- return u_len + 1;
- }
-
--int udf_get_filename(struct super_block *sb, uint8_t *sname, uint8_t *dname,
-- int flen)
-+int udf_get_filename(struct super_block *sb, uint8_t *sname, int slen,
-+ uint8_t *dname, int dlen)
- {
- struct ustr *filename, *unifilename;
- int len = 0;
-@@ -347,7 +348,7 @@ int udf_get_filename(struct super_block *sb, uint8_t *sname, uint8_t *dname,
- if (!unifilename)
- goto out1;
-
-- if (udf_build_ustr_exact(unifilename, sname, flen))
-+ if (udf_build_ustr_exact(unifilename, sname, slen))
- goto out2;
-
- if (UDF_QUERY_FLAG(sb, UDF_FLAG_UTF8)) {
-@@ -366,7 +367,8 @@ int udf_get_filename(struct super_block *sb, uint8_t *sname, uint8_t *dname,
- } else
- goto out2;
-
-- len = udf_translate_to_linux(dname, filename->u_name, filename->u_len,
-+ len = udf_translate_to_linux(dname, dlen,
-+ filename->u_name, filename->u_len,
- unifilename->u_name, unifilename->u_len);
- out2:
- kfree(unifilename);
-@@ -403,10 +405,12 @@ int udf_put_filename(struct super_block *sb, const uint8_t *sname,
- #define EXT_MARK '.'
- #define CRC_MARK '#'
- #define EXT_SIZE 5
-+/* Number of chars we need to store generated CRC to make filename unique */
-+#define CRC_LEN 5
-
--static int udf_translate_to_linux(uint8_t *newName, uint8_t *udfName,
-- int udfLen, uint8_t *fidName,
-- int fidNameLen)
-+static int udf_translate_to_linux(uint8_t *newName, int newLen,
-+ uint8_t *udfName, int udfLen,
-+ uint8_t *fidName, int fidNameLen)
- {
- int index, newIndex = 0, needsCRC = 0;
- int extIndex = 0, newExtIndex = 0, hasExt = 0;
-@@ -440,7 +444,7 @@ static int udf_translate_to_linux(uint8_t *newName, uint8_t *udfName,
- newExtIndex = newIndex;
- }
- }
-- if (newIndex < 256)
-+ if (newIndex < newLen)
- newName[newIndex++] = curr;
- else
- needsCRC = 1;
-@@ -468,13 +472,13 @@ static int udf_translate_to_linux(uint8_t *newName, uint8_t *udfName,
- }
- ext[localExtIndex++] = curr;
- }
-- maxFilenameLen = 250 - localExtIndex;
-+ maxFilenameLen = newLen - CRC_LEN - localExtIndex;
- if (newIndex > maxFilenameLen)
- newIndex = maxFilenameLen;
- else
- newIndex = newExtIndex;
-- } else if (newIndex > 250)
-- newIndex = 250;
-+ } else if (newIndex > newLen - CRC_LEN)
-+ newIndex = newLen - CRC_LEN;
- newName[newIndex++] = CRC_MARK;
- valueCRC = crc_itu_t(0, fidName, fidNameLen);
- newName[newIndex++] = hexChar[(valueCRC & 0xf000) >> 12];
diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
index 8d974c4..b82f6ec 100644
--- a/fs/ufs/swab.h
@@ -68844,7 +68096,7 @@ index aa138d6..5f3a811 100644
error = notify_change(path->dentry, &newattrs, &delegated_inode);
mutex_unlock(&inode->i_mutex);
diff --git a/fs/xattr.c b/fs/xattr.c
-index 3377dff..f394815 100644
+index 64e83ef..b6be154 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
@@ -68898,16 +68150,7 @@ index 3377dff..f394815 100644
out:
if (vvalue)
vfree(vvalue);
-@@ -377,7 +403,7 @@ retry:
- return error;
- error = mnt_want_write(path.mnt);
- if (!error) {
-- error = setxattr(path.dentry, name, value, size, flags);
-+ error = setxattr(&path, name, value, size, flags);
- mnt_drop_write(path.mnt);
- }
- path_put(&path);
-@@ -401,7 +427,7 @@ retry:
+@@ -376,7 +402,7 @@ retry:
return error;
error = mnt_want_write(path.mnt);
if (!error) {
@@ -68916,7 +68159,7 @@ index 3377dff..f394815 100644
mnt_drop_write(path.mnt);
}
path_put(&path);
-@@ -416,16 +442,14 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
+@@ -405,16 +431,14 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
const void __user *,value, size_t, size, int, flags)
{
struct fd f = fdget(fd);
@@ -68935,7 +68178,7 @@ index 3377dff..f394815 100644
mnt_drop_write_file(f.file);
}
fdput(f);
-@@ -626,7 +650,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
+@@ -600,7 +624,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
* Extended attribute REMOVE operations
*/
static long
@@ -68944,7 +68187,7 @@ index 3377dff..f394815 100644
{
int error;
char kname[XATTR_NAME_MAX + 1];
-@@ -637,7 +661,10 @@ removexattr(struct dentry *d, const char __user *name)
+@@ -611,7 +635,10 @@ removexattr(struct dentry *d, const char __user *name)
if (error < 0)
return error;
@@ -68955,8 +68198,8 @@ index 3377dff..f394815 100644
+ return vfs_removexattr(path->dentry, kname);
}
- SYSCALL_DEFINE2(removexattr, const char __user *, pathname,
-@@ -652,7 +679,7 @@ retry:
+ static int path_removexattr(const char __user *pathname,
+@@ -625,7 +652,7 @@ retry:
return error;
error = mnt_want_write(path.mnt);
if (!error) {
@@ -68965,16 +68208,7 @@ index 3377dff..f394815 100644
mnt_drop_write(path.mnt);
}
path_put(&path);
-@@ -675,7 +702,7 @@ retry:
- return error;
- error = mnt_want_write(path.mnt);
- if (!error) {
-- error = removexattr(path.dentry, name);
-+ error = removexattr(&path, name);
- mnt_drop_write(path.mnt);
- }
- path_put(&path);
-@@ -689,16 +716,16 @@ retry:
+@@ -651,16 +678,16 @@ SYSCALL_DEFINE2(lremovexattr, const char __user *, pathname,
SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
{
struct fd f = fdget(fd);
@@ -68995,11 +68229,11 @@ index 3377dff..f394815 100644
mnt_drop_write_file(f.file);
}
fdput(f);
-diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
-index 152543c..d80c361 100644
---- a/fs/xfs/xfs_bmap.c
-+++ b/fs/xfs/xfs_bmap.c
-@@ -584,7 +584,7 @@ xfs_bmap_validate_ret(
+diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
+index 79c9819..22226b4 100644
+--- a/fs/xfs/libxfs/xfs_bmap.c
++++ b/fs/xfs/libxfs/xfs_bmap.c
+@@ -583,7 +583,7 @@ xfs_bmap_validate_ret(
#else
#define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
@@ -69009,10 +68243,10 @@ index 152543c..d80c361 100644
/*
diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
-index aead369..0dfecfd 100644
+index f1b69ed..3d0222f 100644
--- a/fs/xfs/xfs_dir2_readdir.c
+++ b/fs/xfs/xfs_dir2_readdir.c
-@@ -160,7 +160,12 @@ xfs_dir2_sf_getdents(
+@@ -159,7 +159,12 @@ xfs_dir2_sf_getdents(
ino = dp->d_ops->sf_get_ino(sfp, sfep);
filetype = dp->d_ops->sf_get_ftype(sfep);
ctx->pos = off & 0x7fffffff;
@@ -69020,14 +68254,14 @@ index aead369..0dfecfd 100644
+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
+ char name[sfep->namelen];
+ memcpy(name, sfep->name, sfep->namelen);
-+ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(mp, filetype)))
++ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(dp->i_mount, filetype)))
+ return 0;
+ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
- xfs_dir3_get_dtype(mp, filetype)))
+ xfs_dir3_get_dtype(dp->i_mount, filetype)))
return 0;
sfep = dp->d_ops->sf_nextentry(sfp, sfep);
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
-index 78e62cc..eec3706 100644
+index 24c926b6..8726af88 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -122,7 +122,7 @@ xfs_find_handle(
@@ -69040,10 +68274,10 @@ index 78e62cc..eec3706 100644
goto out_put;
diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
-index f9bb590..af3c389 100644
+index 6a51619..9592e1b 100644
--- a/fs/xfs/xfs_linux.h
+++ b/fs/xfs/xfs_linux.h
-@@ -229,7 +229,7 @@ static inline kgid_t xfs_gid_to_kgid(__uint32_t gid)
+@@ -234,7 +234,7 @@ static inline kgid_t xfs_gid_to_kgid(__uint32_t gid)
* of the compiler which do not like us using do_div in the middle
* of large functions.
*/
@@ -69052,7 +68286,7 @@ index f9bb590..af3c389 100644
{
__u32 mod;
-@@ -285,7 +285,7 @@ static inline __u32 xfs_do_mod(void *a, __u32 b, int n)
+@@ -290,7 +290,7 @@ static inline __u32 xfs_do_mod(void *a, __u32 b, int n)
return 0;
}
#else
@@ -69063,10 +68297,10 @@ index f9bb590..af3c389 100644
diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
new file mode 100644
-index 0000000..cdaa3ef
+index 0000000..31f8fe4
--- /dev/null
+++ b/grsecurity/Kconfig
-@@ -0,0 +1,1168 @@
+@@ -0,0 +1,1182 @@
+#
+# grecurity configuration
+#
@@ -69129,19 +68363,17 @@ index 0000000..cdaa3ef
+ you may not be able to boot into a graphical environment with this
+ option enabled. In this case, you should use the RBAC system instead.
+
-+config GRKERNSEC_JIT_HARDEN
-+ bool "Harden BPF JIT against spray attacks"
++config GRKERNSEC_BPF_HARDEN
++ bool "Harden BPF interpreter"
+ default y if GRKERNSEC_CONFIG_AUTO
-+ depends on BPF_JIT && X86
+ help
-+ If you say Y here, the native code generated by the kernel's Berkeley
-+ Packet Filter (BPF) JIT engine will be hardened against JIT-spraying
-+ attacks that attempt to fit attacker-beneficial instructions in
-+ 32bit immediate fields of JIT-generated native instructions. The
-+ attacker will generally aim to cause an unintended instruction sequence
-+ of JIT-generated native code to execute by jumping into the middle of
-+ a generated instruction. This feature effectively randomizes the 32bit
-+ immediate constants present in the generated code to thwart such attacks.
++ Unlike previous versions of grsecurity that hardened both the BPF
++ interpreted code against corruption at rest as well as the JIT code
++ against JIT-spray attacks and attacker-controlled immediate values
++ for ROP, this feature will enforce disabling of the new eBPF JIT engine
++ and will ensure the interpreted code is read-only at rest. This feature
++ may be removed at a later time when eBPF stabilizes to entirely revert
++ back to the more secure pre-3.16 BPF interpreter/JIT.
+
+ If you're using KERNEXEC, it's recommended that you enable this option
+ to supplement the hardening of the kernel.
@@ -69709,6 +68941,22 @@ index 0000000..cdaa3ef
+ sysctl option is enabled, a sysctl option with name
+ "chroot_deny_sysctl" is created.
+
++config GRKERNSEC_CHROOT_RENAME
++ bool "Deny bad renames"
++ default y if GRKERNSEC_CONFIG_AUTO
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, an attacker in a chroot will not be able to
++ abuse the ability to create double chroots to break out of the
++ chroot by exploiting a race condition between a rename of a directory
++ within a chroot against an open of a symlink with relative path
++ components. This feature will likewise prevent an accomplice outside
++ a chroot from enabling a user inside the chroot to break out and make
++ use of their credentials on the global filesystem. Enabling this
++ feature is essential to prevent root users from breaking out of a
++ chroot. If the sysctl option is enabled, a sysctl option with name
++ "chroot_deny_bad_rename" is created.
++
+config GRKERNSEC_CHROOT_CAPS
+ bool "Capability restrictions"
+ default y if GRKERNSEC_CONFIG_AUTO
@@ -70297,10 +69545,10 @@ index 0000000..30ababb
+endif
diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
new file mode 100644
-index 0000000..c83525f
+index 0000000..9c2d930
--- /dev/null
+++ b/grsecurity/gracl.c
-@@ -0,0 +1,2697 @@
+@@ -0,0 +1,2721 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
@@ -72414,13 +71662,15 @@ index 0000000..c83525f
+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
+ struct dentry *old_dentry,
+ struct dentry *new_dentry,
-+ struct vfsmount *mnt, const __u8 replace)
++ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
+{
+ struct name_entry *matchn;
++ struct name_entry *matchn2 = NULL;
+ struct inodev_entry *inodev;
+ struct inode *inode = new_dentry->d_inode;
+ ino_t old_ino = old_dentry->d_inode->i_ino;
+ dev_t old_dev = __get_dev(old_dentry);
++ unsigned int exchange = flags & RENAME_EXCHANGE;
+
+ /* vfs_rename swaps the name and parent link for old_dentry and
+ new_dentry
@@ -72436,12 +71686,30 @@ index 0000000..c83525f
+ preempt_disable();
+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
+
++ /* exchange cases:
++ a filename exists for the source, but not dest
++ do a recreate on source
++ a filename exists for the dest, but not source
++ do a recreate on dest
++ a filename exists for both source and dest
++ delete source and dest, then create source and dest
++ a filename exists for neither source nor dest
++ no updates needed
++
++ the name entry lookups get us the old inode/dev associated with
++ each name, so do the deletes first (if possible) so that when
++ we do the create, we pick up on the right entries
++ */
++
++ if (exchange)
++ matchn2 = lookup_name_entry(gr_to_filename_rbac(new_dentry, mnt));
++
+ /* we wouldn't have to check d_inode if it weren't for
+ NFS silly-renaming
+ */
+
+ write_lock(&gr_inode_lock);
-+ if (unlikely(replace && inode)) {
++ if (unlikely((replace || exchange) && inode)) {
+ ino_t new_ino = inode->i_ino;
+ dev_t new_dev = __get_dev(new_dentry);
+
@@ -72454,9 +71722,12 @@ index 0000000..c83525f
+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
+ do_handle_delete(inodev, old_ino, old_dev);
+
-+ if (unlikely((unsigned long)matchn))
++ if (unlikely(matchn != NULL))
+ do_handle_create(matchn, old_dentry, mnt);
+
++ if (unlikely(matchn2 != NULL))
++ do_handle_create(matchn2, new_dentry, mnt);
++
+ write_unlock(&gr_inode_lock);
+ preempt_enable();
+
@@ -72809,14 +72080,15 @@ index 0000000..c83525f
+ __u8 whr, chr;
+ __u8 wmin, cmin;
+ __u8 wsec, csec;
-+ struct timespec timeval;
++ struct timespec curtime, starttime;
+
+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
+ !(task->acl->mode & GR_PROCACCT)))
+ return;
-+
-+ do_posix_clock_monotonic_gettime(&timeval);
-+ runtime = timeval.tv_sec - task->start_time.tv_sec;
++
++ curtime = ns_to_timespec(ktime_get_ns());
++ starttime = ns_to_timespec(task->start_time);
++ runtime = curtime.tv_sec - starttime.tv_sec;
+ wday = runtime / (60 * 60 * 24);
+ runtime -= wday * (60 * 60 * 24);
+ whr = runtime / (60 * 60);
@@ -73520,10 +72792,10 @@ index 0000000..ca25605
+
diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
new file mode 100644
-index 0000000..4c7e00a
+index 0000000..8ee8e4f
--- /dev/null
+++ b/grsecurity/gracl_fs.c
-@@ -0,0 +1,439 @@
+@@ -0,0 +1,447 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/types.h>
@@ -73890,7 +73162,7 @@ index 0000000..4c7e00a
+ const struct vfsmount *parent_mnt,
+ struct dentry *old_dentry,
+ struct inode *old_parent_inode,
-+ struct vfsmount *old_mnt, const struct filename *newname)
++ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags)
+{
+ __u32 comp1, comp2;
+ int error = 0;
@@ -73898,7 +73170,15 @@ index 0000000..4c7e00a
+ if (unlikely(!gr_acl_is_enabled()))
+ return 0;
+
-+ if (d_is_negative(new_dentry)) {
++ if (flags & RENAME_EXCHANGE) {
++ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
++ GR_AUDIT_READ | GR_AUDIT_WRITE |
++ GR_SUPPRESS, parent_mnt);
++ comp2 =
++ gr_search_file(old_dentry,
++ GR_READ | GR_WRITE | GR_AUDIT_READ |
++ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
++ } else if (d_is_negative(new_dentry)) {
+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
@@ -76751,7 +76031,7 @@ index 0000000..2040e61
+}
diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
new file mode 100644
-index 0000000..98011b0
+index 0000000..6b0c9cc
--- /dev/null
+++ b/grsecurity/gracl_shm.c
@@ -0,0 +1,40 @@
@@ -76766,7 +76046,7 @@ index 0000000..98011b0
+
+int
+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
-+ const time_t shm_createtime, const kuid_t cuid, const int shmid)
++ const u64 shm_createtime, const kuid_t cuid, const int shmid)
+{
+ struct task_struct *task;
+
@@ -76781,7 +76061,7 @@ index 0000000..98011b0
+ if (unlikely(!task))
+ task = find_task_by_vpid(shm_lapid);
+
-+ if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) ||
++ if (unlikely(task && (time_before_eq64(task->start_time, shm_createtime) ||
+ (task_pid_nr(task) == shm_lapid)) &&
+ (task->acl->mode & GR_PROTSHM) &&
+ (task->acl != current->acl))) {
@@ -76822,10 +76102,10 @@ index 0000000..bc0be01
+}
diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
new file mode 100644
-index 0000000..baa635c
+index 0000000..114ea4f
--- /dev/null
+++ b/grsecurity/grsec_chroot.c
-@@ -0,0 +1,387 @@
+@@ -0,0 +1,467 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
@@ -76841,6 +76121,88 @@ index 0000000..baa635c
+int gr_init_ran;
+#endif
+
++void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
++{
++#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
++ struct dentry *tmpd = dentry;
++
++ read_seqlock_excl(&mount_lock);
++ write_seqlock(&rename_lock);
++
++ while (tmpd != mnt->mnt_root) {
++ atomic_inc(&tmpd->chroot_refcnt);
++ tmpd = tmpd->d_parent;
++ }
++ atomic_inc(&tmpd->chroot_refcnt);
++
++ write_sequnlock(&rename_lock);
++ read_sequnlock_excl(&mount_lock);
++#endif
++}
++
++void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
++{
++#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
++ struct dentry *tmpd = dentry;
++
++ read_seqlock_excl(&mount_lock);
++ write_seqlock(&rename_lock);
++
++ while (tmpd != mnt->mnt_root) {
++ atomic_dec(&tmpd->chroot_refcnt);
++ tmpd = tmpd->d_parent;
++ }
++ atomic_dec(&tmpd->chroot_refcnt);
++
++ write_sequnlock(&rename_lock);
++ read_sequnlock_excl(&mount_lock);
++#endif
++}
++
++#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
++static struct dentry *get_closest_chroot(struct dentry *dentry)
++{
++ write_seqlock(&rename_lock);
++ do {
++ if (atomic_read(&dentry->chroot_refcnt)) {
++ write_sequnlock(&rename_lock);
++ return dentry;
++ }
++ dentry = dentry->d_parent;
++ } while (!IS_ROOT(dentry));
++ write_sequnlock(&rename_lock);
++ return NULL;
++}
++#endif
++
++int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
++ struct dentry *newdentry, struct vfsmount *newmnt)
++{
++#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
++ struct dentry *chroot;
++
++ if (unlikely(!grsec_enable_chroot_rename))
++ return 0;
++
++ if (likely(!proc_is_chrooted(current) && gr_is_global_root(current_uid())))
++ return 0;
++
++ chroot = get_closest_chroot(olddentry);
++
++ if (chroot == NULL)
++ return 0;
++
++ if (is_subdir(newdentry, chroot))
++ return 0;
++
++ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_RENAME_MSG, olddentry, oldmnt);
++
++ return 1;
++#else
++ return 0;
++#endif
++}
++
+void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
+{
+#ifdef CONFIG_GRKERNSEC
@@ -77018,11 +76380,10 @@ index 0000000..baa635c
+
+int
+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
-+ const time_t shm_createtime)
++ const u64 shm_createtime)
+{
+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
+ struct task_struct *p;
-+ time_t starttime;
+
+ if (unlikely(!grsec_enable_chroot_shmat))
+ return 1;
@@ -77034,8 +76395,7 @@ index 0000000..baa635c
+ read_lock(&tasklist_lock);
+
+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
-+ starttime = p->start_time.tv_sec;
-+ if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) {
++ if (time_before_eq64(p->start_time, shm_createtime)) {
+ if (have_same_root(current, p)) {
+ goto allow;
+ } else {
@@ -77215,10 +76575,10 @@ index 0000000..baa635c
+}
diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
new file mode 100644
-index 0000000..1e028d7
+index 0000000..0f9ac91
--- /dev/null
+++ b/grsecurity/grsec_disabled.c
-@@ -0,0 +1,439 @@
+@@ -0,0 +1,440 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
@@ -77373,7 +76733,7 @@ index 0000000..1e028d7
+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
+ struct dentry *old_dentry,
+ struct dentry *new_dentry,
-+ struct vfsmount *mnt, const __u8 replace)
++ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
+{
+ return;
+}
@@ -77533,7 +76893,8 @@ index 0000000..1e028d7
+ const struct vfsmount *parent_mnt,
+ const struct dentry *old_dentry,
+ const struct inode *old_parent_inode,
-+ const struct vfsmount *old_mnt, const struct filename *newname)
++ const struct vfsmount *old_mnt, const struct filename *newname,
++ unsigned int flags)
+{
+ return 0;
+}
@@ -77547,7 +76908,7 @@ index 0000000..1e028d7
+
+int
+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
-+ const time_t shm_createtime, const kuid_t cuid, const int shmid)
++ const u64 shm_createtime, const kuid_t cuid, const int shmid)
+{
+ return 1;
+}
@@ -77913,10 +77274,10 @@ index 0000000..8ca18bf
+}
diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
new file mode 100644
-index 0000000..b7cb191
+index 0000000..4ed9e7d
--- /dev/null
+++ b/grsecurity/grsec_init.c
-@@ -0,0 +1,286 @@
+@@ -0,0 +1,290 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/mm.h>
@@ -77959,6 +77320,7 @@ index 0000000..b7cb191
+int grsec_enable_chroot_nice;
+int grsec_enable_chroot_execlog;
+int grsec_enable_chroot_caps;
++int grsec_enable_chroot_rename;
+int grsec_enable_chroot_sysctl;
+int grsec_enable_chroot_unix;
+int grsec_enable_tpe;
@@ -78170,6 +77532,9 @@ index 0000000..b7cb191
+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
+ grsec_enable_chroot_caps = 1;
+#endif
++#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
++ grsec_enable_chroot_rename = 1;
++#endif
+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
+ grsec_enable_chroot_sysctl = 1;
+#endif
@@ -78724,7 +78089,7 @@ index 0000000..0e39d8c
+}
diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
new file mode 100644
-index 0000000..cd9e124
+index 0000000..6f9eb73
--- /dev/null
+++ b/grsecurity/grsec_mount.c
@@ -0,0 +1,65 @@
@@ -78756,11 +78121,11 @@ index 0000000..cd9e124
+}
+
+void
-+gr_log_mount(const char *from, const char *to, const int retval)
++gr_log_mount(const char *from, struct path *to, const int retval)
+{
+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
+ if (grsec_enable_mount && (retval >= 0))
-+ gr_log_str_str(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to);
++ gr_log_str_fs(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to->dentry, to->mnt);
+#endif
+ return;
+}
@@ -79400,10 +78765,10 @@ index 0000000..e3650b6
+}
diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
new file mode 100644
-index 0000000..8159888
+index 0000000..cce889e
--- /dev/null
+++ b/grsecurity/grsec_sysctl.c
-@@ -0,0 +1,479 @@
+@@ -0,0 +1,488 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/sysctl.h>
@@ -79673,6 +79038,15 @@ index 0000000..8159888
+ .proc_handler = &proc_dointvec,
+ },
+#endif
++#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
++ {
++ .procname = "chroot_deny_bad_rename",
++ .data = &grsec_enable_chroot_rename,
++ .maxlen = sizeof(int),
++ .mode = 0600,
++ .proc_handler = &proc_dointvec,
++ },
++#endif
+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
+ {
+ .procname = "chroot_deny_sysctl",
@@ -80456,21 +79830,8 @@ index b7babf0..1e4b4f1 100644
+#endif
+
#endif /* _ASM_GENERIC_ATOMIC_LONG_H */
-diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
-index 33bd2de..f31bff97 100644
---- a/include/asm-generic/atomic.h
-+++ b/include/asm-generic/atomic.h
-@@ -153,7 +153,7 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
- * Atomically clears the bits set in @mask from @v
- */
- #ifndef atomic_clear_mask
--static inline void atomic_clear_mask(unsigned long mask, atomic_t *v)
-+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
- {
- unsigned long flags;
-
diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
-index b18ce4f..2ee2843 100644
+index 30ad9c8..c70c170 100644
--- a/include/asm-generic/atomic64.h
+++ b/include/asm-generic/atomic64.h
@@ -16,6 +16,8 @@ typedef struct {
@@ -80482,7 +79843,7 @@ index b18ce4f..2ee2843 100644
#define ATOMIC64_INIT(i) { (i) }
extern long long atomic64_read(const atomic64_t *v);
-@@ -39,4 +41,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
+@@ -51,4 +53,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
#define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
@@ -80498,10 +79859,10 @@ index b18ce4f..2ee2843 100644
+
#endif /* _ASM_GENERIC_ATOMIC64_H */
diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
-index 6f692f8..2ad9dd2 100644
+index 1402fa8..025a736 100644
--- a/include/asm-generic/barrier.h
+++ b/include/asm-generic/barrier.h
-@@ -66,7 +66,7 @@
+@@ -74,7 +74,7 @@
do { \
compiletime_assert_atomic_type(*p); \
smp_mb(); \
@@ -80585,6 +79946,19 @@ index 0d68a1e..b74a761 100644
{
machine_restart(NULL);
}
+diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
+index b8fdc57..c6d5a5c 100644
+--- a/include/asm-generic/io.h
++++ b/include/asm-generic/io.h
+@@ -289,7 +289,7 @@ static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p)
+ * These are pretty trivial
+ */
+ #ifndef virt_to_phys
+-static inline unsigned long virt_to_phys(volatile void *address)
++static inline unsigned long __intentional_overflow(-1) virt_to_phys(volatile void *address)
+ {
+ return __pa((unsigned long)address);
+ }
diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
index 90f99c7..00ce236 100644
--- a/include/asm-generic/kmap_types.h
@@ -80726,10 +80100,10 @@ index 810431d..0ec4804f 100644
* (puds are folded into pgds so this doesn't get actually called,
* but the define is needed for a generic inline function.)
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
-index 38a7437..47f62a4 100644
+index 752e30d..87f172d 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
-@@ -802,6 +802,22 @@ static inline void pmdp_set_numa(struct mm_struct *mm, unsigned long addr,
+@@ -828,6 +828,22 @@ static inline void pmdp_set_numa(struct mm_struct *mm, unsigned long addr,
}
#endif /* CONFIG_NUMA_BALANCING */
@@ -80778,10 +80152,10 @@ index 72d8803..cb9749c 100644
+
#endif /* __ASM_GENERIC_UACCESS_H */
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
-index bc2121f..2f41f9a 100644
+index aa70cbd..fd72c7a 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
-@@ -232,6 +232,7 @@
+@@ -233,6 +233,7 @@
.rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start_rodata) = .; \
*(.rodata) *(.rodata.*) \
@@ -80789,7 +80163,7 @@ index bc2121f..2f41f9a 100644
*(__vermagic) /* Kernel version magic */ \
. = ALIGN(8); \
VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
-@@ -716,17 +717,18 @@
+@@ -724,17 +725,18 @@
* section in the linker script will go there too. @phdr should have
* a leading colon.
*
@@ -80813,7 +80187,7 @@ index bc2121f..2f41f9a 100644
/**
* PERCPU_SECTION - define output section for percpu area, simple version
diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
-index e73c19e..5b89e00 100644
+index 623a59c..1e79ab9 100644
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -34,7 +34,7 @@ struct crypto_type {
@@ -80826,18 +80200,18 @@ index e73c19e..5b89e00 100644
struct crypto_instance {
struct crypto_alg alg;
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index 04a7f31..668d424 100644
+index 53ed876..5bb09be 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
-@@ -67,6 +67,7 @@
- #include <linux/workqueue.h>
- #include <linux/poll.h>
+@@ -59,6 +59,7 @@
+
+ #include <asm/mman.h>
#include <asm/pgalloc.h>
+#include <asm/local.h>
- #include <drm/drm.h>
- #include <drm/drm_sarea.h>
- #include <drm/drm_vma_manager.h>
-@@ -297,10 +298,12 @@ do { \
+ #include <asm/uaccess.h>
+
+ #include <uapi/drm/drm.h>
+@@ -223,10 +224,12 @@ void drm_err(const char *func, const char *format, ...);
* \param cmd command.
* \param arg argument.
*/
@@ -80852,7 +80226,7 @@ index 04a7f31..668d424 100644
unsigned long arg);
#define DRM_IOCTL_NR(n) _IOC_NR(n)
-@@ -316,10 +319,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
+@@ -242,10 +245,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
struct drm_ioctl_desc {
unsigned int cmd;
int flags;
@@ -80865,7 +80239,7 @@ index 04a7f31..668d424 100644
/**
* Creates a driver or general drm_ioctl_desc array entry for the given
-@@ -1022,7 +1025,8 @@ struct drm_info_list {
+@@ -629,7 +632,8 @@ struct drm_info_list {
int (*show)(struct seq_file*, void*); /** show callback */
u32 driver_features; /**< Required driver features for this entry */
void *data;
@@ -80875,17 +80249,17 @@ index 04a7f31..668d424 100644
/**
* debugfs node structure. This structure represents a debugfs file.
-@@ -1106,7 +1110,7 @@ struct drm_device {
+@@ -713,7 +717,7 @@ struct drm_device {
/** \name Usage Counters */
/*@{ */
-- int open_count; /**< Outstanding files open */
-+ local_t open_count; /**< Outstanding files open */
+- int open_count; /**< Outstanding files open, protected by drm_global_mutex. */
++ local_t open_count; /**< Outstanding files open, protected by drm_global_mutex. */
+ spinlock_t buf_lock; /**< For drm_device::buf_use and a few other things. */
int buf_use; /**< Buffers in use -- cannot alloc */
atomic_t buf_alloc; /**< Buffer allocation in progress */
- /*@} */
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
-index b1388b5..e1d1163 100644
+index a3d75fe..6802f9c 100644
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
@@ -109,7 +109,7 @@ struct drm_encoder_helper_funcs {
@@ -80898,7 +80272,7 @@ index b1388b5..e1d1163 100644
/**
* drm_connector_helper_funcs - helper operations for connectors
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
-index 940ece4..8cb727f 100644
+index a70d456..6ea07cd 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -37,7 +37,7 @@
@@ -80971,10 +80345,10 @@ index c1da539..1dcec55 100644
struct atmphy_ops {
int (*start)(struct atm_dev *dev);
diff --git a/include/linux/audit.h b/include/linux/audit.h
-index 419b7d7..b79b4f2 100644
+index 10f155b..6c73ffe 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
-@@ -200,7 +200,7 @@ static inline void audit_ptrace(struct task_struct *t)
+@@ -219,7 +219,7 @@ static inline void audit_ptrace(struct task_struct *t)
extern unsigned int audit_serial(void);
extern int auditsc_get_stamp(struct audit_context *ctx,
struct timespec *t, unsigned int *serial);
@@ -80984,19 +80358,19 @@ index 419b7d7..b79b4f2 100644
static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
{
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
-index b4a745d..e3c0942 100644
+index 61f29e5..e67c658 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
-@@ -45,7 +45,7 @@ struct linux_binprm {
+@@ -44,7 +44,7 @@ struct linux_binprm {
+ unsigned interp_flags;
unsigned interp_data;
unsigned long loader, exec;
- char tcomm[TASK_COMM_LEN];
-};
+} __randomize_layout;
#define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
#define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
-@@ -74,8 +74,10 @@ struct linux_binfmt {
+@@ -73,8 +73,10 @@ struct linux_binfmt {
int (*load_binary)(struct linux_binprm *);
int (*load_shlib)(struct file *);
int (*core_dump)(struct coredump_params *cprm);
@@ -81040,10 +80414,10 @@ index 5d858e0..336c1d9 100644
if (sizeof(l) == 4)
return fls(l);
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
-index a693c6d..cec897f 100644
+index aac0f9e..73c9869 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
-@@ -1571,7 +1571,7 @@ struct block_device_operations {
+@@ -1615,7 +1615,7 @@ struct block_device_operations {
/* this callback is with swap_lock and sometimes page table lock held */
void (*swap_slot_free_notify) (struct block_device *, unsigned long);
struct module *owner;
@@ -81085,16 +80459,17 @@ index 17e7e82..1d7da26 100644
#define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
#endif
diff --git a/include/linux/capability.h b/include/linux/capability.h
-index aa93e5e..18bb953 100644
+index aa93e5e..985a1b0 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
-@@ -215,8 +215,13 @@ extern bool capable(int cap);
+@@ -214,9 +214,14 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
+ extern bool capable(int cap);
extern bool ns_capable(struct user_namespace *ns, int cap);
extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
++extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
+extern bool capable_nolog(int cap);
+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
-+extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
/* audit system wants to get cap info from files as well */
extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
@@ -81128,22 +80503,22 @@ index 4ce9056..86caac6 100644
extern struct cleancache_ops *
cleancache_register_ops(struct cleancache_ops *ops);
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
-index 939533d..cf0a57c 100644
+index 2839c63..5b06b6b 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
-@@ -166,6 +166,7 @@ struct clk_ops {
- unsigned long parent_accuracy);
+@@ -191,6 +191,7 @@ struct clk_ops {
void (*init)(struct clk_hw *hw);
+ int (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
};
+typedef struct clk_ops __no_const clk_ops_no_const;
/**
* struct clk_init_data - holds init data that's common to all clocks and is
diff --git a/include/linux/compat.h b/include/linux/compat.h
-index 3f448c6..df3ce1d 100644
+index e649426..a74047b 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
-@@ -313,7 +313,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
+@@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
compat_size_t __user *len_ptr);
asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
@@ -81152,7 +80527,7 @@ index 3f448c6..df3ce1d 100644
asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
compat_ssize_t msgsz, int msgflg);
-@@ -420,7 +420,7 @@ extern int compat_ptrace_request(struct task_struct *child,
+@@ -436,7 +436,7 @@ extern int compat_ptrace_request(struct task_struct *child,
extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
compat_ulong_t addr, compat_ulong_t data);
asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
@@ -81162,7 +80537,7 @@ index 3f448c6..df3ce1d 100644
asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
/*
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
-index 2507fd2..55203f8 100644
+index d1a5582..4424efa 100644
--- a/include/linux/compiler-gcc4.h
+++ b/include/linux/compiler-gcc4.h
@@ -39,9 +39,34 @@
@@ -81201,7 +80576,7 @@ index 2507fd2..55203f8 100644
* Mark a position in code as unreachable. This can be used to
* suppress control flow warnings after asm blocks that transfer
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
-index 2472740..4857634 100644
+index d5ad7b1..3b74638 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -5,11 +5,14 @@
@@ -81269,7 +80644,7 @@ index 2472740..4857634 100644
#endif
/* Indirect macros required for expanded argument pasting, eg. __LINE__. */
-@@ -279,6 +301,34 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
+@@ -286,6 +308,34 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
# define __attribute_const__ /* unimplemented */
#endif
@@ -81304,7 +80679,7 @@ index 2472740..4857634 100644
/*
* Tell gcc if a function is cold. The compiler will assume any path
* directly leading to the call is unlikely.
-@@ -288,6 +338,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
+@@ -295,6 +345,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
#define __cold
#endif
@@ -81327,7 +80702,7 @@ index 2472740..4857634 100644
/* Simple shorthand for a section definition */
#ifndef __section
# define __section(S) __attribute__ ((__section__(#S)))
-@@ -362,7 +428,8 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
+@@ -378,7 +444,8 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
* use is to mediate communication between process-level code and irq/NMI
* handlers, all running on the same CPU.
*/
@@ -81378,10 +80753,10 @@ index 34025df..d94bbbc 100644
/*
* Users often need to create attribute structures for their configurable
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
-index 4d89e0e..5281847 100644
+index 503b085b..1638c9e 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
-@@ -191,6 +191,7 @@ struct global_attr {
+@@ -206,6 +206,7 @@ struct global_attr {
ssize_t (*store)(struct kobject *a, struct attribute *b,
const char *c, size_t count);
};
@@ -81389,7 +80764,7 @@ index 4d89e0e..5281847 100644
#define define_one_global_ro(_name) \
static struct global_attr _name = \
-@@ -232,7 +233,7 @@ struct cpufreq_driver {
+@@ -273,7 +274,7 @@ struct cpufreq_driver {
bool boost_supported;
bool boost_enabled;
int (*set_boost) (int state);
@@ -81399,7 +80774,7 @@ index 4d89e0e..5281847 100644
/* flags */
#define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
-index 50fcbb0..9d2dbd9 100644
+index 25e0df6..952dffd 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -50,7 +50,8 @@ struct cpuidle_state {
@@ -81412,7 +80787,7 @@ index 50fcbb0..9d2dbd9 100644
/* Idle State Flags */
#define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
-@@ -192,7 +193,7 @@ struct cpuidle_governor {
+@@ -209,7 +210,7 @@ struct cpuidle_governor {
void (*reflect) (struct cpuidle_device *dev, int index);
struct module *owner;
@@ -81422,7 +80797,7 @@ index 50fcbb0..9d2dbd9 100644
#ifdef CONFIG_CPU_IDLE
extern int cpuidle_register_governor(struct cpuidle_governor *gov);
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
-index d08e4d2..95fad61 100644
+index 0a9a6da..ea597ca 100644
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
@@ -118,17 +118,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
@@ -81446,7 +80821,7 @@ index d08e4d2..95fad61 100644
const struct cpumask *srcp,
const struct cpumask *andp)
{
-@@ -167,7 +167,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
+@@ -174,7 +174,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
*
* Returns >= nr_cpu_ids if no further cpus set.
*/
@@ -81455,7 +80830,7 @@ index d08e4d2..95fad61 100644
{
/* -1 is a legal arg here. */
if (n != -1)
-@@ -182,7 +182,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
+@@ -189,7 +189,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
*
* Returns >= nr_cpu_ids if no further cpus unset.
*/
@@ -81464,17 +80839,17 @@ index d08e4d2..95fad61 100644
{
/* -1 is a legal arg here. */
if (n != -1)
-@@ -190,7 +190,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
+@@ -197,7 +197,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
}
-int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
+int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
+ int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp);
- /**
diff --git a/include/linux/cred.h b/include/linux/cred.h
-index 6c58dd7..80d1d95 100644
+index 2fb2ca2..d6a3340 100644
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -35,7 +35,7 @@ struct group_info {
@@ -81505,7 +80880,7 @@ index 6c58dd7..80d1d95 100644
#endif
/**
-@@ -323,6 +326,7 @@ static inline void put_cred(const struct cred *_cred)
+@@ -332,6 +335,7 @@ static inline void put_cred(const struct cred *_cred)
#define task_uid(task) (task_cred_xxx((task), uid))
#define task_euid(task) (task_cred_xxx((task), euid))
@@ -81514,7 +80889,7 @@ index 6c58dd7..80d1d95 100644
#define current_cred_xxx(xxx) \
({ \
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
-index 2b00d92..ab50c5e 100644
+index dc34dfc..bdf9b5d 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -386,7 +386,7 @@ struct cipher_tfm {
@@ -81556,13 +80931,23 @@ index 653589e..4ef254a 100644
return c | 0x20;
}
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
-index 3b50cac..71a4cec 100644
+index 1c2f1b8..7b9f50c 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
-@@ -133,7 +133,7 @@ struct dentry {
- } d_u;
+@@ -123,6 +123,9 @@ struct dentry {
+ unsigned long d_time; /* used by d_revalidate */
+ void *d_fsdata; /* fs-specific data */
+
++#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
++ atomic_t chroot_refcnt; /* tracks use of directory in chroot */
++#endif
+ struct list_head d_lru; /* LRU list */
+ struct list_head d_child; /* child of parent list */
struct list_head d_subdirs; /* our children */
- struct hlist_node d_alias; /* inode alias list */
+@@ -133,7 +136,7 @@ struct dentry {
+ struct hlist_node d_alias; /* inode alias list */
+ struct rcu_head d_rcu;
+ } d_u;
-};
+} __randomize_layout;
@@ -81582,7 +80967,7 @@ index 7925bf0..d5143d2 100644
#define large_malloc(a) vmalloc(a)
diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
-index d48dc00..211ee54 100644
+index f1863dc..5c26074 100644
--- a/include/linux/devfreq.h
+++ b/include/linux/devfreq.h
@@ -114,7 +114,7 @@ struct devfreq_governor {
@@ -81595,10 +80980,10 @@ index d48dc00..211ee54 100644
/**
* struct devfreq - Device devfreq structure
diff --git a/include/linux/device.h b/include/linux/device.h
-index 952b010..d5b7691 100644
+index ce1f2160..189bc33 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
-@@ -310,7 +310,7 @@ struct subsys_interface {
+@@ -311,7 +311,7 @@ struct subsys_interface {
struct list_head node;
int (*add_dev)(struct device *dev, struct subsys_interface *sif);
int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
@@ -81607,7 +80992,7 @@ index 952b010..d5b7691 100644
int subsys_interface_register(struct subsys_interface *sif);
void subsys_interface_unregister(struct subsys_interface *sif);
-@@ -506,7 +506,7 @@ struct device_type {
+@@ -507,7 +507,7 @@ struct device_type {
void (*release)(struct device *dev);
const struct dev_pm_ops *pm;
@@ -81616,7 +81001,7 @@ index 952b010..d5b7691 100644
/* interface for exporting device attributes */
struct device_attribute {
-@@ -516,11 +516,12 @@ struct device_attribute {
+@@ -517,11 +517,12 @@ struct device_attribute {
ssize_t (*store)(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count);
};
@@ -81631,10 +81016,10 @@ index 952b010..d5b7691 100644
ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
char *buf);
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
-index fd4aee2..1f28db9 100644
+index d5d3881..7ed54af 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
-@@ -54,7 +54,7 @@ struct dma_map_ops {
+@@ -60,7 +60,7 @@ struct dma_map_ops {
u64 (*get_required_mask)(struct device *dev);
#endif
int is_phys;
@@ -81644,10 +81029,10 @@ index fd4aee2..1f28db9 100644
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
-index 0a5f552..6661a5a 100644
+index 653a1fd..9133cd1 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
-@@ -1151,9 +1151,9 @@ struct dma_pinned_list {
+@@ -1136,9 +1136,9 @@ struct dma_pinned_list {
struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
@@ -81660,11 +81045,11 @@ index 0a5f552..6661a5a 100644
unsigned int offset, size_t len);
diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 0a819e7..8ed47f1 100644
+index 0949f9c..04cb9a5 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
-@@ -768,6 +768,7 @@ struct efivar_operations {
- efi_set_variable_t *set_variable;
+@@ -1050,6 +1050,7 @@ struct efivar_operations {
+ efi_set_variable_nonblocking_t *set_variable_nonblocking;
efi_query_variable_store_t *query_variable_store;
};
+typedef struct efivar_operations __no_const efivar_operations_no_const;
@@ -81692,10 +81077,10 @@ index 67a5fa7..b817372 100644
#endif
diff --git a/include/linux/err.h b/include/linux/err.h
-index 15f92e0..e825a8e 100644
+index a729120..6ede2c9 100644
--- a/include/linux/err.h
+++ b/include/linux/err.h
-@@ -19,12 +19,12 @@
+@@ -20,12 +20,12 @@
#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
@@ -81711,7 +81096,7 @@ index 15f92e0..e825a8e 100644
return (long) ptr;
}
diff --git a/include/linux/extcon.h b/include/linux/extcon.h
-index 21c59af..6057a03 100644
+index 36f49c4..a2a1f4c 100644
--- a/include/linux/extcon.h
+++ b/include/linux/extcon.h
@@ -135,7 +135,7 @@ struct extcon_dev {
@@ -81724,10 +81109,10 @@ index 21c59af..6057a03 100644
/**
diff --git a/include/linux/fb.h b/include/linux/fb.h
-index fe6ac95..898d41d 100644
+index 09bb7a1..d98870a 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
-@@ -304,7 +304,7 @@ struct fb_ops {
+@@ -305,7 +305,7 @@ struct fb_ops {
/* called at KDB enter and leave time to prepare the console */
int (*fb_debug_enter)(struct fb_info *info);
int (*fb_debug_leave)(struct fb_info *info);
@@ -81737,10 +81122,10 @@ index fe6ac95..898d41d 100644
#ifdef CONFIG_FB_TILEBLITTING
#define FB_TILE_CURSOR_NONE 0
diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
-index 70e8e21..1939916 100644
+index 230f87b..1fd0485 100644
--- a/include/linux/fdtable.h
+++ b/include/linux/fdtable.h
-@@ -102,7 +102,7 @@ struct files_struct *get_files_struct(struct task_struct *);
+@@ -100,7 +100,7 @@ struct files_struct *get_files_struct(struct task_struct *);
void put_files_struct(struct files_struct *fs);
void reset_files_struct(struct files_struct *);
int unshare_files(struct files_struct **);
@@ -81763,10 +81148,10 @@ index 8293262..2b3b8bd 100644
extern bool frontswap_enabled;
extern struct frontswap_ops *
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 23b2a35..8764ab7 100644
+index 9ab779e..0c636f2 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -426,7 +426,7 @@ struct address_space {
+@@ -412,7 +412,7 @@ struct address_space {
spinlock_t private_lock; /* for use by the address_space */
struct list_head private_list; /* ditto */
void *private_data; /* ditto */
@@ -81775,7 +81160,7 @@ index 23b2a35..8764ab7 100644
/*
* On most architectures that alignment is already the case; but
* must be enforced here for CRIS, to let the least significant bit
-@@ -469,7 +469,7 @@ struct block_device {
+@@ -455,7 +455,7 @@ struct block_device {
int bd_fsfreeze_count;
/* Mutex for freeze */
struct mutex bd_fsfreeze_mutex;
@@ -81784,25 +81169,25 @@ index 23b2a35..8764ab7 100644
/*
* Radix-tree tags, for tagging dirty and writeback pages within the pagecache
-@@ -613,7 +613,7 @@ struct inode {
- atomic_t i_readcount; /* struct files open RO */
+@@ -624,7 +624,7 @@ struct inode {
#endif
+
void *i_private; /* fs or device private pointer */
-};
+} __randomize_layout;
static inline int inode_unhashed(struct inode *inode)
{
-@@ -812,7 +812,7 @@ struct file {
- #ifdef CONFIG_DEBUG_WRITECOUNT
- unsigned long f_mnt_write_state;
- #endif
+@@ -820,7 +820,7 @@ struct file {
+ struct list_head f_tfile_llink;
+ #endif /* #ifdef CONFIG_EPOLL */
+ struct address_space *f_mapping;
-} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
+} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
struct file_handle {
__u32 handle_bytes;
-@@ -982,7 +982,7 @@ struct file_lock {
+@@ -945,7 +945,7 @@ struct file_lock {
int state; /* state of grant or error if -ve */
} afs;
} fl_u;
@@ -81811,16 +81196,16 @@ index 23b2a35..8764ab7 100644
/* The following constant reflects the upper bound of the file/locking space */
#ifndef OFFSET_MAX
-@@ -1329,7 +1329,7 @@ struct super_block {
- struct list_lru s_dentry_lru ____cacheline_aligned_in_smp;
- struct list_lru s_inode_lru ____cacheline_aligned_in_smp;
- struct rcu_head rcu;
+@@ -1287,7 +1287,7 @@ struct super_block {
+ * Indicates how deep in a filesystem stack this SB is
+ */
+ int s_stack_depth;
-};
+} __randomize_layout;
extern struct timespec current_fs_time(struct super_block *sb);
-@@ -1551,7 +1551,8 @@ struct file_operations {
+@@ -1514,7 +1514,8 @@ struct file_operations {
long (*fallocate)(struct file *file, int mode, loff_t offset,
loff_t len);
int (*show_fdinfo)(struct seq_file *m, struct file *f);
@@ -81830,7 +81215,7 @@ index 23b2a35..8764ab7 100644
struct inode_operations {
struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
-@@ -2820,4 +2821,14 @@ static inline bool dir_relax(struct inode *inode)
+@@ -2823,4 +2824,14 @@ static inline bool dir_relax(struct inode *inode)
return !IS_DEADDIR(inode);
}
@@ -81934,7 +81319,7 @@ index 1c804b0..1432c2b 100644
/*
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
-index 9f3c275..8bdff5d 100644
+index ec274e0..e678159 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -194,7 +194,7 @@ struct gendisk {
@@ -81956,7 +81341,7 @@ index 9f3c275..8bdff5d 100644
static inline sector_t get_start_sect(struct block_device *bdev)
diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
-index c0894dd..2fbf10c 100644
+index 667c311..abac2a7 100644
--- a/include/linux/genl_magic_func.h
+++ b/include/linux/genl_magic_func.h
@@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
@@ -81969,10 +81354,10 @@ index c0894dd..2fbf10c 100644
};
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
-index 3824ac6..f3932a3 100644
+index 41b30fd..a3718cf 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
-@@ -36,6 +36,13 @@ struct vm_area_struct;
+@@ -34,6 +34,13 @@ struct vm_area_struct;
#define ___GFP_NO_KSWAPD 0x400000u
#define ___GFP_OTHER_NODE 0x800000u
#define ___GFP_WRITE 0x1000000u
@@ -81986,15 +81371,15 @@ index 3824ac6..f3932a3 100644
/* If the above are modified, __GFP_BITS_SHIFT may need updating */
/*
-@@ -93,6 +100,7 @@ struct vm_area_struct;
+@@ -90,6 +97,7 @@ struct vm_area_struct;
+ #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
#define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
- #define __GFP_KMEMCG ((__force gfp_t)___GFP_KMEMCG) /* Allocation comes from a memcg-accounted resource */
#define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
+#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
/*
* This may seem redundant, but it's a way of annotating false positives vs.
-@@ -100,7 +108,7 @@ struct vm_area_struct;
+@@ -97,7 +105,7 @@ struct vm_area_struct;
*/
#define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
@@ -82003,14 +81388,14 @@ index 3824ac6..f3932a3 100644
#define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
/* This equals 0, but use constants in case they ever change */
-@@ -158,6 +166,8 @@ struct vm_area_struct;
+@@ -155,6 +163,8 @@ struct vm_area_struct;
/* 4GB DMA on some platforms */
#define GFP_DMA32 __GFP_DMA32
+#define GFP_USERCOPY __GFP_USERCOPY
+
/* Convert GFP flags to their corresponding migrate type */
- static inline int allocflags_to_migratetype(gfp_t gfp_flags)
+ static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
{
diff --git a/include/linux/gracl.h b/include/linux/gracl.h
new file mode 100644
@@ -82683,10 +82068,10 @@ index 0000000..be66033
+#endif
diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
new file mode 100644
-index 0000000..d25522e
+index 0000000..fb1de5d
--- /dev/null
+++ b/include/linux/grinternal.h
-@@ -0,0 +1,229 @@
+@@ -0,0 +1,230 @@
+#ifndef __GRINTERNAL_H
+#define __GRINTERNAL_H
+
@@ -82746,6 +82131,7 @@ index 0000000..d25522e
+extern int grsec_enable_chroot_nice;
+extern int grsec_enable_chroot_execlog;
+extern int grsec_enable_chroot_caps;
++extern int grsec_enable_chroot_rename;
+extern int grsec_enable_chroot_sysctl;
+extern int grsec_enable_chroot_unix;
+extern int grsec_enable_symlinkown;
@@ -82918,10 +82304,10 @@ index 0000000..d25522e
+#endif
diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
new file mode 100644
-index 0000000..b02ba9d
+index 0000000..26ef560
--- /dev/null
+++ b/include/linux/grmsg.h
-@@ -0,0 +1,117 @@
+@@ -0,0 +1,118 @@
+#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u"
+#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u"
+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
@@ -82965,6 +82351,7 @@ index 0000000..b02ba9d
+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
++#define GR_CHROOT_RENAME_MSG "denied bad rename of %.950s out of a chroot by "
+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
@@ -83041,10 +82428,10 @@ index 0000000..b02ba9d
+#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
new file mode 100644
-index 0000000..acda855
+index 0000000..6c76fcb
--- /dev/null
+++ b/include/linux/grsecurity.h
-@@ -0,0 +1,254 @@
+@@ -0,0 +1,249 @@
+#ifndef GR_SECURITY_H
+#define GR_SECURITY_H
+#include <linux/fs.h>
@@ -83131,7 +82518,7 @@ index 0000000..acda855
+ const struct vfsmount *mnt);
+void gr_log_remount(const char *devname, const int retval);
+void gr_log_unmount(const char *devname, const int retval);
-+void gr_log_mount(const char *from, const char *to, const int retval);
++void gr_log_mount(const char *from, struct path *to, const int retval);
+void gr_log_textrel(struct vm_area_struct *vma);
+void gr_log_ptgnustack(struct file *file);
+void gr_log_rwxmmap(struct file *file);
@@ -83230,11 +82617,11 @@ index 0000000..acda855
+ const struct vfsmount *parent_mnt,
+ struct dentry *old_dentry,
+ struct inode *old_parent_inode,
-+ struct vfsmount *old_mnt, const struct filename *newname);
++ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
+ struct dentry *old_dentry,
+ struct dentry *new_dentry,
-+ struct vfsmount *mnt, const __u8 replace);
++ struct vfsmount *mnt, const __u8 replace, unsigned int flags);
+__u32 gr_check_link(const struct dentry *new_dentry,
+ const struct dentry *parent_dentry,
+ const struct vfsmount *parent_mnt,
@@ -83256,15 +82643,10 @@ index 0000000..acda855
+
+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
+
-+#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
-+extern void gr_learn_resource(const struct task_struct *task, const int res,
-+ const unsigned long wanted, const int gt);
-+#else
-+static inline void gr_learn_resource(const struct task_struct *task, const int res,
-+ const unsigned long wanted, const int gt)
-+{
-+}
-+#endif
++void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
++void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
++int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
++ struct dentry *newdentry, struct vfsmount *newmnt);
+
+#ifdef CONFIG_GRKERNSEC_RESLOG
+extern void gr_log_resource(const struct task_struct *task, const int res,
@@ -83325,28 +82707,10 @@ index 0000000..e7ffaaf
+
+#endif
diff --git a/include/linux/hash.h b/include/linux/hash.h
-index bd1754c..69b7715 100644
+index d0494c3..69b7715 100644
--- a/include/linux/hash.h
+++ b/include/linux/hash.h
-@@ -37,6 +37,9 @@ static __always_inline u64 hash_64(u64 val, unsigned int bits)
- {
- u64 hash = val;
-
-+#if defined(CONFIG_ARCH_HAS_FAST_MULTIPLIER) && BITS_PER_LONG == 64
-+ hash = hash * GOLDEN_RATIO_PRIME_64;
-+#else
- /* Sigh, gcc can't optimise this alone like it does for 32 bits. */
- u64 n = hash;
- n <<= 18;
-@@ -51,6 +54,7 @@ static __always_inline u64 hash_64(u64 val, unsigned int bits)
- hash += n;
- n <<= 2;
- hash += n;
-+#endif
-
- /* High bits are more random, so use them. */
- return hash >> (64 - bits);
-@@ -83,7 +87,7 @@ static inline u32 hash32_ptr(const void *ptr)
+@@ -87,7 +87,7 @@ static inline u32 hash32_ptr(const void *ptr)
struct fast_hash_ops {
u32 (*hash)(const void *data, u32 len, u32 seed);
u32 (*hash2)(const u32 *data, u32 len, u32 seed);
@@ -83356,7 +82720,7 @@ index bd1754c..69b7715 100644
/**
* arch_fast_hash - Caclulates a hash over a given buffer that can have
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
-index 7fb31da..08b5114 100644
+index 9286a46..373f27f 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
@@ -83403,7 +82767,7 @@ index 1c7b89a..7dda400 100644
container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
-index deddeb8..bcaf62d 100644
+index b556e0a..c10a515 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -378,6 +378,7 @@ struct i2c_algorithm {
@@ -83441,7 +82805,7 @@ index aff7ad8..3942bbd 100644
extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
extern void unregister_pppox_proto(int proto_num);
diff --git a/include/linux/init.h b/include/linux/init.h
-index e168880..d9b489d 100644
+index 2df8e8d..3e1280d 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -37,9 +37,17 @@
@@ -83473,10 +82837,10 @@ index e168880..d9b489d 100644
#define __meminitconst __constsection(.meminit.rodata)
#define __memexit __section(.memexit.text) __exitused __cold notrace
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
-index 6df7f9f..d0bf699 100644
+index 77fc43f..73caf92 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
-@@ -156,6 +156,12 @@ extern struct task_group root_task_group;
+@@ -158,6 +158,12 @@ extern struct task_group root_task_group;
#define INIT_TASK_COMM "swapper"
@@ -83489,7 +82853,7 @@ index 6df7f9f..d0bf699 100644
#ifdef CONFIG_RT_MUTEXES
# define INIT_RT_MUTEXES(tsk) \
.pi_waiters = RB_ROOT, \
-@@ -203,6 +209,7 @@ extern struct task_group root_task_group;
+@@ -205,6 +211,7 @@ extern struct task_group root_task_group;
RCU_POINTER_INITIALIZER(cred, &init_cred), \
.comm = INIT_TASK_COMM, \
.thread = INIT_THREAD, \
@@ -83498,10 +82862,10 @@ index 6df7f9f..d0bf699 100644
.files = &init_files, \
.signal = &init_signals, \
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
-index 203c43d..605836b 100644
+index 69517a2..6b12d37 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
-@@ -411,8 +411,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
+@@ -413,8 +413,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
struct softirq_action
{
@@ -83512,7 +82876,7 @@ index 203c43d..605836b 100644
asmlinkage void do_softirq(void);
asmlinkage void __do_softirq(void);
-@@ -426,7 +426,7 @@ static inline void do_softirq_own_stack(void)
+@@ -428,7 +428,7 @@ static inline void do_softirq_own_stack(void)
}
#endif
@@ -83522,10 +82886,10 @@ index 203c43d..605836b 100644
extern void __raise_softirq_irqoff(unsigned int nr);
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
-index b96a5b2..2732d1c 100644
+index e6a7c9f..5804745 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
-@@ -131,7 +131,7 @@ struct iommu_ops {
+@@ -133,7 +133,7 @@ struct iommu_ops {
u32 (*domain_get_windows)(struct iommu_domain *domain);
unsigned long pgsize_bitmap;
@@ -83535,7 +82899,7 @@ index b96a5b2..2732d1c 100644
#define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
#define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
-index 89b7c24..382af74 100644
+index 2c525022..345b106 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
@@ -83561,11 +82925,11 @@ index 35e7eca..6afb7ad 100644
extern struct ipc_namespace init_ipc_ns;
extern atomic_t nr_ipc_ns;
diff --git a/include/linux/irq.h b/include/linux/irq.h
-index ef1ac9f..e1db06c 100644
+index 03f48d9..e86af0c 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
-@@ -338,7 +338,8 @@ struct irq_chip {
- void (*irq_print_chip)(struct irq_data *data, struct seq_file *p);
+@@ -352,7 +352,8 @@ struct irq_chip {
+ void (*irq_release_resources)(struct irq_data *data);
unsigned long flags;
-};
@@ -83575,10 +82939,10 @@ index ef1ac9f..e1db06c 100644
/*
* irq_chip specific flags
diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
-index 0ceb389..eed3fb8 100644
+index 13eed92..3261c86 100644
--- a/include/linux/irqchip/arm-gic.h
+++ b/include/linux/irqchip/arm-gic.h
-@@ -73,9 +73,11 @@
+@@ -91,9 +91,11 @@
#ifndef __ASSEMBLY__
@@ -83660,10 +83024,10 @@ index 6883e19..e854fcb 100644
/* This macro allows us to keep printk typechecking */
static __printf(1, 2)
diff --git a/include/linux/key-type.h b/include/linux/key-type.h
-index a74c3a8..28d3f21 100644
+index ff9f1d3..6712be5 100644
--- a/include/linux/key-type.h
+++ b/include/linux/key-type.h
-@@ -131,7 +131,7 @@ struct key_type {
+@@ -152,7 +152,7 @@ struct key_type {
/* internal fields */
struct list_head link; /* link in types list */
struct lock_class_key lock_class; /* key->sem lock class */
@@ -83727,10 +83091,10 @@ index 0555cc6..40116ce 100644
char **envp;
int wait;
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
-index 926afb6..58dd6e5 100644
+index 2d61b90..a1d0a13 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
-@@ -116,7 +116,7 @@ struct kobj_type {
+@@ -118,7 +118,7 @@ struct kobj_type {
struct attribute **default_attrs;
const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
const void *(*namespace)(struct kobject *kobj);
@@ -83738,8 +83102,8 @@ index 926afb6..58dd6e5 100644
+} __do_const;
struct kobj_uevent_env {
- char *envp[UEVENT_NUM_ENVP];
-@@ -139,6 +139,7 @@ struct kobj_attribute {
+ char *argv[3];
+@@ -142,6 +142,7 @@ struct kobj_attribute {
ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
const char *buf, size_t count);
};
@@ -83747,7 +83111,7 @@ index 926afb6..58dd6e5 100644
extern const struct sysfs_ops kobj_sysfs_ops;
-@@ -166,7 +167,7 @@ struct kset {
+@@ -169,7 +170,7 @@ struct kset {
spinlock_t list_lock;
struct kobject kobj;
const struct kset_uevent_ops *uevent_ops;
@@ -83783,10 +83147,10 @@ index 484604d..0f6c5b6 100644
if (atomic_sub_and_test((int) count, &kref->refcount)) {
release(kref);
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
-index b8e9a43..632678d 100644
+index a6059bd..8126d5c 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
-@@ -455,7 +455,7 @@ static inline void kvm_irqfd_exit(void)
+@@ -460,7 +460,7 @@ static inline void kvm_irqfd_exit(void)
{
}
#endif
@@ -83795,7 +83159,7 @@ index b8e9a43..632678d 100644
struct module *module);
void kvm_exit(void);
-@@ -621,7 +621,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
+@@ -629,7 +629,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
struct kvm_guest_debug *dbg);
int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
@@ -83805,7 +83169,7 @@ index b8e9a43..632678d 100644
int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
diff --git a/include/linux/libata.h b/include/linux/libata.h
-index e13b3ae..5f450e6 100644
+index fe0bf8d..c511ca6 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -977,7 +977,7 @@ struct ata_port_operations {
@@ -83830,10 +83194,10 @@ index a6a42dd..6c5ebce 100644
/*
diff --git a/include/linux/list.h b/include/linux/list.h
-index ef95941..82db65a 100644
+index f33f831..1ffe5e2 100644
--- a/include/linux/list.h
+++ b/include/linux/list.h
-@@ -112,6 +112,19 @@ extern void __list_del_entry(struct list_head *entry);
+@@ -113,6 +113,19 @@ extern void __list_del_entry(struct list_head *entry);
extern void list_del(struct list_head *entry);
#endif
@@ -83853,7 +83217,7 @@ index ef95941..82db65a 100644
/**
* list_replace - replace old entry by new one
* @old : the element to be replaced
-@@ -145,6 +158,8 @@ static inline void list_del_init(struct list_head *entry)
+@@ -146,6 +159,8 @@ static inline void list_del_init(struct list_head *entry)
INIT_LIST_HEAD(entry);
}
@@ -83953,7 +83317,7 @@ index c45c089..298841c 100644
u32 remainder;
return div_u64_rem(dividend, divisor, &remainder);
diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
-index 5bba088..7ad4ae7 100644
+index 3d385c8..deacb6a 100644
--- a/include/linux/mempolicy.h
+++ b/include/linux/mempolicy.h
@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
@@ -83977,11 +83341,24 @@ index 5bba088..7ad4ae7 100644
static inline int
vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
+diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
+index 37e4404..26ebbd0 100644
+--- a/include/linux/mlx4/device.h
++++ b/include/linux/mlx4/device.h
+@@ -97,7 +97,7 @@ enum {
+ MLX4_MAX_NUM_PF = 16,
+ MLX4_MAX_NUM_VF = 64,
+ MLX4_MAX_NUM_VF_P_PORT = 64,
+- MLX4_MFUNC_MAX = 80,
++ MLX4_MFUNC_MAX = 128,
+ MLX4_MAX_EQ_NUM = 1024,
+ MLX4_MFUNC_EQ_NUM = 4,
+ MLX4_MFUNC_MAX_EQES = 8,
diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 46b8ab5..6823be2 100644
+index 86a977b..8122960 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -127,6 +127,11 @@ extern unsigned int kobjsize(const void *objp);
+@@ -128,6 +128,11 @@ extern unsigned int kobjsize(const void *objp);
#define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
#define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */
#define VM_ARCH_1 0x01000000 /* Architecture-specific flag */
@@ -83993,7 +83370,7 @@ index 46b8ab5..6823be2 100644
#define VM_DONTDUMP 0x04000000 /* Do not include in the core dump */
#ifdef CONFIG_MEM_SOFT_DIRTY
-@@ -229,8 +234,8 @@ struct vm_operations_struct {
+@@ -238,8 +243,8 @@ struct vm_operations_struct {
/* called by access_process_vm when get_user_pages() fails, typically
* for use by special VMAs that can switch between memory and hardware
*/
@@ -84001,10 +83378,10 @@ index 46b8ab5..6823be2 100644
- void *buf, int len, int write);
+ ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
+ void *buf, size_t len, int write);
- #ifdef CONFIG_NUMA
- /*
- * set_policy() op must add a reference to any non-NULL @new mempolicy
-@@ -260,6 +265,7 @@ struct vm_operations_struct {
+
+ /* Called by the /proc/PID/maps code to ask the vma whether it
+ * has a special name. Returning non-NULL will also cause this
+@@ -275,6 +280,7 @@ struct vm_operations_struct {
int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
unsigned long size, pgoff_t pgoff);
};
@@ -84012,16 +83389,7 @@ index 46b8ab5..6823be2 100644
struct mmu_gather;
struct inode;
-@@ -362,6 +368,8 @@ static inline int is_vmalloc_or_module_addr(const void *x)
- }
- #endif
-
-+extern void kvfree(const void *addr);
-+
- static inline void compound_lock(struct page *page)
- {
- #ifdef CONFIG_TRANSPARENT_HUGEPAGE
-@@ -1120,8 +1128,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
+@@ -1167,8 +1173,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
unsigned long *pfn);
int follow_phys(struct vm_area_struct *vma, unsigned long address,
unsigned int flags, unsigned long *prot, resource_size_t *phys);
@@ -84032,7 +83400,7 @@ index 46b8ab5..6823be2 100644
static inline void unmap_shared_mapping_range(struct address_space *mapping,
loff_t const holebegin, loff_t const holelen)
-@@ -1161,9 +1169,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
+@@ -1208,9 +1214,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
}
#endif
@@ -84045,9 +83413,9 @@ index 46b8ab5..6823be2 100644
long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
unsigned long start, unsigned long nr_pages,
-@@ -1195,34 +1203,6 @@ int set_page_dirty(struct page *page);
- int set_page_dirty_lock(struct page *page);
+@@ -1242,34 +1248,6 @@ int set_page_dirty_lock(struct page *page);
int clear_page_dirty_for_io(struct page *page);
+ int get_cmdline(struct task_struct *task, char *buffer, int buflen);
-/* Is the vma a continuation of the stack vma above it? */
-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
@@ -84077,26 +83445,10 @@ index 46b8ab5..6823be2 100644
- !vma_growsup(vma->vm_next, addr);
-}
-
- extern pid_t
- vm_is_stack(struct task_struct *task, struct vm_area_struct *vma, int in_group);
-
-@@ -1322,6 +1302,15 @@ static inline void sync_mm_rss(struct mm_struct *mm)
- }
- #endif
+ extern struct task_struct *task_of_stack(struct task_struct *task,
+ struct vm_area_struct *vma, bool in_group);
-+#ifdef CONFIG_MMU
-+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
-+#else
-+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
-+{
-+ return __pgprot(0);
-+}
-+#endif
-+
- int vma_wants_writenotify(struct vm_area_struct *vma);
-
- extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
-@@ -1340,8 +1329,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
+@@ -1387,8 +1365,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
{
return 0;
}
@@ -84112,7 +83464,7 @@ index 46b8ab5..6823be2 100644
#endif
#ifdef __PAGETABLE_PMD_FOLDED
-@@ -1350,8 +1346,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
+@@ -1397,8 +1382,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
{
return 0;
}
@@ -84128,7 +83480,7 @@ index 46b8ab5..6823be2 100644
#endif
int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
-@@ -1369,11 +1372,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
+@@ -1416,11 +1408,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
NULL: pud_offset(pgd, address);
}
@@ -84152,7 +83504,31 @@ index 46b8ab5..6823be2 100644
#endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
#if USE_SPLIT_PTE_PTLOCKS
-@@ -1763,7 +1778,7 @@ extern int install_special_mapping(struct mm_struct *mm,
+@@ -1803,12 +1807,23 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
+ bool *need_rmap_locks);
+ extern void exit_mmap(struct mm_struct *);
+
++#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
++extern void gr_learn_resource(const struct task_struct *task, const int res,
++ const unsigned long wanted, const int gt);
++#else
++static inline void gr_learn_resource(const struct task_struct *task, const int res,
++ const unsigned long wanted, const int gt)
++{
++}
++#endif
++
+ static inline int check_data_rlimit(unsigned long rlim,
+ unsigned long new,
+ unsigned long start,
+ unsigned long end_data,
+ unsigned long start_data)
+ {
++ gr_learn_resource(current, RLIMIT_DATA, (new - start) + (end_data - start_data), 1);
+ if (rlim < RLIM_INFINITY) {
+ if (((new - start) + (end_data - start_data)) > rlim)
+ return -ENOSPC;
+@@ -1833,7 +1848,7 @@ extern int install_special_mapping(struct mm_struct *mm,
unsigned long addr, unsigned long len,
unsigned long flags, struct page **pages);
@@ -84161,7 +83537,7 @@ index 46b8ab5..6823be2 100644
extern unsigned long mmap_region(struct file *file, unsigned long addr,
unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
-@@ -1771,6 +1786,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1841,6 +1856,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
unsigned long len, unsigned long prot, unsigned long flags,
unsigned long pgoff, unsigned long *populate);
extern int do_munmap(struct mm_struct *, unsigned long, size_t);
@@ -84169,7 +83545,7 @@ index 46b8ab5..6823be2 100644
#ifdef CONFIG_MMU
extern int __mm_populate(unsigned long addr, unsigned long len,
-@@ -1799,10 +1815,11 @@ struct vm_unmapped_area_info {
+@@ -1869,10 +1885,11 @@ struct vm_unmapped_area_info {
unsigned long high_limit;
unsigned long align_mask;
unsigned long align_offset;
@@ -84183,7 +83559,7 @@ index 46b8ab5..6823be2 100644
/*
* Search for an unmapped address range.
-@@ -1814,7 +1831,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
+@@ -1884,7 +1901,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
* - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
*/
static inline unsigned long
@@ -84192,7 +83568,7 @@ index 46b8ab5..6823be2 100644
{
if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
return unmapped_area(info);
-@@ -1874,6 +1891,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
+@@ -1946,6 +1963,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
struct vm_area_struct **pprev);
@@ -84203,23 +83579,20 @@ index 46b8ab5..6823be2 100644
/* Look up the first VMA which intersects the interval start_addr..end_addr-1,
NULL if none. Assume start_addr < end_addr. */
static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
-@@ -1902,15 +1923,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
- return vma;
+@@ -1975,10 +1996,10 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
}
--#ifdef CONFIG_MMU
+ #ifdef CONFIG_MMU
-pgprot_t vm_get_page_prot(unsigned long vm_flags);
--#else
++pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
+ void vma_set_page_prot(struct vm_area_struct *vma);
+ #else
-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
--{
-- return __pgprot(0);
--}
--#endif
--
- #ifdef CONFIG_NUMA_BALANCING
- unsigned long change_prot_numa(struct vm_area_struct *vma,
- unsigned long start, unsigned long end);
-@@ -1962,6 +1974,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
++static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
+ {
+ return __pgprot(0);
+ }
+@@ -2040,6 +2061,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
static inline void vm_stat_account(struct mm_struct *mm,
unsigned long flags, struct file *file, long pages)
{
@@ -84231,7 +83604,7 @@ index 46b8ab5..6823be2 100644
mm->total_vm += pages;
}
#endif /* CONFIG_PROC_FS */
-@@ -2043,7 +2060,7 @@ extern int unpoison_memory(unsigned long pfn);
+@@ -2128,7 +2154,7 @@ extern int unpoison_memory(unsigned long pfn);
extern int sysctl_memory_failure_early_kill;
extern int sysctl_memory_failure_recovery;
extern void shake_page(struct page *p, int access);
@@ -84240,7 +83613,7 @@ index 46b8ab5..6823be2 100644
extern int soft_offline_page(struct page *page, int flags);
#if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
-@@ -2078,5 +2095,11 @@ void __init setup_nr_node_ids(void);
+@@ -2163,5 +2189,11 @@ void __init setup_nr_node_ids(void);
static inline void setup_nr_node_ids(void) {}
#endif
@@ -84253,10 +83626,10 @@ index 46b8ab5..6823be2 100644
#endif /* __KERNEL__ */
#endif /* _LINUX_MM_H */
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 2b58d19..6378966 100644
+index 6e0b286..90d9c0d 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
-@@ -307,7 +307,9 @@ struct vm_area_struct {
+@@ -308,7 +308,9 @@ struct vm_area_struct {
#ifdef CONFIG_NUMA
struct mempolicy *vm_policy; /* NUMA policy for the VMA */
#endif
@@ -84267,7 +83640,7 @@ index 2b58d19..6378966 100644
struct core_thread {
struct task_struct *task;
-@@ -453,7 +455,25 @@ struct mm_struct {
+@@ -454,7 +456,25 @@ struct mm_struct {
bool tlb_flush_pending;
#endif
struct uprobes_state uprobes_state;
@@ -84317,20 +83690,20 @@ index c5d5278..f0b68c8 100644
}
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
-index ac819bf..838afec 100644
+index ffe66e3..b310722 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
-@@ -513,7 +513,7 @@ struct zone {
+@@ -527,7 +527,7 @@ struct zone {
ZONE_PADDING(_pad3_)
/* Zone statistics */
- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
-+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
++ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
} ____cacheline_internodealigned_in_smp;
- typedef enum {
+ enum zone_flags {
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
-index 45e9214..4a547ac 100644
+index 44eeef0..a92d3f9 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -139,7 +139,7 @@ struct usb_device_id {
@@ -84342,7 +83715,7 @@ index 45e9214..4a547ac 100644
#define HID_BUS_ANY 0xffff
#define HID_GROUP_ANY 0x0000
-@@ -467,7 +467,7 @@ struct dmi_system_id {
+@@ -475,7 +475,7 @@ struct dmi_system_id {
const char *ident;
struct dmi_strmatch matches[4];
void *driver_data;
@@ -84352,12 +83725,12 @@ index 45e9214..4a547ac 100644
* struct dmi_device_id appears during expansion of
* "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
diff --git a/include/linux/module.h b/include/linux/module.h
-index eaf60ff..641979a 100644
+index 71f282a..b2387e2 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -17,9 +17,11 @@
#include <linux/moduleparam.h>
- #include <linux/tracepoint.h>
+ #include <linux/jump_label.h>
#include <linux/export.h>
+#include <linux/fs.h>
@@ -84391,7 +83764,7 @@ index eaf60ff..641979a 100644
extern ssize_t __modver_version_show(struct module_attribute *,
struct module_kobject *, char *);
-@@ -238,7 +241,7 @@ struct module {
+@@ -235,7 +238,7 @@ struct module {
/* Sysfs stuff. */
struct module_kobject mkobj;
@@ -84400,7 +83773,7 @@ index eaf60ff..641979a 100644
const char *version;
const char *srcversion;
struct kobject *holders_dir;
-@@ -287,19 +290,16 @@ struct module {
+@@ -284,19 +287,16 @@ struct module {
int (*init)(void);
/* If this is non-NULL, vfree after init() returns */
@@ -84424,7 +83797,7 @@ index eaf60ff..641979a 100644
/* Arch-specific module values */
struct mod_arch_specific arch;
-@@ -355,6 +355,10 @@ struct module {
+@@ -352,6 +352,10 @@ struct module {
#ifdef CONFIG_EVENT_TRACING
struct ftrace_event_call **trace_events;
unsigned int num_trace_events;
@@ -84435,7 +83808,7 @@ index eaf60ff..641979a 100644
#endif
#ifdef CONFIG_FTRACE_MCOUNT_RECORD
unsigned int num_ftrace_callsites;
-@@ -378,7 +382,7 @@ struct module {
+@@ -375,7 +379,7 @@ struct module {
ctor_fn_t *ctors;
unsigned int num_ctors;
#endif
@@ -84444,7 +83817,7 @@ index eaf60ff..641979a 100644
#ifndef MODULE_ARCH_INIT
#define MODULE_ARCH_INIT {}
#endif
-@@ -399,16 +403,46 @@ bool is_module_address(unsigned long addr);
+@@ -396,18 +400,48 @@ bool is_module_address(unsigned long addr);
bool is_module_percpu_address(unsigned long addr);
bool is_module_text_address(unsigned long addr);
@@ -84480,23 +83853,25 @@ index eaf60ff..641979a 100644
+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
+}
+
- static inline int within_module_core(unsigned long addr, const struct module *mod)
+ static inline bool within_module_core(unsigned long addr,
+ const struct module *mod)
{
- return (unsigned long)mod->module_core <= addr &&
- addr < (unsigned long)mod->module_core + mod->core_size;
+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
}
- static inline int within_module_init(unsigned long addr, const struct module *mod)
+ static inline bool within_module_init(unsigned long addr,
+ const struct module *mod)
{
- return (unsigned long)mod->module_init <= addr &&
- addr < (unsigned long)mod->module_init + mod->init_size;
+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
}
- /* Search for module by name: must hold module_mutex. */
+ static inline bool within_module(unsigned long addr, const struct module *mod)
diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
-index 560ca53..ef621ef 100644
+index 7eeb9bb..68f37e0 100644
--- a/include/linux/moduleloader.h
+++ b/include/linux/moduleloader.h
@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
@@ -84521,31 +83896,33 @@ index 560ca53..ef621ef 100644
/*
* Apply the given relocation to the (simplified) ELF. Return -error
* or 0.
-@@ -45,7 +57,9 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
+@@ -45,8 +57,10 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
unsigned int relsec,
struct module *me)
{
+#ifdef CONFIG_MODULES
- printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
+ printk(KERN_ERR "module %s: REL relocation unsupported\n",
+ module_name(me));
+#endif
return -ENOEXEC;
}
#endif
-@@ -67,7 +81,9 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
+@@ -68,8 +82,10 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
unsigned int relsec,
struct module *me)
{
+#ifdef CONFIG_MODULES
- printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
+ printk(KERN_ERR "module %s: REL relocation unsupported\n",
+ module_name(me));
+#endif
return -ENOEXEC;
}
#endif
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
-index c3eb102..073c4a6 100644
+index 1c9effa..1160bdd 100644
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
-@@ -295,7 +295,7 @@ static inline void __kernel_param_unlock(void)
+@@ -323,7 +323,7 @@ static inline void __kernel_param_unlock(void)
* @len is usually just sizeof(string).
*/
#define module_param_string(name, string, len, perm) \
@@ -84554,7 +83931,7 @@ index c3eb102..073c4a6 100644
= { len, string }; \
__module_param_call(MODULE_PARAM_PREFIX, name, \
&param_ops_string, \
-@@ -434,7 +434,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
+@@ -467,7 +467,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
*/
#define module_param_array_named(name, array, type, nump, perm) \
param_check_##type(name, &(array)[0]); \
@@ -84564,7 +83941,7 @@ index c3eb102..073c4a6 100644
.ops = &param_ops_##type, \
.elemsize = sizeof(array[0]), .elem = array }; \
diff --git a/include/linux/mount.h b/include/linux/mount.h
-index b0c1e65..fd6baf1 100644
+index c2c561d..a5f2a8c 100644
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -66,7 +66,7 @@ struct vfsmount {
@@ -84575,7 +83952,7 @@ index b0c1e65..fd6baf1 100644
+} __randomize_layout;
struct file; /* forward dec */
-
+ struct path;
diff --git a/include/linux/namei.h b/include/linux/namei.h
index 492de72..1bddcd4 100644
--- a/include/linux/namei.h
@@ -84618,31 +83995,36 @@ index 17d8339..81656c0 100644
struct iovec;
struct kvec;
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
-index 911718f..f673407 100644
+index 22339b4..4b4d5b3 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -1147,6 +1147,7 @@ struct net_device_ops {
- void *priv);
- int (*ndo_get_lock_subclass)(struct net_device *dev);
+@@ -1160,6 +1160,7 @@ struct net_device_ops {
+ struct net_device *dev,
+ netdev_features_t features);
};
+typedef struct net_device_ops __no_const net_device_ops_no_const;
- /*
- * The DEVICE structure.
-@@ -1229,7 +1230,7 @@ struct net_device {
- int iflink;
+ /**
+ * enum net_device_priv_flags - &struct net_device priv_flags
+@@ -1502,10 +1503,10 @@ struct net_device {
struct net_device_stats stats;
-- atomic_long_t rx_dropped; /* dropped packets by core network
-+ atomic_long_unchecked_t rx_dropped; /* dropped packets by core network
- * Do not use this in drivers.
- */
+- atomic_long_t rx_dropped;
+- atomic_long_t tx_dropped;
++ atomic_long_unchecked_t rx_dropped;
++ atomic_long_unchecked_t tx_dropped;
+
+- atomic_t carrier_changes;
++ atomic_unchecked_t carrier_changes;
+
+ #ifdef CONFIG_WIRELESS_EXT
+ const struct iw_handler_def * wireless_handlers;
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
-index 2077489..a15e561 100644
+index 2517ece..0bbfcfb 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
-@@ -84,7 +84,7 @@ struct nf_sockopt_ops {
+@@ -85,7 +85,7 @@ struct nf_sockopt_ops {
#endif
/* Use the module struct to lock set/get code in place */
struct module *owner;
@@ -84652,7 +84034,7 @@ index 2077489..a15e561 100644
/* Function to register/unregister hook points. */
int nf_register_hook(struct nf_hook_ops *reg);
diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
-index 28c7436..2d6156a 100644
+index e955d47..04a5338 100644
--- a/include/linux/netfilter/nfnetlink.h
+++ b/include/linux/netfilter/nfnetlink.h
@@ -19,7 +19,7 @@ struct nfnl_callback {
@@ -84766,7 +84148,7 @@ index d137218..be0c176 100644
extern void path_get(const struct path *);
extern void path_put(const struct path *);
diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
-index 5f2e559..7d59314 100644
+index 2706ee9..e691f7c 100644
--- a/include/linux/pci_hotplug.h
+++ b/include/linux/pci_hotplug.h
@@ -71,7 +71,8 @@ struct hotplug_slot_ops {
@@ -84780,10 +84162,10 @@ index 5f2e559..7d59314 100644
/**
* struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
-index e56b07f..aef789b 100644
+index 893a0d0..d5f996e 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
-@@ -328,8 +328,8 @@ struct perf_event {
+@@ -341,8 +341,8 @@ struct perf_event {
enum perf_event_active_state state;
unsigned int attach_state;
@@ -84794,7 +84176,7 @@ index e56b07f..aef789b 100644
/*
* These are the total time in nanoseconds that the event
-@@ -380,8 +380,8 @@ struct perf_event {
+@@ -393,8 +393,8 @@ struct perf_event {
* These accumulate total time (in nanoseconds) that children
* events have been enabled and running, respectively.
*/
@@ -84805,7 +84187,7 @@ index e56b07f..aef789b 100644
/*
* Protect attach/detach and child_list:
-@@ -708,7 +708,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
+@@ -734,7 +734,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
entry->ip[entry->nr++] = ip;
}
@@ -84814,7 +84196,7 @@ index e56b07f..aef789b 100644
extern int sysctl_perf_event_mlock;
extern int sysctl_perf_event_sample_rate;
extern int sysctl_perf_cpu_time_max_percent;
-@@ -723,19 +723,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
+@@ -749,19 +749,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
loff_t *ppos);
@@ -84842,7 +84224,7 @@ index e56b07f..aef789b 100644
}
extern void perf_event_init(void);
-@@ -851,7 +856,7 @@ struct perf_pmu_events_attr {
+@@ -892,7 +897,7 @@ struct perf_pmu_events_attr {
struct device_attribute attr;
u64 id;
const char *event_str;
@@ -84852,10 +84234,10 @@ index e56b07f..aef789b 100644
#define PMU_EVENT_ATTR(_name, _var, _id, _show) \
static struct perf_pmu_events_attr _var = { \
diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
-index 7246ef3..1539ea4 100644
+index 1997ffc..4f1f44d 100644
--- a/include/linux/pid_namespace.h
+++ b/include/linux/pid_namespace.h
-@@ -43,7 +43,7 @@ struct pid_namespace {
+@@ -44,7 +44,7 @@ struct pid_namespace {
int hide_pid;
int reboot; /* group exit code if this pidns was rebooted */
unsigned int proc_inum;
@@ -84865,7 +84247,7 @@ index 7246ef3..1539ea4 100644
extern struct pid_namespace init_pid_ns;
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
-index ab57526..94598804 100644
+index eb8b8ac..62649e1 100644
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@ -47,10 +47,10 @@ struct pipe_inode_info {
@@ -84884,29 +84266,29 @@ index ab57526..94598804 100644
unsigned int w_counter;
struct page *tmp_page;
diff --git a/include/linux/pm.h b/include/linux/pm.h
-index 8c6583a..febb84c 100644
+index 383fd68..7a11504 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
-@@ -597,6 +597,7 @@ extern int dev_pm_put_subsys_data(struct device *dev);
- struct dev_pm_domain {
+@@ -621,6 +621,7 @@ struct dev_pm_domain {
struct dev_pm_ops ops;
+ void (*detach)(struct device *dev, bool power_off);
};
+typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
/*
* The PM_EVENT_ messages are also used by drivers implementing the legacy
diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
-index 7c1d252..0e7061d 100644
+index 2e0e06d..824cc9b 100644
--- a/include/linux/pm_domain.h
+++ b/include/linux/pm_domain.h
-@@ -44,11 +44,11 @@ struct gpd_dev_ops {
- int (*thaw_early)(struct device *dev);
- int (*thaw)(struct device *dev);
+@@ -36,11 +36,11 @@ struct gpd_dev_ops {
+ int (*save_state)(struct device *dev);
+ int (*restore_state)(struct device *dev);
bool (*active_wakeup)(struct device *dev);
-};
+} __no_const;
- struct gpd_cpu_data {
+ struct gpd_cpuidle_data {
unsigned int saved_exit_latency;
- struct cpuidle_state *idle_state;
+ cpuidle_state_no_const *idle_state;
@@ -84914,10 +84296,10 @@ index 7c1d252..0e7061d 100644
struct generic_pm_domain {
diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
-index 16c9a62..f9f0838 100644
+index 367f49b..d2f5a14 100644
--- a/include/linux/pm_runtime.h
+++ b/include/linux/pm_runtime.h
-@@ -109,7 +109,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
+@@ -125,7 +125,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
static inline void pm_runtime_mark_last_busy(struct device *dev)
{
@@ -84981,10 +84363,10 @@ index 4ea1d37..80f4b33 100644
/*
* The return value from decompress routine is the length of the
diff --git a/include/linux/preempt.h b/include/linux/preempt.h
-index 1841b58..fbeebf8 100644
+index de83b4e..c4b997d 100644
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
-@@ -29,11 +29,16 @@ extern void preempt_count_sub(int val);
+@@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
#define preempt_count_dec_and_test() __preempt_count_dec_and_test()
#endif
@@ -85001,7 +84383,7 @@ index 1841b58..fbeebf8 100644
#ifdef CONFIG_PREEMPT_COUNT
-@@ -43,6 +48,12 @@ do { \
+@@ -41,6 +46,12 @@ do { \
barrier(); \
} while (0)
@@ -85014,7 +84396,7 @@ index 1841b58..fbeebf8 100644
#define sched_preempt_enable_no_resched() \
do { \
barrier(); \
-@@ -51,6 +62,12 @@ do { \
+@@ -49,6 +60,12 @@ do { \
#define preempt_enable_no_resched() sched_preempt_enable_no_resched()
@@ -85027,7 +84409,7 @@ index 1841b58..fbeebf8 100644
#ifdef CONFIG_PREEMPT
#define preempt_enable() \
do { \
-@@ -115,8 +132,10 @@ do { \
+@@ -113,8 +130,10 @@ do { \
* region.
*/
#define preempt_disable() barrier()
@@ -85038,7 +84420,7 @@ index 1841b58..fbeebf8 100644
#define preempt_enable() barrier()
#define preempt_check_resched() do { } while (0)
-@@ -130,11 +149,13 @@ do { \
+@@ -128,11 +147,13 @@ do { \
/*
* Modules have no business playing preemption tricks.
*/
@@ -85053,10 +84435,10 @@ index 1841b58..fbeebf8 100644
#define preempt_set_need_resched() \
do { \
diff --git a/include/linux/printk.h b/include/linux/printk.h
-index cbf094f..86007b7 100644
+index d78125f..7f36596 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
-@@ -114,6 +114,8 @@ static inline __printf(1, 2) __cold
+@@ -124,6 +124,8 @@ static inline __printf(1, 2) __cold
void early_printk(const char *s, ...) { }
#endif
@@ -85065,7 +84447,7 @@ index cbf094f..86007b7 100644
#ifdef CONFIG_PRINTK
asmlinkage __printf(5, 0)
int vprintk_emit(int facility, int level,
-@@ -148,7 +150,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
+@@ -158,7 +160,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
extern int printk_delay_msec;
extern int dmesg_restrict;
@@ -85074,7 +84456,7 @@ index cbf094f..86007b7 100644
extern void wake_up_klogd(void);
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
-index 608e60a..bbcb1a0 100644
+index b97bf2e..f14c92d4 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
@@ -85109,7 +84491,20 @@ index 608e60a..bbcb1a0 100644
extern void proc_set_size(struct proc_dir_entry *, loff_t);
extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
extern void *PDE_DATA(const struct inode *);
-@@ -73,7 +89,7 @@ static inline int remove_proc_subtree(const char *name, struct proc_dir_entry *p
+@@ -56,8 +72,12 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
+ struct proc_dir_entry *parent,const char *dest) { return NULL;}
+ static inline struct proc_dir_entry *proc_mkdir(const char *name,
+ struct proc_dir_entry *parent) {return NULL;}
++static inline struct proc_dir_entry *proc_mkdir_restrict(const char *name,
++ struct proc_dir_entry *parent) { return NULL; }
+ static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
+ umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
++static inline struct proc_dir_entry *proc_mkdir_data_restrict(const char *name,
++ umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
+ static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
+ umode_t mode, struct proc_dir_entry *parent) { return NULL; }
+ #define proc_create(name, mode, parent, proc_fops) ({NULL;})
+@@ -79,7 +99,7 @@ struct net;
static inline struct proc_dir_entry *proc_net_mkdir(
struct net *net, const char *name, struct proc_dir_entry *parent)
{
@@ -85132,7 +84527,7 @@ index 34a1e10..70f6bde 100644
struct proc_ns {
void *ns;
diff --git a/include/linux/quota.h b/include/linux/quota.h
-index cc7494a..1e27036 100644
+index 224fb81..9d85c41 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -70,7 +70,7 @@ struct kqid { /* Type in which we store the quota identifier */
@@ -85145,7 +84540,7 @@ index cc7494a..1e27036 100644
extern bool qid_valid(struct kqid qid);
diff --git a/include/linux/random.h b/include/linux/random.h
-index 1cfce0e..bf99e0b 100644
+index b05856e..0a9f14e 100644
--- a/include/linux/random.h
+++ b/include/linux/random.h
@@ -9,9 +9,19 @@
@@ -85180,12 +84575,12 @@ index 1cfce0e..bf99e0b 100644
-u32 prandom_u32(void);
+u32 prandom_u32(void) __intentional_overflow(-1);
- void prandom_bytes(void *buf, int nbytes);
+ void prandom_bytes(void *buf, size_t nbytes);
void prandom_seed(u32 seed);
void prandom_reseed_late(void);
@@ -37,6 +47,11 @@ struct rnd_state {
u32 prandom_u32_state(struct rnd_state *state);
- void prandom_bytes_state(struct rnd_state *state, void *buf, int nbytes);
+ void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
+static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
+{
@@ -85195,7 +84590,7 @@ index 1cfce0e..bf99e0b 100644
/**
* prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
* @ep_ro: right open interval endpoint
-@@ -49,7 +64,7 @@ void prandom_bytes_state(struct rnd_state *state, void *buf, int nbytes);
+@@ -49,7 +64,7 @@ void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
*
* Returns: pseudo-random number in interval [0, ep_ro)
*/
@@ -85205,10 +84600,10 @@ index 1cfce0e..bf99e0b 100644
return (u32)(((u64) prandom_u32() * ep_ro) >> 32);
}
diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
-index fea49b5..2ac22bb 100644
+index 378c5ee..aa84a47 100644
--- a/include/linux/rbtree_augmented.h
+++ b/include/linux/rbtree_augmented.h
-@@ -80,7 +80,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
+@@ -90,7 +90,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
old->rbaugmented = rbcompute(old); \
} \
rbstatic const struct rb_augment_callbacks rbname = { \
@@ -85220,7 +84615,7 @@ index fea49b5..2ac22bb 100644
diff --git a/include/linux/rculist.h b/include/linux/rculist.h
-index dbaf990..52e07b8 100644
+index 372ad5e..d4373f8 100644
--- a/include/linux/rculist.h
+++ b/include/linux/rculist.h
@@ -29,8 +29,8 @@
@@ -85279,23 +84674,23 @@ index dbaf990..52e07b8 100644
* hlist_del_init_rcu - deletes entry from hash list with re-initialization
* @n: the element to delete from the hash list.
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
-index 72bf3a0..853347f 100644
+index 53ff1a7..c40f0ab 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
-@@ -588,7 +588,7 @@ static inline void rcu_preempt_sleep_check(void)
- #define rcu_assign_pointer(p, v) \
+@@ -332,7 +332,7 @@ extern struct srcu_struct tasks_rcu_exit_srcu;
+ #define rcu_note_voluntary_context_switch(t) \
do { \
- smp_wmb(); \
-- ACCESS_ONCE(p) = RCU_INITIALIZER(v); \
-+ ACCESS_ONCE_RW(p) = RCU_INITIALIZER(v); \
+ if (ACCESS_ONCE((t)->rcu_tasks_holdout)) \
+- ACCESS_ONCE((t)->rcu_tasks_holdout) = false; \
++ ACCESS_ONCE_RW((t)->rcu_tasks_holdout) = false; \
} while (0)
-
-
+ #else /* #ifdef CONFIG_TASKS_RCU */
+ #define TASKS_RCU(x) do { } while (0)
diff --git a/include/linux/reboot.h b/include/linux/reboot.h
-index 9e7db9e..7d4fd72 100644
+index 67fc8fc..a90f7d8 100644
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
-@@ -44,9 +44,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
+@@ -47,9 +47,9 @@ extern void do_kernel_restart(char *cmd);
*/
extern void migrate_to_reboot_cpu(void);
@@ -85308,7 +84703,7 @@ index 9e7db9e..7d4fd72 100644
extern void machine_shutdown(void);
struct pt_regs;
-@@ -57,9 +57,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
+@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
*/
extern void kernel_restart_prepare(char *cmd);
@@ -85321,7 +84716,7 @@ index 9e7db9e..7d4fd72 100644
extern int C_A_D; /* for sysctl */
void ctrl_alt_del(void);
-@@ -73,7 +73,7 @@ extern int orderly_poweroff(bool force);
+@@ -76,7 +76,7 @@ extern int orderly_poweroff(bool force);
* Emergency restart, callable from an interrupt handler.
*/
@@ -85358,10 +84753,10 @@ index d7c8359..818daf5 100644
/*
* CONFIG_RELAY kernel API, kernel/relay.c
diff --git a/include/linux/rio.h b/include/linux/rio.h
-index b71d573..2f940bd 100644
+index 6bda06f..bf39a9b 100644
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
-@@ -355,7 +355,7 @@ struct rio_ops {
+@@ -358,7 +358,7 @@ struct rio_ops {
int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
u64 rstart, u32 size, u32 flags);
void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
@@ -85371,10 +84766,10 @@ index b71d573..2f940bd 100644
#define RIO_RESOURCE_MEM 0x00000100
#define RIO_RESOURCE_DOORBELL 0x00000200
diff --git a/include/linux/rmap.h b/include/linux/rmap.h
-index b66c211..13d2915 100644
+index c0c2bce..4813524 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
-@@ -145,8 +145,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
+@@ -144,8 +144,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
void anon_vma_init(void); /* create anon_vma_cachep */
int anon_vma_prepare(struct vm_area_struct *);
void unlink_anon_vmas(struct vm_area_struct *);
@@ -85386,7 +84781,7 @@ index b66c211..13d2915 100644
static inline void anon_vma_merge(struct vm_area_struct *vma,
struct vm_area_struct *next)
diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
-index a964f72..b475afb 100644
+index ed8f9e7..999bc96 100644
--- a/include/linux/scatterlist.h
+++ b/include/linux/scatterlist.h
@@ -1,6 +1,7 @@
@@ -85411,7 +84806,7 @@ index a964f72..b475afb 100644
}
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 218b058..7a1fb15 100644
+index 5e344bb..0743255 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -133,6 +133,7 @@ struct fs_struct;
@@ -85420,9 +84815,9 @@ index 218b058..7a1fb15 100644
struct filename;
+struct linux_binprm;
- /*
- * List of flags we want to share for kernel threads,
-@@ -373,7 +374,7 @@ extern char __sched_text_start[], __sched_text_end[];
+ #define VMACACHE_BITS 2
+ #define VMACACHE_SIZE (1U << VMACACHE_BITS)
+@@ -376,7 +377,7 @@ extern char __sched_text_start[], __sched_text_end[];
extern int in_sched_functions(unsigned long addr);
#define MAX_SCHEDULE_TIMEOUT LONG_MAX
@@ -85431,7 +84826,7 @@ index 218b058..7a1fb15 100644
extern signed long schedule_timeout_interruptible(signed long timeout);
extern signed long schedule_timeout_killable(signed long timeout);
extern signed long schedule_timeout_uninterruptible(signed long timeout);
-@@ -384,6 +385,19 @@ struct nsproxy;
+@@ -387,6 +388,19 @@ struct nsproxy;
struct user_namespace;
#ifdef CONFIG_MMU
@@ -85451,7 +84846,7 @@ index 218b058..7a1fb15 100644
extern void arch_pick_mmap_layout(struct mm_struct *mm);
extern unsigned long
arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
-@@ -681,6 +695,17 @@ struct signal_struct {
+@@ -685,6 +699,17 @@ struct signal_struct {
#ifdef CONFIG_TASKSTATS
struct taskstats *stats;
#endif
@@ -85469,7 +84864,7 @@ index 218b058..7a1fb15 100644
#ifdef CONFIG_AUDIT
unsigned audit_tty;
unsigned audit_tty_log_passwd;
-@@ -707,7 +732,7 @@ struct signal_struct {
+@@ -711,7 +736,7 @@ struct signal_struct {
struct mutex cred_guard_mutex; /* guard against foreign influences on
* credential calculations
* (notably. ptrace) */
@@ -85478,7 +84873,7 @@ index 218b058..7a1fb15 100644
/*
* Bits in flags field of signal_struct.
-@@ -761,6 +786,14 @@ struct user_struct {
+@@ -764,6 +789,14 @@ struct user_struct {
struct key *session_keyring; /* UID's default session keyring */
#endif
@@ -85493,7 +84888,7 @@ index 218b058..7a1fb15 100644
/* Hash table maintenance information */
struct hlist_node uidhash_node;
kuid_t uid;
-@@ -768,7 +801,7 @@ struct user_struct {
+@@ -771,7 +804,7 @@ struct user_struct {
#ifdef CONFIG_PERF_EVENTS
atomic_long_t locked_vm;
#endif
@@ -85502,7 +84897,7 @@ index 218b058..7a1fb15 100644
extern int uids_sysfs_init(void);
-@@ -1168,6 +1201,9 @@ enum perf_event_task_context {
+@@ -1235,6 +1268,9 @@ enum perf_event_task_context {
struct task_struct {
volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
void *stack;
@@ -85512,7 +84907,7 @@ index 218b058..7a1fb15 100644
atomic_t usage;
unsigned int flags; /* per process flags, defined below */
unsigned int ptrace;
-@@ -1293,8 +1329,8 @@ struct task_struct {
+@@ -1362,8 +1398,8 @@ struct task_struct {
struct list_head thread_node;
struct completion *vfork_done; /* for vfork() */
@@ -85523,7 +84918,7 @@ index 218b058..7a1fb15 100644
cputime_t utime, stime, utimescaled, stimescaled;
cputime_t gtime;
-@@ -1319,11 +1355,6 @@ struct task_struct {
+@@ -1388,11 +1424,6 @@ struct task_struct {
struct task_cputime cputime_expires;
struct list_head cpu_timers[3];
@@ -85535,7 +84930,7 @@ index 218b058..7a1fb15 100644
char comm[TASK_COMM_LEN]; /* executable name excluding path
- access with [gs]et_task_comm (which lock
it with task_lock())
-@@ -1340,6 +1371,10 @@ struct task_struct {
+@@ -1410,6 +1441,10 @@ struct task_struct {
#endif
/* CPU-specific state of this task */
struct thread_struct thread;
@@ -85546,7 +84941,7 @@ index 218b058..7a1fb15 100644
/* filesystem information */
struct fs_struct *fs;
/* open file information */
-@@ -1416,6 +1451,10 @@ struct task_struct {
+@@ -1484,6 +1519,10 @@ struct task_struct {
gfp_t lockdep_reclaim_gfp;
#endif
@@ -85557,7 +84952,7 @@ index 218b058..7a1fb15 100644
/* journalling filesystem info */
void *journal_info;
-@@ -1454,6 +1493,10 @@ struct task_struct {
+@@ -1522,6 +1561,10 @@ struct task_struct {
/* cg_list protected by css_set_lock and tsk->alloc_lock */
struct list_head cg_list;
#endif
@@ -85568,7 +84963,7 @@ index 218b058..7a1fb15 100644
#ifdef CONFIG_FUTEX
struct robust_list_head __user *robust_list;
#ifdef CONFIG_COMPAT
-@@ -1556,7 +1599,7 @@ struct task_struct {
+@@ -1635,7 +1678,7 @@ struct task_struct {
* Number of functions that haven't been traced
* because of depth overrun.
*/
@@ -85577,7 +84972,7 @@ index 218b058..7a1fb15 100644
/* Pause for the tracing */
atomic_t tracing_graph_pause;
#endif
-@@ -1588,7 +1631,78 @@ struct task_struct {
+@@ -1661,7 +1704,78 @@ struct task_struct {
unsigned int sequential_io;
unsigned int sequential_io_avg;
#endif
@@ -85657,7 +85052,7 @@ index 218b058..7a1fb15 100644
/* Future-safe accessor for struct task_struct's cpus_allowed. */
#define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
-@@ -1665,7 +1779,7 @@ struct pid_namespace;
+@@ -1743,7 +1857,7 @@ struct pid_namespace;
pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
struct pid_namespace *ns);
@@ -85666,7 +85061,7 @@ index 218b058..7a1fb15 100644
{
return tsk->pid;
}
-@@ -2015,6 +2129,25 @@ extern u64 sched_clock_cpu(int cpu);
+@@ -2106,6 +2220,25 @@ extern u64 sched_clock_cpu(int cpu);
extern void sched_clock_init(void);
@@ -85692,7 +85087,7 @@ index 218b058..7a1fb15 100644
#ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
static inline void sched_clock_tick(void)
{
-@@ -2139,7 +2272,9 @@ void yield(void);
+@@ -2239,7 +2372,9 @@ void yield(void);
extern struct exec_domain default_exec_domain;
union thread_union {
@@ -85702,7 +85097,7 @@ index 218b058..7a1fb15 100644
unsigned long stack[THREAD_SIZE/sizeof(long)];
};
-@@ -2172,6 +2307,7 @@ extern struct pid_namespace init_pid_ns;
+@@ -2272,6 +2407,7 @@ extern struct pid_namespace init_pid_ns;
*/
extern struct task_struct *find_task_by_vpid(pid_t nr);
@@ -85710,18 +85105,18 @@ index 218b058..7a1fb15 100644
extern struct task_struct *find_task_by_pid_ns(pid_t nr,
struct pid_namespace *ns);
-@@ -2334,7 +2470,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
+@@ -2436,7 +2572,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
extern void exit_itimers(struct signal_struct *);
extern void flush_itimer_signals(void);
-extern void do_group_exit(int);
+extern __noreturn void do_group_exit(int);
- extern int allow_signal(int);
- extern int disallow_signal(int);
-@@ -2535,9 +2671,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
-
- #endif
+ extern int do_execve(struct filename *,
+ const char __user * const __user *,
+@@ -2653,9 +2789,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
+ #define task_stack_end_corrupted(task) \
+ (*(end_of_stack(task)) != STACK_END_MAGIC)
-static inline int object_is_on_stack(void *obj)
+static inline int object_starts_on_stack(const void *obj)
@@ -85732,10 +85127,10 @@ index 218b058..7a1fb15 100644
return (obj >= stack) && (obj < (stack + THREAD_SIZE));
}
diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
-index 8045a55..c959cd5 100644
+index 596a0e0..bea77ec 100644
--- a/include/linux/sched/sysctl.h
+++ b/include/linux/sched/sysctl.h
-@@ -30,6 +30,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
+@@ -34,6 +34,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
#define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
extern int sysctl_max_map_count;
@@ -85744,7 +85139,7 @@ index 8045a55..c959cd5 100644
extern unsigned int sysctl_sched_latency;
extern unsigned int sysctl_sched_min_granularity;
diff --git a/include/linux/security.h b/include/linux/security.h
-index 2fc42d1..4d802f2 100644
+index ba96471..74fb3f6 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -27,6 +27,7 @@
@@ -85764,7 +85159,7 @@ index 2fc42d1..4d802f2 100644
#ifdef CONFIG_MMU
extern unsigned long mmap_min_addr;
extern unsigned long dac_mmap_min_addr;
-@@ -1719,7 +1718,7 @@ struct security_operations {
+@@ -1729,7 +1728,7 @@ struct security_operations {
struct audit_context *actx);
void (*audit_rule_free) (void *lsmrule);
#endif /* CONFIG_AUDIT */
@@ -85825,25 +85220,38 @@ index 52e0097..383f21d 100644
int single_release(struct inode *, struct file *);
void *__seq_open_private(struct file *, const struct seq_operations *, int);
diff --git a/include/linux/shm.h b/include/linux/shm.h
-index 1e2cd2e..0288750 100644
+index 6fb8016..ab4465e 100644
--- a/include/linux/shm.h
+++ b/include/linux/shm.h
-@@ -21,6 +21,10 @@ struct shmid_kernel /* private to the kernel */
-
+@@ -22,6 +22,10 @@ struct shmid_kernel /* private to the kernel */
/* The task created the shm object. NULL if the task is dead. */
struct task_struct *shm_creator;
+ struct list_head shm_clist; /* list by creator */
+#ifdef CONFIG_GRKERNSEC
-+ time_t shm_createtime;
++ u64 shm_createtime;
+ pid_t shm_lapid;
+#endif
};
/* shm_mode upper byte flags */
+diff --git a/include/linux/signal.h b/include/linux/signal.h
+index ab1e039..ad4229e 100644
+--- a/include/linux/signal.h
++++ b/include/linux/signal.h
+@@ -289,7 +289,7 @@ static inline void allow_signal(int sig)
+ * know it'll be handled, so that they don't get converted to
+ * SIGKILL or just silently dropped.
+ */
+- kernel_sigaction(sig, (__force __sighandler_t)2);
++ kernel_sigaction(sig, (__force_user __sighandler_t)2);
+ }
+
+ static inline void disallow_signal(int sig)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
-index ad8f859..e93b2e4 100644
+index 6c8b6f6..5a0f4bd 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -662,7 +662,7 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
+@@ -773,7 +773,7 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
int node);
struct sk_buff *build_skb(void *data, unsigned int frag_size);
@@ -85852,7 +85260,7 @@ index ad8f859..e93b2e4 100644
gfp_t priority)
{
return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
-@@ -1768,7 +1768,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
+@@ -1962,7 +1962,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
return skb->inner_transport_header - skb->inner_network_header;
}
@@ -85861,7 +85269,7 @@ index ad8f859..e93b2e4 100644
{
return skb_network_header(skb) - skb->data;
}
-@@ -1828,7 +1828,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
+@@ -2022,7 +2022,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
*/
#ifndef NET_SKB_PAD
@@ -85870,7 +85278,7 @@ index ad8f859..e93b2e4 100644
#endif
int ___pskb_trim(struct sk_buff *skb, unsigned int len);
-@@ -2427,7 +2427,7 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
+@@ -2629,7 +2629,7 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
int *err);
unsigned int datagram_poll(struct file *file, struct socket *sock,
struct poll_table_struct *wait);
@@ -85879,7 +85287,7 @@ index ad8f859..e93b2e4 100644
struct iovec *to, int size);
int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, int hlen,
struct iovec *iov);
-@@ -2722,6 +2722,9 @@ static inline void nf_reset(struct sk_buff *skb)
+@@ -3091,6 +3091,9 @@ static inline void nf_reset(struct sk_buff *skb)
nf_bridge_put(skb->nf_bridge);
skb->nf_bridge = NULL;
#endif
@@ -85890,7 +85298,7 @@ index ad8f859..e93b2e4 100644
static inline void nf_reset_trace(struct sk_buff *skb)
diff --git a/include/linux/slab.h b/include/linux/slab.h
-index b5b2df6..69f5734 100644
+index c265bec..4867d28 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -14,15 +14,29 @@
@@ -85941,7 +85349,7 @@ index b5b2df6..69f5734 100644
#include <linux/kmemleak.h>
-@@ -142,6 +159,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
+@@ -144,6 +161,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
void kfree(const void *);
void kzfree(const void *);
size_t ksize(const void *);
@@ -85950,16 +85358,7 @@ index b5b2df6..69f5734 100644
/*
* Some archs want to perform DMA into kmalloc caches and need a guaranteed
-@@ -174,7 +193,7 @@ struct kmem_cache {
- unsigned int align; /* Alignment as calculated */
- unsigned long flags; /* Active flags on the slab */
- const char *name; /* Slab name for sysfs */
-- int refcount; /* Use counter */
-+ atomic_t refcount; /* Use counter */
- void (*ctor)(void *); /* Called on object slot creation */
- struct list_head list; /* List of all slab caches on the system */
- };
-@@ -248,6 +267,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
+@@ -236,6 +255,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
#endif
@@ -85970,7 +85369,7 @@ index b5b2df6..69f5734 100644
/*
* Figure out which kmalloc slab an allocation of a certain size
* belongs to.
-@@ -256,7 +279,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
+@@ -244,7 +267,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
* 2 = 120 .. 192 bytes
* n = 2^(n-1) .. 2^n -1
*/
@@ -85979,7 +85378,7 @@ index b5b2df6..69f5734 100644
{
if (!size)
return 0;
-@@ -299,11 +322,11 @@ static __always_inline int kmalloc_index(size_t size)
+@@ -287,11 +310,11 @@ static __always_inline int kmalloc_index(size_t size)
}
#endif /* !CONFIG_SLOB */
@@ -85994,10 +85393,10 @@ index b5b2df6..69f5734 100644
#else
static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
-index 8235dfb..47ce586 100644
+index b869d16..1453c73 100644
--- a/include/linux/slab_def.h
+++ b/include/linux/slab_def.h
-@@ -38,7 +38,7 @@ struct kmem_cache {
+@@ -40,7 +40,7 @@ struct kmem_cache {
/* 4) cache creation/removal */
const char *name;
struct list_head list;
@@ -86006,7 +85405,7 @@ index 8235dfb..47ce586 100644
int object_size;
int align;
-@@ -54,10 +54,14 @@ struct kmem_cache {
+@@ -56,10 +56,14 @@ struct kmem_cache {
unsigned long node_allocs;
unsigned long node_frees;
unsigned long node_overflow;
@@ -86026,7 +85425,7 @@ index 8235dfb..47ce586 100644
/*
* If debugging is enabled, then the allocator can add additional
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
-index f56bfa9..8378a26 100644
+index d82abd4..408c3a0 100644
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -74,7 +74,7 @@ struct kmem_cache {
@@ -86039,10 +85438,10 @@ index f56bfa9..8378a26 100644
int inuse; /* Offset to metadata */
int align; /* Alignment */
diff --git a/include/linux/smp.h b/include/linux/smp.h
-index 6ae004e..2743532 100644
+index 93dff5f..933c561 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
-@@ -180,7 +180,9 @@ static inline void kick_all_cpus_sync(void) { }
+@@ -176,7 +176,9 @@ static inline void wake_up_all_idle_cpus(void) { }
#endif
#define get_cpu() ({ preempt_disable(); smp_processor_id(); })
@@ -86113,7 +85512,7 @@ index 07d8e53..dc934c9 100644
#endif /* _LINUX_SUNRPC_ADDR_H */
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
-index 8af2804..c7414ef 100644
+index 70736b9..37f33db 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -97,7 +97,7 @@ struct rpc_procinfo {
@@ -86126,10 +85525,10 @@ index 8af2804..c7414ef 100644
#ifdef __KERNEL__
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
-index 04e7632..2e2a8a3 100644
+index 2167846..0648fc3 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
-@@ -412,7 +412,7 @@ struct svc_procedure {
+@@ -416,7 +416,7 @@ struct svc_procedure {
unsigned int pc_count; /* call count */
unsigned int pc_cachetype; /* cache info (NFS) */
unsigned int pc_xdrressize; /* maximum size of XDR reply */
@@ -86139,7 +85538,7 @@ index 04e7632..2e2a8a3 100644
/*
* Function prototypes.
diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
-index 0b8e3e6..33e0a01 100644
+index 975da75..318c083 100644
--- a/include/linux/sunrpc/svc_rdma.h
+++ b/include/linux/sunrpc/svc_rdma.h
@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
@@ -86181,7 +85580,7 @@ index 8d71d65..f79586e 100644
#define SVC_GARBAGE 1
#define SVC_SYSERR 2
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
-index a5ffd32..0935dea 100644
+index e7a018e..49f8b17 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -60,7 +60,8 @@ extern void
@@ -86195,14 +85594,16 @@ index a5ffd32..0935dea 100644
extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
unsigned long offset, size_t size,
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
-index a747a77..9e14df7 100644
+index bda9b81..629e06e 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
-@@ -98,8 +98,14 @@ struct sigaltstack;
+@@ -99,10 +99,16 @@ union bpf_attr;
#define __MAP(n,...) __MAP##n(__VA_ARGS__)
#define __SC_DECL(t, a) t a
+#define __TYPE_IS_U(t) (__same_type((t)0, 0UL) || __same_type((t)0, 0U) || __same_type((t)0, (unsigned short)0) || __same_type((t)0, (unsigned char)0))
+ #define __TYPE_IS_L(t) (__same_type((t)0, 0L))
+ #define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
#define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
-#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
+#define __SC_LONG(t, a) __typeof( \
@@ -86214,7 +85615,7 @@ index a747a77..9e14df7 100644
#define __SC_CAST(t, a) (t) a
#define __SC_ARGS(t, a) a
#define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
-@@ -371,11 +377,11 @@ asmlinkage long sys_sync(void);
+@@ -384,11 +390,11 @@ asmlinkage long sys_sync(void);
asmlinkage long sys_fsync(unsigned int fd);
asmlinkage long sys_fdatasync(unsigned int fd);
asmlinkage long sys_bdflush(int func, long data);
@@ -86230,7 +85631,7 @@ index a747a77..9e14df7 100644
asmlinkage long sys_truncate(const char __user *path, long length);
asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
asmlinkage long sys_stat(const char __user *filename,
-@@ -587,7 +593,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
+@@ -600,7 +606,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
asmlinkage long sys_send(int, void __user *, size_t, unsigned);
asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
@@ -86253,17 +85654,10 @@ index 27b3b0b..e093dd9 100644
extern void register_syscore_ops(struct syscore_ops *ops);
extern void unregister_syscore_ops(struct syscore_ops *ops);
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
-index 14a8ff2..fa95f3a 100644
+index b7361f8..341a15a 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
-@@ -34,13 +34,13 @@ struct ctl_table_root;
- struct ctl_table_header;
- struct ctl_dir;
-
--typedef struct ctl_table ctl_table;
--
- typedef int proc_handler (struct ctl_table *ctl, int write,
- void __user *buffer, size_t *lenp, loff_t *ppos);
+@@ -39,6 +39,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
extern int proc_dostring(struct ctl_table *, int,
void __user *, size_t *, loff_t *);
@@ -86272,19 +85666,18 @@ index 14a8ff2..fa95f3a 100644
extern int proc_dointvec(struct ctl_table *, int,
void __user *, size_t *, loff_t *);
extern int proc_dointvec_minmax(struct ctl_table *, int,
-@@ -115,7 +115,9 @@ struct ctl_table
+@@ -113,7 +115,8 @@ struct ctl_table
struct ctl_table_poll *poll;
void *extra1;
void *extra2;
-};
+} __do_const __randomize_layout;
+typedef struct ctl_table __no_const ctl_table_no_const;
-+typedef struct ctl_table ctl_table;
struct ctl_node {
struct rb_node node;
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
-index 30b2ebe..37412ef 100644
+index f97d0db..c1187dc 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -34,7 +34,8 @@ struct attribute {
@@ -86307,7 +85700,7 @@ index 30b2ebe..37412ef 100644
/**
* Use these macros to make defining attributes easier. See include/linux/device.h
-@@ -127,7 +129,8 @@ struct bin_attribute {
+@@ -128,7 +130,8 @@ struct bin_attribute {
char *, loff_t, size_t);
int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
struct vm_area_struct *vma);
@@ -86339,10 +85732,10 @@ index 387fa7d..3fcde6b 100644
#ifdef CONFIG_MAGIC_SYSRQ
diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
-index a629e4b..3fea3d9 100644
+index ff307b5..f1a4468 100644
--- a/include/linux/thread_info.h
+++ b/include/linux/thread_info.h
-@@ -159,6 +159,13 @@ static inline bool test_and_clear_restore_sigmask(void)
+@@ -145,6 +145,13 @@ static inline bool test_and_clear_restore_sigmask(void)
#error "no set_restore_sigmask() provided and default one won't work"
#endif
@@ -86357,7 +85750,7 @@ index a629e4b..3fea3d9 100644
#endif /* _LINUX_THREAD_INFO_H */
diff --git a/include/linux/tty.h b/include/linux/tty.h
-index b90b5c2..e23a512 100644
+index 5171ef8..1048d83e 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -202,7 +202,7 @@ struct tty_port {
@@ -86369,7 +85762,7 @@ index b90b5c2..e23a512 100644
wait_queue_head_t open_wait; /* Open waiters */
wait_queue_head_t close_wait; /* Close waiters */
wait_queue_head_t delta_msr_wait; /* Modem status change */
-@@ -284,7 +284,7 @@ struct tty_struct {
+@@ -290,7 +290,7 @@ struct tty_struct {
/* If the tty has a pending do_SAK, queue it here - akpm */
struct work_struct SAK_work;
struct tty_port *port;
@@ -86378,7 +85771,7 @@ index b90b5c2..e23a512 100644
/* Each of a tty's open files has private_data pointing to tty_file_private */
struct tty_file_private {
-@@ -550,7 +550,7 @@ extern int tty_port_open(struct tty_port *port,
+@@ -555,7 +555,7 @@ extern int tty_port_open(struct tty_port *port,
struct tty_struct *tty, struct file *filp);
static inline int tty_port_users(struct tty_port *port)
{
@@ -86388,10 +85781,10 @@ index b90b5c2..e23a512 100644
extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
-index 756a609..89db85e 100644
+index 92e337c..f46757b 100644
--- a/include/linux/tty_driver.h
+++ b/include/linux/tty_driver.h
-@@ -285,7 +285,7 @@ struct tty_operations {
+@@ -291,7 +291,7 @@ struct tty_operations {
void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
#endif
const struct file_operations *proc_fops;
@@ -86400,7 +85793,7 @@ index 756a609..89db85e 100644
struct tty_driver {
int magic; /* magic number for this structure */
-@@ -319,7 +319,7 @@ struct tty_driver {
+@@ -325,7 +325,7 @@ struct tty_driver {
const struct tty_operations *ops;
struct list_head tty_drivers;
@@ -86410,10 +85803,10 @@ index 756a609..89db85e 100644
extern struct list_head tty_drivers;
diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
-index b8347c2..85d8b0f 100644
+index 00c9d68..bc0188b 100644
--- a/include/linux/tty_ldisc.h
+++ b/include/linux/tty_ldisc.h
-@@ -213,7 +213,7 @@ struct tty_ldisc_ops {
+@@ -215,7 +215,7 @@ struct tty_ldisc_ops {
struct module *owner;
@@ -86423,10 +85816,10 @@ index b8347c2..85d8b0f 100644
struct tty_ldisc {
diff --git a/include/linux/types.h b/include/linux/types.h
-index 4d118ba..c3ee9bf 100644
+index a0bb704..f511c77 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
-@@ -176,10 +176,26 @@ typedef struct {
+@@ -177,10 +177,26 @@ typedef struct {
int counter;
} atomic_t;
@@ -86486,6 +85879,19 @@ index 2d1f9b6..d7a9fce 100644
+#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
+
#endif /* _LINUX_UIDGID_H */
+diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
+index baa8171..9ca98ba 100644
+--- a/include/linux/uio_driver.h
++++ b/include/linux/uio_driver.h
+@@ -67,7 +67,7 @@ struct uio_device {
+ struct module *owner;
+ struct device *dev;
+ int minor;
+- atomic_t event;
++ atomic_unchecked_t event;
+ struct fasync_struct *async_queue;
+ wait_queue_head_t wait;
+ struct uio_info *info;
diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
index 99c1b4d..562e6f3 100644
--- a/include/linux/unaligned/access_ok.h
@@ -86538,10 +85944,10 @@ index 99c1b4d..562e6f3 100644
static inline void put_unaligned_le16(u16 val, void *p)
diff --git a/include/linux/usb.h b/include/linux/usb.h
-index 7f6eb85..656e806 100644
+index 447a7e2..9cea7e9 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
-@@ -563,7 +563,7 @@ struct usb_device {
+@@ -571,7 +571,7 @@ struct usb_device {
int maxchild;
u32 quirks;
@@ -86550,7 +85956,7 @@ index 7f6eb85..656e806 100644
unsigned long active_duration;
-@@ -1642,7 +1642,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
+@@ -1655,7 +1655,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
__u8 request, __u8 requesttype, __u16 value, __u16 index,
@@ -86560,7 +85966,7 @@ index 7f6eb85..656e806 100644
void *data, int len, int *actual_length, int timeout);
extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
-index e452ba6..78f8e80 100644
+index d5952bb..9a626d4 100644
--- a/include/linux/usb/renesas_usbhs.h
+++ b/include/linux/usb/renesas_usbhs.h
@@ -39,7 +39,7 @@ enum {
@@ -86573,7 +85979,7 @@ index e452ba6..78f8e80 100644
/*
* callback functions for platform
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
-index e92abf9..b802b30 100644
+index 9f3579f..3b2afa5 100644
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -38,7 +38,7 @@ struct user_namespace {
@@ -86675,7 +86081,7 @@ index b483abd..af305ad 100644
#endif
#endif /* _LINUX_VGA_SWITCHEROO_H_ */
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
-index 4b8a891..e9a2863 100644
+index b87696f..1d11de7 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -16,6 +16,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
@@ -86711,10 +86117,10 @@ index 4b8a891..e9a2863 100644
/*
* Internals. Dont't use..
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
-index 67ce70c..d540954 100644
+index 82e7db7..f8ce3d0 100644
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
-@@ -98,18 +98,18 @@ static inline void vm_events_fold_cpu(int cpu)
+@@ -108,18 +108,18 @@ static inline void vm_events_fold_cpu(int cpu)
/*
* Zone based page accounting with per cpu differentials.
*/
@@ -86738,7 +86144,7 @@ index 67ce70c..d540954 100644
#ifdef CONFIG_SMP
if (x < 0)
x = 0;
-@@ -117,10 +117,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
+@@ -127,10 +127,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
return x;
}
@@ -86751,7 +86157,7 @@ index 67ce70c..d540954 100644
#ifdef CONFIG_SMP
if (x < 0)
x = 0;
-@@ -137,7 +137,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
+@@ -147,7 +147,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
static inline unsigned long zone_page_state_snapshot(struct zone *zone,
enum zone_stat_item item)
{
@@ -86760,7 +86166,7 @@ index 67ce70c..d540954 100644
#ifdef CONFIG_SMP
int cpu;
-@@ -226,8 +226,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
+@@ -234,14 +234,14 @@ static inline void __mod_zone_page_state(struct zone *zone,
static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
{
@@ -86770,9 +86176,6 @@ index 67ce70c..d540954 100644
+ atomic_long_inc_unchecked(&vm_stat[item]);
}
- static inline void __inc_zone_page_state(struct page *page,
-@@ -238,8 +238,8 @@ static inline void __inc_zone_page_state(struct page *page,
-
static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
{
- atomic_long_dec(&zone->vm_stat[item]);
@@ -86781,7 +86184,7 @@ index 67ce70c..d540954 100644
+ atomic_long_dec_unchecked(&vm_stat[item]);
}
- static inline void __dec_zone_page_state(struct page *page,
+ static inline void __inc_zone_page_state(struct page *page,
diff --git a/include/linux/xattr.h b/include/linux/xattr.h
index 91b0a68..0e9adf6 100644
--- a/include/linux/xattr.h
@@ -86806,7 +86209,7 @@ index 91b0a68..0e9adf6 100644
ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
diff --git a/include/linux/zlib.h b/include/linux/zlib.h
-index 9c5a6b4..09c9438 100644
+index 92dbbd3..13ab0b3 100644
--- a/include/linux/zlib.h
+++ b/include/linux/zlib.h
@@ -31,6 +31,7 @@
@@ -86827,10 +86230,10 @@ index 9c5a6b4..09c9438 100644
Returns the number of bytes that needs to be allocated for a per-
stream workspace with the specified parameters. A pointer to this
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
-index c768c9f..bdcaa5a 100644
+index eb76cfd..9fd0e7c 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
-@@ -76,7 +76,7 @@ struct v4l2_file_operations {
+@@ -75,7 +75,7 @@ struct v4l2_file_operations {
int (*mmap) (struct file *, struct vm_area_struct *);
int (*open) (struct file *);
int (*release) (struct file *);
@@ -86840,7 +86243,7 @@ index c768c9f..bdcaa5a 100644
/*
* Newer version of video_device, handled by videodev2.c
diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
-index c9b1593..a572459 100644
+index ffb69da..040393e 100644
--- a/include/media/v4l2-device.h
+++ b/include/media/v4l2-device.h
@@ -95,7 +95,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
@@ -86853,11 +86256,11 @@ index c9b1593..a572459 100644
/* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
Since the parent disappears this ensures that v4l2_dev doesn't have an
diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
-index 9a36d92..0aafe2a 100644
+index 2a25dec..bf6dd8a 100644
--- a/include/net/9p/transport.h
+++ b/include/net/9p/transport.h
-@@ -60,7 +60,7 @@ struct p9_trans_module {
- int (*cancel) (struct p9_client *, struct p9_req_t *req);
+@@ -62,7 +62,7 @@ struct p9_trans_module {
+ int (*cancelled)(struct p9_client *, struct p9_req_t *req);
int (*zc_request)(struct p9_client *, struct p9_req_t *,
char *, char *, int , int, int, int);
-};
@@ -86879,13 +86282,13 @@ index a175ba4..196eb8242 100644
#define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
#define UNIXSID(skb) (&UNIXCB((skb)).secid)
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
-index dbc4a89..4a59b5d 100644
+index ead99f0..6263c4b 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
-@@ -600,7 +600,7 @@ struct l2cap_ops {
- long (*get_sndtimeo) (struct l2cap_chan *chan);
- struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
- unsigned long len, int nb);
+@@ -608,7 +608,7 @@ struct l2cap_ops {
+ unsigned char *kdata,
+ struct iovec *iov,
+ int len);
-};
+} __do_const;
@@ -86916,19 +86319,36 @@ index f2ae33d..c457cf0 100644
/* Protects from simultaneous access to first_req list */
spinlock_t info_list_lock;
diff --git a/include/net/flow.h b/include/net/flow.h
-index d23e7fa..e188307 100644
+index 8109a15..504466d 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
-@@ -221,6 +221,6 @@ struct flow_cache_object *flow_cache_lookup(struct net *net,
+@@ -231,6 +231,6 @@ void flow_cache_fini(struct net *net);
- void flow_cache_flush(void);
- void flow_cache_flush_deferred(void);
+ void flow_cache_flush(struct net *net);
+ void flow_cache_flush_deferred(struct net *net);
-extern atomic_t flow_cache_genid;
+extern atomic_unchecked_t flow_cache_genid;
#endif
+diff --git a/include/net/flow_keys.h b/include/net/flow_keys.h
+index 7ee2df0..dc8fd81 100644
+--- a/include/net/flow_keys.h
++++ b/include/net/flow_keys.h
+@@ -22,9 +22,9 @@ struct flow_keys {
+ __be32 ports;
+ __be16 port16[2];
+ };
+- u16 thoff;
+- u16 n_proto;
+- u8 ip_proto;
++ u16 thoff;
++ __be16 n_proto;
++ u8 ip_proto;
+ };
+
+ bool __skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow,
diff --git a/include/net/genetlink.h b/include/net/genetlink.h
-index 93695f0..766d71c 100644
+index af10c2c..a431cc5 100644
--- a/include/net/genetlink.h
+++ b/include/net/genetlink.h
@@ -120,7 +120,7 @@ struct genl_ops {
@@ -86954,7 +86374,7 @@ index 734d9b5..48a9a4b 100644
return;
}
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
-index cf92728..9236ee6 100644
+index 848e85c..051c7de 100644
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -63,7 +63,7 @@ struct inet_connection_sock_af_ops {
@@ -86967,7 +86387,7 @@ index cf92728..9236ee6 100644
/** inet_connection_sock - INET connection oriented sock
*
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
-index 823ec7b..44c938c 100644
+index 80479ab..0c3f647 100644
--- a/include/net/inetpeer.h
+++ b/include/net/inetpeer.h
@@ -47,7 +47,7 @@ struct inet_peer {
@@ -86980,10 +86400,10 @@ index 823ec7b..44c938c 100644
struct rcu_head rcu;
struct inet_peer *gc_next;
diff --git a/include/net/ip.h b/include/net/ip.h
-index 937f196..310a44f 100644
+index 0bb6207..1f38247 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
-@@ -38,11 +38,12 @@ struct inet_skb_parm {
+@@ -39,11 +39,12 @@ struct inet_skb_parm {
struct ip_options opt; /* Compiled IP options */
unsigned char flags;
@@ -87001,16 +86421,7 @@ index 937f196..310a44f 100644
u16 frag_max_size;
};
-@@ -214,7 +215,7 @@ static inline void snmp_mib_free(void __percpu *ptr[SNMP_ARRAY_SZ])
-
- void inet_get_local_port_range(struct net *net, int *low, int *high);
-
--extern unsigned long *sysctl_local_reserved_ports;
-+extern unsigned long sysctl_local_reserved_ports[65536 / 8 / sizeof(unsigned long)];
- static inline int inet_is_reserved_local_port(int port)
- {
- return test_bit(port, sysctl_local_reserved_ports);
-@@ -297,7 +298,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
+@@ -316,7 +317,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
}
}
@@ -87020,10 +86431,10 @@ index 937f196..310a44f 100644
static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, int segs)
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
-index 9922093..a1755d6 100644
+index dc9d2a2..d985691 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
-@@ -169,7 +169,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
+@@ -170,7 +170,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
#define FIB_RES_SADDR(net, res) \
((FIB_RES_NH(res).nh_saddr_genid == \
@@ -87033,19 +86444,19 @@ index 9922093..a1755d6 100644
fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
#define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
-index 5679d92..2e7a690 100644
+index 615b20b..fd4cbd8 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
-@@ -558,7 +558,7 @@ struct ip_vs_conn {
+@@ -534,7 +534,7 @@ struct ip_vs_conn {
struct ip_vs_conn *control; /* Master control connection */
atomic_t n_control; /* Number of controlled ones */
struct ip_vs_dest *dest; /* real server */
- atomic_t in_pkts; /* incoming packet counter */
+ atomic_unchecked_t in_pkts; /* incoming packet counter */
- /* packet transmitter for different forwarding methods. If it
- mangles the packet, it must return NF_DROP or better NF_STOLEN,
-@@ -705,7 +705,7 @@ struct ip_vs_dest {
+ /* Packet transmitter for different forwarding methods. If it
+ * mangles the packet, it must return NF_DROP or better NF_STOLEN,
+@@ -682,7 +682,7 @@ struct ip_vs_dest {
__be16 port; /* port number of the server */
union nf_inet_addr addr; /* IP address of the server */
volatile unsigned int flags; /* dest status flags */
@@ -87054,7 +86465,7 @@ index 5679d92..2e7a690 100644
atomic_t weight; /* server weight */
atomic_t refcnt; /* reference counter */
-@@ -960,11 +960,11 @@ struct netns_ipvs {
+@@ -928,11 +928,11 @@ struct netns_ipvs {
/* ip_vs_lblc */
int sysctl_lblc_expiration;
struct ctl_table_header *lblc_ctl_header;
@@ -87068,6 +86479,28 @@ index 5679d92..2e7a690 100644
/* ip_vs_est */
struct list_head est_list; /* estimator list */
spinlock_t est_lock;
+diff --git a/include/net/ipv6.h b/include/net/ipv6.h
+index 4292929..7e21d2e 100644
+--- a/include/net/ipv6.h
++++ b/include/net/ipv6.h
+@@ -708,7 +708,7 @@ static inline __be32 ip6_make_flowlabel(struct net *net, struct sk_buff *skb,
+ __be32 flowlabel, bool autolabel)
+ {
+ if (!flowlabel && (autolabel || net->ipv6.sysctl.auto_flowlabels)) {
+- __be32 hash;
++ u32 hash;
+
+ hash = skb_get_hash(skb);
+
+@@ -718,7 +718,7 @@ static inline __be32 ip6_make_flowlabel(struct net *net, struct sk_buff *skb,
+ */
+ hash ^= hash >> 12;
+
+- flowlabel = hash & IPV6_FLOWLABEL_MASK;
++ flowlabel = (__force __be32)hash & IPV6_FLOWLABEL_MASK;
+ }
+
+ return flowlabel;
diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
index 8d4f588..2e37ad2 100644
--- a/include/net/irda/ircomm_tty.h
@@ -87161,20 +86594,20 @@ index 567c681..cd73ac02 100644
struct llc_sap_state {
u8 curr_state;
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index f4ab2fb..71a85ba 100644
+index a9de1da..df72057 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
-@@ -4476,7 +4476,7 @@ struct rate_control_ops {
- void (*add_sta_debugfs)(void *priv, void *priv_sta,
- struct dentry *dir);
+@@ -4645,7 +4645,7 @@ struct rate_control_ops {
void (*remove_sta_debugfs)(void *priv, void *priv_sta);
+
+ u32 (*get_expected_throughput)(void *priv_sta);
-};
+} __do_const;
static inline int rate_supported(struct ieee80211_sta *sta,
enum ieee80211_band band,
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
-index 7277caf..fd095bc 100644
+index f60558d..e5ed9bd 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -163,7 +163,7 @@ struct neigh_ops {
@@ -87186,15 +86619,7 @@ index 7277caf..fd095bc 100644
struct pneigh_entry {
struct pneigh_entry *next;
-@@ -203,7 +203,6 @@ struct neigh_table {
- void (*proxy_redo)(struct sk_buff *skb);
- char *id;
- struct neigh_parms parms;
-- /* HACK. gc_* should follow parms without a gap! */
- int gc_interval;
- int gc_thresh1;
- int gc_thresh2;
-@@ -218,7 +217,7 @@ struct neigh_table {
+@@ -217,7 +217,7 @@ struct neigh_table {
struct neigh_statistics __percpu *stats;
struct neigh_hash_table __rcu *nht;
struct pneigh_entry **phash_buckets;
@@ -87204,10 +86629,10 @@ index 7277caf..fd095bc 100644
static inline int neigh_parms_family(struct neigh_parms *p)
{
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
-index 991dcd9..ab58d00 100644
+index e0d6466..e2f3003 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
-@@ -124,8 +124,8 @@ struct net {
+@@ -129,8 +129,8 @@ struct net {
struct netns_ipvs *ipvs;
#endif
struct sock *diag_nlsk;
@@ -87216,9 +86641,9 @@ index 991dcd9..ab58d00 100644
+ atomic_unchecked_t fnhe_genid;
+} __randomize_layout;
- /*
- * ifindex generation is per-net namespace, and loopback is
-@@ -289,7 +289,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
+ #include <linux/seq_file_net.h>
+
+@@ -286,7 +286,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
#define __net_init __init
#define __net_exit __exit_refok
#define __net_initdata __initdata
@@ -87230,7 +86655,7 @@ index 991dcd9..ab58d00 100644
#endif
struct pernet_operations {
-@@ -299,7 +303,7 @@ struct pernet_operations {
+@@ -296,7 +300,7 @@ struct pernet_operations {
void (*exit_batch)(struct list_head *net_exit_list);
int *id;
size_t size;
@@ -87239,7 +86664,7 @@ index 991dcd9..ab58d00 100644
/*
* Use these carefully. If you implement a network device and it
-@@ -347,23 +351,23 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
+@@ -344,12 +348,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
static inline int rt_genid_ipv4(struct net *net)
{
@@ -87253,21 +86678,8 @@ index 991dcd9..ab58d00 100644
+ atomic_inc_unchecked(&net->ipv4.rt_genid);
}
- #if IS_ENABLED(CONFIG_IPV6)
- static inline int rt_genid_ipv6(struct net *net)
- {
-- return atomic_read(&net->ipv6.rt_genid);
-+ return atomic_read_unchecked(&net->ipv6.rt_genid);
- }
-
- static inline void rt_genid_bump_ipv6(struct net *net)
- {
-- atomic_inc(&net->ipv6.rt_genid);
-+ atomic_inc_unchecked(&net->ipv6.rt_genid);
- }
- #else
- static inline int rt_genid_ipv6(struct net *net)
-@@ -385,12 +389,12 @@ static inline void rt_genid_bump_all(struct net *net)
+ extern void (*__fib6_flush_trees)(struct net *net);
+@@ -376,12 +380,12 @@ static inline void rt_genid_bump_all(struct net *net)
static inline int fnhe_genid(struct net *net)
{
@@ -87282,21 +86694,8 @@ index 991dcd9..ab58d00 100644
}
#endif /* __NET_NET_NAMESPACE_H */
-diff --git a/include/net/netdma.h b/include/net/netdma.h
-index 8ba8ce2..99b7fff 100644
---- a/include/net/netdma.h
-+++ b/include/net/netdma.h
-@@ -24,7 +24,7 @@
- #include <linux/dmaengine.h>
- #include <linux/skbuff.h>
-
--int dma_skb_copy_datagram_iovec(struct dma_chan* chan,
-+int __intentional_overflow(3,5) dma_skb_copy_datagram_iovec(struct dma_chan* chan,
- struct sk_buff *skb, int offset, struct iovec *to,
- size_t len, struct dma_pinned_list *pinned_list);
-
diff --git a/include/net/netlink.h b/include/net/netlink.h
-index 2b47eaa..6d5bcc2 100644
+index 7b903e1..ad9ca4b 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -521,7 +521,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
@@ -87309,10 +86708,10 @@ index 2b47eaa..6d5bcc2 100644
/**
diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
-index fbcc7fa..03c7e51 100644
+index 29d6a94..235d3d84 100644
--- a/include/net/netns/conntrack.h
+++ b/include/net/netns/conntrack.h
-@@ -12,10 +12,10 @@ struct nf_conntrack_ecache;
+@@ -14,10 +14,10 @@ struct nf_conntrack_ecache;
struct nf_proto_net {
#ifdef CONFIG_SYSCTL
struct ctl_table_header *ctl_table_header;
@@ -87325,7 +86724,7 @@ index fbcc7fa..03c7e51 100644
#endif
#endif
unsigned int users;
-@@ -58,7 +58,7 @@ struct nf_ip_net {
+@@ -60,7 +60,7 @@ struct nf_ip_net {
struct nf_icmp_net icmpv6;
#if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
struct ctl_table_header *ctl_table_header;
@@ -87335,19 +86734,19 @@ index fbcc7fa..03c7e51 100644
};
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
-index 80f500a..f0c23c2 100644
+index 24945ce..f19e42f 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
-@@ -74,7 +74,7 @@ struct netns_ipv4 {
+@@ -83,7 +83,7 @@ struct netns_ipv4 {
- kgid_t sysctl_ping_group_range[2];
+ struct ping_group_range ping_group_range;
- atomic_t dev_addr_genid;
+ atomic_unchecked_t dev_addr_genid;
- #ifdef CONFIG_IP_MROUTE
- #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
-@@ -84,6 +84,6 @@ struct netns_ipv4 {
+ #ifdef CONFIG_SYSCTL
+ unsigned long *sysctl_local_reserved_ports;
+@@ -97,6 +97,6 @@ struct netns_ipv4 {
struct fib_rules_ops *mr_rules_ops;
#endif
#endif
@@ -87356,20 +86755,33 @@ index 80f500a..f0c23c2 100644
};
#endif
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
-index 21edaf1..4c5faae 100644
+index 69ae41f..4f94868 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
-@@ -73,8 +73,8 @@ struct netns_ipv6 {
+@@ -75,8 +75,8 @@ struct netns_ipv6 {
struct fib_rules_ops *mr6_rules_ops;
#endif
#endif
- atomic_t dev_addr_genid;
-- atomic_t rt_genid;
+- atomic_t fib6_sernum;
+ atomic_unchecked_t dev_addr_genid;
-+ atomic_unchecked_t rt_genid;
++ atomic_unchecked_t fib6_sernum;
};
#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
+diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
+index 9da7982..099321b9 100644
+--- a/include/net/netns/xfrm.h
++++ b/include/net/netns/xfrm.h
+@@ -78,7 +78,7 @@ struct netns_xfrm {
+
+ /* flow cache part */
+ struct flow_cache flow_cache_global;
+- atomic_t flow_cache_genid;
++ atomic_unchecked_t flow_cache_genid;
+ struct list_head flow_cache_gc_list;
+ spinlock_t flow_cache_gc_lock;
+ struct work_struct flow_cache_gc_work;
diff --git a/include/net/ping.h b/include/net/ping.h
index 026479b..d9b2829 100644
--- a/include/net/ping.h
@@ -87384,7 +86796,7 @@ index 026479b..d9b2829 100644
struct pingfakehdr {
diff --git a/include/net/protocol.h b/include/net/protocol.h
-index a7e986b..dc67bce 100644
+index d6fcc1f..ca277058 100644
--- a/include/net/protocol.h
+++ b/include/net/protocol.h
@@ -49,7 +49,7 @@ struct net_protocol {
@@ -87406,7 +86818,7 @@ index a7e986b..dc67bce 100644
#define INET6_PROTO_NOPOLICY 0x1
#define INET6_PROTO_FINAL 0x2
diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
-index 661e45d..54c39df 100644
+index e21b9f9..0191ef0 100644
--- a/include/net/rtnetlink.h
+++ b/include/net/rtnetlink.h
@@ -93,7 +93,7 @@ struct rtnl_link_ops {
@@ -87456,12 +86868,12 @@ index 72a31db..aaa63d9 100644
/* Get the size of a DATA chunk payload. */
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
-index 0dfcc92..7967849 100644
+index 4ff3f67..89ae38e 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
-@@ -507,7 +507,7 @@ struct sctp_pf {
- struct sctp_association *asoc);
- void (*addr_v4map) (struct sctp_sock *, union sctp_addr *);
+@@ -509,7 +509,7 @@ struct sctp_pf {
+ void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
+ void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
struct sctp_af *af;
-};
+} __do_const;
@@ -87469,10 +86881,10 @@ index 0dfcc92..7967849 100644
/* Structure to track chunk fragments that have been acked, but peer
diff --git a/include/net/sock.h b/include/net/sock.h
-index f66b2b1..5233aa0 100644
+index 7db3db1..a915cca 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
-@@ -348,7 +348,7 @@ struct sock {
+@@ -355,7 +355,7 @@ struct sock {
unsigned int sk_napi_id;
unsigned int sk_ll_usec;
#endif
@@ -87481,7 +86893,7 @@ index f66b2b1..5233aa0 100644
int sk_rcvbuf;
struct sk_filter __rcu *sk_filter;
-@@ -1035,7 +1035,7 @@ struct proto {
+@@ -1048,7 +1048,7 @@ struct proto {
void (*destroy_cgroup)(struct mem_cgroup *memcg);
struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
#endif
@@ -87490,7 +86902,7 @@ index f66b2b1..5233aa0 100644
/*
* Bits in struct cg_proto.flags
-@@ -1222,7 +1222,7 @@ static inline u64 memcg_memory_allocated_read(struct cg_proto *prot)
+@@ -1235,7 +1235,7 @@ static inline u64 memcg_memory_allocated_read(struct cg_proto *prot)
return ret >> PAGE_SHIFT;
}
@@ -87499,7 +86911,7 @@ index f66b2b1..5233aa0 100644
sk_memory_allocated(const struct sock *sk)
{
struct proto *prot = sk->sk_prot;
-@@ -1367,7 +1367,7 @@ struct sock_iocb {
+@@ -1380,7 +1380,7 @@ struct sock_iocb {
struct scm_cookie *scm;
struct msghdr *msg, async_msg;
struct kiocb *kiocb;
@@ -87508,7 +86920,7 @@ index f66b2b1..5233aa0 100644
static inline struct sock_iocb *kiocb_to_siocb(struct kiocb *iocb)
{
-@@ -1829,7 +1829,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
+@@ -1820,7 +1820,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
}
static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
@@ -87517,7 +86929,7 @@ index f66b2b1..5233aa0 100644
int copy, int offset)
{
if (skb->ip_summed == CHECKSUM_NONE) {
-@@ -2091,7 +2091,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
+@@ -2092,7 +2092,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
}
}
@@ -87527,43 +86939,43 @@ index f66b2b1..5233aa0 100644
/**
* sk_page_frag - return an appropriate page_frag
diff --git a/include/net/tcp.h b/include/net/tcp.h
-index 1f0d847..613237a 100644
+index 4062b4f..9ff45e7 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
-@@ -542,7 +542,7 @@ void tcp_retransmit_timer(struct sock *sk);
+@@ -519,7 +519,7 @@ void tcp_retransmit_timer(struct sock *sk);
void tcp_xmit_retransmit_queue(struct sock *);
void tcp_simple_retransmit(struct sock *);
int tcp_trim_head(struct sock *, struct sk_buff *, u32);
--int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int);
-+int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int);
+-int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
++int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
void tcp_send_probe0(struct sock *);
void tcp_send_partial(struct sock *);
-@@ -711,8 +711,8 @@ struct tcp_skb_cb {
- struct inet6_skb_parm h6;
- #endif
- } header; /* For incoming frames */
+@@ -692,8 +692,8 @@ static inline u32 tcp_skb_timestamp(const struct sk_buff *skb)
+ * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
+ */
+ struct tcp_skb_cb {
- __u32 seq; /* Starting sequence number */
- __u32 end_seq; /* SEQ + FIN + SYN + datalen */
+ __u32 seq __intentional_overflow(0); /* Starting sequence number */
+ __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
- __u32 when; /* used to compute rtt's */
- __u8 tcp_flags; /* TCP header flags. (tcp[13]) */
-
-@@ -728,7 +728,7 @@ struct tcp_skb_cb {
+ union {
+ /* Note : tcp_tw_isn is used in input path only
+ * (isn chosen by tcp_timewait_state_process())
+@@ -718,7 +718,7 @@ struct tcp_skb_cb {
__u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
/* 1 byte hole */
- __u32 ack_seq; /* Sequence number ACK'd */
+ __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
- };
-
- #define TCP_SKB_CB(__skb) ((struct tcp_skb_cb *)&((__skb)->cb[0]))
+ union {
+ struct inet_skb_parm h4;
+ #if IS_ENABLED(CONFIG_IPV6)
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
-index fb5654a..4457522 100644
+index dc4865e..152ee4c 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
-@@ -286,7 +286,6 @@ struct xfrm_dst;
+@@ -285,7 +285,6 @@ struct xfrm_dst;
struct xfrm_policy_afinfo {
unsigned short family;
struct dst_ops *dst_ops;
@@ -87571,7 +86983,7 @@ index fb5654a..4457522 100644
struct dst_entry *(*dst_lookup)(struct net *net, int tos,
const xfrm_address_t *saddr,
const xfrm_address_t *daddr);
-@@ -304,7 +303,7 @@ struct xfrm_policy_afinfo {
+@@ -303,7 +302,7 @@ struct xfrm_policy_afinfo {
struct net_device *dev,
const struct flowi *fl);
struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
@@ -87580,7 +86992,7 @@ index fb5654a..4457522 100644
int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
-@@ -343,7 +342,7 @@ struct xfrm_state_afinfo {
+@@ -342,7 +341,7 @@ struct xfrm_state_afinfo {
int (*transport_finish)(struct sk_buff *skb,
int async);
void (*local_error)(struct sk_buff *skb, u32 mtu);
@@ -87589,7 +87001,7 @@ index fb5654a..4457522 100644
int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
-@@ -428,7 +427,7 @@ struct xfrm_mode {
+@@ -437,7 +436,7 @@ struct xfrm_mode {
struct module *owner;
unsigned int encap;
int flags;
@@ -87598,7 +87010,7 @@ index fb5654a..4457522 100644
/* Flags for xfrm_mode. */
enum {
-@@ -525,7 +524,7 @@ struct xfrm_policy {
+@@ -534,7 +533,7 @@ struct xfrm_policy {
struct timer_list timer;
struct flow_cache_object flo;
@@ -87607,7 +87019,7 @@ index fb5654a..4457522 100644
u32 priority;
u32 index;
struct xfrm_mark mark;
-@@ -1165,6 +1164,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
+@@ -1167,6 +1166,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
}
void xfrm_garbage_collect(struct net *net);
@@ -87615,7 +87027,7 @@ index fb5654a..4457522 100644
#else
-@@ -1203,6 +1203,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
+@@ -1205,6 +1205,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
static inline void xfrm_garbage_collect(struct net *net)
{
}
@@ -87660,10 +87072,10 @@ index 52beadf..598734c 100644
u8 qfull;
enum fc_lport_state state;
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
-index 409fafb..efc53b0 100644
+index 27ecee7..5f42632 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
-@@ -181,9 +181,9 @@ struct scsi_device {
+@@ -186,9 +186,9 @@ struct scsi_device {
unsigned int max_device_blocked; /* what device_blocked counts down from */
#define SCSI_DEFAULT_DEVICE_BLOCKED 3
@@ -87677,10 +87089,10 @@ index 409fafb..efc53b0 100644
struct device sdev_gendev,
sdev_dev;
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
-index b797e8f..8e2c3aa 100644
+index 007a0bc..7188db8 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
-@@ -751,7 +751,8 @@ struct fc_function_template {
+@@ -756,7 +756,8 @@ struct fc_function_template {
unsigned long show_host_system_hostname:1;
unsigned long disable_target_scan:1;
@@ -87704,32 +87116,32 @@ index ae6c3b8..fd748ac 100644
/**
* struct snd_compr: Compressed device
diff --git a/include/sound/soc.h b/include/sound/soc.h
-index 9a00147..d814573 100644
+index 7ba7130..d46594d 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
-@@ -770,7 +770,7 @@ struct snd_soc_codec_driver {
- /* probe ordering - for components with runtime dependencies */
- int probe_order;
- int remove_order;
+@@ -853,7 +853,7 @@ struct snd_soc_codec_driver {
+ enum snd_soc_dapm_type, int);
+
+ bool ignore_pmdown_time; /* Doesn't benefit from pmdown delay */
-};
+} __do_const;
/* SoC platform interface */
struct snd_soc_platform_driver {
-@@ -816,7 +816,7 @@ struct snd_soc_platform_driver {
- unsigned int (*read)(struct snd_soc_platform *, unsigned int);
- int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
+@@ -882,7 +882,7 @@ struct snd_soc_platform_driver {
+ const struct snd_compr_ops *compr_ops;
+
int (*bespoke_trigger)(struct snd_pcm_substream *, int);
-};
+} __do_const;
- struct snd_soc_platform {
+ struct snd_soc_dai_link_component {
const char *name;
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
-index 1772fad..282e3e2 100644
+index 23c518a..d6ef510 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
-@@ -754,7 +754,7 @@ struct se_device {
+@@ -764,7 +764,7 @@ struct se_device {
atomic_long_t write_bytes;
/* Active commands on this virtual SE device */
atomic_t simple_cmds;
@@ -87798,7 +87210,7 @@ index 0000000..fb634b7
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
-index 1c09820..7f5ec79 100644
+index 3608beb..df39d8a 100644
--- a/include/trace/events/irq.h
+++ b/include/trace/events/irq.h
@@ -36,7 +36,7 @@ struct softirq_action;
@@ -87932,7 +87344,7 @@ index d876736..ccce5c0 100644
#define __cpu_to_le64s(x) do { (void)(x); } while (0)
#define __le64_to_cpus(x) do { (void)(x); } while (0)
diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
-index ef6103b..d4e65dd 100644
+index ea9bf25..5140c61 100644
--- a/include/uapi/linux/elf.h
+++ b/include/uapi/linux/elf.h
@@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
@@ -88049,7 +87461,7 @@ index 0e011eb..82681b1 100644
#ifdef __HAVE_BUILTIN_BSWAP64__
return __builtin_bswap64(val);
diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h
-index 6d67213..552fdd9 100644
+index 43aaba1..1c30b48 100644
--- a/include/uapi/linux/sysctl.h
+++ b/include/uapi/linux/sysctl.h
@@ -155,8 +155,6 @@ enum
@@ -88061,19 +87473,6 @@ index 6d67213..552fdd9 100644
/* CTL_VM names: */
enum
{
-diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index fe94bb9..c9e51c2 100644
---- a/include/uapi/linux/videodev2.h
-+++ b/include/uapi/linux/videodev2.h
-@@ -1227,7 +1227,7 @@ struct v4l2_ext_control {
- union {
- __s32 value;
- __s64 value64;
-- char *string;
-+ char __user *string;
- };
- } __attribute__ ((packed));
-
diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
index 1590c49..5eab462 100644
--- a/include/uapi/linux/xattr.h
@@ -88120,10 +87519,10 @@ index 30f5362..8ed8ac9 100644
void *pmi_pal;
u8 *vbe_state_orig; /*
diff --git a/init/Kconfig b/init/Kconfig
-index 8b9521a..8a3cc34 100644
+index 2081a4d..98d1149 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1079,6 +1079,7 @@ endif # CGROUPS
+@@ -1150,6 +1150,7 @@ endif # CGROUPS
config CHECKPOINT_RESTORE
bool "Checkpoint/restore support" if EXPERT
@@ -88131,7 +87530,7 @@ index 8b9521a..8a3cc34 100644
default n
help
Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1546,7 +1547,7 @@ config SLUB_DEBUG
+@@ -1659,7 +1660,7 @@ config SLUB_DEBUG
config COMPAT_BRK
bool "Disable heap randomization"
@@ -88140,7 +87539,7 @@ index 8b9521a..8a3cc34 100644
help
Randomizing heap placement makes heap exploits harder, but it
also breaks ancient binaries (including anything libc5 based).
-@@ -1834,7 +1835,7 @@ config INIT_ALL_POSSIBLE
+@@ -1990,7 +1991,7 @@ config INIT_ALL_POSSIBLE
config STOP_MACHINE
bool
default y
@@ -88164,10 +87563,10 @@ index 7bc47ee..6da2dc7 100644
ifneq ($(CONFIG_BLK_DEV_INITRD),y)
obj-y += noinitramfs.o
diff --git a/init/do_mounts.c b/init/do_mounts.c
-index 8e5addc..c96ea61 100644
+index 9b3565c..3f90cf9 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
-@@ -359,11 +359,11 @@ static void __init get_fs_names(char *page)
+@@ -360,11 +360,11 @@ static void __init get_fs_names(char *page)
static int __init do_mount_root(char *name, char *fs, int flags, void *data)
{
struct super_block *s;
@@ -88181,7 +87580,7 @@ index 8e5addc..c96ea61 100644
s = current->fs->pwd.dentry->d_sb;
ROOT_DEV = s->s_dev;
printk(KERN_INFO
-@@ -484,18 +484,18 @@ void __init change_floppy(char *fmt, ...)
+@@ -485,18 +485,18 @@ void __init change_floppy(char *fmt, ...)
va_start(args, fmt);
vsprintf(buf, fmt, args);
va_end(args);
@@ -88203,7 +87602,7 @@ index 8e5addc..c96ea61 100644
termios.c_lflag |= ICANON;
sys_ioctl(fd, TCSETSF, (long)&termios);
sys_close(fd);
-@@ -589,8 +589,8 @@ void __init prepare_namespace(void)
+@@ -590,8 +590,8 @@ void __init prepare_namespace(void)
mount_root();
out:
devtmpfs_mount("dev");
@@ -88378,10 +87777,19 @@ index ba0a7f36..2bcf1d5 100644
{ INIT_THREAD_INFO(init_task) };
+#endif
diff --git a/init/initramfs.c b/init/initramfs.c
-index 93b6139..8d628b7 100644
+index ad1bd77..dca2c1b 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
-@@ -84,7 +84,7 @@ static void __init free_hash(void)
+@@ -25,7 +25,7 @@ static ssize_t __init xwrite(int fd, const char *p, size_t count)
+
+ /* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
+ while (count) {
+- ssize_t rv = sys_write(fd, p, count);
++ ssize_t rv = sys_write(fd, (char __force_user *)p, count);
+
+ if (rv < 0) {
+ if (rv == -EINTR || rv == -EAGAIN)
+@@ -107,7 +107,7 @@ static void __init free_hash(void)
}
}
@@ -88390,7 +87798,7 @@ index 93b6139..8d628b7 100644
{
struct timespec t[2];
-@@ -119,7 +119,7 @@ static void __init dir_utime(void)
+@@ -142,7 +142,7 @@ static void __init dir_utime(void)
struct dir_entry *de, *tmp;
list_for_each_entry_safe(de, tmp, &dir_list, list) {
list_del(&de->list);
@@ -88399,7 +87807,7 @@ index 93b6139..8d628b7 100644
kfree(de->name);
kfree(de);
}
-@@ -281,7 +281,7 @@ static int __init maybe_link(void)
+@@ -304,7 +304,7 @@ static int __init maybe_link(void)
if (nlink >= 2) {
char *old = find_link(major, minor, ino, mode, collected);
if (old)
@@ -88408,12 +87816,12 @@ index 93b6139..8d628b7 100644
}
return 0;
}
-@@ -290,11 +290,11 @@ static void __init clean_path(char *path, umode_t mode)
+@@ -313,11 +313,11 @@ static void __init clean_path(char *path, umode_t fmode)
{
struct stat st;
-- if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
-+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode^mode) & S_IFMT) {
+- if (!sys_newlstat(path, &st) && (st.st_mode ^ fmode) & S_IFMT) {
++ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode ^ fmode) & S_IFMT) {
if (S_ISDIR(st.st_mode))
- sys_rmdir(path);
+ sys_rmdir((char __force_user *)path);
@@ -88423,7 +87831,7 @@ index 93b6139..8d628b7 100644
}
}
-@@ -315,7 +315,7 @@ static int __init do_name(void)
+@@ -338,7 +338,7 @@ static int __init do_name(void)
int openflags = O_WRONLY|O_CREAT;
if (ml != 1)
openflags |= O_TRUNC;
@@ -88432,7 +87840,7 @@ index 93b6139..8d628b7 100644
if (wfd >= 0) {
sys_fchown(wfd, uid, gid);
-@@ -327,17 +327,17 @@ static int __init do_name(void)
+@@ -350,17 +350,17 @@ static int __init do_name(void)
}
}
} else if (S_ISDIR(mode)) {
@@ -88457,26 +87865,16 @@ index 93b6139..8d628b7 100644
}
}
return 0;
-@@ -346,15 +346,15 @@ static int __init do_name(void)
- static int __init do_copy(void)
- {
- if (count >= body_len) {
-- sys_write(wfd, victim, body_len);
-+ sys_write(wfd, (char __force_user *)victim, body_len);
+@@ -372,7 +372,7 @@ static int __init do_copy(void)
+ if (xwrite(wfd, victim, body_len) != body_len)
+ error("write error");
sys_close(wfd);
- do_utime(vcollected, mtime);
+ do_utime((char __force_user *)vcollected, mtime);
kfree(vcollected);
eat(body_len);
state = SkipIt;
- return 0;
- } else {
-- sys_write(wfd, victim, count);
-+ sys_write(wfd, (char __force_user *)victim, count);
- body_len -= count;
- eat(count);
- return 1;
-@@ -365,9 +365,9 @@ static int __init do_symlink(void)
+@@ -390,9 +390,9 @@ static int __init do_symlink(void)
{
collected[N_ALIGN(name_len) + body_len] = '\0';
clean_path(collected, 0);
@@ -88490,10 +87888,10 @@ index 93b6139..8d628b7 100644
next_state = Reset;
return 0;
diff --git a/init/main.c b/init/main.c
-index 58c132d..ac3f3b0 100644
+index 321d0ce..91b53e5 100644
--- a/init/main.c
+++ b/init/main.c
-@@ -97,6 +97,8 @@ extern void radix_tree_init(void);
+@@ -98,6 +98,8 @@ extern void radix_tree_init(void);
static inline void mark_rodata_ro(void) { }
#endif
@@ -88502,7 +87900,7 @@ index 58c132d..ac3f3b0 100644
/*
* Debug helper: via this flag we know that we are in 'early bootup code'
* where only the boot processor is running with IRQ disabled. This means
-@@ -158,6 +160,75 @@ static int __init set_reset_devices(char *str)
+@@ -159,6 +161,75 @@ static int __init set_reset_devices(char *str)
__setup("reset_devices", set_reset_devices);
@@ -88575,18 +87973,28 @@ index 58c132d..ac3f3b0 100644
+__setup("pax_softmode=", setup_pax_softmode);
+#endif
+
- static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
- const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
+ static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
+ const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
static const char *panic_later, *panic_param;
-@@ -692,25 +763,24 @@ int __init_or_module do_one_initcall(initcall_t fn)
+@@ -728,7 +799,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
+ struct blacklist_entry *entry;
+ char *fn_name;
+
+- fn_name = kasprintf(GFP_KERNEL, "%pf", fn);
++ fn_name = kasprintf(GFP_KERNEL, "%pX", fn);
+ if (!fn_name)
+ return false;
+
+@@ -780,7 +851,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
{
int count = preempt_count();
int ret;
- char msgbuf[64];
+ const char *msg1 = "", *msg2 = "";
- if (initcall_debug)
- ret = do_one_initcall_debug(fn);
+ if (initcall_blacklisted(fn))
+ return -EPERM;
+@@ -790,18 +861,17 @@ int __init_or_module do_one_initcall(initcall_t fn)
else
ret = fn();
@@ -88609,7 +88017,7 @@ index 58c132d..ac3f3b0 100644
return ret;
}
-@@ -817,8 +887,8 @@ static int run_init_process(const char *init_filename)
+@@ -907,8 +977,8 @@ static int run_init_process(const char *init_filename)
{
argv_init[0] = init_filename;
return do_execve(getname_kernel(init_filename),
@@ -88620,7 +88028,7 @@ index 58c132d..ac3f3b0 100644
}
static int try_to_run_init_process(const char *init_filename)
-@@ -835,6 +905,10 @@ static int try_to_run_init_process(const char *init_filename)
+@@ -925,6 +995,10 @@ static int try_to_run_init_process(const char *init_filename)
return ret;
}
@@ -88631,7 +88039,7 @@ index 58c132d..ac3f3b0 100644
static noinline void __init kernel_init_freeable(void);
static int __ref kernel_init(void *unused)
-@@ -859,6 +933,11 @@ static int __ref kernel_init(void *unused)
+@@ -949,6 +1023,11 @@ static int __ref kernel_init(void *unused)
ramdisk_execute_command, ret);
}
@@ -88643,7 +88051,7 @@ index 58c132d..ac3f3b0 100644
/*
* We try each of these until one succeeds.
*
-@@ -914,7 +993,7 @@ static noinline void __init kernel_init_freeable(void)
+@@ -1004,7 +1083,7 @@ static noinline void __init kernel_init_freeable(void)
do_basic_setup();
/* Open the /dev/console on the rootfs, this should never fail */
@@ -88652,7 +88060,7 @@ index 58c132d..ac3f3b0 100644
pr_err("Warning: unable to open an initial console.\n");
(void) sys_dup(0);
-@@ -927,11 +1006,13 @@ static noinline void __init kernel_init_freeable(void)
+@@ -1017,11 +1096,13 @@ static noinline void __init kernel_init_freeable(void)
if (!ramdisk_execute_command)
ramdisk_execute_command = "/init";
@@ -88668,10 +88076,10 @@ index 58c132d..ac3f3b0 100644
* Ok, we have completed the initial bootup, and
* we're essentially up and running. Get rid of the
diff --git a/ipc/compat.c b/ipc/compat.c
-index f486b00..442867f 100644
+index 9b3c85f..1c4d897 100644
--- a/ipc/compat.c
+++ b/ipc/compat.c
-@@ -399,7 +399,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
+@@ -396,7 +396,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
COMPAT_SHMLBA);
if (err < 0)
return err;
@@ -88681,11 +88089,11 @@ index f486b00..442867f 100644
case SHMDT:
return sys_shmdt(compat_ptr(ptr));
diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
-index cadddc8..c263084 100644
+index e8075b2..76f2c6a 100644
--- a/ipc/ipc_sysctl.c
+++ b/ipc/ipc_sysctl.c
-@@ -30,7 +30,7 @@ static void *get_ipc(ctl_table *table)
- static int proc_ipc_dointvec(ctl_table *table, int write,
+@@ -30,7 +30,7 @@ static void *get_ipc(struct ctl_table *table)
+ static int proc_ipc_dointvec(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
- struct ctl_table ipc_table;
@@ -88693,8 +88101,8 @@ index cadddc8..c263084 100644
memcpy(&ipc_table, table, sizeof(ipc_table));
ipc_table.data = get_ipc(table);
-@@ -41,7 +41,7 @@ static int proc_ipc_dointvec(ctl_table *table, int write,
- static int proc_ipc_dointvec_minmax(ctl_table *table, int write,
+@@ -41,7 +41,7 @@ static int proc_ipc_dointvec(struct ctl_table *table, int write,
+ static int proc_ipc_dointvec_minmax(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
- struct ctl_table ipc_table;
@@ -88702,8 +88110,8 @@ index cadddc8..c263084 100644
memcpy(&ipc_table, table, sizeof(ipc_table));
ipc_table.data = get_ipc(table);
-@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(ctl_table *table, int write,
- static int proc_ipc_callback_dointvec_minmax(ctl_table *table, int write,
+@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(struct ctl_table *table, int write,
+ static int proc_ipc_callback_dointvec_minmax(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
- struct ctl_table ipc_table;
@@ -88711,8 +88119,8 @@ index cadddc8..c263084 100644
size_t lenp_bef = *lenp;
int rc;
-@@ -88,7 +88,7 @@ static int proc_ipc_callback_dointvec_minmax(ctl_table *table, int write,
- static int proc_ipc_doulongvec_minmax(ctl_table *table, int write,
+@@ -88,7 +88,7 @@ static int proc_ipc_callback_dointvec_minmax(struct ctl_table *table, int write,
+ static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
- struct ctl_table ipc_table;
@@ -88721,7 +88129,7 @@ index cadddc8..c263084 100644
ipc_table.data = get_ipc(table);
@@ -122,7 +122,7 @@ static void ipc_auto_callback(int val)
- static int proc_ipcauto_dointvec_minmax(ctl_table *table, int write,
+ static int proc_ipcauto_dointvec_minmax(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
- struct ctl_table ipc_table;
@@ -88730,11 +88138,11 @@ index cadddc8..c263084 100644
int rc;
diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
-index 5bb8bfe..a38ec05 100644
+index 68d4e95..1477ded 100644
--- a/ipc/mq_sysctl.c
+++ b/ipc/mq_sysctl.c
-@@ -25,7 +25,7 @@ static void *get_mq(ctl_table *table)
- static int proc_mq_dointvec(ctl_table *table, int write,
+@@ -25,7 +25,7 @@ static void *get_mq(struct ctl_table *table)
+ static int proc_mq_dointvec(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
- struct ctl_table mq_table;
@@ -88742,8 +88150,8 @@ index 5bb8bfe..a38ec05 100644
memcpy(&mq_table, table, sizeof(mq_table));
mq_table.data = get_mq(table);
-@@ -35,7 +35,7 @@ static int proc_mq_dointvec(ctl_table *table, int write,
- static int proc_mq_dointvec_minmax(ctl_table *table, int write,
+@@ -35,7 +35,7 @@ static int proc_mq_dointvec(struct ctl_table *table, int write,
+ static int proc_mq_dointvec_minmax(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
- struct ctl_table mq_table;
@@ -88752,7 +88160,7 @@ index 5bb8bfe..a38ec05 100644
mq_table.data = get_mq(table);
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
-index c3b3117..1efa933 100644
+index 4fcf39a..d3cc2ec 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
@@ -88763,69 +88171,8 @@ index c3b3117..1efa933 100644
spin_lock(&mq_lock);
if (u->mq_bytes + mq_bytes < u->mq_bytes ||
u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
-diff --git a/ipc/msg.c b/ipc/msg.c
-index 6498531..b0ff3c8 100644
---- a/ipc/msg.c
-+++ b/ipc/msg.c
-@@ -303,18 +303,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
- return security_msg_queue_associate(msq, msgflg);
- }
-
-+static struct ipc_ops msg_ops = {
-+ .getnew = newque,
-+ .associate = msg_security,
-+ .more_checks = NULL
-+};
-+
- SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
- {
- struct ipc_namespace *ns;
-- struct ipc_ops msg_ops;
- struct ipc_params msg_params;
-
- ns = current->nsproxy->ipc_ns;
-
-- msg_ops.getnew = newque;
-- msg_ops.associate = msg_security;
-- msg_ops.more_checks = NULL;
--
- msg_params.key = key;
- msg_params.flg = msgflg;
-
-diff --git a/ipc/sem.c b/ipc/sem.c
-index bee5554..e9af81dd 100644
---- a/ipc/sem.c
-+++ b/ipc/sem.c
-@@ -561,10 +561,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
- return 0;
- }
-
-+static struct ipc_ops sem_ops = {
-+ .getnew = newary,
-+ .associate = sem_security,
-+ .more_checks = sem_more_checks
-+};
-+
- SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
- {
- struct ipc_namespace *ns;
-- struct ipc_ops sem_ops;
- struct ipc_params sem_params;
-
- ns = current->nsproxy->ipc_ns;
-@@ -572,10 +577,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
- if (nsems < 0 || nsems > ns->sc_semmsl)
- return -EINVAL;
-
-- sem_ops.getnew = newary;
-- sem_ops.associate = sem_security;
-- sem_ops.more_checks = sem_more_checks;
--
- sem_params.key = key;
- sem_params.flg = semflg;
- sem_params.u.nsems = nsems;
diff --git a/ipc/shm.c b/ipc/shm.c
-index 7645961..afc7f02 100644
+index 0145479..3d27947 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
@@ -88834,56 +88181,26 @@ index 7645961..afc7f02 100644
+#ifdef CONFIG_GRKERNSEC
+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
-+ const time_t shm_createtime, const kuid_t cuid,
++ const u64 shm_createtime, const kuid_t cuid,
+ const int shmid);
+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
-+ const time_t shm_createtime);
++ const u64 shm_createtime);
+#endif
+
void shm_init_ns(struct ipc_namespace *ns)
{
ns->shm_ctlmax = SHMMAX;
-@@ -553,6 +561,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
+@@ -559,6 +567,9 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
shp->shm_lprid = 0;
shp->shm_atim = shp->shm_dtim = 0;
shp->shm_ctim = get_seconds();
+#ifdef CONFIG_GRKERNSEC
-+ {
-+ struct timespec timeval;
-+ do_posix_clock_monotonic_gettime(&timeval);
-+
-+ shp->shm_createtime = timeval.tv_sec;
-+ }
++ shp->shm_createtime = ktime_get_ns();
+#endif
shp->shm_segsz = size;
shp->shm_nattch = 0;
shp->shm_file = file;
-@@ -606,18 +622,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
- return 0;
- }
-
-+static struct ipc_ops shm_ops = {
-+ .getnew = newseg,
-+ .associate = shm_security,
-+ .more_checks = shm_more_checks
-+};
-+
- SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
- {
- struct ipc_namespace *ns;
-- struct ipc_ops shm_ops;
- struct ipc_params shm_params;
-
- ns = current->nsproxy->ipc_ns;
-
-- shm_ops.getnew = newseg;
-- shm_ops.associate = shm_security;
-- shm_ops.more_checks = shm_more_checks;
--
- shm_params.key = key;
- shm_params.flg = shmflg;
- shm_params.u.size = size;
-@@ -1088,6 +1105,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
+@@ -1095,6 +1106,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
f_mode = FMODE_READ | FMODE_WRITE;
}
if (shmflg & SHM_EXEC) {
@@ -88896,7 +88213,7 @@ index 7645961..afc7f02 100644
prot |= PROT_EXEC;
acc_mode |= S_IXUGO;
}
-@@ -1112,6 +1135,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
+@@ -1119,6 +1136,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
if (err)
goto out_unlock;
@@ -88912,7 +88229,7 @@ index 7645961..afc7f02 100644
ipc_lock_object(&shp->shm_perm);
/* check if shm_destroy() is tearing down shp */
-@@ -1124,6 +1156,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
+@@ -1131,6 +1157,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
path = shp->shm_file->f_path;
path_get(&path);
shp->shm_nattch++;
@@ -88923,7 +88240,7 @@ index 7645961..afc7f02 100644
ipc_unlock_object(&shp->shm_perm);
rcu_read_unlock();
diff --git a/ipc/util.c b/ipc/util.c
-index e1b4c6d..8174204 100644
+index 88adc32..3867c68 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -71,6 +71,8 @@ struct ipc_proc_iface {
@@ -88944,23 +88261,10 @@ index e1b4c6d..8174204 100644
+ return -1;
+
/* is there some bit set in requested_mode but not in granted_mode? */
- if ((requested_mode & ~granted_mode & 0007) &&
+ if ((requested_mode & ~granted_mode & 0007) &&
!ns_capable(ns->user_ns, CAP_IPC_OWNER))
-diff --git a/kernel/acct.c b/kernel/acct.c
-index 8d6e145..33e0b1e 100644
---- a/kernel/acct.c
-+++ b/kernel/acct.c
-@@ -556,7 +556,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
- */
- flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
- current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
-- file->f_op->write(file, (char *)&ac,
-+ file->f_op->write(file, (char __force_user *)&ac,
- sizeof(acct_t), &file->f_pos);
- current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
- set_fs(fs);
diff --git a/kernel/audit.c b/kernel/audit.c
-index b45b2da..159e8c4 100644
+index c6df990..fde80b4 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -122,7 +122,7 @@ u32 audit_sig_sid = 0;
@@ -88990,7 +88294,7 @@ index b45b2da..159e8c4 100644
audit_rate_limit,
audit_backlog_limit);
audit_panic(message);
-@@ -803,7 +803,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+@@ -840,7 +840,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
s.pid = audit_pid;
s.rate_limit = audit_rate_limit;
s.backlog_limit = audit_backlog_limit;
@@ -89000,10 +88304,10 @@ index b45b2da..159e8c4 100644
s.version = AUDIT_VERSION_LATEST;
s.backlog_wait_time = audit_backlog_wait_time;
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
-index 619b58d..e58d957 100644
+index e420a0c..38137fa 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
-@@ -1954,7 +1954,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
+@@ -2014,7 +2014,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
}
/* global counter which is incremented every time something logs in */
@@ -89012,7 +88316,7 @@ index 619b58d..e58d957 100644
static int audit_set_loginuid_perm(kuid_t loginuid)
{
-@@ -2023,7 +2023,7 @@ int audit_set_loginuid(kuid_t loginuid)
+@@ -2081,7 +2081,7 @@ int audit_set_loginuid(kuid_t loginuid)
/* are we setting or clearing? */
if (uid_valid(loginuid))
@@ -89021,11 +88325,65 @@ index 619b58d..e58d957 100644
task->sessionid = sessionid;
task->loginuid = loginuid;
+diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
+index d6594e4..597264b 100644
+--- a/kernel/bpf/core.c
++++ b/kernel/bpf/core.c
+@@ -143,14 +143,17 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
+ * random section of illegal instructions.
+ */
+ size = round_up(proglen + sizeof(*hdr) + 128, PAGE_SIZE);
+- hdr = module_alloc(size);
++ hdr = module_alloc_exec(size);
+ if (hdr == NULL)
+ return NULL;
+
+ /* Fill space with illegal/arch-dep instructions. */
+ bpf_fill_ill_insns(hdr, size);
+
++ pax_open_kernel();
+ hdr->pages = size / PAGE_SIZE;
++ pax_close_kernel();
++
+ hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),
+ PAGE_SIZE - sizeof(*hdr));
+ start = (prandom_u32() % hole) & ~(alignment - 1);
+@@ -163,7 +166,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
+
+ void bpf_jit_binary_free(struct bpf_binary_header *hdr)
+ {
+- module_free(NULL, hdr);
++ module_free_exec(NULL, hdr);
+ }
+ #endif /* CONFIG_BPF_JIT */
+
+diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
+index ba61c8c..c60c486 100644
+--- a/kernel/bpf/syscall.c
++++ b/kernel/bpf/syscall.c
+@@ -539,11 +539,15 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
+ int err;
+
+ /* the syscall is limited to root temporarily. This restriction will be
+- * lifted when security audit is clean. Note that eBPF+tracing must have
+- * this restriction, since it may pass kernel data to user space
++ * lifted by upstream when a half-assed security audit is clean. Note
++ * that eBPF+tracing must have this restriction, since it may pass
++ * kernel data to user space
+ */
+ if (!capable(CAP_SYS_ADMIN))
+ return -EPERM;
++#ifdef CONFIG_GRKERNSEC
++ return -EPERM;
++#endif
+
+ if (!access_ok(VERIFY_READ, uattr, 1))
+ return -EFAULT;
diff --git a/kernel/capability.c b/kernel/capability.c
-index 00adb21..d5954a8 100644
+index 989f5bf..d317ca0 100644
--- a/kernel/capability.c
+++ b/kernel/capability.c
-@@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
+@@ -192,6 +192,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
* before modification is attempted and the application
* fails.
*/
@@ -89035,7 +88393,7 @@ index 00adb21..d5954a8 100644
if (copy_to_user(dataptr, kdata, tocopy
* sizeof(struct __user_cap_data_struct))) {
return -EFAULT;
-@@ -307,10 +310,11 @@ bool has_ns_capability(struct task_struct *t,
+@@ -297,10 +300,11 @@ bool has_ns_capability(struct task_struct *t,
int ret;
rcu_read_lock();
@@ -89049,7 +88407,7 @@ index 00adb21..d5954a8 100644
}
/**
-@@ -347,10 +351,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
+@@ -337,10 +341,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
int ret;
rcu_read_lock();
@@ -89062,7 +88420,7 @@ index 00adb21..d5954a8 100644
}
/**
-@@ -388,7 +392,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
+@@ -378,7 +382,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
BUG();
}
@@ -89071,7 +88429,7 @@ index 00adb21..d5954a8 100644
current->flags |= PF_SUPERPRIV;
return true;
}
-@@ -396,6 +400,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
+@@ -386,6 +390,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
}
EXPORT_SYMBOL(ns_capable);
@@ -89093,7 +88451,7 @@ index 00adb21..d5954a8 100644
/**
* file_ns_capable - Determine if the file's opener had a capability in effect
* @file: The file we want to check
-@@ -436,6 +455,12 @@ bool capable(int cap)
+@@ -427,6 +446,12 @@ bool capable(int cap)
}
EXPORT_SYMBOL(capable);
@@ -89106,7 +88464,7 @@ index 00adb21..d5954a8 100644
/**
* capable_wrt_inode_uidgid - Check nsown_capable and uid and gid mapped
* @inode: The inode in question
-@@ -453,3 +478,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
+@@ -444,3 +469,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
kgid_has_mapping(ns, inode->i_gid);
}
EXPORT_SYMBOL(capable_wrt_inode_uidgid);
@@ -89120,35 +88478,30 @@ index 00adb21..d5954a8 100644
+}
+EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
-index 550e205..b0a7f7d 100644
+index 136ecea..45157a6 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
-@@ -5189,6 +5189,14 @@ static void cgroup_release_agent(struct work_struct *work)
- release_list);
- list_del_init(&cgrp->release_list);
- raw_spin_unlock(&release_list_lock);
+@@ -5276,6 +5276,9 @@ static void cgroup_release_agent(struct work_struct *work)
+ if (!pathbuf || !agentbuf)
+ goto out;
+
++ if (agentbuf[0] == '\0')
++ goto out;
+
-+ /*
-+ * don't bother calling call_usermodehelper if we haven't
-+ * configured a binary to execute
-+ */
-+ if (cgrp->root->release_agent_path[0] == '\0')
-+ goto continue_free;
-+
- pathbuf = kmalloc(PAGE_SIZE, GFP_KERNEL);
- if (!pathbuf)
- goto continue_free;
-@@ -5371,7 +5379,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
- struct css_set *cset = link->cset;
+ path = cgroup_path(cgrp, pathbuf, PATH_MAX);
+ if (!path)
+ goto out;
+@@ -5461,7 +5464,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
struct task_struct *task;
int count = 0;
+
- seq_printf(seq, "css_set %p\n", cset);
+ seq_printf(seq, "css_set %pK\n", cset);
+
list_for_each_entry(task, &cset->tasks, cg_list) {
- if (count++ > MAX_TASKS_SHOWN_PER_CSS) {
- seq_puts(seq, " ...\n");
+ if (count++ > MAX_TASKS_SHOWN_PER_CSS)
diff --git a/kernel/compat.c b/kernel/compat.c
-index 0a09e48..b46b3d78 100644
+index ebb3c36..1df606e 100644
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -13,6 +13,7 @@
@@ -89168,7 +88521,7 @@ index 0a09e48..b46b3d78 100644
oldfs = get_fs();
set_fs(KERNEL_DS);
ret = hrtimer_nanosleep_restart(restart);
-@@ -252,7 +253,7 @@ asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp,
+@@ -252,7 +253,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
oldfs = get_fs();
set_fs(KERNEL_DS);
ret = hrtimer_nanosleep(&tu,
@@ -89177,7 +88530,7 @@ index 0a09e48..b46b3d78 100644
HRTIMER_MODE_REL, CLOCK_MONOTONIC);
set_fs(oldfs);
-@@ -361,7 +362,7 @@ asmlinkage long compat_sys_sigpending(compat_old_sigset_t __user *set)
+@@ -379,7 +380,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
mm_segment_t old_fs = get_fs();
set_fs(KERNEL_DS);
@@ -89186,16 +88539,16 @@ index 0a09e48..b46b3d78 100644
set_fs(old_fs);
if (ret == 0)
ret = put_user(s, set);
-@@ -451,7 +452,7 @@ asmlinkage long compat_sys_old_getrlimit(unsigned int resource,
+@@ -469,7 +470,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
mm_segment_t old_fs = get_fs();
set_fs(KERNEL_DS);
-- ret = sys_old_getrlimit(resource, &r);
+- ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r);
+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
set_fs(old_fs);
if (!ret) {
-@@ -533,8 +534,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
+@@ -551,8 +552,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
set_fs (KERNEL_DS);
ret = sys_wait4(pid,
(stat_addr ?
@@ -89206,7 +88559,7 @@ index 0a09e48..b46b3d78 100644
set_fs (old_fs);
if (ret > 0) {
-@@ -560,8 +561,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
+@@ -578,8 +579,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
memset(&info, 0, sizeof(info));
set_fs(KERNEL_DS);
@@ -89217,7 +88570,7 @@ index 0a09e48..b46b3d78 100644
set_fs(old_fs);
if ((ret < 0) || (info.si_signo == 0))
-@@ -695,8 +696,8 @@ long compat_sys_timer_settime(timer_t timer_id, int flags,
+@@ -713,8 +714,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
oldfs = get_fs();
set_fs(KERNEL_DS);
err = sys_timer_settime(timer_id, flags,
@@ -89228,7 +88581,7 @@ index 0a09e48..b46b3d78 100644
set_fs(oldfs);
if (!err && old && put_compat_itimerspec(old, &oldts))
return -EFAULT;
-@@ -713,7 +714,7 @@ long compat_sys_timer_gettime(timer_t timer_id,
+@@ -731,7 +732,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
oldfs = get_fs();
set_fs(KERNEL_DS);
err = sys_timer_gettime(timer_id,
@@ -89237,7 +88590,7 @@ index 0a09e48..b46b3d78 100644
set_fs(oldfs);
if (!err && put_compat_itimerspec(setting, &ts))
return -EFAULT;
-@@ -732,7 +733,7 @@ long compat_sys_clock_settime(clockid_t which_clock,
+@@ -750,7 +751,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
oldfs = get_fs();
set_fs(KERNEL_DS);
err = sys_clock_settime(which_clock,
@@ -89246,16 +88599,16 @@ index 0a09e48..b46b3d78 100644
set_fs(oldfs);
return err;
}
-@@ -747,7 +748,7 @@ long compat_sys_clock_gettime(clockid_t which_clock,
+@@ -765,7 +766,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
oldfs = get_fs();
set_fs(KERNEL_DS);
err = sys_clock_gettime(which_clock,
- (struct timespec __user *) &ts);
+ (struct timespec __force_user *) &ts);
set_fs(oldfs);
- if (!err && put_compat_timespec(&ts, tp))
+ if (!err && compat_put_timespec(&ts, tp))
return -EFAULT;
-@@ -767,7 +768,7 @@ long compat_sys_clock_adjtime(clockid_t which_clock,
+@@ -785,7 +786,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
oldfs = get_fs();
set_fs(KERNEL_DS);
@@ -89264,28 +88617,25 @@ index 0a09e48..b46b3d78 100644
set_fs(oldfs);
err = compat_put_timex(utp, &txc);
-@@ -787,7 +788,7 @@ long compat_sys_clock_getres(clockid_t which_clock,
+@@ -805,7 +806,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
oldfs = get_fs();
set_fs(KERNEL_DS);
err = sys_clock_getres(which_clock,
- (struct timespec __user *) &ts);
+ (struct timespec __force_user *) &ts);
set_fs(oldfs);
- if (!err && tp && put_compat_timespec(&ts, tp))
+ if (!err && tp && compat_put_timespec(&ts, tp))
return -EFAULT;
-@@ -799,9 +800,9 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
- long err;
- mm_segment_t oldfs;
+@@ -819,7 +820,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
struct timespec tu;
-- struct compat_timespec *rmtp = restart->nanosleep.compat_rmtp;
-+ struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
+ struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
oldfs = get_fs();
set_fs(KERNEL_DS);
err = clock_nanosleep_restart(restart);
-@@ -833,8 +834,8 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
+@@ -851,8 +852,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
oldfs = get_fs();
set_fs(KERNEL_DS);
err = sys_clock_nanosleep(which_clock, flags,
@@ -89296,14 +88646,14 @@ index 0a09e48..b46b3d78 100644
set_fs(oldfs);
if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
-@@ -1128,7 +1129,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
+@@ -1146,7 +1147,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
mm_segment_t old_fs = get_fs();
set_fs(KERNEL_DS);
- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
set_fs(old_fs);
- if (put_compat_timespec(&t, interval))
+ if (compat_put_timespec(&t, interval))
return -EFAULT;
diff --git a/kernel/configs.c b/kernel/configs.c
index c18b1f1..b9a0132 100644
@@ -89330,7 +88680,7 @@ index c18b1f1..b9a0132 100644
return -ENOMEM;
diff --git a/kernel/cred.c b/kernel/cred.c
-index e0573a4..20fb164 100644
+index e0573a4..26c0fd3 100644
--- a/kernel/cred.c
+++ b/kernel/cred.c
@@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
@@ -89368,7 +88718,7 @@ index e0573a4..20fb164 100644
/* dumpability changes */
if (!uid_eq(old->euid, new->euid) ||
!gid_eq(old->egid, new->egid) ||
-@@ -479,6 +491,108 @@ int commit_creds(struct cred *new)
+@@ -479,6 +491,105 @@ int commit_creds(struct cred *new)
put_cred(old);
return 0;
}
@@ -89403,10 +88753,7 @@ index e0573a4..20fb164 100644
+ ncred->sgid = new->sgid;
+ ncred->fsgid = new->fsgid;
+ // groups
-+ if (set_groups(ncred, new->group_info) < 0) {
-+ abort_creds(ncred);
-+ goto die;
-+ }
++ set_groups(ncred, new->group_info);
+ // caps
+ ncred->securebits = new->securebits;
+ ncred->cap_inheritable = new->cap_inheritable;
@@ -89478,7 +88825,7 @@ index e0573a4..20fb164 100644
/**
diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
-index 8865cae..3530a18 100644
+index 1adf62b..7736e06 100644
--- a/kernel/debug/debug_core.c
+++ b/kernel/debug/debug_core.c
@@ -124,7 +124,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
@@ -89542,7 +88889,7 @@ index 8865cae..3530a18 100644
}
EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
-index 0b097c8..11dd5c5 100644
+index 379650b..30c5180 100644
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
@@ -1977,7 +1977,7 @@ static int kdb_lsmod(int argc, const char **argv)
@@ -89564,10 +88911,10 @@ index 0b097c8..11dd5c5 100644
#ifdef CONFIG_MODULE_UNLOAD
{
diff --git a/kernel/events/core.c b/kernel/events/core.c
-index 69cffb4..54dc2d9 100644
+index 2ab0238..bf89262f5 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
-@@ -159,8 +159,15 @@ static struct srcu_struct pmus_srcu;
+@@ -170,8 +170,15 @@ static struct srcu_struct pmus_srcu;
* 0 - disallow raw tracepoint access for unpriv
* 1 - disallow cpu events for unpriv
* 2 - disallow kernel profiling for unpriv
@@ -89584,7 +88931,7 @@ index 69cffb4..54dc2d9 100644
/* Minimum for 512 kiB + 1 user control page */
int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
-@@ -186,7 +193,7 @@ void update_perf_cpu_limits(void)
+@@ -197,7 +204,7 @@ void update_perf_cpu_limits(void)
tmp *= sysctl_perf_cpu_time_max_percent;
do_div(tmp, 100);
@@ -89593,8 +88940,8 @@ index 69cffb4..54dc2d9 100644
}
static int perf_rotate_context(struct perf_cpu_context *cpuctx);
-@@ -273,7 +280,7 @@ void perf_sample_event_took(u64 sample_len_ns)
- update_perf_cpu_limits();
+@@ -303,7 +310,7 @@ void perf_sample_event_took(u64 sample_len_ns)
+ }
}
-static atomic64_t perf_event_id;
@@ -89602,7 +88949,7 @@ index 69cffb4..54dc2d9 100644
static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
enum event_type_t event_type);
-@@ -3011,7 +3018,7 @@ static void __perf_event_read(void *info)
+@@ -3102,7 +3109,7 @@ static void __perf_event_read(void *info)
static inline u64 perf_event_count(struct perf_event *event)
{
@@ -89611,7 +88958,7 @@ index 69cffb4..54dc2d9 100644
}
static u64 perf_event_read(struct perf_event *event)
-@@ -3376,9 +3383,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
+@@ -3528,9 +3535,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
mutex_lock(&event->child_mutex);
total += perf_event_read(event);
*enabled += event->total_time_enabled +
@@ -89623,7 +88970,7 @@ index 69cffb4..54dc2d9 100644
list_for_each_entry(child, &event->child_list, child_list) {
total += perf_event_read(child);
-@@ -3827,10 +3834,10 @@ void perf_event_update_userpage(struct perf_event *event)
+@@ -3994,10 +4001,10 @@ void perf_event_update_userpage(struct perf_event *event)
userpg->offset -= local64_read(&event->hw.prev_count);
userpg->time_enabled = enabled +
@@ -89636,7 +88983,7 @@ index 69cffb4..54dc2d9 100644
arch_perf_update_userpage(userpg, now);
-@@ -4381,7 +4388,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
+@@ -4561,7 +4568,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
/* Data. */
sp = perf_user_stack_pointer(regs);
@@ -89645,7 +88992,7 @@ index 69cffb4..54dc2d9 100644
dyn_size = dump_size - rem;
perf_output_skip(handle, rem);
-@@ -4472,11 +4479,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
+@@ -4652,11 +4659,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
values[n++] = perf_event_count(event);
if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
values[n++] = enabled +
@@ -89659,7 +89006,7 @@ index 69cffb4..54dc2d9 100644
}
if (read_format & PERF_FORMAT_ID)
values[n++] = primary_event_id(event);
-@@ -6755,7 +6762,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
+@@ -6958,7 +6965,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
event->parent = parent_event;
event->ns = get_pid_ns(task_active_pid_ns(current));
@@ -89668,7 +89015,7 @@ index 69cffb4..54dc2d9 100644
event->state = PERF_EVENT_STATE_INACTIVE;
-@@ -7055,6 +7062,11 @@ SYSCALL_DEFINE5(perf_event_open,
+@@ -7237,6 +7244,11 @@ SYSCALL_DEFINE5(perf_event_open,
if (flags & ~PERF_FLAG_ALL)
return -EINVAL;
@@ -89680,7 +89027,7 @@ index 69cffb4..54dc2d9 100644
err = perf_copy_attr(attr_uptr, &attr);
if (err)
return err;
-@@ -7393,10 +7405,10 @@ static void sync_child_event(struct perf_event *child_event,
+@@ -7592,10 +7604,10 @@ static void sync_child_event(struct perf_event *child_event,
/*
* Add back the child's count to the parent's count:
*/
@@ -89739,10 +89086,10 @@ index 569b2187..19940d9 100644
/* Callchain handling */
extern struct perf_callchain_entry *
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
-index 1139b22..5aac2f9 100644
+index ed8f2cd..fe8030c 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
-@@ -1665,7 +1665,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
+@@ -1670,7 +1670,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
{
struct page *page;
uprobe_opcode_t opcode;
@@ -89752,10 +89099,10 @@ index 1139b22..5aac2f9 100644
pagefault_disable();
result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
diff --git a/kernel/exit.c b/kernel/exit.c
-index 81b3d67..ef189a4 100644
+index 2116aac..d95df2a 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
-@@ -173,6 +173,10 @@ void release_task(struct task_struct * p)
+@@ -174,6 +174,10 @@ void release_task(struct task_struct *p)
struct task_struct *leader;
int zap_leader;
repeat:
@@ -89766,25 +89113,16 @@ index 81b3d67..ef189a4 100644
/* don't need to get the RCU readlock here - the process is dead and
* can't be modifying its own credentials. But shut RCU-lockdep up */
rcu_read_lock();
-@@ -330,7 +334,7 @@ int allow_signal(int sig)
- * know it'll be handled, so that they don't get converted to
- * SIGKILL or just silently dropped.
- */
-- current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
-+ current->sighand->action[(sig)-1].sa.sa_handler = (__force void __user *)2;
- recalc_sigpending();
- spin_unlock_irq(&current->sighand->siglock);
- return 0;
-@@ -706,6 +710,8 @@ void do_exit(long code)
- struct task_struct *tsk = current;
+@@ -670,6 +674,8 @@ void do_exit(long code)
int group_dead;
+ TASKS_RCU(int tasks_rcu_i);
+ set_fs(USER_DS);
+
profile_task_exit(tsk);
WARN_ON(blk_needs_flush_plug(tsk));
-@@ -722,7 +728,6 @@ void do_exit(long code)
+@@ -686,7 +692,6 @@ void do_exit(long code)
* mm_release()->clear_child_tid() from writing to a user-controlled
* kernel address.
*/
@@ -89792,7 +89130,7 @@ index 81b3d67..ef189a4 100644
ptrace_event(PTRACE_EVENT_EXIT, code);
-@@ -781,6 +786,9 @@ void do_exit(long code)
+@@ -744,6 +749,9 @@ void do_exit(long code)
tsk->exit_code = code;
taskstats_exit(tsk, group_dead);
@@ -89802,7 +89140,7 @@ index 81b3d67..ef189a4 100644
exit_mm(tsk);
if (group_dead)
-@@ -900,7 +908,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
+@@ -863,7 +871,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
* Take down every thread in the group. This is called by fatal signals
* as well as by sys_exit_group (below).
*/
@@ -89812,10 +89150,10 @@ index 81b3d67..ef189a4 100644
{
struct signal_struct *sig = current->signal;
diff --git a/kernel/fork.c b/kernel/fork.c
-index e2c6853..9a6397e 100644
+index 9b7d746..5b898ab 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
-@@ -182,6 +182,48 @@ void thread_info_cache_init(void)
+@@ -183,6 +183,48 @@ void thread_info_cache_init(void)
# endif
#endif
@@ -89864,7 +89202,7 @@ index e2c6853..9a6397e 100644
/* SLAB cache for signal_struct structures (tsk->signal) */
static struct kmem_cache *signal_cachep;
-@@ -200,18 +242,22 @@ struct kmem_cache *vm_area_cachep;
+@@ -201,18 +243,22 @@ struct kmem_cache *vm_area_cachep;
/* SLAB cache for mm_struct structures (tsk->mm) */
static struct kmem_cache *mm_cachep;
@@ -89890,15 +89228,15 @@ index e2c6853..9a6397e 100644
rt_mutex_debug_task_free(tsk);
ftrace_graph_exit_task(tsk);
put_seccomp_filter(tsk);
-@@ -297,6 +343,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
+@@ -306,6 +352,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
+ {
struct task_struct *tsk;
struct thread_info *ti;
- unsigned long *stackend;
+ void *lowmem_stack;
int node = tsk_fork_get_node(orig);
int err;
-@@ -304,7 +351,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
+@@ -313,7 +360,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
if (!tsk)
return NULL;
@@ -89907,18 +89245,18 @@ index e2c6853..9a6397e 100644
if (!ti)
goto free_tsk;
-@@ -313,6 +360,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
+@@ -322,6 +369,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
goto free_ti;
tsk->stack = ti;
+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
+ tsk->lowmem_stack = lowmem_stack;
+#endif
-
- setup_thread_stack(tsk, orig);
- clear_user_return_notifier(tsk);
-@@ -321,7 +371,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
- *stackend = STACK_END_MAGIC; /* for overflow detection */
+ #ifdef CONFIG_SECCOMP
+ /*
+ * We must handle setting up seccomp filters once we're under
+@@ -338,7 +388,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
+ set_task_stack_end_magic(tsk);
#ifdef CONFIG_CC_STACKPROTECTOR
- tsk->stack_canary = get_random_int();
@@ -89926,7 +89264,7 @@ index e2c6853..9a6397e 100644
#endif
/*
-@@ -335,24 +385,92 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
+@@ -352,24 +402,92 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
tsk->splice_pipe = NULL;
tsk->task_frag.page = NULL;
@@ -89984,7 +89322,7 @@ index e2c6853..9a6397e 100644
+ atomic_dec(&inode->i_writecount);
+ mutex_lock(&mapping->i_mmap_mutex);
+ if (tmp->vm_flags & VM_SHARED)
-+ mapping->i_mmap_writable++;
++ atomic_inc(&mapping->i_mmap_writable);
+ flush_dcache_mmap_lock(mapping);
+ /* insert tmp into the share list, just after mpnt */
+ if (unlikely(tmp->vm_flags & VM_NONLINEAR))
@@ -90023,7 +89361,7 @@ index e2c6853..9a6397e 100644
uprobe_start_dup_mmap();
down_write(&oldmm->mmap_sem);
-@@ -381,55 +499,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+@@ -397,55 +515,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
prev = NULL;
for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
@@ -90065,7 +89403,7 @@ index e2c6853..9a6397e 100644
- atomic_dec(&inode->i_writecount);
- mutex_lock(&mapping->i_mmap_mutex);
- if (tmp->vm_flags & VM_SHARED)
-- mapping->i_mmap_writable++;
+- atomic_inc(&mapping->i_mmap_writable);
- flush_dcache_mmap_lock(mapping);
- /* insert tmp into the share list, just after mpnt */
- if (unlikely(tmp->vm_flags & VM_NONLINEAR))
@@ -90083,7 +89421,7 @@ index e2c6853..9a6397e 100644
}
/*
-@@ -461,6 +539,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+@@ -477,6 +555,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
if (retval)
goto out;
}
@@ -90115,7 +89453,7 @@ index e2c6853..9a6397e 100644
/* a new mm has just been created */
arch_dup_mmap(oldmm, mm);
retval = 0;
-@@ -470,14 +573,6 @@ out:
+@@ -486,14 +589,6 @@ out:
up_write(&oldmm->mmap_sem);
uprobe_end_dup_mmap();
return retval;
@@ -90130,7 +89468,7 @@ index e2c6853..9a6397e 100644
}
static inline int mm_alloc_pgd(struct mm_struct *mm)
-@@ -691,8 +786,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
+@@ -734,8 +829,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
return ERR_PTR(err);
mm = get_task_mm(task);
@@ -90141,7 +89479,7 @@ index e2c6853..9a6397e 100644
mmput(mm);
mm = ERR_PTR(-EACCES);
}
-@@ -911,13 +1006,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
+@@ -938,13 +1033,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
spin_unlock(&fs->lock);
return -EAGAIN;
}
@@ -90163,7 +89501,7 @@ index e2c6853..9a6397e 100644
return 0;
}
-@@ -1135,7 +1237,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
+@@ -1179,7 +1281,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
* parts of the process environment (as per the clone
* flags). The actual kick-off is left to the caller.
*/
@@ -90172,7 +89510,7 @@ index e2c6853..9a6397e 100644
unsigned long stack_start,
unsigned long stack_size,
int __user *child_tidptr,
-@@ -1207,6 +1309,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
+@@ -1250,6 +1352,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
#endif
retval = -EAGAIN;
@@ -90182,7 +89520,7 @@ index e2c6853..9a6397e 100644
if (atomic_read(&p->real_cred->user->processes) >=
task_rlimit(p, RLIMIT_NPROC)) {
if (p->real_cred->user != INIT_USER &&
-@@ -1454,6 +1559,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
+@@ -1499,6 +1604,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
goto bad_fork_free_pid;
}
@@ -90194,7 +89532,7 @@ index e2c6853..9a6397e 100644
if (likely(p->pid)) {
ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
-@@ -1545,6 +1655,8 @@ bad_fork_cleanup_count:
+@@ -1589,6 +1699,8 @@ bad_fork_cleanup_count:
bad_fork_free:
free_task(p);
fork_out:
@@ -90203,7 +89541,7 @@ index e2c6853..9a6397e 100644
return ERR_PTR(retval);
}
-@@ -1606,6 +1718,7 @@ long do_fork(unsigned long clone_flags,
+@@ -1650,6 +1762,7 @@ long do_fork(unsigned long clone_flags,
p = copy_process(clone_flags, stack_start, stack_size,
child_tidptr, NULL, trace);
@@ -90211,7 +89549,7 @@ index e2c6853..9a6397e 100644
/*
* Do this prior waking up the new thread - the thread pointer
* might get invalid after that point, if the thread exits quickly.
-@@ -1622,6 +1735,8 @@ long do_fork(unsigned long clone_flags,
+@@ -1666,6 +1779,8 @@ long do_fork(unsigned long clone_flags,
if (clone_flags & CLONE_PARENT_SETTID)
put_user(nr, parent_tidptr);
@@ -90220,7 +89558,7 @@ index e2c6853..9a6397e 100644
if (clone_flags & CLONE_VFORK) {
p->vfork_done = &vfork;
init_completion(&vfork);
-@@ -1740,7 +1855,7 @@ void __init proc_caches_init(void)
+@@ -1784,7 +1899,7 @@ void __init proc_caches_init(void)
mm_cachep = kmem_cache_create("mm_struct",
sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
@@ -90229,7 +89567,7 @@ index e2c6853..9a6397e 100644
mmap_init();
nsproxy_cache_init();
}
-@@ -1780,7 +1895,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
+@@ -1824,7 +1939,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
return 0;
/* don't need lock here; in the worst case we'll do useless copy */
@@ -90238,7 +89576,7 @@ index e2c6853..9a6397e 100644
return 0;
*new_fsp = copy_fs_struct(fs);
-@@ -1887,7 +2002,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
+@@ -1936,7 +2051,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
fs = current->fs;
spin_lock(&fs->lock);
current->fs = new_fs;
@@ -90249,18 +89587,10 @@ index e2c6853..9a6397e 100644
else
new_fs = fs;
diff --git a/kernel/futex.c b/kernel/futex.c
-index fda2950..5f3eb62 100644
+index 63678b5..512f9af 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
-@@ -54,6 +54,7 @@
- #include <linux/mount.h>
- #include <linux/pagemap.h>
- #include <linux/syscalls.h>
-+#include <linux/ptrace.h>
- #include <linux/signal.h>
- #include <linux/export.h>
- #include <linux/magic.h>
-@@ -188,7 +189,7 @@ struct futex_pi_state {
+@@ -201,7 +201,7 @@ struct futex_pi_state {
atomic_t refcount;
union futex_key key;
@@ -90269,7 +89599,7 @@ index fda2950..5f3eb62 100644
/**
* struct futex_q - The hashed futex queue entry, one per waiting task
-@@ -222,7 +223,7 @@ struct futex_q {
+@@ -235,7 +235,7 @@ struct futex_q {
struct rt_mutex_waiter *rt_waiter;
union futex_key *requeue_pi_key;
u32 bitset;
@@ -90278,7 +89608,7 @@ index fda2950..5f3eb62 100644
static const struct futex_q futex_q_init = {
/* list gets initialized in queue_me()*/
-@@ -382,6 +383,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
+@@ -402,6 +402,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
struct page *page, *page_head;
int err, ro = 0;
@@ -90290,7 +89620,7 @@ index fda2950..5f3eb62 100644
/*
* The futex address must be "naturally" aligned.
*/
-@@ -581,7 +587,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
+@@ -601,7 +606,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
static int get_futex_value_locked(u32 *dest, u32 __user *from)
{
@@ -90299,7 +89629,7 @@ index fda2950..5f3eb62 100644
pagefault_disable();
ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
-@@ -3022,6 +3028,7 @@ static void __init futex_detect_cmpxchg(void)
+@@ -3006,6 +3011,7 @@ static void __init futex_detect_cmpxchg(void)
{
#ifndef CONFIG_HAVE_FUTEX_CMPXCHG
u32 curval;
@@ -90307,7 +89637,7 @@ index fda2950..5f3eb62 100644
/*
* This will fail and we want it. Some arch implementations do
-@@ -3033,8 +3040,11 @@ static void __init futex_detect_cmpxchg(void)
+@@ -3017,8 +3023,11 @@ static void __init futex_detect_cmpxchg(void)
* implementation, the non-functional ones will return
* -ENOSYS.
*/
@@ -90320,7 +89650,7 @@ index fda2950..5f3eb62 100644
}
diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
-index f9f44fd..29885e4 100644
+index 55c8c93..9ba7ad6 100644
--- a/kernel/futex_compat.c
+++ b/kernel/futex_compat.c
@@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
@@ -90333,10 +89663,10 @@ index f9f44fd..29885e4 100644
{
compat_uptr_t base = ptr_to_compat(entry);
diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
-index f45b75b..bfac6d5 100644
+index b358a80..fc25240 100644
--- a/kernel/gcov/base.c
+++ b/kernel/gcov/base.c
-@@ -108,11 +108,6 @@ void gcov_enable_events(void)
+@@ -114,11 +114,6 @@ void gcov_enable_events(void)
}
#ifdef CONFIG_MODULES
@@ -90348,7 +89678,7 @@ index f45b75b..bfac6d5 100644
/* Update list and generate events when modules are unloaded. */
static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
void *data)
-@@ -127,7 +122,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
+@@ -133,7 +128,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
/* Remove entries located in module from linked list. */
while ((info = gcov_info_next(info))) {
@@ -90357,40 +89687,6 @@ index f45b75b..bfac6d5 100644
gcov_info_unlink(prev, info);
if (gcov_events_enabled)
gcov_event(GCOV_REMOVE, info);
-diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
-index 04d0374..e7c3725 100644
---- a/kernel/hrtimer.c
-+++ b/kernel/hrtimer.c
-@@ -1461,7 +1461,7 @@ void hrtimer_peek_ahead_timers(void)
- local_irq_restore(flags);
- }
-
--static void run_hrtimer_softirq(struct softirq_action *h)
-+static __latent_entropy void run_hrtimer_softirq(void)
- {
- hrtimer_peek_ahead_timers();
- }
-diff --git a/kernel/irq_work.c b/kernel/irq_work.c
-index 55fcce6..0e4cf34 100644
---- a/kernel/irq_work.c
-+++ b/kernel/irq_work.c
-@@ -189,12 +189,13 @@ static int irq_work_cpu_notify(struct notifier_block *self,
- return NOTIFY_OK;
- }
-
--static struct notifier_block cpu_notify;
-+static struct notifier_block cpu_notify = {
-+ .notifier_call = irq_work_cpu_notify,
-+ .priority = 0,
-+};
-
- static __init int irq_work_init_cpu_notifier(void)
- {
-- cpu_notify.notifier_call = irq_work_cpu_notify;
-- cpu_notify.priority = 0;
- register_cpu_notifier(&cpu_notify);
- return 0;
- }
diff --git a/kernel/jump_label.c b/kernel/jump_label.c
index 9019f15..9a3c42e 100644
--- a/kernel/jump_label.c
@@ -90427,7 +89723,7 @@ index 9019f15..9a3c42e 100644
static int
diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
-index 3127ad5..159d880 100644
+index 5c5987f..bc502b0 100644
--- a/kernel/kallsyms.c
+++ b/kernel/kallsyms.c
@@ -11,6 +11,9 @@
@@ -90440,7 +89736,7 @@ index 3127ad5..159d880 100644
#include <linux/kallsyms.h>
#include <linux/module.h>
#include <linux/init.h>
-@@ -53,12 +56,33 @@ extern const unsigned long kallsyms_markers[] __attribute__((weak));
+@@ -54,12 +57,33 @@ extern const unsigned long kallsyms_markers[] __weak;
static inline int is_kernel_inittext(unsigned long addr)
{
@@ -90474,7 +89770,7 @@ index 3127ad5..159d880 100644
static inline int is_kernel_text(unsigned long addr)
{
if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
-@@ -69,13 +93,28 @@ static inline int is_kernel_text(unsigned long addr)
+@@ -70,13 +94,28 @@ static inline int is_kernel_text(unsigned long addr)
static inline int is_kernel(unsigned long addr)
{
@@ -90503,7 +89799,7 @@ index 3127ad5..159d880 100644
if (all_var)
return is_kernel(addr);
-@@ -480,7 +519,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
+@@ -481,7 +520,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
{
@@ -90511,7 +89807,7 @@ index 3127ad5..159d880 100644
iter->nameoff = get_symbol_offset(new_pos);
iter->pos = new_pos;
}
-@@ -528,6 +566,11 @@ static int s_show(struct seq_file *m, void *p)
+@@ -529,6 +567,11 @@ static int s_show(struct seq_file *m, void *p)
{
struct kallsym_iter *iter = m->private;
@@ -90523,7 +89819,7 @@ index 3127ad5..159d880 100644
/* Some debugging symbols have no name. Ignore them. */
if (!iter->name[0])
return 0;
-@@ -541,6 +584,7 @@ static int s_show(struct seq_file *m, void *p)
+@@ -542,6 +585,7 @@ static int s_show(struct seq_file *m, void *p)
*/
type = iter->exported ? toupper(iter->type) :
tolower(iter->type);
@@ -90531,15 +89827,6 @@ index 3127ad5..159d880 100644
seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
type, iter->name, iter->module_name);
} else
-@@ -566,7 +610,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
- struct kallsym_iter *iter;
- int ret;
-
-- iter = kmalloc(sizeof(*iter), GFP_KERNEL);
-+ iter = kzalloc(sizeof(*iter), GFP_KERNEL);
- if (!iter)
- return -ENOMEM;
- reset_iter(iter, 0);
diff --git a/kernel/kcmp.c b/kernel/kcmp.c
index 0aa69ea..a7fcafb 100644
--- a/kernel/kcmp.c
@@ -90556,11 +89843,11 @@ index 0aa69ea..a7fcafb 100644
/*
diff --git a/kernel/kexec.c b/kernel/kexec.c
-index 18ff0b9..40b0eab 100644
+index 2abf9f6..c40cf85 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
-@@ -1045,7 +1045,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
- unsigned long flags)
+@@ -1349,7 +1349,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
+ compat_ulong_t, flags)
{
struct compat_kexec_segment in;
- struct kexec_segment out, __user *ksegments;
@@ -90570,7 +89857,7 @@ index 18ff0b9..40b0eab 100644
/* Don't allow clients that don't understand the native
diff --git a/kernel/kmod.c b/kernel/kmod.c
-index 6b375af..eaff670 100644
+index 80f7a6d..3c476d3 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -75,7 +75,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
@@ -90644,7 +89931,7 @@ index 6b375af..eaff670 100644
/* If modprobe needs a service that is in a module, we get a recursive
* loop. Limit the number of running kmod threads to max_threads/2 or
* MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
-@@ -188,11 +200,52 @@ int __request_module(bool wait, const char *fmt, ...)
+@@ -188,16 +200,61 @@ int __request_module(bool wait, const char *fmt, ...)
trace_module_request(module_name, wait, _RET_IP_);
@@ -90698,7 +89985,16 @@ index 6b375af..eaff670 100644
EXPORT_SYMBOL(__request_module);
#endif /* CONFIG_MODULES */
-@@ -218,6 +271,20 @@ static int ____call_usermodehelper(void *data)
+ static void call_usermodehelper_freeinfo(struct subprocess_info *info)
+ {
++#ifdef CONFIG_GRKERNSEC
++ kfree(info->path);
++ info->path = info->origpath;
++#endif
+ if (info->cleanup)
+ (*info->cleanup)(info);
+ kfree(info);
+@@ -240,6 +297,20 @@ static int ____call_usermodehelper(void *data)
*/
set_user_nice(current, 0);
@@ -90712,14 +90008,14 @@ index 6b375af..eaff670 100644
+ strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
+ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path);
+ retval = -EPERM;
-+ goto fail;
++ goto out;
+ }
+#endif
+
retval = -ENOMEM;
new = prepare_kernel_cred(current);
if (!new)
-@@ -240,8 +307,8 @@ static int ____call_usermodehelper(void *data)
+@@ -262,8 +333,8 @@ static int ____call_usermodehelper(void *data)
commit_creds(new);
retval = do_execve(getname_kernel(sub_info->path),
@@ -90727,20 +90023,9 @@ index 6b375af..eaff670 100644
- (const char __user *const __user *)sub_info->envp);
+ (const char __user *const __force_user *)sub_info->argv,
+ (const char __user *const __force_user *)sub_info->envp);
- if (!retval)
- return 0;
-
-@@ -260,6 +327,10 @@ static int call_helper(void *data)
-
- static void call_usermodehelper_freeinfo(struct subprocess_info *info)
- {
-+#ifdef CONFIG_GRKERNSEC
-+ kfree(info->path);
-+ info->path = info->origpath;
-+#endif
- if (info->cleanup)
- (*info->cleanup)(info);
- kfree(info);
+ out:
+ sub_info->retval = retval;
+ /* wait_for_helper() will call umh_complete if UHM_WAIT_PROC. */
@@ -303,7 +374,7 @@ static int wait_for_helper(void *data)
*
* Thus the __user pointer cast is valid here.
@@ -90750,7 +90035,7 @@ index 6b375af..eaff670 100644
/*
* If ret is 0, either ____call_usermodehelper failed and the
-@@ -542,7 +613,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
+@@ -532,7 +603,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
goto out;
INIT_WORK(&sub_info->work, __call_usermodehelper);
@@ -90763,7 +90048,7 @@ index 6b375af..eaff670 100644
sub_info->argv = argv;
sub_info->envp = envp;
-@@ -650,7 +726,7 @@ EXPORT_SYMBOL(call_usermodehelper);
+@@ -645,7 +721,7 @@ EXPORT_SYMBOL(call_usermodehelper);
static int proc_cap_handler(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
@@ -90773,7 +90058,7 @@ index 6b375af..eaff670 100644
kernel_cap_t new_cap;
int err, i;
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
-index ceeadfc..11c18b6 100644
+index 3995f54..e247879 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -31,6 +31,9 @@
@@ -90786,7 +90071,7 @@ index ceeadfc..11c18b6 100644
#include <linux/kprobes.h>
#include <linux/hash.h>
#include <linux/init.h>
-@@ -135,12 +138,12 @@ enum kprobe_slot_state {
+@@ -122,12 +125,12 @@ enum kprobe_slot_state {
static void *alloc_insn_page(void)
{
@@ -90801,7 +90086,7 @@ index ceeadfc..11c18b6 100644
}
struct kprobe_insn_cache kprobe_insn_slots = {
-@@ -2151,11 +2154,11 @@ static void __kprobes report_probe(struct seq_file *pi, struct kprobe *p,
+@@ -2187,11 +2190,11 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
kprobe_type = "k";
if (sym)
@@ -90816,10 +90101,10 @@ index ceeadfc..11c18b6 100644
if (!pp)
diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
-index d945a94..0b7f45f 100644
+index 6683cce..daf8999 100644
--- a/kernel/ksysfs.c
+++ b/kernel/ksysfs.c
-@@ -46,6 +46,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
+@@ -50,6 +50,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
{
if (count+1 > UEVENT_HELPER_PATH_LEN)
return -ENOENT;
@@ -90828,7 +90113,7 @@ index d945a94..0b7f45f 100644
memcpy(uevent_helper, buf, count);
uevent_helper[count] = '\0';
if (count && uevent_helper[count-1] == '\n')
-@@ -172,7 +174,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
+@@ -176,7 +178,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
return count;
}
@@ -90838,10 +90123,10 @@ index d945a94..0b7f45f 100644
.name = "notes",
.mode = S_IRUGO,
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index eb8a547..321d8e1 100644
+index 88d0d44..e9ce0ee 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
-@@ -597,6 +597,10 @@ static int static_obj(void *obj)
+@@ -599,6 +599,10 @@ static int static_obj(void *obj)
end = (unsigned long) &_end,
addr = (unsigned long) obj;
@@ -90852,7 +90137,7 @@ index eb8a547..321d8e1 100644
/*
* static variable?
*/
-@@ -738,6 +742,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
+@@ -740,6 +744,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
if (!static_obj(lock->key)) {
debug_locks_off();
printk("INFO: trying to register non-static key.\n");
@@ -90860,7 +90145,7 @@ index eb8a547..321d8e1 100644
printk("the code is fine but needs lockdep annotation.\n");
printk("turning off the locking correctness validator.\n");
dump_stack();
-@@ -3082,7 +3087,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
+@@ -3081,7 +3086,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
if (!class)
return 0;
}
@@ -90918,8 +90203,61 @@ index ef43ac4..2720dfa 100644
(void *)class->contending_point[i]);
seq_printf(m, "%40s %14lu %29s %pS\n",
name, stats->contending_point[i],
+diff --git a/kernel/locking/mcs_spinlock.c b/kernel/locking/mcs_spinlock.c
+index 9887a90..0cd2b1d 100644
+--- a/kernel/locking/mcs_spinlock.c
++++ b/kernel/locking/mcs_spinlock.c
+@@ -100,7 +100,7 @@ bool osq_lock(struct optimistic_spin_queue *lock)
+
+ prev = decode_cpu(old);
+ node->prev = prev;
+- ACCESS_ONCE(prev->next) = node;
++ ACCESS_ONCE_RW(prev->next) = node;
+
+ /*
+ * Normally @prev is untouchable after the above store; because at that
+@@ -172,8 +172,8 @@ unqueue:
+ * it will wait in Step-A.
+ */
+
+- ACCESS_ONCE(next->prev) = prev;
+- ACCESS_ONCE(prev->next) = next;
++ ACCESS_ONCE_RW(next->prev) = prev;
++ ACCESS_ONCE_RW(prev->next) = next;
+
+ return false;
+ }
+@@ -195,13 +195,13 @@ void osq_unlock(struct optimistic_spin_queue *lock)
+ node = this_cpu_ptr(&osq_node);
+ next = xchg(&node->next, NULL);
+ if (next) {
+- ACCESS_ONCE(next->locked) = 1;
++ ACCESS_ONCE_RW(next->locked) = 1;
+ return;
+ }
+
+ next = osq_wait_next(lock, node, NULL);
+ if (next)
+- ACCESS_ONCE(next->locked) = 1;
++ ACCESS_ONCE_RW(next->locked) = 1;
+ }
+
+ #endif
+diff --git a/kernel/locking/mcs_spinlock.h b/kernel/locking/mcs_spinlock.h
+index 4d60986..5d351c1 100644
+--- a/kernel/locking/mcs_spinlock.h
++++ b/kernel/locking/mcs_spinlock.h
+@@ -78,7 +78,7 @@ void mcs_spin_lock(struct mcs_spinlock **lock, struct mcs_spinlock *node)
+ */
+ return;
+ }
+- ACCESS_ONCE(prev->next) = node;
++ ACCESS_ONCE_RW(prev->next) = node;
+
+ /* Wait until the lock holder passes the lock down. */
+ arch_mcs_spin_lock_contended(&node->locked);
diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
-index faf6f5b..dc9070a 100644
+index 5cf6731..ce3bc5a 100644
--- a/kernel/locking/mutex-debug.c
+++ b/kernel/locking/mutex-debug.c
@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
@@ -90967,28 +90305,10 @@ index 0799fd3..d06ae3b 100644
extern void debug_mutex_init(struct mutex *lock, const char *name,
struct lock_class_key *key);
diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
-index 4dd6e4c..df52693 100644
+index dadbf88..4500507 100644
--- a/kernel/locking/mutex.c
+++ b/kernel/locking/mutex.c
-@@ -135,7 +135,7 @@ void mspin_lock(struct mspin_node **lock, struct mspin_node *node)
- node->locked = 1;
- return;
- }
-- ACCESS_ONCE(prev->next) = node;
-+ ACCESS_ONCE_RW(prev->next) = node;
- smp_wmb();
- /* Wait until the lock holder passes the lock down */
- while (!ACCESS_ONCE(node->locked))
-@@ -156,7 +156,7 @@ static void mspin_unlock(struct mspin_node **lock, struct mspin_node *node)
- while (!(next = ACCESS_ONCE(node->next)))
- arch_mutex_cpu_relax();
- }
-- ACCESS_ONCE(next->locked) = 1;
-+ ACCESS_ONCE_RW(next->locked) = 1;
- smp_wmb();
- }
-
-@@ -520,7 +520,7 @@ slowpath:
+@@ -518,7 +518,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
goto skip_wait;
debug_mutex_lock_common(lock, &waiter);
@@ -90997,7 +90317,7 @@ index 4dd6e4c..df52693 100644
/* add waiting tasks to the end of the waitqueue (FIFO): */
list_add_tail(&waiter.list, &lock->wait_list);
-@@ -564,7 +564,7 @@ slowpath:
+@@ -563,7 +563,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
schedule_preempt_disabled();
spin_lock_mutex(&lock->wait_lock, flags);
}
@@ -91006,7 +90326,7 @@ index 4dd6e4c..df52693 100644
/* set it to 0 if there are no waiters left: */
if (likely(list_empty(&lock->wait_list)))
atomic_set(&lock->count, 0);
-@@ -601,7 +601,7 @@ skip_wait:
+@@ -600,7 +600,7 @@ skip_wait:
return 0;
err:
@@ -91110,18 +90430,18 @@ index 1d96dd0..994ff19 100644
default:
diff --git a/kernel/module.c b/kernel/module.c
-index 1d679a6..acc7443 100644
+index 88cec1d..d097c28 100644
--- a/kernel/module.c
+++ b/kernel/module.c
-@@ -61,6 +61,7 @@
+@@ -60,6 +60,7 @@
+ #include <linux/jump_label.h>
#include <linux/pfn.h>
#include <linux/bsearch.h>
- #include <linux/fips.h>
+#include <linux/grsecurity.h>
#include <uapi/linux/module.h>
#include "module-internal.h"
-@@ -157,7 +158,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
+@@ -156,7 +157,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
/* Bounds of module allocation, for speeding __module_address.
* Protected by module_mutex. */
@@ -91131,7 +90451,7 @@ index 1d679a6..acc7443 100644
int register_module_notifier(struct notifier_block * nb)
{
-@@ -324,7 +326,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
+@@ -323,7 +325,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
return true;
list_for_each_entry_rcu(mod, &modules, list) {
@@ -91140,7 +90460,7 @@ index 1d679a6..acc7443 100644
{ mod->syms, mod->syms + mod->num_syms, mod->crcs,
NOT_GPL_ONLY, false },
{ mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
-@@ -349,7 +351,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
+@@ -348,7 +350,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
if (mod->state == MODULE_STATE_UNFORMED)
continue;
@@ -91149,7 +90469,7 @@ index 1d679a6..acc7443 100644
return true;
}
return false;
-@@ -489,7 +491,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
+@@ -488,7 +490,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
if (!pcpusec->sh_size)
return 0;
@@ -91158,7 +90478,7 @@ index 1d679a6..acc7443 100644
pr_warn("%s: per-cpu alignment %li > %li\n",
mod->name, align, PAGE_SIZE);
align = PAGE_SIZE;
-@@ -1059,7 +1061,7 @@ struct module_attribute module_uevent =
+@@ -1060,7 +1062,7 @@ struct module_attribute module_uevent =
static ssize_t show_coresize(struct module_attribute *mattr,
struct module_kobject *mk, char *buffer)
{
@@ -91167,7 +90487,7 @@ index 1d679a6..acc7443 100644
}
static struct module_attribute modinfo_coresize =
-@@ -1068,7 +1070,7 @@ static struct module_attribute modinfo_coresize =
+@@ -1069,7 +1071,7 @@ static struct module_attribute modinfo_coresize =
static ssize_t show_initsize(struct module_attribute *mattr,
struct module_kobject *mk, char *buffer)
{
@@ -91176,7 +90496,7 @@ index 1d679a6..acc7443 100644
}
static struct module_attribute modinfo_initsize =
-@@ -1160,12 +1162,29 @@ static int check_version(Elf_Shdr *sechdrs,
+@@ -1161,12 +1163,29 @@ static int check_version(Elf_Shdr *sechdrs,
goto bad_version;
}
@@ -91206,7 +90526,7 @@ index 1d679a6..acc7443 100644
return 0;
}
-@@ -1281,7 +1300,7 @@ resolve_symbol_wait(struct module *mod,
+@@ -1282,7 +1301,7 @@ resolve_symbol_wait(struct module *mod,
*/
#ifdef CONFIG_SYSFS
@@ -91215,7 +90535,7 @@ index 1d679a6..acc7443 100644
static inline bool sect_empty(const Elf_Shdr *sect)
{
return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
-@@ -1421,7 +1440,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
+@@ -1422,7 +1441,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
{
unsigned int notes, loaded, i;
struct module_notes_attrs *notes_attrs;
@@ -91224,7 +90544,7 @@ index 1d679a6..acc7443 100644
/* failed to create section attributes, so can't create notes */
if (!mod->sect_attrs)
-@@ -1533,7 +1552,7 @@ static void del_usage_links(struct module *mod)
+@@ -1534,7 +1553,7 @@ static void del_usage_links(struct module *mod)
static int module_add_modinfo_attrs(struct module *mod)
{
struct module_attribute *attr;
@@ -91233,7 +90553,7 @@ index 1d679a6..acc7443 100644
int error = 0;
int i;
-@@ -1754,21 +1773,21 @@ static void set_section_ro_nx(void *base,
+@@ -1755,21 +1774,21 @@ static void set_section_ro_nx(void *base,
static void unset_module_core_ro_nx(struct module *mod)
{
@@ -91263,7 +90583,7 @@ index 1d679a6..acc7443 100644
set_memory_rw);
}
-@@ -1781,14 +1800,14 @@ void set_all_modules_text_rw(void)
+@@ -1782,14 +1801,14 @@ void set_all_modules_text_rw(void)
list_for_each_entry_rcu(mod, &modules, list) {
if (mod->state == MODULE_STATE_UNFORMED)
continue;
@@ -91284,7 +90604,7 @@ index 1d679a6..acc7443 100644
set_memory_rw);
}
}
-@@ -1804,14 +1823,14 @@ void set_all_modules_text_ro(void)
+@@ -1805,14 +1824,14 @@ void set_all_modules_text_ro(void)
list_for_each_entry_rcu(mod, &modules, list) {
if (mod->state == MODULE_STATE_UNFORMED)
continue;
@@ -91305,7 +90625,7 @@ index 1d679a6..acc7443 100644
set_memory_ro);
}
}
-@@ -1864,16 +1883,19 @@ static void free_module(struct module *mod)
+@@ -1865,16 +1884,19 @@ static void free_module(struct module *mod)
/* This may be NULL, but that's OK */
unset_module_init_ro_nx(mod);
@@ -91328,7 +90648,7 @@ index 1d679a6..acc7443 100644
#ifdef CONFIG_MPU
update_protections(current->mm);
-@@ -1942,9 +1964,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
+@@ -1943,9 +1965,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
int ret = 0;
const struct kernel_symbol *ksym;
@@ -91359,8 +90679,8 @@ index 1d679a6..acc7443 100644
+
switch (sym[i].st_shndx) {
case SHN_COMMON:
- /* We compiled with -fno-common. These are not
-@@ -1965,7 +2009,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
+ /* Ignore common symbols */
+@@ -1970,7 +2014,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
ksym = resolve_symbol_wait(mod, info, name);
/* Ok if resolved. */
if (ksym && !IS_ERR(ksym)) {
@@ -91370,7 +90690,7 @@ index 1d679a6..acc7443 100644
break;
}
-@@ -1984,11 +2030,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
+@@ -1989,11 +2035,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
secbase = (unsigned long)mod_percpu(mod);
else
secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
@@ -91391,7 +90711,7 @@ index 1d679a6..acc7443 100644
return ret;
}
-@@ -2072,22 +2127,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
+@@ -2077,22 +2132,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
|| s->sh_entsize != ~0UL
|| strstarts(sname, ".init"))
continue;
@@ -91418,7 +90738,7 @@ index 1d679a6..acc7443 100644
}
pr_debug("Init section allocation order:\n");
-@@ -2101,23 +2146,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
+@@ -2106,23 +2151,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
|| s->sh_entsize != ~0UL
|| !strstarts(sname, ".init"))
continue;
@@ -91447,7 +90767,7 @@ index 1d679a6..acc7443 100644
}
}
-@@ -2290,7 +2325,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
+@@ -2295,7 +2330,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
/* Put symbol section at end of init part of module. */
symsect->sh_flags |= SHF_ALLOC;
@@ -91456,7 +90776,7 @@ index 1d679a6..acc7443 100644
info->index.sym) | INIT_OFFSET_MASK;
pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
-@@ -2307,13 +2342,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
+@@ -2312,13 +2347,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
}
/* Append room for core symbols at end of core part. */
@@ -91474,7 +90794,7 @@ index 1d679a6..acc7443 100644
info->index.str) | INIT_OFFSET_MASK;
pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
}
-@@ -2331,12 +2366,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
+@@ -2336,12 +2371,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
/* Make sure we get permanent strtab: don't use info->strtab. */
mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
@@ -91491,7 +90811,7 @@ index 1d679a6..acc7443 100644
src = mod->symtab;
for (ndst = i = 0; i < mod->num_symtab; i++) {
if (i == 0 ||
-@@ -2348,6 +2385,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
+@@ -2353,6 +2390,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
}
}
mod->core_num_syms = ndst;
@@ -91500,7 +90820,7 @@ index 1d679a6..acc7443 100644
}
#else
static inline void layout_symtab(struct module *mod, struct load_info *info)
-@@ -2381,17 +2420,33 @@ void * __weak module_alloc(unsigned long size)
+@@ -2386,17 +2425,33 @@ void * __weak module_alloc(unsigned long size)
return vmalloc_exec(size);
}
@@ -91539,7 +90859,7 @@ index 1d679a6..acc7443 100644
mutex_unlock(&module_mutex);
}
return ret;
-@@ -2648,7 +2703,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
+@@ -2650,7 +2705,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
mod = (void *)info->sechdrs[info->index.mod].sh_addr;
if (info->index.sym == 0) {
@@ -91555,7 +90875,7 @@ index 1d679a6..acc7443 100644
return ERR_PTR(-ENOEXEC);
}
-@@ -2664,8 +2727,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
+@@ -2666,8 +2729,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
static int check_modinfo(struct module *mod, struct load_info *info, int flags)
{
const char *modmagic = get_modinfo(info, "vermagic");
@@ -91570,7 +90890,7 @@ index 1d679a6..acc7443 100644
if (flags & MODULE_INIT_IGNORE_VERMAGIC)
modmagic = NULL;
-@@ -2690,7 +2759,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
+@@ -2692,7 +2761,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
}
/* Set up license info based on the info section */
@@ -91579,7 +90899,7 @@ index 1d679a6..acc7443 100644
return 0;
}
-@@ -2784,7 +2853,7 @@ static int move_module(struct module *mod, struct load_info *info)
+@@ -2786,7 +2855,7 @@ static int move_module(struct module *mod, struct load_info *info)
void *ptr;
/* Do the allocs. */
@@ -91588,7 +90908,7 @@ index 1d679a6..acc7443 100644
/*
* The pointer to this block is stored in the module structure
* which is inside the block. Just mark it as not being a
-@@ -2794,11 +2863,11 @@ static int move_module(struct module *mod, struct load_info *info)
+@@ -2796,11 +2865,11 @@ static int move_module(struct module *mod, struct load_info *info)
if (!ptr)
return -ENOMEM;
@@ -91604,7 +90924,7 @@ index 1d679a6..acc7443 100644
/*
* The pointer to this block is stored in the module structure
* which is inside the block. This block doesn't need to be
-@@ -2807,13 +2876,45 @@ static int move_module(struct module *mod, struct load_info *info)
+@@ -2809,13 +2878,45 @@ static int move_module(struct module *mod, struct load_info *info)
*/
kmemleak_ignore(ptr);
if (!ptr) {
@@ -91654,7 +90974,7 @@ index 1d679a6..acc7443 100644
/* Transfer each section which specifies SHF_ALLOC */
pr_debug("final section addresses:\n");
-@@ -2824,16 +2925,45 @@ static int move_module(struct module *mod, struct load_info *info)
+@@ -2826,16 +2927,45 @@ static int move_module(struct module *mod, struct load_info *info)
if (!(shdr->sh_flags & SHF_ALLOC))
continue;
@@ -91707,7 +91027,7 @@ index 1d679a6..acc7443 100644
pr_debug("\t0x%lx %s\n",
(long)shdr->sh_addr, info->secstrings + shdr->sh_name);
}
-@@ -2890,12 +3020,12 @@ static void flush_module_icache(const struct module *mod)
+@@ -2892,12 +3022,12 @@ static void flush_module_icache(const struct module *mod)
* Do it before processing of module parameters, so the module
* can provide parameter accessor functions of its own.
*/
@@ -91726,7 +91046,7 @@ index 1d679a6..acc7443 100644
set_fs(old_fs);
}
-@@ -2952,8 +3082,10 @@ static struct module *layout_and_allocate(struct load_info *info, int flags)
+@@ -2954,8 +3084,10 @@ static struct module *layout_and_allocate(struct load_info *info, int flags)
static void module_deallocate(struct module *mod, struct load_info *info)
{
percpu_modfree(mod);
@@ -91739,7 +91059,7 @@ index 1d679a6..acc7443 100644
}
int __weak module_finalize(const Elf_Ehdr *hdr,
-@@ -2966,7 +3098,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
+@@ -2968,7 +3100,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
static int post_relocation(struct module *mod, const struct load_info *info)
{
/* Sort exception table now relocations are done. */
@@ -91749,8 +91069,26 @@ index 1d679a6..acc7443 100644
/* Copy relocated percpu area over. */
percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
-@@ -3020,16 +3154,16 @@ static int do_init_module(struct module *mod)
- MODULE_STATE_COMING, mod);
+@@ -3077,11 +3211,12 @@ static int do_init_module(struct module *mod)
+ mod->strtab = mod->core_strtab;
+ #endif
+ unset_module_init_ro_nx(mod);
+- module_free(mod, mod->module_init);
+- mod->module_init = NULL;
+- mod->init_size = 0;
+- mod->init_ro_size = 0;
+- mod->init_text_size = 0;
++ module_free(mod, mod->module_init_rw);
++ module_free_exec(mod, mod->module_init_rx);
++ mod->module_init_rw = NULL;
++ mod->module_init_rx = NULL;
++ mod->init_size_rw = 0;
++ mod->init_size_rx = 0;
+ mutex_unlock(&module_mutex);
+ wake_up_all(&module_wq);
+
+@@ -3149,16 +3284,16 @@ static int complete_formation(struct module *mod, struct load_info *info)
+ module_bug_finalize(info->hdr, info->sechdrs, mod);
/* Set RO and NX regions for core */
- set_section_ro_nx(mod->module_core,
@@ -91772,27 +91110,9 @@ index 1d679a6..acc7443 100644
+ mod->init_size_rx,
+ mod->init_size_rx);
- do_mod_ctors(mod);
- /* Start the module */
-@@ -3090,11 +3224,12 @@ static int do_init_module(struct module *mod)
- mod->strtab = mod->core_strtab;
- #endif
- unset_module_init_ro_nx(mod);
-- module_free(mod, mod->module_init);
-- mod->module_init = NULL;
-- mod->init_size = 0;
-- mod->init_ro_size = 0;
-- mod->init_text_size = 0;
-+ module_free(mod, mod->module_init_rw);
-+ module_free_exec(mod, mod->module_init_rx);
-+ mod->module_init_rw = NULL;
-+ mod->module_init_rx = NULL;
-+ mod->init_size_rw = 0;
-+ mod->init_size_rx = 0;
- mutex_unlock(&module_mutex);
- wake_up_all(&module_wq);
-
-@@ -3237,9 +3372,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
+ /* Mark state as coming so strong_try_module_get() ignores us,
+ * but kallsyms etc. can see us. */
+@@ -3242,9 +3377,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
if (err)
goto free_unload;
@@ -91831,7 +91151,7 @@ index 1d679a6..acc7443 100644
/* Fix up syms, so that st_value is a pointer to location. */
err = simplify_symbols(mod, info);
if (err < 0)
-@@ -3255,13 +3419,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
+@@ -3260,13 +3424,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
flush_module_icache(mod);
@@ -91845,7 +91165,7 @@ index 1d679a6..acc7443 100644
dynamic_debug_setup(info->debug, info->num_debug);
/* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
-@@ -3299,11 +3456,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
+@@ -3314,11 +3471,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
ddebug_cleanup:
dynamic_debug_remove(info->debug);
synchronize_sched();
@@ -91858,7 +91178,7 @@ index 1d679a6..acc7443 100644
free_unload:
module_unload_free(mod);
unlink_mod:
-@@ -3386,10 +3542,16 @@ static const char *get_ksymbol(struct module *mod,
+@@ -3403,10 +3559,16 @@ static const char *get_ksymbol(struct module *mod,
unsigned long nextval;
/* At worse, next value is at end of module */
@@ -91878,7 +91198,7 @@ index 1d679a6..acc7443 100644
/* Scan for closest preceding symbol, and next symbol. (ELF
starts real symbols at 1). */
-@@ -3640,7 +3802,7 @@ static int m_show(struct seq_file *m, void *p)
+@@ -3654,7 +3816,7 @@ static int m_show(struct seq_file *m, void *p)
return 0;
seq_printf(m, "%s %u",
@@ -91887,7 +91207,7 @@ index 1d679a6..acc7443 100644
print_unload_info(m, mod);
/* Informative for users. */
-@@ -3649,7 +3811,7 @@ static int m_show(struct seq_file *m, void *p)
+@@ -3663,7 +3825,7 @@ static int m_show(struct seq_file *m, void *p)
mod->state == MODULE_STATE_COMING ? "Loading":
"Live");
/* Used by oprofile and other similar tools. */
@@ -91896,7 +91216,7 @@ index 1d679a6..acc7443 100644
/* Taints info */
if (mod->taints)
-@@ -3685,7 +3847,17 @@ static const struct file_operations proc_modules_operations = {
+@@ -3699,7 +3861,17 @@ static const struct file_operations proc_modules_operations = {
static int __init proc_modules_init(void)
{
@@ -91914,7 +91234,7 @@ index 1d679a6..acc7443 100644
return 0;
}
module_init(proc_modules_init);
-@@ -3746,14 +3918,14 @@ struct module *__module_address(unsigned long addr)
+@@ -3760,7 +3932,8 @@ struct module *__module_address(unsigned long addr)
{
struct module *mod;
@@ -91924,15 +91244,7 @@ index 1d679a6..acc7443 100644
return NULL;
list_for_each_entry_rcu(mod, &modules, list) {
- if (mod->state == MODULE_STATE_UNFORMED)
- continue;
-- if (within_module_core(addr, mod)
-- || within_module_init(addr, mod))
-+ if (within_module_init(addr, mod) || within_module_core(addr, mod))
- return mod;
- }
- return NULL;
-@@ -3788,11 +3960,20 @@ bool is_module_text_address(unsigned long addr)
+@@ -3801,11 +3974,20 @@ bool is_module_text_address(unsigned long addr)
*/
struct module *__module_text_address(unsigned long addr)
{
@@ -91957,7 +91269,7 @@ index 1d679a6..acc7443 100644
}
return mod;
diff --git a/kernel/notifier.c b/kernel/notifier.c
-index 2d5cc4c..d9ea600 100644
+index 4803da6..1c5eea6 100644
--- a/kernel/notifier.c
+++ b/kernel/notifier.c
@@ -5,6 +5,7 @@
@@ -92035,10 +91347,10 @@ index 161402f..598814c 100644
atomic_set(&pd->refcnt, 0);
pd->pinst = pinst;
diff --git a/kernel/panic.c b/kernel/panic.c
-index 6d63003..486a109 100644
+index cf80672..f6771b2 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
-@@ -52,7 +52,7 @@ EXPORT_SYMBOL(panic_blink);
+@@ -53,7 +53,7 @@ EXPORT_SYMBOL(panic_blink);
/*
* Stop ourself in panic -- architecture code may override this
*/
@@ -92047,7 +91359,7 @@ index 6d63003..486a109 100644
{
while (1)
cpu_relax();
-@@ -407,7 +407,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
+@@ -422,7 +422,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
disable_trace_on_warning();
pr_warn("------------[ cut here ]------------\n");
@@ -92056,9 +91368,9 @@ index 6d63003..486a109 100644
raw_smp_processor_id(), current->pid, file, line, caller);
if (args)
-@@ -461,7 +461,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
+@@ -476,7 +476,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
*/
- void __stack_chk_fail(void)
+ __visible void __stack_chk_fail(void)
{
- panic("stack-protector: Kernel stack is corrupted in: %p\n",
+ dump_stack();
@@ -92135,145 +91447,8 @@ index db95d8e..a0ca23f 100644
if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
return -EPERM;
-diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
-index 3b89464..5e38379 100644
---- a/kernel/posix-cpu-timers.c
-+++ b/kernel/posix-cpu-timers.c
-@@ -1464,14 +1464,14 @@ struct k_clock clock_posix_cpu = {
-
- static __init int init_posix_cpu_timers(void)
- {
-- struct k_clock process = {
-+ static struct k_clock process = {
- .clock_getres = process_cpu_clock_getres,
- .clock_get = process_cpu_clock_get,
- .timer_create = process_cpu_timer_create,
- .nsleep = process_cpu_nsleep,
- .nsleep_restart = process_cpu_nsleep_restart,
- };
-- struct k_clock thread = {
-+ static struct k_clock thread = {
- .clock_getres = thread_cpu_clock_getres,
- .clock_get = thread_cpu_clock_get,
- .timer_create = thread_cpu_timer_create,
-diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
-index 77e6b83..fc021bd 100644
---- a/kernel/posix-timers.c
-+++ b/kernel/posix-timers.c
-@@ -43,6 +43,7 @@
- #include <linux/hash.h>
- #include <linux/posix-clock.h>
- #include <linux/posix-timers.h>
-+#include <linux/grsecurity.h>
- #include <linux/syscalls.h>
- #include <linux/wait.h>
- #include <linux/workqueue.h>
-@@ -122,7 +123,7 @@ static DEFINE_SPINLOCK(hash_lock);
- * which we beg off on and pass to do_sys_settimeofday().
- */
-
--static struct k_clock posix_clocks[MAX_CLOCKS];
-+static struct k_clock *posix_clocks[MAX_CLOCKS];
-
- /*
- * These ones are defined below.
-@@ -275,7 +276,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
- */
- static __init int init_posix_timers(void)
- {
-- struct k_clock clock_realtime = {
-+ static struct k_clock clock_realtime = {
- .clock_getres = hrtimer_get_res,
- .clock_get = posix_clock_realtime_get,
- .clock_set = posix_clock_realtime_set,
-@@ -287,7 +288,7 @@ static __init int init_posix_timers(void)
- .timer_get = common_timer_get,
- .timer_del = common_timer_del,
- };
-- struct k_clock clock_monotonic = {
-+ static struct k_clock clock_monotonic = {
- .clock_getres = hrtimer_get_res,
- .clock_get = posix_ktime_get_ts,
- .nsleep = common_nsleep,
-@@ -297,19 +298,19 @@ static __init int init_posix_timers(void)
- .timer_get = common_timer_get,
- .timer_del = common_timer_del,
- };
-- struct k_clock clock_monotonic_raw = {
-+ static struct k_clock clock_monotonic_raw = {
- .clock_getres = hrtimer_get_res,
- .clock_get = posix_get_monotonic_raw,
- };
-- struct k_clock clock_realtime_coarse = {
-+ static struct k_clock clock_realtime_coarse = {
- .clock_getres = posix_get_coarse_res,
- .clock_get = posix_get_realtime_coarse,
- };
-- struct k_clock clock_monotonic_coarse = {
-+ static struct k_clock clock_monotonic_coarse = {
- .clock_getres = posix_get_coarse_res,
- .clock_get = posix_get_monotonic_coarse,
- };
-- struct k_clock clock_tai = {
-+ static struct k_clock clock_tai = {
- .clock_getres = hrtimer_get_res,
- .clock_get = posix_get_tai,
- .nsleep = common_nsleep,
-@@ -319,7 +320,7 @@ static __init int init_posix_timers(void)
- .timer_get = common_timer_get,
- .timer_del = common_timer_del,
- };
-- struct k_clock clock_boottime = {
-+ static struct k_clock clock_boottime = {
- .clock_getres = hrtimer_get_res,
- .clock_get = posix_get_boottime,
- .nsleep = common_nsleep,
-@@ -531,7 +532,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
- return;
- }
-
-- posix_clocks[clock_id] = *new_clock;
-+ posix_clocks[clock_id] = new_clock;
- }
- EXPORT_SYMBOL_GPL(posix_timers_register_clock);
-
-@@ -577,9 +578,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
- return (id & CLOCKFD_MASK) == CLOCKFD ?
- &clock_posix_dynamic : &clock_posix_cpu;
-
-- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
-+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
- return NULL;
-- return &posix_clocks[id];
-+ return posix_clocks[id];
- }
-
- static int common_timer_create(struct k_itimer *new_timer)
-@@ -597,7 +598,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
- struct k_clock *kc = clockid_to_kclock(which_clock);
- struct k_itimer *new_timer;
- int error, new_timer_id;
-- sigevent_t event;
-+ sigevent_t event = { };
- int it_id_set = IT_ID_NOT_SET;
-
- if (!kc)
-@@ -1012,6 +1013,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
- if (copy_from_user(&new_tp, tp, sizeof (*tp)))
- return -EFAULT;
-
-+ /* only the CLOCK_REALTIME clock can be set, all other clocks
-+ have their clock_set fptr set to a nosettime dummy function
-+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
-+ call common_clock_set, which calls do_sys_settimeofday, which
-+ we hook
-+ */
-+
- return kc->clock_set(which_clock, &new_tp);
- }
-
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
-index 2fac9cc..56fef29 100644
+index bbef57f..5f94462 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
@@ -92286,10 +91461,10 @@ index 2fac9cc..56fef29 100644
select LZO_COMPRESS
select LZO_DECOMPRESS
diff --git a/kernel/power/process.c b/kernel/power/process.c
-index f1fe7ec..7d4e641 100644
+index 5a6ec86..3a8c884 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
-@@ -34,6 +34,7 @@ static int try_to_freeze_tasks(bool user_only)
+@@ -35,6 +35,7 @@ static int try_to_freeze_tasks(bool user_only)
unsigned int elapsed_msecs;
bool wakeup = false;
int sleep_usecs = USEC_PER_MSEC;
@@ -92297,14 +91472,14 @@ index f1fe7ec..7d4e641 100644
do_gettimeofday(&start);
-@@ -44,13 +45,20 @@ static int try_to_freeze_tasks(bool user_only)
+@@ -45,13 +46,20 @@ static int try_to_freeze_tasks(bool user_only)
while (true) {
todo = 0;
+ if (time_after(jiffies, end_time))
+ timedout = true;
read_lock(&tasklist_lock);
- do_each_thread(g, p) {
+ for_each_process_thread(g, p) {
if (p == current || !freeze_task(p))
continue;
@@ -92316,10 +91491,10 @@ index f1fe7ec..7d4e641 100644
+ sched_show_task(p);
+ }
+ }
- } while_each_thread(g, p);
+ }
read_unlock(&tasklist_lock);
-@@ -59,7 +67,7 @@ static int try_to_freeze_tasks(bool user_only)
+@@ -60,7 +68,7 @@ static int try_to_freeze_tasks(bool user_only)
todo += wq_busy;
}
@@ -92329,10 +91504,10 @@ index f1fe7ec..7d4e641 100644
if (pm_wakeup_pending()) {
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
-index 8c086e6..a52bc51 100644
+index ced2b84..ffc4791 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
-@@ -385,6 +385,11 @@ static int check_syslog_permissions(int type, bool from_file)
+@@ -489,6 +489,11 @@ static int check_syslog_permissions(int type, bool from_file)
if (from_file && type != SYSLOG_ACTION_OPEN)
return 0;
@@ -92345,7 +91520,7 @@ index 8c086e6..a52bc51 100644
if (capable(CAP_SYSLOG))
return 0;
diff --git a/kernel/profile.c b/kernel/profile.c
-index ebdd9c1..612ee05 100644
+index 54bf5ba..df6e0a2 100644
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -37,7 +37,7 @@ struct profile_hit {
@@ -92357,7 +91532,7 @@ index ebdd9c1..612ee05 100644
static unsigned long prof_len, prof_shift;
int prof_on __read_mostly;
-@@ -260,7 +260,7 @@ static void profile_flip_buffers(void)
+@@ -256,7 +256,7 @@ static void profile_flip_buffers(void)
hits[i].pc = 0;
continue;
}
@@ -92366,7 +91541,7 @@ index ebdd9c1..612ee05 100644
hits[i].hits = hits[i].pc = 0;
}
}
-@@ -321,9 +321,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
+@@ -317,9 +317,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
* Add the current hit(s) and flush the write-queue out
* to the global buffer:
*/
@@ -92378,7 +91553,7 @@ index ebdd9c1..612ee05 100644
hits[i].pc = hits[i].hits = 0;
}
out:
-@@ -398,7 +398,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
+@@ -394,7 +394,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
{
unsigned long pc;
pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
@@ -92387,7 +91562,7 @@ index ebdd9c1..612ee05 100644
}
#endif /* !CONFIG_SMP */
-@@ -494,7 +494,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
+@@ -490,7 +490,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
return -EFAULT;
buf++; p++; count--; read++;
}
@@ -92396,7 +91571,7 @@ index ebdd9c1..612ee05 100644
if (copy_to_user(buf, (void *)pnt, count))
return -EFAULT;
read += count;
-@@ -525,7 +525,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
+@@ -521,7 +521,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
}
#endif
profile_discard_flip_buffers();
@@ -92406,10 +91581,10 @@ index ebdd9c1..612ee05 100644
}
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 1f4bcb3..99cf7ab 100644
+index 54e7522..5b82dd6 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
-@@ -327,7 +327,7 @@ static int ptrace_attach(struct task_struct *task, long request,
+@@ -321,7 +321,7 @@ static int ptrace_attach(struct task_struct *task, long request,
if (seize)
flags |= PT_SEIZED;
rcu_read_lock();
@@ -92418,7 +91593,7 @@ index 1f4bcb3..99cf7ab 100644
flags |= PT_PTRACE_CAP;
rcu_read_unlock();
task->ptrace = flags;
-@@ -538,7 +538,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
+@@ -532,7 +532,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
break;
return -EIO;
}
@@ -92427,7 +91602,7 @@ index 1f4bcb3..99cf7ab 100644
return -EFAULT;
copied += retval;
src += retval;
-@@ -806,7 +806,7 @@ int ptrace_request(struct task_struct *child, long request,
+@@ -800,7 +800,7 @@ int ptrace_request(struct task_struct *child, long request,
bool seized = child->ptrace & PT_SEIZED;
int ret = -EIO;
siginfo_t siginfo, *si;
@@ -92436,7 +91611,7 @@ index 1f4bcb3..99cf7ab 100644
unsigned long __user *datalp = datavp;
unsigned long flags;
-@@ -1052,14 +1052,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
+@@ -1046,14 +1046,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
goto out;
}
@@ -92459,7 +91634,7 @@ index 1f4bcb3..99cf7ab 100644
goto out_put_task_struct;
}
-@@ -1087,7 +1094,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
+@@ -1081,7 +1088,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
if (copied != sizeof(tmp))
return -EIO;
@@ -92468,16 +91643,16 @@ index 1f4bcb3..99cf7ab 100644
}
int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
-@@ -1181,7 +1188,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
+@@ -1175,7 +1182,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
}
- asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
-- compat_long_t addr, compat_long_t data)
-+ compat_ulong_t addr, compat_ulong_t data)
+ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
+- compat_long_t, addr, compat_long_t, data)
++ compat_ulong_t, addr, compat_ulong_t, data)
{
struct task_struct *child;
long ret;
-@@ -1197,14 +1204,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
+@@ -1191,14 +1198,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
goto out;
}
@@ -92522,52 +91697,14 @@ index 322ea8e..82cfc28 100644
}
int clean_sort_range(struct range *range, int az)
-diff --git a/kernel/rcu/srcu.c b/kernel/rcu/srcu.c
-index 3318d82..1a5b2d1 100644
---- a/kernel/rcu/srcu.c
-+++ b/kernel/rcu/srcu.c
-@@ -300,9 +300,9 @@ int __srcu_read_lock(struct srcu_struct *sp)
-
- idx = ACCESS_ONCE(sp->completed) & 0x1;
- preempt_disable();
-- ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
-+ ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
- smp_mb(); /* B */ /* Avoid leaking the critical section. */
-- ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;
-+ ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;
- preempt_enable();
- return idx;
- }
-diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
-index 1254f31..16258dc 100644
---- a/kernel/rcu/tiny.c
-+++ b/kernel/rcu/tiny.c
-@@ -46,7 +46,7 @@
- /* Forward declarations for tiny_plugin.h. */
- struct rcu_ctrlblk;
- static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
--static void rcu_process_callbacks(struct softirq_action *unused);
-+static void rcu_process_callbacks(void);
- static void __call_rcu(struct rcu_head *head,
- void (*func)(struct rcu_head *rcu),
- struct rcu_ctrlblk *rcp);
-@@ -312,7 +312,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
- false));
- }
-
--static void rcu_process_callbacks(struct softirq_action *unused)
-+static __latent_entropy void rcu_process_callbacks(void)
- {
- __rcu_process_callbacks(&rcu_sched_ctrlblk);
- __rcu_process_callbacks(&rcu_bh_ctrlblk);
-diff --git a/kernel/rcu/torture.c b/kernel/rcu/torture.c
-index 732f8ae..42c1919 100644
---- a/kernel/rcu/torture.c
-+++ b/kernel/rcu/torture.c
-@@ -174,12 +174,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
- { 0 };
- static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
- { 0 };
+diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
+index 240fa90..5fa56bd 100644
+--- a/kernel/rcu/rcutorture.c
++++ b/kernel/rcu/rcutorture.c
+@@ -134,12 +134,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
+ rcu_torture_count) = { 0 };
+ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
+ rcu_torture_batch) = { 0 };
-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
-static atomic_t n_rcu_torture_alloc;
-static atomic_t n_rcu_torture_alloc_fail;
@@ -92583,7 +91720,16 @@ index 732f8ae..42c1919 100644
static long n_rcu_torture_barrier_error;
static long n_rcu_torture_boost_ktrerror;
static long n_rcu_torture_boost_rterror;
-@@ -297,11 +297,11 @@ rcu_torture_alloc(void)
+@@ -148,7 +148,7 @@ static long n_rcu_torture_boosts;
+ static long n_rcu_torture_timers;
+ static long n_barrier_attempts;
+ static long n_barrier_successes;
+-static atomic_long_t n_cbfloods;
++static atomic_long_unchecked_t n_cbfloods;
+ static struct list_head rcu_torture_removed;
+
+ static int rcu_torture_writer_state;
+@@ -211,11 +211,11 @@ rcu_torture_alloc(void)
spin_lock_bh(&rcu_torture_lock);
if (list_empty(&rcu_torture_freelist)) {
@@ -92597,7 +91743,7 @@ index 732f8ae..42c1919 100644
p = rcu_torture_freelist.next;
list_del_init(p);
spin_unlock_bh(&rcu_torture_lock);
-@@ -314,7 +314,7 @@ rcu_torture_alloc(void)
+@@ -228,7 +228,7 @@ rcu_torture_alloc(void)
static void
rcu_torture_free(struct rcu_torture *p)
{
@@ -92606,7 +91752,7 @@ index 732f8ae..42c1919 100644
spin_lock_bh(&rcu_torture_lock);
list_add_tail(&p->rtort_free, &rcu_torture_freelist);
spin_unlock_bh(&rcu_torture_lock);
-@@ -435,7 +435,7 @@ rcu_torture_cb(struct rcu_head *p)
+@@ -312,7 +312,7 @@ rcu_torture_pipe_update_one(struct rcu_torture *rp)
i = rp->rtort_pipe_count;
if (i > RCU_TORTURE_PIPE_LEN)
i = RCU_TORTURE_PIPE_LEN;
@@ -92614,26 +91760,26 @@ index 732f8ae..42c1919 100644
+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
rp->rtort_mbtest = 0;
- rcu_torture_free(rp);
-@@ -823,7 +823,7 @@ rcu_torture_writer(void *arg)
+ return true;
+@@ -799,7 +799,7 @@ rcu_torture_cbflood(void *arg)
+ VERBOSE_TOROUT_STRING("rcu_torture_cbflood task started");
+ do {
+ schedule_timeout_interruptible(cbflood_inter_holdoff);
+- atomic_long_inc(&n_cbfloods);
++ atomic_long_inc_unchecked(&n_cbfloods);
+ WARN_ON(signal_pending(current));
+ for (i = 0; i < cbflood_n_burst; i++) {
+ for (j = 0; j < cbflood_n_per_burst; j++) {
+@@ -917,7 +917,7 @@ rcu_torture_writer(void *arg)
i = old_rp->rtort_pipe_count;
if (i > RCU_TORTURE_PIPE_LEN)
i = RCU_TORTURE_PIPE_LEN;
- atomic_inc(&rcu_torture_wcount[i]);
+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
old_rp->rtort_pipe_count++;
- if (gp_normal == gp_exp)
- exp = !!(rcu_random(&rand) & 0x80);
-@@ -841,7 +841,7 @@ rcu_torture_writer(void *arg)
- i = rp->rtort_pipe_count;
- if (i > RCU_TORTURE_PIPE_LEN)
- i = RCU_TORTURE_PIPE_LEN;
-- atomic_inc(&rcu_torture_wcount[i]);
-+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
- if (++rp->rtort_pipe_count >=
- RCU_TORTURE_PIPE_LEN) {
- rp->rtort_mbtest = 0;
-@@ -940,7 +940,7 @@ static void rcu_torture_timer(unsigned long unused)
+ switch (synctype[torture_random(&rand) % nsynctypes]) {
+ case RTWS_DEF_FREE:
+@@ -1035,7 +1035,7 @@ static void rcu_torture_timer(unsigned long unused)
return;
}
if (p->rtort_mbtest == 0)
@@ -92642,7 +91788,7 @@ index 732f8ae..42c1919 100644
spin_lock(&rand_lock);
cur_ops->read_delay(&rand);
n_rcu_torture_timers++;
-@@ -1010,7 +1010,7 @@ rcu_torture_reader(void *arg)
+@@ -1105,7 +1105,7 @@ rcu_torture_reader(void *arg)
continue;
}
if (p->rtort_mbtest == 0)
@@ -92651,31 +91797,30 @@ index 732f8ae..42c1919 100644
cur_ops->read_delay(&rand);
preempt_disable();
pipe_count = p->rtort_pipe_count;
-@@ -1068,15 +1068,15 @@ rcu_torture_printk(char *page)
- }
- page += sprintf(page, "%s%s ", torture_type, TORTURE_FLAG);
- page += sprintf(page,
-- "rtc: %p ver: %lu tfle: %d rta: %d rtaf: %d rtf: %d ",
-+ "rtc: %pP ver: %lu tfle: %d rta: %d rtaf: %d rtf: %d ",
- rcu_torture_current,
- rcu_torture_current_version,
- list_empty(&rcu_torture_freelist),
-- atomic_read(&n_rcu_torture_alloc),
-- atomic_read(&n_rcu_torture_alloc_fail),
-- atomic_read(&n_rcu_torture_free));
-+ atomic_read_unchecked(&n_rcu_torture_alloc),
-+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
-+ atomic_read_unchecked(&n_rcu_torture_free));
- page += sprintf(page, "rtmbe: %d rtbke: %ld rtbre: %ld ",
-- atomic_read(&n_rcu_torture_mberror),
-+ atomic_read_unchecked(&n_rcu_torture_mberror),
- n_rcu_torture_boost_ktrerror,
- n_rcu_torture_boost_rterror);
- page += sprintf(page, "rtbf: %ld rtb: %ld nt: %ld ",
-@@ -1095,14 +1095,14 @@ rcu_torture_printk(char *page)
- n_barrier_attempts,
- n_rcu_torture_barrier_error);
- page += sprintf(page, "\n%s%s ", torture_type, TORTURE_FLAG);
+@@ -1172,11 +1172,11 @@ rcu_torture_stats_print(void)
+ rcu_torture_current,
+ rcu_torture_current_version,
+ list_empty(&rcu_torture_freelist),
+- atomic_read(&n_rcu_torture_alloc),
+- atomic_read(&n_rcu_torture_alloc_fail),
+- atomic_read(&n_rcu_torture_free));
++ atomic_read_unchecked(&n_rcu_torture_alloc),
++ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
++ atomic_read_unchecked(&n_rcu_torture_free));
+ pr_cont("rtmbe: %d rtbke: %ld rtbre: %ld ",
+- atomic_read(&n_rcu_torture_mberror),
++ atomic_read_unchecked(&n_rcu_torture_mberror),
+ n_rcu_torture_boost_ktrerror,
+ n_rcu_torture_boost_rterror);
+ pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
+@@ -1188,17 +1188,17 @@ rcu_torture_stats_print(void)
+ n_barrier_successes,
+ n_barrier_attempts,
+ n_rcu_torture_barrier_error);
+- pr_cont("cbflood: %ld\n", atomic_long_read(&n_cbfloods));
++ pr_cont("cbflood: %ld\n", atomic_long_read_unchecked(&n_cbfloods));
+
+ pr_alert("%s%s ", torture_type, TORTURE_FLAG);
- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
n_rcu_torture_barrier_error != 0 ||
@@ -92683,31 +91828,31 @@ index 732f8ae..42c1919 100644
n_rcu_torture_boost_rterror != 0 ||
n_rcu_torture_boost_failure != 0 ||
i > 1) {
- page += sprintf(page, "!!! ");
+ pr_cont("%s", "!!! ");
- atomic_inc(&n_rcu_torture_error);
+ atomic_inc_unchecked(&n_rcu_torture_error);
WARN_ON_ONCE(1);
}
- page += sprintf(page, "Reader Pipe: ");
-@@ -1116,7 +1116,7 @@ rcu_torture_printk(char *page)
- page += sprintf(page, "Free-Block Circulation: ");
+ pr_cont("Reader Pipe: ");
+@@ -1215,7 +1215,7 @@ rcu_torture_stats_print(void)
+ pr_alert("%s%s ", torture_type, TORTURE_FLAG);
+ pr_cont("Free-Block Circulation: ");
for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
- page += sprintf(page, " %d",
-- atomic_read(&rcu_torture_wcount[i]));
-+ atomic_read_unchecked(&rcu_torture_wcount[i]));
+- pr_cont(" %d", atomic_read(&rcu_torture_wcount[i]));
++ pr_cont(" %d", atomic_read_unchecked(&rcu_torture_wcount[i]));
}
- page += sprintf(page, "\n");
- if (cur_ops->stats)
-@@ -1839,7 +1839,7 @@ rcu_torture_cleanup(void)
+ pr_cont("\n");
+
+@@ -1559,7 +1559,7 @@ rcu_torture_cleanup(void)
rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
- if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
+ if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
- else if (n_online_successes != n_online_attempts ||
- n_offline_successes != n_offline_attempts)
-@@ -1961,18 +1961,18 @@ rcu_torture_init(void)
+ else if (torture_onoff_failures())
+ rcu_torture_print_module_parms(cur_ops,
+@@ -1684,18 +1684,18 @@ rcu_torture_init(void)
rcu_torture_current = NULL;
rcu_torture_current_version = 0;
@@ -92732,36 +91877,92 @@ index 732f8ae..42c1919 100644
for_each_possible_cpu(cpu) {
for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
per_cpu(rcu_torture_count, cpu)[i] = 0;
+diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
+index c0623fc..329c091 100644
+--- a/kernel/rcu/tiny.c
++++ b/kernel/rcu/tiny.c
+@@ -42,7 +42,7 @@
+ /* Forward declarations for tiny_plugin.h. */
+ struct rcu_ctrlblk;
+ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
+-static void rcu_process_callbacks(struct softirq_action *unused);
++static void rcu_process_callbacks(void);
+ static void __call_rcu(struct rcu_head *head,
+ void (*func)(struct rcu_head *rcu),
+ struct rcu_ctrlblk *rcp);
+@@ -310,7 +310,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
+ false));
+ }
+
+-static void rcu_process_callbacks(struct softirq_action *unused)
++static __latent_entropy void rcu_process_callbacks(void)
+ {
+ __rcu_process_callbacks(&rcu_sched_ctrlblk);
+ __rcu_process_callbacks(&rcu_bh_ctrlblk);
+diff --git a/kernel/rcu/tiny_plugin.h b/kernel/rcu/tiny_plugin.h
+index 858c565..7efd915 100644
+--- a/kernel/rcu/tiny_plugin.h
++++ b/kernel/rcu/tiny_plugin.h
+@@ -152,17 +152,17 @@ static void check_cpu_stall(struct rcu_ctrlblk *rcp)
+ dump_stack();
+ }
+ if (*rcp->curtail && ULONG_CMP_GE(j, js))
+- ACCESS_ONCE(rcp->jiffies_stall) = jiffies +
++ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies +
+ 3 * rcu_jiffies_till_stall_check() + 3;
+ else if (ULONG_CMP_GE(j, js))
+- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
++ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
+ }
+
+ static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)
+ {
+ rcp->ticks_this_gp = 0;
+ rcp->gp_start = jiffies;
+- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
++ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
+ }
+
+ static void check_cpu_stalls(void)
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
-index 6705d94..137e56f 100644
+index 9815447..2cdf92a 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
-@@ -390,9 +390,9 @@ static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval,
+@@ -274,7 +274,7 @@ static void rcu_momentary_dyntick_idle(void)
+ */
+ rdtp = this_cpu_ptr(&rcu_dynticks);
+ smp_mb__before_atomic(); /* Earlier stuff before QS. */
+- atomic_add(2, &rdtp->dynticks); /* QS. */
++ atomic_add_unchecked(2, &rdtp->dynticks); /* QS. */
+ smp_mb__after_atomic(); /* Later stuff after QS. */
+ break;
+ }
+@@ -534,9 +534,9 @@ static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval,
rcu_prepare_for_idle(smp_processor_id());
/* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
- smp_mb__before_atomic_inc(); /* See above. */
+ smp_mb__before_atomic(); /* See above. */
- atomic_inc(&rdtp->dynticks);
+ atomic_inc_unchecked(&rdtp->dynticks);
- smp_mb__after_atomic_inc(); /* Force ordering with next sojourn. */
+ smp_mb__after_atomic(); /* Force ordering with next sojourn. */
- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
+ rcu_dynticks_task_enter();
/*
- * It is illegal to enter an extended quiescent state while
-@@ -510,10 +510,10 @@ static void rcu_eqs_exit_common(struct rcu_dynticks *rdtp, long long oldval,
- int user)
+@@ -656,10 +656,10 @@ static void rcu_eqs_exit_common(struct rcu_dynticks *rdtp, long long oldval,
{
- smp_mb__before_atomic_inc(); /* Force ordering w/previous sojourn. */
+ rcu_dynticks_task_exit();
+ smp_mb__before_atomic(); /* Force ordering w/previous sojourn. */
- atomic_inc(&rdtp->dynticks);
+ atomic_inc_unchecked(&rdtp->dynticks);
/* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
- smp_mb__after_atomic_inc(); /* See above. */
+ smp_mb__after_atomic(); /* See above. */
- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
rcu_cleanup_after_idle(smp_processor_id());
trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
if (!user && !is_idle_task(current)) {
-@@ -634,14 +634,14 @@ void rcu_nmi_enter(void)
+@@ -780,14 +780,14 @@ void rcu_nmi_enter(void)
struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks);
if (rdtp->dynticks_nmi_nesting == 0 &&
@@ -92769,29 +91970,29 @@ index 6705d94..137e56f 100644
+ (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
return;
rdtp->dynticks_nmi_nesting++;
- smp_mb__before_atomic_inc(); /* Force delay from prior write. */
+ smp_mb__before_atomic(); /* Force delay from prior write. */
- atomic_inc(&rdtp->dynticks);
+ atomic_inc_unchecked(&rdtp->dynticks);
/* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
- smp_mb__after_atomic_inc(); /* See above. */
+ smp_mb__after_atomic(); /* See above. */
- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
}
/**
-@@ -660,9 +660,9 @@ void rcu_nmi_exit(void)
+@@ -806,9 +806,9 @@ void rcu_nmi_exit(void)
return;
/* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
- smp_mb__before_atomic_inc(); /* See above. */
+ smp_mb__before_atomic(); /* See above. */
- atomic_inc(&rdtp->dynticks);
+ atomic_inc_unchecked(&rdtp->dynticks);
- smp_mb__after_atomic_inc(); /* Force delay to next write. */
+ smp_mb__after_atomic(); /* Force delay to next write. */
- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
}
/**
-@@ -675,7 +675,7 @@ void rcu_nmi_exit(void)
+@@ -821,7 +821,7 @@ void rcu_nmi_exit(void)
*/
bool notrace __rcu_is_watching(void)
{
@@ -92800,17 +92001,17 @@ index 6705d94..137e56f 100644
}
/**
-@@ -758,7 +758,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
+@@ -904,7 +904,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
static int dyntick_save_progress_counter(struct rcu_data *rdp,
bool *isidle, unsigned long *maxj)
{
- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
rcu_sysidle_check_cpu(rdp, isidle, maxj);
- return (rdp->dynticks_snap & 0x1) == 0;
- }
-@@ -781,7 +781,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
- unsigned int curr;
+ if ((rdp->dynticks_snap & 0x1) == 0) {
+ trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));
+@@ -933,7 +933,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
+ int *rcrmp;
unsigned int snap;
- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
@@ -92818,7 +92019,65 @@ index 6705d94..137e56f 100644
snap = (unsigned int)rdp->dynticks_snap;
/*
-@@ -1466,9 +1466,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
+@@ -996,10 +996,10 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
+ rdp->rsp->gp_start + jiffies_till_sched_qs) ||
+ ULONG_CMP_GE(jiffies, rdp->rsp->jiffies_resched)) {
+ if (!(ACCESS_ONCE(*rcrmp) & rdp->rsp->flavor_mask)) {
+- ACCESS_ONCE(rdp->cond_resched_completed) =
++ ACCESS_ONCE_RW(rdp->cond_resched_completed) =
+ ACCESS_ONCE(rdp->mynode->completed);
+ smp_mb(); /* ->cond_resched_completed before *rcrmp. */
+- ACCESS_ONCE(*rcrmp) =
++ ACCESS_ONCE_RW(*rcrmp) =
+ ACCESS_ONCE(*rcrmp) + rdp->rsp->flavor_mask;
+ resched_cpu(rdp->cpu); /* Force CPU into scheduler. */
+ rdp->rsp->jiffies_resched += 5; /* Enable beating. */
+@@ -1021,7 +1021,7 @@ static void record_gp_stall_check_time(struct rcu_state *rsp)
+ rsp->gp_start = j;
+ smp_wmb(); /* Record start time before stall time. */
+ j1 = rcu_jiffies_till_stall_check();
+- ACCESS_ONCE(rsp->jiffies_stall) = j + j1;
++ ACCESS_ONCE_RW(rsp->jiffies_stall) = j + j1;
+ rsp->jiffies_resched = j + j1 / 2;
+ }
+
+@@ -1062,7 +1062,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp)
+ raw_spin_unlock_irqrestore(&rnp->lock, flags);
+ return;
+ }
+- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
++ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
+ raw_spin_unlock_irqrestore(&rnp->lock, flags);
+
+ /*
+@@ -1139,7 +1139,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
+
+ raw_spin_lock_irqsave(&rnp->lock, flags);
+ if (ULONG_CMP_GE(jiffies, ACCESS_ONCE(rsp->jiffies_stall)))
+- ACCESS_ONCE(rsp->jiffies_stall) = jiffies +
++ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies +
+ 3 * rcu_jiffies_till_stall_check() + 3;
+ raw_spin_unlock_irqrestore(&rnp->lock, flags);
+
+@@ -1223,7 +1223,7 @@ void rcu_cpu_stall_reset(void)
+ struct rcu_state *rsp;
+
+ for_each_rcu_flavor(rsp)
+- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
++ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
+ }
+
+ /*
+@@ -1609,7 +1609,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
+ raw_spin_unlock_irq(&rnp->lock);
+ return 0;
+ }
+- ACCESS_ONCE(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
++ ACCESS_ONCE_RW(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
+
+ if (WARN_ON_ONCE(rcu_gp_in_progress(rsp))) {
+ /*
+@@ -1650,9 +1650,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
rdp = this_cpu_ptr(rsp->rda);
rcu_preempt_check_blocked_tasks(rnp);
rnp->qsmask = rnp->qsmaskinit;
@@ -92828,9 +92087,18 @@ index 6705d94..137e56f 100644
- ACCESS_ONCE(rnp->completed) = rsp->completed;
+ ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
if (rnp == rdp->mynode)
- __note_gp_changes(rsp, rnp, rdp);
+ (void)__note_gp_changes(rsp, rnp, rdp);
rcu_preempt_boost_start_gp(rnp);
-@@ -1562,7 +1562,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
+@@ -1697,7 +1697,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
+ if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
+ raw_spin_lock_irq(&rnp->lock);
+ smp_mb__after_unlock_lock();
+- ACCESS_ONCE(rsp->gp_flags) =
++ ACCESS_ONCE_RW(rsp->gp_flags) =
+ ACCESS_ONCE(rsp->gp_flags) & ~RCU_GP_FLAG_FQS;
+ raw_spin_unlock_irq(&rnp->lock);
+ }
+@@ -1743,7 +1743,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
rcu_for_each_node_breadth_first(rsp, rnp) {
raw_spin_lock_irq(&rnp->lock);
smp_mb__after_unlock_lock();
@@ -92838,8 +92106,34 @@ index 6705d94..137e56f 100644
+ ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
rdp = this_cpu_ptr(rsp->rda);
if (rnp == rdp->mynode)
- __note_gp_changes(rsp, rnp, rdp);
-@@ -1928,7 +1928,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
+ needgp = __note_gp_changes(rsp, rnp, rdp) || needgp;
+@@ -1758,14 +1758,14 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
+ rcu_nocb_gp_set(rnp, nocb);
+
+ /* Declare grace period done. */
+- ACCESS_ONCE(rsp->completed) = rsp->gpnum;
++ ACCESS_ONCE_RW(rsp->completed) = rsp->gpnum;
+ trace_rcu_grace_period(rsp->name, rsp->completed, TPS("end"));
+ rsp->fqs_state = RCU_GP_IDLE;
+ rdp = this_cpu_ptr(rsp->rda);
+ /* Advance CBs to reduce false positives below. */
+ needgp = rcu_advance_cbs(rsp, rnp, rdp) || needgp;
+ if (needgp || cpu_needs_another_gp(rsp, rdp)) {
+- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
++ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
+ trace_rcu_grace_period(rsp->name,
+ ACCESS_ONCE(rsp->gpnum),
+ TPS("newreq"));
+@@ -1890,7 +1890,7 @@ rcu_start_gp_advanced(struct rcu_state *rsp, struct rcu_node *rnp,
+ */
+ return false;
+ }
+- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
++ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
+ trace_rcu_grace_period(rsp->name, ACCESS_ONCE(rsp->gpnum),
+ TPS("newreq"));
+
+@@ -2111,7 +2111,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
rsp->qlen += rdp->qlen;
rdp->n_cbs_orphaned += rdp->qlen;
rdp->qlen_lazy = 0;
@@ -92848,16 +92142,25 @@ index 6705d94..137e56f 100644
}
/*
-@@ -2175,7 +2175,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
+@@ -2356,7 +2356,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
}
smp_mb(); /* List handling before counting for rcu_barrier(). */
rdp->qlen_lazy -= count_lazy;
-- ACCESS_ONCE(rdp->qlen) -= count;
-+ ACCESS_ONCE_RW(rdp->qlen) -= count;
+- ACCESS_ONCE(rdp->qlen) = rdp->qlen - count;
++ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen - count;
rdp->n_cbs_invoked += count;
/* Reinstate batch limit if we have worked down the excess. */
-@@ -2378,7 +2378,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
+@@ -2519,7 +2519,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
+ raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
+ return; /* Someone beat us to it. */
+ }
+- ACCESS_ONCE(rsp->gp_flags) =
++ ACCESS_ONCE_RW(rsp->gp_flags) =
+ ACCESS_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS;
+ raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
+ rcu_gp_kthread_wake(rsp);
+@@ -2565,7 +2565,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
/*
* Do RCU core processing for the current CPU.
*/
@@ -92866,8 +92169,8 @@ index 6705d94..137e56f 100644
{
struct rcu_state *rsp;
-@@ -2486,7 +2486,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
- WARN_ON_ONCE((unsigned long)head & 0x3); /* Misaligned rcu_head! */
+@@ -2677,7 +2677,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
+ WARN_ON_ONCE((unsigned long)head & 0x1); /* Misaligned rcu_head! */
if (debug_rcu_head_queue(head)) {
/* Probable double call_rcu(), so leak the callback. */
- ACCESS_ONCE(head->func) = rcu_leak_callback;
@@ -92875,16 +92178,16 @@ index 6705d94..137e56f 100644
WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
return;
}
-@@ -2514,7 +2514,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
+@@ -2705,7 +2705,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
local_irq_restore(flags);
return;
}
-- ACCESS_ONCE(rdp->qlen)++;
-+ ACCESS_ONCE_RW(rdp->qlen)++;
+- ACCESS_ONCE(rdp->qlen) = rdp->qlen + 1;
++ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen + 1;
if (lazy)
rdp->qlen_lazy++;
else
-@@ -2723,11 +2723,11 @@ void synchronize_sched_expedited(void)
+@@ -2975,11 +2975,11 @@ void synchronize_sched_expedited(void)
* counter wrap on a 32-bit system. Quite a few more CPUs would of
* course be required on a 64-bit system.
*/
@@ -92898,16 +92201,22 @@ index 6705d94..137e56f 100644
return;
}
-@@ -2735,7 +2735,7 @@ void synchronize_sched_expedited(void)
+@@ -2987,12 +2987,12 @@ void synchronize_sched_expedited(void)
* Take a ticket. Note that atomic_inc_return() implies a
* full memory barrier.
*/
- snap = atomic_long_inc_return(&rsp->expedited_start);
+ snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
firstsnap = snap;
- get_online_cpus();
+ if (!try_get_online_cpus()) {
+ /* CPU hotplug operation in flight, fall back to normal GP. */
+ wait_rcu_gp(call_rcu_sched);
+- atomic_long_inc(&rsp->expedited_normal);
++ atomic_long_inc_unchecked(&rsp->expedited_normal);
+ return;
+ }
WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
-@@ -2748,14 +2748,14 @@ void synchronize_sched_expedited(void)
+@@ -3005,14 +3005,14 @@ void synchronize_sched_expedited(void)
synchronize_sched_expedited_cpu_stop,
NULL) == -EAGAIN) {
put_online_cpus();
@@ -92918,13 +92227,13 @@ index 6705d94..137e56f 100644
s = atomic_long_read(&rsp->expedited_done);
if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
/* ensure test happens before caller kfree */
- smp_mb__before_atomic_inc(); /* ^^^ */
+ smp_mb__before_atomic(); /* ^^^ */
- atomic_long_inc(&rsp->expedited_workdone1);
+ atomic_long_inc_unchecked(&rsp->expedited_workdone1);
return;
}
-@@ -2764,7 +2764,7 @@ void synchronize_sched_expedited(void)
+@@ -3021,7 +3021,7 @@ void synchronize_sched_expedited(void)
udelay(trycount * num_online_cpus());
} else {
wait_rcu_gp(call_rcu_sched);
@@ -92933,19 +92242,23 @@ index 6705d94..137e56f 100644
return;
}
-@@ -2773,7 +2773,7 @@ void synchronize_sched_expedited(void)
+@@ -3030,7 +3030,7 @@ void synchronize_sched_expedited(void)
if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
/* ensure test happens before caller kfree */
- smp_mb__before_atomic_inc(); /* ^^^ */
+ smp_mb__before_atomic(); /* ^^^ */
- atomic_long_inc(&rsp->expedited_workdone2);
+ atomic_long_inc_unchecked(&rsp->expedited_workdone2);
return;
}
-@@ -2785,10 +2785,10 @@ void synchronize_sched_expedited(void)
- * period works for us.
- */
- get_online_cpus();
+@@ -3044,13 +3044,13 @@ void synchronize_sched_expedited(void)
+ if (!try_get_online_cpus()) {
+ /* CPU hotplug operation in flight, use normal GP. */
+ wait_rcu_gp(call_rcu_sched);
+- atomic_long_inc(&rsp->expedited_normal);
++ atomic_long_inc_unchecked(&rsp->expedited_normal);
+ return;
+ }
- snap = atomic_long_read(&rsp->expedited_start);
+ snap = atomic_long_read_unchecked(&rsp->expedited_start);
smp_mb(); /* ensure read is before try_stop_cpus(). */
@@ -92955,7 +92268,7 @@ index 6705d94..137e56f 100644
/*
* Everyone up to our most recent fetch is covered by our grace
-@@ -2797,16 +2797,16 @@ void synchronize_sched_expedited(void)
+@@ -3059,16 +3059,16 @@ void synchronize_sched_expedited(void)
* than we did already did their update.
*/
do {
@@ -92964,7 +92277,7 @@ index 6705d94..137e56f 100644
s = atomic_long_read(&rsp->expedited_done);
if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
/* ensure test happens before caller kfree */
- smp_mb__before_atomic_inc(); /* ^^^ */
+ smp_mb__before_atomic(); /* ^^^ */
- atomic_long_inc(&rsp->expedited_done_lost);
+ atomic_long_inc_unchecked(&rsp->expedited_done_lost);
break;
@@ -92975,25 +92288,25 @@ index 6705d94..137e56f 100644
put_online_cpus();
}
-@@ -3012,7 +3012,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
+@@ -3274,7 +3274,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
* ACCESS_ONCE() to prevent the compiler from speculating
* the increment to precede the early-exit check.
*/
-- ACCESS_ONCE(rsp->n_barrier_done)++;
-+ ACCESS_ONCE_RW(rsp->n_barrier_done)++;
+- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
++ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
_rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
-@@ -3062,7 +3062,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
+@@ -3329,7 +3329,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
/* Increment ->n_barrier_done to prevent duplicate work. */
smp_mb(); /* Keep increment after above mechanism. */
-- ACCESS_ONCE(rsp->n_barrier_done)++;
-+ ACCESS_ONCE_RW(rsp->n_barrier_done)++;
+- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
++ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
_rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
smp_mb(); /* Keep increment before caller's subsequent code. */
-@@ -3107,10 +3107,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
+@@ -3374,10 +3374,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
init_callback_list(rdp);
rdp->qlen_lazy = 0;
@@ -93006,7 +92319,7 @@ index 6705d94..137e56f 100644
rdp->cpu = cpu;
rdp->rsp = rsp;
rcu_boot_init_nocb_percpu_data(rdp);
-@@ -3144,8 +3144,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible)
+@@ -3410,8 +3410,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
rcu_sysidle_init_percpu_data(rdp->dynticks);
@@ -93018,7 +92331,7 @@ index 6705d94..137e56f 100644
/* Add CPU to rcu_node bitmasks. */
diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
-index 8c19873..bf83c57 100644
+index bbdc45d..c882ccb 100644
--- a/kernel/rcu/tree.h
+++ b/kernel/rcu/tree.h
@@ -87,11 +87,11 @@ struct rcu_dynticks {
@@ -93035,7 +92348,7 @@ index 8c19873..bf83c57 100644
/* "Idle" excludes userspace execution. */
unsigned long dynticks_idle_jiffies;
/* End of last non-NMI non-idle period. */
-@@ -431,17 +431,17 @@ struct rcu_state {
+@@ -466,17 +466,17 @@ struct rcu_state {
/* _rcu_barrier(). */
/* End of fields guarded by barrier_mutex. */
@@ -93065,10 +92378,10 @@ index 8c19873..bf83c57 100644
unsigned long jiffies_force_qs; /* Time at which to invoke */
/* force_quiescent_state(). */
diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
-index 6e2ef4b..c15df94 100644
+index c1d7f27..a64bf49 100644
--- a/kernel/rcu/tree_plugin.h
+++ b/kernel/rcu/tree_plugin.h
-@@ -758,7 +758,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
+@@ -709,7 +709,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
{
return !rcu_preempted_readers_exp(rnp) &&
@@ -93077,16 +92390,16 @@ index 6e2ef4b..c15df94 100644
}
/*
-@@ -920,7 +920,7 @@ void synchronize_rcu_expedited(void)
+@@ -870,7 +870,7 @@ void synchronize_rcu_expedited(void)
/* Clean up and exit. */
smp_mb(); /* ensure expedited GP seen before counter increment. */
-- ACCESS_ONCE(sync_rcu_preempt_exp_count)++;
-+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count)++;
+- ACCESS_ONCE(sync_rcu_preempt_exp_count) =
++ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count) =
+ sync_rcu_preempt_exp_count + 1;
unlock_mb_ret:
mutex_unlock(&sync_rcu_preempt_exp_mutex);
- mb_ret:
-@@ -1496,7 +1496,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
+@@ -1426,7 +1426,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
free_cpumask_var(cm);
}
@@ -93095,7 +92408,7 @@ index 6e2ef4b..c15df94 100644
.store = &rcu_cpu_kthread_task,
.thread_should_run = rcu_cpu_kthread_should_run,
.thread_fn = rcu_cpu_kthread,
-@@ -1965,7 +1965,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
+@@ -1900,7 +1900,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u %s\n",
cpu, ticks_value, ticks_title,
@@ -93104,7 +92417,16 @@ index 6e2ef4b..c15df94 100644
rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
fast_no_hz);
-@@ -2129,7 +2129,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
+@@ -2044,7 +2044,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
+ return;
+ if (ACCESS_ONCE(rdp_leader->nocb_leader_sleep) || force) {
+ /* Prior smp_mb__after_atomic() orders against prior enqueue. */
+- ACCESS_ONCE(rdp_leader->nocb_leader_sleep) = false;
++ ACCESS_ONCE_RW(rdp_leader->nocb_leader_sleep) = false;
+ wake_up(&rdp_leader->nocb_wq);
+ }
+ }
+@@ -2096,7 +2096,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
/* Enqueue the callback on the nocb list and update counts. */
old_rhpp = xchg(&rdp->nocb_tail, rhtp);
@@ -93112,80 +92434,82 @@ index 6e2ef4b..c15df94 100644
+ ACCESS_ONCE_RW(*old_rhpp) = rhp;
atomic_long_add(rhcount, &rdp->nocb_q_count);
atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
+ smp_mb__after_atomic(); /* Store *old_rhpp before _wake test. */
+@@ -2286,7 +2286,7 @@ wait_again:
+ continue; /* No CBs here, try next follower. */
-@@ -2302,12 +2302,12 @@ static int rcu_nocb_kthread(void *arg)
- * Extract queued callbacks, update counts, and wait
- * for a grace period to elapse.
- */
+ /* Move callbacks to wait-for-GP list, which is empty. */
- ACCESS_ONCE(rdp->nocb_head) = NULL;
+ ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
- tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
- c = atomic_long_xchg(&rdp->nocb_q_count, 0);
- cl = atomic_long_xchg(&rdp->nocb_q_count_lazy, 0);
-- ACCESS_ONCE(rdp->nocb_p_count) += c;
-- ACCESS_ONCE(rdp->nocb_p_count_lazy) += cl;
-+ ACCESS_ONCE_RW(rdp->nocb_p_count) += c;
-+ ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) += cl;
- rcu_nocb_wait_gp(rdp);
-
- /* Each pass through the following loop invokes a callback. */
-@@ -2333,8 +2333,8 @@ static int rcu_nocb_kthread(void *arg)
+ rdp->nocb_gp_tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
+ rdp->nocb_gp_count = atomic_long_xchg(&rdp->nocb_q_count, 0);
+ rdp->nocb_gp_count_lazy =
+@@ -2413,7 +2413,7 @@ static int rcu_nocb_kthread(void *arg)
+ list = ACCESS_ONCE(rdp->nocb_follower_head);
+ BUG_ON(!list);
+ trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "WokeNonEmpty");
+- ACCESS_ONCE(rdp->nocb_follower_head) = NULL;
++ ACCESS_ONCE_RW(rdp->nocb_follower_head) = NULL;
+ tail = xchg(&rdp->nocb_follower_tail, &rdp->nocb_follower_head);
+ c = atomic_long_xchg(&rdp->nocb_follower_count, 0);
+ cl = atomic_long_xchg(&rdp->nocb_follower_count_lazy, 0);
+@@ -2443,8 +2443,8 @@ static int rcu_nocb_kthread(void *arg)
list = next;
}
trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1);
-- ACCESS_ONCE(rdp->nocb_p_count) -= c;
-- ACCESS_ONCE(rdp->nocb_p_count_lazy) -= cl;
-+ ACCESS_ONCE_RW(rdp->nocb_p_count) -= c;
-+ ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) -= cl;
+- ACCESS_ONCE(rdp->nocb_p_count) = rdp->nocb_p_count - c;
+- ACCESS_ONCE(rdp->nocb_p_count_lazy) =
++ ACCESS_ONCE_RW(rdp->nocb_p_count) = rdp->nocb_p_count - c;
++ ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) =
+ rdp->nocb_p_count_lazy - cl;
rdp->n_nocbs_invoked += c;
}
- return 0;
-@@ -2351,7 +2351,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
- {
+@@ -2465,7 +2465,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
if (!rcu_nocb_need_deferred_wakeup(rdp))
return;
-- ACCESS_ONCE(rdp->nocb_defer_wakeup) = false;
-+ ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = false;
- wake_up(&rdp->nocb_wq);
- trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWakeEmpty"));
+ ndw = ACCESS_ONCE(rdp->nocb_defer_wakeup);
+- ACCESS_ONCE(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
++ ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
+ wake_nocb_leader(rdp, ndw == RCU_NOGP_WAKE_FORCE);
+ trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWake"));
}
-@@ -2377,7 +2377,7 @@ static void __init rcu_spawn_nocb_kthreads(struct rcu_state *rsp)
- t = kthread_run(rcu_nocb_kthread, rdp,
- "rcuo%c/%d", rsp->abbr, cpu);
- BUG_ON(IS_ERR(t));
-- ACCESS_ONCE(rdp->nocb_kthread) = t;
-+ ACCESS_ONCE_RW(rdp->nocb_kthread) = t;
- }
+@@ -2584,7 +2584,7 @@ static void rcu_spawn_one_nocb_kthread(struct rcu_state *rsp, int cpu)
+ t = kthread_run(rcu_nocb_kthread, rdp_spawn,
+ "rcuo%c/%d", rsp->abbr, cpu);
+ BUG_ON(IS_ERR(t));
+- ACCESS_ONCE(rdp_spawn->nocb_kthread) = t;
++ ACCESS_ONCE_RW(rdp_spawn->nocb_kthread) = t;
}
-@@ -2513,11 +2513,11 @@ static void rcu_sysidle_enter(struct rcu_dynticks *rdtp, int irq)
+ /*
+@@ -2788,11 +2788,11 @@ static void rcu_sysidle_enter(struct rcu_dynticks *rdtp, int irq)
/* Record start of fully idle period. */
j = jiffies;
- ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
+ ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
- smp_mb__before_atomic_inc();
+ smp_mb__before_atomic();
- atomic_inc(&rdtp->dynticks_idle);
+ atomic_inc_unchecked(&rdtp->dynticks_idle);
- smp_mb__after_atomic_inc();
+ smp_mb__after_atomic();
- WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
}
/*
-@@ -2582,9 +2582,9 @@ static void rcu_sysidle_exit(struct rcu_dynticks *rdtp, int irq)
+@@ -2861,9 +2861,9 @@ static void rcu_sysidle_exit(struct rcu_dynticks *rdtp, int irq)
/* Record end of idle period. */
- smp_mb__before_atomic_inc();
+ smp_mb__before_atomic();
- atomic_inc(&rdtp->dynticks_idle);
+ atomic_inc_unchecked(&rdtp->dynticks_idle);
- smp_mb__after_atomic_inc();
+ smp_mb__after_atomic();
- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
/*
* If we are the timekeeping CPU, we are permitted to be non-idle
-@@ -2625,7 +2625,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
+@@ -2908,7 +2908,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
/* Pick up current idle and NMI-nesting counter and check. */
@@ -93194,7 +92518,7 @@ index 6e2ef4b..c15df94 100644
if (cur & 0x1) {
*isidle = false; /* We are not idle! */
return;
-@@ -2688,7 +2688,7 @@ static void rcu_sysidle(unsigned long j)
+@@ -2957,7 +2957,7 @@ static void rcu_sysidle(unsigned long j)
case RCU_SYSIDLE_NOT:
/* First time all are idle, so note a short idle period. */
@@ -93203,16 +92527,16 @@ index 6e2ef4b..c15df94 100644
break;
case RCU_SYSIDLE_SHORT:
-@@ -2725,7 +2725,7 @@ static void rcu_sysidle(unsigned long j)
- static void rcu_sysidle_cancel(void)
+@@ -2995,7 +2995,7 @@ static void rcu_sysidle_cancel(void)
{
smp_mb();
-- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
-+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
+ if (full_sysidle_state > RCU_SYSIDLE_SHORT)
+- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
++ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
}
/*
-@@ -2773,7 +2773,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
+@@ -3047,7 +3047,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
smp_mb(); /* grace period precedes setting inuse. */
rshp = container_of(rhp, struct rcu_sysidle_head, rh);
@@ -93221,8 +92545,25 @@ index 6e2ef4b..c15df94 100644
}
/*
+@@ -3200,7 +3200,7 @@ static void rcu_bind_gp_kthread(void)
+ static void rcu_dynticks_task_enter(void)
+ {
+ #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
+- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = smp_processor_id();
++ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = smp_processor_id();
+ #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
+ }
+
+@@ -3208,6 +3208,6 @@ static void rcu_dynticks_task_enter(void)
+ static void rcu_dynticks_task_exit(void)
+ {
+ #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
+- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = -1;
++ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = -1;
+ #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
+ }
diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
-index 4def475..8ffddde 100644
+index 5cdc62e..cc52e88 100644
--- a/kernel/rcu/tree_trace.c
+++ b/kernel/rcu/tree_trace.c
@@ -121,7 +121,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
@@ -93263,10 +92604,10 @@ index 4def475..8ffddde 100644
}
diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
-index c54609f..2e8829c 100644
+index 3ef8ba5..8c5ebfb6 100644
--- a/kernel/rcu/update.c
+++ b/kernel/rcu/update.c
-@@ -312,10 +312,10 @@ int rcu_jiffies_till_stall_check(void)
+@@ -342,10 +342,10 @@ int rcu_jiffies_till_stall_check(void)
* for CONFIG_RCU_CPU_STALL_TIMEOUT.
*/
if (till_stall_check < 3) {
@@ -93279,11 +92620,38 @@ index c54609f..2e8829c 100644
till_stall_check = 300;
}
return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
+@@ -501,7 +501,7 @@ static void check_holdout_task(struct task_struct *t,
+ !ACCESS_ONCE(t->on_rq) ||
+ (IS_ENABLED(CONFIG_NO_HZ_FULL) &&
+ !is_idle_task(t) && t->rcu_tasks_idle_cpu >= 0)) {
+- ACCESS_ONCE(t->rcu_tasks_holdout) = false;
++ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = false;
+ list_del_init(&t->rcu_tasks_holdout_list);
+ put_task_struct(t);
+ return;
+@@ -588,7 +588,7 @@ static int __noreturn rcu_tasks_kthread(void *arg)
+ !is_idle_task(t)) {
+ get_task_struct(t);
+ t->rcu_tasks_nvcsw = ACCESS_ONCE(t->nvcsw);
+- ACCESS_ONCE(t->rcu_tasks_holdout) = true;
++ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = true;
+ list_add(&t->rcu_tasks_holdout_list,
+ &rcu_tasks_holdouts);
+ }
+@@ -685,7 +685,7 @@ static void rcu_spawn_tasks_kthread(void)
+ t = kthread_run(rcu_tasks_kthread, NULL, "rcu_tasks_kthread");
+ BUG_ON(IS_ERR(t));
+ smp_mb(); /* Ensure others see full kthread. */
+- ACCESS_ONCE(rcu_tasks_kthread_ptr) = t;
++ ACCESS_ONCE_RW(rcu_tasks_kthread_ptr) = t;
+ mutex_unlock(&rcu_tasks_kthread_mutex);
+ }
+
diff --git a/kernel/resource.c b/kernel/resource.c
-index 3f285dc..5755f62 100644
+index 0bcebff..e7cd5b2 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
-@@ -152,8 +152,18 @@ static const struct file_operations proc_iomem_operations = {
+@@ -161,8 +161,18 @@ static const struct file_operations proc_iomem_operations = {
static int __init ioresources_init(void)
{
@@ -93303,7 +92671,7 @@ index 3f285dc..5755f62 100644
}
__initcall(ioresources_init);
diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
-index 4a07353..66b5291 100644
+index 8a2e230..6020954 100644
--- a/kernel/sched/auto_group.c
+++ b/kernel/sched/auto_group.c
@@ -11,7 +11,7 @@
@@ -93356,10 +92724,10 @@ index a63f4dc..349bbb0 100644
unsigned long timeout)
{
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index 9a3f3c4..943fa11 100644
+index efdca2f..e361dfb 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
-@@ -1775,7 +1775,7 @@ void set_numabalancing_state(bool enabled)
+@@ -1890,7 +1890,7 @@ void set_numabalancing_state(bool enabled)
int sysctl_numa_balancing(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
@@ -93368,7 +92736,7 @@ index 9a3f3c4..943fa11 100644
int err;
int state = numabalancing_enabled;
-@@ -2255,8 +2255,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
+@@ -2353,8 +2353,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
next->active_mm = oldmm;
atomic_inc(&oldmm->mm_count);
enter_lazy_tlb(oldmm, next);
@@ -93380,26 +92748,26 @@ index 9a3f3c4..943fa11 100644
if (!prev->mm) {
prev->active_mm = NULL;
-@@ -3053,6 +3055,8 @@ int can_nice(const struct task_struct *p, const int nice)
+@@ -3165,6 +3167,8 @@ int can_nice(const struct task_struct *p, const int nice)
/* convert nice value [19,-20] to rlimit style value [1,40] */
- int nice_rlim = 20 - nice;
+ int nice_rlim = nice_to_rlimit(nice);
+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
+
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}
-@@ -3086,7 +3090,8 @@ SYSCALL_DEFINE1(nice, int, increment)
- if (nice > 19)
- nice = 19;
+@@ -3191,7 +3195,8 @@ SYSCALL_DEFINE1(nice, int, increment)
+ nice = task_nice(current) + increment;
+ nice = clamp_val(nice, MIN_NICE, MAX_NICE);
- if (increment < 0 && !can_nice(current, nice))
+ if (increment < 0 && (!can_nice(current, nice) ||
+ gr_handle_chroot_nice()))
return -EPERM;
retval = security_task_setnice(current, nice);
-@@ -3359,6 +3364,7 @@ recheck:
+@@ -3470,6 +3475,7 @@ recheck:
if (policy != p->policy && !rlim_rtprio)
return -EPERM;
@@ -93407,19 +92775,15 @@ index 9a3f3c4..943fa11 100644
/* can't increase priority */
if (attr->sched_priority > p->rt_priority &&
attr->sched_priority > rlim_rtprio)
-@@ -4732,8 +4738,10 @@ void idle_task_exit(void)
-
- BUG_ON(cpu_online(smp_processor_id()));
+@@ -4890,6 +4896,7 @@ void idle_task_exit(void)
-- if (mm != &init_mm)
-+ if (mm != &init_mm) {
+ if (mm != &init_mm) {
switch_mm(mm, &init_mm, current);
+ populate_stack();
-+ }
+ finish_arch_post_lock_switch();
+ }
mmdrop(mm);
- }
-
-@@ -4811,7 +4819,7 @@ static void migrate_tasks(unsigned int dead_cpu)
+@@ -4985,7 +4992,7 @@ static void migrate_tasks(unsigned int dead_cpu)
#if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
@@ -93428,7 +92792,7 @@ index 9a3f3c4..943fa11 100644
{
.procname = "sched_domain",
.mode = 0555,
-@@ -4828,17 +4836,17 @@ static struct ctl_table sd_ctl_root[] = {
+@@ -5002,17 +5009,17 @@ static struct ctl_table sd_ctl_root[] = {
{}
};
@@ -93450,7 +92814,7 @@ index 9a3f3c4..943fa11 100644
/*
* In the intermediate directories, both the child directory and
-@@ -4846,22 +4854,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
+@@ -5020,22 +5027,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
* will always be set. In the lowest directory the names are
* static strings and all have proc handlers.
*/
@@ -93482,16 +92846,16 @@ index 9a3f3c4..943fa11 100644
const char *procname, void *data, int maxlen,
umode_t mode, proc_handler *proc_handler,
bool load_idx)
-@@ -4881,7 +4892,7 @@ set_table_entry(struct ctl_table *entry,
+@@ -5055,7 +5065,7 @@ set_table_entry(struct ctl_table *entry,
static struct ctl_table *
sd_alloc_ctl_domain_table(struct sched_domain *sd)
{
-- struct ctl_table *table = sd_alloc_ctl_entry(13);
-+ ctl_table_no_const *table = sd_alloc_ctl_entry(13);
+- struct ctl_table *table = sd_alloc_ctl_entry(14);
++ ctl_table_no_const *table = sd_alloc_ctl_entry(14);
if (table == NULL)
return NULL;
-@@ -4916,9 +4927,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
+@@ -5093,9 +5103,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
return table;
}
@@ -93503,7 +92867,7 @@ index 9a3f3c4..943fa11 100644
struct sched_domain *sd;
int domain_num = 0, i;
char buf[32];
-@@ -4945,11 +4956,13 @@ static struct ctl_table_header *sd_sysctl_header;
+@@ -5122,11 +5132,13 @@ static struct ctl_table_header *sd_sysctl_header;
static void register_sched_domain_sysctl(void)
{
int i, cpu_num = num_possible_cpus();
@@ -93518,7 +92882,7 @@ index 9a3f3c4..943fa11 100644
if (entry == NULL)
return;
-@@ -4972,8 +4985,12 @@ static void unregister_sched_domain_sysctl(void)
+@@ -5149,8 +5161,12 @@ static void unregister_sched_domain_sysctl(void)
if (sd_sysctl_header)
unregister_sysctl_table(sd_sysctl_header);
sd_sysctl_header = NULL;
@@ -93534,10 +92898,10 @@ index 9a3f3c4..943fa11 100644
#else
static void register_sched_domain_sysctl(void)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
-index 9b4c4f3..665489b 100644
+index ef2b104..69961f6 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
-@@ -1647,7 +1647,7 @@ void task_numa_fault(int last_cpupid, int node, int pages, int flags)
+@@ -1906,7 +1906,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
static void reset_ptenuma_scan(struct task_struct *p)
{
@@ -93546,7 +92910,7 @@ index 9b4c4f3..665489b 100644
p->mm->numa_scan_offset = 0;
}
-@@ -6851,7 +6851,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
+@@ -7465,7 +7465,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
* run_rebalance_domains is triggered when needed from the scheduler tick.
* Also triggered for nohz idle balancing (with nohz_balancing_kick set).
*/
@@ -93556,23 +92920,23 @@ index 9b4c4f3..665489b 100644
struct rq *this_rq = this_rq();
enum cpu_idle_type idle = this_rq->idle_balance ?
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
-index f964add..dcd823d 100644
+index 2df8ef0..aae070f 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
-@@ -1157,7 +1157,7 @@ struct sched_class {
+@@ -1140,7 +1140,7 @@ struct sched_class {
#ifdef CONFIG_FAIR_GROUP_SCHED
void (*task_move_group) (struct task_struct *p, int on_rq);
#endif
-};
+} __do_const;
- #define sched_class_highest (&stop_sched_class)
- #define for_each_class(class) \
+ static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
+ {
diff --git a/kernel/signal.c b/kernel/signal.c
-index 52f881d..1e9f941 100644
+index 8f0876f..1153a5a 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
-@@ -51,12 +51,12 @@ static struct kmem_cache *sigqueue_cachep;
+@@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
int print_fatal_signals __read_mostly;
@@ -93587,7 +92951,7 @@ index 52f881d..1e9f941 100644
{
/* Is it explicitly or implicitly ignored? */
return handler == SIG_IGN ||
-@@ -65,7 +65,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
+@@ -67,7 +67,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
static int sig_task_ignored(struct task_struct *t, int sig, bool force)
{
@@ -93596,7 +92960,7 @@ index 52f881d..1e9f941 100644
handler = sig_handler(t, sig);
-@@ -369,6 +369,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
+@@ -372,6 +372,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
atomic_inc(&user->sigpending);
rcu_read_unlock();
@@ -93606,7 +92970,7 @@ index 52f881d..1e9f941 100644
if (override_rlimit ||
atomic_read(&user->sigpending) <=
task_rlimit(t, RLIMIT_SIGPENDING)) {
-@@ -496,7 +499,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
+@@ -499,7 +502,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
int unhandled_signal(struct task_struct *tsk, int sig)
{
@@ -93615,7 +92979,7 @@ index 52f881d..1e9f941 100644
if (is_global_init(tsk))
return 1;
if (handler != SIG_IGN && handler != SIG_DFL)
-@@ -816,6 +819,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
+@@ -793,6 +796,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
}
}
@@ -93629,7 +92993,7 @@ index 52f881d..1e9f941 100644
return security_task_kill(t, info, sig, 0);
}
-@@ -1199,7 +1209,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
+@@ -1176,7 +1186,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
return send_signal(sig, info, p, 1);
}
@@ -93638,7 +93002,7 @@ index 52f881d..1e9f941 100644
specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
{
return send_signal(sig, info, t, 0);
-@@ -1236,6 +1246,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
+@@ -1213,6 +1223,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
unsigned long int flags;
int ret, blocked, ignored;
struct k_sigaction *action;
@@ -93646,7 +93010,7 @@ index 52f881d..1e9f941 100644
spin_lock_irqsave(&t->sighand->siglock, flags);
action = &t->sighand->action[sig-1];
-@@ -1250,9 +1261,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
+@@ -1227,9 +1238,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
}
if (action->sa.sa_handler == SIG_DFL)
t->signal->flags &= ~SIGNAL_UNKILLABLE;
@@ -93665,7 +93029,7 @@ index 52f881d..1e9f941 100644
return ret;
}
-@@ -1319,8 +1339,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
+@@ -1300,8 +1320,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
ret = check_kill_permission(sig, info, p);
rcu_read_unlock();
@@ -93678,7 +93042,7 @@ index 52f881d..1e9f941 100644
return ret;
}
-@@ -2926,7 +2949,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
+@@ -2903,7 +2926,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
int error = -ESRCH;
rcu_read_lock();
@@ -93695,7 +93059,7 @@ index 52f881d..1e9f941 100644
if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
error = check_kill_permission(sig, info, p);
/*
-@@ -3239,8 +3270,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
+@@ -3236,8 +3267,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
}
seg = get_fs();
set_fs(KERNEL_DS);
@@ -93729,10 +93093,10 @@ index eb89e18..a4e6792 100644
mutex_unlock(&smpboot_threads_lock);
put_online_cpus();
diff --git a/kernel/softirq.c b/kernel/softirq.c
-index 490fcbb..1e502c6 100644
+index 0699add..d365ad8 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
-@@ -52,7 +52,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
+@@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
EXPORT_SYMBOL(irq_stat);
#endif
@@ -93741,7 +93105,7 @@ index 490fcbb..1e502c6 100644
DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
-@@ -267,7 +267,7 @@ restart:
+@@ -266,7 +266,7 @@ restart:
kstat_incr_softirqs_this_cpu(vec_nr);
trace_softirq_entry(vec_nr);
@@ -93750,7 +93114,7 @@ index 490fcbb..1e502c6 100644
trace_softirq_exit(vec_nr);
if (unlikely(prev_count != preempt_count())) {
pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
-@@ -427,7 +427,7 @@ void __raise_softirq_irqoff(unsigned int nr)
+@@ -426,7 +426,7 @@ void __raise_softirq_irqoff(unsigned int nr)
or_softirq_pending(1UL << nr);
}
@@ -93759,7 +93123,7 @@ index 490fcbb..1e502c6 100644
{
softirq_vec[nr].action = action;
}
-@@ -479,7 +479,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
+@@ -478,7 +478,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
}
EXPORT_SYMBOL(__tasklet_hi_schedule_first);
@@ -93768,7 +93132,7 @@ index 490fcbb..1e502c6 100644
{
struct tasklet_struct *list;
-@@ -515,7 +515,7 @@ static void tasklet_action(struct softirq_action *a)
+@@ -514,7 +514,7 @@ static void tasklet_action(struct softirq_action *a)
}
}
@@ -93777,7 +93141,7 @@ index 490fcbb..1e502c6 100644
{
struct tasklet_struct *list;
-@@ -742,7 +742,7 @@ static struct notifier_block cpu_nfb = {
+@@ -741,7 +741,7 @@ static struct notifier_block cpu_nfb = {
.notifier_call = cpu_callback
};
@@ -93787,7 +93151,7 @@ index 490fcbb..1e502c6 100644
.thread_should_run = ksoftirqd_should_run,
.thread_fn = run_ksoftirqd,
diff --git a/kernel/sys.c b/kernel/sys.c
-index c0a58be..95e292b 100644
+index 1eaa2f0..d80d27c 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -148,6 +148,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
@@ -93803,7 +93167,7 @@ index c0a58be..95e292b 100644
no_nice = security_task_setnice(p, niceval);
if (no_nice) {
error = no_nice;
-@@ -351,6 +357,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
+@@ -353,6 +359,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
goto error;
}
@@ -93824,7 +93188,7 @@ index c0a58be..95e292b 100644
if (rgid != (gid_t) -1 ||
(egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
new->sgid = new->egid;
-@@ -386,6 +406,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
+@@ -388,6 +408,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
old = current_cred();
retval = -EPERM;
@@ -93835,7 +93199,7 @@ index c0a58be..95e292b 100644
if (ns_capable(old->user_ns, CAP_SETGID))
new->gid = new->egid = new->sgid = new->fsgid = kgid;
else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
-@@ -403,7 +427,7 @@ error:
+@@ -405,7 +429,7 @@ error:
/*
* change the user struct in a credentials set to match the new UID
*/
@@ -93844,7 +93208,7 @@ index c0a58be..95e292b 100644
{
struct user_struct *new_user;
-@@ -483,7 +507,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
+@@ -485,7 +509,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
goto error;
}
@@ -93863,7 +93227,7 @@ index c0a58be..95e292b 100644
retval = set_user(new);
if (retval < 0)
goto error;
-@@ -533,6 +568,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
+@@ -535,6 +570,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
old = current_cred();
retval = -EPERM;
@@ -93876,7 +93240,7 @@ index c0a58be..95e292b 100644
if (ns_capable(old->user_ns, CAP_SETUID)) {
new->suid = new->uid = kuid;
if (!uid_eq(kuid, old->uid)) {
-@@ -602,6 +643,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
+@@ -604,6 +645,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
goto error;
}
@@ -93886,7 +93250,7 @@ index c0a58be..95e292b 100644
if (ruid != (uid_t) -1) {
new->uid = kruid;
if (!uid_eq(kruid, old->uid)) {
-@@ -684,6 +728,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
+@@ -688,6 +732,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
goto error;
}
@@ -93896,7 +93260,7 @@ index c0a58be..95e292b 100644
if (rgid != (gid_t) -1)
new->gid = krgid;
if (egid != (gid_t) -1)
-@@ -745,12 +792,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
+@@ -752,12 +799,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
ns_capable(old->user_ns, CAP_SETUID)) {
if (!uid_eq(kuid, old->fsuid)) {
@@ -93913,7 +93277,7 @@ index c0a58be..95e292b 100644
abort_creds(new);
return old_fsuid;
-@@ -783,12 +834,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
+@@ -790,12 +841,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
ns_capable(old->user_ns, CAP_SETGID)) {
@@ -93930,7 +93294,7 @@ index c0a58be..95e292b 100644
abort_creds(new);
return old_fsgid;
-@@ -1167,19 +1222,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
+@@ -1172,19 +1227,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
return -EFAULT;
down_read(&uts_sem);
@@ -93955,7 +93319,7 @@ index c0a58be..95e292b 100644
__OLD_UTS_LEN);
error |= __put_user(0, name->machine + __OLD_UTS_LEN);
up_read(&uts_sem);
-@@ -1381,6 +1436,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
+@@ -1385,6 +1440,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
*/
new_rlim->rlim_cur = 1;
}
@@ -93970,7 +93334,7 @@ index c0a58be..95e292b 100644
if (!retval) {
if (old_rlim)
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index c1b26e1..bc7b50d 100644
+index 15f2511..181b356 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -94,7 +94,6 @@
@@ -93981,7 +93345,7 @@ index c1b26e1..bc7b50d 100644
/* External variables not in a header file. */
extern int max_threads;
extern int suid_dumpable;
-@@ -118,19 +117,18 @@ extern int blk_iopoll_enabled;
+@@ -115,19 +114,20 @@ extern int sysctl_nr_trim_pages;
/* Constants used for minimum and maximum */
#ifdef CONFIG_LOCKUP_DETECTOR
@@ -93990,18 +93354,19 @@ index c1b26e1..bc7b50d 100644
#endif
-static int __maybe_unused neg_one = -1;
--
++static int __maybe_unused neg_one __read_only = -1;
+
-static int zero;
-static int __maybe_unused one = 1;
-static int __maybe_unused two = 2;
--static int __maybe_unused three = 3;
+-static int __maybe_unused four = 4;
-static unsigned long one_ul = 1;
-static int one_hundred = 100;
-+static int __maybe_unused neg_one __read_only = -1;
+static int zero __read_only = 0;
+static int __maybe_unused one __read_only = 1;
+static int __maybe_unused two __read_only = 2;
+static int __maybe_unused three __read_only = 3;
++static int __maybe_unused four __read_only = 4;
+static unsigned long one_ul __read_only = 1;
+static int one_hundred __read_only = 100;
#ifdef CONFIG_PRINTK
@@ -94010,7 +93375,7 @@ index c1b26e1..bc7b50d 100644
#endif
/* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
-@@ -181,10 +179,8 @@ static int proc_taint(struct ctl_table *table, int write,
+@@ -181,10 +181,8 @@ static int proc_taint(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos);
#endif
@@ -94021,7 +93386,7 @@ index c1b26e1..bc7b50d 100644
static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos);
-@@ -215,6 +211,8 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
+@@ -215,6 +213,8 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write,
#endif
@@ -94030,12 +93395,12 @@ index c1b26e1..bc7b50d 100644
static struct ctl_table kern_table[];
static struct ctl_table vm_table[];
static struct ctl_table fs_table[];
-@@ -229,6 +227,20 @@ extern struct ctl_table epoll_table[];
+@@ -229,6 +229,20 @@ extern struct ctl_table epoll_table[];
int sysctl_legacy_va_layout;
#endif
+#ifdef CONFIG_PAX_SOFTMODE
-+static ctl_table pax_table[] = {
++static struct ctl_table pax_table[] = {
+ {
+ .procname = "softmode",
+ .data = &pax_softmode,
@@ -94051,7 +93416,7 @@ index c1b26e1..bc7b50d 100644
/* The default sysctl tables: */
static struct ctl_table sysctl_base_table[] = {
-@@ -277,6 +289,22 @@ static int max_extfrag_threshold = 1000;
+@@ -277,6 +291,22 @@ static int max_extfrag_threshold = 1000;
#endif
static struct ctl_table kern_table[] = {
@@ -94074,7 +93439,7 @@ index c1b26e1..bc7b50d 100644
{
.procname = "sched_child_runs_first",
.data = &sysctl_sched_child_runs_first,
-@@ -639,7 +667,7 @@ static struct ctl_table kern_table[] = {
+@@ -642,7 +672,7 @@ static struct ctl_table kern_table[] = {
.data = &modprobe_path,
.maxlen = KMOD_PATH_LEN,
.mode = 0644,
@@ -94083,7 +93448,7 @@ index c1b26e1..bc7b50d 100644
},
{
.procname = "modules_disabled",
-@@ -806,16 +834,20 @@ static struct ctl_table kern_table[] = {
+@@ -809,16 +839,20 @@ static struct ctl_table kern_table[] = {
.extra1 = &zero,
.extra2 = &one,
},
@@ -94105,7 +93470,7 @@ index c1b26e1..bc7b50d 100644
{
.procname = "ngroups_max",
.data = &ngroups_max,
-@@ -1060,10 +1092,17 @@ static struct ctl_table kern_table[] = {
+@@ -1065,10 +1099,17 @@ static struct ctl_table kern_table[] = {
*/
{
.procname = "perf_event_paranoid",
@@ -94126,7 +93491,7 @@ index c1b26e1..bc7b50d 100644
},
{
.procname = "perf_event_mlock_kb",
-@@ -1334,6 +1373,13 @@ static struct ctl_table vm_table[] = {
+@@ -1327,6 +1368,13 @@ static struct ctl_table vm_table[] = {
.proc_handler = proc_dointvec_minmax,
.extra1 = &zero,
},
@@ -94140,8 +93505,8 @@ index c1b26e1..bc7b50d 100644
#else
{
.procname = "nr_trim_pages",
-@@ -1798,6 +1844,16 @@ int proc_dostring(struct ctl_table *table, int write,
- buffer, lenp, ppos);
+@@ -1809,6 +1857,16 @@ int proc_dostring(struct ctl_table *table, int write,
+ (char __user *)buffer, lenp, ppos);
}
+int proc_dostring_modpriv(struct ctl_table *table, int write,
@@ -94157,7 +93522,7 @@ index c1b26e1..bc7b50d 100644
static size_t proc_skip_spaces(char **buf)
{
size_t ret;
-@@ -1903,6 +1959,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
+@@ -1914,6 +1972,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
len = strlen(tmp);
if (len > *size)
len = *size;
@@ -94166,7 +93531,7 @@ index c1b26e1..bc7b50d 100644
if (copy_to_user(*buf, tmp, len))
return -EFAULT;
*size -= len;
-@@ -2067,7 +2125,7 @@ int proc_dointvec(struct ctl_table *table, int write,
+@@ -2091,7 +2151,7 @@ int proc_dointvec(struct ctl_table *table, int write,
static int proc_taint(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
@@ -94175,7 +93540,7 @@ index c1b26e1..bc7b50d 100644
unsigned long tmptaint = get_taint();
int err;
-@@ -2095,7 +2153,6 @@ static int proc_taint(struct ctl_table *table, int write,
+@@ -2119,7 +2179,6 @@ static int proc_taint(struct ctl_table *table, int write,
return err;
}
@@ -94183,7 +93548,7 @@ index c1b26e1..bc7b50d 100644
static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
-@@ -2104,7 +2161,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
+@@ -2128,7 +2187,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
}
@@ -94191,7 +93556,7 @@ index c1b26e1..bc7b50d 100644
struct do_proc_dointvec_minmax_conv_param {
int *min;
-@@ -2651,6 +2707,12 @@ int proc_dostring(struct ctl_table *table, int write,
+@@ -2688,6 +2746,12 @@ int proc_dostring(struct ctl_table *table, int write,
return -ENOSYS;
}
@@ -94204,7 +93569,7 @@ index c1b26e1..bc7b50d 100644
int proc_dointvec(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
-@@ -2707,5 +2769,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
+@@ -2744,5 +2808,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
EXPORT_SYMBOL(proc_dostring);
@@ -94212,7 +93577,7 @@ index c1b26e1..bc7b50d 100644
EXPORT_SYMBOL(proc_doulongvec_minmax);
EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
diff --git a/kernel/taskstats.c b/kernel/taskstats.c
-index 13d2f7c..c93d0b0 100644
+index b312fcc7..753d72d 100644
--- a/kernel/taskstats.c
+++ b/kernel/taskstats.c
@@ -28,9 +28,12 @@
@@ -94238,24 +93603,8 @@ index 13d2f7c..c93d0b0 100644
if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
return cmd_attr_register_cpumask(info);
else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
-diff --git a/kernel/time.c b/kernel/time.c
-index 3eb322e..1ba53cf 100644
---- a/kernel/time.c
-+++ b/kernel/time.c
-@@ -172,6 +172,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
- return error;
-
- if (tz) {
-+ /* we log in do_settimeofday called below, so don't log twice
-+ */
-+ if (!tv)
-+ gr_log_timechange();
-+
- sys_tz = *tz;
- update_vsyscall_tz();
- if (firsttime) {
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
-index cd45a07..b8a1463 100644
+index a7077d3..dd48a49 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -823,7 +823,7 @@ static int __init alarmtimer_init(void)
@@ -94267,8 +93616,174 @@ index cd45a07..b8a1463 100644
.clock_getres = alarm_clock_getres,
.clock_get = alarm_clock_get,
.timer_create = alarm_timer_create,
+diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
+index 37e50aa..57a9501 100644
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -1399,7 +1399,7 @@ void hrtimer_peek_ahead_timers(void)
+ local_irq_restore(flags);
+ }
+
+-static void run_hrtimer_softirq(struct softirq_action *h)
++static __latent_entropy void run_hrtimer_softirq(void)
+ {
+ hrtimer_peek_ahead_timers();
+ }
+diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
+index a16b678..8c5bd9d 100644
+--- a/kernel/time/posix-cpu-timers.c
++++ b/kernel/time/posix-cpu-timers.c
+@@ -1450,14 +1450,14 @@ struct k_clock clock_posix_cpu = {
+
+ static __init int init_posix_cpu_timers(void)
+ {
+- struct k_clock process = {
++ static struct k_clock process = {
+ .clock_getres = process_cpu_clock_getres,
+ .clock_get = process_cpu_clock_get,
+ .timer_create = process_cpu_timer_create,
+ .nsleep = process_cpu_nsleep,
+ .nsleep_restart = process_cpu_nsleep_restart,
+ };
+- struct k_clock thread = {
++ static struct k_clock thread = {
+ .clock_getres = thread_cpu_clock_getres,
+ .clock_get = thread_cpu_clock_get,
+ .timer_create = thread_cpu_timer_create,
+diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
+index 31ea01f..7fc61ef 100644
+--- a/kernel/time/posix-timers.c
++++ b/kernel/time/posix-timers.c
+@@ -43,6 +43,7 @@
+ #include <linux/hash.h>
+ #include <linux/posix-clock.h>
+ #include <linux/posix-timers.h>
++#include <linux/grsecurity.h>
+ #include <linux/syscalls.h>
+ #include <linux/wait.h>
+ #include <linux/workqueue.h>
+@@ -124,7 +125,7 @@ static DEFINE_SPINLOCK(hash_lock);
+ * which we beg off on and pass to do_sys_settimeofday().
+ */
+
+-static struct k_clock posix_clocks[MAX_CLOCKS];
++static struct k_clock *posix_clocks[MAX_CLOCKS];
+
+ /*
+ * These ones are defined below.
+@@ -277,7 +278,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
+ */
+ static __init int init_posix_timers(void)
+ {
+- struct k_clock clock_realtime = {
++ static struct k_clock clock_realtime = {
+ .clock_getres = hrtimer_get_res,
+ .clock_get = posix_clock_realtime_get,
+ .clock_set = posix_clock_realtime_set,
+@@ -289,7 +290,7 @@ static __init int init_posix_timers(void)
+ .timer_get = common_timer_get,
+ .timer_del = common_timer_del,
+ };
+- struct k_clock clock_monotonic = {
++ static struct k_clock clock_monotonic = {
+ .clock_getres = hrtimer_get_res,
+ .clock_get = posix_ktime_get_ts,
+ .nsleep = common_nsleep,
+@@ -299,19 +300,19 @@ static __init int init_posix_timers(void)
+ .timer_get = common_timer_get,
+ .timer_del = common_timer_del,
+ };
+- struct k_clock clock_monotonic_raw = {
++ static struct k_clock clock_monotonic_raw = {
+ .clock_getres = hrtimer_get_res,
+ .clock_get = posix_get_monotonic_raw,
+ };
+- struct k_clock clock_realtime_coarse = {
++ static struct k_clock clock_realtime_coarse = {
+ .clock_getres = posix_get_coarse_res,
+ .clock_get = posix_get_realtime_coarse,
+ };
+- struct k_clock clock_monotonic_coarse = {
++ static struct k_clock clock_monotonic_coarse = {
+ .clock_getres = posix_get_coarse_res,
+ .clock_get = posix_get_monotonic_coarse,
+ };
+- struct k_clock clock_tai = {
++ static struct k_clock clock_tai = {
+ .clock_getres = hrtimer_get_res,
+ .clock_get = posix_get_tai,
+ .nsleep = common_nsleep,
+@@ -321,7 +322,7 @@ static __init int init_posix_timers(void)
+ .timer_get = common_timer_get,
+ .timer_del = common_timer_del,
+ };
+- struct k_clock clock_boottime = {
++ static struct k_clock clock_boottime = {
+ .clock_getres = hrtimer_get_res,
+ .clock_get = posix_get_boottime,
+ .nsleep = common_nsleep,
+@@ -533,7 +534,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
+ return;
+ }
+
+- posix_clocks[clock_id] = *new_clock;
++ posix_clocks[clock_id] = new_clock;
+ }
+ EXPORT_SYMBOL_GPL(posix_timers_register_clock);
+
+@@ -579,9 +580,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
+ return (id & CLOCKFD_MASK) == CLOCKFD ?
+ &clock_posix_dynamic : &clock_posix_cpu;
+
+- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
++ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
+ return NULL;
+- return &posix_clocks[id];
++ return posix_clocks[id];
+ }
+
+ static int common_timer_create(struct k_itimer *new_timer)
+@@ -599,7 +600,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
+ struct k_clock *kc = clockid_to_kclock(which_clock);
+ struct k_itimer *new_timer;
+ int error, new_timer_id;
+- sigevent_t event;
++ sigevent_t event = { };
+ int it_id_set = IT_ID_NOT_SET;
+
+ if (!kc)
+@@ -1014,6 +1015,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
+ if (copy_from_user(&new_tp, tp, sizeof (*tp)))
+ return -EFAULT;
+
++ /* only the CLOCK_REALTIME clock can be set, all other clocks
++ have their clock_set fptr set to a nosettime dummy function
++ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
++ call common_clock_set, which calls do_sys_settimeofday, which
++ we hook
++ */
++
+ return kc->clock_set(which_clock, &new_tp);
+ }
+
+diff --git a/kernel/time/time.c b/kernel/time/time.c
+index 22d5d3b..70caeb2 100644
+--- a/kernel/time/time.c
++++ b/kernel/time/time.c
+@@ -173,6 +173,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
+ return error;
+
+ if (tz) {
++ /* we log in do_settimeofday called below, so don't log twice
++ */
++ if (!tv)
++ gr_log_timechange();
++
+ sys_tz = *tz;
+ update_vsyscall_tz();
+ if (firsttime) {
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
-index 5b40279..81e58db 100644
+index ec1791f..6a086cd 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -15,6 +15,7 @@
@@ -94279,15 +93794,37 @@ index 5b40279..81e58db 100644
#include <linux/syscore_ops.h>
#include <linux/clocksource.h>
#include <linux/jiffies.h>
-@@ -501,6 +502,8 @@ int do_settimeofday(const struct timespec *tv)
+@@ -717,6 +718,8 @@ int do_settimeofday(const struct timespec *tv)
if (!timespec_valid_strict(tv))
return -EINVAL;
+ gr_log_timechange();
+
raw_spin_lock_irqsave(&timekeeper_lock, flags);
- write_seqcount_begin(&timekeeper_seq);
+ write_seqcount_begin(&tk_core.seq);
+
+diff --git a/kernel/time/timer.c b/kernel/time/timer.c
+index 3260ffd..c93cd5e 100644
+--- a/kernel/time/timer.c
++++ b/kernel/time/timer.c
+@@ -1394,7 +1394,7 @@ void update_process_times(int user_tick)
+ /*
+ * This function runs timers and the timer-tq in bottom half context.
+ */
+-static void run_timer_softirq(struct softirq_action *h)
++static __latent_entropy void run_timer_softirq(void)
+ {
+ struct tvec_base *base = __this_cpu_read(tvec_bases);
+@@ -1457,7 +1457,7 @@ static void process_timeout(unsigned long __data)
+ *
+ * In all cases the return value is guaranteed to be non-negative.
+ */
+-signed long __sched schedule_timeout(signed long timeout)
++signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
+ {
+ struct timer_list timer;
+ unsigned long expire;
diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
index 61ed862..3b52c65 100644
--- a/kernel/time/timer_list.c
@@ -94405,30 +93942,48 @@ index 1fb08f2..ca4bb1e 100644
if (!pe)
return -ENOMEM;
return 0;
-diff --git a/kernel/timer.c b/kernel/timer.c
-index 38f0d40..96b2ebf 100644
---- a/kernel/timer.c
-+++ b/kernel/timer.c
-@@ -1366,7 +1366,7 @@ void update_process_times(int user_tick)
- /*
- * This function runs timers and the timer-tq in bottom half context.
- */
--static void run_timer_softirq(struct softirq_action *h)
-+static __latent_entropy void run_timer_softirq(void)
- {
- struct tvec_base *base = __this_cpu_read(tvec_bases);
-
-@@ -1429,7 +1429,7 @@ static void process_timeout(unsigned long __data)
- *
- * In all cases the return value is guaranteed to be non-negative.
- */
--signed long __sched schedule_timeout(signed long timeout)
-+signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
- {
- struct timer_list timer;
- unsigned long expire;
+diff --git a/kernel/torture.c b/kernel/torture.c
+index dd70993..0bf694b 100644
+--- a/kernel/torture.c
++++ b/kernel/torture.c
+@@ -482,7 +482,7 @@ static int torture_shutdown_notify(struct notifier_block *unused1,
+ mutex_lock(&fullstop_mutex);
+ if (ACCESS_ONCE(fullstop) == FULLSTOP_DONTSTOP) {
+ VERBOSE_TOROUT_STRING("Unscheduled system shutdown detected");
+- ACCESS_ONCE(fullstop) = FULLSTOP_SHUTDOWN;
++ ACCESS_ONCE_RW(fullstop) = FULLSTOP_SHUTDOWN;
+ } else {
+ pr_warn("Concurrent rmmod and shutdown illegal!\n");
+ }
+@@ -549,14 +549,14 @@ static int torture_stutter(void *arg)
+ if (!torture_must_stop()) {
+ if (stutter > 1) {
+ schedule_timeout_interruptible(stutter - 1);
+- ACCESS_ONCE(stutter_pause_test) = 2;
++ ACCESS_ONCE_RW(stutter_pause_test) = 2;
+ }
+ schedule_timeout_interruptible(1);
+- ACCESS_ONCE(stutter_pause_test) = 1;
++ ACCESS_ONCE_RW(stutter_pause_test) = 1;
+ }
+ if (!torture_must_stop())
+ schedule_timeout_interruptible(stutter);
+- ACCESS_ONCE(stutter_pause_test) = 0;
++ ACCESS_ONCE_RW(stutter_pause_test) = 0;
+ torture_shutdown_absorb("torture_stutter");
+ } while (!torture_must_stop());
+ torture_kthread_stopping("torture_stutter");
+@@ -648,7 +648,7 @@ bool torture_cleanup_begin(void)
+ schedule_timeout_uninterruptible(10);
+ return true;
+ }
+- ACCESS_ONCE(fullstop) = FULLSTOP_RMMOD;
++ ACCESS_ONCE_RW(fullstop) = FULLSTOP_RMMOD;
+ mutex_unlock(&fullstop_mutex);
+ torture_shutdown_cleanup();
+ torture_shuffle_cleanup();
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
-index 4f3a3c03..04b7886 100644
+index c1bd4ad..4b861dc 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
@@ -94459,10 +94014,10 @@ index 4f3a3c03..04b7886 100644
ret = -EIO;
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
-index e3be87e..abc908f 100644
+index 124e2c7..762ca29 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
-@@ -1965,12 +1965,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
+@@ -2183,12 +2183,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
if (unlikely(ftrace_disabled))
return 0;
@@ -94482,7 +94037,7 @@ index e3be87e..abc908f 100644
}
/*
-@@ -4177,8 +4182,10 @@ static int ftrace_process_locs(struct module *mod,
+@@ -4529,8 +4534,10 @@ static int ftrace_process_locs(struct module *mod,
if (!count)
return 0;
@@ -94493,16 +94048,7 @@ index e3be87e..abc908f 100644
start_pg = ftrace_allocate_pages(count);
if (!start_pg)
-@@ -4890,8 +4897,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
- #ifdef CONFIG_FUNCTION_GRAPH_TRACER
-
- static int ftrace_graph_active;
--static struct notifier_block ftrace_suspend_notifier;
--
- int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace)
- {
- return 0;
-@@ -4933,7 +4938,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
+@@ -5377,7 +5384,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
if (t->ret_stack == NULL) {
atomic_set(&t->tracing_graph_pause, 0);
@@ -94511,26 +94057,7 @@ index e3be87e..abc908f 100644
t->curr_ret_stack = -1;
/* Make sure the tasks see the -1 first: */
smp_wmb();
-@@ -5067,6 +5072,10 @@ static void update_function_graph_func(void)
- ftrace_graph_entry = ftrace_graph_entry_test;
- }
-
-+static struct notifier_block ftrace_suspend_notifier = {
-+ .notifier_call = ftrace_suspend_notifier_call
-+};
-+
- int register_ftrace_graph(trace_func_graph_ret_t retfunc,
- trace_func_graph_ent_t entryfunc)
- {
-@@ -5080,7 +5089,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc,
- goto out;
- }
-
-- ftrace_suspend_notifier.notifier_call = ftrace_suspend_notifier_call;
- register_pm_notifier(&ftrace_suspend_notifier);
-
- ftrace_graph_active++;
-@@ -5134,7 +5142,7 @@ static void
+@@ -5590,7 +5597,7 @@ static void
graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
{
atomic_set(&t->tracing_graph_pause, 0);
@@ -94540,7 +94067,7 @@ index e3be87e..abc908f 100644
/* make curr_ret_stack visible before we add the ret_stack */
smp_wmb();
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
-index 774a080..7fa60b1 100644
+index a56e07c..d46f0ba 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -352,9 +352,9 @@ struct buffer_data_page {
@@ -94566,7 +94093,7 @@ index 774a080..7fa60b1 100644
local_t dropped_events;
local_t committing;
local_t commits;
-@@ -1005,8 +1005,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -1032,8 +1032,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
*
* We add a counter to the write field to denote this.
*/
@@ -94577,7 +94104,7 @@ index 774a080..7fa60b1 100644
/*
* Just make sure we have seen our old_write and synchronize
-@@ -1034,8 +1034,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -1061,8 +1061,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
* cmpxchg to only update if an interrupt did not already
* do it for us. If the cmpxchg fails, we don't care.
*/
@@ -94588,7 +94115,7 @@ index 774a080..7fa60b1 100644
/*
* No need to worry about races with clearing out the commit.
-@@ -1399,12 +1399,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
+@@ -1429,12 +1429,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
static inline unsigned long rb_page_entries(struct buffer_page *bpage)
{
@@ -94603,7 +94130,7 @@ index 774a080..7fa60b1 100644
}
static int
-@@ -1499,7 +1499,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
+@@ -1529,7 +1529,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
* bytes consumed in ring buffer from here.
* Increment overrun to account for the lost events.
*/
@@ -94612,7 +94139,7 @@ index 774a080..7fa60b1 100644
local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
}
-@@ -2077,7 +2077,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2091,7 +2091,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
* it is our responsibility to update
* the counters.
*/
@@ -94621,7 +94148,7 @@ index 774a080..7fa60b1 100644
local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
/*
-@@ -2227,7 +2227,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2241,7 +2241,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
if (tail == BUF_PAGE_SIZE)
tail_page->real_end = 0;
@@ -94630,7 +94157,7 @@ index 774a080..7fa60b1 100644
return;
}
-@@ -2262,7 +2262,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2276,7 +2276,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
rb_event_set_padding(event);
/* Set the write back to the previous setting */
@@ -94639,7 +94166,7 @@ index 774a080..7fa60b1 100644
return;
}
-@@ -2274,7 +2274,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2288,7 +2288,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
/* Set write to end of buffer */
length = (tail + length) - BUF_PAGE_SIZE;
@@ -94648,7 +94175,7 @@ index 774a080..7fa60b1 100644
}
/*
-@@ -2300,7 +2300,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2314,7 +2314,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
* about it.
*/
if (unlikely(next_page == commit_page)) {
@@ -94657,7 +94184,7 @@ index 774a080..7fa60b1 100644
goto out_reset;
}
-@@ -2356,7 +2356,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2370,7 +2370,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
cpu_buffer->tail_page) &&
(cpu_buffer->commit_page ==
cpu_buffer->reader_page))) {
@@ -94666,7 +94193,7 @@ index 774a080..7fa60b1 100644
goto out_reset;
}
}
-@@ -2404,7 +2404,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2418,7 +2418,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
length += RB_LEN_TIME_EXTEND;
tail_page = cpu_buffer->tail_page;
@@ -94675,7 +94202,7 @@ index 774a080..7fa60b1 100644
/* set write to only the index of the write */
write &= RB_WRITE_MASK;
-@@ -2428,7 +2428,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2442,7 +2442,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
kmemcheck_annotate_bitfield(event, bitfield);
rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
@@ -94684,7 +94211,7 @@ index 774a080..7fa60b1 100644
/*
* If this is the first commit on the page, then update
-@@ -2461,7 +2461,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2475,7 +2475,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
unsigned long write_mask =
@@ -94693,7 +94220,7 @@ index 774a080..7fa60b1 100644
unsigned long event_length = rb_event_length(event);
/*
* This is on the tail page. It is possible that
-@@ -2471,7 +2471,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2485,7 +2485,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
*/
old_index += write_mask;
new_index += write_mask;
@@ -94702,7 +94229,7 @@ index 774a080..7fa60b1 100644
if (index == old_index) {
/* update counters */
local_sub(event_length, &cpu_buffer->entries_bytes);
-@@ -2863,7 +2863,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2877,7 +2877,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
/* Do the likely case first */
if (likely(bpage->page == (void *)addr)) {
@@ -94711,7 +94238,7 @@ index 774a080..7fa60b1 100644
return;
}
-@@ -2875,7 +2875,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2889,7 +2889,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
start = bpage;
do {
if (bpage->page == (void *)addr) {
@@ -94720,7 +94247,7 @@ index 774a080..7fa60b1 100644
return;
}
rb_inc_page(cpu_buffer, &bpage);
-@@ -3159,7 +3159,7 @@ static inline unsigned long
+@@ -3173,7 +3173,7 @@ static inline unsigned long
rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
{
return local_read(&cpu_buffer->entries) -
@@ -94729,7 +94256,7 @@ index 774a080..7fa60b1 100644
}
/**
-@@ -3248,7 +3248,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
+@@ -3262,7 +3262,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
return 0;
cpu_buffer = buffer->buffers[cpu];
@@ -94738,7 +94265,7 @@ index 774a080..7fa60b1 100644
return ret;
}
-@@ -3271,7 +3271,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
+@@ -3285,7 +3285,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
return 0;
cpu_buffer = buffer->buffers[cpu];
@@ -94747,7 +94274,7 @@ index 774a080..7fa60b1 100644
return ret;
}
-@@ -3356,7 +3356,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
+@@ -3370,7 +3370,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
/* if you care about this being correct, lock the buffer */
for_each_buffer_cpu(buffer, cpu) {
cpu_buffer = buffer->buffers[cpu];
@@ -94756,7 +94283,7 @@ index 774a080..7fa60b1 100644
}
return overruns;
-@@ -3527,8 +3527,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -3541,8 +3541,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
/*
* Reset the reader page to size zero.
*/
@@ -94767,7 +94294,7 @@ index 774a080..7fa60b1 100644
local_set(&cpu_buffer->reader_page->page->commit, 0);
cpu_buffer->reader_page->real_end = 0;
-@@ -3562,7 +3562,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -3576,7 +3576,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
* want to compare with the last_overrun.
*/
smp_mb();
@@ -94776,7 +94303,7 @@ index 774a080..7fa60b1 100644
/*
* Here's the tricky part.
-@@ -4134,8 +4134,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -4148,8 +4148,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
cpu_buffer->head_page
= list_entry(cpu_buffer->pages, struct buffer_page, list);
@@ -94787,7 +94314,7 @@ index 774a080..7fa60b1 100644
local_set(&cpu_buffer->head_page->page->commit, 0);
cpu_buffer->head_page->read = 0;
-@@ -4145,14 +4145,14 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -4159,14 +4159,14 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
INIT_LIST_HEAD(&cpu_buffer->new_pages);
@@ -94806,7 +94333,7 @@ index 774a080..7fa60b1 100644
local_set(&cpu_buffer->dropped_events, 0);
local_set(&cpu_buffer->entries, 0);
local_set(&cpu_buffer->committing, 0);
-@@ -4557,8 +4557,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
+@@ -4571,8 +4571,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
rb_init_page(bpage);
bpage = reader->page;
reader->page = *data_page;
@@ -94818,10 +94345,10 @@ index 774a080..7fa60b1 100644
*data_page = bpage;
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
-index 7113672..e8a9c80 100644
+index 426962b..e8e2d9a 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
-@@ -3412,7 +3412,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
+@@ -3488,7 +3488,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
return 0;
}
@@ -94831,10 +94358,10 @@ index 7113672..e8a9c80 100644
/* do nothing if flag is already set */
if (!!(trace_flags & mask) == !!enabled)
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
-index c8bd809..33d7539 100644
+index 385391f..8d2250f 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
-@@ -1233,7 +1233,7 @@ extern const char *__stop___tracepoint_str[];
+@@ -1280,7 +1280,7 @@ extern const char *__stop___tracepoint_str[];
void trace_printk_init_buffers(void);
void trace_printk_start_comm(void);
int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
@@ -94864,10 +94391,10 @@ index 57b67b1..66082a9 100644
+ return atomic64_inc_return_unchecked(&trace_counter);
}
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
-index e4c4efc..ef4e975 100644
+index 1b0df1e..4ebb965 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
-@@ -1682,7 +1682,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
+@@ -1720,7 +1720,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
return 0;
}
@@ -94876,10 +94403,10 @@ index e4c4efc..ef4e975 100644
/* Add an additional event_call dynamically */
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
-index 0b99120..881174f 100644
+index f0a0c98..3692dc8 100644
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
-@@ -110,7 +110,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
+@@ -133,7 +133,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
/* The return trace stack is full */
if (current->curr_ret_stack == FTRACE_RETFUNC_DEPTH - 1) {
@@ -94888,7 +94415,7 @@ index 0b99120..881174f 100644
return -EBUSY;
}
-@@ -207,7 +207,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret,
+@@ -230,7 +230,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret,
*ret = current->ret_stack[index].ret;
trace->func = current->ret_stack[index].func;
trace->calltime = current->ret_stack[index].calltime;
@@ -94938,19 +94465,10 @@ index 0abd9b8..6a663a2 100644
}
entry = ring_buffer_event_data(event);
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
-index ed32284..884d6c3 100644
+index c6977d5..d243785 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
-@@ -294,7 +294,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
-
- p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
- if (!IS_ERR(p)) {
-- p = mangle_path(s->buffer + s->len, p, "\n");
-+ p = mangle_path(s->buffer + s->len, p, "\n\\");
- if (p) {
- s->len = p - s->buffer;
- return 1;
-@@ -908,14 +908,16 @@ int register_ftrace_event(struct trace_event *event)
+@@ -712,14 +712,16 @@ int register_ftrace_event(struct trace_event *event)
goto out;
}
@@ -94971,11 +94489,24 @@ index ed32284..884d6c3 100644
key = event->type & (EVENT_HASHSIZE - 1);
+diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
+index 1f24ed9..10407ec 100644
+--- a/kernel/trace/trace_seq.c
++++ b/kernel/trace/trace_seq.c
+@@ -367,7 +367,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
+
+ p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
+ if (!IS_ERR(p)) {
+- p = mangle_path(s->buffer + s->len, p, "\n");
++ p = mangle_path(s->buffer + s->len, p, "\n\\");
+ if (p) {
+ s->len = p - s->buffer;
+ return 1;
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
-index e6be585..d73ae5e 100644
+index 16eddb3..758b308 100644
--- a/kernel/trace/trace_stack.c
+++ b/kernel/trace/trace_stack.c
-@@ -68,7 +68,7 @@ check_stack(unsigned long ip, unsigned long *stack)
+@@ -90,7 +90,7 @@ check_stack(unsigned long ip, unsigned long *stack)
return;
/* we do not handle interrupt stacks yet */
@@ -94985,7 +94516,7 @@ index e6be585..d73ae5e 100644
local_irq_save(flags);
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
-index 7e3cd7a..5156a5fe 100644
+index 29228c4..301bc8c 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -602,6 +602,8 @@ static int perf_sysenter_enable(struct ftrace_event_call *call)
@@ -95025,7 +94556,7 @@ index 7e3cd7a..5156a5fe 100644
mutex_lock(&syscall_trace_lock);
sys_perf_refcount_exit--;
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
-index 153971e..ac4be58 100644
+index a2e37c5..4fa859b 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -83,6 +83,21 @@ int create_user_ns(struct cred *new)
@@ -95050,7 +94581,7 @@ index 153971e..ac4be58 100644
ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
if (!ns)
return -ENOMEM;
-@@ -966,7 +981,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
+@@ -974,7 +989,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
if (atomic_read(&current->mm->mm_users) > 1)
return -EINVAL;
@@ -95060,11 +94591,11 @@ index 153971e..ac4be58 100644
if (!ns_capable(user_ns, CAP_SYS_ADMIN))
diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
-index 4f69f9a..7c6f8f8 100644
+index c8eac43..4b5f08f 100644
--- a/kernel/utsname_sysctl.c
+++ b/kernel/utsname_sysctl.c
-@@ -47,7 +47,7 @@ static void put_uts(ctl_table *table, int write, void *which)
- static int proc_do_uts_string(ctl_table *table, int write,
+@@ -47,7 +47,7 @@ static void put_uts(struct ctl_table *table, int write, void *which)
+ static int proc_do_uts_string(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
- struct ctl_table uts_table;
@@ -95073,10 +94604,10 @@ index 4f69f9a..7c6f8f8 100644
memcpy(&uts_table, table, sizeof(uts_table));
uts_table.data = get_uts(table, write);
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
-index c9b6f01..37781d9 100644
+index 70bf118..4be3c37 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
-@@ -475,7 +475,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
+@@ -572,7 +572,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
static void watchdog_nmi_disable(unsigned int cpu) { return; }
#endif /* CONFIG_HARDLOCKUP_DETECTOR */
@@ -95086,10 +94617,10 @@ index c9b6f01..37781d9 100644
.thread_should_run = watchdog_should_run,
.thread_fn = watchdog,
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
-index b4defde..f092808 100644
+index 66940a5..a44fed0 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
-@@ -4703,7 +4703,7 @@ static void rebind_workers(struct worker_pool *pool)
+@@ -4499,7 +4499,7 @@ static void rebind_workers(struct worker_pool *pool)
WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
worker_flags |= WORKER_REBOUND;
worker_flags &= ~WORKER_UNBOUND;
@@ -95098,25 +94629,11 @@ index b4defde..f092808 100644
}
spin_unlock_irq(&pool->lock);
-diff --git a/lib/Kconfig b/lib/Kconfig
-index 991c98b..88061cf 100644
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -51,6 +51,9 @@ config PERCPU_RWSEM
- config ARCH_USE_CMPXCHG_LOCKREF
- bool
-
-+config ARCH_HAS_FAST_MULTIPLIER
-+ bool
-+
- config CRC_CCITT
- tristate "CRC-CCITT functions"
- help
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
-index a48abea..e108def 100644
+index 4e35a5d..8a1f3f0 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
-@@ -854,7 +854,7 @@ config DEBUG_MUTEXES
+@@ -894,7 +894,7 @@ config DEBUG_MUTEXES
config DEBUG_WW_MUTEX_SLOWPATH
bool "Wait/wound mutex debugging: Slowpath testing"
@@ -95125,7 +94642,7 @@ index a48abea..e108def 100644
select DEBUG_LOCK_ALLOC
select DEBUG_SPINLOCK
select DEBUG_MUTEXES
-@@ -867,7 +867,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
+@@ -911,7 +911,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
config DEBUG_LOCK_ALLOC
bool "Lock debugging: detect incorrect freeing of live locks"
@@ -95134,7 +94651,7 @@ index a48abea..e108def 100644
select DEBUG_SPINLOCK
select DEBUG_MUTEXES
select LOCKDEP
-@@ -881,7 +881,7 @@ config DEBUG_LOCK_ALLOC
+@@ -925,7 +925,7 @@ config DEBUG_LOCK_ALLOC
config PROVE_LOCKING
bool "Lock debugging: prove locking correctness"
@@ -95143,7 +94660,7 @@ index a48abea..e108def 100644
select LOCKDEP
select DEBUG_SPINLOCK
select DEBUG_MUTEXES
-@@ -932,7 +932,7 @@ config LOCKDEP
+@@ -976,7 +976,7 @@ config LOCKDEP
config LOCK_STAT
bool "Lock usage statistics"
@@ -95152,7 +94669,7 @@ index a48abea..e108def 100644
select LOCKDEP
select DEBUG_SPINLOCK
select DEBUG_MUTEXES
-@@ -1394,6 +1394,7 @@ config LATENCYTOP
+@@ -1449,6 +1449,7 @@ config LATENCYTOP
depends on DEBUG_KERNEL
depends on STACKTRACE_SUPPORT
depends on PROC_FS
@@ -95160,7 +94677,7 @@ index a48abea..e108def 100644
select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
select KALLSYMS
select KALLSYMS_ALL
-@@ -1410,7 +1411,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
+@@ -1465,7 +1466,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
config DEBUG_STRICT_USER_COPY_CHECKS
bool "Strict user copy size checks"
depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
@@ -95169,7 +94686,7 @@ index a48abea..e108def 100644
help
Enabling this option turns a certain set of sanity checks for user
copy operations into compile time failures.
-@@ -1529,7 +1530,7 @@ endmenu # runtime tests
+@@ -1593,7 +1594,7 @@ endmenu # runtime tests
config PROVIDE_OHCI1394_DMA_INIT
bool "Remote debugging over FireWire early on boot"
@@ -95179,11 +94696,11 @@ index a48abea..e108def 100644
If you want to debug problems which hang or crash the kernel early
on boot and the crashing machine has a FireWire port, you can use
diff --git a/lib/Makefile b/lib/Makefile
-index 48140e3..de854e5 100644
+index 0211d2b..93f5cc3 100644
--- a/lib/Makefile
+++ b/lib/Makefile
-@@ -52,7 +52,7 @@ obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
- obj-$(CONFIG_BTREE) += btree.o
+@@ -55,7 +55,7 @@ obj-$(CONFIG_BTREE) += btree.o
+ obj-$(CONFIG_INTERVAL_TREE) += interval_tree.o
obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
@@ -95205,10 +94722,10 @@ index 114d1be..ab0350c 100644
(val << avg->factor)) >> avg->weight :
(val << avg->factor);
diff --git a/lib/bitmap.c b/lib/bitmap.c
-index e5c4ebe..9078e42 100644
+index b499ab6..fbdb76c 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
-@@ -426,7 +426,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
+@@ -433,7 +433,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
{
int c, old_c, totaldigits, ndigits, nchunks, nbits;
u32 chunk;
@@ -95217,7 +94734,7 @@ index e5c4ebe..9078e42 100644
bitmap_zero(maskp, nmaskbits);
-@@ -511,7 +511,7 @@ int bitmap_parse_user(const char __user *ubuf,
+@@ -518,7 +518,7 @@ int bitmap_parse_user(const char __user *ubuf,
{
if (!access_ok(VERIFY_READ, ubuf, ulen))
return -EFAULT;
@@ -95226,7 +94743,7 @@ index e5c4ebe..9078e42 100644
ulen, 1, maskp, nmaskbits);
}
-@@ -602,7 +602,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
+@@ -609,7 +609,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
{
unsigned a, b;
int c, old_c, totaldigits;
@@ -95235,7 +94752,7 @@ index e5c4ebe..9078e42 100644
int exp_digit, in_range;
totaldigits = c = 0;
-@@ -702,7 +702,7 @@ int bitmap_parselist_user(const char __user *ubuf,
+@@ -704,7 +704,7 @@ int bitmap_parselist_user(const char __user *ubuf,
{
if (!access_ok(VERIFY_READ, ubuf, ulen))
return -EFAULT;
@@ -95245,10 +94762,10 @@ index e5c4ebe..9078e42 100644
}
EXPORT_SYMBOL(bitmap_parselist_user);
diff --git a/lib/bug.c b/lib/bug.c
-index 1686034..a9c00c8 100644
+index d1d7c78..b354235 100644
--- a/lib/bug.c
+++ b/lib/bug.c
-@@ -134,6 +134,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
+@@ -137,6 +137,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
return BUG_TRAP_TYPE_NONE;
bug = find_bug(bugaddr);
@@ -95258,10 +94775,10 @@ index 1686034..a9c00c8 100644
file = NULL;
line = 0;
diff --git a/lib/debugobjects.c b/lib/debugobjects.c
-index e0731c3..ad66444 100644
+index 547f7f9..a6d4ba0 100644
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
-@@ -286,7 +286,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
+@@ -289,7 +289,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
if (limit > 4)
return;
@@ -95270,28 +94787,6 @@ index e0731c3..ad66444 100644
if (is_on_stack == onstack)
return;
-diff --git a/lib/devres.c b/lib/devres.c
-index 8235331..5881053 100644
---- a/lib/devres.c
-+++ b/lib/devres.c
-@@ -81,7 +81,7 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
- void devm_iounmap(struct device *dev, void __iomem *addr)
- {
- WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
-- (void *)addr));
-+ (void __force *)addr));
- iounmap(addr);
- }
- EXPORT_SYMBOL(devm_iounmap);
-@@ -224,7 +224,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
- {
- ioport_unmap(addr);
- WARN_ON(devres_destroy(dev, devm_ioport_map_release,
-- devm_ioport_map_match, (void *)addr));
-+ devm_ioport_map_match, (void __force *)addr));
- }
- EXPORT_SYMBOL(devm_ioport_unmap);
- #endif /* CONFIG_HAS_IOPORT */
diff --git a/lib/div64.c b/lib/div64.c
index 4382ad7..08aa558 100644
--- a/lib/div64.c
@@ -95315,7 +94810,7 @@ index 4382ad7..08aa558 100644
u32 high = divisor >> 32;
u64 quot;
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
-index 98f2d7e..899da5c 100644
+index add80cc..0d27550 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -971,7 +971,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
@@ -95333,7 +94828,7 @@ index 98f2d7e..899da5c 100644
{
- if (object_is_on_stack(addr))
+ if (object_starts_on_stack(addr))
- err_printk(dev, NULL, "DMA-API: device driver maps memory from"
+ err_printk(dev, NULL, "DMA-API: device driver maps memory from "
"stack [addr=%p]\n", addr);
}
diff --git a/lib/hash.c b/lib/hash.c
@@ -95349,28 +94844,6 @@ index fea973f..386626f 100644
.hash = jhash,
.hash2 = jhash2,
};
-diff --git a/lib/hweight.c b/lib/hweight.c
-index b7d81ba..9a5c1f2 100644
---- a/lib/hweight.c
-+++ b/lib/hweight.c
-@@ -11,7 +11,7 @@
-
- unsigned int __sw_hweight32(unsigned int w)
- {
--#ifdef ARCH_HAS_FAST_MULTIPLIER
-+#ifdef CONFIG_ARCH_HAS_FAST_MULTIPLIER
- w -= (w >> 1) & 0x55555555;
- w = (w & 0x33333333) + ((w >> 2) & 0x33333333);
- w = (w + (w >> 4)) & 0x0f0f0f0f;
-@@ -49,7 +49,7 @@ unsigned long __sw_hweight64(__u64 w)
- return __sw_hweight32((unsigned int)(w >> 32)) +
- __sw_hweight32((unsigned int)w);
- #elif BITS_PER_LONG == 64
--#ifdef ARCH_HAS_FAST_MULTIPLIER
-+#ifdef CONFIG_ARCH_HAS_FAST_MULTIPLIER
- w -= (w >> 1) & 0x5555555555555555ul;
- w = (w & 0x3333333333333333ul) + ((w >> 2) & 0x3333333333333333ul);
- w = (w + (w >> 4)) & 0x0f0f0f0f0f0f0f0ful;
diff --git a/lib/inflate.c b/lib/inflate.c
index 013a761..c28f3fc 100644
--- a/lib/inflate.c
@@ -95421,7 +94894,7 @@ index bd2bea9..6b3c95e 100644
return false;
diff --git a/lib/kobject.c b/lib/kobject.c
-index cb14aea..8c53cdb 100644
+index 58751bb..93a1853 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -931,9 +931,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
@@ -95658,10 +95131,10 @@ index c24c2f7..f0296f4 100644
+}
+EXPORT_SYMBOL(pax_list_del_rcu);
diff --git a/lib/lockref.c b/lib/lockref.c
-index f07a40d..0a445a7 100644
+index d2233de..fa1a2f6 100644
--- a/lib/lockref.c
+++ b/lib/lockref.c
-@@ -49,13 +49,13 @@
+@@ -48,13 +48,13 @@
void lockref_get(struct lockref *lockref)
{
CMPXCHG_LOOP(
@@ -95677,7 +95150,7 @@ index f07a40d..0a445a7 100644
spin_unlock(&lockref->lock);
}
EXPORT_SYMBOL(lockref_get);
-@@ -70,7 +70,7 @@ int lockref_get_not_zero(struct lockref *lockref)
+@@ -69,7 +69,7 @@ int lockref_get_not_zero(struct lockref *lockref)
int retval;
CMPXCHG_LOOP(
@@ -95686,7 +95159,7 @@ index f07a40d..0a445a7 100644
if (!old.count)
return 0;
,
-@@ -80,7 +80,7 @@ int lockref_get_not_zero(struct lockref *lockref)
+@@ -79,7 +79,7 @@ int lockref_get_not_zero(struct lockref *lockref)
spin_lock(&lockref->lock);
retval = 0;
if (lockref->count) {
@@ -95695,7 +95168,7 @@ index f07a40d..0a445a7 100644
retval = 1;
}
spin_unlock(&lockref->lock);
-@@ -97,7 +97,7 @@ EXPORT_SYMBOL(lockref_get_not_zero);
+@@ -96,7 +96,7 @@ EXPORT_SYMBOL(lockref_get_not_zero);
int lockref_get_or_lock(struct lockref *lockref)
{
CMPXCHG_LOOP(
@@ -95704,7 +95177,7 @@ index f07a40d..0a445a7 100644
if (!old.count)
break;
,
-@@ -107,7 +107,7 @@ int lockref_get_or_lock(struct lockref *lockref)
+@@ -106,7 +106,7 @@ int lockref_get_or_lock(struct lockref *lockref)
spin_lock(&lockref->lock);
if (!lockref->count)
return 0;
@@ -95713,7 +95186,7 @@ index f07a40d..0a445a7 100644
spin_unlock(&lockref->lock);
return 1;
}
-@@ -121,7 +121,7 @@ EXPORT_SYMBOL(lockref_get_or_lock);
+@@ -120,7 +120,7 @@ EXPORT_SYMBOL(lockref_get_or_lock);
int lockref_put_or_lock(struct lockref *lockref)
{
CMPXCHG_LOOP(
@@ -95722,7 +95195,7 @@ index f07a40d..0a445a7 100644
if (old.count <= 1)
break;
,
-@@ -131,7 +131,7 @@ int lockref_put_or_lock(struct lockref *lockref)
+@@ -130,7 +130,7 @@ int lockref_put_or_lock(struct lockref *lockref)
spin_lock(&lockref->lock);
if (lockref->count <= 1)
return 0;
@@ -95731,7 +95204,7 @@ index f07a40d..0a445a7 100644
spin_unlock(&lockref->lock);
return 1;
}
-@@ -158,7 +158,7 @@ int lockref_get_not_dead(struct lockref *lockref)
+@@ -157,7 +157,7 @@ int lockref_get_not_dead(struct lockref *lockref)
int retval;
CMPXCHG_LOOP(
@@ -95740,7 +95213,7 @@ index f07a40d..0a445a7 100644
if ((int)old.count < 0)
return 0;
,
-@@ -168,7 +168,7 @@ int lockref_get_not_dead(struct lockref *lockref)
+@@ -167,7 +167,7 @@ int lockref_get_not_dead(struct lockref *lockref)
spin_lock(&lockref->lock);
retval = 0;
if ((int) lockref->count >= 0) {
@@ -95750,23 +95223,23 @@ index f07a40d..0a445a7 100644
}
spin_unlock(&lockref->lock);
diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
-index 963b703..438bc51 100644
+index 6111bcb..02e816b 100644
--- a/lib/percpu-refcount.c
+++ b/lib/percpu-refcount.c
-@@ -29,7 +29,7 @@
- * can't hit 0 before we've added up all the percpu refs.
+@@ -31,7 +31,7 @@
+ * atomic_long_t can't hit 0 before we've added up all the percpu refs.
*/
--#define PCPU_COUNT_BIAS (1U << 31)
-+#define PCPU_COUNT_BIAS (1U << 30)
+-#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 1))
++#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 2))
+
+ static DECLARE_WAIT_QUEUE_HEAD(percpu_ref_switch_waitq);
- /**
- * percpu_ref_init - initialize a percpu refcount
diff --git a/lib/radix-tree.c b/lib/radix-tree.c
-index 7e30d2a..eccc695 100644
+index 3291a8e..346a91e 100644
--- a/lib/radix-tree.c
+++ b/lib/radix-tree.c
-@@ -93,7 +93,7 @@ struct radix_tree_preload {
+@@ -67,7 +67,7 @@ struct radix_tree_preload {
int nr;
struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
};
@@ -95776,11 +95249,11 @@ index 7e30d2a..eccc695 100644
static inline void *ptr_to_indirect(void *ptr)
{
diff --git a/lib/random32.c b/lib/random32.c
-index 6148967..009bfe8 100644
+index 0bee183..526f12f 100644
--- a/lib/random32.c
+++ b/lib/random32.c
-@@ -44,7 +44,7 @@
- static void __init prandom_state_selftest(void);
+@@ -47,7 +47,7 @@ static inline void prandom_state_selftest(void)
+ }
#endif
-static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
@@ -95789,7 +95262,7 @@ index 6148967..009bfe8 100644
/**
* prandom_u32_state - seeded pseudo-random number generator.
diff --git a/lib/rbtree.c b/lib/rbtree.c
-index 65f4eff..2cfa167 100644
+index c16c81a..4dcbda1 100644
--- a/lib/rbtree.c
+++ b/lib/rbtree.c
@@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
@@ -95804,7 +95277,7 @@ index 65f4eff..2cfa167 100644
void rb_insert_color(struct rb_node *node, struct rb_root *root)
diff --git a/lib/show_mem.c b/lib/show_mem.c
-index 0922579..9d7adb9 100644
+index 5e25627..3ed9d7f 100644
--- a/lib/show_mem.c
+++ b/lib/show_mem.c
@@ -44,6 +44,6 @@ void show_mem(unsigned int filter)
@@ -95815,22 +95288,6 @@ index 0922579..9d7adb9 100644
+ printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
#endif
}
-diff --git a/lib/string.c b/lib/string.c
-index 43d0781..64941b2 100644
---- a/lib/string.c
-+++ b/lib/string.c
-@@ -805,9 +805,9 @@ void *memchr_inv(const void *start, int c, size_t bytes)
- return check_bytes8(start, value, bytes);
-
- value64 = value;
--#if defined(ARCH_HAS_FAST_MULTIPLIER) && BITS_PER_LONG == 64
-+#if defined(CONFIG_ARCH_HAS_FAST_MULTIPLIER) && BITS_PER_LONG == 64
- value64 *= 0x0101010101010101;
--#elif defined(ARCH_HAS_FAST_MULTIPLIER)
-+#elif defined(CONFIG_ARCH_HAS_FAST_MULTIPLIER)
- value64 *= 0x01010101;
- value64 |= value64 << 32;
- #else
diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
index bb2b201..46abaf9 100644
--- a/lib/strncpy_from_user.c
@@ -95858,10 +95315,10 @@ index a28df52..3d55877 100644
unsigned long c;
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
-index b604b83..c0547f6 100644
+index 4abda07..b9d3765 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
-@@ -674,7 +674,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
+@@ -682,7 +682,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
void
swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
@@ -95885,7 +95342,7 @@ index 4f5b1dd..7cab418 100644
+}
+EXPORT_SYMBOL(copy_to_user_overflow);
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
-index 185b6d3..823c48c 100644
+index ec337f6..8484eb2 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -16,6 +16,9 @@
@@ -95898,7 +95355,16 @@ index 185b6d3..823c48c 100644
#include <stdarg.h>
#include <linux/module.h> /* for KSYM_SYMBOL_LEN */
#include <linux/types.h>
-@@ -1179,7 +1182,11 @@ char *address_val(char *buf, char *end, const void *addr,
+@@ -625,7 +628,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
+ #ifdef CONFIG_KALLSYMS
+ if (*fmt == 'B')
+ sprint_backtrace(sym, value);
+- else if (*fmt != 'f' && *fmt != 's')
++ else if (*fmt != 'f' && *fmt != 's' && *fmt != 'X')
+ sprint_symbol(sym, value);
+ else
+ sprint_symbol_no_offset(sym, value);
+@@ -1240,7 +1243,11 @@ char *address_val(char *buf, char *end, const void *addr,
return number(buf, end, num, spec);
}
@@ -95910,15 +95376,18 @@ index 185b6d3..823c48c 100644
/*
* Show a '%p' thing. A kernel extension is that the '%p' is followed
-@@ -1192,6 +1199,7 @@ int kptr_restrict __read_mostly;
+@@ -1251,8 +1258,10 @@ int kptr_restrict __read_mostly;
+ *
+ * - 'F' For symbolic function descriptor pointers with offset
* - 'f' For simple symbolic function names without offset
++ * - 'X' For simple symbolic function names without offset approved for use with GRKERNSEC_HIDESYM
* - 'S' For symbolic direct pointers with offset
* - 's' For symbolic direct pointers without offset
+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
* - '[FfSs]R' as above with __builtin_extract_return_addr() translation
* - 'B' For backtraced symbolic direct pointers with offset
* - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
-@@ -1259,12 +1267,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+@@ -1331,12 +1340,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
if (!ptr && *fmt != 'K') {
/*
@@ -95933,7 +95402,7 @@ index 185b6d3..823c48c 100644
}
switch (*fmt) {
-@@ -1274,6 +1282,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+@@ -1346,6 +1355,14 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
/* Fallthrough */
case 'S':
case 's':
@@ -95942,11 +95411,13 @@ index 185b6d3..823c48c 100644
+#else
+ return symbol_string(buf, end, ptr, spec, fmt);
+#endif
++ case 'X':
++ ptr = dereference_function_descriptor(ptr);
+ case 'A':
case 'B':
return symbol_string(buf, end, ptr, spec, fmt);
case 'R':
-@@ -1329,6 +1343,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+@@ -1403,6 +1420,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
va_end(va);
return buf;
}
@@ -95955,7 +95426,7 @@ index 185b6d3..823c48c 100644
case 'K':
/*
* %pK cannot be used in IRQ context because its test
-@@ -1386,6 +1402,21 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+@@ -1460,6 +1479,22 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
((const struct file *)ptr)->f_path.dentry,
spec, fmt);
}
@@ -95964,10 +95435,11 @@ index 185b6d3..823c48c 100644
+ /* 'P' = approved pointers to copy to userland,
+ as in the /proc/kallsyms case, as we make it display nothing
+ for non-root users, and the real contents for root users
++ 'X' = approved simple symbols
+ Also ignore 'K' pointers, since we force their NULLing for non-root users
+ above
+ */
-+ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'K' && is_usercopy_object(buf)) {
++ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'X' && *fmt != 'K' && is_usercopy_object(buf)) {
+ printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
+ dump_stack();
+ ptr = NULL;
@@ -95977,7 +95449,7 @@ index 185b6d3..823c48c 100644
spec.flags |= SMALL;
if (spec.field_width == -1) {
spec.field_width = default_width;
-@@ -2107,11 +2138,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
+@@ -2160,11 +2195,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
typeof(type) value; \
if (sizeof(type) == 8) { \
args = PTR_ALIGN(args, sizeof(u32)); \
@@ -95992,7 +95464,7 @@ index 185b6d3..823c48c 100644
} \
args += sizeof(type); \
value; \
-@@ -2174,7 +2205,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
+@@ -2227,7 +2262,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
case FORMAT_TYPE_STR: {
const char *str_arg = args;
args += strlen(str_arg) + 1;
@@ -96009,10 +95481,10 @@ index 0000000..7cd6065
@@ -0,0 +1 @@
+-grsec
diff --git a/mm/Kconfig b/mm/Kconfig
-index 0862816..2e3a043 100644
+index 1d1ae6b..0f05885 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
-@@ -329,10 +329,11 @@ config KSM
+@@ -341,10 +341,11 @@ config KSM
root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
config DEFAULT_MMAP_MIN_ADDR
@@ -96027,7 +95499,7 @@ index 0862816..2e3a043 100644
This is the portion of low virtual memory which should be protected
from userspace allocation. Keeping a user from writing to low pages
can help reduce the impact of kernel NULL pointer bugs.
-@@ -363,7 +364,7 @@ config MEMORY_FAILURE
+@@ -375,7 +376,7 @@ config MEMORY_FAILURE
config HWPOISON_INJECT
tristate "HWPoison pages injector"
@@ -96037,7 +95509,7 @@ index 0862816..2e3a043 100644
config NOMMU_INITIAL_TRIM_EXCESS
diff --git a/mm/backing-dev.c b/mm/backing-dev.c
-index 09d9591..165bb75 100644
+index 0ae0df5..82ac56b 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -12,7 +12,7 @@
@@ -96049,7 +95521,7 @@ index 09d9591..165bb75 100644
struct backing_dev_info default_backing_dev_info = {
.name = "default",
-@@ -533,7 +533,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
+@@ -525,7 +525,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
return err;
err = bdi_register(bdi, NULL, "%.28s-%ld", name,
@@ -96059,10 +95531,10 @@ index 09d9591..165bb75 100644
bdi_destroy(bdi);
return err;
diff --git a/mm/filemap.c b/mm/filemap.c
-index 217cfd3..6257351 100644
+index 37beab9..2c55a85 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
-@@ -1972,7 +1972,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
+@@ -2097,7 +2097,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
struct address_space *mapping = file->f_mapping;
if (!mapping->a_ops->readpage)
@@ -96071,43 +95543,7 @@ index 217cfd3..6257351 100644
file_accessed(file);
vma->vm_ops = &generic_file_vm_ops;
return 0;
-@@ -2136,7 +2136,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr,
-
- while (bytes) {
- char __user *buf = iov->iov_base + base;
-- int copy = min(bytes, iov->iov_len - base);
-+ size_t copy = min(bytes, iov->iov_len - base);
-
- base = 0;
- left = __copy_from_user_inatomic(vaddr, buf, copy);
-@@ -2164,7 +2164,7 @@ size_t iov_iter_copy_from_user_atomic(struct page *page,
-
- kaddr = kmap_atomic(page);
- if (likely(i->nr_segs == 1)) {
-- int left;
-+ size_t left;
- char __user *buf = i->iov->iov_base + i->iov_offset;
- left = __copy_from_user_inatomic(kaddr + offset, buf, bytes);
- copied = bytes - left;
-@@ -2192,7 +2192,7 @@ size_t iov_iter_copy_from_user(struct page *page,
-
- kaddr = kmap(page);
- if (likely(i->nr_segs == 1)) {
-- int left;
-+ size_t left;
- char __user *buf = i->iov->iov_base + i->iov_offset;
- left = __copy_from_user(kaddr + offset, buf, bytes);
- copied = bytes - left;
-@@ -2222,7 +2222,7 @@ void iov_iter_advance(struct iov_iter *i, size_t bytes)
- * zero-length segments (without overruning the iovec).
- */
- while (bytes || unlikely(i->count && !iov->iov_len)) {
-- int copy;
-+ size_t copy;
-
- copy = min(bytes, iov->iov_len - base);
- BUG_ON(!i->count || i->count < copy);
-@@ -2293,6 +2293,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
+@@ -2275,6 +2275,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
*pos = i_size_read(inode);
if (limit != RLIM_INFINITY) {
@@ -96116,10 +95552,10 @@ index 217cfd3..6257351 100644
send_sig(SIGXFSZ, current, 0);
return -EFBIG;
diff --git a/mm/fremap.c b/mm/fremap.c
-index 34feba6..315fe78 100644
+index 72b8fa3..c5b39f1 100644
--- a/mm/fremap.c
+++ b/mm/fremap.c
-@@ -179,6 +179,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -180,6 +180,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
retry:
vma = find_vma(mm, start);
@@ -96131,11 +95567,62 @@ index 34feba6..315fe78 100644
/*
* Make sure the vma is shared, that it supports prefaulting,
* and that the remapped range is valid and fully within
+diff --git a/mm/gup.c b/mm/gup.c
+index a0d57ec..79d469ce 100644
+--- a/mm/gup.c
++++ b/mm/gup.c
+@@ -274,11 +274,6 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
+ unsigned int fault_flags = 0;
+ int ret;
+
+- /* For mlock, just skip the stack guard page. */
+- if ((*flags & FOLL_MLOCK) &&
+- (stack_guard_page_start(vma, address) ||
+- stack_guard_page_end(vma, address + PAGE_SIZE)))
+- return -ENOENT;
+ if (*flags & FOLL_WRITE)
+ fault_flags |= FAULT_FLAG_WRITE;
+ if (nonblocking)
+@@ -444,14 +439,14 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
+ if (!(gup_flags & FOLL_FORCE))
+ gup_flags |= FOLL_NUMA;
+
+- do {
++ while (nr_pages) {
+ struct page *page;
+ unsigned int foll_flags = gup_flags;
+ unsigned int page_increm;
+
+ /* first iteration or cross vma bound */
+ if (!vma || start >= vma->vm_end) {
+- vma = find_extend_vma(mm, start);
++ vma = find_vma(mm, start);
+ if (!vma && in_gate_area(mm, start)) {
+ int ret;
+ ret = get_gate_page(mm, start & PAGE_MASK,
+@@ -463,7 +458,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
+ goto next_page;
+ }
+
+- if (!vma || check_vma_flags(vma, gup_flags))
++ if (!vma || start < vma->vm_start || check_vma_flags(vma, gup_flags))
+ return i ? : -EFAULT;
+ if (is_vm_hugetlb_page(vma)) {
+ i = follow_hugetlb_page(mm, vma, pages, vmas,
+@@ -518,7 +513,7 @@ next_page:
+ i += page_increm;
+ start += page_increm * PAGE_SIZE;
+ nr_pages -= page_increm;
+- } while (nr_pages);
++ }
+ return i;
+ }
+ EXPORT_SYMBOL(__get_user_pages);
diff --git a/mm/highmem.c b/mm/highmem.c
-index b32b70c..e512eb0 100644
+index 123bcd3..0de52ba 100644
--- a/mm/highmem.c
+++ b/mm/highmem.c
-@@ -138,8 +138,9 @@ static void flush_all_zero_pkmaps(void)
+@@ -195,8 +195,9 @@ static void flush_all_zero_pkmaps(void)
* So no dangers, even with speculative execution.
*/
page = pte_page(pkmap_page_table[i]);
@@ -96146,7 +95633,7 @@ index b32b70c..e512eb0 100644
set_page_address(page, NULL);
need_flush = 1;
}
-@@ -198,9 +199,11 @@ start:
+@@ -259,9 +260,11 @@ start:
}
}
vaddr = PKMAP_ADDR(last_pkmap_nr);
@@ -96160,32 +95647,32 @@ index b32b70c..e512eb0 100644
set_page_address(page, (void *)vaddr);
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
-index 67d0c17..b22c193 100644
+index 9fd7227..5628939 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
-@@ -2070,6 +2070,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
+@@ -2258,6 +2258,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
+ struct ctl_table *table, int write,
+ void __user *buffer, size_t *length, loff_t *ppos)
+ {
++ ctl_table_no_const t;
struct hstate *h = &default_hstate;
- unsigned long tmp;
+ unsigned long tmp = h->max_huge_pages;
int ret;
-+ ctl_table_no_const hugetlb_table;
-
+@@ -2265,9 +2266,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
if (!hugepages_supported())
return -ENOTSUPP;
-@@ -2079,9 +2080,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
- if (write && h->order >= MAX_ORDER)
- return -EINVAL;
- table->data = &tmp;
- table->maxlen = sizeof(unsigned long);
- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
-+ hugetlb_table = *table;
-+ hugetlb_table.data = &tmp;
-+ hugetlb_table.maxlen = sizeof(unsigned long);
-+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
++ t = *table;
++ t.data = &tmp;
++ t.maxlen = sizeof(unsigned long);
++ ret = proc_doulongvec_minmax(&t, write, buffer, length, ppos);
if (ret)
goto out;
-@@ -2126,6 +2128,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
+@@ -2302,6 +2304,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
struct hstate *h = &default_hstate;
unsigned long tmp;
int ret;
@@ -96193,8 +95680,8 @@ index 67d0c17..b22c193 100644
if (!hugepages_supported())
return -ENOTSUPP;
-@@ -2135,9 +2138,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
- if (write && h->order >= MAX_ORDER)
+@@ -2311,9 +2314,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
+ if (write && hstate_is_gigantic(h))
return -EINVAL;
- table->data = &tmp;
@@ -96207,8 +95694,8 @@ index 67d0c17..b22c193 100644
if (ret)
goto out;
-@@ -2629,6 +2633,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
- return 1;
+@@ -2792,6 +2796,27 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
+ mutex_unlock(&mapping->i_mmap_mutex);
}
+#ifdef CONFIG_PAX_SEGMEXEC
@@ -96235,7 +95722,7 @@ index 67d0c17..b22c193 100644
/*
* Hugetlb_cow() should be called with page lock of the original hugepage held.
* Called with hugetlb_instantiation_mutex held and pte_page locked so we
-@@ -2745,6 +2770,11 @@ retry_avoidcopy:
+@@ -2903,6 +2928,11 @@ retry_avoidcopy:
make_huge_pte(vma, new_page, 1));
page_remove_rmap(old_page);
hugepage_add_new_anon_rmap(new_page, vma, address);
@@ -96247,7 +95734,7 @@ index 67d0c17..b22c193 100644
/* Make the old page be freed below */
new_page = old_page;
}
-@@ -2909,6 +2939,10 @@ retry:
+@@ -3063,6 +3093,10 @@ retry:
&& (vma->vm_flags & VM_SHARED)));
set_huge_pte_at(mm, address, ptep, new_pte);
@@ -96258,9 +95745,9 @@ index 67d0c17..b22c193 100644
if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
/* Optimization, do the COW without a second fault */
ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
-@@ -2939,6 +2973,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
- static DEFINE_MUTEX(hugetlb_instantiation_mutex);
+@@ -3129,6 +3163,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
struct hstate *h = hstate_vma(vma);
+ struct address_space *mapping;
+#ifdef CONFIG_PAX_SEGMEXEC
+ struct vm_area_struct *vma_m;
@@ -96269,7 +95756,7 @@ index 67d0c17..b22c193 100644
address &= huge_page_mask(h);
ptep = huge_pte_offset(mm, address);
-@@ -2952,6 +2990,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3142,6 +3180,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
VM_FAULT_SET_HINDEX(hstate_index(h));
}
@@ -96297,18 +95784,18 @@ index 67d0c17..b22c193 100644
if (!ptep)
return VM_FAULT_OOM;
diff --git a/mm/internal.h b/mm/internal.h
-index 1a8a0d4..2c580ef 100644
+index a4f90ba..fbdc32b 100644
--- a/mm/internal.h
+++ b/mm/internal.h
-@@ -109,6 +109,7 @@ extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address);
- * in mm/page_alloc.c
- */
+@@ -134,6 +134,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
+
+ extern int __isolate_free_page(struct page *page, unsigned int order);
extern void __free_pages_bootmem(struct page *page, unsigned int order);
+extern void free_compound_page(struct page *page);
extern void prep_compound_page(struct page *page, unsigned long order);
#ifdef CONFIG_MEMORY_FAILURE
extern bool is_free_buddy_page(struct page *page);
-@@ -370,7 +371,7 @@ extern u32 hwpoison_filter_enable;
+@@ -390,7 +391,7 @@ extern u32 hwpoison_filter_enable;
extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
unsigned long, unsigned long,
@@ -96317,11 +95804,42 @@ index 1a8a0d4..2c580ef 100644
extern void set_pageblock_order(void);
unsigned long reclaim_clean_pages_from_list(struct zone *zone,
+diff --git a/mm/iov_iter.c b/mm/iov_iter.c
+index e34a3cb..a810efe 100644
+--- a/mm/iov_iter.c
++++ b/mm/iov_iter.c
+@@ -307,7 +307,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr,
+
+ while (bytes) {
+ char __user *buf = iov->iov_base + base;
+- int copy = min(bytes, iov->iov_len - base);
++ size_t copy = min(bytes, iov->iov_len - base);
+
+ base = 0;
+ left = __copy_from_user_inatomic(vaddr, buf, copy);
+@@ -335,7 +335,7 @@ static size_t copy_from_user_atomic_iovec(struct page *page,
+
+ kaddr = kmap_atomic(page);
+ if (likely(i->nr_segs == 1)) {
+- int left;
++ size_t left;
+ char __user *buf = i->iov->iov_base + i->iov_offset;
+ left = __copy_from_user_inatomic(kaddr + offset, buf, bytes);
+ copied = bytes - left;
+@@ -365,7 +365,7 @@ static void advance_iovec(struct iov_iter *i, size_t bytes)
+ * zero-length segments (without overruning the iovec).
+ */
+ while (bytes || unlikely(i->count && !iov->iov_len)) {
+- int copy;
++ size_t copy;
+
+ copy = min(bytes, iov->iov_len - base);
+ BUG_ON(!i->count || i->count < copy);
diff --git a/mm/kmemleak.c b/mm/kmemleak.c
-index 31f01c5..7015178 100644
+index 3cda50c..032ba634 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
-@@ -363,7 +363,7 @@ static void print_unreferenced(struct seq_file *seq,
+@@ -364,7 +364,7 @@ static void print_unreferenced(struct seq_file *seq,
for (i = 0; i < object->trace_len; i++) {
void *ptr = (void *)object->trace[i];
@@ -96330,7 +95848,7 @@ index 31f01c5..7015178 100644
}
}
-@@ -1853,7 +1853,7 @@ static int __init kmemleak_late_init(void)
+@@ -1905,7 +1905,7 @@ static int __init kmemleak_late_init(void)
return -ENOMEM;
}
@@ -96362,7 +95880,7 @@ index d53adf9..03a24bf 100644
set_fs(old_fs);
diff --git a/mm/madvise.c b/mm/madvise.c
-index a402f8f..f5e5daa 100644
+index 0938b30..199abe8 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
@@ -96424,7 +95942,7 @@ index a402f8f..f5e5daa 100644
return 0;
}
-@@ -491,6 +522,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
+@@ -488,6 +519,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
if (end < start)
return error;
@@ -96442,7 +95960,7 @@ index a402f8f..f5e5daa 100644
if (end == start)
return error;
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
-index a98c7fc..393f8f1 100644
+index 8639f6b..b623882a 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
@@ -96454,7 +95972,7 @@ index a98c7fc..393f8f1 100644
#if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
-@@ -202,7 +202,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
+@@ -198,7 +198,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
pfn, t->comm, t->pid);
si.si_signo = SIGBUS;
si.si_errno = 0;
@@ -96463,7 +95981,7 @@ index a98c7fc..393f8f1 100644
#ifdef __ARCH_SI_TRAPNO
si.si_trapno = trapno;
#endif
-@@ -795,7 +795,7 @@ static struct page_state {
+@@ -791,7 +791,7 @@ static struct page_state {
unsigned long res;
char *msg;
int (*action)(struct page *p, unsigned long pfn);
@@ -96472,7 +95990,7 @@ index a98c7fc..393f8f1 100644
{ reserved, reserved, "reserved kernel", me_kernel },
/*
* free pages are specially detected outside this table:
-@@ -1095,7 +1095,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
+@@ -1099,7 +1099,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
nr_pages = 1 << compound_order(hpage);
else /* normal page or thp */
nr_pages = 1;
@@ -96481,7 +95999,7 @@ index a98c7fc..393f8f1 100644
/*
* We need/can do nothing about count=0 pages.
-@@ -1124,7 +1124,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
+@@ -1128,7 +1128,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
if (PageHWPoison(hpage)) {
if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
|| (p != hpage && TestSetPageHWPoison(hpage))) {
@@ -96490,7 +96008,7 @@ index a98c7fc..393f8f1 100644
unlock_page(hpage);
return 0;
}
-@@ -1190,14 +1190,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
+@@ -1196,14 +1196,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
*/
if (!PageHWPoison(p)) {
printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
@@ -96507,7 +96025,7 @@ index a98c7fc..393f8f1 100644
unlock_page(hpage);
put_page(hpage);
return 0;
-@@ -1419,7 +1419,7 @@ int unpoison_memory(unsigned long pfn)
+@@ -1433,7 +1433,7 @@ int unpoison_memory(unsigned long pfn)
return 0;
}
if (TestClearPageHWPoison(p))
@@ -96516,7 +96034,7 @@ index a98c7fc..393f8f1 100644
pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
return 0;
}
-@@ -1433,7 +1433,7 @@ int unpoison_memory(unsigned long pfn)
+@@ -1447,7 +1447,7 @@ int unpoison_memory(unsigned long pfn)
*/
if (TestClearPageHWPoison(page)) {
pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
@@ -96525,7 +96043,7 @@ index a98c7fc..393f8f1 100644
freeit = 1;
if (PageHuge(page))
clear_page_hwpoison_huge_page(page);
-@@ -1558,11 +1558,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
+@@ -1572,11 +1572,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
if (PageHuge(page)) {
set_page_hwpoison_huge_page(hpage);
dequeue_hwpoisoned_huge_page(hpage);
@@ -96539,7 +96057,7 @@ index a98c7fc..393f8f1 100644
}
}
return ret;
-@@ -1601,7 +1601,7 @@ static int __soft_offline_page(struct page *page, int flags)
+@@ -1615,7 +1615,7 @@ static int __soft_offline_page(struct page *page, int flags)
put_page(page);
pr_info("soft_offline: %#lx: invalidated\n", pfn);
SetPageHWPoison(page);
@@ -96548,7 +96066,7 @@ index a98c7fc..393f8f1 100644
return 0;
}
-@@ -1652,7 +1652,7 @@ static int __soft_offline_page(struct page *page, int flags)
+@@ -1666,7 +1666,7 @@ static int __soft_offline_page(struct page *page, int flags)
if (!is_free_buddy_page(page))
pr_info("soft offline: %#lx: page leaked\n",
pfn);
@@ -96557,7 +96075,7 @@ index a98c7fc..393f8f1 100644
}
} else {
pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
-@@ -1726,11 +1726,11 @@ int soft_offline_page(struct page *page, int flags)
+@@ -1736,11 +1736,11 @@ int soft_offline_page(struct page *page, int flags)
if (PageHuge(page)) {
set_page_hwpoison_huge_page(hpage);
dequeue_hwpoisoned_huge_page(hpage);
@@ -96572,10 +96090,10 @@ index a98c7fc..393f8f1 100644
}
unset_migratetype_isolate(page, MIGRATE_MOVABLE);
diff --git a/mm/memory.c b/mm/memory.c
-index 7f30bea..67cb92b 100644
+index d442584..0600e22 100644
--- a/mm/memory.c
+++ b/mm/memory.c
-@@ -403,6 +403,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
+@@ -415,6 +415,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
free_pte_range(tlb, pmd, addr);
} while (pmd++, addr = next, addr != end);
@@ -96583,7 +96101,7 @@ index 7f30bea..67cb92b 100644
start &= PUD_MASK;
if (start < floor)
return;
-@@ -417,6 +418,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
+@@ -429,6 +430,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
pmd = pmd_offset(pud, start);
pud_clear(pud);
pmd_free_tlb(tlb, pmd, start);
@@ -96592,7 +96110,7 @@ index 7f30bea..67cb92b 100644
}
static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
-@@ -436,6 +439,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
+@@ -448,6 +451,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
free_pmd_range(tlb, pud, addr, next, floor, ceiling);
} while (pud++, addr = next, addr != end);
@@ -96600,7 +96118,7 @@ index 7f30bea..67cb92b 100644
start &= PGDIR_MASK;
if (start < floor)
return;
-@@ -450,6 +454,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
+@@ -462,6 +466,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
pud = pud_offset(pgd, start);
pgd_clear(pgd);
pud_free_tlb(tlb, pud, start);
@@ -96609,7 +96127,7 @@ index 7f30bea..67cb92b 100644
}
/*
-@@ -679,10 +685,10 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
+@@ -691,10 +697,10 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
* Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
*/
if (vma->vm_ops)
@@ -96622,75 +96140,7 @@ index 7f30bea..67cb92b 100644
vma->vm_file->f_op->mmap);
dump_stack();
add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
-@@ -1137,8 +1143,10 @@ again:
- if (unlikely(page_mapcount(page) < 0))
- print_bad_pte(vma, addr, ptent, page);
- force_flush = !__tlb_remove_page(tlb, page);
-- if (force_flush)
-+ if (force_flush) {
-+ addr += PAGE_SIZE;
- break;
-+ }
- continue;
- }
- /*
-@@ -1636,12 +1644,6 @@ no_page_table:
- return page;
- }
-
--static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
--{
-- return stack_guard_page_start(vma, addr) ||
-- stack_guard_page_end(vma, addr+PAGE_SIZE);
--}
--
- /**
- * __get_user_pages() - pin user pages in memory
- * @tsk: task_struct of target task
-@@ -1728,10 +1730,10 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
-
- i = 0;
-
-- do {
-+ while (nr_pages) {
- struct vm_area_struct *vma;
-
-- vma = find_extend_vma(mm, start);
-+ vma = find_vma(mm, start);
- if (!vma && in_gate_area(mm, start)) {
- unsigned long pg = start & PAGE_MASK;
- pgd_t *pgd;
-@@ -1780,7 +1782,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
- goto next_page;
- }
-
-- if (!vma ||
-+ if (!vma || start < vma->vm_start ||
- (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
- !(vm_flags & vma->vm_flags))
- return i ? : -EFAULT;
-@@ -1809,11 +1811,6 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
- int ret;
- unsigned int fault_flags = 0;
-
-- /* For mlock, just skip the stack guard page. */
-- if (foll_flags & FOLL_MLOCK) {
-- if (stack_guard_page(vma, start))
-- goto next_page;
-- }
- if (foll_flags & FOLL_WRITE)
- fault_flags |= FAULT_FLAG_WRITE;
- if (nonblocking)
-@@ -1893,7 +1890,7 @@ next_page:
- start += page_increm * PAGE_SIZE;
- nr_pages -= page_increm;
- } while (nr_pages && start < vma->vm_end);
-- } while (nr_pages);
-+ }
- return i;
- }
- EXPORT_SYMBOL(__get_user_pages);
-@@ -2105,6 +2102,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
+@@ -1501,6 +1507,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
page_add_file_rmap(page);
set_pte_at(mm, addr, pte, mk_pte(page, prot));
@@ -96701,7 +96151,7 @@ index 7f30bea..67cb92b 100644
retval = 0;
pte_unmap_unlock(pte, ptl);
return retval;
-@@ -2149,9 +2150,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
+@@ -1545,9 +1555,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
if (!page_count(page))
return -EINVAL;
if (!(vma->vm_flags & VM_MIXEDMAP)) {
@@ -96723,7 +96173,7 @@ index 7f30bea..67cb92b 100644
}
return insert_page(vma, addr, page, vma->vm_page_prot);
}
-@@ -2234,6 +2247,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
+@@ -1630,6 +1652,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
unsigned long pfn)
{
BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
@@ -96731,7 +96181,7 @@ index 7f30bea..67cb92b 100644
if (addr < vma->vm_start || addr >= vma->vm_end)
return -EFAULT;
-@@ -2481,7 +2495,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
+@@ -1877,7 +1900,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
BUG_ON(pud_huge(*pud));
@@ -96742,7 +96192,7 @@ index 7f30bea..67cb92b 100644
if (!pmd)
return -ENOMEM;
do {
-@@ -2501,7 +2517,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
+@@ -1897,7 +1922,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
unsigned long next;
int err;
@@ -96753,8 +96203,8 @@ index 7f30bea..67cb92b 100644
if (!pud)
return -ENOMEM;
do {
-@@ -2591,6 +2609,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
- copy_user_highpage(dst, src, va, vma);
+@@ -2019,6 +2046,186 @@ static int do_page_mkwrite(struct vm_area_struct *vma, struct page *page,
+ return ret;
}
+#ifdef CONFIG_PAX_SEGMEXEC
@@ -96918,7 +96368,7 @@ index 7f30bea..67cb92b 100644
+ entry = *pte;
+ page_m = vm_normal_page(vma, address, entry);
+ if (!page_m)
-+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
++ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
+ else if (PageAnon(page_m)) {
+ if (pax_find_mirror_vma(vma)) {
+ pte_unmap_unlock(pte, ptl);
@@ -96940,7 +96390,7 @@ index 7f30bea..67cb92b 100644
/*
* This routine handles present pages, when users try to write
* to a shared page. It is done by copying the page to a new address
-@@ -2815,6 +3013,12 @@ gotten:
+@@ -2225,6 +2432,12 @@ gotten:
*/
page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
if (likely(pte_same(*page_table, orig_pte))) {
@@ -96953,7 +96403,7 @@ index 7f30bea..67cb92b 100644
if (old_page) {
if (!PageAnon(old_page)) {
dec_mm_counter_fast(mm, MM_FILEPAGES);
-@@ -2866,6 +3070,10 @@ gotten:
+@@ -2278,6 +2491,10 @@ gotten:
page_remove_rmap(old_page);
}
@@ -96964,7 +96414,7 @@ index 7f30bea..67cb92b 100644
/* Free the old page.. */
new_page = old_page;
ret |= VM_FAULT_WRITE;
-@@ -3143,6 +3351,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2552,6 +2769,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
swap_free(entry);
if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
try_to_free_swap(page);
@@ -96976,7 +96426,7 @@ index 7f30bea..67cb92b 100644
unlock_page(page);
if (page != swapcache) {
/*
-@@ -3166,6 +3379,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2575,6 +2797,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
/* No need to invalidate - it was non-present before */
update_mmu_cache(vma, address, page_table);
@@ -96988,7 +96438,7 @@ index 7f30bea..67cb92b 100644
unlock:
pte_unmap_unlock(page_table, ptl);
out:
-@@ -3185,40 +3403,6 @@ out_release:
+@@ -2594,40 +2821,6 @@ out_release:
}
/*
@@ -97029,10 +96479,10 @@ index 7f30bea..67cb92b 100644
* We enter with non-exclusive mmap_sem (to exclude vma changes,
* but allow concurrent faults), and pte mapped but not yet locked.
* We return with mmap_sem still held, but pte unmapped and unlocked.
-@@ -3227,27 +3411,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
- unsigned long address, pte_t *page_table, pmd_t *pmd,
+@@ -2637,27 +2830,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
unsigned int flags)
{
+ struct mem_cgroup *memcg;
- struct page *page;
+ struct page *page = NULL;
spinlock_t *ptl;
@@ -97042,7 +96492,7 @@ index 7f30bea..67cb92b 100644
-
- /* Check if we need to add a guard page to the stack */
- if (check_stack_guard_page(vma, address) < 0)
-- return VM_FAULT_SIGBUS;
+- return VM_FAULT_SIGSEGV;
-
- /* Use the zero-page for reads */
if (!(flags & FAULT_FLAG_WRITE)) {
@@ -97062,7 +96512,7 @@ index 7f30bea..67cb92b 100644
if (unlikely(anon_vma_prepare(vma)))
goto oom;
page = alloc_zeroed_user_highpage_movable(vma, address);
-@@ -3271,6 +3451,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2681,6 +2870,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
if (!pte_none(*page_table))
goto release;
@@ -97073,8 +96523,8 @@ index 7f30bea..67cb92b 100644
+
inc_mm_counter_fast(mm, MM_ANONPAGES);
page_add_new_anon_rmap(page, vma, address);
- setpte:
-@@ -3278,6 +3463,12 @@ setpte:
+ mem_cgroup_commit_charge(page, memcg, false);
+@@ -2690,6 +2884,12 @@ setpte:
/* No need to invalidate - it was non-present before */
update_mmu_cache(vma, address, page_table);
@@ -97087,35 +96537,50 @@ index 7f30bea..67cb92b 100644
unlock:
pte_unmap_unlock(page_table, ptl);
return 0;
-@@ -3422,6 +3613,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
- */
- /* Only go through if we didn't race with anybody else... */
- if (likely(pte_same(*page_table, orig_pte))) {
+@@ -2920,6 +3120,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+ return ret;
+ }
+ do_set_pte(vma, address, fault_page, pte, false, false);
+
+#ifdef CONFIG_PAX_SEGMEXEC
-+ if (anon && pax_find_mirror_vma(vma))
-+ BUG_ON(!trylock_page(page));
++ pax_mirror_file_pte(vma, address, fault_page, ptl);
+#endif
+
- flush_icache_page(vma, page);
- entry = mk_pte(page, vma->vm_page_prot);
- if (flags & FAULT_FLAG_WRITE)
-@@ -3443,6 +3640,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
-
- /* no need to invalidate: a not-present page won't be cached */
- update_mmu_cache(vma, address, page_table);
+ unlock_page(fault_page);
+ unlock_out:
+ pte_unmap_unlock(pte, ptl);
+@@ -2962,7 +3167,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+ page_cache_release(fault_page);
+ goto uncharge_out;
+ }
+
+#ifdef CONFIG_PAX_SEGMEXEC
-+ if (anon)
-+ pax_mirror_anon_pte(vma, address, page, ptl);
-+ else
-+ pax_mirror_file_pte(vma, address, page, ptl);
++ if (pax_find_mirror_vma(vma))
++ BUG_ON(!trylock_page(new_page));
+#endif
+
- } else {
- if (cow_page)
- mem_cgroup_uncharge_page(cow_page);
-@@ -3690,6 +3895,12 @@ static int handle_pte_fault(struct mm_struct *mm,
+ do_set_pte(vma, address, new_page, pte, true, true);
++
++#ifdef CONFIG_PAX_SEGMEXEC
++ pax_mirror_anon_pte(vma, address, new_page, ptl);
++#endif
++
+ mem_cgroup_commit_charge(new_page, memcg, false);
+ lru_cache_add_active_or_unevictable(new_page, vma);
+ pte_unmap_unlock(pte, ptl);
+@@ -3012,6 +3228,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+ return ret;
+ }
+ do_set_pte(vma, address, fault_page, pte, true, false);
++
++#ifdef CONFIG_PAX_SEGMEXEC
++ pax_mirror_file_pte(vma, address, fault_page, ptl);
++#endif
++
+ pte_unmap_unlock(pte, ptl);
+
+ if (set_page_dirty(fault_page))
+@@ -3253,6 +3474,12 @@ static int handle_pte_fault(struct mm_struct *mm,
if (flags & FAULT_FLAG_WRITE)
flush_tlb_fix_spurious_fault(vma, address);
}
@@ -97128,7 +96593,7 @@ index 7f30bea..67cb92b 100644
unlock:
pte_unmap_unlock(pte, ptl);
return 0;
-@@ -3706,9 +3917,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3272,9 +3499,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
pmd_t *pmd;
pte_t *pte;
@@ -97170,7 +96635,7 @@ index 7f30bea..67cb92b 100644
pgd = pgd_offset(mm, address);
pud = pud_alloc(mm, pgd, address);
if (!pud)
-@@ -3836,6 +4079,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
+@@ -3408,6 +3667,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
spin_unlock(&mm->page_table_lock);
return 0;
}
@@ -97194,7 +96659,7 @@ index 7f30bea..67cb92b 100644
#endif /* __PAGETABLE_PUD_FOLDED */
#ifndef __PAGETABLE_PMD_FOLDED
-@@ -3866,6 +4126,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
+@@ -3438,6 +3714,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
spin_unlock(&mm->page_table_lock);
return 0;
}
@@ -97224,17 +96689,8 @@ index 7f30bea..67cb92b 100644
+}
#endif /* __PAGETABLE_PMD_FOLDED */
- #if !defined(__HAVE_ARCH_GATE_AREA)
-@@ -3879,7 +4163,7 @@ static int __init gate_vma_init(void)
- gate_vma.vm_start = FIXADDR_USER_START;
- gate_vma.vm_end = FIXADDR_USER_END;
- gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
-- gate_vma.vm_page_prot = __P101;
-+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
-
- return 0;
- }
-@@ -4013,8 +4297,8 @@ out:
+ static int __follow_pte(struct mm_struct *mm, unsigned long address,
+@@ -3547,8 +3847,8 @@ out:
return ret;
}
@@ -97245,7 +96701,7 @@ index 7f30bea..67cb92b 100644
{
resource_size_t phys_addr;
unsigned long prot = 0;
-@@ -4040,8 +4324,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
+@@ -3574,8 +3874,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
* Access another process' address space as given in mm. If non-NULL, use the
* given task for page fault accounting.
*/
@@ -97256,7 +96712,7 @@ index 7f30bea..67cb92b 100644
{
struct vm_area_struct *vma;
void *old_buf = buf;
-@@ -4049,7 +4333,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
+@@ -3583,7 +3883,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
down_read(&mm->mmap_sem);
/* ignore errors, just check how much was successfully transferred */
while (len) {
@@ -97265,7 +96721,7 @@ index 7f30bea..67cb92b 100644
void *maddr;
struct page *page = NULL;
-@@ -4108,8 +4392,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
+@@ -3644,8 +3944,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
*
* The caller must hold a reference on @mm.
*/
@@ -97276,7 +96732,7 @@ index 7f30bea..67cb92b 100644
{
return __access_remote_vm(NULL, mm, addr, buf, len, write);
}
-@@ -4119,11 +4403,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
+@@ -3655,11 +3955,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
* Source/target buffer must be kernel space,
* Do not walk the page table directly, use get_user_pages
*/
@@ -97292,10 +96748,10 @@ index 7f30bea..67cb92b 100644
mm = get_task_mm(tsk);
if (!mm)
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
-index e8fff0f..8d10fb5 100644
+index e58725a..e0be017 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
-@@ -747,6 +747,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
+@@ -750,6 +750,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
unsigned long vmstart;
unsigned long vmend;
@@ -97306,7 +96762,7 @@ index e8fff0f..8d10fb5 100644
vma = find_vma(mm, start);
if (!vma || vma->vm_start > start)
return -EFAULT;
-@@ -790,6 +794,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
+@@ -793,6 +797,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
err = vma_replace_policy(vma, new_pol);
if (err)
goto out;
@@ -97323,7 +96779,7 @@ index e8fff0f..8d10fb5 100644
}
out:
-@@ -1253,6 +1267,17 @@ static long do_mbind(unsigned long start, unsigned long len,
+@@ -1212,6 +1226,17 @@ static long do_mbind(unsigned long start, unsigned long len,
if (end < start)
return -EINVAL;
@@ -97341,7 +96797,7 @@ index e8fff0f..8d10fb5 100644
if (end == start)
return 0;
-@@ -1478,8 +1503,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
+@@ -1437,8 +1462,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
*/
tcred = __task_cred(task);
if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
@@ -97351,7 +96807,7 @@ index e8fff0f..8d10fb5 100644
rcu_read_unlock();
err = -EPERM;
goto out_put;
-@@ -1510,6 +1534,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
+@@ -1469,6 +1493,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
goto out;
}
@@ -97368,10 +96824,10 @@ index e8fff0f..8d10fb5 100644
capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
diff --git a/mm/migrate.c b/mm/migrate.c
-index 3acac4a..a186f71 100644
+index 0143995..b294728 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
-@@ -1511,8 +1511,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
+@@ -1495,8 +1495,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
*/
tcred = __task_cred(task);
if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
@@ -97382,7 +96838,7 @@ index 3acac4a..a186f71 100644
err = -EPERM;
goto out;
diff --git a/mm/mlock.c b/mm/mlock.c
-index b1eb536..091d154 100644
+index 73cf098..ab547c7 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -14,6 +14,7 @@
@@ -97393,7 +96849,7 @@ index b1eb536..091d154 100644
#include <linux/sched.h>
#include <linux/export.h>
#include <linux/rmap.h>
-@@ -606,7 +607,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
+@@ -613,7 +614,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
{
unsigned long nstart, end, tmp;
struct vm_area_struct * vma, * prev;
@@ -97402,7 +96858,7 @@ index b1eb536..091d154 100644
VM_BUG_ON(start & ~PAGE_MASK);
VM_BUG_ON(len != PAGE_ALIGN(len));
-@@ -615,6 +616,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
+@@ -622,6 +623,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
return -EINVAL;
if (end == start)
return 0;
@@ -97412,7 +96868,7 @@ index b1eb536..091d154 100644
vma = find_vma(current->mm, start);
if (!vma || vma->vm_start > start)
return -ENOMEM;
-@@ -626,6 +630,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
+@@ -633,6 +637,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
for (nstart = start ; ; ) {
vm_flags_t newflags;
@@ -97424,7 +96880,7 @@ index b1eb536..091d154 100644
/* Here we know that vma->vm_start <= nstart < vma->vm_end. */
newflags = vma->vm_flags & ~VM_LOCKED;
-@@ -739,6 +748,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
+@@ -746,6 +755,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
locked += current->mm->locked_vm;
/* check against resource limits */
@@ -97432,7 +96888,7 @@ index b1eb536..091d154 100644
if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
error = do_mlock(start, len, 1);
-@@ -776,6 +786,11 @@ static int do_mlockall(int flags)
+@@ -783,6 +793,11 @@ static int do_mlockall(int flags)
for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
vm_flags_t newflags;
@@ -97444,7 +96900,7 @@ index b1eb536..091d154 100644
newflags = vma->vm_flags & ~VM_LOCKED;
if (flags & MCL_CURRENT)
newflags |= VM_LOCKED;
-@@ -807,8 +822,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
+@@ -814,8 +829,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
lock_limit >>= PAGE_SHIFT;
ret = -ENOMEM;
@@ -97457,18 +96913,18 @@ index b1eb536..091d154 100644
capable(CAP_IPC_LOCK))
ret = do_mlockall(flags);
diff --git a/mm/mmap.c b/mm/mmap.c
-index 085bcd8..cb98f9f 100644
+index 1620adb..348da48 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
-@@ -37,6 +37,7 @@
- #include <linux/sched/sysctl.h>
+@@ -41,6 +41,7 @@
#include <linux/notifier.h>
#include <linux/memory.h>
+ #include <linux/printk.h>
+#include <linux/random.h>
#include <asm/uaccess.h>
#include <asm/cacheflush.h>
-@@ -53,6 +54,16 @@
+@@ -57,6 +58,16 @@
#define arch_rebalance_pgtables(addr, len) (addr)
#endif
@@ -97485,7 +96941,7 @@ index 085bcd8..cb98f9f 100644
static void unmap_region(struct mm_struct *mm,
struct vm_area_struct *vma, struct vm_area_struct *prev,
unsigned long start, unsigned long end);
-@@ -72,16 +83,25 @@ static void unmap_region(struct mm_struct *mm,
+@@ -76,16 +87,25 @@ static void unmap_region(struct mm_struct *mm,
* x: (no) no x: (no) yes x: (no) yes x: (yes) yes
*
*/
@@ -97514,7 +96970,7 @@ index 085bcd8..cb98f9f 100644
}
EXPORT_SYMBOL(vm_get_page_prot);
-@@ -91,6 +111,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
+@@ -114,6 +134,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
@@ -97522,7 +96978,7 @@ index 085bcd8..cb98f9f 100644
/*
* Make sure vm_committed_as in one cacheline and not cacheline shared with
* other variables. It can be updated by several CPUs frequently.
-@@ -247,6 +268,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
+@@ -274,6 +295,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
struct vm_area_struct *next = vma->vm_next;
might_sleep();
@@ -97530,20 +96986,30 @@ index 085bcd8..cb98f9f 100644
if (vma->vm_ops && vma->vm_ops->close)
vma->vm_ops->close(vma);
if (vma->vm_file)
-@@ -291,6 +313,12 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
+@@ -287,6 +309,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len);
+
+ SYSCALL_DEFINE1(brk, unsigned long, brk)
+ {
++ unsigned long rlim;
+ unsigned long retval;
+ unsigned long newbrk, oldbrk;
+ struct mm_struct *mm = current->mm;
+@@ -317,7 +340,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
+ * segment grow beyond its set limit the in case where the limit is
* not page aligned -Ram Gupta
*/
- rlim = rlimit(RLIMIT_DATA);
+- if (check_data_rlimit(rlimit(RLIMIT_DATA), brk, mm->start_brk,
++ rlim = rlimit(RLIMIT_DATA);
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
+ /* force a minimum 16MB brk heap on setuid/setgid binaries */
+ if (rlim < PAGE_SIZE && (get_dumpable(mm) != SUID_DUMP_USER) && gr_is_global_nonroot(current_uid()))
+ rlim = 4096 * PAGE_SIZE;
+#endif
-+ gr_learn_resource(current, RLIMIT_DATA, (brk - mm->start_brk) + (mm->end_data - mm->start_data), 1);
- if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
- (mm->end_data - mm->start_data) > rlim)
++ if (check_data_rlimit(rlim, brk, mm->start_brk,
+ mm->end_data, mm->start_data))
goto out;
-@@ -945,6 +973,12 @@ static int
+
+@@ -976,6 +1005,12 @@ static int
can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
{
@@ -97556,7 +97022,7 @@ index 085bcd8..cb98f9f 100644
if (is_mergeable_vma(vma, file, vm_flags) &&
is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
if (vma->vm_pgoff == vm_pgoff)
-@@ -964,6 +998,12 @@ static int
+@@ -995,6 +1030,12 @@ static int
can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
{
@@ -97569,15 +97035,7 @@ index 085bcd8..cb98f9f 100644
if (is_mergeable_vma(vma, file, vm_flags) &&
is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
pgoff_t vm_pglen;
-@@ -1006,13 +1046,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
- struct vm_area_struct *vma_merge(struct mm_struct *mm,
- struct vm_area_struct *prev, unsigned long addr,
- unsigned long end, unsigned long vm_flags,
-- struct anon_vma *anon_vma, struct file *file,
-+ struct anon_vma *anon_vma, struct file *file,
- pgoff_t pgoff, struct mempolicy *policy)
- {
- pgoff_t pglen = (end - addr) >> PAGE_SHIFT;
+@@ -1044,6 +1085,13 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
struct vm_area_struct *area, *next;
int err;
@@ -97591,7 +97049,7 @@ index 085bcd8..cb98f9f 100644
/*
* We later require that vma->vm_flags == vm_flags,
* so this tests vma->vm_flags & VM_SPECIAL, too.
-@@ -1028,6 +1075,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -1059,6 +1107,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
if (next && next->vm_end == end) /* cases 6, 7, 8 */
next = next->vm_next;
@@ -97607,7 +97065,7 @@ index 085bcd8..cb98f9f 100644
/*
* Can it merge with the predecessor?
*/
-@@ -1047,9 +1103,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -1078,9 +1135,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
/* cases 1, 6 */
err = vma_adjust(prev, prev->vm_start,
next->vm_end, prev->vm_pgoff, NULL);
@@ -97632,9 +97090,9 @@ index 085bcd8..cb98f9f 100644
+ }
if (err)
return NULL;
- khugepaged_enter_vma_merge(prev);
-@@ -1063,12 +1134,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
- mpol_equal(policy, vma_policy(next)) &&
+ khugepaged_enter_vma_merge(prev, vm_flags);
+@@ -1094,12 +1166,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+ mpol_equal(policy, vma_policy(next)) &&
can_vma_merge_before(next, vm_flags,
anon_vma, file, pgoff+pglen)) {
- if (prev && addr < prev->vm_end) /* case 4 */
@@ -97662,8 +97120,8 @@ index 085bcd8..cb98f9f 100644
+ }
if (err)
return NULL;
- khugepaged_enter_vma_merge(area);
-@@ -1177,8 +1263,10 @@ none:
+ khugepaged_enter_vma_merge(area, vm_flags);
+@@ -1208,8 +1295,10 @@ none:
void vm_stat_account(struct mm_struct *mm, unsigned long flags,
struct file *file, long pages)
{
@@ -97676,7 +97134,7 @@ index 085bcd8..cb98f9f 100644
mm->total_vm += pages;
-@@ -1186,7 +1274,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
+@@ -1217,7 +1306,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
mm->shared_vm += pages;
if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
mm->exec_vm += pages;
@@ -97685,7 +97143,7 @@ index 085bcd8..cb98f9f 100644
mm->stack_vm += pages;
}
#endif /* CONFIG_PROC_FS */
-@@ -1216,6 +1304,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
+@@ -1247,6 +1336,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
locked += mm->locked_vm;
lock_limit = rlimit(RLIMIT_MEMLOCK);
lock_limit >>= PAGE_SHIFT;
@@ -97693,7 +97151,7 @@ index 085bcd8..cb98f9f 100644
if (locked > lock_limit && !capable(CAP_IPC_LOCK))
return -EAGAIN;
}
-@@ -1242,7 +1331,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1273,7 +1363,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
* (the exception is when the underlying filesystem is noexec
* mounted, in which case we dont add PROT_EXEC.)
*/
@@ -97702,7 +97160,7 @@ index 085bcd8..cb98f9f 100644
if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
prot |= PROT_EXEC;
-@@ -1268,7 +1357,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1299,7 +1389,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
/* Obtain the address to map to. we verify (or select) it and ensure
* that it represents a valid section of the address space.
*/
@@ -97711,7 +97169,7 @@ index 085bcd8..cb98f9f 100644
if (addr & ~PAGE_MASK)
return addr;
-@@ -1279,6 +1368,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1310,6 +1400,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
@@ -97755,7 +97213,7 @@ index 085bcd8..cb98f9f 100644
if (flags & MAP_LOCKED)
if (!can_do_mlock())
return -EPERM;
-@@ -1366,6 +1492,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1397,6 +1524,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
vm_flags |= VM_NORESERVE;
}
@@ -97765,7 +97223,7 @@ index 085bcd8..cb98f9f 100644
addr = mmap_region(file, addr, len, vm_flags, pgoff);
if (!IS_ERR_VALUE(addr) &&
((vm_flags & VM_LOCKED) ||
-@@ -1459,7 +1588,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
+@@ -1490,7 +1620,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
vm_flags_t vm_flags = vma->vm_flags;
/* If it was private or non-writable, the write bit is already clear */
@@ -97774,7 +97232,7 @@ index 085bcd8..cb98f9f 100644
return 0;
/* The backer wishes to know when pages are first written to? */
-@@ -1505,7 +1634,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+@@ -1541,7 +1671,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
struct rb_node **rb_link, *rb_parent;
unsigned long charged = 0;
@@ -97797,7 +97255,7 @@ index 085bcd8..cb98f9f 100644
if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
unsigned long nr_pages;
-@@ -1524,11 +1668,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+@@ -1560,11 +1705,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
/* Clear old maps */
error = -ENOMEM;
@@ -97810,7 +97268,7 @@ index 085bcd8..cb98f9f 100644
}
/*
-@@ -1559,6 +1702,16 @@ munmap_back:
+@@ -1595,6 +1739,16 @@ munmap_back:
goto unacct_error;
}
@@ -97827,7 +97285,7 @@ index 085bcd8..cb98f9f 100644
vma->vm_mm = mm;
vma->vm_start = addr;
vma->vm_end = addr + len;
-@@ -1578,6 +1731,13 @@ munmap_back:
+@@ -1625,6 +1779,13 @@ munmap_back:
if (error)
goto unmap_and_free_vma;
@@ -97841,7 +97299,7 @@ index 085bcd8..cb98f9f 100644
/* Can addr have changed??
*
* Answer: Yes, several device drivers can do it in their
-@@ -1611,6 +1771,12 @@ munmap_back:
+@@ -1643,6 +1804,12 @@ munmap_back:
}
vma_link(mm, vma, prev, rb_link, rb_parent);
@@ -97852,9 +97310,9 @@ index 085bcd8..cb98f9f 100644
+#endif
+
/* Once vma denies write, undo our temporary denial count */
- if (vm_flags & VM_DENYWRITE)
- allow_write_access(file);
-@@ -1619,6 +1785,7 @@ out:
+ if (file) {
+ if (vm_flags & VM_SHARED)
+@@ -1655,6 +1822,7 @@ out:
perf_event_mmap(vma);
vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
@@ -97862,9 +97320,9 @@ index 085bcd8..cb98f9f 100644
if (vm_flags & VM_LOCKED) {
if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
vma == get_gate_vma(current->mm)))
-@@ -1651,6 +1818,12 @@ unmap_and_free_vma:
- unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
- charged = 0;
+@@ -1692,6 +1860,12 @@ allow_write_and_free_vma:
+ if (vm_flags & VM_DENYWRITE)
+ allow_write_access(file);
free_vma:
+
+#ifdef CONFIG_PAX_SEGMEXEC
@@ -97875,7 +97333,7 @@ index 085bcd8..cb98f9f 100644
kmem_cache_free(vm_area_cachep, vma);
unacct_error:
if (charged)
-@@ -1658,7 +1831,63 @@ unacct_error:
+@@ -1699,7 +1873,63 @@ unacct_error:
return error;
}
@@ -97940,7 +97398,7 @@ index 085bcd8..cb98f9f 100644
{
/*
* We implement the search by looking for an rbtree node that
-@@ -1706,11 +1935,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
+@@ -1747,11 +1977,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
}
}
@@ -97971,7 +97429,7 @@ index 085bcd8..cb98f9f 100644
if (gap_end >= low_limit && gap_end - gap_start >= length)
goto found;
-@@ -1760,7 +2007,7 @@ found:
+@@ -1801,7 +2049,7 @@ found:
return gap_start;
}
@@ -97980,7 +97438,7 @@ index 085bcd8..cb98f9f 100644
{
struct mm_struct *mm = current->mm;
struct vm_area_struct *vma;
-@@ -1814,6 +2061,24 @@ check_current:
+@@ -1855,6 +2103,24 @@ check_current:
gap_end = vma->vm_start;
if (gap_end < low_limit)
return -ENOMEM;
@@ -98005,7 +97463,7 @@ index 085bcd8..cb98f9f 100644
if (gap_start <= high_limit && gap_end - gap_start >= length)
goto found;
-@@ -1877,6 +2142,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -1918,6 +2184,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
struct mm_struct *mm = current->mm;
struct vm_area_struct *vma;
struct vm_unmapped_area_info info;
@@ -98013,7 +97471,7 @@ index 085bcd8..cb98f9f 100644
if (len > TASK_SIZE - mmap_min_addr)
return -ENOMEM;
-@@ -1884,11 +2150,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -1925,11 +2192,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
if (flags & MAP_FIXED)
return addr;
@@ -98030,15 +97488,15 @@ index 085bcd8..cb98f9f 100644
return addr;
}
-@@ -1897,6 +2167,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -1938,6 +2209,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
info.low_limit = mm->mmap_base;
info.high_limit = TASK_SIZE;
info.align_mask = 0;
+ info.threadstack_offset = offset;
return vm_unmapped_area(&info);
}
- #endif
-@@ -1915,6 +2186,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ #endif
+@@ -1956,6 +2228,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
struct mm_struct *mm = current->mm;
unsigned long addr = addr0;
struct vm_unmapped_area_info info;
@@ -98046,7 +97504,7 @@ index 085bcd8..cb98f9f 100644
/* requested length too big for entire address space */
if (len > TASK_SIZE - mmap_min_addr)
-@@ -1923,12 +2195,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -1964,12 +2237,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
if (flags & MAP_FIXED)
return addr;
@@ -98064,7 +97522,7 @@ index 085bcd8..cb98f9f 100644
return addr;
}
-@@ -1937,6 +2213,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -1978,6 +2255,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
info.low_limit = max(PAGE_SIZE, mmap_min_addr);
info.high_limit = mm->mmap_base;
info.align_mask = 0;
@@ -98072,7 +97530,7 @@ index 085bcd8..cb98f9f 100644
addr = vm_unmapped_area(&info);
/*
-@@ -1949,6 +2226,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -1990,6 +2268,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
VM_BUG_ON(addr != -ENOMEM);
info.flags = 0;
info.low_limit = TASK_UNMAPPED_BASE;
@@ -98085,7 +97543,7 @@ index 085bcd8..cb98f9f 100644
info.high_limit = TASK_SIZE;
addr = vm_unmapped_area(&info);
}
-@@ -2049,6 +2332,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
+@@ -2090,6 +2374,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
return vma;
}
@@ -98114,7 +97572,7 @@ index 085bcd8..cb98f9f 100644
/*
* Verify that the stack growth is acceptable and
* update accounting. This is shared with both the
-@@ -2066,8 +2371,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -2107,8 +2413,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
/* Stack limit test */
actual_size = size;
@@ -98124,7 +97582,7 @@ index 085bcd8..cb98f9f 100644
if (actual_size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
return -ENOMEM;
-@@ -2078,6 +2382,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -2119,6 +2424,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
locked = mm->locked_vm + grow;
limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
limit >>= PAGE_SHIFT;
@@ -98132,7 +97590,7 @@ index 085bcd8..cb98f9f 100644
if (locked > limit && !capable(CAP_IPC_LOCK))
return -ENOMEM;
}
-@@ -2107,37 +2412,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -2148,37 +2454,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
* PA-RISC uses this for its stack; IA64 for its Register Backing Store.
* vma is the last one with address > vma->vm_end. Have to extend vma.
*/
@@ -98190,16 +97648,16 @@ index 085bcd8..cb98f9f 100644
unsigned long size, grow;
size = address - vma->vm_start;
-@@ -2172,6 +2488,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
+@@ -2213,6 +2530,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
}
}
}
+ if (locknext)
+ vma_unlock_anon_vma(vma->vm_next);
vma_unlock_anon_vma(vma);
- khugepaged_enter_vma_merge(vma);
+ khugepaged_enter_vma_merge(vma, vma->vm_flags);
validate_mm(vma->vm_mm);
-@@ -2186,6 +2504,8 @@ int expand_downwards(struct vm_area_struct *vma,
+@@ -2227,6 +2546,8 @@ int expand_downwards(struct vm_area_struct *vma,
unsigned long address)
{
int error;
@@ -98208,7 +97666,7 @@ index 085bcd8..cb98f9f 100644
/*
* We must make sure the anon_vma is allocated
-@@ -2199,6 +2519,15 @@ int expand_downwards(struct vm_area_struct *vma,
+@@ -2240,6 +2561,15 @@ int expand_downwards(struct vm_area_struct *vma,
if (error)
return error;
@@ -98224,7 +97682,7 @@ index 085bcd8..cb98f9f 100644
vma_lock_anon_vma(vma);
/*
-@@ -2208,9 +2537,17 @@ int expand_downwards(struct vm_area_struct *vma,
+@@ -2249,9 +2579,17 @@ int expand_downwards(struct vm_area_struct *vma,
*/
/* Somebody else might have raced and expanded it already */
@@ -98243,7 +97701,7 @@ index 085bcd8..cb98f9f 100644
size = vma->vm_end - address;
grow = (vma->vm_start - address) >> PAGE_SHIFT;
-@@ -2235,13 +2572,27 @@ int expand_downwards(struct vm_area_struct *vma,
+@@ -2276,13 +2614,27 @@ int expand_downwards(struct vm_area_struct *vma,
vma->vm_pgoff -= grow;
anon_vma_interval_tree_post_update_vma(vma);
vma_gap_update(vma);
@@ -98268,10 +97726,10 @@ index 085bcd8..cb98f9f 100644
vma_unlock_anon_vma(vma);
+ if (lockprev)
+ vma_unlock_anon_vma(prev);
- khugepaged_enter_vma_merge(vma);
+ khugepaged_enter_vma_merge(vma, vma->vm_flags);
validate_mm(vma->vm_mm);
return error;
-@@ -2339,6 +2690,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -2380,6 +2732,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
do {
long nrpages = vma_pages(vma);
@@ -98285,7 +97743,7 @@ index 085bcd8..cb98f9f 100644
if (vma->vm_flags & VM_ACCOUNT)
nr_accounted += nrpages;
vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
-@@ -2383,6 +2741,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2424,6 +2783,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
insertion_point = (prev ? &prev->vm_next : &mm->mmap);
vma->vm_prev = NULL;
do {
@@ -98302,7 +97760,7 @@ index 085bcd8..cb98f9f 100644
vma_rb_erase(vma, &mm->mm_rb);
mm->map_count--;
tail_vma = vma;
-@@ -2410,14 +2778,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -2451,14 +2820,33 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
struct vm_area_struct *new;
int err = -ENOMEM;
@@ -98336,7 +97794,7 @@ index 085bcd8..cb98f9f 100644
/* most fields are the same, copy all, and then fixup */
*new = *vma;
-@@ -2430,6 +2817,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -2471,6 +2859,22 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
}
@@ -98359,7 +97817,7 @@ index 085bcd8..cb98f9f 100644
err = vma_dup_policy(vma, new);
if (err)
goto out_free_vma;
-@@ -2450,6 +2853,38 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -2491,6 +2895,38 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
else
err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
@@ -98398,7 +97856,7 @@ index 085bcd8..cb98f9f 100644
/* Success. */
if (!err)
return 0;
-@@ -2459,10 +2894,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -2500,10 +2936,18 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
new->vm_ops->close(new);
if (new->vm_file)
fput(new->vm_file);
@@ -98418,7 +97876,7 @@ index 085bcd8..cb98f9f 100644
kmem_cache_free(vm_area_cachep, new);
out_err:
return err;
-@@ -2475,6 +2918,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -2516,6 +2960,15 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
unsigned long addr, int new_below)
{
@@ -98434,7 +97892,7 @@ index 085bcd8..cb98f9f 100644
if (mm->map_count >= sysctl_max_map_count)
return -ENOMEM;
-@@ -2486,11 +2938,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2527,11 +2980,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
* work. This now handles partial unmappings.
* Jeremy Fitzhardinge <jeremy@goop.org>
*/
@@ -98465,7 +97923,7 @@ index 085bcd8..cb98f9f 100644
if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
return -EINVAL;
-@@ -2565,6 +3036,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
+@@ -2607,6 +3079,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
/* Fix up all other VM information */
remove_vma_list(mm, vma);
@@ -98474,7 +97932,7 @@ index 085bcd8..cb98f9f 100644
return 0;
}
-@@ -2573,6 +3046,13 @@ int vm_munmap(unsigned long start, size_t len)
+@@ -2615,6 +3089,13 @@ int vm_munmap(unsigned long start, size_t len)
int ret;
struct mm_struct *mm = current->mm;
@@ -98488,7 +97946,7 @@ index 085bcd8..cb98f9f 100644
down_write(&mm->mmap_sem);
ret = do_munmap(mm, start, len);
up_write(&mm->mmap_sem);
-@@ -2586,16 +3066,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
+@@ -2628,16 +3109,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
return vm_munmap(addr, len);
}
@@ -98505,15 +97963,15 @@ index 085bcd8..cb98f9f 100644
/*
* this is really a simplified "do_mmap". it only handles
* anonymous maps. eventually we may be able to do some
-@@ -2609,6 +3079,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
- struct rb_node ** rb_link, * rb_parent;
+@@ -2651,6 +3122,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+ struct rb_node **rb_link, *rb_parent;
pgoff_t pgoff = addr >> PAGE_SHIFT;
int error;
+ unsigned long charged;
len = PAGE_ALIGN(len);
if (!len)
-@@ -2616,10 +3087,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2658,10 +3130,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
@@ -98538,7 +97996,7 @@ index 085bcd8..cb98f9f 100644
error = mlock_future_check(mm, mm->def_flags, len);
if (error)
return error;
-@@ -2633,21 +3118,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2675,21 +3161,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
/*
* Clear old maps. this also does some error checking for us
*/
@@ -98563,7 +98021,7 @@ index 085bcd8..cb98f9f 100644
return -ENOMEM;
/* Can we just expand an old private anonymous mapping? */
-@@ -2661,7 +3145,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2703,7 +3188,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
*/
vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
if (!vma) {
@@ -98572,7 +98030,7 @@ index 085bcd8..cb98f9f 100644
return -ENOMEM;
}
-@@ -2675,10 +3159,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2717,10 +3202,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
vma_link(mm, vma, prev, rb_link, rb_parent);
out:
perf_event_mmap(vma);
@@ -98586,7 +98044,7 @@ index 085bcd8..cb98f9f 100644
return addr;
}
-@@ -2740,6 +3225,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2782,6 +3268,7 @@ void exit_mmap(struct mm_struct *mm)
while (vma) {
if (vma->vm_flags & VM_ACCOUNT)
nr_accounted += vma_pages(vma);
@@ -98594,7 +98052,7 @@ index 085bcd8..cb98f9f 100644
vma = remove_vma(vma);
}
vm_unacct_memory(nr_accounted);
-@@ -2757,6 +3243,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -2799,6 +3286,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
struct vm_area_struct *prev;
struct rb_node **rb_link, *rb_parent;
@@ -98608,7 +98066,7 @@ index 085bcd8..cb98f9f 100644
/*
* The vm_pgoff of a purely anonymous vma should be irrelevant
* until its first write fault, when page's anon_vma and index
-@@ -2780,7 +3273,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -2822,7 +3316,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
security_vm_enough_memory_mm(mm, vma_pages(vma)))
return -ENOMEM;
@@ -98630,7 +98088,7 @@ index 085bcd8..cb98f9f 100644
return 0;
}
-@@ -2799,6 +3306,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -2841,6 +3349,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
struct rb_node **rb_link, *rb_parent;
bool faulted_in_anon_vma = true;
@@ -98639,7 +98097,7 @@ index 085bcd8..cb98f9f 100644
/*
* If anonymous vma has not yet been faulted, update new pgoff
* to match new location, to increase its chance of merging.
-@@ -2863,6 +3372,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -2905,6 +3415,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
return NULL;
}
@@ -98679,7 +98137,7 @@ index 085bcd8..cb98f9f 100644
/*
* Return true if the calling process may expand its vm space by the passed
* number of pages
-@@ -2874,6 +3416,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
+@@ -2916,6 +3459,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
@@ -98687,7 +98145,7 @@ index 085bcd8..cb98f9f 100644
if (cur + npages > lim)
return 0;
return 1;
-@@ -2944,6 +3487,22 @@ int install_special_mapping(struct mm_struct *mm,
+@@ -2998,6 +3542,22 @@ static struct vm_area_struct *__install_special_mapping(
vma->vm_start = addr;
vma->vm_end = addr + len;
@@ -98695,7 +98153,7 @@ index 085bcd8..cb98f9f 100644
+ if (mm->pax_flags & MF_PAX_MPROTECT) {
+#ifndef CONFIG_PAX_MPROTECT_COMPAT
+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
-+ return -EPERM;
++ return ERR_PTR(-EPERM);
+ if (!(vm_flags & VM_EXEC))
+ vm_flags &= ~VM_MAYEXEC;
+#else
@@ -98711,7 +98169,7 @@ index 085bcd8..cb98f9f 100644
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
diff --git a/mm/mprotect.c b/mm/mprotect.c
-index 769a67a..414d24f 100644
+index ace9345..63320dc 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -24,10 +24,18 @@
@@ -98731,9 +98189,9 @@ index 769a67a..414d24f 100644
#include <asm/tlbflush.h>
+#include <asm/mmu_context.h>
- #ifndef pgprot_modify
- static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
-@@ -214,6 +222,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
+ /*
+ * For a prot_numa update we only hold mmap_sem for read so there is a
+@@ -251,6 +259,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
return pages;
}
@@ -98782,7 +98240,7 @@ index 769a67a..414d24f 100644
int
mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
unsigned long start, unsigned long end, unsigned long newflags)
-@@ -226,11 +276,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+@@ -263,11 +313,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
int error;
int dirty_accountable = 0;
@@ -98812,7 +98270,7 @@ index 769a67a..414d24f 100644
/*
* If we make a private mapping writable we increase our commit;
* but (without finer accounting) cannot reduce our commit if we
-@@ -247,6 +315,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+@@ -284,6 +352,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
}
}
@@ -98855,7 +98313,7 @@ index 769a67a..414d24f 100644
/*
* First try to merge with previous and/or next vma.
*/
-@@ -277,9 +381,21 @@ success:
+@@ -314,7 +418,19 @@ success:
* vm_flags and vm_page_prot are protected by the mmap_sem
* held in write mode.
*/
@@ -98872,13 +98330,10 @@ index 769a67a..414d24f 100644
+ mm->binfmt->handle_mprotect(vma, newflags);
+#endif
+
- vma->vm_page_prot = pgprot_modify(vma->vm_page_prot,
-- vm_get_page_prot(newflags));
-+ vm_get_page_prot(vma->vm_flags));
+ dirty_accountable = vma_wants_writenotify(vma);
+ vma_set_page_prot(vma);
- if (vma_wants_writenotify(vma)) {
- vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
-@@ -318,6 +434,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -350,6 +466,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
end = start + len;
if (end <= start)
return -ENOMEM;
@@ -98896,7 +98351,7 @@ index 769a67a..414d24f 100644
if (!arch_validate_prot(prot))
return -EINVAL;
-@@ -325,7 +452,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -357,7 +484,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
/*
* Does the application expect PROT_READ to imply PROT_EXEC:
*/
@@ -98905,7 +98360,7 @@ index 769a67a..414d24f 100644
prot |= PROT_EXEC;
vm_flags = calc_vm_prot_bits(prot);
-@@ -357,6 +484,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -389,6 +516,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
if (start > vma->vm_start)
prev = vma;
@@ -98917,7 +98372,7 @@ index 769a67a..414d24f 100644
for (nstart = start ; ; ) {
unsigned long newflags;
-@@ -367,6 +499,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -399,6 +531,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
/* newflags >> 4 shift VM_MAY% in place of VM_% */
if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
@@ -98932,7 +98387,7 @@ index 769a67a..414d24f 100644
error = -EACCES;
goto out;
}
-@@ -381,6 +521,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -413,6 +553,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
if (error)
goto out;
@@ -98943,7 +98398,7 @@ index 769a67a..414d24f 100644
if (nstart < prev->vm_end)
diff --git a/mm/mremap.c b/mm/mremap.c
-index 05f1180..c3cde48 100644
+index b147f66..98a695ab 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -144,6 +144,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
@@ -98959,7 +98414,7 @@ index 05f1180..c3cde48 100644
pte = move_soft_dirty_pte(pte);
set_pte_at(mm, new_addr, new_pte, pte);
}
-@@ -344,6 +350,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
+@@ -345,6 +351,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
if (is_vm_hugetlb_page(vma))
goto Einval;
@@ -98971,7 +98426,7 @@ index 05f1180..c3cde48 100644
/* We can't remap across vm area boundaries */
if (old_len > vma->vm_end - addr)
goto Efault;
-@@ -399,20 +410,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
+@@ -400,20 +411,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
unsigned long ret = -EINVAL;
unsigned long charged = 0;
unsigned long map_flags;
@@ -99002,7 +98457,7 @@ index 05f1180..c3cde48 100644
goto out;
ret = do_munmap(mm, new_addr, new_len);
-@@ -481,6 +497,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
+@@ -482,6 +498,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
unsigned long ret = -EINVAL;
unsigned long charged = 0;
bool locked = false;
@@ -99010,7 +98465,7 @@ index 05f1180..c3cde48 100644
if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
return ret;
-@@ -502,6 +519,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
+@@ -503,6 +520,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
if (!new_len)
return ret;
@@ -99028,7 +98483,7 @@ index 05f1180..c3cde48 100644
down_write(&current->mm->mmap_sem);
if (flags & MREMAP_FIXED) {
-@@ -552,6 +580,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
+@@ -553,6 +581,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
new_addr = addr;
}
ret = addr;
@@ -99036,7 +98491,7 @@ index 05f1180..c3cde48 100644
goto out;
}
}
-@@ -575,7 +604,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
+@@ -576,7 +605,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
goto out;
}
@@ -99050,10 +98505,10 @@ index 05f1180..c3cde48 100644
out:
if (ret & ~PAGE_MASK)
diff --git a/mm/nommu.c b/mm/nommu.c
-index 3ee4f74..9f4fdd8 100644
+index bd1808e..b63d87c 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
-@@ -66,7 +66,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
+@@ -70,7 +70,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
@@ -99061,7 +98516,7 @@ index 3ee4f74..9f4fdd8 100644
atomic_long_t mmap_pages_allocated;
-@@ -853,15 +852,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
+@@ -857,15 +856,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
EXPORT_SYMBOL(find_vma);
/*
@@ -99085,7 +98540,7 @@ index 3ee4f74..9f4fdd8 100644
*region = *vma->vm_region;
new->vm_region = region;
-@@ -2001,8 +1992,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
+@@ -2002,8 +1993,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
}
EXPORT_SYMBOL(generic_file_remap_pages);
@@ -99096,7 +98551,7 @@ index 3ee4f74..9f4fdd8 100644
{
struct vm_area_struct *vma;
-@@ -2043,8 +2034,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
+@@ -2044,8 +2035,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
*
* The caller must hold a reference on @mm.
*/
@@ -99107,7 +98562,7 @@ index 3ee4f74..9f4fdd8 100644
{
return __access_remote_vm(NULL, mm, addr, buf, len, write);
}
-@@ -2053,7 +2044,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
+@@ -2054,7 +2045,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
* Access another process' address space.
* - source/target buffer must be kernel space
*/
@@ -99117,10 +98572,10 @@ index 3ee4f74..9f4fdd8 100644
struct mm_struct *mm;
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
-index 9f45f87..749bfd8 100644
+index 437174a..8b86707 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
-@@ -685,7 +685,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
+@@ -664,7 +664,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
* card's bdi_dirty may rush to many times higher than bdi_setpoint.
* - the bdi dirty thresh drops quickly due to change of JBOD workload
*/
@@ -99130,10 +98585,10 @@ index 9f45f87..749bfd8 100644
unsigned long bg_thresh,
unsigned long dirty,
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index ea41913..d1a474f 100644
+index 616a2c9..0e755f6 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
-@@ -61,6 +61,7 @@
+@@ -59,6 +59,7 @@
#include <linux/page-debug-flags.h>
#include <linux/hugetlb.h>
#include <linux/sched/rt.h>
@@ -99141,7 +98596,7 @@ index ea41913..d1a474f 100644
#include <asm/sections.h>
#include <asm/tlbflush.h>
-@@ -355,7 +356,7 @@ out:
+@@ -356,7 +357,7 @@ out:
* This usage means that zero-order pages may not be compound.
*/
@@ -99150,7 +98605,7 @@ index ea41913..d1a474f 100644
{
__free_pages_ok(page, compound_order(page));
}
-@@ -749,6 +750,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
+@@ -741,6 +742,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
int i;
int bad = 0;
@@ -99161,7 +98616,7 @@ index ea41913..d1a474f 100644
trace_mm_page_free(page, order);
kmemcheck_free_shadow(page, order);
-@@ -765,6 +770,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
+@@ -757,6 +762,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
debug_check_no_obj_freed(page_address(page),
PAGE_SIZE << order);
}
@@ -99174,7 +98629,7 @@ index ea41913..d1a474f 100644
arch_free_page(page, order);
kernel_map_pages(page, 1 << order, 0);
-@@ -788,6 +799,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
+@@ -780,6 +791,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
local_irq_restore(flags);
}
@@ -99195,7 +98650,7 @@ index ea41913..d1a474f 100644
void __init __free_pages_bootmem(struct page *page, unsigned int order)
{
unsigned int nr_pages = 1 << order;
-@@ -803,6 +828,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
+@@ -795,6 +820,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
__ClearPageReserved(p);
set_page_count(p, 0);
@@ -99215,7 +98670,7 @@ index ea41913..d1a474f 100644
page_zone(page)->managed_pages += nr_pages;
set_page_refcounted(page);
__free_pages(page, order);
-@@ -931,8 +969,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags)
+@@ -923,8 +961,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags)
arch_alloc_page(page, order);
kernel_map_pages(page, 1 << order, 1);
@@ -99226,16 +98681,25 @@ index ea41913..d1a474f 100644
if (order && (gfp_flags & __GFP_COMP))
prep_compound_page(page, order);
-@@ -1948,7 +1988,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
+@@ -1602,7 +1642,7 @@ again:
+ }
+
+ __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order));
+- if (atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
++ if (atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
+ !test_bit(ZONE_FAIR_DEPLETED, &zone->flags))
+ set_bit(ZONE_FAIR_DEPLETED, &zone->flags);
+
+@@ -1923,7 +1963,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
do {
mod_zone_page_state(zone, NR_ALLOC_BATCH,
high_wmark_pages(zone) - low_wmark_pages(zone) -
- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
- zone_clear_flag(zone, ZONE_FAIR_DEPLETED);
+ clear_bit(ZONE_FAIR_DEPLETED, &zone->flags);
} while (zone++ != preferred_zone);
}
-@@ -5711,7 +5751,7 @@ static void __setup_per_zone_wmarks(void)
+@@ -5698,7 +5738,7 @@ static void __setup_per_zone_wmarks(void)
__mod_zone_page_state(zone, NR_ALLOC_BATCH,
high_wmark_pages(zone) - low_wmark_pages(zone) -
@@ -99244,30 +98708,11 @@ index ea41913..d1a474f 100644
setup_zone_migrate_reserve(zone);
spin_unlock_irqrestore(&zone->lock, flags);
-@@ -6652,4 +6692,4 @@ void dump_page(struct page *page, char *reason)
- {
- dump_page_badflags(page, reason, 0);
- }
--EXPORT_SYMBOL_GPL(dump_page);
-+EXPORT_SYMBOL(dump_page);
-diff --git a/mm/page_io.c b/mm/page_io.c
-index 7c59ef6..1358905 100644
---- a/mm/page_io.c
-+++ b/mm/page_io.c
-@@ -260,7 +260,7 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc,
- struct file *swap_file = sis->swap_file;
- struct address_space *mapping = swap_file->f_mapping;
- struct iovec iov = {
-- .iov_base = kmap(page),
-+ .iov_base = (void __force_user *)kmap(page),
- .iov_len = PAGE_SIZE,
- };
-
diff --git a/mm/percpu.c b/mm/percpu.c
-index a2a54a8..43ecb68 100644
+index 014bab6..db5a76f 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
-@@ -122,7 +122,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
+@@ -131,7 +131,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
static unsigned int pcpu_high_unit_cpu __read_mostly;
/* the address of the first chunk which starts with the kernel static area */
@@ -99276,21 +98721,8 @@ index a2a54a8..43ecb68 100644
EXPORT_SYMBOL_GPL(pcpu_base_addr);
static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
-diff --git a/mm/pgtable-generic.c b/mm/pgtable-generic.c
-index a8b9199..dfb79e0 100644
---- a/mm/pgtable-generic.c
-+++ b/mm/pgtable-generic.c
-@@ -195,7 +195,7 @@ void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,
- pmd_t entry = *pmdp;
- if (pmd_numa(entry))
- entry = pmd_mknonnuma(entry);
-- set_pmd_at(vma->vm_mm, address, pmdp, pmd_mknotpresent(*pmdp));
-+ set_pmd_at(vma->vm_mm, address, pmdp, pmd_mknotpresent(entry));
- flush_tlb_range(vma, address, address + HPAGE_PMD_SIZE);
- }
- #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
-index fd26d04..0cea1b0 100644
+index 5077afc..846c9ef 100644
--- a/mm/process_vm_access.c
+++ b/mm/process_vm_access.c
@@ -13,6 +13,7 @@
@@ -99301,9 +98733,9 @@ index fd26d04..0cea1b0 100644
#include <linux/ptrace.h>
#include <linux/slab.h>
#include <linux/syscalls.h>
-@@ -258,19 +259,19 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
- size_t iov_l_curr_offset = 0;
+@@ -157,19 +158,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
ssize_t iov_len;
+ size_t total_len = iov_iter_count(iter);
+ return -ENOSYS; // PaX: until properly audited
+
@@ -99328,7 +98760,7 @@ index fd26d04..0cea1b0 100644
}
if (nr_pages == 0)
-@@ -298,6 +299,11 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
+@@ -197,6 +198,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
goto free_proc_pages;
}
@@ -99341,7 +98773,7 @@ index fd26d04..0cea1b0 100644
if (!mm || IS_ERR(mm)) {
rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
diff --git a/mm/rmap.c b/mm/rmap.c
-index cab9820..cb05259 100644
+index 3e4c721..a5e3e39 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -164,6 +164,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
@@ -99444,7 +98876,7 @@ index cab9820..cb05259 100644
/*
diff --git a/mm/shmem.c b/mm/shmem.c
-index 85d8a1a..da4e20f 100644
+index 185836b..d7255a1 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -33,7 +33,7 @@
@@ -99456,7 +98888,7 @@ index 85d8a1a..da4e20f 100644
#ifdef CONFIG_SHMEM
/*
-@@ -77,7 +77,7 @@ static struct vfsmount *shm_mnt;
+@@ -80,7 +80,7 @@ static struct vfsmount *shm_mnt;
#define BOGO_DIRENT_SIZE 20
/* Symlink up to this size is kmalloc'ed instead of using a swappable page */
@@ -99465,7 +98897,7 @@ index 85d8a1a..da4e20f 100644
/*
* shmem_fallocate communicates with shmem_fault or shmem_writepage via
-@@ -2249,6 +2249,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
+@@ -2558,6 +2558,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
static int shmem_xattr_validate(const char *name)
{
struct { const char *prefix; size_t len; } arr[] = {
@@ -99477,7 +98909,7 @@ index 85d8a1a..da4e20f 100644
{ XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
{ XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
};
-@@ -2304,6 +2309,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
+@@ -2613,6 +2618,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
if (err)
return err;
@@ -99493,7 +98925,7 @@ index 85d8a1a..da4e20f 100644
return simple_xattr_set(&info->xattrs, name, value, size, flags);
}
-@@ -2616,8 +2630,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
+@@ -2996,8 +3010,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
int err = -ENOMEM;
/* Round up to L1_CACHE_BYTES to resist false sharing */
@@ -99504,10 +98936,10 @@ index 85d8a1a..da4e20f 100644
return -ENOMEM;
diff --git a/mm/slab.c b/mm/slab.c
-index 0b1c2a5..4deff8e 100644
+index f34e053..78a3839 100644
--- a/mm/slab.c
+++ b/mm/slab.c
-@@ -300,10 +300,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
+@@ -314,10 +314,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
if ((x)->max_freeable < i) \
(x)->max_freeable = i; \
} while (0)
@@ -99524,7 +98956,7 @@ index 0b1c2a5..4deff8e 100644
#else
#define STATS_INC_ACTIVE(x) do { } while (0)
#define STATS_DEC_ACTIVE(x) do { } while (0)
-@@ -320,6 +322,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
+@@ -334,6 +336,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
#define STATS_INC_ALLOCMISS(x) do { } while (0)
#define STATS_INC_FREEHIT(x) do { } while (0)
#define STATS_INC_FREEMISS(x) do { } while (0)
@@ -99533,7 +98965,7 @@ index 0b1c2a5..4deff8e 100644
#endif
#if DEBUG
-@@ -436,7 +440,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
+@@ -450,7 +454,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
* reciprocal_divide(offset, cache->reciprocal_buffer_size)
*/
static inline unsigned int obj_to_index(const struct kmem_cache *cache,
@@ -99542,22 +98974,25 @@ index 0b1c2a5..4deff8e 100644
{
u32 offset = (obj - page->s_mem);
return reciprocal_divide(offset, cache->reciprocal_buffer_size);
-@@ -1536,12 +1540,12 @@ void __init kmem_cache_init(void)
+@@ -1438,7 +1442,7 @@ void __init kmem_cache_init(void)
+ * structures first. Without this, further allocations will bug.
*/
-
- kmalloc_caches[INDEX_AC] = create_kmalloc_cache("kmalloc-ac",
-- kmalloc_size(INDEX_AC), ARCH_KMALLOC_FLAGS);
-+ kmalloc_size(INDEX_AC), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
-
- if (INDEX_AC != INDEX_NODE)
- kmalloc_caches[INDEX_NODE] =
- create_kmalloc_cache("kmalloc-node",
+ kmalloc_caches[INDEX_NODE] = create_kmalloc_cache("kmalloc-node",
- kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
+ kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
+ slab_state = PARTIAL_NODE;
slab_early_init = 0;
+@@ -2059,7 +2063,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
-@@ -3477,6 +3481,20 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
+ cachep = find_mergeable(size, align, flags, name, ctor);
+ if (cachep) {
+- cachep->refcount++;
++ atomic_inc(&cachep->refcount);
+
+ /*
+ * Adjust the object sizes so that we clear
+@@ -3352,6 +3356,20 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
struct array_cache *ac = cpu_cache_get(cachep);
check_irq_off();
@@ -99578,7 +99013,7 @@ index 0b1c2a5..4deff8e 100644
kmemleak_free_recursive(objp, cachep->flags);
objp = cache_free_debugcheck(cachep, objp, caller);
-@@ -3705,6 +3723,7 @@ void kfree(const void *objp)
+@@ -3557,6 +3575,7 @@ void kfree(const void *objp)
if (unlikely(ZERO_OR_NULL_PTR(objp)))
return;
@@ -99586,7 +99021,7 @@ index 0b1c2a5..4deff8e 100644
local_irq_save(flags);
kfree_debugcheck(objp);
c = virt_to_cache(objp);
-@@ -4146,14 +4165,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
+@@ -3979,14 +3998,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
}
/* cpu stats */
{
@@ -99613,7 +99048,7 @@ index 0b1c2a5..4deff8e 100644
#endif
}
-@@ -4374,13 +4401,69 @@ static const struct file_operations proc_slabstats_operations = {
+@@ -4200,13 +4227,69 @@ static const struct file_operations proc_slabstats_operations = {
static int __init slab_proc_init(void)
{
#ifdef CONFIG_DEBUG_SLAB_LEAK
@@ -99685,10 +99120,19 @@ index 0b1c2a5..4deff8e 100644
* ksize - get the actual amount of memory allocated for a given object
* @objp: Pointer to the object
diff --git a/mm/slab.h b/mm/slab.h
-index 8184a7c..81ed62c 100644
+index ab019e6..fbcac34 100644
--- a/mm/slab.h
+++ b/mm/slab.h
-@@ -32,6 +32,20 @@ extern struct list_head slab_caches;
+@@ -22,7 +22,7 @@ struct kmem_cache {
+ unsigned int align; /* Alignment as calculated */
+ unsigned long flags; /* Active flags on the slab */
+ const char *name; /* Slab name for sysfs */
+- int refcount; /* Use counter */
++ atomic_t refcount; /* Use counter */
+ void (*ctor)(void *); /* Called on object slot creation */
+ struct list_head list; /* List of all slab caches on the system */
+ };
+@@ -66,6 +66,20 @@ extern struct list_head slab_caches;
/* The slab cache that manages slab cache information */
extern struct kmem_cache *kmem_cache;
@@ -99709,7 +99153,7 @@ index 8184a7c..81ed62c 100644
unsigned long calculate_alignment(unsigned long flags,
unsigned long align, unsigned long size);
-@@ -67,7 +81,8 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
+@@ -116,7 +130,8 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,
/* Legal flag mask for kmem_cache_create(), for various configurations */
#define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
@@ -99719,7 +99163,7 @@ index 8184a7c..81ed62c 100644
#if defined(CONFIG_DEBUG_SLAB)
#define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
-@@ -257,6 +272,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
+@@ -300,6 +315,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
return s;
page = virt_to_head_page(x);
@@ -99730,10 +99174,10 @@ index 8184a7c..81ed62c 100644
if (slab_equal_or_root(cachep, s))
return cachep;
diff --git a/mm/slab_common.c b/mm/slab_common.c
-index f149e67..97a8b4b 100644
+index dcdab81..3576646 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
-@@ -23,11 +23,35 @@
+@@ -25,11 +25,35 @@
#include "slab.h"
@@ -99767,10 +99211,37 @@ index f149e67..97a8b4b 100644
+early_param("pax_sanitize_slab", pax_sanitize_slab_setup);
+#endif
+
- #ifdef CONFIG_DEBUG_VM
- static int kmem_cache_sanity_check(struct mem_cgroup *memcg, const char *name,
- size_t size)
-@@ -200,6 +224,13 @@ kmem_cache_create_memcg(struct mem_cgroup *memcg, const char *name, size_t size,
+ /*
+ * Set of flags that will prevent slab merging
+ */
+@@ -44,7 +68,7 @@ struct kmem_cache *kmem_cache;
+ * Merge control. If this is set then no merging of slab caches will occur.
+ * (Could be removed. This was introduced to pacify the merge skeptics.)
+ */
+-static int slab_nomerge;
++static int slab_nomerge = 1;
+
+ static int __init setup_slab_nomerge(char *str)
+ {
+@@ -218,7 +242,7 @@ int slab_unmergeable(struct kmem_cache *s)
+ /*
+ * We may have set a slab to be unmergeable during bootstrap.
+ */
+- if (s->refcount < 0)
++ if (atomic_read(&s->refcount) < 0)
+ return 1;
+
+ return 0;
+@@ -322,7 +346,7 @@ do_kmem_cache_create(char *name, size_t object_size, size_t size, size_t align,
+ if (err)
+ goto out_free_cache;
+
+- s->refcount = 1;
++ atomic_set(&s->refcount, 1);
+ list_add(&s->list, &slab_caches);
+ out:
+ if (err)
+@@ -386,6 +410,13 @@ kmem_cache_create(const char *name, size_t size, size_t align,
*/
flags &= CACHE_CREATE_MASK;
@@ -99781,29 +99252,29 @@ index f149e67..97a8b4b 100644
+ flags &= ~SLAB_NO_SANITIZE;
+#endif
+
- s = __kmem_cache_alias(memcg, name, size, align, flags, ctor);
+ s = __kmem_cache_alias(name, size, align, flags, ctor);
if (s)
goto out_unlock;
-@@ -225,7 +256,7 @@ kmem_cache_create_memcg(struct mem_cgroup *memcg, const char *name, size_t size,
- if (err)
- goto out_free_cache;
-
-- s->refcount = 1;
-+ atomic_set(&s->refcount, 1);
- list_add(&s->list, &slab_caches);
- memcg_register_cache(s);
+@@ -505,8 +536,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
-@@ -278,8 +309,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
-
- get_online_cpus();
mutex_lock(&slab_mutex);
+
- s->refcount--;
-- if (!s->refcount) {
-+ if (atomic_dec_and_test(&s->refcount)) {
- list_del(&s->list);
+- if (s->refcount)
++ if (!atomic_dec_and_test(&s->refcount))
+ goto out_unlock;
+
+ if (memcg_cleanup_cache_params(s) != 0)
+@@ -526,7 +556,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
+ rcu_barrier();
- if (!__kmem_cache_shutdown(s)) {
-@@ -326,7 +356,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
+ memcg_free_cache_params(s);
+-#ifdef SLAB_SUPPORTS_SYSFS
++#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
+ sysfs_slab_remove(s);
+ #else
+ slab_kmem_cache_release(s);
+@@ -582,7 +612,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
name, size, err);
@@ -99812,7 +99283,7 @@ index f149e67..97a8b4b 100644
}
struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
-@@ -339,7 +369,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
+@@ -595,7 +625,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
create_boot_cache(s, name, size, flags);
list_add(&s->list, &slab_caches);
@@ -99821,7 +99292,7 @@ index f149e67..97a8b4b 100644
return s;
}
-@@ -351,6 +381,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
+@@ -607,6 +637,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
EXPORT_SYMBOL(kmalloc_dma_caches);
#endif
@@ -99833,7 +99304,7 @@ index f149e67..97a8b4b 100644
/*
* Conversion table for small slabs sizes / 8 to the index in the
* kmalloc array. This is necessary for slabs < 192 since we have non power
-@@ -415,6 +450,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
+@@ -671,6 +706,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
return kmalloc_dma_caches[index];
#endif
@@ -99847,7 +99318,7 @@ index f149e67..97a8b4b 100644
return kmalloc_caches[index];
}
-@@ -471,7 +513,7 @@ void __init create_kmalloc_caches(unsigned long flags)
+@@ -727,7 +769,7 @@ void __init create_kmalloc_caches(unsigned long flags)
for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
if (!kmalloc_caches[i]) {
kmalloc_caches[i] = create_kmalloc_cache(NULL,
@@ -99856,7 +99327,7 @@ index f149e67..97a8b4b 100644
}
/*
-@@ -480,10 +522,10 @@ void __init create_kmalloc_caches(unsigned long flags)
+@@ -736,10 +778,10 @@ void __init create_kmalloc_caches(unsigned long flags)
* earlier power of two caches
*/
if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
@@ -99869,7 +99340,7 @@ index f149e67..97a8b4b 100644
}
/* Kmalloc array is now usable */
-@@ -516,6 +558,23 @@ void __init create_kmalloc_caches(unsigned long flags)
+@@ -772,6 +814,23 @@ void __init create_kmalloc_caches(unsigned long flags)
}
}
#endif
@@ -99893,7 +99364,7 @@ index f149e67..97a8b4b 100644
}
#endif /* !CONFIG_SLOB */
-@@ -556,6 +615,9 @@ void print_slabinfo_header(struct seq_file *m)
+@@ -830,6 +889,9 @@ void print_slabinfo_header(struct seq_file *m)
seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
"<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
@@ -99904,7 +99375,7 @@ index f149e67..97a8b4b 100644
seq_putc(m, '\n');
}
diff --git a/mm/slob.c b/mm/slob.c
-index 4bf8809..a0a0b9f 100644
+index 96a8620..3e7e663 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
@@ -99982,7 +99453,7 @@ index 4bf8809..a0a0b9f 100644
sp->units = SLOB_UNITS(PAGE_SIZE);
sp->freelist = b;
+ sp->private = 0;
- INIT_LIST_HEAD(&sp->list);
+ INIT_LIST_HEAD(&sp->lru);
set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
set_slob_page_free(sp, slob_list);
@@ -337,7 +341,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
@@ -100073,7 +99544,7 @@ index 4bf8809..a0a0b9f 100644
return ret;
}
-@@ -493,34 +517,112 @@ void kfree(const void *block)
+@@ -491,34 +515,112 @@ void kfree(const void *block)
return;
kmemleak_free(block);
@@ -100195,7 +99666,7 @@ index 4bf8809..a0a0b9f 100644
}
EXPORT_SYMBOL(ksize);
-@@ -536,23 +638,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
+@@ -534,23 +636,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
{
@@ -100231,7 +99702,7 @@ index 4bf8809..a0a0b9f 100644
if (b && c->ctor)
c->ctor(b);
-@@ -582,12 +694,16 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t gfp, int node)
+@@ -580,12 +692,16 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t gfp, int node)
EXPORT_SYMBOL(kmem_cache_alloc_node);
#endif
@@ -100252,7 +99723,7 @@ index 4bf8809..a0a0b9f 100644
}
static void kmem_rcu_free(struct rcu_head *head)
-@@ -595,22 +711,36 @@ static void kmem_rcu_free(struct rcu_head *head)
+@@ -593,22 +709,36 @@ static void kmem_rcu_free(struct rcu_head *head)
struct slob_rcu *slob_rcu = (struct slob_rcu *)head;
void *b = (void *)slob_rcu - (slob_rcu->size - sizeof(struct slob_rcu));
@@ -100294,10 +99765,10 @@ index 4bf8809..a0a0b9f 100644
EXPORT_SYMBOL(kmem_cache_free);
diff --git a/mm/slub.c b/mm/slub.c
-index 7611f14..3d5e216 100644
+index ae7b9f1..7b3fdbe 100644
--- a/mm/slub.c
+++ b/mm/slub.c
-@@ -207,7 +207,7 @@ struct track {
+@@ -197,7 +197,7 @@ struct track {
enum track_item { TRACK_ALLOC, TRACK_FREE };
@@ -100305,17 +99776,17 @@ index 7611f14..3d5e216 100644
+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
static int sysfs_slab_add(struct kmem_cache *);
static int sysfs_slab_alias(struct kmem_cache *, const char *);
- static void sysfs_slab_remove(struct kmem_cache *);
-@@ -545,7 +545,7 @@ static void print_track(const char *s, struct track *t)
+ static void memcg_propagate_slab_attrs(struct kmem_cache *s);
+@@ -535,7 +535,7 @@ static void print_track(const char *s, struct track *t)
if (!t->addr)
return;
-- printk(KERN_ERR "INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
-+ printk(KERN_ERR "INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
- s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
+- pr_err("INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
++ pr_err("INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
+ s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
#ifdef CONFIG_STACKTRACE
{
-@@ -2664,6 +2664,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
+@@ -2645,6 +2645,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
slab_free_hook(s, x);
@@ -100330,16 +99801,7 @@ index 7611f14..3d5e216 100644
redo:
/*
* Determine the currently cpus per cpu slab.
-@@ -2731,7 +2739,7 @@ static int slub_min_objects;
- * Merge control. If this is set then no merging of slab caches will occur.
- * (Could be removed. This was introduced to pacify the merge skeptics.)
- */
--static int slub_nomerge;
-+static int slub_nomerge = 1;
-
- /*
- * Calculate the order of allocation given an slab object size.
-@@ -3012,6 +3020,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
+@@ -2982,6 +2990,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
s->inuse = size;
if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
@@ -100349,7 +99811,7 @@ index 7611f14..3d5e216 100644
s->ctor)) {
/*
* Relocate free pointer after the object if it is not
-@@ -3357,6 +3368,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
+@@ -3301,6 +3312,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
EXPORT_SYMBOL(__kmalloc_node);
#endif
@@ -100409,7 +99871,7 @@ index 7611f14..3d5e216 100644
size_t ksize(const void *object)
{
struct page *page;
-@@ -3385,6 +3449,7 @@ void kfree(const void *x)
+@@ -3329,6 +3393,7 @@ void kfree(const void *x)
if (unlikely(ZERO_OR_NULL_PTR(x)))
return;
@@ -100417,26 +99879,17 @@ index 7611f14..3d5e216 100644
page = virt_to_head_page(x);
if (unlikely(!PageSlab(page))) {
BUG_ON(!PageCompound(page));
-@@ -3690,7 +3755,7 @@ static int slab_unmergeable(struct kmem_cache *s)
- /*
- * We may have set a slab to be unmergeable during bootstrap.
- */
-- if (s->refcount < 0)
-+ if (atomic_read(&s->refcount) < 0)
- return 1;
-
- return 0;
-@@ -3748,7 +3813,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
+@@ -3624,7 +3689,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
+ int i;
+ struct kmem_cache *c;
- s = find_mergeable(memcg, size, align, flags, name, ctor);
- if (s) {
- s->refcount++;
+ atomic_inc(&s->refcount);
+
/*
* Adjust the object sizes so that we clear
- * the complete object on kzalloc.
-@@ -3757,7 +3822,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
- s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
+@@ -3643,7 +3708,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
+ }
if (sysfs_slab_alias(s, name)) {
- s->refcount--;
@@ -100444,7 +99897,7 @@ index 7611f14..3d5e216 100644
s = NULL;
}
}
-@@ -3877,7 +3942,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
+@@ -3760,7 +3825,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
}
#endif
@@ -100453,7 +99906,7 @@ index 7611f14..3d5e216 100644
static int count_inuse(struct page *page)
{
return page->inuse;
-@@ -4161,7 +4226,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
+@@ -4041,7 +4106,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
len += sprintf(buf + len, "%7ld ", l->count);
if (l->addr)
@@ -100465,7 +99918,7 @@ index 7611f14..3d5e216 100644
else
len += sprintf(buf + len, "<not-available>");
-@@ -4266,12 +4335,12 @@ static void resiliency_test(void)
+@@ -4143,12 +4212,12 @@ static void __init resiliency_test(void)
validate_slab_cache(kmalloc_caches[9]);
}
#else
@@ -100480,7 +99933,7 @@ index 7611f14..3d5e216 100644
enum slab_stat_type {
SL_ALL, /* All slabs */
SL_PARTIAL, /* Only partially allocated slabs */
-@@ -4511,13 +4580,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
+@@ -4385,13 +4454,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
{
if (!s->ctor)
return 0;
@@ -100494,12 +99947,12 @@ index 7611f14..3d5e216 100644
static ssize_t aliases_show(struct kmem_cache *s, char *buf)
{
-- return sprintf(buf, "%d\n", s->refcount - 1);
-+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) - 1);
+- return sprintf(buf, "%d\n", s->refcount < 0 ? 0 : s->refcount - 1);
++ return sprintf(buf, "%d\n", atomic_read(&s->refcount) < 0 ? 0 : atomic_read(&s->refcount) - 1);
}
SLAB_ATTR_RO(aliases);
-@@ -4605,6 +4678,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
+@@ -4479,6 +4552,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
SLAB_ATTR_RO(cache_dma);
#endif
@@ -100522,7 +99975,25 @@ index 7611f14..3d5e216 100644
static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
{
return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
-@@ -4939,6 +5028,12 @@ static struct attribute *slab_attrs[] = {
+@@ -4534,7 +4623,7 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf,
+ * as well as cause other issues like converting a mergeable
+ * cache into an umergeable one.
+ */
+- if (s->refcount > 1)
++ if (atomic_read(&s->refcount) > 1)
+ return -EINVAL;
+
+ s->flags &= ~SLAB_TRACE;
+@@ -4654,7 +4743,7 @@ static ssize_t failslab_show(struct kmem_cache *s, char *buf)
+ static ssize_t failslab_store(struct kmem_cache *s, const char *buf,
+ size_t length)
+ {
+- if (s->refcount > 1)
++ if (atomic_read(&s->refcount) > 1)
+ return -EINVAL;
+
+ s->flags &= ~SLAB_FAILSLAB;
+@@ -4824,6 +4913,12 @@ static struct attribute *slab_attrs[] = {
#ifdef CONFIG_ZONE_DMA
&cache_dma_attr.attr,
#endif
@@ -100535,7 +100006,7 @@ index 7611f14..3d5e216 100644
#ifdef CONFIG_NUMA
&remote_node_defrag_ratio_attr.attr,
#endif
-@@ -5171,6 +5266,7 @@ static char *create_unique_id(struct kmem_cache *s)
+@@ -5068,6 +5163,7 @@ static char *create_unique_id(struct kmem_cache *s)
return name;
}
@@ -100543,7 +100014,7 @@ index 7611f14..3d5e216 100644
static int sysfs_slab_add(struct kmem_cache *s)
{
int err;
-@@ -5228,6 +5324,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
+@@ -5141,6 +5237,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
kobject_del(&s->kobj);
kobject_put(&s->kobj);
}
@@ -100551,7 +100022,7 @@ index 7611f14..3d5e216 100644
/*
* Need to buffer aliases during bootup until sysfs becomes
-@@ -5241,6 +5338,7 @@ struct saved_alias {
+@@ -5154,6 +5251,7 @@ struct saved_alias {
static struct saved_alias *alias_list;
@@ -100559,7 +100030,7 @@ index 7611f14..3d5e216 100644
static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
{
struct saved_alias *al;
-@@ -5263,6 +5361,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
+@@ -5176,6 +5274,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
alias_list = al;
return 0;
}
@@ -100590,10 +100061,10 @@ index 4cba9c2..b4f9fcc 100644
return pgd;
}
diff --git a/mm/sparse.c b/mm/sparse.c
-index 63c3ea5..95c0858 100644
+index d1b48b6..6e8590e 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
-@@ -748,7 +748,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
+@@ -750,7 +750,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
for (i = 0; i < PAGES_PER_SECTION; i++) {
if (PageHWPoison(&memmap[i])) {
@@ -100603,7 +100074,7 @@ index 63c3ea5..95c0858 100644
}
}
diff --git a/mm/swap.c b/mm/swap.c
-index d2ceddf..d585efa 100644
+index 8a12b33..7068e78 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -31,6 +31,7 @@
@@ -100614,7 +100085,7 @@ index d2ceddf..d585efa 100644
#include "internal.h"
-@@ -76,6 +77,8 @@ static void __put_compound_page(struct page *page)
+@@ -77,6 +78,8 @@ static void __put_compound_page(struct page *page)
__page_cache_release(page);
dtor = get_compound_page_dtor(page);
@@ -100624,7 +100095,7 @@ index d2ceddf..d585efa 100644
}
diff --git a/mm/swapfile.c b/mm/swapfile.c
-index beeeef8..1cb288b 100644
+index 8798b2e..348f9dd 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -84,7 +84,7 @@ static DEFINE_MUTEX(swapon_mutex);
@@ -100636,7 +100107,7 @@ index beeeef8..1cb288b 100644
static inline unsigned char swap_count(unsigned char ent)
{
-@@ -1968,7 +1968,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
+@@ -1944,7 +1944,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
spin_unlock(&swap_lock);
err = 0;
@@ -100645,7 +100116,7 @@ index beeeef8..1cb288b 100644
wake_up_interruptible(&proc_poll_wait);
out_dput:
-@@ -1985,8 +1985,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
+@@ -1961,8 +1961,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
poll_wait(file, &proc_poll_wait, wait);
@@ -100656,7 +100127,7 @@ index beeeef8..1cb288b 100644
return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
}
-@@ -2084,7 +2084,7 @@ static int swaps_open(struct inode *inode, struct file *file)
+@@ -2060,7 +2060,7 @@ static int swaps_open(struct inode *inode, struct file *file)
return ret;
seq = file->private_data;
@@ -100665,7 +100136,7 @@ index beeeef8..1cb288b 100644
return 0;
}
-@@ -2544,7 +2544,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
+@@ -2520,7 +2520,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
(frontswap_map) ? "FS" : "");
mutex_unlock(&swapon_mutex);
@@ -100675,18 +100146,10 @@ index beeeef8..1cb288b 100644
if (S_ISREG(inode->i_mode))
diff --git a/mm/util.c b/mm/util.c
-index c1010cb..210c536 100644
+index fec39d4..3e60325 100644
--- a/mm/util.c
+++ b/mm/util.c
-@@ -9,6 +9,7 @@
- #include <linux/swapops.h>
- #include <linux/mman.h>
- #include <linux/hugetlb.h>
-+#include <linux/vmalloc.h>
-
- #include <asm/uaccess.h>
-
-@@ -294,6 +295,12 @@ done:
+@@ -195,6 +195,12 @@ struct task_struct *task_of_stack(struct task_struct *task,
void arch_pick_mmap_layout(struct mm_struct *mm)
{
mm->mmap_base = TASK_UNMAPPED_BASE;
@@ -100699,27 +100162,21 @@ index c1010cb..210c536 100644
mm->get_unmapped_area = arch_get_unmapped_area;
}
#endif
-@@ -383,6 +390,15 @@ unsigned long vm_mmap(struct file *file, unsigned long addr,
- }
- EXPORT_SYMBOL(vm_mmap);
+@@ -371,6 +377,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
+ if (!mm->arg_end)
+ goto out_mm; /* Shh! No looking before we're done */
-+void kvfree(const void *addr)
-+{
-+ if (is_vmalloc_addr(addr))
-+ vfree(addr);
-+ else
-+ kfree(addr);
-+}
-+EXPORT_SYMBOL(kvfree);
++ if (gr_acl_handle_procpidmem(task))
++ goto out_mm;
+
- struct address_space *page_mapping(struct page *page)
- {
- struct address_space *mapping = page->mapping;
+ len = mm->arg_end - mm->arg_start;
+
+ if (len > buflen)
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
-index aa3891e..97555dd 100644
+index 90520af..24231aa 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
-@@ -38,6 +38,21 @@ struct vfree_deferred {
+@@ -40,6 +40,21 @@ struct vfree_deferred {
};
static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred);
@@ -100741,7 +100198,7 @@ index aa3891e..97555dd 100644
static void __vunmap(const void *, int);
static void free_work(struct work_struct *w)
-@@ -45,12 +60,30 @@ static void free_work(struct work_struct *w)
+@@ -47,12 +62,30 @@ static void free_work(struct work_struct *w)
struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
struct llist_node *llnode = llist_del_all(&p->list);
while (llnode) {
@@ -100766,7 +100223,7 @@ index aa3891e..97555dd 100644
+ void *lowmem_stack = ACCESS_ONCE(x->lowmem_stack);
+ llnode = llist_next(llnode);
+ __vunmap(stack, 0);
-+ free_memcg_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
++ free_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
+ }
+}
+#endif
@@ -100774,7 +100231,7 @@ index aa3891e..97555dd 100644
/*** Page table manipulation functions ***/
static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
-@@ -59,8 +92,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
+@@ -61,8 +94,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
pte = pte_offset_kernel(pmd, addr);
do {
@@ -100796,7 +100253,7 @@ index aa3891e..97555dd 100644
} while (pte++, addr += PAGE_SIZE, addr != end);
}
-@@ -120,16 +164,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
+@@ -122,16 +166,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
pte = pte_alloc_kernel(pmd, addr);
if (!pte)
return -ENOMEM;
@@ -100828,7 +100285,7 @@ index aa3891e..97555dd 100644
return 0;
}
-@@ -139,7 +196,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
+@@ -141,7 +198,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
pmd_t *pmd;
unsigned long next;
@@ -100837,7 +100294,7 @@ index aa3891e..97555dd 100644
if (!pmd)
return -ENOMEM;
do {
-@@ -156,7 +213,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
+@@ -158,7 +215,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
pud_t *pud;
unsigned long next;
@@ -100846,7 +100303,7 @@ index aa3891e..97555dd 100644
if (!pud)
return -ENOMEM;
do {
-@@ -216,6 +273,12 @@ int is_vmalloc_or_module_addr(const void *x)
+@@ -218,6 +275,12 @@ int is_vmalloc_or_module_addr(const void *x)
if (addr >= MODULES_VADDR && addr < MODULES_END)
return 1;
#endif
@@ -100859,7 +100316,7 @@ index aa3891e..97555dd 100644
return is_vmalloc_addr(x);
}
-@@ -236,8 +299,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
+@@ -238,8 +301,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
if (!pgd_none(*pgd)) {
pud_t *pud = pud_offset(pgd, addr);
@@ -100874,7 +100331,7 @@ index aa3891e..97555dd 100644
if (!pmd_none(*pmd)) {
pte_t *ptep, pte;
-@@ -1175,13 +1244,23 @@ void __init vmalloc_init(void)
+@@ -1183,13 +1252,23 @@ void __init vmalloc_init(void)
for_each_possible_cpu(i) {
struct vmap_block_queue *vbq;
struct vfree_deferred *p;
@@ -100898,7 +100355,7 @@ index aa3891e..97555dd 100644
}
/* Import existing vmlist entries. */
-@@ -1309,6 +1388,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
+@@ -1314,6 +1393,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
struct vm_struct *area;
BUG_ON(in_interrupt());
@@ -100915,7 +100372,7 @@ index aa3891e..97555dd 100644
if (flags & VM_IOREMAP)
align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
-@@ -1514,6 +1603,23 @@ void vunmap(const void *addr)
+@@ -1519,6 +1608,23 @@ void vunmap(const void *addr)
}
EXPORT_SYMBOL(vunmap);
@@ -100931,7 +100388,7 @@ index aa3891e..97555dd 100644
+ schedule_work(&p->wq);
+ } else {
+ __vunmap(task->stack, 0);
-+ free_memcg_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
++ free_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
+ }
+}
+#endif
@@ -100939,7 +100396,7 @@ index aa3891e..97555dd 100644
/**
* vmap - map an array of pages into virtually contiguous space
* @pages: array of page pointers
-@@ -1534,6 +1640,11 @@ void *vmap(struct page **pages, unsigned int count,
+@@ -1539,6 +1645,11 @@ void *vmap(struct page **pages, unsigned int count,
if (count > totalram_pages)
return NULL;
@@ -100951,7 +100408,7 @@ index aa3891e..97555dd 100644
area = get_vm_area_caller((count << PAGE_SHIFT), flags,
__builtin_return_address(0));
if (!area)
-@@ -1634,6 +1745,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
+@@ -1641,6 +1752,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
if (!size || (size >> PAGE_SHIFT) > totalram_pages)
goto fail;
@@ -100965,7 +100422,7 @@ index aa3891e..97555dd 100644
area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED,
start, end, node, gfp_mask, caller);
if (!area)
-@@ -1810,10 +1928,9 @@ EXPORT_SYMBOL(vzalloc_node);
+@@ -1817,10 +1935,9 @@ EXPORT_SYMBOL(vzalloc_node);
* For tight control over page level allocator and protection flags
* use __vmalloc() instead.
*/
@@ -100977,7 +100434,7 @@ index aa3891e..97555dd 100644
NUMA_NO_NODE, __builtin_return_address(0));
}
-@@ -2120,6 +2237,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
+@@ -2127,6 +2244,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
{
struct vm_struct *area;
@@ -100986,7 +100443,7 @@ index aa3891e..97555dd 100644
size = PAGE_ALIGN(size);
if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
-@@ -2602,7 +2721,11 @@ static int s_show(struct seq_file *m, void *p)
+@@ -2609,7 +2728,11 @@ static int s_show(struct seq_file *m, void *p)
v->addr, v->addr + v->size, v->size);
if (v->caller)
@@ -100999,10 +100456,10 @@ index aa3891e..97555dd 100644
if (v->nr_pages)
seq_printf(m, " pages=%d", v->nr_pages);
diff --git a/mm/vmstat.c b/mm/vmstat.c
-index eded190..e4203d1 100644
+index 1b12d39..57b29b2 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
-@@ -20,6 +20,7 @@
+@@ -22,6 +22,7 @@
#include <linux/writeback.h>
#include <linux/compaction.h>
#include <linux/mm_inline.h>
@@ -101010,7 +100467,7 @@ index eded190..e4203d1 100644
#include "internal.h"
-@@ -79,7 +80,7 @@ void vm_events_fold_cpu(int cpu)
+@@ -81,7 +82,7 @@ void vm_events_fold_cpu(int cpu)
*
* vm_stat contains the global counters
*/
@@ -101019,16 +100476,16 @@ index eded190..e4203d1 100644
EXPORT_SYMBOL(vm_stat);
#ifdef CONFIG_SMP
-@@ -423,7 +424,7 @@ static inline void fold_diff(int *diff)
+@@ -433,7 +434,7 @@ static int fold_diff(int *diff)
for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
- if (diff[i])
+ if (diff[i]) {
- atomic_long_add(diff[i], &vm_stat[i]);
+ atomic_long_add_unchecked(diff[i], &vm_stat[i]);
- }
-
- /*
-@@ -455,7 +456,7 @@ static void refresh_cpu_vm_stats(void)
+ changes++;
+ }
+ return changes;
+@@ -471,7 +472,7 @@ static int refresh_cpu_vm_stats(void)
v = this_cpu_xchg(p->vm_stat_diff[i], 0);
if (v) {
@@ -101037,7 +100494,7 @@ index eded190..e4203d1 100644
global_diff[i] += v;
#ifdef CONFIG_NUMA
/* 3 seconds idle till flush */
-@@ -517,7 +518,7 @@ void cpu_vm_stats_fold(int cpu)
+@@ -535,7 +536,7 @@ void cpu_vm_stats_fold(int cpu)
v = p->vm_stat_diff[i];
p->vm_stat_diff[i] = 0;
@@ -101046,7 +100503,7 @@ index eded190..e4203d1 100644
global_diff[i] += v;
}
}
-@@ -537,8 +538,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
+@@ -555,8 +556,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
if (pset->vm_stat_diff[i]) {
int v = pset->vm_stat_diff[i];
pset->vm_stat_diff[i] = 0;
@@ -101057,7 +100514,7 @@ index eded190..e4203d1 100644
}
}
#endif
-@@ -1151,10 +1152,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
+@@ -1189,10 +1190,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
stat_items_size += sizeof(struct vm_event_state);
#endif
@@ -101081,8 +100538,8 @@ index eded190..e4203d1 100644
for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
v[i] = global_page_state(i);
v += NR_VM_ZONE_STAT_ITEMS;
-@@ -1303,10 +1316,16 @@ static int __init setup_vmstat(void)
- put_online_cpus();
+@@ -1424,10 +1437,16 @@ static int __init setup_vmstat(void)
+ cpu_notifier_register_done();
#endif
#ifdef CONFIG_PROC_FS
- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
@@ -101103,10 +100560,10 @@ index eded190..e4203d1 100644
return 0;
}
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
-index 44ebd5c..1f732bae 100644
+index 64c6bed..b79a5de 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
-@@ -475,7 +475,7 @@ out:
+@@ -481,7 +481,7 @@ out:
return NOTIFY_DONE;
}
@@ -101115,7 +100572,7 @@ index 44ebd5c..1f732bae 100644
.notifier_call = vlan_device_event,
};
-@@ -550,8 +550,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
+@@ -556,8 +556,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
err = -EPERM;
if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
break;
@@ -101126,7 +100583,7 @@ index 44ebd5c..1f732bae 100644
vn = net_generic(net, vlan_net_id);
diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
-index c7e634a..041cbdb 100644
+index 8ac8a5c..991defc 100644
--- a/net/8021q/vlan_netlink.c
+++ b/net/8021q/vlan_netlink.c
@@ -238,7 +238,7 @@ nla_put_failure:
@@ -101139,10 +100596,10 @@ index c7e634a..041cbdb 100644
.maxtype = IFLA_VLAN_MAX,
.policy = vlan_policy,
diff --git a/net/9p/client.c b/net/9p/client.c
-index 9186550..e604a2f 100644
+index e86a9bea..e91f70e 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
-@@ -588,7 +588,7 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,
+@@ -596,7 +596,7 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,
len - inline_len);
} else {
err = copy_from_user(ename + inline_len,
@@ -101151,7 +100608,7 @@ index 9186550..e604a2f 100644
if (err) {
err = -EFAULT;
goto out_err;
-@@ -1560,7 +1560,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
+@@ -1570,7 +1570,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
kernel_buf = 1;
indata = data;
} else
@@ -101160,7 +100617,7 @@ index 9186550..e604a2f 100644
/*
* response header len is 11
* PDU Header(7) + IO Size (4)
-@@ -1635,7 +1635,7 @@ p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
+@@ -1645,7 +1645,7 @@ p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
kernel_buf = 1;
odata = data;
} else
@@ -101192,10 +100649,10 @@ index 6ab36ae..6f1841b 100644
}
EXPORT_SYMBOL(v9fs_unregister_trans);
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
-index b7bd7f2..2498bf7 100644
+index 80d08f6..de63fd1 100644
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
-@@ -432,7 +432,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
+@@ -428,7 +428,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
oldfs = get_fs();
set_fs(get_ds());
/* The cast to a user pointer is valid due to the set_fs() */
@@ -101258,7 +100715,7 @@ index 876fbe8..8bbea9f 100644
#undef __HANDLE_ITEM
}
diff --git a/net/atm/lec.c b/net/atm/lec.c
-index 5a2f602..93961433 100644
+index 4b98f89..5a2f6cb 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
@@ -101396,10 +100853,10 @@ index 919a5ce..cc6b444 100644
table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
if (!table)
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
-index d074d06..ad3cfcf 100644
+index 1e80539..676c37a 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
-@@ -312,7 +312,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
+@@ -313,7 +313,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
/* randomize initial seqno to avoid collision */
get_random_bytes(&random_seqno, sizeof(random_seqno));
@@ -101408,7 +100865,7 @@ index d074d06..ad3cfcf 100644
hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
-@@ -917,9 +917,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
+@@ -918,9 +918,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
batadv_ogm_packet->tvlv_len = htons(tvlv_len);
/* change sequence number to network order */
@@ -101420,7 +100877,7 @@ index d074d06..ad3cfcf 100644
batadv_iv_ogm_slide_own_bcast_window(hard_iface);
-@@ -1596,7 +1596,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
+@@ -1597,7 +1597,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
return;
/* could be changed by schedule_own_packet() */
@@ -101430,7 +100887,7 @@ index d074d06..ad3cfcf 100644
if (ogm_packet->flags & BATADV_DIRECTLINK)
has_directlink_flag = true;
diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
-index e5c5f57..1f25f1c 100644
+index 00f9e14..e1c7203 100644
--- a/net/batman-adv/fragmentation.c
+++ b/net/batman-adv/fragmentation.c
@@ -450,7 +450,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
@@ -101443,11 +100900,11 @@ index e5c5f57..1f25f1c 100644
frag_header.no = 0;
frag_header.total_size = htons(skb->len);
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
-index f82c267..8a27a34 100644
+index 5467955..75ad4e3 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
-@@ -283,7 +283,7 @@ send:
- primary_if->net_dev->dev_addr, ETH_ALEN);
+@@ -296,7 +296,7 @@ send:
+ primary_if->net_dev->dev_addr);
/* set broadcast sequence number */
- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
@@ -101455,7 +100912,7 @@ index f82c267..8a27a34 100644
bcast_packet->seqno = htonl(seqno);
batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
-@@ -707,7 +707,7 @@ static int batadv_softif_init_late(struct net_device *dev)
+@@ -761,7 +761,7 @@ static int batadv_softif_init_late(struct net_device *dev)
atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
@@ -101464,7 +100921,7 @@ index f82c267..8a27a34 100644
atomic_set(&bat_priv->tt.vn, 0);
atomic_set(&bat_priv->tt.local_changes, 0);
atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
-@@ -721,7 +721,7 @@ static int batadv_softif_init_late(struct net_device *dev)
+@@ -775,7 +775,7 @@ static int batadv_softif_init_late(struct net_device *dev)
/* randomize initial seqno to avoid collision */
get_random_bytes(&random_seqno, sizeof(random_seqno));
@@ -101473,7 +100930,7 @@ index f82c267..8a27a34 100644
bat_priv->primary_if = NULL;
bat_priv->num_ifaces = 0;
-@@ -929,7 +929,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
+@@ -983,7 +983,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
return 0;
}
@@ -101483,10 +100940,10 @@ index f82c267..8a27a34 100644
.priv_size = sizeof(struct batadv_priv),
.setup = batadv_softif_init_early,
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
-index 78370ab..1cb3614 100644
+index 8854c05..ee5d5497 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
-@@ -66,7 +66,7 @@ enum batadv_dhcp_recipient {
+@@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
struct batadv_hard_iface_bat_iv {
unsigned char *ogm_buff;
int ogm_buff_len;
@@ -101495,7 +100952,7 @@ index 78370ab..1cb3614 100644
};
/**
-@@ -714,7 +714,7 @@ struct batadv_priv {
+@@ -768,7 +768,7 @@ struct batadv_priv {
atomic_t bonding;
atomic_t fragmentation;
atomic_t packet_size_max;
@@ -101504,7 +100961,7 @@ index 78370ab..1cb3614 100644
#ifdef CONFIG_BATMAN_ADV_BLA
atomic_t bridge_loop_avoidance;
#endif
-@@ -730,7 +730,7 @@ struct batadv_priv {
+@@ -787,7 +787,7 @@ struct batadv_priv {
#endif
uint32_t isolation_mark;
uint32_t isolation_mark_mask;
@@ -101513,8 +100970,20 @@ index 78370ab..1cb3614 100644
atomic_t bcast_queue_left;
atomic_t batman_queue_left;
char num_ifaces;
+diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
+index cfbb39e..0bbfc9d 100644
+--- a/net/bluetooth/6lowpan.c
++++ b/net/bluetooth/6lowpan.c
+@@ -367,7 +367,6 @@ static int recv_pkt(struct sk_buff *skb, struct net_device *dev,
+
+ drop:
+ dev->stats.rx_dropped++;
+- kfree_skb(skb);
+ return NET_RX_DROP;
+ }
+
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
-index a841d3e..c7a19a1 100644
+index 85bcc21..ce82722d 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -533,6 +533,9 @@ int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock)
@@ -101542,10 +101011,10 @@ index 67fe5e8..278a194 100644
if (!session)
return -ENOMEM;
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
-index 7552f9e..074ce29 100644
+index 115f149..f0ba286 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
-@@ -1052,7 +1052,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
+@@ -1067,7 +1067,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
uf.event_mask[1] = *((u32 *) f->event_mask + 1);
}
@@ -101555,10 +101024,10 @@ index 7552f9e..074ce29 100644
err = -EFAULT;
break;
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
-index d9fb934..6134618 100644
+index 1b7d605..02ebd10 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
-@@ -1332,13 +1332,14 @@ int hidp_connection_add(struct hidp_connadd_req *req,
+@@ -1318,13 +1318,14 @@ int hidp_connection_add(struct hidp_connadd_req *req,
{
struct hidp_session *session;
struct l2cap_conn *conn;
@@ -101573,12 +101042,12 @@ index d9fb934..6134618 100644
+ chan = l2cap_pi(ctrl_sock->sk)->chan;
conn = NULL;
l2cap_chan_lock(chan);
- if (chan->conn) {
+ if (chan->conn)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
-index 0007c9e..f11541b 100644
+index b6f9777..36d3039 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
-@@ -3736,8 +3736,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
+@@ -3512,8 +3512,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
break;
case L2CAP_CONF_RFC:
@@ -101592,10 +101061,10 @@ index 0007c9e..f11541b 100644
if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
rfc.mode != chan->mode)
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
-index 06a7a76..86dd829 100644
+index 31f106e..323f606 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
-@@ -625,7 +625,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
+@@ -628,7 +628,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
struct sock *sk = sock->sk;
struct l2cap_chan *chan = l2cap_pi(sk)->chan;
struct l2cap_options opts;
@@ -101605,7 +101074,7 @@ index 06a7a76..86dd829 100644
u32 opt;
BT_DBG("sk %p", sk);
-@@ -652,7 +653,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
+@@ -655,7 +656,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
opts.max_tx = chan->max_tx;
opts.txwin_size = chan->tx_win;
@@ -101614,7 +101083,7 @@ index 06a7a76..86dd829 100644
if (copy_from_user((char *) &opts, optval, len)) {
err = -EFAULT;
break;
-@@ -734,7 +735,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
+@@ -742,7 +743,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
struct bt_security sec;
struct bt_power pwr;
struct l2cap_conn *conn;
@@ -101624,7 +101093,7 @@ index 06a7a76..86dd829 100644
u32 opt;
BT_DBG("sk %p", sk);
-@@ -757,7 +759,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
+@@ -766,7 +768,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
sec.level = BT_SECURITY_LOW;
@@ -101633,7 +101102,7 @@ index 06a7a76..86dd829 100644
if (copy_from_user((char *) &sec, optval, len)) {
err = -EFAULT;
break;
-@@ -852,7 +854,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
+@@ -862,7 +864,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
@@ -101643,10 +101112,10 @@ index 06a7a76..86dd829 100644
err = -EFAULT;
break;
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
-index a0050de..59c6178 100644
+index 8bbbb5e..6fc0950 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
-@@ -672,7 +672,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
+@@ -687,7 +687,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
struct sock *sk = sock->sk;
struct bt_security sec;
int err = 0;
@@ -101655,7 +101124,7 @@ index a0050de..59c6178 100644
u32 opt;
BT_DBG("sk %p", sk);
-@@ -694,7 +694,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
+@@ -709,7 +709,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
sec.level = BT_SECURITY_LOW;
@@ -101665,10 +101134,10 @@ index a0050de..59c6178 100644
err = -EFAULT;
break;
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
-index f9c0980a..fcbbfeb 100644
+index 8e385a0..a5bdd8e 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
-@@ -717,7 +717,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
+@@ -752,7 +752,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
BT_DBG("tty %p id %d", tty, tty->index);
BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
@@ -101677,7 +101146,7 @@ index f9c0980a..fcbbfeb 100644
err = tty_port_open(&dev->port, tty, filp);
if (err)
-@@ -740,7 +740,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
+@@ -775,7 +775,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
@@ -101687,23 +101156,23 @@ index f9c0980a..fcbbfeb 100644
tty_port_close(&dev->port, tty, filp);
}
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
-index e8844d9..df3afa0 100644
+index e5ec470..cbfabd1 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
-@@ -482,7 +482,7 @@ static struct rtnl_af_ops br_af_ops = {
+@@ -564,7 +564,7 @@ static struct rtnl_af_ops br_af_ops = {
.get_link_af_size = br_get_link_af_size,
};
-struct rtnl_link_ops br_link_ops __read_mostly = {
+struct rtnl_link_ops br_link_ops = {
- .kind = "bridge",
- .priv_size = sizeof(struct net_bridge),
- .setup = br_dev_setup,
+ .kind = "bridge",
+ .priv_size = sizeof(struct net_bridge),
+ .setup = br_dev_setup,
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
-index 1059ed3..d70846a 100644
+index d9a8c05..8dadc6c6 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
-@@ -1524,7 +1524,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
+@@ -1533,7 +1533,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
tmp.valid_hooks = t->table->valid_hooks;
}
mutex_unlock(&ebt_mutex);
@@ -101712,7 +101181,7 @@ index 1059ed3..d70846a 100644
BUGPRINT("c2u Didn't work\n");
ret = -EFAULT;
break;
-@@ -2330,7 +2330,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
+@@ -2339,7 +2339,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
goto out;
tmp.valid_hooks = t->valid_hooks;
@@ -101721,7 +101190,7 @@ index 1059ed3..d70846a 100644
ret = -EFAULT;
break;
}
-@@ -2341,7 +2341,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
+@@ -2350,7 +2350,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
tmp.entries_size = t->table->entries_size;
tmp.valid_hooks = t->table->valid_hooks;
@@ -101731,7 +101200,7 @@ index 1059ed3..d70846a 100644
break;
}
diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
-index 0f45522..dab651f 100644
+index f5afda1..dcf770a 100644
--- a/net/caif/cfctrl.c
+++ b/net/caif/cfctrl.c
@@ -10,6 +10,7 @@
@@ -101787,10 +101256,10 @@ index 4589ff67..46d6b8f 100644
.priv_size = sizeof(struct chnl_net),
.setup = ipcaif_net_setup,
diff --git a/net/can/af_can.c b/net/can/af_can.c
-index a27f8aa..67174a3 100644
+index ce82337..5d17b4d 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
-@@ -863,7 +863,7 @@ static const struct net_proto_family can_family_ops = {
+@@ -884,7 +884,7 @@ static const struct net_proto_family can_family_ops = {
};
/* notifier block for netdevice event */
@@ -101844,10 +101313,10 @@ index 050a211..bb9fe33 100644
if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
diff --git a/net/can/proc.c b/net/can/proc.c
-index b543470..d2ddae2 100644
+index 1a19b98..df2b4ec 100644
--- a/net/can/proc.c
+++ b/net/can/proc.c
-@@ -468,7 +468,7 @@ static void can_remove_proc_readentry(const char *name)
+@@ -514,7 +514,7 @@ static void can_remove_proc_readentry(const char *name)
void can_init_proc(void)
{
/* create /proc/net/can directory */
@@ -101857,10 +101326,10 @@ index b543470..d2ddae2 100644
if (!can_dir) {
printk(KERN_INFO "can: failed to create /proc/net/can . "
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
-index 2e87eec..6301eb0 100644
+index 8d1653c..77ad145 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
-@@ -187,7 +187,7 @@ static void con_fault(struct ceph_connection *con);
+@@ -188,7 +188,7 @@ static void con_fault(struct ceph_connection *con);
#define MAX_ADDR_STR_LEN 64 /* 54 is enough */
static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
@@ -101869,7 +101338,7 @@ index 2e87eec..6301eb0 100644
static struct page *zero_page; /* used in certain error cases */
-@@ -198,7 +198,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
+@@ -199,7 +199,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
@@ -101879,7 +101348,7 @@ index 2e87eec..6301eb0 100644
switch (ss->ss_family) {
diff --git a/net/compat.c b/net/compat.c
-index cbc1a2a..ab7644e 100644
+index bc8aeef..f9c070c 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -73,9 +73,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
@@ -102009,7 +101478,7 @@ index cbc1a2a..ab7644e 100644
struct group_filter __user *kgf;
int __user *koptlen;
u32 interface, fmode, numsrc;
-@@ -804,7 +804,7 @@ asmlinkage long compat_sys_socketcall(int call, u32 __user *args)
+@@ -804,7 +804,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
if (call < SYS_SOCKET || call > SYS_SENDMMSG)
return -EINVAL;
@@ -102019,7 +101488,7 @@ index cbc1a2a..ab7644e 100644
a0 = a[0];
a1 = a[1];
diff --git a/net/core/datagram.c b/net/core/datagram.c
-index a16ed7b..eb44d17 100644
+index fdbc9a8..cd6972c 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -301,7 +301,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
@@ -102032,10 +101501,10 @@ index a16ed7b..eb44d17 100644
return err;
diff --git a/net/core/dev.c b/net/core/dev.c
-index 86bb9cc..8814d50 100644
+index 8440968..e14d2b7 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -1695,14 +1695,14 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
+@@ -1683,14 +1683,14 @@ int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
{
if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
@@ -102052,16 +101521,16 @@ index 86bb9cc..8814d50 100644
kfree_skb(skb);
return NET_RX_DROP;
}
-@@ -2461,7 +2461,7 @@ static int illegal_highdma(const struct net_device *dev, struct sk_buff *skb)
-
- struct dev_gso_cb {
- void (*destructor)(struct sk_buff *skb);
--};
-+} __no_const;
-
- #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
+@@ -2994,7 +2994,7 @@ recursion_alert:
+ drop:
+ rcu_read_unlock_bh();
-@@ -3238,7 +3238,7 @@ enqueue:
+- atomic_long_inc(&dev->tx_dropped);
++ atomic_long_inc_unchecked(&dev->tx_dropped);
+ kfree_skb_list(skb);
+ return rc;
+ out:
+@@ -3337,7 +3337,7 @@ enqueue:
local_irq_restore(flags);
@@ -102070,16 +101539,16 @@ index 86bb9cc..8814d50 100644
kfree_skb(skb);
return NET_RX_DROP;
}
-@@ -3319,7 +3319,7 @@ int netif_rx_ni(struct sk_buff *skb)
+@@ -3414,7 +3414,7 @@ int netif_rx_ni(struct sk_buff *skb)
}
EXPORT_SYMBOL(netif_rx_ni);
-static void net_tx_action(struct softirq_action *h)
+static __latent_entropy void net_tx_action(void)
{
- struct softnet_data *sd = &__get_cpu_var(softnet_data);
+ struct softnet_data *sd = this_cpu_ptr(&softnet_data);
-@@ -3656,7 +3656,7 @@ ncls:
+@@ -3747,7 +3747,7 @@ ncls:
ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
} else {
drop:
@@ -102088,153 +101557,149 @@ index 86bb9cc..8814d50 100644
kfree_skb(skb);
/* Jamal, now you will not able to escape explaining
* me how you were going to use this. :-)
-@@ -4346,7 +4346,7 @@ void netif_napi_del(struct napi_struct *napi)
+@@ -4511,7 +4511,7 @@ void netif_napi_del(struct napi_struct *napi)
}
EXPORT_SYMBOL(netif_napi_del);
-static void net_rx_action(struct softirq_action *h)
+static __latent_entropy void net_rx_action(void)
{
- struct softnet_data *sd = &__get_cpu_var(softnet_data);
+ struct softnet_data *sd = this_cpu_ptr(&softnet_data);
unsigned long time_limit = jiffies + 2;
-@@ -6376,7 +6376,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
+@@ -5247,7 +5247,7 @@ void netdev_upper_dev_unlink(struct net_device *dev,
+ }
+ EXPORT_SYMBOL(netdev_upper_dev_unlink);
+
+-void netdev_adjacent_add_links(struct net_device *dev)
++static void netdev_adjacent_add_links(struct net_device *dev)
+ {
+ struct netdev_adjacent *iter;
+
+@@ -5272,7 +5272,7 @@ void netdev_adjacent_add_links(struct net_device *dev)
+ }
+ }
+
+-void netdev_adjacent_del_links(struct net_device *dev)
++static void netdev_adjacent_del_links(struct net_device *dev)
+ {
+ struct netdev_adjacent *iter;
+
+@@ -6557,8 +6557,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
} else {
netdev_stats_to_stats64(storage, &dev->stats);
}
- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
+- storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
++ storage->tx_dropped += atomic_long_read_unchecked(&dev->tx_dropped);
return storage;
}
EXPORT_SYMBOL(dev_get_stats);
+@@ -6574,7 +6574,7 @@ struct netdev_queue *dev_ingress_queue_create(struct net_device *dev)
+ if (!queue)
+ return NULL;
+ netdev_init_one_queue(dev, queue, NULL);
+- queue->qdisc = &noop_qdisc;
++ RCU_INIT_POINTER(queue->qdisc, &noop_qdisc);
+ queue->qdisc_sleeping = &noop_qdisc;
+ rcu_assign_pointer(dev->ingress_queue, queue);
+ #endif
diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
-index cf999e0..c59a9754 100644
+index 72e899a..79a9409 100644
--- a/net/core/dev_ioctl.c
+++ b/net/core/dev_ioctl.c
-@@ -366,9 +366,13 @@ void dev_load(struct net *net, const char *name)
+@@ -365,8 +365,13 @@ void dev_load(struct net *net, const char *name)
+ no_module = !dev;
if (no_module && capable(CAP_NET_ADMIN))
no_module = request_module("netdev-%s", name);
- if (no_module && capable(CAP_SYS_MODULE)) {
+- if (no_module && capable(CAP_SYS_MODULE))
++ if (no_module && capable(CAP_SYS_MODULE)) {
+#ifdef CONFIG_GRKERNSEC_MODHARDEN
+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
+#else
- if (!request_module("%s", name))
- pr_warn("Loading kernel module for a network device with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s instead.\n",
- name);
+ request_module("%s", name);
+#endif
- }
++ }
}
EXPORT_SYMBOL(dev_load);
+
diff --git a/net/core/filter.c b/net/core/filter.c
-index ebce437..9fed9d0 100644
+index 647b122..18a7ff6 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
-@@ -126,7 +126,7 @@ unsigned int sk_run_filter(const struct sk_buff *skb,
- void *ptr;
- u32 A = 0; /* Accumulator */
- u32 X = 0; /* Index Register */
-- u32 mem[BPF_MEMWORDS]; /* Scratch Memory Store */
-+ u32 mem[BPF_MEMWORDS] = {}; /* Scratch Memory Store */
- u32 tmp;
- int k;
+@@ -532,7 +532,11 @@ do_pass:
-@@ -292,10 +292,10 @@ load_b:
- X = K;
- continue;
- case BPF_S_LD_MEM:
-- A = mem[K];
-+ A = mem[K&15];
- continue;
- case BPF_S_LDX_MEM:
-- X = mem[K];
-+ X = mem[K&15];
- continue;
- case BPF_S_MISC_TAX:
- X = A;
-@@ -308,10 +308,10 @@ load_b:
- case BPF_S_RET_A:
- return A;
- case BPF_S_ST:
-- mem[K] = A;
-+ mem[K&15] = A;
- continue;
- case BPF_S_STX:
-- mem[K] = X;
-+ mem[K&15] = X;
- continue;
- case BPF_S_ANC_PROTOCOL:
- A = ntohs(skb->protocol);
-@@ -395,9 +395,10 @@ load_b:
- continue;
- #endif
+ /* Unkown instruction. */
default:
-- WARN_RATELIMIT(1, "Unknown code:%u jt:%u tf:%u k:%u\n",
+- goto err;
+ WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
- fentry->code, fentry->jt,
- fentry->jf, fentry->k);
++ fp->code, fp->jt, fp->jf, fp->k);
++ kfree(addrs);
+ BUG();
- return 0;
++ return -EINVAL;
}
- }
-@@ -420,7 +421,7 @@ static int check_load_and_stores(struct sock_filter *filter, int flen)
- u16 *masks, memvalid = 0; /* one bit per cell, 16 cells */
+
+ insn++;
+@@ -576,7 +580,7 @@ static int check_load_and_stores(const struct sock_filter *filter, int flen)
+ u16 *masks, memvalid = 0; /* One bit per cell, 16 cells */
int pc, ret = 0;
- BUILD_BUG_ON(BPF_MEMWORDS > 16);
+ BUILD_BUG_ON(BPF_MEMWORDS != 16);
- masks = kmalloc(flen * sizeof(*masks), GFP_KERNEL);
+
+ masks = kmalloc_array(flen, sizeof(*masks), GFP_KERNEL);
if (!masks)
- return -ENOMEM;
-@@ -683,7 +684,7 @@ int sk_unattached_filter_create(struct sk_filter **pfp,
- fp = kmalloc(sk_filter_size(fprog->len), GFP_KERNEL);
+@@ -987,7 +991,7 @@ int bpf_prog_create(struct bpf_prog **pfp, struct sock_fprog_kern *fprog)
if (!fp)
return -ENOMEM;
+
- memcpy(fp->insns, fprog->filter, fsize);
+ memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
- atomic_set(&fp->refcnt, 1);
fp->len = fprog->len;
+ /* Since unattached filters are not copied back to user
diff --git a/net/core/flow.c b/net/core/flow.c
-index dfa602c..3103d88 100644
+index a0348fd..340f65d 100644
--- a/net/core/flow.c
+++ b/net/core/flow.c
-@@ -61,7 +61,7 @@ struct flow_cache {
- struct timer_list rnd_timer;
- };
-
--atomic_t flow_cache_genid = ATOMIC_INIT(0);
-+atomic_unchecked_t flow_cache_genid = ATOMIC_INIT(0);
- EXPORT_SYMBOL(flow_cache_genid);
- static struct flow_cache flow_cache_global;
- static struct kmem_cache *flow_cachep __read_mostly;
-@@ -86,7 +86,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
-
- static int flow_entry_valid(struct flow_cache_entry *fle)
+@@ -65,7 +65,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
+ static int flow_entry_valid(struct flow_cache_entry *fle,
+ struct netns_xfrm *xfrm)
{
-- if (atomic_read(&flow_cache_genid) != fle->genid)
-+ if (atomic_read_unchecked(&flow_cache_genid) != fle->genid)
+- if (atomic_read(&xfrm->flow_cache_genid) != fle->genid)
++ if (atomic_read_unchecked(&xfrm->flow_cache_genid) != fle->genid)
return 0;
if (fle->object && !fle->object->ops->check(fle->object))
return 0;
-@@ -258,7 +258,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
+@@ -242,7 +242,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
fcp->hash_count++;
}
-- } else if (likely(fle->genid == atomic_read(&flow_cache_genid))) {
-+ } else if (likely(fle->genid == atomic_read_unchecked(&flow_cache_genid))) {
+- } else if (likely(fle->genid == atomic_read(&net->xfrm.flow_cache_genid))) {
++ } else if (likely(fle->genid == atomic_read_unchecked(&net->xfrm.flow_cache_genid))) {
flo = fle->object;
if (!flo)
goto ret_object;
-@@ -279,7 +279,7 @@ nocache:
+@@ -263,7 +263,7 @@ nocache:
}
flo = resolver(net, key, family, dir, flo, ctx);
if (fle) {
-- fle->genid = atomic_read(&flow_cache_genid);
-+ fle->genid = atomic_read_unchecked(&flow_cache_genid);
+- fle->genid = atomic_read(&net->xfrm.flow_cache_genid);
++ fle->genid = atomic_read_unchecked(&net->xfrm.flow_cache_genid);
if (!IS_ERR(flo))
fle->object = flo;
else
+@@ -379,7 +379,7 @@ done:
+ static void flow_cache_flush_task(struct work_struct *work)
+ {
+ struct netns_xfrm *xfrm = container_of(work, struct netns_xfrm,
+- flow_cache_gc_work);
++ flow_cache_flush_work);
+ struct net *net = container_of(xfrm, struct net, xfrm);
+
+ flow_cache_flush(net);
diff --git a/net/core/iovec.c b/net/core/iovec.c
-index 26dc006..89e838e 100644
+index e1ec45a..e5c6f16 100644
--- a/net/core/iovec.c
+++ b/net/core/iovec.c
@@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
@@ -102256,10 +101721,10 @@ index 26dc006..89e838e 100644
m->msg_iov = iov;
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
-index 7d95f69..a6065de 100644
+index ef31fef..8be66d9 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
-@@ -2824,7 +2824,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
+@@ -2825,7 +2825,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
int size, ret;
@@ -102268,7 +101733,7 @@ index 7d95f69..a6065de 100644
tmp.extra1 = &zero;
tmp.extra2 = &unres_qlen_max;
-@@ -2886,7 +2886,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
+@@ -2887,7 +2887,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
void __user *buffer,
size_t *lenp, loff_t *ppos)
{
@@ -102277,23 +101742,6 @@ index 7d95f69..a6065de 100644
int ret;
tmp.extra1 = &zero;
-@@ -3058,11 +3058,12 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,
- memset(&t->neigh_vars[NEIGH_VAR_GC_INTERVAL], 0,
- sizeof(t->neigh_vars[NEIGH_VAR_GC_INTERVAL]));
- } else {
-+ struct neigh_table *ntable = container_of(p, struct neigh_table, parms);
- dev_name_source = "default";
-- t->neigh_vars[NEIGH_VAR_GC_INTERVAL].data = (int *)(p + 1);
-- t->neigh_vars[NEIGH_VAR_GC_THRESH1].data = (int *)(p + 1) + 1;
-- t->neigh_vars[NEIGH_VAR_GC_THRESH2].data = (int *)(p + 1) + 2;
-- t->neigh_vars[NEIGH_VAR_GC_THRESH3].data = (int *)(p + 1) + 3;
-+ t->neigh_vars[NEIGH_VAR_GC_INTERVAL].data = &ntable->gc_interval;
-+ t->neigh_vars[NEIGH_VAR_GC_THRESH1].data = &ntable->gc_thresh1;
-+ t->neigh_vars[NEIGH_VAR_GC_THRESH2].data = &ntable->gc_thresh2;
-+ t->neigh_vars[NEIGH_VAR_GC_THRESH3].data = &ntable->gc_thresh3;
- }
-
- if (handler) {
diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
index 2bf8329..2eb1423 100644
--- a/net/core/net-procfs.c
@@ -102345,11 +101793,24 @@ index 2bf8329..2eb1423 100644
}
return 0;
+diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
+index 9dd0669..c52fb1b 100644
+--- a/net/core/net-sysfs.c
++++ b/net/core/net-sysfs.c
+@@ -278,7 +278,7 @@ static ssize_t carrier_changes_show(struct device *dev,
+ {
+ struct net_device *netdev = to_net_dev(dev);
+ return sprintf(buf, fmt_dec,
+- atomic_read(&netdev->carrier_changes));
++ atomic_read_unchecked(&netdev->carrier_changes));
+ }
+ static DEVICE_ATTR_RO(carrier_changes);
+
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
-index 7c8ffd9..0cb3687 100644
+index 7f15517..f7d65c0 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
-@@ -443,7 +443,7 @@ static int __register_pernet_operations(struct list_head *list,
+@@ -445,7 +445,7 @@ static int __register_pernet_operations(struct list_head *list,
int error;
LIST_HEAD(net_exit_list);
@@ -102358,7 +101819,7 @@ index 7c8ffd9..0cb3687 100644
if (ops->init || (ops->id && ops->size)) {
for_each_net(net) {
error = ops_init(ops, net);
-@@ -456,7 +456,7 @@ static int __register_pernet_operations(struct list_head *list,
+@@ -458,7 +458,7 @@ static int __register_pernet_operations(struct list_head *list,
out_undo:
/* If I have an error cleanup all namespaces I initialized */
@@ -102367,7 +101828,7 @@ index 7c8ffd9..0cb3687 100644
ops_exit_list(ops, &net_exit_list);
ops_free_list(ops, &net_exit_list);
return error;
-@@ -467,7 +467,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
+@@ -469,7 +469,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
struct net *net;
LIST_HEAD(net_exit_list);
@@ -102376,7 +101837,7 @@ index 7c8ffd9..0cb3687 100644
for_each_net(net)
list_add_tail(&net->exit_list, &net_exit_list);
ops_exit_list(ops, &net_exit_list);
-@@ -601,7 +601,7 @@ int register_pernet_device(struct pernet_operations *ops)
+@@ -603,7 +603,7 @@ int register_pernet_device(struct pernet_operations *ops)
mutex_lock(&net_mutex);
error = register_pernet_operations(&pernet_list, ops);
if (!error && (first_device == &pernet_list))
@@ -102386,10 +101847,10 @@ index 7c8ffd9..0cb3687 100644
return error;
}
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
-index 723fa7d..81bd037 100644
+index e6645b4..43e1af9 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
-@@ -435,7 +435,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
+@@ -379,7 +379,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
struct udphdr *udph;
struct iphdr *iph;
struct ethhdr *eth;
@@ -102398,7 +101859,7 @@ index 723fa7d..81bd037 100644
struct ipv6hdr *ip6h;
udp_len = len + sizeof(*udph);
-@@ -506,7 +506,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
+@@ -450,7 +450,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
put_unaligned(0x45, (unsigned char *)iph);
iph->tos = 0;
put_unaligned(htons(ip_len), &(iph->tot_len));
@@ -102408,10 +101869,10 @@ index 723fa7d..81bd037 100644
iph->ttl = 64;
iph->protocol = IPPROTO_UDP;
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
-index fdac61c..e5e5b46 100644
+index 443256b..bbff424 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
-@@ -3719,7 +3719,7 @@ static int __net_init pg_net_init(struct net *net)
+@@ -3753,7 +3753,7 @@ static int __net_init pg_net_init(struct net *net)
pn->net = net;
INIT_LIST_HEAD(&pn->pktgen_threads);
pn->pktgen_exiting = false;
@@ -102421,7 +101882,7 @@ index fdac61c..e5e5b46 100644
pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
return -ENODEV;
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
-index 4617586..d6ea668 100644
+index 76321ea..3129bd6 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -58,7 +58,7 @@ struct rtnl_link {
@@ -102433,13 +101894,13 @@ index 4617586..d6ea668 100644
static DEFINE_MUTEX(rtnl_mutex);
-@@ -299,10 +299,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
- if (rtnl_link_ops_get(ops->kind))
- return -EEXIST;
-
-- if (!ops->dellink)
+@@ -304,10 +304,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
+ * to use the ops for creating device. So do not
+ * fill up dellink as well. That disables rtnl_dellink.
+ */
+- if (ops->setup && !ops->dellink)
- ops->dellink = unregister_netdevice_queue;
-+ if (!ops->dellink) {
++ if (ops->setup && !ops->dellink) {
+ pax_open_kernel();
+ *(void **)&ops->dellink = unregister_netdevice_queue;
+ pax_close_kernel();
@@ -102450,7 +101911,7 @@ index 4617586..d6ea668 100644
return 0;
}
EXPORT_SYMBOL_GPL(__rtnl_link_register);
-@@ -349,7 +352,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
+@@ -354,7 +357,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
for_each_net(net) {
__rtnl_kill_links(net, ops);
}
@@ -102459,26 +101920,15 @@ index 4617586..d6ea668 100644
}
EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
-@@ -2685,6 +2688,9 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh)
- if (br_spec) {
- nla_for_each_nested(attr, br_spec, rem) {
- if (nla_type(attr) == IFLA_BRIDGE_FLAGS) {
-+ if (nla_len(attr) < sizeof(flags))
-+ return -EINVAL;
-+
- have_flags = true;
- flags = nla_get_u16(attr);
- break;
-@@ -2755,6 +2761,9 @@ static int rtnl_bridge_dellink(struct sk_buff *skb, struct nlmsghdr *nlh)
- if (br_spec) {
- nla_for_each_nested(attr, br_spec, rem) {
- if (nla_type(attr) == IFLA_BRIDGE_FLAGS) {
-+ if (nla_len(attr) < sizeof(flags))
-+ return -EINVAL;
-+
- have_flags = true;
- flags = nla_get_u16(attr);
- break;
+@@ -1014,7 +1017,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
+ (dev->ifalias &&
+ nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
+ nla_put_u32(skb, IFLA_CARRIER_CHANGES,
+- atomic_read(&dev->carrier_changes)))
++ atomic_read_unchecked(&dev->carrier_changes)))
+ goto nla_put_failure;
+
+ if (1) {
diff --git a/net/core/scm.c b/net/core/scm.c
index b442e7e..6f5b5a2 100644
--- a/net/core/scm.c
@@ -102520,47 +101970,10 @@ index b442e7e..6f5b5a2 100644
{
struct socket *sock;
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
-index e2b1bba..71bd8fe 100644
+index d7543d0..ff96aec 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
-@@ -360,18 +360,29 @@ refill:
- goto end;
- }
- nc->frag.size = PAGE_SIZE << order;
--recycle:
-- atomic_set(&nc->frag.page->_count, NETDEV_PAGECNT_MAX_BIAS);
-+ /* Even if we own the page, we do not use atomic_set().
-+ * This would break get_page_unless_zero() users.
-+ */
-+ atomic_add(NETDEV_PAGECNT_MAX_BIAS - 1,
-+ &nc->frag.page->_count);
- nc->pagecnt_bias = NETDEV_PAGECNT_MAX_BIAS;
- nc->frag.offset = 0;
- }
-
- if (nc->frag.offset + fragsz > nc->frag.size) {
-- /* avoid unnecessary locked operations if possible */
-- if ((atomic_read(&nc->frag.page->_count) == nc->pagecnt_bias) ||
-- atomic_sub_and_test(nc->pagecnt_bias, &nc->frag.page->_count))
-- goto recycle;
-- goto refill;
-+ if (atomic_read(&nc->frag.page->_count) != nc->pagecnt_bias) {
-+ if (!atomic_sub_and_test(nc->pagecnt_bias,
-+ &nc->frag.page->_count))
-+ goto refill;
-+ /* OK, page count is 0, we can safely set it */
-+ atomic_set(&nc->frag.page->_count,
-+ NETDEV_PAGECNT_MAX_BIAS);
-+ } else {
-+ atomic_add(NETDEV_PAGECNT_MAX_BIAS - nc->pagecnt_bias,
-+ &nc->frag.page->_count);
-+ }
-+ nc->pagecnt_bias = NETDEV_PAGECNT_MAX_BIAS;
-+ nc->frag.offset = 0;
- }
-
- data = page_address(nc->frag.page) + nc->frag.offset;
-@@ -2004,7 +2015,7 @@ EXPORT_SYMBOL(__skb_checksum);
+@@ -2025,7 +2025,7 @@ EXPORT_SYMBOL(__skb_checksum);
__wsum skb_checksum(const struct sk_buff *skb, int offset,
int len, __wsum csum)
{
@@ -102569,7 +101982,7 @@ index e2b1bba..71bd8fe 100644
.update = csum_partial_ext,
.combine = csum_block_add_ext,
};
-@@ -3225,13 +3236,15 @@ void __init skb_init(void)
+@@ -3255,12 +3255,14 @@ void __init skb_init(void)
skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
sizeof(struct sk_buff),
0,
@@ -102578,8 +101991,7 @@ index e2b1bba..71bd8fe 100644
+ SLAB_NO_SANITIZE,
NULL);
skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
- (2*sizeof(struct sk_buff)) +
- sizeof(atomic_t),
+ sizeof(struct sk_buff_fclones),
0,
- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
@@ -102588,10 +102000,10 @@ index e2b1bba..71bd8fe 100644
}
diff --git a/net/core/sock.c b/net/core/sock.c
-index c806956..b63d825 100644
+index 15e0c67..0310f4a 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
-@@ -442,7 +442,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+@@ -441,7 +441,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
struct sk_buff_head *list = &sk->sk_receive_queue;
if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
@@ -102600,7 +102012,7 @@ index c806956..b63d825 100644
trace_sock_rcvqueue_full(sk, skb);
return -ENOMEM;
}
-@@ -452,7 +452,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+@@ -451,7 +451,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
return err;
if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
@@ -102609,7 +102021,7 @@ index c806956..b63d825 100644
return -ENOBUFS;
}
-@@ -472,7 +472,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+@@ -464,7 +464,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
skb_dst_force(skb);
spin_lock_irqsave(&list->lock, flags);
@@ -102618,16 +102030,16 @@ index c806956..b63d825 100644
__skb_queue_tail(list, skb);
spin_unlock_irqrestore(&list->lock, flags);
-@@ -492,7 +492,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
+@@ -484,7 +484,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
skb->dev = NULL;
- if (sk_rcvqueues_full(sk, skb, sk->sk_rcvbuf)) {
+ if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
- atomic_inc(&sk->sk_drops);
+ atomic_inc_unchecked(&sk->sk_drops);
goto discard_and_relse;
}
if (nested)
-@@ -510,7 +510,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
+@@ -502,7 +502,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
} else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
bh_unlock_sock(sk);
@@ -102636,7 +102048,7 @@ index c806956..b63d825 100644
goto discard_and_relse;
}
-@@ -998,12 +998,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
+@@ -991,12 +991,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
struct timeval tm;
} v;
@@ -102652,7 +102064,7 @@ index c806956..b63d825 100644
return -EINVAL;
memset(&v, 0, sizeof(v));
-@@ -1155,11 +1155,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
+@@ -1134,11 +1134,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
case SO_PEERNAME:
{
@@ -102666,7 +102078,7 @@ index c806956..b63d825 100644
return -EINVAL;
if (copy_to_user(optval, address, len))
return -EFAULT;
-@@ -1240,7 +1240,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
+@@ -1219,7 +1219,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
if (len > lv)
len = lv;
@@ -102675,16 +102087,7 @@ index c806956..b63d825 100644
return -EFAULT;
lenout:
if (put_user(len, optlen))
-@@ -1731,6 +1731,8 @@ EXPORT_SYMBOL(sock_kmalloc);
- */
- void sock_kfree_s(struct sock *sk, void *mem, int size)
- {
-+ if (WARN_ON_ONCE(!mem))
-+ return;
- kfree(mem);
- atomic_sub(size, &sk->sk_omem_alloc);
- }
-@@ -2375,7 +2377,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
+@@ -2315,7 +2315,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
*/
smp_wmb();
atomic_set(&sk->sk_refcnt, 1);
@@ -102693,15 +102096,15 @@ index c806956..b63d825 100644
}
EXPORT_SYMBOL(sock_init_data);
-@@ -2503,6 +2505,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
+@@ -2443,6 +2443,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
int level, int type)
{
+ struct sock_extended_err ee;
struct sock_exterr_skb *serr;
- struct sk_buff *skb, *skb2;
+ struct sk_buff *skb;
int copied, err;
-@@ -2524,7 +2527,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
+@@ -2464,7 +2465,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
sock_recv_timestamp(msg, sk, skb);
serr = SKB_EXT_ERR(skb);
@@ -102712,7 +102115,7 @@ index c806956..b63d825 100644
msg->msg_flags |= MSG_ERRQUEUE;
err = copied;
diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
-index c38e7a2..773e3d7 100644
+index ad704c7..ca48aff 100644
--- a/net/core/sock_diag.c
+++ b/net/core/sock_diag.c
@@ -9,26 +9,33 @@
@@ -102750,7 +102153,7 @@ index c38e7a2..773e3d7 100644
}
EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
-@@ -113,8 +120,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
+@@ -110,8 +117,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
mutex_lock(&sock_diag_table_mutex);
if (sock_diag_handlers[hndl->family])
err = -EBUSY;
@@ -102763,7 +102166,7 @@ index c38e7a2..773e3d7 100644
mutex_unlock(&sock_diag_table_mutex);
return err;
-@@ -130,7 +140,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
+@@ -127,7 +137,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
mutex_lock(&sock_diag_table_mutex);
BUG_ON(sock_diag_handlers[family] != hnld);
@@ -102774,7 +102177,7 @@ index c38e7a2..773e3d7 100644
}
EXPORT_SYMBOL_GPL(sock_diag_unregister);
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
-index cf9cd13..8b56af3 100644
+index cf9cd13..50683950 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -32,7 +32,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
@@ -102795,6 +102198,15 @@ index cf9cd13..8b56af3 100644
.data = id,
.maxlen = IFNAMSIZ,
};
+@@ -263,7 +263,7 @@ static struct ctl_table net_core_table[] = {
+ .mode = 0644,
+ .proc_handler = proc_dointvec
+ },
+-#ifdef CONFIG_BPF_JIT
++#if defined(CONFIG_BPF_JIT) && !defined(CONFIG_GRKERNSEC_BPF_HARDEN)
+ {
+ .procname = "bpf_jit_enable",
+ .data = &bpf_jit_enable,
@@ -379,13 +379,12 @@ static struct ctl_table netns_core_table[] = {
static __net_init int sysctl_core_net_init(struct net *net)
@@ -102843,10 +102255,10 @@ index cf9cd13..8b56af3 100644
.exit = sysctl_core_net_exit,
};
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
-index 4c04848..f575934 100644
+index 25733d5..b9360f0 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
-@@ -465,6 +465,7 @@ static struct proto dn_proto = {
+@@ -466,6 +466,7 @@ static struct proto dn_proto = {
.sysctl_rmem = sysctl_decnet_rmem,
.max_header = DN_MAX_NSP_DATA_HEADER + 64,
.obj_size = sizeof(struct dn_sock),
@@ -102855,10 +102267,10 @@ index 4c04848..f575934 100644
static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
-index 3b726f3..1af6368 100644
+index 4400da7..3429972 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
-@@ -200,7 +200,7 @@ static struct dn_dev_sysctl_table {
+@@ -201,7 +201,7 @@ static struct dn_dev_sysctl_table {
.extra1 = &min_t3,
.extra2 = &max_t3
},
@@ -102890,10 +102302,10 @@ index 5325b54..a0d4d69 100644
*lenp = len;
diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
-index 01a5261..29cea68 100644
+index a2c7e4c..3dc9f67 100644
--- a/net/hsr/hsr_netlink.c
+++ b/net/hsr/hsr_netlink.c
-@@ -86,7 +86,7 @@ nla_put_failure:
+@@ -102,7 +102,7 @@ nla_put_failure:
return -EMSGSIZE;
}
@@ -102902,11 +102314,11 @@ index 01a5261..29cea68 100644
.kind = "hsr",
.maxtype = IFLA_HSR_MAX,
.policy = hsr_policy,
-diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
-index 8edfea5..a17998f 100644
---- a/net/ieee802154/6lowpan.c
-+++ b/net/ieee802154/6lowpan.c
-@@ -714,7 +714,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
+diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c
+index 4413629..dea596a 100644
+--- a/net/ieee802154/6lowpan_rtnl.c
++++ b/net/ieee802154/6lowpan_rtnl.c
+@@ -635,7 +635,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
dev_put(real_dev);
}
@@ -102915,36 +102327,65 @@ index 8edfea5..a17998f 100644
.kind = "lowpan",
.priv_size = sizeof(struct lowpan_dev_info),
.setup = lowpan_setup,
-diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
-index 07bd8ed..c574801 100644
---- a/net/ipv4/af_inet.c
-+++ b/net/ipv4/af_inet.c
-@@ -1706,13 +1706,9 @@ static int __init inet_init(void)
+diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/reassembly.c
+index 7cfcd68..84ca5b7 100644
+--- a/net/ieee802154/reassembly.c
++++ b/net/ieee802154/reassembly.c
+@@ -433,14 +433,13 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
- BUILD_BUG_ON(sizeof(struct inet_skb_parm) > FIELD_SIZEOF(struct sk_buff, cb));
+ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
+ {
+- struct ctl_table *table;
++ ctl_table_no_const *table = NULL;
+ struct ctl_table_header *hdr;
+ struct netns_ieee802154_lowpan *ieee802154_lowpan =
+ net_ieee802154_lowpan(net);
-- sysctl_local_reserved_ports = kzalloc(65536 / 8, GFP_KERNEL);
-- if (!sysctl_local_reserved_ports)
-- goto out;
+- table = lowpan_frags_ns_ctl_table;
+ if (!net_eq(net, &init_net)) {
+- table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
++ table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
+ GFP_KERNEL);
+ if (table == NULL)
+ goto err_alloc;
+@@ -455,9 +454,9 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
+ /* Don't export sysctls to unprivileged users */
+ if (net->user_ns != &init_user_ns)
+ table[0].procname = NULL;
+- }
-
- rc = proto_register(&tcp_prot, 1);
- if (rc)
-- goto out_free_reserved_ports;
-+ goto out;
+- hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
++ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
++ } else
++ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
+ if (hdr == NULL)
+ goto err_reg;
- rc = proto_register(&udp_prot, 1);
- if (rc)
-@@ -1819,8 +1815,6 @@ out_unregister_udp_proto:
- proto_unregister(&udp_prot);
- out_unregister_tcp_proto:
- proto_unregister(&tcp_prot);
--out_free_reserved_ports:
-- kfree(sysctl_local_reserved_ports);
- goto out;
- }
+@@ -465,8 +464,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
+ return 0;
+ err_reg:
+- if (!net_eq(net, &init_net))
+- kfree(table);
++ kfree(table);
+ err_alloc:
+ return -ENOMEM;
+ }
+diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
+index e67da4e..da217942 100644
+--- a/net/ipv4/af_inet.c
++++ b/net/ipv4/af_inet.c
+@@ -1392,7 +1392,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
+ return ip_recv_error(sk, msg, len, addr_len);
+ #if IS_ENABLED(CONFIG_IPV6)
+ if (sk->sk_family == AF_INET6)
+- return pingv6_ops.ipv6_recv_error(sk, msg, len, addr_len);
++ return pingv6_ops->ipv6_recv_error(sk, msg, len, addr_len);
+ #endif
+ return -EINVAL;
+ }
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
-index bdbf68b..f0d9c83 100644
+index 214882e..ec032f6 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -69,7 +69,8 @@
@@ -102967,7 +102408,7 @@ index bdbf68b..f0d9c83 100644
[IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
[IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
[IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
-@@ -1543,7 +1545,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
+@@ -1548,7 +1550,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
idx = 0;
head = &net->dev_index_head[h];
rcu_read_lock();
@@ -102976,7 +102417,7 @@ index bdbf68b..f0d9c83 100644
net->dev_base_seq;
hlist_for_each_entry_rcu(dev, head, index_hlist) {
if (idx < s_idx)
-@@ -1861,7 +1863,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
+@@ -1866,7 +1868,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
idx = 0;
head = &net->dev_index_head[h];
rcu_read_lock();
@@ -102985,7 +102426,7 @@ index bdbf68b..f0d9c83 100644
net->dev_base_seq;
hlist_for_each_entry_rcu(dev, head, index_hlist) {
if (idx < s_idx)
-@@ -2096,7 +2098,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
+@@ -2101,7 +2103,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
#define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
@@ -102994,7 +102435,7 @@ index bdbf68b..f0d9c83 100644
struct ctl_table_header *sysctl_header;
struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
} devinet_sysctl = {
-@@ -2218,7 +2220,7 @@ static __net_init int devinet_init_net(struct net *net)
+@@ -2233,7 +2235,7 @@ static __net_init int devinet_init_net(struct net *net)
int err;
struct ipv4_devconf *all, *dflt;
#ifdef CONFIG_SYSCTL
@@ -103003,7 +102444,7 @@ index bdbf68b..f0d9c83 100644
struct ctl_table_header *forw_hdr;
#endif
-@@ -2236,7 +2238,7 @@ static __net_init int devinet_init_net(struct net *net)
+@@ -2251,7 +2253,7 @@ static __net_init int devinet_init_net(struct net *net)
goto err_alloc_dflt;
#ifdef CONFIG_SYSCTL
@@ -103012,7 +102453,7 @@ index bdbf68b..f0d9c83 100644
if (tbl == NULL)
goto err_alloc_ctl;
-@@ -2256,7 +2258,10 @@ static __net_init int devinet_init_net(struct net *net)
+@@ -2271,7 +2273,10 @@ static __net_init int devinet_init_net(struct net *net)
goto err_reg_dflt;
err = -ENOMEM;
@@ -103024,7 +102465,7 @@ index bdbf68b..f0d9c83 100644
if (forw_hdr == NULL)
goto err_reg_ctl;
net->ipv4.forw_hdr = forw_hdr;
-@@ -2272,8 +2277,7 @@ err_reg_ctl:
+@@ -2287,8 +2292,7 @@ err_reg_ctl:
err_reg_dflt:
__devinet_sysctl_unregister(all);
err_reg_all:
@@ -103035,10 +102476,10 @@ index bdbf68b..f0d9c83 100644
#endif
if (dflt != &ipv4_devconf_dflt)
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
-index c7539e2..b455e51 100644
+index 23104a3..9f5570b 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
-@@ -1015,12 +1015,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
+@@ -1017,12 +1017,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
#ifdef CONFIG_IP_ROUTE_MULTIPATH
fib_sync_up(dev);
#endif
@@ -103053,7 +102494,7 @@ index c7539e2..b455e51 100644
if (ifa->ifa_dev->ifa_list == NULL) {
/* Last address was deleted from this interface.
* Disable IP.
-@@ -1058,7 +1058,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
+@@ -1060,7 +1060,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
#ifdef CONFIG_IP_ROUTE_MULTIPATH
fib_sync_up(dev);
#endif
@@ -103063,10 +102504,10 @@ index c7539e2..b455e51 100644
break;
case NETDEV_DOWN:
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
-index 017fa5e..d61ebac 100644
+index f99f41b..1879da9 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
-@@ -767,7 +767,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
+@@ -770,7 +770,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
nh->nh_saddr = inet_select_addr(nh->nh_dev,
nh->nh_gw,
nh->nh_parent->fib_scope);
@@ -103075,42 +102516,8 @@ index 017fa5e..d61ebac 100644
return nh->nh_saddr;
}
-diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c
-index 278836f..482db7b 100644
---- a/net/ipv4/gre_offload.c
-+++ b/net/ipv4/gre_offload.c
-@@ -56,13 +56,13 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
-
- csum = !!(greh->flags & GRE_CSUM);
-
-- if (unlikely(!pskb_may_pull(skb, ghl)))
-- goto out;
--
- /* setup inner skb. */
- skb->protocol = greh->protocol;
- skb->encapsulation = 0;
-
-+ if (unlikely(!pskb_may_pull(skb, ghl)))
-+ goto out;
-+
- __skb_pull(skb, ghl);
- skb_reset_mac_header(skb);
- skb_set_network_header(skb, skb_inner_network_offset(skb));
-diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
-index 0d1e2cb..4501a2c 100644
---- a/net/ipv4/inet_connection_sock.c
-+++ b/net/ipv4/inet_connection_sock.c
-@@ -29,7 +29,7 @@ const char inet_csk_timer_bug_msg[] = "inet_csk BUG: unknown timer value\n";
- EXPORT_SYMBOL(inet_csk_timer_bug_msg);
- #endif
-
--unsigned long *sysctl_local_reserved_ports;
-+unsigned long sysctl_local_reserved_ports[65536 / 8 / sizeof(unsigned long)];
- EXPORT_SYMBOL(sysctl_local_reserved_ports);
-
- void inet_get_local_port_range(struct net *net, int *low, int *high)
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
-index 8b9cf27..9c17cab 100644
+index 9111a4e..3576905 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -18,6 +18,7 @@
@@ -103140,10 +102547,10 @@ index 8b9cf27..9c17cab 100644
inet_twsk_deschedule(tw, death_row);
while (twrefcnt) {
diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
-index bf2cb4a..d83ba8a 100644
+index 241afd7..31b95d5 100644
--- a/net/ipv4/inetpeer.c
+++ b/net/ipv4/inetpeer.c
-@@ -482,7 +482,7 @@ relookup:
+@@ -461,7 +461,7 @@ relookup:
if (p) {
p->daddr = *daddr;
atomic_set(&p->refcnt, 1);
@@ -103153,10 +102560,10 @@ index bf2cb4a..d83ba8a 100644
p->rate_tokens = 0;
/* 60*HZ is arbitrary, but chosen enough high so that the first
diff --git a/net/ipv4/ip_forward.c b/net/ipv4/ip_forward.c
-index 1c6bd43..ecb34b5 100644
+index 3a83ce5..787b3c2 100644
--- a/net/ipv4/ip_forward.c
+++ b/net/ipv4/ip_forward.c
-@@ -178,7 +178,8 @@ int ip_forward(struct sk_buff *skb)
+@@ -129,7 +129,8 @@ int ip_forward(struct sk_buff *skb)
* We now generate an ICMP HOST REDIRECT giving the route
* we calculated.
*/
@@ -103167,10 +102574,10 @@ index 1c6bd43..ecb34b5 100644
skb->priority = rt_tos2priority(iph->tos);
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
-index c10a3ce..dd71f84 100644
+index 2811cc1..ad5a534 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
-@@ -283,7 +283,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
+@@ -268,7 +268,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
return 0;
start = qp->rid;
@@ -103179,7 +102586,7 @@ index c10a3ce..dd71f84 100644
qp->rid = end;
rc = qp->q.fragments && (end - start) > max;
-@@ -760,12 +760,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
+@@ -746,12 +746,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
static int __net_init ip4_frags_ns_ctl_register(struct net *net)
{
@@ -103194,7 +102601,7 @@ index c10a3ce..dd71f84 100644
if (table == NULL)
goto err_alloc;
-@@ -776,9 +775,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
+@@ -765,9 +764,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
/* Don't export sysctls to unprivileged users */
if (net->user_ns != &init_user_ns)
table[0].procname = NULL;
@@ -103207,7 +102614,7 @@ index c10a3ce..dd71f84 100644
if (hdr == NULL)
goto err_reg;
-@@ -786,8 +786,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
+@@ -775,8 +775,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
return 0;
err_reg:
@@ -103218,7 +102625,7 @@ index c10a3ce..dd71f84 100644
return -ENOMEM;
}
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
-index b40b90d..9e7ce17 100644
+index 69aaf0a..8298c029 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -115,7 +115,7 @@ static bool log_ecn_error = true;
@@ -103230,8 +102637,8 @@ index b40b90d..9e7ce17 100644
static int ipgre_tunnel_init(struct net_device *dev);
static int ipgre_net_id __read_mostly;
-@@ -733,7 +733,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
- [IFLA_GRE_PMTUDISC] = { .type = NLA_U8 },
+@@ -816,7 +816,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
+ [IFLA_GRE_ENCAP_DPORT] = { .type = NLA_U16 },
};
-static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
@@ -103239,7 +102646,7 @@ index b40b90d..9e7ce17 100644
.kind = "gre",
.maxtype = IFLA_GRE_MAX,
.policy = ipgre_policy,
-@@ -747,7 +747,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
+@@ -830,7 +830,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
.fill_info = ipgre_fill_info,
};
@@ -103274,10 +102681,10 @@ index 3d4da2c..40f9c29 100644
ICMP_PROT_UNREACH, 0);
}
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
-index 844323b..7c1b9ac 100644
+index bc6471d..c5e8a0c 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
-@@ -1471,6 +1471,7 @@ static DEFINE_PER_CPU(struct inet_sock, unicast_sock) = {
+@@ -1517,6 +1517,7 @@ static DEFINE_PER_CPU(struct inet_sock, unicast_sock) = {
.sk_wmem_alloc = ATOMIC_INIT(1),
.sk_allocation = GFP_ATOMIC,
.sk_flags = (1UL << SOCK_USE_WRITE_QUEUE),
@@ -103286,10 +102693,10 @@ index 844323b..7c1b9ac 100644
.pmtudisc = IP_PMTUDISC_WANT,
.uc_ttl = -1,
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
-index 580dd96..41e9720 100644
+index 9daf217..373d454 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
-@@ -426,15 +426,12 @@ int ip_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
+@@ -443,15 +443,12 @@ int ip_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
memcpy(&errhdr.ee, &serr->ee, sizeof(struct sock_extended_err));
sin = &errhdr.offender;
@@ -103308,7 +102715,7 @@ index 580dd96..41e9720 100644
ip_cmsg_recv(msg, skb);
}
-@@ -1171,7 +1168,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
+@@ -1177,7 +1174,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
len = min_t(unsigned int, len, opt->optlen);
if (put_user(len, optlen))
return -EFAULT;
@@ -103318,20 +102725,20 @@ index 580dd96..41e9720 100644
return -EFAULT;
return 0;
}
-@@ -1302,7 +1300,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
+@@ -1308,7 +1306,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
if (sk->sk_type != SOCK_STREAM)
return -ENOPROTOOPT;
-- msg.msg_control = optval;
-+ msg.msg_control = (void __force_kernel *)optval;
+- msg.msg_control = (__force void *) optval;
++ msg.msg_control = (__force_kernel void *) optval;
msg.msg_controllen = len;
msg.msg_flags = flags;
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
-index b0a9cb4..8e8f8d2 100644
+index 1a7e979..fd05aa4 100644
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
#include <net/net_namespace.h>
#include <net/netns/generic.h>
@@ -103340,7 +102747,7 @@ index b0a9cb4..8e8f8d2 100644
static int vti_net_id __read_mostly;
static int vti_tunnel_init(struct net_device *dev);
-@@ -360,7 +360,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
+@@ -519,7 +519,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
[IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
};
@@ -103350,10 +102757,10 @@ index b0a9cb4..8e8f8d2 100644
.maxtype = IFLA_VTI_MAX,
.policy = vti_policy,
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
-index b3e86ea..18ce98c 100644
+index 648fa14..97864d0 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
-@@ -334,7 +334,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
+@@ -333,7 +333,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
mm_segment_t oldfs = get_fs();
set_fs(get_ds());
@@ -103362,7 +102769,7 @@ index b3e86ea..18ce98c 100644
set_fs(oldfs);
return res;
}
-@@ -345,7 +345,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
+@@ -344,7 +344,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
mm_segment_t oldfs = get_fs();
set_fs(get_ds());
@@ -103371,7 +102778,7 @@ index b3e86ea..18ce98c 100644
set_fs(oldfs);
return res;
}
-@@ -356,7 +356,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
+@@ -355,7 +355,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
mm_segment_t oldfs = get_fs();
set_fs(get_ds());
@@ -103381,7 +102788,7 @@ index b3e86ea..18ce98c 100644
return res;
}
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
-index 62eaa00..29b2dc2 100644
+index 37096d6..86abb03 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
@@ -103393,8 +102800,8 @@ index 62eaa00..29b2dc2 100644
static int ipip_err(struct sk_buff *skb, u32 info)
{
-@@ -409,7 +409,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
- [IFLA_IPTUN_PMTUDISC] = { .type = NLA_U8 },
+@@ -487,7 +487,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
+ [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
};
-static struct rtnl_link_ops ipip_link_ops __read_mostly = {
@@ -103501,7 +102908,7 @@ index 99e810f..3711b81 100644
case IPT_SO_GET_ENTRIES:
diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
-index 2510c02..cfb34fa 100644
+index e90f83a..3e6acca 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -720,7 +720,7 @@ static int clusterip_net_init(struct net *net)
@@ -103514,7 +102921,7 @@ index 2510c02..cfb34fa 100644
pr_err("Unable to proc dir entry\n");
return -ENOMEM;
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
-index 0d33f94..d0a62e6 100644
+index 5d740cc..22c8e65 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -59,7 +59,7 @@ struct ping_table {
@@ -103553,16 +102960,7 @@ index 0d33f94..d0a62e6 100644
info, (u8 *)icmph);
#endif
}
-@@ -860,7 +860,7 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
- return ip_recv_error(sk, msg, len, addr_len);
- #if IS_ENABLED(CONFIG_IPV6)
- } else if (family == AF_INET6) {
-- return pingv6_ops.ipv6_recv_error(sk, msg, len,
-+ return pingv6_ops->ipv6_recv_error(sk, msg, len,
- addr_len);
- #endif
- }
-@@ -918,10 +918,10 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
+@@ -910,10 +910,10 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
}
if (inet6_sk(sk)->rxopt.all)
@@ -103575,7 +102973,7 @@ index 0d33f94..d0a62e6 100644
else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
ip_cmsg_recv(msg, skb);
#endif
-@@ -973,8 +973,11 @@ void ping_rcv(struct sk_buff *skb)
+@@ -965,8 +965,11 @@ void ping_rcv(struct sk_buff *skb)
sk = ping_lookup(net, skb, ntohs(icmph->un.echo.id));
if (sk != NULL) {
@@ -103588,7 +102986,7 @@ index 0d33f94..d0a62e6 100644
sock_put(sk);
return;
}
-@@ -1113,7 +1116,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
+@@ -1105,7 +1108,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
0, sock_i_ino(sp),
atomic_read(&sp->sk_refcnt), sp,
@@ -103598,10 +102996,10 @@ index 0d33f94..d0a62e6 100644
static int ping_v4_seq_show(struct seq_file *seq, void *v)
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
-index 11c8d81..d67116b 100644
+index 739db31..74f0210 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
-@@ -311,7 +311,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
+@@ -314,7 +314,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
int raw_rcv(struct sock *sk, struct sk_buff *skb)
{
if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
@@ -103610,7 +103008,7 @@ index 11c8d81..d67116b 100644
kfree_skb(skb);
return NET_RX_DROP;
}
-@@ -748,16 +748,20 @@ static int raw_init(struct sock *sk)
+@@ -755,16 +755,20 @@ static int raw_init(struct sock *sk)
static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
{
@@ -103632,7 +103030,7 @@ index 11c8d81..d67116b 100644
if (get_user(len, optlen))
goto out;
-@@ -767,8 +771,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
+@@ -774,8 +778,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
if (len > sizeof(struct icmp_filter))
len = sizeof(struct icmp_filter);
ret = -EFAULT;
@@ -103643,7 +103041,7 @@ index 11c8d81..d67116b 100644
goto out;
ret = 0;
out: return ret;
-@@ -997,7 +1001,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
+@@ -1004,7 +1008,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
0, 0L, 0,
from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
0, sock_i_ino(sp),
@@ -103653,10 +103051,10 @@ index 11c8d81..d67116b 100644
static int raw_seq_show(struct seq_file *seq, void *v)
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
-index 487bb62..31268ca 100644
+index 6a2155b..47de388 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
-@@ -234,7 +234,7 @@ static const struct seq_operations rt_cache_seq_ops = {
+@@ -228,7 +228,7 @@ static const struct seq_operations rt_cache_seq_ops = {
static int rt_cache_seq_open(struct inode *inode, struct file *file)
{
@@ -103665,7 +103063,7 @@ index 487bb62..31268ca 100644
}
static const struct file_operations rt_cache_seq_fops = {
-@@ -325,7 +325,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
+@@ -319,7 +319,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
static int rt_cpu_seq_open(struct inode *inode, struct file *file)
{
@@ -103674,7 +103072,7 @@ index 487bb62..31268ca 100644
}
static const struct file_operations rt_cpu_seq_fops = {
-@@ -363,7 +363,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
+@@ -357,7 +357,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
static int rt_acct_proc_open(struct inode *inode, struct file *file)
{
@@ -103683,7 +103081,7 @@ index 487bb62..31268ca 100644
}
static const struct file_operations rt_acct_proc_fops = {
-@@ -465,11 +465,11 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
+@@ -459,11 +459,11 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
#define IP_IDENTS_SZ 2048u
struct ip_ident_bucket {
@@ -103697,7 +103095,7 @@ index 487bb62..31268ca 100644
/* In order to protect privacy, we add a perturbation to identifiers
* if one generator is seldom used. This makes hard for an attacker
-@@ -485,7 +485,7 @@ u32 ip_idents_reserve(u32 hash, int segs)
+@@ -479,7 +479,7 @@ u32 ip_idents_reserve(u32 hash, int segs)
if (old != now && cmpxchg(&bucket->stamp32, old, now) == old)
delta = prandom_u32_max(now - old);
@@ -103721,7 +103119,7 @@ index 487bb62..31268ca 100644
if (skb->protocol != htons(ETH_P_IP)) {
/* Not IP (i.e. ARP). Do not create route, if it is
-@@ -2305,6 +2304,8 @@ static int rt_fill_info(struct net *net, __be32 dst, __be32 src,
+@@ -2303,6 +2302,8 @@ static int rt_fill_info(struct net *net, __be32 dst, __be32 src,
r->rtm_flags = (rt->rt_flags & ~0xFFFF) | RTM_F_CLONED;
if (rt->rt_flags & RTCF_NOTIFY)
r->rtm_flags |= RTM_F_NOTIFY;
@@ -103730,7 +103128,7 @@ index 487bb62..31268ca 100644
if (nla_put_be32(skb, RTA_DST, dst))
goto nla_put_failure;
-@@ -2631,34 +2632,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
+@@ -2624,34 +2625,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
.maxlen = sizeof(int),
.mode = 0200,
.proc_handler = ipv4_sysctl_rtcache_flush,
@@ -103773,7 +103171,7 @@ index 487bb62..31268ca 100644
err_dup:
return -ENOMEM;
}
-@@ -2681,8 +2682,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
+@@ -2674,8 +2675,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
static __net_init int rt_genid_init(struct net *net)
{
@@ -103784,7 +103182,7 @@ index 487bb62..31268ca 100644
get_random_bytes(&net->ipv4.dev_addr_genid,
sizeof(net->ipv4.dev_addr_genid));
return 0;
-@@ -2725,11 +2726,7 @@ int __init ip_rt_init(void)
+@@ -2718,11 +2719,7 @@ int __init ip_rt_init(void)
{
int rc = 0;
@@ -103798,11 +103196,11 @@ index 487bb62..31268ca 100644
#ifdef CONFIG_IP_ROUTE_CLASSID
ip_rt_acct = __alloc_percpu(256 * sizeof(struct ip_rt_acct), __alignof__(struct ip_rt_acct));
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
-index 44eba05..b36864b 100644
+index b3c53c8..35cc18d 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
- container_of(table->data, struct net, ipv4.sysctl_local_ports.range);
+ container_of(table->data, struct net, ipv4.ip_local_ports.range);
int ret;
int range[2];
- struct ctl_table tmp = {
@@ -103855,16 +103253,7 @@ index 44eba05..b36864b 100644
struct tcp_fastopen_context *ctxt;
int ret;
u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
-@@ -438,7 +438,7 @@ static struct ctl_table ipv4_table[] = {
- },
- {
- .procname = "ip_local_reserved_ports",
-- .data = NULL, /* initialized in sysctl_ipv4_init */
-+ .data = sysctl_local_reserved_ports,
- .maxlen = 65536,
- .mode = 0644,
- .proc_handler = proc_do_large_bitmap,
-@@ -843,13 +843,12 @@ static struct ctl_table ipv4_net_table[] = {
+@@ -874,13 +874,12 @@ static struct ctl_table ipv4_net_table[] = {
static __net_init int ipv4_sysctl_init_net(struct net *net)
{
@@ -103880,9 +103269,9 @@ index 44eba05..b36864b 100644
if (table == NULL)
goto err_alloc;
-@@ -872,15 +871,17 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
- net->ipv4.sysctl_local_ports.range[0] = 32768;
- net->ipv4.sysctl_local_ports.range[1] = 61000;
+@@ -889,7 +888,10 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
+ table[i].data += (void *)net - (void *)&init_net;
+ }
- net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
+ if (!net_eq(net, &init_net))
@@ -103892,37 +103281,11 @@ index 44eba05..b36864b 100644
if (net->ipv4.ipv4_hdr == NULL)
goto err_reg;
- return 0;
-
- err_reg:
-- if (!net_eq(net, &init_net))
-- kfree(table);
-+ kfree(table);
- err_alloc:
- return -ENOMEM;
- }
-@@ -902,16 +903,6 @@ static __net_initdata struct pernet_operations ipv4_sysctl_ops = {
- static __init int sysctl_ipv4_init(void)
- {
- struct ctl_table_header *hdr;
-- struct ctl_table *i;
--
-- for (i = ipv4_table; i->procname; i++) {
-- if (strcmp(i->procname, "ip_local_reserved_ports") == 0) {
-- i->data = sysctl_local_reserved_ports;
-- break;
-- }
-- }
-- if (!i->procname)
-- return -EINVAL;
-
- hdr = register_net_sysctl(&init_net, "net/ipv4", ipv4_table);
- if (hdr == NULL)
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
-index 2291791..7b62d2b 100644
+index d107ee2..bcebf11 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
-@@ -761,7 +761,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
+@@ -765,7 +765,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
* without any lock. We want to make sure compiler wont store
* intermediate values in this location.
*/
@@ -103931,7 +103294,7 @@ index 2291791..7b62d2b 100644
sk->sk_max_pacing_rate);
}
-@@ -4482,7 +4482,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
+@@ -4527,7 +4527,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
* simplifies code)
*/
static void
@@ -103940,7 +103303,7 @@ index 2291791..7b62d2b 100644
struct sk_buff *head, struct sk_buff *tail,
u32 start, u32 end)
{
-@@ -5559,6 +5559,7 @@ discard:
+@@ -5506,6 +5506,7 @@ discard:
tcp_paws_reject(&tp->rx_opt, 0))
goto discard_and_undo;
@@ -103948,7 +103311,7 @@ index 2291791..7b62d2b 100644
if (th->syn) {
/* We see SYN without ACK. It is attempt of
* simultaneous connect with crossed SYNs.
-@@ -5609,6 +5610,7 @@ discard:
+@@ -5556,6 +5557,7 @@ discard:
goto discard;
#endif
}
@@ -103956,7 +103319,7 @@ index 2291791..7b62d2b 100644
/* "fifth, if neither of the SYN or RST bits is set then
* drop the segment and return."
*/
-@@ -5655,7 +5657,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
+@@ -5602,7 +5604,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
goto discard;
if (th->syn) {
@@ -103966,13 +103329,13 @@ index 2291791..7b62d2b 100644
if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
return 1;
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
-index a782d5b..28f0ae5 100644
+index ef7089c..a3e65fb 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
-@@ -91,6 +91,10 @@ int sysctl_tcp_low_latency __read_mostly;
+@@ -89,6 +89,10 @@ int sysctl_tcp_tw_reuse __read_mostly;
+ int sysctl_tcp_low_latency __read_mostly;
EXPORT_SYMBOL(sysctl_tcp_low_latency);
-
+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
+extern int grsec_enable_blackhole;
+#endif
@@ -103980,7 +103343,7 @@ index a782d5b..28f0ae5 100644
#ifdef CONFIG_TCP_MD5SIG
static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
__be32 daddr, __be32 saddr, const struct tcphdr *th);
-@@ -1830,6 +1834,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
+@@ -1469,6 +1473,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
return 0;
reset:
@@ -103990,7 +103353,7 @@ index a782d5b..28f0ae5 100644
tcp_v4_send_reset(rsk, skb);
discard:
kfree_skb(skb);
-@@ -1975,12 +1982,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
+@@ -1633,12 +1640,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
TCP_SKB_CB(skb)->sacked = 0;
sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
@@ -104013,7 +103376,7 @@ index a782d5b..28f0ae5 100644
if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
-@@ -2034,6 +2048,10 @@ csum_error:
+@@ -1694,6 +1708,10 @@ csum_error:
bad_packet:
TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
} else {
@@ -104025,7 +103388,7 @@ index a782d5b..28f0ae5 100644
}
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
-index 7a436c5..1b05c59 100644
+index 63d2680..2db9d6b 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -27,6 +27,10 @@
@@ -104039,7 +103402,7 @@ index 7a436c5..1b05c59 100644
int sysctl_tcp_syncookies __read_mostly = 1;
EXPORT_SYMBOL(sysctl_tcp_syncookies);
-@@ -709,7 +713,10 @@ embryonic_reset:
+@@ -739,7 +743,10 @@ embryonic_reset:
* avoid becoming vulnerable to outside attack aiming at
* resetting legit local connections.
*/
@@ -104052,10 +103415,10 @@ index 7a436c5..1b05c59 100644
reqsk_fastopen_remove(sk, req, true);
tcp_reset(sk);
diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
-index 1f2d376..01d18c4 100644
+index ebf5ff5..4d1ff32 100644
--- a/net/ipv4/tcp_probe.c
+++ b/net/ipv4/tcp_probe.c
-@@ -238,7 +238,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
+@@ -236,7 +236,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
if (cnt + width >= len)
break;
@@ -104065,7 +103428,7 @@ index 1f2d376..01d18c4 100644
cnt += width;
}
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
-index 64f0354..a81b39d 100644
+index 9b21ae8..4eb67df 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -22,6 +22,10 @@
@@ -104079,7 +103442,7 @@ index 64f0354..a81b39d 100644
int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
-@@ -189,6 +193,13 @@ static int tcp_write_timeout(struct sock *sk)
+@@ -191,6 +195,13 @@ static int tcp_write_timeout(struct sock *sk)
}
}
@@ -104094,7 +103457,7 @@ index 64f0354..a81b39d 100644
syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
/* Has it gone just too far? */
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
-index b25e852..cdc3258 100644
+index cd0db54..93a6518 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -87,6 +87,7 @@
@@ -104105,7 +103468,7 @@ index b25e852..cdc3258 100644
#include <linux/socket.h>
#include <linux/sockios.h>
#include <linux/igmp.h>
-@@ -113,6 +114,10 @@
+@@ -114,6 +115,10 @@
#include <net/busy_poll.h>
#include "udp_impl.h"
@@ -104116,8 +103479,8 @@ index b25e852..cdc3258 100644
struct udp_table udp_table __read_mostly;
EXPORT_SYMBOL(udp_table);
-@@ -615,6 +620,9 @@ found:
- return s;
+@@ -595,6 +600,9 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
+ return true;
}
+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
@@ -104126,7 +103489,7 @@ index b25e852..cdc3258 100644
/*
* This routine is called by the ICMP module when it gets some
* sort of error condition. If err < 0 then the socket should
-@@ -914,9 +922,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
+@@ -932,9 +940,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
dport = usin->sin_port;
if (dport == 0)
return -EINVAL;
@@ -104145,7 +103508,7 @@ index b25e852..cdc3258 100644
daddr = inet->inet_daddr;
dport = inet->inet_dport;
/* Open fast path for connected socket.
-@@ -1163,7 +1180,7 @@ static unsigned int first_packet_length(struct sock *sk)
+@@ -1182,7 +1199,7 @@ static unsigned int first_packet_length(struct sock *sk)
IS_UDPLITE(sk));
UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
IS_UDPLITE(sk));
@@ -104154,7 +103517,7 @@ index b25e852..cdc3258 100644
__skb_unlink(skb, rcvq);
__skb_queue_tail(&list_kill, skb);
}
-@@ -1243,6 +1260,10 @@ try_again:
+@@ -1262,6 +1279,10 @@ try_again:
if (!skb)
goto out;
@@ -104165,7 +103528,7 @@ index b25e852..cdc3258 100644
ulen = skb->len - sizeof(struct udphdr);
copied = len;
if (copied > ulen)
-@@ -1276,7 +1297,7 @@ try_again:
+@@ -1295,7 +1316,7 @@ try_again:
if (unlikely(err)) {
trace_kfree_skb(skb, udp_recvmsg);
if (!peeked) {
@@ -104174,7 +103537,7 @@ index b25e852..cdc3258 100644
UDP_INC_STATS_USER(sock_net(sk),
UDP_MIB_INERRORS, is_udplite);
}
-@@ -1566,7 +1587,7 @@ csum_error:
+@@ -1592,7 +1613,7 @@ csum_error:
UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
drop:
UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
@@ -104183,7 +103546,7 @@ index b25e852..cdc3258 100644
kfree_skb(skb);
return -1;
}
-@@ -1585,7 +1606,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
+@@ -1611,7 +1632,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
if (!skb1) {
@@ -104192,7 +103555,7 @@ index b25e852..cdc3258 100644
UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
IS_UDPLITE(sk));
UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
-@@ -1786,6 +1807,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
+@@ -1812,6 +1833,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
goto csum_error;
UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
@@ -104202,7 +103565,7 @@ index b25e852..cdc3258 100644
icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
/*
-@@ -2354,7 +2378,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
+@@ -2398,7 +2422,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
0, sock_i_ino(sp),
atomic_read(&sp->sk_refcnt), sp,
@@ -104212,7 +103575,7 @@ index b25e852..cdc3258 100644
int udp4_seq_show(struct seq_file *seq, void *v)
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
-index e1a6393..f634ce5 100644
+index 6156f68..d6ab46d 100644
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
@@ -104265,10 +103628,10 @@ index e1a6393..f634ce5 100644
return -ENOMEM;
}
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
-index 3f0ec06..5aad945 100644
+index 0169ccf..6f14338 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
-@@ -170,7 +170,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
+@@ -171,7 +171,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
.hop_limit = IPV6_DEFAULT_HOPLIMIT,
.mtu6 = IPV6_MIN_MTU,
.accept_ra = 1,
@@ -104277,7 +103640,7 @@ index 3f0ec06..5aad945 100644
.autoconf = 1,
.force_mld_version = 0,
.mldv1_unsolicited_report_interval = 10 * HZ,
-@@ -206,7 +206,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
+@@ -208,7 +208,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
.hop_limit = IPV6_DEFAULT_HOPLIMIT,
.mtu6 = IPV6_MIN_MTU,
.accept_ra = 1,
@@ -104286,7 +103649,7 @@ index 3f0ec06..5aad945 100644
.autoconf = 1,
.force_mld_version = 0,
.mldv1_unsolicited_report_interval = 10 * HZ,
-@@ -598,7 +598,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
+@@ -604,7 +604,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
idx = 0;
head = &net->dev_index_head[h];
rcu_read_lock();
@@ -104295,7 +103658,7 @@ index 3f0ec06..5aad945 100644
net->dev_base_seq;
hlist_for_each_entry_rcu(dev, head, index_hlist) {
if (idx < s_idx)
-@@ -2390,7 +2390,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
+@@ -2396,7 +2396,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
p.iph.ihl = 5;
p.iph.protocol = IPPROTO_IPV6;
p.iph.ttl = 64;
@@ -104304,7 +103667,7 @@ index 3f0ec06..5aad945 100644
if (ops->ndo_do_ioctl) {
mm_segment_t oldfs = get_fs();
-@@ -3523,16 +3523,23 @@ static const struct file_operations if6_fops = {
+@@ -3534,16 +3534,23 @@ static const struct file_operations if6_fops = {
.release = seq_release_net,
};
@@ -104329,7 +103692,7 @@ index 3f0ec06..5aad945 100644
}
static struct pernet_operations if6_proc_net_ops = {
-@@ -4141,7 +4148,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
+@@ -4159,7 +4166,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
s_ip_idx = ip_idx = cb->args[2];
rcu_read_lock();
@@ -104338,30 +103701,39 @@ index 3f0ec06..5aad945 100644
for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
idx = 0;
head = &net->dev_index_head[h];
-@@ -4741,11 +4748,8 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
-
- rt = rt6_lookup(dev_net(dev), &ifp->peer_addr, NULL,
- dev->ifindex, 1);
-- if (rt) {
-- dst_hold(&rt->dst);
-- if (ip6_del_rt(rt))
-- dst_free(&rt->dst);
-- }
-+ if (rt && ip6_del_rt(rt))
-+ dst_free(&rt->dst);
- }
- dst_hold(&ifp->rt->dst);
+@@ -4536,6 +4543,22 @@ static int inet6_set_iftoken(struct inet6_dev *idev, struct in6_addr *token)
+ return 0;
+ }
-@@ -4753,7 +4757,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
- dst_free(&ifp->rt->dst);
++static const struct nla_policy inet6_af_policy[IFLA_INET6_MAX + 1] = {
++ [IFLA_INET6_ADDR_GEN_MODE] = { .type = NLA_U8 },
++ [IFLA_INET6_TOKEN] = { .len = sizeof(struct in6_addr) },
++};
++
++static int inet6_validate_link_af(const struct net_device *dev,
++ const struct nlattr *nla)
++{
++ struct nlattr *tb[IFLA_INET6_MAX + 1];
++
++ if (dev && !__in6_dev_get(dev))
++ return -EAFNOSUPPORT;
++
++ return nla_parse_nested(tb, IFLA_INET6_MAX, nla, inet6_af_policy);
++}
++
+ static int inet6_set_link_af(struct net_device *dev, const struct nlattr *nla)
+ {
+ int err = -EINVAL;
+@@ -4788,7 +4811,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
+ rt_genid_bump_ipv6(net);
break;
}
- atomic_inc(&net->ipv6.dev_addr_genid);
+ atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
- rt_genid_bump_ipv6(net);
}
-@@ -4774,7 +4778,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
+ static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
+@@ -4808,7 +4831,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
int *valp = ctl->data;
int val = *valp;
loff_t pos = *ppos;
@@ -104370,7 +103742,7 @@ index 3f0ec06..5aad945 100644
int ret;
/*
-@@ -4859,7 +4863,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
+@@ -4893,7 +4916,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
int *valp = ctl->data;
int val = *valp;
loff_t pos = *ppos;
@@ -104379,24 +103751,32 @@ index 3f0ec06..5aad945 100644
int ret;
/*
+@@ -5351,6 +5374,7 @@ static struct rtnl_af_ops inet6_ops = {
+ .family = AF_INET6,
+ .fill_link_af = inet6_fill_link_af,
+ .get_link_af_size = inet6_get_link_af_size,
++ .validate_link_af = inet6_validate_link_af,
+ .set_link_af = inet6_set_link_af,
+ };
+
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
-index d935889..2f64330 100644
+index e8c4400..a4cd5da 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
-@@ -776,7 +776,7 @@ static int __net_init inet6_net_init(struct net *net)
- net->ipv6.sysctl.bindv6only = 0;
+@@ -766,7 +766,7 @@ static int __net_init inet6_net_init(struct net *net)
net->ipv6.sysctl.icmpv6_time = 1*HZ;
net->ipv6.sysctl.flowlabel_consistency = 1;
-- atomic_set(&net->ipv6.rt_genid, 0);
-+ atomic_set_unchecked(&net->ipv6.rt_genid, 0);
+ net->ipv6.sysctl.auto_flowlabels = 0;
+- atomic_set(&net->ipv6.fib6_sernum, 1);
++ atomic_set_unchecked(&net->ipv6.fib6_sernum, 1);
err = ipv6_init_mibs(net);
if (err)
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
-index c3bf2d2..c85df82 100644
+index 2cdc383..4f1b785 100644
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
-@@ -382,11 +382,10 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
+@@ -383,11 +383,10 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
memcpy(&errhdr.ee, &serr->ee, sizeof(struct sock_extended_err));
sin = &errhdr.offender;
@@ -104410,7 +103790,7 @@ index c3bf2d2..c85df82 100644
if (np->rxopt.all)
ip6_datagram_recv_common_ctl(sk, msg, skb);
if (skb->protocol == htons(ETH_P_IPV6)) {
-@@ -397,12 +396,9 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
+@@ -398,12 +397,9 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
ipv6_iface_scope_id(&sin->sin6_addr,
IP6CB(skb)->iif);
} else {
@@ -104424,7 +103804,7 @@ index c3bf2d2..c85df82 100644
ip_cmsg_recv(msg, skb);
}
}
-@@ -938,5 +934,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
+@@ -928,5 +924,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
0,
sock_i_ino(sp),
atomic_read(&sp->sk_refcnt), sp,
@@ -104432,10 +103812,10 @@ index c3bf2d2..c85df82 100644
+ atomic_read_unchecked(&sp->sk_drops));
}
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
-index 7b32652..0bc348b 100644
+index 97ae700..18dcae0 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
-@@ -1005,7 +1005,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
+@@ -997,7 +997,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
{
@@ -104444,20 +103824,56 @@ index 7b32652..0bc348b 100644
table = kmemdup(ipv6_icmp_table_template,
sizeof(ipv6_icmp_table_template),
+diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
+index b2d1838..0194c04 100644
+--- a/net/ipv6/ip6_fib.c
++++ b/net/ipv6/ip6_fib.c
+@@ -99,9 +99,9 @@ static int fib6_new_sernum(struct net *net)
+ int new, old;
+
+ do {
+- old = atomic_read(&net->ipv6.fib6_sernum);
++ old = atomic_read_unchecked(&net->ipv6.fib6_sernum);
+ new = old < INT_MAX ? old + 1 : 1;
+- } while (atomic_cmpxchg(&net->ipv6.fib6_sernum,
++ } while (atomic_cmpxchg_unchecked(&net->ipv6.fib6_sernum,
+ old, new) != old);
+ return new;
+ }
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
-index 4a230b1..a1d47b8 100644
+index 0e32d2e..dd45cdc 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
-@@ -71,7 +71,7 @@ struct ip6gre_net {
+@@ -71,8 +71,8 @@ struct ip6gre_net {
struct net_device *fb_tunnel_dev;
};
-static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
+-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly;
+static struct rtnl_link_ops ip6gre_link_ops;
++static struct rtnl_link_ops ip6gre_tap_ops;
static int ip6gre_tunnel_init(struct net_device *dev);
static void ip6gre_tunnel_setup(struct net_device *dev);
static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
-@@ -1290,7 +1290,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
+@@ -417,7 +417,7 @@ static void ip6gre_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
+ if (code == ICMPV6_HDR_FIELD)
+ teli = ip6_tnl_parse_tlv_enc_lim(skb, skb->data);
+
+- if (teli && teli == info - 2) {
++ if (teli && teli == be32_to_cpu(info) - 2) {
+ tel = (struct ipv6_tlv_tnl_enc_lim *) &skb->data[teli];
+ if (tel->encap_limit == 0) {
+ net_warn_ratelimited("%s: Too small encapsulation limit or routing loop in tunnel!\n",
+@@ -429,7 +429,7 @@ static void ip6gre_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
+ }
+ break;
+ case ICMPV6_PKT_TOOBIG:
+- mtu = info - offset;
++ mtu = be32_to_cpu(info) - offset;
+ if (mtu < IPV6_MIN_MTU)
+ mtu = IPV6_MIN_MTU;
+ t->dev->mtu = mtu;
+@@ -1289,7 +1289,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
}
@@ -104466,7 +103882,7 @@ index 4a230b1..a1d47b8 100644
.handler = ip6gre_rcv,
.err_handler = ip6gre_err,
.flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
-@@ -1644,7 +1644,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
+@@ -1650,7 +1650,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
[IFLA_GRE_FLAGS] = { .type = NLA_U32 },
};
@@ -104475,7 +103891,7 @@ index 4a230b1..a1d47b8 100644
.kind = "ip6gre",
.maxtype = IFLA_GRE_MAX,
.policy = ip6gre_policy,
-@@ -1658,7 +1658,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
+@@ -1664,7 +1664,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
.fill_info = ip6gre_fill_info,
};
@@ -104484,20 +103900,8 @@ index 4a230b1..a1d47b8 100644
.kind = "ip6gretap",
.maxtype = IFLA_GRE_MAX,
.policy = ip6gre_policy,
-diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c
-index b2f0915..066db10 100644
---- a/net/ipv6/ip6_offload.c
-+++ b/net/ipv6/ip6_offload.c
-@@ -46,6 +46,7 @@ static int ipv6_gso_pull_exthdrs(struct sk_buff *skb, int proto)
- if (unlikely(!pskb_may_pull(skb, len)))
- break;
-
-+ opth = (void *)skb->data;
- proto = opth->nexthdr;
- __skb_pull(skb, len);
- }
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
-index 657639d..8b609c5 100644
+index 9cb94cf..5678108 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -86,7 +86,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
@@ -104509,7 +103913,7 @@ index 657639d..8b609c5 100644
static int ip6_tnl_net_id __read_mostly;
struct ip6_tnl_net {
-@@ -1707,7 +1707,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
+@@ -1706,7 +1706,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
[IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
};
@@ -104519,7 +103923,7 @@ index 657639d..8b609c5 100644
.maxtype = IFLA_IPTUN_MAX,
.policy = ip6_tnl_policy,
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
-index 28456c9..13a4115 100644
+index bcda14d..49378c9 100644
--- a/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
@@ -104531,7 +103935,7 @@ index 28456c9..13a4115 100644
static int vti6_net_id __read_mostly;
struct vti6_net {
-@@ -901,7 +901,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
+@@ -981,7 +981,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
[IFLA_VTI_OKEY] = { .type = NLA_U32 },
};
@@ -104541,10 +103945,10 @@ index 28456c9..13a4115 100644
.maxtype = IFLA_VTI_MAX,
.policy = vti6_policy,
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
-index 0a00f44..bec42b2 100644
+index e1a9583..7dd8f4d 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
-@@ -991,7 +991,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
+@@ -993,7 +993,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
if (sk->sk_type != SOCK_STREAM)
return -ENOPROTOOPT;
@@ -104603,10 +104007,10 @@ index e080fbb..412b3cf 100644
case IP6T_SO_GET_ENTRIES:
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
-index 767ab8d..c5ec70a 100644
+index 6f187c8..34b367f 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
-@@ -90,12 +90,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
+@@ -96,12 +96,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
static int nf_ct_frag6_sysctl_register(struct net *net)
{
@@ -104621,10 +104025,10 @@ index 767ab8d..c5ec70a 100644
GFP_KERNEL);
if (table == NULL)
goto err_alloc;
-@@ -103,9 +102,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
- table[0].data = &net->nf_frag.frags.timeout;
- table[1].data = &net->nf_frag.frags.low_thresh;
+@@ -112,9 +111,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
table[2].data = &net->nf_frag.frags.high_thresh;
+ table[2].extra1 = &net->nf_frag.frags.low_thresh;
+ table[2].extra2 = &init_net.nf_frag.frags.high_thresh;
- }
-
- hdr = register_net_sysctl(net, "net/netfilter", table);
@@ -104634,7 +104038,7 @@ index 767ab8d..c5ec70a 100644
if (hdr == NULL)
goto err_reg;
-@@ -113,8 +112,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
+@@ -122,8 +121,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
return 0;
err_reg:
@@ -104645,10 +104049,10 @@ index 767ab8d..c5ec70a 100644
return -ENOMEM;
}
diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
-index bda7429..469b26b 100644
+index 5b7a1ed..d9da205 100644
--- a/net/ipv6/ping.c
+++ b/net/ipv6/ping.c
-@@ -246,6 +246,24 @@ static struct pernet_operations ping_v6_net_ops = {
+@@ -240,6 +240,24 @@ static struct pernet_operations ping_v6_net_ops = {
};
#endif
@@ -104673,7 +104077,7 @@ index bda7429..469b26b 100644
int __init pingv6_init(void)
{
#ifdef CONFIG_PROC_FS
-@@ -253,13 +271,7 @@ int __init pingv6_init(void)
+@@ -247,13 +265,7 @@ int __init pingv6_init(void)
if (ret)
return ret;
#endif
@@ -104688,7 +104092,7 @@ index bda7429..469b26b 100644
return inet6_register_protosw(&pingv6_protosw);
}
-@@ -268,14 +280,9 @@ int __init pingv6_init(void)
+@@ -262,14 +274,9 @@ int __init pingv6_init(void)
*/
void pingv6_exit(void)
{
@@ -104705,7 +104109,7 @@ index bda7429..469b26b 100644
inet6_unregister_protosw(&pingv6_protosw);
}
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
-index 091d066..139d410 100644
+index 1752cd0..3c6af41 100644
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -309,7 +309,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
@@ -104718,7 +104122,7 @@ index 091d066..139d410 100644
goto proc_dev_snmp6_fail;
return 0;
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
-index 1f29996..7418779 100644
+index 896af88..6e2ba628 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
@@ -104748,7 +104152,7 @@ index 1f29996..7418779 100644
kfree_skb(skb);
return NET_RX_DROP;
}
-@@ -610,7 +610,7 @@ out:
+@@ -608,7 +608,7 @@ out:
return err;
}
@@ -104757,7 +104161,7 @@ index 1f29996..7418779 100644
struct flowi6 *fl6, struct dst_entry **dstp,
unsigned int flags)
{
-@@ -922,12 +922,15 @@ do_confirm:
+@@ -914,12 +914,15 @@ do_confirm:
static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
char __user *optval, int optlen)
{
@@ -104774,7 +104178,7 @@ index 1f29996..7418779 100644
return 0;
default:
return -ENOPROTOOPT;
-@@ -940,6 +943,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
+@@ -932,6 +935,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
char __user *optval, int __user *optlen)
{
int len;
@@ -104782,7 +104186,7 @@ index 1f29996..7418779 100644
switch (optname) {
case ICMPV6_FILTER:
-@@ -951,7 +955,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
+@@ -943,7 +947,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
len = sizeof(struct icmp6_filter);
if (put_user(len, optlen))
return -EFAULT;
@@ -104793,10 +104197,10 @@ index 1f29996..7418779 100644
return 0;
default:
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
-index cc85a9b..526a133 100644
+index 1a157ca..9fc05f4 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
-@@ -626,12 +626,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
+@@ -625,12 +625,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
{
@@ -104811,7 +104215,7 @@ index cc85a9b..526a133 100644
if (table == NULL)
goto err_alloc;
-@@ -642,9 +641,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
+@@ -644,9 +643,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
/* Don't export sysctls to unprivileged users */
if (net->user_ns != &init_user_ns)
table[0].procname = NULL;
@@ -104824,7 +104228,7 @@ index cc85a9b..526a133 100644
if (hdr == NULL)
goto err_reg;
-@@ -652,8 +652,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
+@@ -654,8 +654,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
return 0;
err_reg:
@@ -104835,10 +104239,10 @@ index cc85a9b..526a133 100644
return -ENOMEM;
}
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
-index 7cc1102..50e95c7 100644
+index a318dd89..42a612c 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
-@@ -1160,12 +1160,9 @@ static void ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,
+@@ -1150,12 +1150,9 @@ static void ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,
struct net *net = dev_net(dst->dev);
rt6->rt6i_flags |= RTF_MODIFIED;
@@ -104853,7 +104257,7 @@ index 7cc1102..50e95c7 100644
dst_metric_set(dst, RTAX_MTU, mtu);
rt6_update_expires(rt6, net->ipv6.sysctl.ip6_rt_mtu_expires);
}
-@@ -2973,7 +2970,7 @@ struct ctl_table ipv6_route_table_template[] = {
+@@ -2965,7 +2962,7 @@ struct ctl_table ipv6_route_table_template[] = {
struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
{
@@ -104863,7 +104267,7 @@ index 7cc1102..50e95c7 100644
table = kmemdup(ipv6_route_table_template,
sizeof(ipv6_route_table_template),
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
-index 317b6db..9dbd284 100644
+index a24557a..ade77d3 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
@@ -104875,30 +104279,34 @@ index 317b6db..9dbd284 100644
static int sit_net_id __read_mostly;
struct sit_net {
-@@ -483,11 +483,11 @@ static void ipip6_tunnel_uninit(struct net_device *dev)
- */
- static int ipip6_err_gen_icmpv6_unreach(struct sk_buff *skb)
- {
-- const struct iphdr *iph = (const struct iphdr *) skb->data;
-+ int ihl = ((const struct iphdr *)skb->data)->ihl*4;
- struct rt6_info *rt;
- struct sk_buff *skb2;
-
-- if (!pskb_may_pull(skb, iph->ihl * 4 + sizeof(struct ipv6hdr) + 8))
-+ if (!pskb_may_pull(skb, ihl + sizeof(struct ipv6hdr) + 8))
- return 1;
+@@ -1505,12 +1505,12 @@ static bool ipip6_netlink_encap_parms(struct nlattr *data[],
- skb2 = skb_clone(skb, GFP_ATOMIC);
-@@ -496,7 +496,7 @@ static int ipip6_err_gen_icmpv6_unreach(struct sk_buff *skb)
- return 1;
+ if (data[IFLA_IPTUN_ENCAP_SPORT]) {
+ ret = true;
+- ipencap->sport = nla_get_u16(data[IFLA_IPTUN_ENCAP_SPORT]);
++ ipencap->sport = nla_get_be16(data[IFLA_IPTUN_ENCAP_SPORT]);
+ }
- skb_dst_drop(skb2);
-- skb_pull(skb2, iph->ihl * 4);
-+ skb_pull(skb2, ihl);
- skb_reset_network_header(skb2);
+ if (data[IFLA_IPTUN_ENCAP_DPORT]) {
+ ret = true;
+- ipencap->dport = nla_get_u16(data[IFLA_IPTUN_ENCAP_DPORT]);
++ ipencap->dport = nla_get_be16(data[IFLA_IPTUN_ENCAP_DPORT]);
+ }
- rt = rt6_lookup(dev_net(skb->dev), &ipv6_hdr(skb2)->saddr, NULL, 0, 0);
-@@ -1680,7 +1680,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
+ return ret;
+@@ -1706,9 +1706,9 @@ static int ipip6_fill_info(struct sk_buff *skb, const struct net_device *dev)
+
+ if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE,
+ tunnel->encap.type) ||
+- nla_put_u16(skb, IFLA_IPTUN_ENCAP_SPORT,
++ nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT,
+ tunnel->encap.sport) ||
+- nla_put_u16(skb, IFLA_IPTUN_ENCAP_DPORT,
++ nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT,
+ tunnel->encap.dport) ||
+ nla_put_u16(skb, IFLA_IPTUN_ENCAP_FLAGS,
+ tunnel->encap.dport))
+@@ -1750,7 +1750,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
unregister_netdevice_queue(dev, head);
}
@@ -104908,10 +104316,10 @@ index 317b6db..9dbd284 100644
.maxtype = IFLA_IPTUN_MAX,
.policy = ipip6_policy,
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
-index 7f405a1..eabef92 100644
+index c5c10fa..2577d51 100644
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
-@@ -54,7 +54,7 @@ static struct ctl_table ipv6_rotable[] = {
+@@ -78,7 +78,7 @@ static struct ctl_table ipv6_rotable[] = {
static int __net_init ipv6_sysctl_net_init(struct net *net)
{
@@ -104921,11 +104329,11 @@ index 7f405a1..eabef92 100644
struct ctl_table *ipv6_icmp_table;
int err;
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
-index a4f890d..5db3708 100644
+index c113602..0cccb46 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
- inet6_sk(sk)->rx_dst_cookie = rt->rt6i_node->fn_sernum;
+ }
}
+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
@@ -104935,7 +104343,7 @@ index a4f890d..5db3708 100644
static void tcp_v6_hash(struct sock *sk)
{
if (sk->sk_state != TCP_CLOSE) {
-@@ -1412,6 +1416,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
+@@ -1341,6 +1345,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
return 0;
reset:
@@ -104945,10 +104353,10 @@ index a4f890d..5db3708 100644
tcp_v6_send_reset(sk, skb);
discard:
if (opt_skb)
-@@ -1496,12 +1503,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
- TCP_SKB_CB(skb)->sacked = 0;
+@@ -1441,12 +1448,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
- sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
+ sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest,
+ inet6_iif(skb));
- if (!sk)
+ if (!sk) {
+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
@@ -104968,7 +104376,7 @@ index a4f890d..5db3708 100644
if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
-@@ -1553,6 +1568,10 @@ csum_error:
+@@ -1497,6 +1512,10 @@ csum_error:
bad_packet:
TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
} else {
@@ -104980,7 +104388,7 @@ index a4f890d..5db3708 100644
}
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
-index 20b63d2..31a777d 100644
+index f6ba535..b41033f 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -76,6 +76,10 @@ static unsigned int udp6_ehashfn(struct net *net,
@@ -104994,7 +104402,7 @@ index 20b63d2..31a777d 100644
int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
{
const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
-@@ -435,7 +439,7 @@ try_again:
+@@ -434,7 +438,7 @@ try_again:
if (unlikely(err)) {
trace_kfree_skb(skb, udpv6_recvmsg);
if (!peeked) {
@@ -105003,7 +104411,7 @@ index 20b63d2..31a777d 100644
if (is_udp4)
UDP_INC_STATS_USER(sock_net(sk),
UDP_MIB_INERRORS,
-@@ -690,7 +694,7 @@ csum_error:
+@@ -701,7 +705,7 @@ csum_error:
UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
drop:
UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
@@ -105012,7 +104420,7 @@ index 20b63d2..31a777d 100644
kfree_skb(skb);
return -1;
}
-@@ -747,7 +751,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
+@@ -740,7 +744,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
if (likely(skb1 == NULL))
skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
if (!skb1) {
@@ -105021,7 +104429,7 @@ index 20b63d2..31a777d 100644
UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
IS_UDPLITE(sk));
UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
-@@ -886,6 +890,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
+@@ -919,6 +923,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
goto csum_error;
UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
@@ -105032,7 +104440,7 @@ index 20b63d2..31a777d 100644
kfree_skb(skb);
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
-index 5f8e128..776fc30 100644
+index 5f98364..691985a 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -130,12 +130,18 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
@@ -105056,42 +104464,7 @@ index 5f8e128..776fc30 100644
if (skb_dst(skb))
oif = skb_dst(skb)->dev->ifindex;
-@@ -170,8 +176,10 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
- case IPPROTO_DCCP:
- if (!onlyproto && (nh + offset + 4 < skb->data ||
- pskb_may_pull(skb, nh + offset + 4 - skb->data))) {
-- __be16 *ports = (__be16 *)exthdr;
-+ __be16 *ports;
-
-+ nh = skb_network_header(skb);
-+ ports = (__be16 *)(nh + offset);
- fl6->fl6_sport = ports[!!reverse];
- fl6->fl6_dport = ports[!reverse];
- }
-@@ -180,8 +188,10 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
-
- case IPPROTO_ICMPV6:
- if (!onlyproto && pskb_may_pull(skb, nh + offset + 2 - skb->data)) {
-- u8 *icmp = (u8 *)exthdr;
-+ u8 *icmp;
-
-+ nh = skb_network_header(skb);
-+ icmp = (u8 *)(nh + offset);
- fl6->fl6_icmp_type = icmp[0];
- fl6->fl6_icmp_code = icmp[1];
- }
-@@ -192,8 +202,9 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
- case IPPROTO_MH:
- if (!onlyproto && pskb_may_pull(skb, nh + offset + 3 - skb->data)) {
- struct ip6_mh *mh;
-- mh = (struct ip6_mh *)exthdr;
-
-+ nh = skb_network_header(skb);
-+ mh = (struct ip6_mh *)(nh + offset);
- fl6->fl6_mh_type = mh->ip6mh_type;
- }
- fl6->flowi6_proto = nexthdr;
-@@ -212,11 +223,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
+@@ -217,11 +223,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
}
}
@@ -105105,7 +104478,7 @@ index 5f8e128..776fc30 100644
return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
}
-@@ -329,19 +340,19 @@ static struct ctl_table xfrm6_policy_table[] = {
+@@ -334,19 +340,19 @@ static struct ctl_table xfrm6_policy_table[] = {
static int __net_init xfrm6_net_init(struct net *net)
{
@@ -105130,7 +104503,7 @@ index 5f8e128..776fc30 100644
if (!hdr)
goto err_reg;
-@@ -349,8 +360,7 @@ static int __net_init xfrm6_net_init(struct net *net)
+@@ -354,8 +360,7 @@ static int __net_init xfrm6_net_init(struct net *net)
return 0;
err_reg:
@@ -105154,10 +104527,10 @@ index e15c16a..7cf07aa 100644
if (!ipx_proc_dir)
goto out;
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
-index 2ba8b97..6d33010 100644
+index 61ceb4c..e788eb8 100644
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
-@@ -317,11 +317,11 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
+@@ -317,10 +317,10 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
add_wait_queue(&port->open_wait, &wait);
IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
@@ -105165,13 +104538,12 @@ index 2ba8b97..6d33010 100644
+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
spin_lock_irqsave(&port->lock, flags);
- if (!tty_hung_up_p(filp))
-- port->count--;
-+ atomic_dec(&port->count);
+- port->count--;
++ atomic_dec(&port->count);
port->blocked_open++;
spin_unlock_irqrestore(&port->lock, flags);
-@@ -356,7 +356,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
+@@ -355,7 +355,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
}
IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
@@ -105180,7 +104552,7 @@ index 2ba8b97..6d33010 100644
schedule();
}
-@@ -366,12 +366,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
+@@ -365,12 +365,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
spin_lock_irqsave(&port->lock, flags);
if (!tty_hung_up_p(filp))
@@ -105195,7 +104567,7 @@ index 2ba8b97..6d33010 100644
if (!retval)
port->flags |= ASYNC_NORMAL_ACTIVE;
-@@ -445,12 +445,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
+@@ -444,12 +444,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
/* ++ is not atomic, so this should be protected - Jean II */
spin_lock_irqsave(&self->port.lock, flags);
@@ -105210,7 +104582,7 @@ index 2ba8b97..6d33010 100644
/* Not really used by us, but lets do it anyway */
self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
-@@ -987,7 +987,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
+@@ -985,7 +985,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
tty_kref_put(port->tty);
}
port->tty = NULL;
@@ -105219,7 +104591,7 @@ index 2ba8b97..6d33010 100644
spin_unlock_irqrestore(&port->lock, flags);
wake_up_interruptible(&port->open_wait);
-@@ -1344,7 +1344,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
+@@ -1342,7 +1342,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
seq_putc(m, '\n');
seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
@@ -105242,12 +104614,12 @@ index b9ac598..f88cc56 100644
return;
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
-index 1465363..c7e9f14 100644
+index a089b6b..3ca3b60 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
-@@ -773,10 +773,10 @@ static int iucv_sock_autobind(struct sock *sk)
-
- write_lock_bh(&iucv_sk_list.lock);
+@@ -686,10 +686,10 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
+ {
+ char name[12];
- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
@@ -105256,13 +104628,13 @@ index 1465363..c7e9f14 100644
- atomic_inc_return(&iucv_sk_list.autobind_name));
+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
}
-
- write_unlock_bh(&iucv_sk_list.lock);
+ memcpy(iucv->src_name, name, 8);
+ }
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
-index cd5b8ec..f205e6b 100644
+index 2a6a1fd..6c112b0 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
-@@ -690,7 +690,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
+@@ -702,7 +702,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
@@ -105272,10 +104644,10 @@ index cd5b8ec..f205e6b 100644
};
diff --git a/net/key/af_key.c b/net/key/af_key.c
-index 7932697..a13d158 100644
+index 1847ec4..26ef732 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
-@@ -3052,10 +3052,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
+@@ -3049,10 +3049,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
static u32 get_acqseq(void)
{
u32 res;
@@ -105288,6 +104660,82 @@ index 7932697..a13d158 100644
} while (!res);
return res;
}
+diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
+index edb78e6..8dc654a 100644
+--- a/net/l2tp/l2tp_eth.c
++++ b/net/l2tp/l2tp_eth.c
+@@ -42,12 +42,12 @@ struct l2tp_eth {
+ struct sock *tunnel_sock;
+ struct l2tp_session *session;
+ struct list_head list;
+- atomic_long_t tx_bytes;
+- atomic_long_t tx_packets;
+- atomic_long_t tx_dropped;
+- atomic_long_t rx_bytes;
+- atomic_long_t rx_packets;
+- atomic_long_t rx_errors;
++ atomic_long_unchecked_t tx_bytes;
++ atomic_long_unchecked_t tx_packets;
++ atomic_long_unchecked_t tx_dropped;
++ atomic_long_unchecked_t rx_bytes;
++ atomic_long_unchecked_t rx_packets;
++ atomic_long_unchecked_t rx_errors;
+ };
+
+ /* via l2tp_session_priv() */
+@@ -98,10 +98,10 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
+ int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
+
+ if (likely(ret == NET_XMIT_SUCCESS)) {
+- atomic_long_add(len, &priv->tx_bytes);
+- atomic_long_inc(&priv->tx_packets);
++ atomic_long_add_unchecked(len, &priv->tx_bytes);
++ atomic_long_inc_unchecked(&priv->tx_packets);
+ } else {
+- atomic_long_inc(&priv->tx_dropped);
++ atomic_long_inc_unchecked(&priv->tx_dropped);
+ }
+ return NETDEV_TX_OK;
+ }
+@@ -111,12 +111,12 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
+ {
+ struct l2tp_eth *priv = netdev_priv(dev);
+
+- stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
+- stats->tx_packets = atomic_long_read(&priv->tx_packets);
+- stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
+- stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
+- stats->rx_packets = atomic_long_read(&priv->rx_packets);
+- stats->rx_errors = atomic_long_read(&priv->rx_errors);
++ stats->tx_bytes = atomic_long_read_unchecked(&priv->tx_bytes);
++ stats->tx_packets = atomic_long_read_unchecked(&priv->tx_packets);
++ stats->tx_dropped = atomic_long_read_unchecked(&priv->tx_dropped);
++ stats->rx_bytes = atomic_long_read_unchecked(&priv->rx_bytes);
++ stats->rx_packets = atomic_long_read_unchecked(&priv->rx_packets);
++ stats->rx_errors = atomic_long_read_unchecked(&priv->rx_errors);
+ return stats;
+ }
+
+@@ -166,15 +166,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
+ nf_reset(skb);
+
+ if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
+- atomic_long_inc(&priv->rx_packets);
+- atomic_long_add(data_len, &priv->rx_bytes);
++ atomic_long_inc_unchecked(&priv->rx_packets);
++ atomic_long_add_unchecked(data_len, &priv->rx_bytes);
+ } else {
+- atomic_long_inc(&priv->rx_errors);
++ atomic_long_inc_unchecked(&priv->rx_errors);
+ }
+ return;
+
+ error:
+- atomic_long_inc(&priv->rx_errors);
++ atomic_long_inc_unchecked(&priv->rx_errors);
+ kfree_skb(skb);
+ }
+
diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
index 1a3c7e0..80f8b0c 100644
--- a/net/llc/llc_proc.c
@@ -105302,10 +104750,10 @@ index 1a3c7e0..80f8b0c 100644
goto out;
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
-index 453e974..b3a43a5 100644
+index 343da1e..509873f 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
-@@ -839,7 +839,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
+@@ -541,7 +541,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
ret = ieee80211_vif_use_channel(sdata, chandef,
IEEE80211_CHANCTX_EXCLUSIVE);
}
@@ -105314,7 +104762,7 @@ index 453e974..b3a43a5 100644
local->_oper_chandef = *chandef;
ieee80211_hw_config(local, 0);
}
-@@ -3356,7 +3356,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
+@@ -3326,7 +3326,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
else
local->probe_req_reg--;
@@ -105323,9 +104771,9 @@ index 453e974..b3a43a5 100644
break;
ieee80211_queue_work(&local->hw, &local->reconfig_filter);
-@@ -3819,8 +3819,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
+@@ -3460,8 +3460,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
if (chanctx_conf) {
- *chandef = chanctx_conf->def;
+ *chandef = sdata->vif.bss_conf.chandef;
ret = 0;
- } else if (local->open_count > 0 &&
- local->open_count == local->monitors &&
@@ -105335,10 +104783,10 @@ index 453e974..b3a43a5 100644
if (local->use_chanctx)
*chandef = local->monitor_chandef;
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
-index bf7a1bb..1619d8e 100644
+index 8c68da3..0695016 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
-@@ -28,6 +28,7 @@
+@@ -29,6 +29,7 @@
#include <net/ieee80211_radiotap.h>
#include <net/cfg80211.h>
#include <net/mac80211.h>
@@ -105346,7 +104794,7 @@ index bf7a1bb..1619d8e 100644
#include "key.h"
#include "sta_info.h"
#include "debug.h"
-@@ -995,7 +996,7 @@ struct ieee80211_local {
+@@ -1057,7 +1058,7 @@ struct ieee80211_local {
/* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
spinlock_t queue_stop_reason_lock;
@@ -105356,10 +104804,10 @@ index bf7a1bb..1619d8e 100644
/* number of interfaces with corresponding FIF_ flags */
int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
-index 06f5de4..f2e0437 100644
+index eeae0ab..0f24585 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -529,7 +529,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
+@@ -533,7 +533,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
break;
}
@@ -105368,7 +104816,7 @@ index 06f5de4..f2e0437 100644
res = drv_start(local);
if (res)
goto err_del_bss;
-@@ -576,7 +576,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
+@@ -580,7 +580,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
res = drv_add_interface(local, sdata);
if (res)
goto err_stop;
@@ -105377,7 +104825,7 @@ index 06f5de4..f2e0437 100644
res = ieee80211_add_virtual_monitor(local);
if (res)
goto err_stop;
-@@ -685,7 +685,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
+@@ -689,7 +689,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
atomic_inc(&local->iff_promiscs);
if (coming_up)
@@ -105386,7 +104834,7 @@ index 06f5de4..f2e0437 100644
if (hw_reconf_flags)
ieee80211_hw_config(local, hw_reconf_flags);
-@@ -723,7 +723,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
+@@ -727,7 +727,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
err_del_interface:
drv_remove_interface(local, sdata);
err_stop:
@@ -105395,7 +104843,7 @@ index 06f5de4..f2e0437 100644
drv_stop(local);
err_del_bss:
sdata->bss = NULL;
-@@ -876,7 +876,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
+@@ -893,7 +893,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
}
if (going_down)
@@ -105404,7 +104852,7 @@ index 06f5de4..f2e0437 100644
switch (sdata->vif.type) {
case NL80211_IFTYPE_AP_VLAN:
-@@ -935,7 +935,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
+@@ -955,7 +955,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
}
spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
@@ -105413,7 +104861,7 @@ index 06f5de4..f2e0437 100644
ieee80211_clear_tx_pending(local);
/*
-@@ -978,7 +978,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
+@@ -998,7 +998,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
if (cancel_scan)
flush_delayed_work(&local->scan_work);
@@ -105422,7 +104870,7 @@ index 06f5de4..f2e0437 100644
ieee80211_stop_device(local);
/* no reconfiguring after stop! */
-@@ -989,7 +989,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
+@@ -1009,7 +1009,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
ieee80211_configure_filter(local);
ieee80211_hw_config(local, hw_reconf_flags);
@@ -105432,10 +104880,10 @@ index 06f5de4..f2e0437 100644
}
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
-index c7a7a86..a74f57b 100644
+index 0de7c93..884b2ca 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
-@@ -174,7 +174,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
+@@ -175,7 +175,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
IEEE80211_CONF_CHANGE_POWER);
@@ -105445,7 +104893,7 @@ index c7a7a86..a74f57b 100644
/*
* Goal:
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
-index d478b88..8c8d157 100644
+index 4a95fe3..0bfd713 100644
--- a/net/mac80211/pm.c
+++ b/net/mac80211/pm.c
@@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
@@ -105457,7 +104905,7 @@ index d478b88..8c8d157 100644
goto suspend;
ieee80211_scan_cancel(local);
-@@ -58,7 +58,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
+@@ -59,7 +59,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
cancel_work_sync(&local->dynamic_ps_enable_work);
del_timer_sync(&local->dynamic_ps_timer);
@@ -105466,7 +104914,7 @@ index d478b88..8c8d157 100644
if (local->wowlan) {
int err = drv_suspend(local, wowlan);
if (err < 0) {
-@@ -123,7 +123,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
+@@ -126,7 +126,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
WARN_ON(!list_empty(&local->chanctx_list));
/* stop hardware - this must stop RX */
@@ -105476,10 +104924,10 @@ index d478b88..8c8d157 100644
suspend:
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
-index 74350c3..512e9f5 100644
+index 6081329..ab23834 100644
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
-@@ -734,7 +734,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
+@@ -720,7 +720,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
ASSERT_RTNL();
@@ -105488,24 +104936,11 @@ index 74350c3..512e9f5 100644
return -EBUSY;
if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
-diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
-index 6ff1346..936ca9a 100644
---- a/net/mac80211/rc80211_pid_debugfs.c
-+++ b/net/mac80211/rc80211_pid_debugfs.c
-@@ -193,7 +193,7 @@ static ssize_t rate_control_pid_events_read(struct file *file, char __user *buf,
-
- spin_unlock_irqrestore(&events->lock, status);
-
-- if (copy_to_user(buf, pb, p))
-+ if (p > sizeof(pb) || copy_to_user(buf, pb, p))
- return -EFAULT;
-
- return p;
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
-index 6427625..afa5a5a 100644
+index 3c61060..7bed2e3 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
-@@ -1483,7 +1483,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
+@@ -1669,7 +1669,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
}
#endif
/* everything else happens only if HW was up & running */
@@ -105514,7 +104949,7 @@ index 6427625..afa5a5a 100644
goto wake_up;
/*
-@@ -1708,7 +1708,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
+@@ -1895,7 +1895,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
local->in_reconfig = false;
barrier();
@@ -105524,10 +104959,10 @@ index 6427625..afa5a5a 100644
/*
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
-index e9410d1..77b6378 100644
+index ae5096ab..e5aa70a 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -1081,6 +1081,16 @@ config NETFILTER_XT_MATCH_ESP
+@@ -1105,6 +1105,16 @@ config NETFILTER_XT_MATCH_ESP
To compile it as a module, choose M here. If unsure, say N.
@@ -105545,10 +104980,10 @@ index e9410d1..77b6378 100644
tristate '"hashlimit" match support'
depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
-index bffdad7..f9317d1 100644
+index a9571be..c59e173 100644
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
-@@ -133,6 +133,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
+@@ -137,6 +137,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
@@ -105557,10 +104992,10 @@ index bffdad7..f9317d1 100644
obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
-index 53ea164..c518529 100644
+index d259da3..6a32b2c 100644
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
-@@ -1928,7 +1928,7 @@ done:
+@@ -1952,7 +1952,7 @@ done:
return ret;
}
@@ -105570,10 +105005,10 @@ index 53ea164..c518529 100644
.get_optmin = SO_IP_SET,
.get_optmax = SO_IP_SET + 1,
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
-index 610e19c..08d0c3f 100644
+index b0f7b62..0541842 100644
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
-@@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
+@@ -572,7 +572,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
/* Increase the refcnt counter of the dest */
ip_vs_dest_hold(dest);
@@ -105582,7 +105017,7 @@ index 610e19c..08d0c3f 100644
if (cp->protocol != IPPROTO_UDP)
conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
flags = cp->flags;
-@@ -899,7 +899,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p,
+@@ -922,7 +922,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af,
cp->control = NULL;
atomic_set(&cp->n_control, 0);
@@ -105591,7 +105026,7 @@ index 610e19c..08d0c3f 100644
cp->packet_xmit = NULL;
cp->app = NULL;
-@@ -1187,7 +1187,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
+@@ -1229,7 +1229,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
/* Don't drop the entry if its number of incoming packets is not
located in [0, 8] */
@@ -105601,10 +105036,10 @@ index 610e19c..08d0c3f 100644
if (!todrop_rate[i]) return 0;
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
-index 27d3f40..f95d8d0 100644
+index 990decb..5075248 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
-@@ -567,7 +567,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
+@@ -568,7 +568,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
ret = cp->packet_xmit(skb, cp, pd->pp, iph);
/* do not touch skb anymore */
@@ -105613,7 +105048,7 @@ index 27d3f40..f95d8d0 100644
ip_vs_conn_put(cp);
return ret;
}
-@@ -1711,7 +1711,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
+@@ -1712,7 +1712,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
pkts = sysctl_sync_threshold(ipvs);
else
@@ -105623,10 +105058,10 @@ index 27d3f40..f95d8d0 100644
if (ipvs->sync_state & IP_VS_STATE_MASTER)
ip_vs_sync_conn(net, cp, pkts);
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
-index 35be035..50f8834 100644
+index ac7ba68..9735acb9 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
-@@ -794,7 +794,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
+@@ -800,7 +800,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
*/
ip_vs_rs_hash(ipvs, dest);
}
@@ -105635,7 +105070,7 @@ index 35be035..50f8834 100644
/* bind the service */
old_svc = rcu_dereference_protected(dest->svc, 1);
-@@ -1654,7 +1654,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
+@@ -1665,7 +1665,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
* align with netns init in ip_vs_control_net_init()
*/
@@ -105644,7 +105079,7 @@ index 35be035..50f8834 100644
{
.procname = "amemthresh",
.maxlen = sizeof(int),
-@@ -2075,7 +2075,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
+@@ -2000,7 +2000,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
" %-7s %-6d %-10d %-10d\n",
&dest->addr.in6,
ntohs(dest->port),
@@ -105653,7 +105088,7 @@ index 35be035..50f8834 100644
atomic_read(&dest->weight),
atomic_read(&dest->activeconns),
atomic_read(&dest->inactconns));
-@@ -2086,7 +2086,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
+@@ -2011,7 +2011,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
"%-7s %-6d %-10d %-10d\n",
ntohl(dest->addr.ip),
ntohs(dest->port),
@@ -105662,7 +105097,7 @@ index 35be035..50f8834 100644
atomic_read(&dest->weight),
atomic_read(&dest->activeconns),
atomic_read(&dest->inactconns));
-@@ -2564,7 +2564,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
+@@ -2500,7 +2500,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
entry.addr = dest->addr.ip;
entry.port = dest->port;
@@ -105671,7 +105106,7 @@ index 35be035..50f8834 100644
entry.weight = atomic_read(&dest->weight);
entry.u_threshold = dest->u_threshold;
entry.l_threshold = dest->l_threshold;
-@@ -3107,7 +3107,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
+@@ -3040,7 +3040,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
@@ -105680,16 +105115,7 @@ index 35be035..50f8834 100644
IP_VS_CONN_F_FWD_MASK)) ||
nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
atomic_read(&dest->weight)) ||
-@@ -3580,7 +3580,7 @@ out:
- }
-
-
--static const struct genl_ops ip_vs_genl_ops[] __read_mostly = {
-+static const struct genl_ops ip_vs_genl_ops[] = {
- {
- .cmd = IPVS_CMD_NEW_SERVICE,
- .flags = GENL_ADMIN_PERM,
-@@ -3697,7 +3697,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
+@@ -3673,7 +3673,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
{
int idx;
struct netns_ipvs *ipvs = net_ipvs(net);
@@ -105699,7 +105125,7 @@ index 35be035..50f8834 100644
atomic_set(&ipvs->dropentry, 0);
spin_lock_init(&ipvs->dropentry_lock);
diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
-index ca056a3..9cf01ef 100644
+index 127f140..553d652 100644
--- a/net/netfilter/ipvs/ip_vs_lblc.c
+++ b/net/netfilter/ipvs/ip_vs_lblc.c
@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
@@ -105712,7 +105138,7 @@ index ca056a3..9cf01ef 100644
.procname = "lblc_expiration",
.data = NULL,
diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
-index 3f21a2f..a112e85 100644
+index 2229d2d..b32b785 100644
--- a/net/netfilter/ipvs/ip_vs_lblcr.c
+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
@@ -105725,7 +105151,7 @@ index 3f21a2f..a112e85 100644
.procname = "lblcr_expiration",
.data = NULL,
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
-index db80126..ef7110e 100644
+index 7162c86..9eeb60e 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
@@ -105746,7 +105172,7 @@ index db80126..ef7110e 100644
else
pkts = sysctl_sync_threshold(ipvs);
goto sloop;
-@@ -895,7 +895,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
+@@ -901,7 +901,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
if (opt)
memcpy(&cp->in_seq, opt, sizeof(*opt));
@@ -105756,10 +105182,10 @@ index db80126..ef7110e 100644
cp->old_state = cp->state;
/*
diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
-index 1692e75..0d7c8e3 100644
+index bd90bf8..816a020d 100644
--- a/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c
-@@ -1102,7 +1102,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
+@@ -1215,7 +1215,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
else
rc = NF_ACCEPT;
/* do not touch skb anymore */
@@ -105768,7 +105194,7 @@ index 1692e75..0d7c8e3 100644
goto out;
}
-@@ -1194,7 +1194,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
+@@ -1308,7 +1308,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
else
rc = NF_ACCEPT;
/* do not touch skb anymore */
@@ -105791,10 +105217,10 @@ index a4b5e2a..13b1de3 100644
table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
GFP_KERNEL);
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
-index 356bef5..163b56a 100644
+index c588012..b0d4ef8 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
-@@ -1627,6 +1627,10 @@ void nf_conntrack_init_end(void)
+@@ -1737,6 +1737,10 @@ void nf_conntrack_init_end(void)
#define DYING_NULLS_VAL ((1<<30)+1)
#define TEMPLATE_NULLS_VAL ((1<<30)+2)
@@ -105804,24 +105230,24 @@ index 356bef5..163b56a 100644
+
int nf_conntrack_init_net(struct net *net)
{
- int ret;
-@@ -1641,7 +1645,11 @@ int nf_conntrack_init_net(struct net *net)
- goto err_stat;
- }
+ int ret = -ENOMEM;
+@@ -1762,7 +1766,11 @@ int nf_conntrack_init_net(struct net *net)
+ if (!net->ct.stat)
+ goto err_pcpu_lists;
+#ifdef CONFIG_GRKERNSEC_HIDESYM
+ net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08x", atomic_inc_return_unchecked(&conntrack_cache_id));
+#else
net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
+#endif
- if (!net->ct.slabname) {
- ret = -ENOMEM;
+ if (!net->ct.slabname)
goto err_slabname;
+
diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
-index 1df1761..ce8b88a 100644
+index 4e78c57..ec8fb74 100644
--- a/net/netfilter/nf_conntrack_ecache.c
+++ b/net/netfilter/nf_conntrack_ecache.c
-@@ -188,7 +188,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
+@@ -264,7 +264,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
#ifdef CONFIG_SYSCTL
static int nf_conntrack_event_init_sysctl(struct net *net)
{
@@ -105831,7 +105257,7 @@ index 1df1761..ce8b88a 100644
table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
GFP_KERNEL);
diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
-index 974a2a4..52cc6ff 100644
+index 5b3eae7..dd4b8fe 100644
--- a/net/netfilter/nf_conntrack_helper.c
+++ b/net/netfilter/nf_conntrack_helper.c
@@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
@@ -105857,7 +105283,7 @@ index b65d586..beec902 100644
{
if (users > 0)
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
-index f641751..d3c5b51 100644
+index cf65a1e..2f291e9 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -471,7 +471,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
@@ -105883,10 +105309,10 @@ index 7a394df..bd91a8a 100644
table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
GFP_KERNEL);
diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
-index 85296d4..8becdec 100644
+index d719764..311bc60 100644
--- a/net/netfilter/nf_log.c
+++ b/net/netfilter/nf_log.c
-@@ -243,7 +243,7 @@ static const struct file_operations nflog_file_ops = {
+@@ -353,7 +353,7 @@ static const struct file_operations nflog_file_ops = {
#ifdef CONFIG_SYSCTL
static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
@@ -105895,7 +105321,7 @@ index 85296d4..8becdec 100644
static int nf_log_proc_dostring(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
-@@ -274,14 +274,16 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
+@@ -384,14 +384,16 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
mutex_unlock(&nf_log_mutex);
} else {
@@ -105916,10 +105342,10 @@ index 85296d4..8becdec 100644
}
diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
-index f042ae5..30ea486 100644
+index c68c1e5..8b5d670 100644
--- a/net/netfilter/nf_sockopt.c
+++ b/net/netfilter/nf_sockopt.c
-@@ -45,7 +45,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
+@@ -43,7 +43,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
}
}
@@ -105928,7 +105354,7 @@ index f042ae5..30ea486 100644
out:
mutex_unlock(&nf_sockopt_mutex);
return ret;
-@@ -55,7 +55,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
+@@ -53,7 +53,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
{
mutex_lock(&nf_sockopt_mutex);
@@ -105938,25 +105364,26 @@ index f042ae5..30ea486 100644
}
EXPORT_SYMBOL(nf_unregister_sockopt);
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
-index c68e5e0..8d52d50 100644
+index 71b574c..d319e8b 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
-@@ -152,8 +152,8 @@ nf_tables_chain_type_lookup(const struct nft_af_info *afi,
- #ifdef CONFIG_MODULES
- if (autoload) {
- nfnl_unlock(NFNL_SUBSYS_NFTABLES);
-- request_module("nft-chain-%u-%*.s", afi->family,
-- nla_len(nla)-1, (const char *)nla_data(nla));
-+ request_module("nft-chain-%u-%.*s", afi->family,
-+ nla_len(nla), (const char *)nla_data(nla));
- nfnl_lock(NFNL_SUBSYS_NFTABLES);
- type = __nf_tables_chain_type_lookup(afi->family, nla);
- if (type != NULL)
+@@ -1134,9 +1134,11 @@ static struct nft_stats __percpu *nft_stats_alloc(const struct nlattr *attr)
+ /* Restore old counters on this cpu, no problem. Per-cpu statistics
+ * are not exposed to userspace.
+ */
++ preempt_disable();
+ stats = this_cpu_ptr(newstats);
+ stats->bytes = be64_to_cpu(nla_get_be64(tb[NFTA_COUNTER_BYTES]));
+ stats->pkts = be64_to_cpu(nla_get_be64(tb[NFTA_COUNTER_PACKETS]));
++ preempt_enable();
+
+ return newstats;
+ }
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
-index 6ff12a1..d1815b6 100644
+index 5f1be5b..2cba8cd 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
-@@ -83,7 +83,7 @@ static int nfnl_log_net_id __read_mostly;
+@@ -80,7 +80,7 @@ static int nfnl_log_net_id __read_mostly;
struct nfnl_log_net {
spinlock_t instances_lock;
struct hlist_head instance_table[INSTANCE_BUCKETS];
@@ -105965,7 +105392,7 @@ index 6ff12a1..d1815b6 100644
};
static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
-@@ -566,7 +566,7 @@ __build_packet_message(struct nfnl_log_net *log,
+@@ -563,7 +563,7 @@ __build_packet_message(struct nfnl_log_net *log,
/* global sequence number */
if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
@@ -105974,28 +105401,6 @@ index 6ff12a1..d1815b6 100644
goto nla_put_failure;
if (data_len) {
-diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
-index ad97961..a312654 100644
---- a/net/netfilter/nft_compat.c
-+++ b/net/netfilter/nft_compat.c
-@@ -216,7 +216,7 @@ target_dump_info(struct sk_buff *skb, const struct xt_target *t, const void *in)
- /* We want to reuse existing compat_to_user */
- old_fs = get_fs();
- set_fs(KERNEL_DS);
-- t->compat_to_user(out, in);
-+ t->compat_to_user((void __force_user *)out, in);
- set_fs(old_fs);
- ret = nla_put(skb, NFTA_TARGET_INFO, XT_ALIGN(t->targetsize), out);
- kfree(out);
-@@ -403,7 +403,7 @@ match_dump_info(struct sk_buff *skb, const struct xt_match *m, const void *in)
- /* We want to reuse existing compat_to_user */
- old_fs = get_fs();
- set_fs(KERNEL_DS);
-- m->compat_to_user(out, in);
-+ m->compat_to_user((void __force_user *)out, in);
- set_fs(old_fs);
- ret = nla_put(skb, NFTA_MATCH_INFO, XT_ALIGN(m->matchsize), out);
- kfree(out);
diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
new file mode 100644
index 0000000..c566332
@@ -106054,7 +105459,7 @@ index 0000000..c566332
+MODULE_ALIAS("ipt_gradm");
+MODULE_ALIAS("ip6t_gradm");
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
-index 47dc683..2e0d52c 100644
+index 05fbc2a..4424b5c 100644
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -871,11 +871,11 @@ static int __net_init hashlimit_proc_net_init(struct net *net)
@@ -106072,10 +105477,10 @@ index 47dc683..2e0d52c 100644
remove_proc_entry("ipt_hashlimit", net->proc_net);
return -ENOMEM;
diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
-index 1e657cf..1eb1c34 100644
+index a9faae8..1ea30e0 100644
--- a/net/netfilter/xt_recent.c
+++ b/net/netfilter/xt_recent.c
-@@ -618,7 +618,7 @@ static int __net_init recent_proc_net_init(struct net *net)
+@@ -615,7 +615,7 @@ static int __net_init recent_proc_net_init(struct net *net)
{
struct recent_net *recent_net = recent_pernet(net);
@@ -106119,10 +105524,10 @@ index 11de55e..f25e448 100644
return 0;
}
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
-index 1d52506..b772b22 100644
+index 79c965a..ee2b76d 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
-@@ -257,7 +257,7 @@ static void netlink_overrun(struct sock *sk)
+@@ -273,7 +273,7 @@ static void netlink_overrun(struct sock *sk)
sk->sk_error_report(sk);
}
}
@@ -106131,7 +105536,7 @@ index 1d52506..b772b22 100644
}
static void netlink_rcv_wake(struct sock *sk)
-@@ -2983,7 +2983,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
+@@ -2990,7 +2990,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
sk_wmem_alloc_get(s),
nlk->cb_running,
atomic_read(&s->sk_refcnt),
@@ -106140,23 +105545,95 @@ index 1d52506..b772b22 100644
sock_i_ino(s)
);
-diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
-index b74aa07..d41926e 100644
---- a/net/netrom/af_netrom.c
-+++ b/net/netrom/af_netrom.c
-@@ -850,7 +850,6 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr,
- *uaddr_len = sizeof(struct full_sockaddr_ax25);
- } else {
- sax->fsa_ax25.sax25_family = AF_NETROM;
-- sax->fsa_ax25.sax25_ndigis = 0;
- sax->fsa_ax25.sax25_call = nr->source_addr;
- *uaddr_len = sizeof(struct sockaddr_ax25);
+diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c
+index 8451612..c8872bc 100644
+--- a/net/openvswitch/vport-internal_dev.c
++++ b/net/openvswitch/vport-internal_dev.c
+@@ -122,7 +122,7 @@ static const struct net_device_ops internal_dev_netdev_ops = {
+ .ndo_get_stats64 = internal_dev_get_stats,
+ };
+
+-static struct rtnl_link_ops internal_dev_link_ops __read_mostly = {
++static struct rtnl_link_ops internal_dev_link_ops = {
+ .kind = "openvswitch",
+ };
+
+diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
+index 6015802..e81e8bf 100644
+--- a/net/openvswitch/vport.c
++++ b/net/openvswitch/vport.c
+@@ -269,10 +269,10 @@ void ovs_vport_get_stats(struct vport *vport, struct ovs_vport_stats *stats)
+ * netdev-stats can be directly read over netlink-ioctl.
+ */
+
+- stats->rx_errors = atomic_long_read(&vport->err_stats.rx_errors);
+- stats->tx_errors = atomic_long_read(&vport->err_stats.tx_errors);
+- stats->tx_dropped = atomic_long_read(&vport->err_stats.tx_dropped);
+- stats->rx_dropped = atomic_long_read(&vport->err_stats.rx_dropped);
++ stats->rx_errors = atomic_long_read_unchecked(&vport->err_stats.rx_errors);
++ stats->tx_errors = atomic_long_read_unchecked(&vport->err_stats.tx_errors);
++ stats->tx_dropped = atomic_long_read_unchecked(&vport->err_stats.tx_dropped);
++ stats->rx_dropped = atomic_long_read_unchecked(&vport->err_stats.rx_dropped);
+
+ for_each_possible_cpu(i) {
+ const struct pcpu_sw_netstats *percpu_stats;
+@@ -503,19 +503,19 @@ static void ovs_vport_record_error(struct vport *vport,
+ {
+ switch (err_type) {
+ case VPORT_E_RX_DROPPED:
+- atomic_long_inc(&vport->err_stats.rx_dropped);
++ atomic_long_inc_unchecked(&vport->err_stats.rx_dropped);
+ break;
+
+ case VPORT_E_RX_ERROR:
+- atomic_long_inc(&vport->err_stats.rx_errors);
++ atomic_long_inc_unchecked(&vport->err_stats.rx_errors);
+ break;
+
+ case VPORT_E_TX_DROPPED:
+- atomic_long_inc(&vport->err_stats.tx_dropped);
++ atomic_long_inc_unchecked(&vport->err_stats.tx_dropped);
+ break;
+
+ case VPORT_E_TX_ERROR:
+- atomic_long_inc(&vport->err_stats.tx_errors);
++ atomic_long_inc_unchecked(&vport->err_stats.tx_errors);
+ break;
}
+
+diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h
+index 8942125..03ed887 100644
+--- a/net/openvswitch/vport.h
++++ b/net/openvswitch/vport.h
+@@ -61,10 +61,10 @@ int ovs_vport_send(struct vport *, struct sk_buff *);
+ /* The following definitions are for implementers of vport devices: */
+
+ struct vport_err_stats {
+- atomic_long_t rx_dropped;
+- atomic_long_t rx_errors;
+- atomic_long_t tx_dropped;
+- atomic_long_t tx_errors;
++ atomic_long_unchecked_t rx_dropped;
++ atomic_long_unchecked_t rx_errors;
++ atomic_long_unchecked_t tx_dropped;
++ atomic_long_unchecked_t tx_errors;
+ };
+ /**
+ * struct vport_portids - array of netlink portids of a vport.
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
-index 48b1817..d2c096b 100644
+index 07c04a8..3ca11eb 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
-@@ -1846,7 +1846,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
+@@ -269,7 +269,7 @@ static int packet_direct_xmit(struct sk_buff *skb)
+
+ return ret;
+ drop:
+- atomic_long_inc(&dev->tx_dropped);
++ atomic_long_inc_unchecked(&dev->tx_dropped);
+ kfree_skb(skb);
+ return NET_XMIT_DROP;
+ }
+@@ -1836,7 +1836,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
spin_lock(&sk->sk_receive_queue.lock);
po->stats.stats1.tp_packets++;
@@ -106164,8 +105641,8 @@ index 48b1817..d2c096b 100644
+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
__skb_queue_tail(&sk->sk_receive_queue, skb);
spin_unlock(&sk->sk_receive_queue.lock);
- sk->sk_data_ready(sk, skb->len);
-@@ -1855,7 +1855,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
+ sk->sk_data_ready(sk);
+@@ -1845,7 +1845,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
drop_n_acct:
spin_lock(&sk->sk_receive_queue.lock);
po->stats.stats1.tp_drops++;
@@ -106174,7 +105651,7 @@ index 48b1817..d2c096b 100644
spin_unlock(&sk->sk_receive_queue.lock);
drop_n_restore:
-@@ -3462,7 +3462,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
+@@ -3460,7 +3460,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
case PACKET_HDRLEN:
if (len > sizeof(int))
len = sizeof(int);
@@ -106183,7 +105660,7 @@ index 48b1817..d2c096b 100644
return -EFAULT;
switch (val) {
case TPACKET_V1:
-@@ -3508,7 +3508,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
+@@ -3506,7 +3506,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
len = lv;
if (put_user(len, optlen))
return -EFAULT;
@@ -106193,7 +105670,7 @@ index 48b1817..d2c096b 100644
return 0;
}
diff --git a/net/phonet/pep.c b/net/phonet/pep.c
-index e774117..900b8b7 100644
+index 70a547e..23477fe 100644
--- a/net/phonet/pep.c
+++ b/net/phonet/pep.c
@@ -388,7 +388,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
@@ -106214,7 +105691,7 @@ index e774117..900b8b7 100644
err = -ENOBUFS;
break;
}
-@@ -580,7 +580,7 @@ static int pipe_handler_do_rcv(struct sock *sk, struct sk_buff *skb)
+@@ -579,7 +579,7 @@ static int pipe_handler_do_rcv(struct sock *sk, struct sk_buff *skb)
}
if (pn->rx_credits == 0) {
@@ -106307,7 +105784,7 @@ index 31b74f5..dc1fbfa 100644
ic->i_ack_next = 0;
#endif
diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
-index b7ebe23..b6352f6 100644
+index d67de45..73dbf51 100644
--- a/net/rds/ib_recv.c
+++ b/net/rds/ib_recv.c
@@ -596,7 +596,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
@@ -106317,11 +105794,11 @@ index b7ebe23..b6352f6 100644
- atomic64_set(&ic->i_ack_next, seq);
+ atomic64_set_unchecked(&ic->i_ack_next, seq);
if (ack_required) {
- smp_mb__before_clear_bit();
+ smp_mb__before_atomic();
set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
@@ -608,7 +608,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
- smp_mb__after_clear_bit();
+ smp_mb__after_atomic();
- return atomic64_read(&ic->i_ack_next);
+ return atomic64_read_unchecked(&ic->i_ack_next);
@@ -106355,7 +105832,7 @@ index a91e1db..cf3053f 100644
ic->i_ack_next = 0;
#endif
diff --git a/net/rds/iw_recv.c b/net/rds/iw_recv.c
-index 4503335..db566b4 100644
+index aa8bf67..b70133c 100644
--- a/net/rds/iw_recv.c
+++ b/net/rds/iw_recv.c
@@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic)
@@ -106365,53 +105842,17 @@ index 4503335..db566b4 100644
- atomic64_set(&ic->i_ack_next, seq);
+ atomic64_set_unchecked(&ic->i_ack_next, seq);
if (ack_required) {
- smp_mb__before_clear_bit();
+ smp_mb__before_atomic();
set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
@@ -439,7 +439,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic)
clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
- smp_mb__after_clear_bit();
+ smp_mb__after_atomic();
- return atomic64_read(&ic->i_ack_next);
+ return atomic64_read_unchecked(&ic->i_ack_next);
}
#endif
-diff --git a/net/rds/rdma.c b/net/rds/rdma.c
-index 4e37c1c..40084d8 100644
---- a/net/rds/rdma.c
-+++ b/net/rds/rdma.c
-@@ -564,12 +564,12 @@ int rds_cmsg_rdma_args(struct rds_sock *rs, struct rds_message *rm,
-
- if (rs->rs_bound_addr == 0) {
- ret = -ENOTCONN; /* XXX not a great errno */
-- goto out;
-+ goto out_ret;
- }
-
- if (args->nr_local > UIO_MAXIOV) {
- ret = -EMSGSIZE;
-- goto out;
-+ goto out_ret;
- }
-
- /* Check whether to allocate the iovec area */
-@@ -578,7 +578,7 @@ int rds_cmsg_rdma_args(struct rds_sock *rs, struct rds_message *rm,
- iovs = sock_kmalloc(rds_rs_to_sk(rs), iov_size, GFP_KERNEL);
- if (!iovs) {
- ret = -ENOMEM;
-- goto out;
-+ goto out_ret;
- }
- }
-
-@@ -696,6 +696,7 @@ out:
- if (iovs != iovstack)
- sock_kfree_s(rds_rs_to_sk(rs), iovs, iov_size);
- kfree(pages);
-+out_ret:
- if (ret)
- rds_rdma_free_op(op);
- else
diff --git a/net/rds/rds.h b/net/rds/rds.h
index 48f8ffc..0ef3eec 100644
--- a/net/rds/rds.h
@@ -106425,43 +105866,27 @@ index 48f8ffc..0ef3eec 100644
struct rds_sock {
struct sock rs_sk;
-diff --git a/net/rds/send.c b/net/rds/send.c
-index a82fb66..1ea9251 100644
---- a/net/rds/send.c
-+++ b/net/rds/send.c
-@@ -593,8 +593,11 @@ static void rds_send_remove_from_sock(struct list_head *messages, int status)
- sock_put(rds_rs_to_sk(rs));
- }
- rs = rm->m_rs;
-- sock_hold(rds_rs_to_sk(rs));
-+ if (rs)
-+ sock_hold(rds_rs_to_sk(rs));
- }
-+ if (!rs)
-+ goto unlock_and_drop;
- spin_lock(&rs->rs_lock);
-
- if (test_and_clear_bit(RDS_MSG_ON_SOCK, &rm->m_flags)) {
-@@ -638,9 +641,6 @@ unlock_and_drop:
- * queue. This means that in the TCP case, the message may not have been
- * assigned the m_ack_seq yet - but that's fine as long as tcp_is_acked
- * checks the RDS_MSG_HAS_ACK_SEQ bit.
-- *
-- * XXX It's not clear to me how this is safely serialized with socket
-- * destruction. Maybe it should bail if it sees SOCK_DEAD.
- */
- void rds_send_drop_acked(struct rds_connection *conn, u64 ack,
- is_acked_func is_acked)
-@@ -711,6 +711,9 @@ void rds_send_drop_to(struct rds_sock *rs, struct sockaddr_in *dest)
- */
- if (!test_and_clear_bit(RDS_MSG_ON_CONN, &rm->m_flags)) {
- spin_unlock_irqrestore(&conn->c_lock, flags);
-+ spin_lock_irqsave(&rm->m_rs_lock, flags);
-+ rm->m_rs = NULL;
-+ spin_unlock_irqrestore(&rm->m_rs_lock, flags);
- continue;
- }
- list_del_init(&rm->m_conn_item);
+diff --git a/net/rds/sysctl.c b/net/rds/sysctl.c
+index c3b0cd4..c173f69 100644
+--- a/net/rds/sysctl.c
++++ b/net/rds/sysctl.c
+@@ -71,14 +71,14 @@ static struct ctl_table rds_sysctl_rds_table[] = {
+ {
+ .procname = "max_unacked_packets",
+ .data = &rds_sysctl_max_unacked_packets,
+- .maxlen = sizeof(unsigned long),
++ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = proc_dointvec,
+ },
+ {
+ .procname = "max_unacked_bytes",
+ .data = &rds_sysctl_max_unacked_bytes,
+- .maxlen = sizeof(unsigned long),
++ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = proc_dointvec,
+ },
diff --git a/net/rds/tcp.c b/net/rds/tcp.c
index edac9ef..16bcb98 100644
--- a/net/rds/tcp.c
@@ -106476,7 +105901,7 @@ index edac9ef..16bcb98 100644
set_fs(oldfs);
}
diff --git a/net/rds/tcp_send.c b/net/rds/tcp_send.c
-index 81cf5a4..b5826ff 100644
+index 53b17ca..45463e7 100644
--- a/net/rds/tcp_send.c
+++ b/net/rds/tcp_send.c
@@ -43,7 +43,7 @@ static void rds_tcp_cork(struct socket *sock, int val)
@@ -106489,7 +105914,7 @@ index 81cf5a4..b5826ff 100644
set_fs(oldfs);
}
diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
-index e61aa60..f07cc89 100644
+index 7b16704..9628ec6 100644
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
@@ -40,7 +40,7 @@ static const struct proto_ops rxrpc_rpc_ops;
@@ -106502,10 +105927,10 @@ index e61aa60..f07cc89 100644
/* count of skbs currently in use */
atomic_t rxrpc_n_skbs;
diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c
-index cd97a0c..0041649 100644
+index c6be17a..2a6200a 100644
--- a/net/rxrpc/ar-ack.c
+++ b/net/rxrpc/ar-ack.c
-@@ -182,7 +182,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
+@@ -223,7 +223,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
_enter("{%d,%d,%d,%d},",
call->acks_hard, call->acks_unacked,
@@ -106514,7 +105939,7 @@ index cd97a0c..0041649 100644
CIRC_CNT(call->acks_head, call->acks_tail, call->acks_winsz));
stop = 0;
-@@ -206,7 +206,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
+@@ -247,7 +247,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
/* each Tx packet has a new serial number */
sp->hdr.serial =
@@ -106523,7 +105948,7 @@ index cd97a0c..0041649 100644
hdr = (struct rxrpc_header *) txb->head;
hdr->serial = sp->hdr.serial;
-@@ -410,7 +410,7 @@ static void rxrpc_rotate_tx_window(struct rxrpc_call *call, u32 hard)
+@@ -451,7 +451,7 @@ static void rxrpc_rotate_tx_window(struct rxrpc_call *call, u32 hard)
*/
static void rxrpc_clear_tx_window(struct rxrpc_call *call)
{
@@ -106532,7 +105957,7 @@ index cd97a0c..0041649 100644
}
/*
-@@ -636,7 +636,7 @@ process_further:
+@@ -677,7 +677,7 @@ process_further:
latest = ntohl(sp->hdr.serial);
hard = ntohl(ack.firstPacket);
@@ -106541,7 +105966,7 @@ index cd97a0c..0041649 100644
_proto("Rx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
latest,
-@@ -1168,7 +1168,7 @@ void rxrpc_process_call(struct work_struct *work)
+@@ -1209,7 +1209,7 @@ void rxrpc_process_call(struct work_struct *work)
goto maybe_reschedule;
send_ACK_with_skew:
@@ -106550,16 +105975,16 @@ index cd97a0c..0041649 100644
ntohl(ack.serial));
send_ACK:
mtu = call->conn->trans->peer->if_mtu;
-@@ -1180,7 +1180,7 @@ send_ACK:
- ackinfo.rxMTU = htonl(5692);
- ackinfo.jumbo_max = htonl(4);
+@@ -1221,7 +1221,7 @@ send_ACK:
+ ackinfo.rxMTU = htonl(rxrpc_rx_mtu);
+ ackinfo.jumbo_max = htonl(rxrpc_rx_jumbo_max);
- hdr.serial = htonl(atomic_inc_return(&call->conn->serial));
+ hdr.serial = htonl(atomic_inc_return_unchecked(&call->conn->serial));
_proto("Tx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
ntohl(hdr.serial),
ntohs(ack.maxSkew),
-@@ -1198,7 +1198,7 @@ send_ACK:
+@@ -1239,7 +1239,7 @@ send_ACK:
send_message:
_debug("send message");
@@ -106569,10 +105994,10 @@ index cd97a0c..0041649 100644
send_message_2:
diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/ar-call.c
-index a3bbb36..3341fb9 100644
+index a9e05db..194e793 100644
--- a/net/rxrpc/ar-call.c
+++ b/net/rxrpc/ar-call.c
-@@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_call(gfp_t gfp)
+@@ -232,7 +232,7 @@ static struct rxrpc_call *rxrpc_alloc_call(gfp_t gfp)
spin_lock_init(&call->lock);
rwlock_init(&call->state_lock);
atomic_set(&call->usage, 1);
@@ -106582,10 +106007,10 @@ index a3bbb36..3341fb9 100644
memset(&call->sock_node, 0xed, sizeof(call->sock_node));
diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c
-index 7bf5b5b..4a3bf2c 100644
+index 6631f4f..bfdf056 100644
--- a/net/rxrpc/ar-connection.c
+++ b/net/rxrpc/ar-connection.c
-@@ -206,7 +206,7 @@ static struct rxrpc_connection *rxrpc_alloc_connection(gfp_t gfp)
+@@ -210,7 +210,7 @@ static struct rxrpc_connection *rxrpc_alloc_connection(gfp_t gfp)
rwlock_init(&conn->lock);
spin_lock_init(&conn->state_lock);
atomic_set(&conn->usage, 1);
@@ -106608,10 +106033,10 @@ index e7ed43a..6afa140 100644
ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c
-index 529572f..c758ca7 100644
+index 481f89f..ceeaf8d 100644
--- a/net/rxrpc/ar-input.c
+++ b/net/rxrpc/ar-input.c
-@@ -340,9 +340,9 @@ void rxrpc_fast_process_packet(struct rxrpc_call *call, struct sk_buff *skb)
+@@ -331,9 +331,9 @@ void rxrpc_fast_process_packet(struct rxrpc_call *call, struct sk_buff *skb)
/* track the latest serial number on this connection for ACK packet
* information */
serial = ntohl(sp->hdr.serial);
@@ -106624,7 +106049,7 @@ index 529572f..c758ca7 100644
/* request ACK generation for any ACK or DATA packet that requests
diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
-index 5f43675..ca07817 100644
+index ba9fd36..9bbfe01 100644
--- a/net/rxrpc/ar-internal.h
+++ b/net/rxrpc/ar-internal.h
@@ -272,8 +272,8 @@ struct rxrpc_connection {
@@ -106647,7 +106072,7 @@ index 5f43675..ca07817 100644
u32 abort_code; /* local/remote abort code */
enum { /* current state of call */
RXRPC_CALL_CLIENT_SEND_REQUEST, /* - client sending request phase */
-@@ -420,7 +420,7 @@ static inline void rxrpc_abort_call(struct rxrpc_call *call, u32 abort_code)
+@@ -431,7 +431,7 @@ static inline void rxrpc_abort_call(struct rxrpc_call *call, u32 abort_code)
*/
extern atomic_t rxrpc_n_skbs;
extern __be32 rxrpc_epoch;
@@ -106670,15 +106095,20 @@ index 87f7135..74d3703 100644
}
diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c
-index d0e8f1c..a3a1686 100644
+index 0b4b9a7..966ffbb 100644
--- a/net/rxrpc/ar-output.c
+++ b/net/rxrpc/ar-output.c
-@@ -682,9 +682,9 @@ static int rxrpc_send_data(struct kiocb *iocb,
+@@ -682,14 +682,14 @@ static int rxrpc_send_data(struct kiocb *iocb,
+ memset(skb_put(skb, pad), 0, pad);
+ }
+
+- seq = atomic_inc_return(&call->sequence);
++ seq = atomic_inc_return_unchecked(&call->sequence);
+
+ sp->hdr.epoch = conn->epoch;
sp->hdr.cid = call->cid;
sp->hdr.callNumber = call->call_id;
- sp->hdr.seq =
-- htonl(atomic_inc_return(&call->sequence));
-+ htonl(atomic_inc_return_unchecked(&call->sequence));
+ sp->hdr.seq = htonl(seq);
sp->hdr.serial =
- htonl(atomic_inc_return(&conn->serial));
+ htonl(atomic_inc_return_unchecked(&conn->serial));
@@ -106714,10 +106144,10 @@ index 38047f7..9f48511 100644
return 0;
}
diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c
-index 92df566..87ec1bf 100644
+index 1976dec..aa70be5 100644
--- a/net/rxrpc/ar-transport.c
+++ b/net/rxrpc/ar-transport.c
-@@ -47,7 +47,7 @@ static struct rxrpc_transport *rxrpc_alloc_transport(struct rxrpc_local *local,
+@@ -51,7 +51,7 @@ static struct rxrpc_transport *rxrpc_alloc_transport(struct rxrpc_local *local,
spin_lock_init(&trans->client_lock);
rwlock_init(&trans->conn_lock);
atomic_set(&trans->usage, 1);
@@ -106748,11 +106178,36 @@ index f226709..0e735a8 100644
_proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
+diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
+index aad6a67..baef987 100644
+--- a/net/sched/cls_api.c
++++ b/net/sched/cls_api.c
+@@ -556,8 +556,9 @@ void tcf_exts_change(struct tcf_proto *tp, struct tcf_exts *dst,
+ }
+ EXPORT_SYMBOL(tcf_exts_change);
+
+-#define tcf_exts_first_act(ext) \
+- list_first_entry(&(exts)->actions, struct tc_action, list)
++#define tcf_exts_first_act(ext) \
++ list_first_entry_or_null(&(exts)->actions, \
++ struct tc_action, list)
+
+ int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts)
+ {
+@@ -603,7 +604,7 @@ int tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts)
+ {
+ #ifdef CONFIG_NET_CLS_ACT
+ struct tc_action *a = tcf_exts_first_act(exts);
+- if (tcf_action_copy_stats(skb, a, 1) < 0)
++ if (a != NULL && tcf_action_copy_stats(skb, a, 1) < 0)
+ return -1;
+ #endif
+ return 0;
diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c
-index 8e3cf49..4a8e322 100644
+index eed49d1..ce22514 100644
--- a/net/sched/cls_bpf.c
+++ b/net/sched/cls_bpf.c
-@@ -182,6 +182,11 @@ static int cls_bpf_modify_existing(struct net *net, struct tcf_proto *tp,
+@@ -191,6 +191,11 @@ static int cls_bpf_modify_existing(struct net *net, struct tcf_proto *tp,
}
bpf_size = bpf_len * sizeof(*bpf_ops);
@@ -106764,7 +106219,7 @@ index 8e3cf49..4a8e322 100644
bpf_ops = kzalloc(bpf_size, GFP_KERNEL);
if (bpf_ops == NULL) {
ret = -ENOMEM;
-@@ -228,15 +233,21 @@ static u32 cls_bpf_grab_new_handle(struct tcf_proto *tp,
+@@ -226,15 +231,21 @@ static u32 cls_bpf_grab_new_handle(struct tcf_proto *tp,
struct cls_bpf_head *head)
{
unsigned int i = 0x80000000;
@@ -106788,11 +106243,33 @@ index 8e3cf49..4a8e322 100644
}
static int cls_bpf_change(struct net *net, struct sk_buff *in_skb,
+diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
+index 6efca30..1259f82 100644
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
+@@ -349,7 +349,7 @@ void netif_carrier_on(struct net_device *dev)
+ if (test_and_clear_bit(__LINK_STATE_NOCARRIER, &dev->state)) {
+ if (dev->reg_state == NETREG_UNINITIALIZED)
+ return;
+- atomic_inc(&dev->carrier_changes);
++ atomic_inc_unchecked(&dev->carrier_changes);
+ linkwatch_fire_event(dev);
+ if (netif_running(dev))
+ __netdev_watchdog_up(dev);
+@@ -368,7 +368,7 @@ void netif_carrier_off(struct net_device *dev)
+ if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state)) {
+ if (dev->reg_state == NETREG_UNINITIALIZED)
+ return;
+- atomic_inc(&dev->carrier_changes);
++ atomic_inc_unchecked(&dev->carrier_changes);
+ linkwatch_fire_event(dev);
+ }
+ }
diff --git a/net/sctp/associola.c b/net/sctp/associola.c
-index d477d47..abc0922 100644
+index f791edd..26d06db 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
-@@ -1235,7 +1235,6 @@ void sctp_assoc_update(struct sctp_association *asoc,
+@@ -1182,7 +1182,6 @@ void sctp_assoc_update(struct sctp_association *asoc,
asoc->peer.peer_hmacs = new->peer.peer_hmacs;
new->peer.peer_hmacs = NULL;
@@ -106801,10 +106278,10 @@ index d477d47..abc0922 100644
}
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
-index 2b1738e..a9d0fc9 100644
+index 0e4198e..f94193e 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
-@@ -966,7 +966,7 @@ static const struct inet6_protocol sctpv6_protocol = {
+@@ -972,7 +972,7 @@ static const struct inet6_protocol sctpv6_protocol = {
.flags = INET6_PROTO_NOPOLICY | INET6_PROTO_FINAL,
};
@@ -106813,7 +106290,7 @@ index 2b1738e..a9d0fc9 100644
.sa_family = AF_INET6,
.sctp_xmit = sctp_v6_xmit,
.setsockopt = ipv6_setsockopt,
-@@ -998,7 +998,7 @@ static struct sctp_af sctp_af_inet6 = {
+@@ -1002,7 +1002,7 @@ static struct sctp_af sctp_af_inet6 = {
#endif
};
@@ -106822,7 +106299,7 @@ index 2b1738e..a9d0fc9 100644
.event_msgname = sctp_inet6_event_msgname,
.skb_msgname = sctp_inet6_skb_msgname,
.af_supported = sctp_inet6_af_supported,
-@@ -1023,7 +1023,7 @@ void sctp_v6_pf_init(void)
+@@ -1029,7 +1029,7 @@ void sctp_v6_pf_init(void)
void sctp_v6_pf_exit(void)
{
@@ -106832,7 +106309,7 @@ index 2b1738e..a9d0fc9 100644
/* Initialize IPv6 support and register with socket layer. */
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
-index a62a215..0976540 100644
+index 8f34b27..b105385 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -836,8 +836,10 @@ int sctp_register_af(struct sctp_af *af)
@@ -106865,7 +106342,7 @@ index a62a215..0976540 100644
.sa_family = AF_INET,
.sctp_xmit = sctp_v4_xmit,
.setsockopt = ip_setsockopt,
-@@ -1124,7 +1126,7 @@ static void sctp_v4_pf_init(void)
+@@ -1123,7 +1125,7 @@ static void sctp_v4_pf_init(void)
static void sctp_v4_pf_exit(void)
{
@@ -106888,10 +106365,39 @@ index fef2acd..c705c4f 100644
sctp_generate_t1_cookie_event,
sctp_generate_t1_init_event,
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
-index 604a6ac..f87f0a3 100644
+index 634a2ab..dfdaf9b 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
-@@ -2175,11 +2175,13 @@ static int sctp_setsockopt_events(struct sock *sk, char __user *optval,
+@@ -1603,7 +1603,7 @@ static int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
+ sctp_assoc_t associd = 0;
+ sctp_cmsgs_t cmsgs = { NULL };
+ sctp_scope_t scope;
+- bool fill_sinfo_ttl = false;
++ bool fill_sinfo_ttl = false, wait_connect = false;
+ struct sctp_datamsg *datamsg;
+ int msg_flags = msg->msg_flags;
+ __u16 sinfo_flags = 0;
+@@ -1943,6 +1943,7 @@ static int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
+ if (err < 0)
+ goto out_free;
+
++ wait_connect = true;
+ pr_debug("%s: we associated primitively\n", __func__);
+ }
+
+@@ -1980,6 +1981,11 @@ static int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
+ sctp_datamsg_put(datamsg);
+ err = msg_len;
+
++ if (unlikely(wait_connect)) {
++ timeo = sock_sndtimeo(sk, msg_flags & MSG_DONTWAIT);
++ sctp_wait_for_connect(asoc, &timeo);
++ }
++
+ /* If we are already past ASSOCIATE, the lower
+ * layers are responsible for association cleanup.
+ */
+@@ -2199,11 +2205,13 @@ static int sctp_setsockopt_events(struct sock *sk, char __user *optval,
{
struct sctp_association *asoc;
struct sctp_ulpevent *event;
@@ -106904,9 +106410,9 @@ index 604a6ac..f87f0a3 100644
return -EFAULT;
+ sctp_sk(sk)->subscribe = subscribe;
- /*
- * At the time when a user app subscribes to SCTP_SENDER_DRY_EVENT,
-@@ -4259,13 +4261,16 @@ static int sctp_getsockopt_disable_fragments(struct sock *sk, int len,
+ if (sctp_sk(sk)->subscribe.sctp_data_io_event)
+ pr_warn_ratelimited(DEPRECATED "%s (pid %d) "
+@@ -4372,13 +4380,16 @@ static int sctp_getsockopt_disable_fragments(struct sock *sk, int len,
static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
int __user *optlen)
{
@@ -106924,7 +106430,7 @@ index 604a6ac..f87f0a3 100644
return -EFAULT;
return 0;
}
-@@ -4283,6 +4288,8 @@ static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
+@@ -4396,6 +4407,8 @@ static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
*/
static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optval, int __user *optlen)
{
@@ -106933,7 +106439,7 @@ index 604a6ac..f87f0a3 100644
/* Applicable to UDP-style socket only */
if (sctp_style(sk, TCP))
return -EOPNOTSUPP;
-@@ -4291,7 +4298,8 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv
+@@ -4404,7 +4417,8 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv
len = sizeof(int);
if (put_user(len, optlen))
return -EFAULT;
@@ -106943,7 +106449,7 @@ index 604a6ac..f87f0a3 100644
return -EFAULT;
return 0;
}
-@@ -4666,12 +4674,15 @@ static int sctp_getsockopt_delayed_ack(struct sock *sk, int len,
+@@ -4778,12 +4792,15 @@ static int sctp_getsockopt_delayed_ack(struct sock *sk, int len,
*/
static int sctp_getsockopt_initmsg(struct sock *sk, int len, char __user *optval, int __user *optlen)
{
@@ -106960,8 +106466,8 @@ index 604a6ac..f87f0a3 100644
return -EFAULT;
return 0;
}
-@@ -4712,6 +4723,8 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
- addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
+@@ -4824,6 +4841,8 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
+ ->addr_to_user(sp, &temp);
if (space_left < addrlen)
return -ENOMEM;
+ if (addrlen > sizeof(temp) || addrlen < 0)
@@ -106970,10 +106476,10 @@ index 604a6ac..f87f0a3 100644
return -EFAULT;
to += addrlen;
diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c
-index dfa532f..1dcfb44 100644
+index 2e9ada1..40f425d 100644
--- a/net/sctp/sysctl.c
+++ b/net/sctp/sysctl.c
-@@ -307,7 +307,7 @@ static int proc_sctp_do_hmac_alg(struct ctl_table *ctl, int write,
+@@ -321,7 +321,7 @@ static int proc_sctp_do_hmac_alg(struct ctl_table *ctl, int write,
loff_t *ppos)
{
struct net *net = current->nsproxy->net_ns;
@@ -106982,7 +106488,7 @@ index dfa532f..1dcfb44 100644
bool changed = false;
char *none = "none";
char tmp[8];
-@@ -355,7 +355,7 @@ static int proc_sctp_do_rto_min(struct ctl_table *ctl, int write,
+@@ -369,7 +369,7 @@ static int proc_sctp_do_rto_min(struct ctl_table *ctl, int write,
struct net *net = current->nsproxy->net_ns;
unsigned int min = *(unsigned int *) ctl->extra1;
unsigned int max = *(unsigned int *) ctl->extra2;
@@ -106991,7 +106497,7 @@ index dfa532f..1dcfb44 100644
int ret, new_value;
memset(&tbl, 0, sizeof(struct ctl_table));
-@@ -384,7 +384,7 @@ static int proc_sctp_do_rto_max(struct ctl_table *ctl, int write,
+@@ -398,7 +398,7 @@ static int proc_sctp_do_rto_max(struct ctl_table *ctl, int write,
struct net *net = current->nsproxy->net_ns;
unsigned int min = *(unsigned int *) ctl->extra1;
unsigned int max = *(unsigned int *) ctl->extra2;
@@ -107000,7 +106506,7 @@ index dfa532f..1dcfb44 100644
int ret, new_value;
memset(&tbl, 0, sizeof(struct ctl_table));
-@@ -411,7 +411,7 @@ static int proc_sctp_do_auth(struct ctl_table *ctl, int write,
+@@ -436,7 +436,7 @@ static int proc_sctp_do_auth(struct ctl_table *ctl, int write,
loff_t *ppos)
{
struct net *net = current->nsproxy->net_ns;
@@ -107009,32 +106515,20 @@ index dfa532f..1dcfb44 100644
int new_value, ret;
memset(&tbl, 0, sizeof(struct ctl_table));
-@@ -438,7 +438,7 @@ static int proc_sctp_do_auth(struct ctl_table *ctl, int write,
+@@ -463,7 +463,7 @@ static int proc_sctp_do_auth(struct ctl_table *ctl, int write,
int sctp_sysctl_net_register(struct net *net)
{
-- struct ctl_table *table = sctp_net_table;
-+ ctl_table_no_const *table = NULL;
-
- if (!net_eq(net, &init_net)) {
- int i;
-@@ -451,7 +451,10 @@ int sctp_sysctl_net_register(struct net *net)
- table[i].data += (char *)(&net->sctp) - (char *)&init_net.sctp;
- }
-
-- net->sctp.sysctl_header = register_net_sysctl(net, "net/sctp", table);
-+ if (!net_eq(net, &init_net))
-+ net->sctp.sysctl_header = register_net_sysctl(net, "net/sctp", table);
-+ else
-+ net->sctp.sysctl_header = register_net_sysctl(net, "net/sctp", sctp_net_table);
- return 0;
- }
+- struct ctl_table *table;
++ ctl_table_no_const *table;
+ int i;
+ table = kmemdup(sctp_net_table, sizeof(sctp_net_table), GFP_KERNEL);
diff --git a/net/socket.c b/net/socket.c
-index a19ae19..edb5c03 100644
+index fe20c31..83a0ed6 100644
--- a/net/socket.c
+++ b/net/socket.c
-@@ -88,6 +88,7 @@
+@@ -89,6 +89,7 @@
#include <linux/magic.h>
#include <linux/slab.h>
#include <linux/xattr.h>
@@ -107042,7 +106536,7 @@ index a19ae19..edb5c03 100644
#include <asm/uaccess.h>
#include <asm/unistd.h>
-@@ -111,6 +112,8 @@ unsigned int sysctl_net_busy_read __read_mostly;
+@@ -113,6 +114,8 @@ unsigned int sysctl_net_busy_read __read_mostly;
unsigned int sysctl_net_busy_poll __read_mostly;
#endif
@@ -107051,7 +106545,7 @@ index a19ae19..edb5c03 100644
static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
unsigned long nr_segs, loff_t pos);
-@@ -162,7 +165,7 @@ static const struct file_operations socket_file_ops = {
+@@ -164,7 +167,7 @@ static const struct file_operations socket_file_ops = {
*/
static DEFINE_SPINLOCK(net_family_lock);
@@ -107060,7 +106554,7 @@ index a19ae19..edb5c03 100644
/*
* Statistics counters of the socket lists
-@@ -328,7 +331,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type,
+@@ -330,7 +333,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type,
&sockfs_dentry_operations, SOCKFS_MAGIC);
}
@@ -107069,7 +106563,7 @@ index a19ae19..edb5c03 100644
static struct file_system_type sock_fs_type = {
.name = "sockfs",
-@@ -1256,6 +1259,8 @@ int __sock_create(struct net *net, int family, int type, int protocol,
+@@ -1263,6 +1266,8 @@ int __sock_create(struct net *net, int family, int type, int protocol,
return -EAFNOSUPPORT;
if (type < 0 || type >= SOCK_MAX)
return -EINVAL;
@@ -107078,7 +106572,7 @@ index a19ae19..edb5c03 100644
/* Compatibility.
-@@ -1276,6 +1281,20 @@ int __sock_create(struct net *net, int family, int type, int protocol,
+@@ -1283,6 +1288,20 @@ int __sock_create(struct net *net, int family, int type, int protocol,
if (err)
return err;
@@ -107099,7 +106593,7 @@ index a19ae19..edb5c03 100644
/*
* Allocate the socket and allow the family to set things up. if
* the protocol is 0, the family is instructed to select an appropriate
-@@ -1527,6 +1546,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
+@@ -1534,6 +1553,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
if (sock) {
err = move_addr_to_kernel(umyaddr, addrlen, &address);
if (err >= 0) {
@@ -107114,7 +106608,7 @@ index a19ae19..edb5c03 100644
err = security_socket_bind(sock,
(struct sockaddr *)&address,
addrlen);
-@@ -1535,6 +1562,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
+@@ -1542,6 +1569,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
(struct sockaddr *)
&address, addrlen);
}
@@ -107122,7 +106616,7 @@ index a19ae19..edb5c03 100644
fput_light(sock->file, fput_needed);
}
return err;
-@@ -1558,10 +1586,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
+@@ -1565,10 +1593,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
if ((unsigned int)backlog > somaxconn)
backlog = somaxconn;
@@ -107143,7 +106637,7 @@ index a19ae19..edb5c03 100644
fput_light(sock->file, fput_needed);
}
return err;
-@@ -1605,6 +1643,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
+@@ -1612,6 +1650,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
newsock->type = sock->type;
newsock->ops = sock->ops;
@@ -107162,7 +106656,7 @@ index a19ae19..edb5c03 100644
/*
* We don't need try_module_get here, as the listening socket (sock)
* has the protocol module (sock->ops->owner) held.
-@@ -1650,6 +1700,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
+@@ -1657,6 +1707,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
fd_install(newfd, newfile);
err = newfd;
@@ -107171,7 +106665,7 @@ index a19ae19..edb5c03 100644
out_put:
fput_light(sock->file, fput_needed);
out:
-@@ -1682,6 +1734,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
+@@ -1689,6 +1741,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
int, addrlen)
{
struct socket *sock;
@@ -107179,7 +106673,7 @@ index a19ae19..edb5c03 100644
struct sockaddr_storage address;
int err, fput_needed;
-@@ -1692,6 +1745,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
+@@ -1699,6 +1752,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
if (err < 0)
goto out_put;
@@ -107197,7 +106691,7 @@ index a19ae19..edb5c03 100644
err =
security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
if (err)
-@@ -1773,6 +1837,8 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr,
+@@ -1780,6 +1844,8 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr,
* the protocol.
*/
@@ -107206,7 +106700,7 @@ index a19ae19..edb5c03 100644
SYSCALL_DEFINE6(sendto, int, fd, void __user *, buff, size_t, len,
unsigned int, flags, struct sockaddr __user *, addr,
int, addr_len)
-@@ -1839,7 +1905,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size,
+@@ -1846,7 +1912,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size,
struct socket *sock;
struct iovec iov;
struct msghdr msg;
@@ -107215,17 +106709,7 @@ index a19ae19..edb5c03 100644
int err, err2;
int fput_needed;
-@@ -1987,6 +2053,9 @@ static int copy_msghdr_from_user(struct msghdr *kmsg,
- if (copy_from_user(kmsg, umsg, sizeof(struct msghdr)))
- return -EFAULT;
-
-+ if (kmsg->msg_name == NULL)
-+ kmsg->msg_namelen = 0;
-+
- if (kmsg->msg_namelen < 0)
- return -EINVAL;
-
-@@ -2065,7 +2134,7 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
+@@ -2075,7 +2141,7 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
* checking falls down on this.
*/
if (copy_from_user(ctl_buf,
@@ -107234,7 +106718,7 @@ index a19ae19..edb5c03 100644
ctl_len))
goto out_freectl;
msg_sys->msg_control = ctl_buf;
-@@ -2216,7 +2285,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
+@@ -2226,7 +2292,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
int err, total_len, len;
/* kernel mode address */
@@ -107243,7 +106727,7 @@ index a19ae19..edb5c03 100644
/* user mode address pointers */
struct sockaddr __user *uaddr;
-@@ -2245,7 +2314,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
+@@ -2255,7 +2321,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
/* Save the user-mode address (verify_iovec will change the
* kernel msghdr to use the kernel address space)
*/
@@ -107252,7 +106736,7 @@ index a19ae19..edb5c03 100644
uaddr_len = COMPAT_NAMELEN(msg);
if (MSG_CMSG_COMPAT & flags)
err = verify_compat_iovec(msg_sys, iov, &addr, VERIFY_WRITE);
-@@ -2889,7 +2958,7 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
+@@ -2896,7 +2962,7 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
ifr = compat_alloc_user_space(buf_size);
rxnfc = (void __user *)ifr + ALIGN(sizeof(struct ifreq), 8);
@@ -107261,7 +106745,7 @@ index a19ae19..edb5c03 100644
return -EFAULT;
if (put_user(convert_in ? rxnfc : compat_ptr(data),
-@@ -3000,7 +3069,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
+@@ -3007,7 +3073,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
old_fs = get_fs();
set_fs(KERNEL_DS);
err = dev_ioctl(net, cmd,
@@ -107270,7 +106754,7 @@ index a19ae19..edb5c03 100644
set_fs(old_fs);
return err;
-@@ -3093,7 +3162,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
+@@ -3100,7 +3166,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
old_fs = get_fs();
set_fs(KERNEL_DS);
@@ -107279,7 +106763,7 @@ index a19ae19..edb5c03 100644
set_fs(old_fs);
if (cmd == SIOCGIFMAP && !err) {
-@@ -3177,7 +3246,7 @@ static int routing_ioctl(struct net *net, struct socket *sock,
+@@ -3184,7 +3250,7 @@ static int routing_ioctl(struct net *net, struct socket *sock,
ret |= get_user(rtdev, &(ur4->rt_dev));
if (rtdev) {
ret |= copy_from_user(devname, compat_ptr(rtdev), 15);
@@ -107288,7 +106772,7 @@ index a19ae19..edb5c03 100644
devname[15] = 0;
} else
r4.rt_dev = NULL;
-@@ -3404,8 +3473,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname,
+@@ -3411,8 +3477,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname,
int __user *uoptlen;
int err;
@@ -107299,7 +106783,7 @@ index a19ae19..edb5c03 100644
set_fs(KERNEL_DS);
if (level == SOL_SOCKET)
-@@ -3425,7 +3494,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname,
+@@ -3432,7 +3498,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname,
char __user *uoptval;
int err;
@@ -107309,7 +106793,7 @@ index a19ae19..edb5c03 100644
set_fs(KERNEL_DS);
if (level == SOL_SOCKET)
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
-index 0f73f45..a96aa52 100644
+index c548ab2..4e1b68b 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -1140,7 +1140,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
@@ -107331,7 +106815,7 @@ index 0f73f45..a96aa52 100644
/* make a copy for the caller */
*handle = ctxh;
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
-index ae333c1..18521f0 100644
+index 0663621..c4928d4 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -1609,7 +1609,7 @@ static int create_cache_proc_entries(struct cache_detail *cd, struct net *net)
@@ -107344,10 +106828,10 @@ index ae333c1..18521f0 100644
goto out_nomem;
cd->u.procfs.channel_ent = NULL;
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
-index 5ff8b87..35af642 100644
+index 9acd6ce..4353a72 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
-@@ -1418,7 +1418,9 @@ call_start(struct rpc_task *task)
+@@ -1428,7 +1428,9 @@ call_start(struct rpc_task *task)
(RPC_IS_ASYNC(task) ? "async" : "sync"));
/* Increment call count */
@@ -107359,10 +106843,10 @@ index 5ff8b87..35af642 100644
task->tk_action = call_reserve;
}
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
-index ff3cc4b..7612a9e 100644
+index fe3441a..922c29e 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
-@@ -261,9 +261,9 @@ static int rpc_wait_bit_killable(void *word)
+@@ -261,9 +261,9 @@ static int rpc_wait_bit_killable(struct wait_bit_key *key)
#if defined(RPC_DEBUG) || defined(RPC_TRACEPOINTS)
static void rpc_task_set_debuginfo(struct rpc_task *task)
{
@@ -107388,10 +106872,10 @@ index 5453049..465669a 100644
return -ENOMEM;
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
-index 5de6801..b4e330d 100644
+index ca8a795..ddfc41b 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
-@@ -1167,7 +1167,9 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
+@@ -1165,7 +1165,9 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
svc_putnl(resv, RPC_SUCCESS);
/* Bump per-procedure stats counter */
@@ -107536,19 +107020,28 @@ index c1b6270..05089c1 100644
.proc_handler = read_reset_stat,
},
diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
-index 0ce7552..d074459 100644
+index e011027..9d3c4e1 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
-@@ -501,7 +501,7 @@ next_sge:
- svc_rdma_put_context(ctxt, 0);
- goto out;
- }
-- atomic_inc(&rdma_stat_read);
-+ atomic_inc_unchecked(&rdma_stat_read);
-
- if (read_wr.num_sge < chl_map->ch[ch_no].count) {
- chl_map->ch[ch_no].count -= read_wr.num_sge;
-@@ -611,7 +611,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
+@@ -220,7 +220,7 @@ static int rdma_read_chunk_lcl(struct svcxprt_rdma *xprt,
+ *page_no = pg_no;
+ *page_offset = pg_off;
+ ret = read;
+- atomic_inc(&rdma_stat_read);
++ atomic_inc_unchecked(&rdma_stat_read);
+ return ret;
+ err:
+ svc_rdma_unmap_dma(ctxt);
+@@ -356,7 +356,7 @@ static int rdma_read_chunk_frmr(struct svcxprt_rdma *xprt,
+ *page_no = pg_no;
+ *page_offset = pg_off;
+ ret = read;
+- atomic_inc(&rdma_stat_read);
++ atomic_inc_unchecked(&rdma_stat_read);
+ return ret;
+ err:
+ svc_rdma_unmap_dma(ctxt);
+@@ -540,7 +540,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
dto_q);
list_del_init(&ctxt->dto_q);
} else {
@@ -107557,7 +107050,7 @@ index 0ce7552..d074459 100644
clear_bit(XPT_DATA, &xprt->xpt_flags);
ctxt = NULL;
}
-@@ -631,7 +631,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
+@@ -559,7 +559,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
dprintk("svcrdma: processing ctxt=%p on xprt=%p, rqstp=%p, status=%d\n",
ctxt, rdma_xprt, rqstp, ctxt->wc_status);
BUG_ON(ctxt->wc_status != IB_WC_SUCCESS);
@@ -107567,10 +107060,10 @@ index 0ce7552..d074459 100644
/* Build up the XDR from the receive buffers. */
rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
-index c1d124d..acfc59e 100644
+index 9f1b506..2e0b321 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
-@@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdma *xprt, struct svc_rqst *rqstp,
+@@ -208,7 +208,7 @@ static int send_write(struct svcxprt_rdma *xprt, struct svc_rqst *rqstp,
write_wr.wr.rdma.remote_addr = to;
/* Post It */
@@ -107578,12 +107071,12 @@ index c1d124d..acfc59e 100644
+ atomic_inc_unchecked(&rdma_stat_write);
if (svc_rdma_send(xprt, &write_wr))
goto err;
- return 0;
+ return write_len - bc;
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
-index ed36cb5..c55d17f 100644
+index 4e61880..1f0d963 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
-@@ -293,7 +293,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
+@@ -295,7 +295,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
return;
ib_req_notify_cq(xprt->sc_rq_cq, IB_CQ_NEXT_COMP);
@@ -107592,7 +107085,7 @@ index ed36cb5..c55d17f 100644
while ((ret = ib_poll_cq(xprt->sc_rq_cq, 1, &wc)) > 0) {
ctxt = (struct svc_rdma_op_ctxt *)(unsigned long)wc.wr_id;
-@@ -315,7 +315,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
+@@ -317,7 +317,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
}
if (ctxt)
@@ -107601,16 +107094,16 @@ index ed36cb5..c55d17f 100644
set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags);
/*
-@@ -387,7 +387,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
+@@ -392,7 +392,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
return;
ib_req_notify_cq(xprt->sc_sq_cq, IB_CQ_NEXT_COMP);
- atomic_inc(&rdma_stat_sq_poll);
+ atomic_inc_unchecked(&rdma_stat_sq_poll);
- while ((ret = ib_poll_cq(cq, 1, &wc)) > 0) {
- if (wc.status != IB_WC_SUCCESS)
- /* Close the transport */
-@@ -405,7 +405,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
+ while ((ret = ib_poll_cq(cq, ARRAY_SIZE(wc_a), wc_a)) > 0) {
+ int i;
+
+@@ -420,7 +420,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
}
if (ctxt)
@@ -107619,7 +107112,7 @@ index ed36cb5..c55d17f 100644
}
static void sq_comp_handler(struct ib_cq *cq, void *cq_context)
-@@ -1263,7 +1263,7 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr)
+@@ -1264,7 +1264,7 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr)
spin_lock_bh(&xprt->sc_lock);
if (xprt->sc_sq_depth < atomic_read(&xprt->sc_sq_count) + wr_count) {
spin_unlock_bh(&xprt->sc_lock);
@@ -107642,10 +107135,10 @@ index e7000be..e3b0ba7 100644
int mode = (table->mode >> 6) & 7;
return (mode << 6) | (mode << 3) | mode;
diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
-index 6424372..afd36e9 100644
+index 31b5cb2..566ff01 100644
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c
-@@ -97,7 +97,7 @@ static void subscr_send_event(struct tipc_subscription *sub, u32 found_lower,
+@@ -96,7 +96,7 @@ static void subscr_send_event(struct tipc_subscription *sub, u32 found_lower,
struct tipc_subscriber *subscriber = sub->subscriber;
struct kvec msg_sect;
@@ -107655,7 +107148,7 @@ index 6424372..afd36e9 100644
sub->evt.event = htohl(event, sub->swap);
sub->evt.found_lower = htohl(found_lower, sub->swap);
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
-index 94404f1..5782191 100644
+index e968843..bc95776 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -791,6 +791,12 @@ static struct sock *unix_find_other(struct net *net,
@@ -107704,7 +107197,7 @@ index 94404f1..5782191 100644
done_path_create(&path, dentry);
return err;
}
-@@ -2344,9 +2363,13 @@ static int unix_seq_show(struct seq_file *seq, void *v)
+@@ -2350,9 +2369,13 @@ static int unix_seq_show(struct seq_file *seq, void *v)
seq_puts(seq, "Num RefCount Protocol Flags Type St "
"Inode Path\n");
else {
@@ -107719,7 +107212,7 @@ index 94404f1..5782191 100644
seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5lu",
s,
-@@ -2373,8 +2396,10 @@ static int unix_seq_show(struct seq_file *seq, void *v)
+@@ -2379,8 +2402,10 @@ static int unix_seq_show(struct seq_file *seq, void *v)
}
for ( ; i < len; i++)
seq_putc(seq, u->addr->name->sun_path[i]);
@@ -107746,7 +107239,7 @@ index b3d5150..ff3a837 100644
table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL);
if (table == NULL)
diff --git a/net/vmw_vsock/vmci_transport_notify.c b/net/vmw_vsock/vmci_transport_notify.c
-index 9a73074..aecba9a 100644
+index 9b7f207..2596621 100644
--- a/net/vmw_vsock/vmci_transport_notify.c
+++ b/net/vmw_vsock/vmci_transport_notify.c
@@ -662,19 +662,19 @@ static void vmci_transport_notify_pkt_process_negotiate(struct sock *sk)
@@ -107785,7 +107278,7 @@ index 9a73074..aecba9a 100644
+ .process_negotiate = vmci_transport_notify_pkt_process_negotiate,
};
diff --git a/net/vmw_vsock/vmci_transport_notify_qstate.c b/net/vmw_vsock/vmci_transport_notify_qstate.c
-index 622bd7a..b92086c 100644
+index dc9c792..3089de0 100644
--- a/net/vmw_vsock/vmci_transport_notify_qstate.c
+++ b/net/vmw_vsock/vmci_transport_notify_qstate.c
@@ -420,19 +420,19 @@ vmci_transport_notify_pkt_send_pre_enqueue(
@@ -107887,10 +107380,10 @@ index 0917f04..f4e3d8c 100644
if (!proc_create("x25/route", S_IRUGO, init_net.proc_net,
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
-index 59cf325..e7fa6f0 100644
+index 88bf289..7b0741b 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
-@@ -332,7 +332,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)
+@@ -330,7 +330,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)
{
policy->walk.dead = 1;
@@ -107899,16 +107392,16 @@ index 59cf325..e7fa6f0 100644
if (del_timer(&policy->polq.hold_timer))
xfrm_pol_put(policy);
-@@ -666,7 +666,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
+@@ -781,7 +781,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
hlist_add_head(&policy->bydst, chain);
xfrm_pol_hold(policy);
net->xfrm.policy_count[dir]++;
-- atomic_inc(&flow_cache_genid);
-+ atomic_inc_unchecked(&flow_cache_genid);
+- atomic_inc(&net->xfrm.flow_cache_genid);
++ atomic_inc_unchecked(&net->xfrm.flow_cache_genid);
/* After previous checking, family can either be AF_INET or AF_INET6 */
if (policy->family == AF_INET)
-@@ -1766,7 +1766,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols,
+@@ -1871,7 +1871,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols,
xdst->num_pols = num_pols;
memcpy(xdst->pols, pols, sizeof(struct xfrm_policy *) * num_pols);
@@ -107917,21 +107410,20 @@ index 59cf325..e7fa6f0 100644
return xdst;
}
-@@ -2604,11 +2604,12 @@ void xfrm_garbage_collect(struct net *net)
+@@ -2685,10 +2685,11 @@ void xfrm_garbage_collect(struct net *net)
}
EXPORT_SYMBOL(xfrm_garbage_collect);
-static void xfrm_garbage_collect_deferred(struct net *net)
+void xfrm_garbage_collect_deferred(struct net *net)
{
- flow_cache_flush_deferred();
- __xfrm_garbage_collect(net);
+ flow_cache_flush_deferred(net);
}
+EXPORT_SYMBOL(xfrm_garbage_collect_deferred);
static void xfrm_init_pmtu(struct dst_entry *dst)
{
-@@ -2658,7 +2659,7 @@ static int xfrm_bundle_ok(struct xfrm_dst *first)
+@@ -2738,7 +2739,7 @@ static int xfrm_bundle_ok(struct xfrm_dst *first)
if (xdst->xfrm_genid != dst->xfrm->genid)
return 0;
if (xdst->num_pols > 0 &&
@@ -107940,7 +107432,7 @@ index 59cf325..e7fa6f0 100644
return 0;
mtu = dst_mtu(dst->child);
-@@ -2746,8 +2747,6 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
+@@ -2826,8 +2827,6 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
dst_ops->link_failure = xfrm_link_failure;
if (likely(dst_ops->neigh_lookup == NULL))
dst_ops->neigh_lookup = xfrm_neigh_lookup;
@@ -107949,7 +107441,7 @@ index 59cf325..e7fa6f0 100644
rcu_assign_pointer(xfrm_policy_afinfo[afinfo->family], afinfo);
}
spin_unlock(&xfrm_policy_afinfo_lock);
-@@ -2801,7 +2800,6 @@ int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo)
+@@ -2881,7 +2880,6 @@ int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo)
dst_ops->check = NULL;
dst_ops->negative_advice = NULL;
dst_ops->link_failure = NULL;
@@ -107957,7 +107449,7 @@ index 59cf325..e7fa6f0 100644
}
return err;
}
-@@ -3191,7 +3189,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol,
+@@ -3277,7 +3275,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol,
sizeof(pol->xfrm_vec[i].saddr));
pol->xfrm_vec[i].encap_family = mp->new_family;
/* flush bundles */
@@ -107967,10 +107459,10 @@ index 59cf325..e7fa6f0 100644
}
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
-index 40f1b3e..e33fdfa 100644
+index de971b6..b843409 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
-@@ -172,12 +172,14 @@ int xfrm_register_type(const struct xfrm_type *type, unsigned short family)
+@@ -166,12 +166,14 @@ int xfrm_register_type(const struct xfrm_type *type, unsigned short family)
if (unlikely(afinfo == NULL))
return -EAFNOSUPPORT;
@@ -107988,7 +107480,7 @@ index 40f1b3e..e33fdfa 100644
err = -EEXIST;
spin_unlock_bh(&xfrm_type_lock);
xfrm_state_put_afinfo(afinfo);
-@@ -193,13 +195,16 @@ int xfrm_unregister_type(const struct xfrm_type *type, unsigned short family)
+@@ -187,13 +189,16 @@ int xfrm_unregister_type(const struct xfrm_type *type, unsigned short family)
if (unlikely(afinfo == NULL))
return -EAFNOSUPPORT;
@@ -108007,7 +107499,7 @@ index 40f1b3e..e33fdfa 100644
spin_unlock_bh(&xfrm_type_lock);
xfrm_state_put_afinfo(afinfo);
return err;
-@@ -209,7 +214,6 @@ EXPORT_SYMBOL(xfrm_unregister_type);
+@@ -203,7 +208,6 @@ EXPORT_SYMBOL(xfrm_unregister_type);
static const struct xfrm_type *xfrm_get_type(u8 proto, unsigned short family)
{
struct xfrm_state_afinfo *afinfo;
@@ -108015,7 +107507,7 @@ index 40f1b3e..e33fdfa 100644
const struct xfrm_type *type;
int modload_attempted = 0;
-@@ -217,9 +221,8 @@ retry:
+@@ -211,9 +215,8 @@ retry:
afinfo = xfrm_state_get_afinfo(family);
if (unlikely(afinfo == NULL))
return NULL;
@@ -108026,7 +107518,7 @@ index 40f1b3e..e33fdfa 100644
if (unlikely(type && !try_module_get(type->owner)))
type = NULL;
if (!type && !modload_attempted) {
-@@ -253,7 +256,7 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
+@@ -247,7 +250,7 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
return -EAFNOSUPPORT;
err = -EEXIST;
@@ -108035,7 +107527,7 @@ index 40f1b3e..e33fdfa 100644
spin_lock_bh(&xfrm_mode_lock);
if (modemap[mode->encap])
goto out;
-@@ -262,8 +265,10 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
+@@ -256,8 +259,10 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
if (!try_module_get(afinfo->owner))
goto out;
@@ -108047,7 +107539,7 @@ index 40f1b3e..e33fdfa 100644
err = 0;
out:
-@@ -287,10 +292,12 @@ int xfrm_unregister_mode(struct xfrm_mode *mode, int family)
+@@ -281,10 +286,12 @@ int xfrm_unregister_mode(struct xfrm_mode *mode, int family)
return -EAFNOSUPPORT;
err = -ENOENT;
@@ -108061,7 +107553,7 @@ index 40f1b3e..e33fdfa 100644
module_put(mode->afinfo->owner);
err = 0;
}
-@@ -1512,10 +1519,10 @@ EXPORT_SYMBOL(xfrm_find_acq_byseq);
+@@ -1505,10 +1512,10 @@ EXPORT_SYMBOL(xfrm_find_acq_byseq);
u32 xfrm_get_acqseq(void)
{
u32 res;
@@ -108088,10 +107580,10 @@ index 05a6e3d..6716ec9 100644
__xfrm_sysctl_init(net);
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
-index 547e15d..e550fa6 100644
+index 65e7b08..1b868d5 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
-@@ -143,7 +143,7 @@ cc-ifversion = $(shell [ $(call cc-version, $(CC)) $(1) $(2) ] && echo $(3))
+@@ -144,7 +144,7 @@ cc-ifversion = $(shell [ $(call cc-version, $(CC)) $(1) $(2) ] && echo $(3))
# cc-ldoption
# Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both)
cc-ldoption = $(call try-run,\
@@ -108100,21 +107592,11 @@ index 547e15d..e550fa6 100644
# ld-option
# Usage: LDFLAGS += $(call ld-option, -X)
-diff --git a/scripts/Makefile b/scripts/Makefile
-index 01e7adb..6176d5d 100644
---- a/scripts/Makefile
-+++ b/scripts/Makefile
-@@ -40,3 +40,5 @@ subdir-$(CONFIG_DTC) += dtc
-
- # Let clean descend into subdirs
- subdir- += basic kconfig package selinux
-+
-+clean-files := randstruct.seed
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
-index d5d859c..781cbcb 100644
+index 649ce68..f6bc05c 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
-@@ -111,7 +111,7 @@ endif
+@@ -60,7 +60,7 @@ endif
endif
# Do not include host rules unless needed
@@ -108124,12 +107606,12 @@ index d5d859c..781cbcb 100644
endif
diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
-index 686cb0d..9d653bf 100644
+index a609552..fde19cd 100644
--- a/scripts/Makefile.clean
+++ b/scripts/Makefile.clean
-@@ -43,7 +43,8 @@ subdir-ymn := $(addprefix $(obj)/,$(subdir-ymn))
- __clean-files := $(extra-y) $(always) \
- $(targets) $(clean-files) \
+@@ -41,7 +41,8 @@ subdir-ymn := $(addprefix $(obj)/,$(subdir-ymn))
+ __clean-files := $(extra-y) $(extra-m) $(extra-) \
+ $(always) $(targets) $(clean-files) \
$(host-progs) \
- $(hostprogs-y) $(hostprogs-m) $(hostprogs-)
+ $(hostprogs-y) $(hostprogs-m) $(hostprogs-) \
@@ -108138,63 +107620,87 @@ index 686cb0d..9d653bf 100644
__clean-files := $(filter-out $(no-clean-files), $(__clean-files))
diff --git a/scripts/Makefile.host b/scripts/Makefile.host
-index 1ac414f..38575f7 100644
+index 133edfa..c9aa07f 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
-@@ -31,6 +31,8 @@
- # Note: Shared libraries consisting of C++ files are not supported
-
+@@ -20,7 +20,19 @@
+ # Will compile qconf as a C++ program, and menu as a C program.
+ # They are linked as C++ code to the executable qconf
+
++# hostprogs-y := conf
++# conf-objs := conf.o libkconfig.so
++# libkconfig-objs := expr.o type.o
++# Will create a shared library named libkconfig.so that consists of
++# expr.o and type.o (they are both compiled as C code and the object files
++# are made as position independent code).
++# conf.c is compiled as a C program, and conf.o is linked together with
++# libkconfig.so as the executable conf.
++# Note: Shared libraries consisting of C++ files are not supported
++
__hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))
+__hostlibs := $(sort $(hostlibs-y) $(hostlibs-m))
+__hostcxxlibs := $(sort $(hostcxxlibs-y) $(hostcxxlibs-m))
# C code
# Executables compiled from a single .c file
-@@ -54,11 +56,15 @@ host-cxxobjs := $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs)))
- # Shared libaries (only .c supported)
- # Shared libraries (.so) - all .so files referenced in "xxx-objs"
- host-cshlib := $(sort $(filter %.so, $(host-cobjs)))
+@@ -42,6 +54,19 @@ host-cxxmulti := $(foreach m,$(__hostprogs),$(if $($(m)-cxxobjs),$(m)))
+ # C++ Object (.o) files compiled from .cc files
+ host-cxxobjs := $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs)))
+
++# Shared libaries (only .c supported)
++# Shared libraries (.so) - all .so files referenced in "xxx-objs"
++host-cshlib := $(sort $(filter %.so, $(host-cobjs)))
+host-cshlib += $(sort $(filter %.so, $(__hostlibs)))
+host-cxxshlib := $(sort $(filter %.so, $(__hostcxxlibs)))
- # Remove .so files from "xxx-objs"
- host-cobjs := $(filter-out %.so,$(host-cobjs))
++# Remove .so files from "xxx-objs"
++host-cobjs := $(filter-out %.so,$(host-cobjs))
+host-cxxobjs := $(filter-out %.so,$(host-cxxobjs))
-
--#Object (.o) files used by the shared libaries
++
+# Object (.o) files used by the shared libaries
- host-cshobjs := $(sort $(foreach m,$(host-cshlib),$($(m:.so=-objs))))
++host-cshobjs := $(sort $(foreach m,$(host-cshlib),$($(m:.so=-objs))))
+host-cxxshobjs := $(sort $(foreach m,$(host-cxxshlib),$($(m:.so=-objs))))
-
++
# output directory for programs/.o files
- # hostprogs-y := tools/build may have been specified. Retrieve directory
-@@ -82,7 +88,9 @@ host-cobjs := $(addprefix $(obj)/,$(host-cobjs))
+ # hostprogs-y := tools/build may have been specified.
+ # Retrieve also directory of .o files from prog-objs or prog-cxxobjs notation
+@@ -56,6 +81,10 @@ host-cmulti := $(addprefix $(obj)/,$(host-cmulti))
+ host-cobjs := $(addprefix $(obj)/,$(host-cobjs))
host-cxxmulti := $(addprefix $(obj)/,$(host-cxxmulti))
host-cxxobjs := $(addprefix $(obj)/,$(host-cxxobjs))
- host-cshlib := $(addprefix $(obj)/,$(host-cshlib))
++host-cshlib := $(addprefix $(obj)/,$(host-cshlib))
+host-cxxshlib := $(addprefix $(obj)/,$(host-cxxshlib))
- host-cshobjs := $(addprefix $(obj)/,$(host-cshobjs))
++host-cshobjs := $(addprefix $(obj)/,$(host-cshobjs))
+host-cxxshobjs := $(addprefix $(obj)/,$(host-cxxshobjs))
host-objdirs := $(addprefix $(obj)/,$(host-objdirs))
obj-dirs += $(host-objdirs)
-@@ -156,6 +164,13 @@ quiet_cmd_host-cshobjs = HOSTCC -fPIC $@
- $(host-cshobjs): $(obj)/%.o: $(src)/%.c FORCE
- $(call if_changed_dep,host-cshobjs)
+@@ -124,5 +153,37 @@ quiet_cmd_host-cxxobjs = HOSTCXX $@
+ $(host-cxxobjs): $(obj)/%.o: $(src)/%.cc FORCE
+ $(call if_changed_dep,host-cxxobjs)
+# Compile .c file, create position independent .o file
++# host-cshobjs -> .o
++quiet_cmd_host-cshobjs = HOSTCC -fPIC $@
++ cmd_host-cshobjs = $(HOSTCC) $(hostc_flags) -fPIC -c -o $@ $<
++$(host-cshobjs): $(obj)/%.o: $(src)/%.c FORCE
++ $(call if_changed_dep,host-cshobjs)
++
++# Compile .c file, create position independent .o file
+# host-cxxshobjs -> .o
+quiet_cmd_host-cxxshobjs = HOSTCXX -fPIC $@
+ cmd_host-cxxshobjs = $(HOSTCXX) $(hostcxx_flags) -fPIC -c -o $@ $<
+$(host-cxxshobjs): $(obj)/%.o: $(src)/%.c FORCE
+ $(call if_changed_dep,host-cxxshobjs)
+
- # Link a shared library, based on position independent .o files
- # *.o -> .so shared library (host-cshlib)
- quiet_cmd_host-cshlib = HOSTLLD -shared $@
-@@ -165,6 +180,15 @@ quiet_cmd_host-cshlib = HOSTLLD -shared $@
- $(host-cshlib): $(obj)/%: $(host-cshobjs) FORCE
- $(call if_changed,host-cshlib)
-
++# Link a shared library, based on position independent .o files
++# *.o -> .so shared library (host-cshlib)
++quiet_cmd_host-cshlib = HOSTLLD -shared $@
++ cmd_host-cshlib = $(HOSTCC) $(HOSTLDFLAGS) -shared -o $@ \
++ $(addprefix $(obj)/,$($(@F:.so=-objs))) \
++ $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
++$(host-cshlib): $(obj)/%: $(host-cshobjs) FORCE
++ $(call if_changed,host-cshlib)
++
+# Link a shared library, based on position independent .o files
+# *.o -> .so shared library (host-cxxshlib)
+quiet_cmd_host-cxxshlib = HOSTLLD -shared $@
@@ -108205,11 +107711,10 @@ index 1ac414f..38575f7 100644
+ $(call if_changed,host-cxxshlib)
+
targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\
-- $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)
+- $(host-cxxmulti) $(host-cxxobjs)
+ $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs) $(host-cxxshlib) $(host-cxxshobjs)
-
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
-index 078fe1d..fbdb363 100644
+index b304068..462d24e 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -161,7 +161,7 @@ static unsigned int strhash(const char *str, unsigned int sz)
@@ -108313,7 +107818,7 @@ index 0000000..42018ed
+fi
+exit 1
diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh
-index 5de5660..d3deb89 100644
+index fdebd66..a349e33 100755
--- a/scripts/headers_install.sh
+++ b/scripts/headers_install.sh
@@ -32,6 +32,7 @@ do
@@ -108325,10 +107830,10 @@ index 5de5660..d3deb89 100644
-e 's@^#include <linux/compiler.h>@@' \
-e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
-index 2dcb377..a82c500 100644
+index 86a4fe7..99e91f9 100755
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
-@@ -162,7 +162,7 @@ else
+@@ -166,7 +166,7 @@ else
fi;
# final build of init/
@@ -108338,7 +107843,7 @@ index 2dcb377..a82c500 100644
kallsymso=""
kallsyms_vmlinux=""
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
-index 25e5cb0..6e85821 100644
+index e614ef6..d9d2b01 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -142,7 +142,7 @@ static void device_id_check(const char *modname, const char *device_id,
@@ -108350,7 +107855,7 @@ index 25e5cb0..6e85821 100644
if (size % id_size || size < id_size) {
fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo "
-@@ -170,7 +170,7 @@ static void device_id_check(const char *modname, const char *device_id,
+@@ -171,7 +171,7 @@ static void device_id_check(const char *modname, const char *device_id,
/* USB is special because the bcdDevice can be matched against a numeric range */
/* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipNinN" */
static void do_usb_entry(void *symval,
@@ -108359,7 +107864,7 @@ index 25e5cb0..6e85821 100644
unsigned char range_lo, unsigned char range_hi,
unsigned char max, struct module *mod)
{
-@@ -280,7 +280,7 @@ static void do_usb_entry_multi(void *symval, struct module *mod)
+@@ -281,7 +281,7 @@ static void do_usb_entry_multi(void *symval, struct module *mod)
{
unsigned int devlo, devhi;
unsigned char chi, clo, max;
@@ -108368,7 +107873,7 @@ index 25e5cb0..6e85821 100644
DEF_FIELD(symval, usb_device_id, match_flags);
DEF_FIELD(symval, usb_device_id, idVendor);
-@@ -533,7 +533,7 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
+@@ -534,7 +534,7 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
for (i = 0; i < count; i++) {
DEF_FIELD_ADDR(symval + i*id_size, pnp_device_id, id);
char acpi_id[sizeof(*id)];
@@ -108377,7 +107882,7 @@ index 25e5cb0..6e85821 100644
buf_printf(&mod->dev_table_buf,
"MODULE_ALIAS(\"pnp:d%s*\");\n", *id);
-@@ -562,7 +562,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
+@@ -563,7 +563,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
for (j = 0; j < PNP_MAX_DEVICES; j++) {
const char *id = (char *)(*devs)[j].id;
@@ -108386,7 +107891,7 @@ index 25e5cb0..6e85821 100644
int dup = 0;
if (!id[0])
-@@ -588,7 +588,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
+@@ -589,7 +589,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
/* add an individual alias for every device entry */
if (!dup) {
char acpi_id[PNP_ID_LEN];
@@ -108395,7 +107900,7 @@ index 25e5cb0..6e85821 100644
buf_printf(&mod->dev_table_buf,
"MODULE_ALIAS(\"pnp:d%s*\");\n", id);
-@@ -940,7 +940,7 @@ static void dmi_ascii_filter(char *d, const char *s)
+@@ -939,7 +939,7 @@ static void dmi_ascii_filter(char *d, const char *s)
static int do_dmi_entry(const char *filename, void *symval,
char *alias)
{
@@ -108405,10 +107910,10 @@ index 25e5cb0..6e85821 100644
sprintf(alias, "dmi*");
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
-index 99a45fd..4b995a3 100644
+index d439856..10c1eac 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
-@@ -945,6 +945,7 @@ enum mismatch {
+@@ -921,6 +921,7 @@ enum mismatch {
ANY_INIT_TO_ANY_EXIT,
ANY_EXIT_TO_ANY_INIT,
EXPORT_TO_INIT_EXIT,
@@ -108416,7 +107921,7 @@ index 99a45fd..4b995a3 100644
};
struct sectioncheck {
-@@ -1031,6 +1032,12 @@ const struct sectioncheck sectioncheck[] = {
+@@ -1007,6 +1008,12 @@ static const struct sectioncheck sectioncheck[] = {
.tosec = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
.mismatch = EXPORT_TO_INIT_EXIT,
.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
@@ -108429,7 +107934,7 @@ index 99a45fd..4b995a3 100644
}
};
-@@ -1151,10 +1158,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
+@@ -1127,10 +1134,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
continue;
if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
continue;
@@ -108442,7 +107947,7 @@ index 99a45fd..4b995a3 100644
if (d < 0)
d = addr - sym->st_value;
if (d < distance) {
-@@ -1432,6 +1439,14 @@ static void report_sec_mismatch(const char *modname,
+@@ -1408,6 +1415,14 @@ static void report_sec_mismatch(const char *modname,
tosym, prl_to, prl_to, tosym);
free(prl_to);
break;
@@ -108457,16 +107962,16 @@ index 99a45fd..4b995a3 100644
}
fprintf(stderr, "\n");
}
-@@ -1679,7 +1694,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
+@@ -1659,7 +1674,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
static void check_sec_ref(struct module *mod, const char *modname,
- struct elf_info *elf)
+ struct elf_info *elf)
{
- int i;
+ unsigned int i;
Elf_Shdr *sechdrs = elf->sechdrs;
/* Walk through all sections */
-@@ -1798,7 +1813,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf,
+@@ -1790,7 +1805,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf,
va_end(ap);
}
@@ -108475,7 +107980,7 @@ index 99a45fd..4b995a3 100644
{
if (buf->size - buf->pos < len) {
buf->size += len + SZ;
-@@ -2017,7 +2032,7 @@ static void write_if_changed(struct buffer *b, const char *fname)
+@@ -2009,7 +2024,7 @@ static void write_if_changed(struct buffer *b, const char *fname)
if (fstat(fileno(file), &st) < 0)
goto close_write;
@@ -108485,7 +107990,7 @@ index 99a45fd..4b995a3 100644
tmp = NOFAIL(malloc(b->pos));
diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
-index 51207e4..f7d603d 100644
+index 168b43d..77914bf 100644
--- a/scripts/mod/modpost.h
+++ b/scripts/mod/modpost.h
@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *expr);
@@ -108508,7 +108013,7 @@ index 51207e4..f7d603d 100644
struct module {
struct module *next;
diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
-index deb2994..af4f63e8 100644
+index 944418d..15291e4 100644
--- a/scripts/mod/sumversion.c
+++ b/scripts/mod/sumversion.c
@@ -470,7 +470,7 @@ static void write_version(const char *filename, const char *sum,
@@ -108536,7 +108041,7 @@ index 0865b3e..7235dd4 100644
__ksymtab_gpl : { *(SORT(___ksymtab_gpl+*)) }
__ksymtab_unused : { *(SORT(___ksymtab_unused+*)) }
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
-index c5d4733..7c43eb4 100644
+index 99ca6e7..3a1a1a1 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -46,7 +46,7 @@ rpm-pkg rpm: FORCE
@@ -108549,17 +108054,17 @@ index c5d4733..7c43eb4 100644
rm -f $(objtree)/.scmversion
$(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
-index 152d4d2..791684c 100644
+index 5972624..4028795 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
-@@ -291,6 +291,7 @@ fi
- (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
- (cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
- (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
+@@ -293,6 +293,7 @@ fi
+ (cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
+ (cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"
+ (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles"
+(cd $objtree; find tools/gcc -name \*.so >> "$objtree/debian/hdrobjfiles")
destdir=$kernel_headers_dir/usr/src/linux-headers-$version
mkdir -p "$destdir"
- (cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)
+ (cd $srctree; tar -c -f - -T -) < "$objtree/debian/hdrsrcfiles" | (cd $destdir; tar -xf -)
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index 1395760..bca2734 100755
--- a/scripts/package/mkspec
@@ -108628,7 +108133,7 @@ index 1395760..bca2734 100755
-echo "/lib/modules/$KERNELRELEASE/source"
echo ""
diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c
-index 68bb4ef..2f419e1 100644
+index 4718d78..9220d58 100644
--- a/scripts/pnmtologo.c
+++ b/scripts/pnmtologo.c
@@ -244,14 +244,14 @@ static void write_header(void)
@@ -108658,7 +108163,7 @@ index 68bb4ef..2f419e1 100644
write_hex_cnt = 0;
for (i = 0; i < logo_clutsize; i++) {
diff --git a/scripts/sortextable.h b/scripts/sortextable.h
-index 8fac3fd..32ff38d 100644
+index ba87004..3f4852c 100644
--- a/scripts/sortextable.h
+++ b/scripts/sortextable.h
@@ -108,9 +108,9 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
@@ -108674,8 +108179,21 @@ index 8fac3fd..32ff38d 100644
unsigned int num_sections;
unsigned int secindex_strings;
+diff --git a/scripts/tags.sh b/scripts/tags.sh
+index cdb491d..8d32bfc 100755
+--- a/scripts/tags.sh
++++ b/scripts/tags.sh
+@@ -26,7 +26,7 @@ else
+ fi
+
+ # ignore userspace tools
+-ignore="$ignore ( -path ${tree}tools ) -prune -o"
++ignore="$ignore ( -path \"${tree}tools/[^g]*\" ) -prune -o"
+
+ # Find all available archs
+ find_all_archs()
diff --git a/security/Kconfig b/security/Kconfig
-index beb86b5..4c193cc 100644
+index beb86b5..1a953b1 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -4,6 +4,974 @@
@@ -109529,7 +109047,7 @@ index beb86b5..4c193cc 100644
+config PAX_REFCOUNT
+ bool "Prevent various kernel object reference counter overflows"
+ default y if GRKERNSEC_CONFIG_AUTO
-+ depends on GRKERNSEC && ((ARM && (CPU_V6 || CPU_V6K || CPU_V7)) || MIPS || SPARC64 || X86)
++ depends on GRKERNSEC && ((ARM && (CPU_V6 || CPU_V6K || CPU_V7)) || MIPS || PPC || SPARC64 || X86)
+ help
+ By saying Y here the kernel will detect and prevent overflowing
+ various (but not all) kinds of object reference counters. Such
@@ -109677,42 +109195,8 @@ index fdaa50c..2761dcb 100644
struct path_cond cond = {
old_dentry->d_inode->i_uid,
old_dentry->d_inode->i_mode
-diff --git a/security/apparmor/include/apparmor.h b/security/apparmor/include/apparmor.h
-index 8fb1488..97130f8 100644
---- a/security/apparmor/include/apparmor.h
-+++ b/security/apparmor/include/apparmor.h
-@@ -66,7 +66,6 @@ extern int apparmor_initialized __initdata;
- char *aa_split_fqname(char *args, char **ns_name);
- void aa_info_message(const char *str);
- void *__aa_kvmalloc(size_t size, gfp_t flags);
--void kvfree(void *buffer);
-
- static inline void *kvmalloc(size_t size)
- {
-diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c
-index 6968992..c1827e0 100644
---- a/security/apparmor/lib.c
-+++ b/security/apparmor/lib.c
-@@ -104,17 +104,3 @@ void *__aa_kvmalloc(size_t size, gfp_t flags)
- }
- return buffer;
- }
--
--/**
-- * kvfree - free an allocation do by kvmalloc
-- * @buffer: buffer to free (MAYBE_NULL)
-- *
-- * Free a buffer allocated by kvmalloc
-- */
--void kvfree(void *buffer)
--{
-- if (is_vmalloc_addr(buffer))
-- vfree(buffer);
-- else
-- kfree(buffer);
--}
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
-index 4257b7e..2d0732d 100644
+index 65ca451..ad6f22d 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -186,7 +186,7 @@ static int common_perm_dir_dentry(int op, struct path *dir,
@@ -109754,7 +109238,7 @@ index 4257b7e..2d0732d 100644
.ptrace_access_check = apparmor_ptrace_access_check,
diff --git a/security/commoncap.c b/security/commoncap.c
-index 963dc59..12ebd0c 100644
+index bab0611..f9a0ff5 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -427,6 +427,32 @@ int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data
@@ -109801,10 +109285,10 @@ index 963dc59..12ebd0c 100644
if (bprm->cap_effective)
return 1;
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
-index f79fa8b..6161868 100644
+index 8ee997d..24c174b 100644
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h
-@@ -118,8 +118,8 @@ int ima_init_template(void);
+@@ -116,8 +116,8 @@ int ima_init_template(void);
extern spinlock_t ima_queue_lock;
struct ima_h_table {
@@ -109816,7 +109300,7 @@ index f79fa8b..6161868 100644
};
extern struct ima_h_table ima_htable;
diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
-index 025824a..2a681b1 100644
+index 8688597..9fa80d2 100644
--- a/security/integrity/ima/ima_api.c
+++ b/security/integrity/ima/ima_api.c
@@ -137,7 +137,7 @@ void ima_add_violation(struct file *file, const unsigned char *filename,
@@ -109829,7 +109313,7 @@ index 025824a..2a681b1 100644
result = ima_alloc_init_template(NULL, file, filename,
NULL, 0, &entry);
diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
-index 468a3ba..9af5cae 100644
+index da92fcc..8a5d390 100644
--- a/security/integrity/ima/ima_fs.c
+++ b/security/integrity/ima/ima_fs.c
@@ -28,12 +28,12 @@
@@ -109848,10 +109332,10 @@ index 468a3ba..9af5cae 100644
}
diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c
-index d85e997..6992813 100644
+index 552705d..9920f4fb 100644
--- a/security/integrity/ima/ima_queue.c
+++ b/security/integrity/ima/ima_queue.c
-@@ -80,7 +80,7 @@ static int ima_add_digest_entry(struct ima_template_entry *entry)
+@@ -83,7 +83,7 @@ static int ima_add_digest_entry(struct ima_template_entry *entry)
INIT_LIST_HEAD(&qe->later);
list_add_tail_rcu(&qe->later, &ima_measurements);
@@ -109861,7 +109345,7 @@ index d85e997..6992813 100644
hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
return 0;
diff --git a/security/keys/compat.c b/security/keys/compat.c
-index bbd32c7..c60c927 100644
+index 3478965..ec7bb9e 100644
--- a/security/keys/compat.c
+++ b/security/keys/compat.c
@@ -44,7 +44,7 @@ static long compat_keyctl_instantiate_key_iov(
@@ -109874,10 +109358,10 @@ index bbd32c7..c60c927 100644
if (iov != iovstack)
kfree(iov);
diff --git a/security/keys/internal.h b/security/keys/internal.h
-index 80b2aac..bb7ee65 100644
+index 200e378..cdc74b5 100644
--- a/security/keys/internal.h
+++ b/security/keys/internal.h
-@@ -253,7 +253,7 @@ extern long keyctl_instantiate_key_iov(key_serial_t,
+@@ -244,7 +244,7 @@ extern long keyctl_instantiate_key_iov(key_serial_t,
extern long keyctl_invalidate_key(key_serial_t);
extern long keyctl_instantiate_key_common(key_serial_t,
@@ -109887,7 +109371,7 @@ index 80b2aac..bb7ee65 100644
#ifdef CONFIG_PERSISTENT_KEYRINGS
extern long keyctl_get_persistent(uid_t, key_serial_t);
diff --git a/security/keys/key.c b/security/keys/key.c
-index 6e21c11..9ed67ca 100644
+index e17ba6a..2cc04a6 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -285,7 +285,7 @@ struct key *key_alloc(struct key_type *type, const char *desc,
@@ -109899,7 +109383,7 @@ index 6e21c11..9ed67ca 100644
key->index_key.type = type;
key->user = user;
key->quotalen = quotalen;
-@@ -1036,7 +1036,9 @@ int register_key_type(struct key_type *ktype)
+@@ -1075,7 +1075,9 @@ int register_key_type(struct key_type *ktype)
struct key_type *p;
int ret;
@@ -109910,7 +109394,7 @@ index 6e21c11..9ed67ca 100644
ret = -EEXIST;
down_write(&key_types_sem);
-@@ -1048,7 +1050,7 @@ int register_key_type(struct key_type *ktype)
+@@ -1087,7 +1089,7 @@ int register_key_type(struct key_type *ktype)
}
/* store the type */
@@ -109919,7 +109403,7 @@ index 6e21c11..9ed67ca 100644
pr_notice("Key type %s registered\n", ktype->name);
ret = 0;
-@@ -1070,7 +1072,7 @@ EXPORT_SYMBOL(register_key_type);
+@@ -1109,7 +1111,7 @@ EXPORT_SYMBOL(register_key_type);
void unregister_key_type(struct key_type *ktype)
{
down_write(&key_types_sem);
@@ -109928,7 +109412,7 @@ index 6e21c11..9ed67ca 100644
downgrade_write(&key_types_sem);
key_gc_keytype(ktype);
pr_notice("Key type %s unregistered\n", ktype->name);
-@@ -1088,10 +1090,10 @@ void __init key_init(void)
+@@ -1127,10 +1129,10 @@ void __init key_init(void)
0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
/* add the special key types */
@@ -109944,10 +109428,10 @@ index 6e21c11..9ed67ca 100644
/* record the root user tracking */
rb_link_node(&root_key_user.node,
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
-index cee72ce..e46074a 100644
+index 4743d71..170a185 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
-@@ -987,7 +987,7 @@ static int keyctl_change_reqkey_auth(struct key *key)
+@@ -1000,7 +1000,7 @@ static int keyctl_change_reqkey_auth(struct key *key)
/*
* Copy the iovec data from userspace
*/
@@ -109956,7 +109440,7 @@ index cee72ce..e46074a 100644
unsigned ioc)
{
for (; ioc > 0; ioc--) {
-@@ -1009,7 +1009,7 @@ static long copy_from_user_iovec(void *buffer, const struct iovec *iov,
+@@ -1022,7 +1022,7 @@ static long copy_from_user_iovec(void *buffer, const struct iovec *iov,
* If successful, 0 will be returned.
*/
long keyctl_instantiate_key_common(key_serial_t id,
@@ -109965,7 +109449,7 @@ index cee72ce..e46074a 100644
unsigned ioc,
size_t plen,
key_serial_t ringid)
-@@ -1104,7 +1104,7 @@ long keyctl_instantiate_key(key_serial_t id,
+@@ -1117,7 +1117,7 @@ long keyctl_instantiate_key(key_serial_t id,
[0].iov_len = plen
};
@@ -109974,7 +109458,7 @@ index cee72ce..e46074a 100644
}
return keyctl_instantiate_key_common(id, NULL, 0, 0, ringid);
-@@ -1137,7 +1137,7 @@ long keyctl_instantiate_key_iov(key_serial_t id,
+@@ -1150,7 +1150,7 @@ long keyctl_instantiate_key_iov(key_serial_t id,
if (ret == 0)
goto no_payload_free;
@@ -110004,7 +109488,7 @@ index f728728..6457a0c 100644
/*
diff --git a/security/security.c b/security/security.c
-index 919cad9..2127be1 100644
+index 18b35c6..c9fbc92 100644
--- a/security/security.c
+++ b/security/security.c
@@ -33,8 +33,8 @@
@@ -110031,7 +109515,7 @@ index 919cad9..2127be1 100644
static int __init choose_lsm(char *str)
{
diff --git a/security/selinux/avc.c b/security/selinux/avc.c
-index fc3e662..7844c60 100644
+index a18f1fa..c9b9fc4 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -59,7 +59,7 @@ struct avc_node {
@@ -110062,7 +109546,7 @@ index fc3e662..7844c60 100644
lock = &avc_cache.slots_lock[hvalue];
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
-index 47b5c69..4fc9b7f 100644
+index c603b20..8716ec9 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -95,8 +95,6 @@
@@ -110074,7 +109558,7 @@ index 47b5c69..4fc9b7f 100644
/* SECMARK reference count */
static atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
-@@ -5759,7 +5757,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
+@@ -5809,7 +5807,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
#endif
@@ -110083,7 +109567,7 @@ index 47b5c69..4fc9b7f 100644
.name = "selinux",
.ptrace_access_check = selinux_ptrace_access_check,
-@@ -6112,6 +6110,9 @@ static void selinux_nf_ip_exit(void)
+@@ -6150,6 +6148,9 @@ static void selinux_nf_ip_exit(void)
#ifdef CONFIG_SECURITY_SELINUX_DISABLE
static int selinux_disabled;
@@ -110093,7 +109577,7 @@ index 47b5c69..4fc9b7f 100644
int selinux_disable(void)
{
if (ss_initialized) {
-@@ -6129,7 +6130,9 @@ int selinux_disable(void)
+@@ -6167,7 +6168,9 @@ int selinux_disable(void)
selinux_disabled = 1;
selinux_enabled = 0;
@@ -110105,23 +109589,23 @@ index 47b5c69..4fc9b7f 100644
/* Try to destroy the avc node cache */
avc_disable();
diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h
-index 9f05847..7933395 100644
+index 1450f85..a91e0bc 100644
--- a/security/selinux/include/xfrm.h
+++ b/security/selinux/include/xfrm.h
-@@ -46,7 +46,7 @@ static inline void selinux_xfrm_notify_policyload(void)
- {
- struct net *net;
+@@ -48,7 +48,7 @@ static inline void selinux_xfrm_notify_policyload(void)
-- atomic_inc(&flow_cache_genid);
-+ atomic_inc_unchecked(&flow_cache_genid);
rtnl_lock();
- for_each_net(net)
+ for_each_net(net) {
+- atomic_inc(&net->xfrm.flow_cache_genid);
++ atomic_inc_unchecked(&net->xfrm.flow_cache_genid);
rt_genid_bump_all(net);
+ }
+ rtnl_unlock();
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
-index 14f52be..7352368 100644
+index d515ec2..8a4ca71 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
-@@ -3726,7 +3726,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
+@@ -4079,7 +4079,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
return 0;
}
@@ -110357,7 +109841,7 @@ index 13c88fbc..f8c115e 100644
{ .procname = "kernel", },
{ .procname = "yama", },
diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c
-index 4cedc69..e59d8a3 100644
+index 401107b..b9c47c6 100644
--- a/sound/aoa/codecs/onyx.c
+++ b/sound/aoa/codecs/onyx.c
@@ -54,7 +54,7 @@ struct onyx {
@@ -110401,10 +109885,10 @@ index ffd2025..df062c9 100644
/* PCM3052 register definitions */
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
-index 4c1cc51..16040040 100644
+index ada69d7..5f65386 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
-@@ -1189,10 +1189,10 @@ snd_pcm_sframes_t snd_pcm_oss_write3(struct snd_pcm_substream *substream, const
+@@ -1190,10 +1190,10 @@ snd_pcm_sframes_t snd_pcm_oss_write3(struct snd_pcm_substream *substream, const
if (in_kernel) {
mm_segment_t fs;
fs = snd_enter_user();
@@ -110417,7 +109901,7 @@ index 4c1cc51..16040040 100644
}
if (ret != -EPIPE && ret != -ESTRPIPE)
break;
-@@ -1234,10 +1234,10 @@ snd_pcm_sframes_t snd_pcm_oss_read3(struct snd_pcm_substream *substream, char *p
+@@ -1233,10 +1233,10 @@ snd_pcm_sframes_t snd_pcm_oss_read3(struct snd_pcm_substream *substream, char *p
if (in_kernel) {
mm_segment_t fs;
fs = snd_enter_user();
@@ -110430,7 +109914,7 @@ index 4c1cc51..16040040 100644
}
if (ret == -EPIPE) {
if (runtime->status->state == SNDRV_PCM_STATE_DRAINING) {
-@@ -1337,7 +1337,7 @@ static ssize_t snd_pcm_oss_write2(struct snd_pcm_substream *substream, const cha
+@@ -1332,7 +1332,7 @@ static ssize_t snd_pcm_oss_write2(struct snd_pcm_substream *substream, const cha
struct snd_pcm_plugin_channel *channels;
size_t oss_frame_bytes = (runtime->oss.plugin_first->src_width * runtime->oss.plugin_first->src_format.channels) / 8;
if (!in_kernel) {
@@ -110439,7 +109923,7 @@ index 4c1cc51..16040040 100644
return -EFAULT;
buf = runtime->oss.buffer;
}
-@@ -1407,7 +1407,7 @@ static ssize_t snd_pcm_oss_write1(struct snd_pcm_substream *substream, const cha
+@@ -1402,7 +1402,7 @@ static ssize_t snd_pcm_oss_write1(struct snd_pcm_substream *substream, const cha
}
} else {
tmp = snd_pcm_oss_write2(substream,
@@ -110448,7 +109932,7 @@ index 4c1cc51..16040040 100644
runtime->oss.period_bytes, 0);
if (tmp <= 0)
goto err;
-@@ -1433,7 +1433,7 @@ static ssize_t snd_pcm_oss_read2(struct snd_pcm_substream *substream, char *buf,
+@@ -1428,7 +1428,7 @@ static ssize_t snd_pcm_oss_read2(struct snd_pcm_substream *substream, char *buf,
struct snd_pcm_runtime *runtime = substream->runtime;
snd_pcm_sframes_t frames, frames1;
#ifdef CONFIG_SND_PCM_OSS_PLUGINS
@@ -110457,7 +109941,7 @@ index 4c1cc51..16040040 100644
if (runtime->oss.plugin_first) {
struct snd_pcm_plugin_channel *channels;
size_t oss_frame_bytes = (runtime->oss.plugin_last->dst_width * runtime->oss.plugin_last->dst_format.channels) / 8;
-@@ -1495,7 +1495,7 @@ static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream *substream, char __use
+@@ -1490,7 +1490,7 @@ static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream *substream, char __use
xfer += tmp;
runtime->oss.buffer_used -= tmp;
} else {
@@ -110466,7 +109950,7 @@ index 4c1cc51..16040040 100644
runtime->oss.period_bytes, 0);
if (tmp <= 0)
goto err;
-@@ -1663,7 +1663,7 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file)
+@@ -1659,7 +1659,7 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file)
size1);
size1 /= runtime->channels; /* frames */
fs = snd_enter_user();
@@ -110476,7 +109960,7 @@ index 4c1cc51..16040040 100644
}
} else if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) {
diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c
-index c4ac3c1..5266261 100644
+index 2d957ba..fda022c 100644
--- a/sound/core/pcm_compat.c
+++ b/sound/core/pcm_compat.c
@@ -31,7 +31,7 @@ static int snd_pcm_ioctl_delay_compat(struct snd_pcm_substream *substream,
@@ -110489,10 +109973,10 @@ index c4ac3c1..5266261 100644
if (err < 0)
return err;
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
-index 566b0f6..636730b 100644
+index 166d59c..89e3889 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
-@@ -2811,11 +2811,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,
+@@ -2931,11 +2931,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,
switch (substream->stream) {
case SNDRV_PCM_STREAM_PLAYBACK:
result = snd_pcm_playback_ioctl1(NULL, substream, cmd,
@@ -110507,10 +109991,10 @@ index 566b0f6..636730b 100644
default:
result = -EINVAL;
diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c
-index 8d4d5e8..fdd0826 100644
+index 16d4267..fe8b49b 100644
--- a/sound/core/seq/oss/seq_oss.c
+++ b/sound/core/seq/oss/seq_oss.c
-@@ -75,8 +75,8 @@ static int __init alsa_seq_oss_init(void)
+@@ -69,8 +69,8 @@ static int __init alsa_seq_oss_init(void)
{
int rc;
static struct snd_seq_dev_ops ops = {
@@ -110522,7 +110006,7 @@ index 8d4d5e8..fdd0826 100644
snd_seq_autoload_lock();
diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c
-index 040c60e..989a19a 100644
+index 91a786a..4c07ed4 100644
--- a/sound/core/seq/seq_device.c
+++ b/sound/core/seq/seq_device.c
@@ -64,7 +64,7 @@ struct ops_list {
@@ -110562,7 +110046,7 @@ index 040c60e..989a19a 100644
dev->driver_data = NULL;
ops->num_init_devices--;
diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c
-index 64069db..3c6d392 100644
+index a1fd77a..69cd659 100644
--- a/sound/core/seq/seq_midi.c
+++ b/sound/core/seq/seq_midi.c
@@ -462,8 +462,8 @@ snd_seq_midisynth_unregister_port(struct snd_seq_device *dev)
@@ -110577,7 +110061,7 @@ index 64069db..3c6d392 100644
memset(&synths, 0, sizeof(synths));
snd_seq_autoload_lock();
diff --git a/sound/core/sound.c b/sound/core/sound.c
-index 437c25e..cd040ab 100644
+index 38ad1a0..5010a40 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -86,7 +86,7 @@ static void snd_request_other(int minor)
@@ -110590,7 +110074,7 @@ index 437c25e..cd040ab 100644
#endif /* modular kernel */
diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
-index 4e0dd22..7a1f32c 100644
+index f5fd448..6ae276da 100644
--- a/sound/drivers/mts64.c
+++ b/sound/drivers/mts64.c
@@ -29,6 +29,7 @@
@@ -110693,7 +110177,7 @@ index 9919769..d7de36c 100644
return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_OPL4, &ops,
diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
-index 991018d..8984740 100644
+index 78ccfa4..7a0857b 100644
--- a/sound/drivers/portman2x4.c
+++ b/sound/drivers/portman2x4.c
@@ -48,6 +48,7 @@
@@ -110714,42 +110198,51 @@ index 991018d..8984740 100644
struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
};
diff --git a/sound/firewire/amdtp.c b/sound/firewire/amdtp.c
-index 9048777..2d8b1fc 100644
+index 95fc2eaf..ea5d6a7 100644
--- a/sound/firewire/amdtp.c
+++ b/sound/firewire/amdtp.c
-@@ -488,7 +488,7 @@ static void queue_out_packet(struct amdtp_out_stream *s, unsigned int cycle)
- ptr = s->pcm_buffer_pointer + data_blocks;
- if (ptr >= pcm->runtime->buffer_size)
- ptr -= pcm->runtime->buffer_size;
-- ACCESS_ONCE(s->pcm_buffer_pointer) = ptr;
-+ ACCESS_ONCE_RW(s->pcm_buffer_pointer) = ptr;
-
- s->pcm_period_pointer += data_blocks;
- if (s->pcm_period_pointer >= pcm->runtime->period_size) {
-@@ -655,7 +655,7 @@ EXPORT_SYMBOL(amdtp_out_stream_pcm_pointer);
+@@ -521,7 +521,7 @@ static void update_pcm_pointers(struct amdtp_stream *s,
+ ptr = s->pcm_buffer_pointer + frames;
+ if (ptr >= pcm->runtime->buffer_size)
+ ptr -= pcm->runtime->buffer_size;
+- ACCESS_ONCE(s->pcm_buffer_pointer) = ptr;
++ ACCESS_ONCE_RW(s->pcm_buffer_pointer) = ptr;
+
+ s->pcm_period_pointer += frames;
+ if (s->pcm_period_pointer >= pcm->runtime->period_size) {
+@@ -961,7 +961,7 @@ EXPORT_SYMBOL(amdtp_stream_pcm_pointer);
*/
- void amdtp_out_stream_update(struct amdtp_out_stream *s)
+ void amdtp_stream_update(struct amdtp_stream *s)
{
- ACCESS_ONCE(s->source_node_id_field) =
+ ACCESS_ONCE_RW(s->source_node_id_field) =
(fw_parent_device(s->unit)->card->node_id & 0x3f) << 24;
}
- EXPORT_SYMBOL(amdtp_out_stream_update);
+ EXPORT_SYMBOL(amdtp_stream_update);
diff --git a/sound/firewire/amdtp.h b/sound/firewire/amdtp.h
-index 2746ecd..c35dedd 100644
+index 4823c08..47a5f7c 100644
--- a/sound/firewire/amdtp.h
+++ b/sound/firewire/amdtp.h
-@@ -135,7 +135,7 @@ static inline bool amdtp_out_streaming_error(struct amdtp_out_stream *s)
- static inline void amdtp_out_stream_pcm_trigger(struct amdtp_out_stream *s,
- struct snd_pcm_substream *pcm)
+@@ -212,7 +212,7 @@ static inline bool amdtp_stream_pcm_running(struct amdtp_stream *s)
+ static inline void amdtp_stream_pcm_trigger(struct amdtp_stream *s,
+ struct snd_pcm_substream *pcm)
{
- ACCESS_ONCE(s->pcm) = pcm;
+ ACCESS_ONCE_RW(s->pcm) = pcm;
}
+ /**
+@@ -230,7 +230,7 @@ static inline void amdtp_stream_midi_trigger(struct amdtp_stream *s,
+ struct snd_rawmidi_substream *midi)
+ {
+ if (port < s->midi_ports)
+- ACCESS_ONCE(s->midi[port]) = midi;
++ ACCESS_ONCE_RW(s->midi[port]) = midi;
+ }
+
static inline bool cip_sfc_is_base_44100(enum cip_sfc sfc)
diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
-index fd42e6b..c041971 100644
+index 7ac9443..0ec6274 100644
--- a/sound/firewire/isight.c
+++ b/sound/firewire/isight.c
@@ -96,7 +96,7 @@ static void isight_update_pointers(struct isight *isight, unsigned int count)
@@ -110793,7 +110286,7 @@ index fd42e6b..c041971 100644
default:
return -EINVAL;
diff --git a/sound/firewire/scs1x.c b/sound/firewire/scs1x.c
-index 858023c..83b3d3c 100644
+index 2dba848..c682aef 100644
--- a/sound/firewire/scs1x.c
+++ b/sound/firewire/scs1x.c
@@ -74,7 +74,7 @@ static void scs_output_trigger(struct snd_rawmidi_substream *stream, int up)
@@ -110854,7 +110347,7 @@ index 048439a..3be9f6f 100644
userbuf+useroffs + p,
locallen))
diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c
-index f851fd0..92576fb 100644
+index a33e8ce..2262303 100644
--- a/sound/oss/swarm_cs4297a.c
+++ b/sound/oss/swarm_cs4297a.c
@@ -2623,7 +2623,6 @@ static int __init cs4297a_init(void)
@@ -110863,9 +110356,9 @@ index f851fd0..92576fb 100644
u32 pwr, id;
- mm_segment_t fs;
int rval;
- #ifndef CONFIG_BCM_CS4297A_CSWARM
u64 cfg;
-@@ -2713,22 +2712,23 @@ static int __init cs4297a_init(void)
+ int mdio_val;
+@@ -2709,22 +2708,23 @@ static int __init cs4297a_init(void)
if (!rval) {
char *sb1250_duart_present;
@@ -110907,10 +110400,10 @@ index 4c41c90..37f3631 100644
return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH, &ops,
sizeof(struct snd_emu10k1_synth_arg));
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
-index f6e5c4e..7df65ef 100644
+index e708368..764dffe 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
-@@ -985,14 +985,10 @@ find_codec_preset(struct hda_codec *codec)
+@@ -968,14 +968,10 @@ find_codec_preset(struct hda_codec *codec)
mutex_unlock(&preset_mutex);
if (mod_requested < HDA_MODREQ_MAX_COUNT) {
@@ -110927,7 +110420,7 @@ index f6e5c4e..7df65ef 100644
mod_requested++;
goto again;
}
-@@ -2741,7 +2737,7 @@ static int get_kctl_0dB_offset(struct snd_kcontrol *kctl, int *step_to_check)
+@@ -2802,7 +2798,7 @@ static int get_kctl_0dB_offset(struct hda_codec *codec,
/* FIXME: set_fs() hack for obtaining user-space TLV data */
mm_segment_t fs = get_fs();
set_fs(get_ds());
@@ -110950,10 +110443,10 @@ index 4631a23..001ae57 100644
const struct firmware *dsp_microcode;
const struct firmware *controller_microcode;
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
-index d591c15..8cb8f94 100644
+index 81c916a..516f0bf 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
-@@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct snd_ymfpci *chip)
+@@ -204,8 +204,8 @@ static void snd_ymfpci_hw_stop(struct snd_ymfpci *chip)
if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
break;
}
@@ -110964,7 +110457,7 @@ index d591c15..8cb8f94 100644
wake_up(&chip->interrupt_sleep);
}
__end:
-@@ -787,7 +787,7 @@ static void snd_ymfpci_irq_wait(struct snd_ymfpci *chip)
+@@ -789,7 +789,7 @@ static void snd_ymfpci_irq_wait(struct snd_ymfpci *chip)
continue;
init_waitqueue_entry(&wait, current);
add_wait_queue(&chip->interrupt_sleep, &wait);
@@ -110973,7 +110466,7 @@ index d591c15..8cb8f94 100644
schedule_timeout_uninterruptible(msecs_to_jiffies(50));
remove_wait_queue(&chip->interrupt_sleep, &wait);
}
-@@ -825,8 +825,8 @@ static irqreturn_t snd_ymfpci_interrupt(int irq, void *dev_id)
+@@ -827,8 +827,8 @@ static irqreturn_t snd_ymfpci_interrupt(int irq, void *dev_id)
snd_ymfpci_writel(chip, YDSXGR_MODE, mode);
spin_unlock(&chip->reg_lock);
@@ -110984,7 +110477,7 @@ index d591c15..8cb8f94 100644
wake_up(&chip->interrupt_sleep);
}
}
-@@ -2421,7 +2421,7 @@ int snd_ymfpci_create(struct snd_card *card,
+@@ -2423,7 +2423,7 @@ int snd_ymfpci_create(struct snd_card *card,
spin_lock_init(&chip->reg_lock);
spin_lock_init(&chip->voice_lock);
init_waitqueue_head(&chip->interrupt_sleep);
@@ -110993,42 +110486,11 @@ index d591c15..8cb8f94 100644
chip->card = card;
chip->pci = pci;
chip->irq = -1;
-diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
-index 5428a1f..474f651 100644
---- a/sound/soc/fsl/fsl_ssi.c
-+++ b/sound/soc/fsl/fsl_ssi.c
-@@ -1255,7 +1255,6 @@ static int fsl_ssi_probe(struct platform_device *pdev)
- {
- struct fsl_ssi_private *ssi_private;
- int ret = 0;
-- struct device_attribute *dev_attr = NULL;
- struct device_node *np = pdev->dev.of_node;
- const struct of_device_id *of_id;
- enum fsl_ssi_type hw_type;
-@@ -1481,7 +1480,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
- &ssi_private->cpu_dai_drv, 1);
- if (ret) {
- dev_err(&pdev->dev, "failed to register DAI: %d\n", ret);
-- goto error_dev;
-+ goto error_clk;
- }
-
- ret = fsl_ssi_debugfs_create(ssi_private, &pdev->dev);
-@@ -1562,9 +1561,6 @@ error_pcm:
- error_dbgfs:
- snd_soc_unregister_component(&pdev->dev);
-
--error_dev:
-- device_remove_file(&pdev->dev, dev_attr);
--
- error_clk:
- if (ssi_private->ssi_on_imx) {
- if (!IS_ERR(ssi_private->baudclk))
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
-index fe1df50..09d3be6 100644
+index b60ff56..7307f0f 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
-@@ -2254,8 +2254,10 @@ int snd_soc_set_ac97_ops_of_reset(struct snd_ac97_bus_ops *ops,
+@@ -2132,8 +2132,10 @@ int snd_soc_set_ac97_ops_of_reset(struct snd_ac97_bus_ops *ops,
if (ret)
return ret;
@@ -111068,12 +110530,11 @@ index 7778b8e..3d619fc 100644
diff --git a/tools/gcc/.gitignore b/tools/gcc/.gitignore
new file mode 100644
-index 0000000..60e7af2
+index 0000000..de92ed9
--- /dev/null
+++ b/tools/gcc/.gitignore
-@@ -0,0 +1,2 @@
+@@ -0,0 +1 @@
+randomize_layout_seed.h
-+randomize_layout_hash.h
diff --git a/tools/gcc/Makefile b/tools/gcc/Makefile
new file mode 100644
index 0000000..7b8921f
@@ -114494,10 +113955,11 @@ index 0000000..a5cb46b
+}
diff --git a/tools/gcc/size_overflow_plugin/.gitignore b/tools/gcc/size_overflow_plugin/.gitignore
new file mode 100644
-index 0000000..92d3b0c
+index 0000000..1f0214f
--- /dev/null
+++ b/tools/gcc/size_overflow_plugin/.gitignore
-@@ -0,0 +1,2 @@
+@@ -0,0 +1,3 @@
++randomize_layout_seed.h
+size_overflow_hash.h
+size_overflow_hash_aux.h
diff --git a/tools/gcc/size_overflow_plugin/Makefile b/tools/gcc/size_overflow_plugin/Makefile
@@ -114527,7 +113989,7 @@ index 0000000..1ae2ed5
+
+targets += size_overflow_hash.h size_overflow_hash_aux.h
diff --git a/tools/gcc/size_overflow_plugin/generate_size_overflow_hash.sh b/tools/gcc/size_overflow_plugin/generate_size_overflow_hash.sh
-new file mode 100755
+new file mode 100644
index 0000000..12b1e3b
--- /dev/null
+++ b/tools/gcc/size_overflow_plugin/generate_size_overflow_hash.sh
@@ -118836,12 +118298,11 @@ index 0000000..4378111
+}
diff --git a/tools/gcc/size_overflow_plugin/size_overflow_hash.data b/tools/gcc/size_overflow_plugin/size_overflow_hash.data
new file mode 100644
-index 0000000..3d3508d
+index 0000000..f2bd55d
--- /dev/null
+++ b/tools/gcc/size_overflow_plugin/size_overflow_hash.data
-@@ -0,0 +1,6042 @@
+@@ -0,0 +1,6031 @@
+intel_fake_agp_alloc_by_type_1 intel_fake_agp_alloc_by_type 1 1 NULL
-+ocfs2_get_refcount_tree_3 ocfs2_get_refcount_tree 0 3 NULL
+storvsc_connect_to_vsp_22 storvsc_connect_to_vsp 2 22 NULL
+compat_sock_setsockopt_23 compat_sock_setsockopt 5 23 NULL
+carl9170_alloc_27 carl9170_alloc 1 27 NULL
@@ -118854,20 +118315,17 @@ index 0000000..3d3508d
+ipath_verbs_send_117 ipath_verbs_send 5-3 117 NULL
+init_q_132 init_q 4 132 NULL
+memstick_alloc_host_142 memstick_alloc_host 1 142 NULL
-+gfs2_glock_get_147 gfs2_glock_get 0 147 NULL
+hva_to_gfn_memslot_149 hva_to_gfn_memslot 0-1 149 NULL
+ping_v6_sendmsg_152 ping_v6_sendmsg 4 152 NULL
+ext4_ext_get_actual_len_153 ext4_ext_get_actual_len 0 153 NULL nohasharray
+tracing_trace_options_write_153 tracing_trace_options_write 3 153 &ext4_ext_get_actual_len_153
-+pci_request_selected_regions_169 pci_request_selected_regions 0 169 NULL
+xfs_buf_item_get_format_189 xfs_buf_item_get_format 2 189 NULL
-+xfs_bmap_btalloc_192 xfs_bmap_btalloc 0 192 NULL
+iscsi_session_setup_196 iscsi_session_setup 4-5 196 NULL
++obd_proc_jobid_var_seq_write_199 obd_proc_jobid_var_seq_write 3 199 NULL
+ll_xattr_cache_seq_write_250 ll_xattr_cache_seq_write 3 250 NULL
++vpdma_create_desc_list_255 vpdma_create_desc_list 2 255 NULL
+br_port_info_size_268 br_port_info_size 0 268 NULL
-+generic_file_direct_write_291 generic_file_direct_write 0 291 NULL
+read_file_war_stats_292 read_file_war_stats 3 292 NULL
-+xfs_zero_last_block_298 xfs_zero_last_block 0 298 NULL
+SYSC_connect_304 SYSC_connect 3 304 NULL
+syslog_print_307 syslog_print 2 307 NULL
+dn_setsockopt_314 dn_setsockopt 5 314 NULL
@@ -118879,6 +118337,7 @@ index 0000000..3d3508d
+nvme_trans_modesel_data_488 nvme_trans_modesel_data 4 488 NULL
+iwl_dbgfs_protection_mode_write_502 iwl_dbgfs_protection_mode_write 3 502 NULL
+rx_rx_defrag_end_read_505 rx_rx_defrag_end_read 3 505 NULL
++smp_send_cmd_512 smp_send_cmd 3 512 NULL
+ocfs2_validate_meta_ecc_bhs_527 ocfs2_validate_meta_ecc_bhs 0 527 NULL
+zlib_deflate_workspacesize_537 zlib_deflate_workspacesize 0-1-2 537 NULL
+iwl_dbgfs_wowlan_sram_read_540 iwl_dbgfs_wowlan_sram_read 3 540 NULL
@@ -118887,7 +118346,6 @@ index 0000000..3d3508d
+snd_aw2_saa7146_get_hw_ptr_playback_558 snd_aw2_saa7146_get_hw_ptr_playback 0 558 NULL
+start_isoc_chain_565 start_isoc_chain 2 565 NULL nohasharray
+dev_hard_header_565 dev_hard_header 0 565 &start_isoc_chain_565
-+ocfs2_refcounted_xattr_delete_need_584 ocfs2_refcounted_xattr_delete_need 0 584 NULL
+smk_write_load_self2_591 smk_write_load_self2 3 591 NULL
+btrfs_stack_file_extent_offset_607 btrfs_stack_file_extent_offset 0 607 NULL
+ni_gpct_device_construct_610 ni_gpct_device_construct 5 610 NULL
@@ -118898,9 +118356,9 @@ index 0000000..3d3508d
+cfs_hash_bkt_size_643 cfs_hash_bkt_size 0 643 NULL
+unlink_queued_645 unlink_queued 4 645 NULL
+dtim_interval_read_654 dtim_interval_read 3 654 NULL
++nvif_notify_new_671 nvif_notify_new 6 671 NULL
+mem_rx_free_mem_blks_read_675 mem_rx_free_mem_blks_read 3 675 NULL
-+persistent_ram_vmap_709 persistent_ram_vmap 1-2 709 NULL
-+xfs_bmap_eof_728 xfs_bmap_eof 0 728 NULL
++persistent_ram_vmap_709 persistent_ram_vmap 2-1 709 NULL
+sctp_setsockopt_peer_addr_params_734 sctp_setsockopt_peer_addr_params 3 734 NULL
+dvb_video_write_754 dvb_video_write 3 754 NULL
+cfs_trace_allocate_string_buffer_781 cfs_trace_allocate_string_buffer 2 781 NULL
@@ -118908,15 +118366,14 @@ index 0000000..3d3508d
+if_writecmd_815 if_writecmd 2 815 NULL
+aac_change_queue_depth_825 aac_change_queue_depth 2 825 NULL
+error_state_read_859 error_state_read 6 859 NULL
++lustre_init_msg_v2_864 lustre_init_msg_v2 2 864 NULL
+o2net_send_message_vec_879 o2net_send_message_vec 4 879 NULL nohasharray
+iwl_dbgfs_fh_reg_read_879 iwl_dbgfs_fh_reg_read 3 879 &o2net_send_message_vec_879
+snd_pcm_action_single_905 snd_pcm_action_single 0 905 NULL
+carl9170_cmd_buf_950 carl9170_cmd_buf 3 950 NULL
+__nodes_weight_956 __nodes_weight 2-0 956 NULL
+bnx2x_fill_fw_str_968 bnx2x_fill_fw_str 3 968 NULL
-+mnt_want_write_975 mnt_want_write 0 975 NULL
+usnic_ib_qp_grp_dump_hdr_989 usnic_ib_qp_grp_dump_hdr 2 989 NULL
-+memcmp_990 memcmp 0 990 NULL
+readreg_1017 readreg 0-1 1017 NULL
+smk_write_cipso2_1021 smk_write_cipso2 3 1021 NULL
+gigaset_initdriver_1060 gigaset_initdriver 2 1060 NULL
@@ -118925,6 +118382,7 @@ index 0000000..3d3508d
+_scsih_adjust_queue_depth_1083 _scsih_adjust_queue_depth 2 1083 NULL
+llcp_sock_sendmsg_1092 llcp_sock_sendmsg 4 1092 NULL
+nfs4_init_nonuniform_client_string_1097 nfs4_init_nonuniform_client_string 3 1097 NULL
++__arch_hweight8_1105 __arch_hweight8 0 1105 NULL
+utf8s_to_utf16s_1115 utf8s_to_utf16s 0 1115 NULL
+cfg80211_report_obss_beacon_1133 cfg80211_report_obss_beacon 3 1133 NULL
+i2400m_rx_ctl_1157 i2400m_rx_ctl 4 1157 NULL
@@ -118935,27 +118393,27 @@ index 0000000..3d3508d
+dgrp_dpa_read_1204 dgrp_dpa_read 3 1204 NULL
+i2cdev_read_1206 i2cdev_read 3 1206 NULL
+lov_ost_pool_init_1215 lov_ost_pool_init 2 1215 NULL
-+fsync_buffers_list_1219 fsync_buffers_list 0 1219 NULL
+kernfs_file_direct_read_1238 kernfs_file_direct_read 3 1238 NULL
+acpi_battery_write_alarm_1240 acpi_battery_write_alarm 3 1240 NULL
++drm_primary_helper_create_plane_1262 drm_primary_helper_create_plane 3 1262 NULL
+ocfs2_extend_file_1266 ocfs2_extend_file 3 1266 NULL
+qla4xxx_change_queue_depth_1268 qla4xxx_change_queue_depth 2 1268 NULL
+ioctl_private_iw_point_1273 ioctl_private_iw_point 7 1273 NULL
+SyS_flistxattr_1287 SyS_flistxattr 3 1287 NULL
+tx_frag_in_process_called_read_1290 tx_frag_in_process_called_read 3 1290 NULL
+posix_acl_xattr_set_1301 posix_acl_xattr_set 4 1301 NULL
-+tcf_hash_create_1305 tcf_hash_create 4 1305 NULL
+ffs_1322 ffs 0 1322 NULL
+qlcnic_pci_sriov_configure_1327 qlcnic_pci_sriov_configure 2 1327 NULL
+btrfs_submit_compressed_write_1347 btrfs_submit_compressed_write 5 1347 NULL
++bond_verify_device_path_1352 bond_verify_device_path 3 1352 NULL
+snd_pcm_lib_write1_1358 snd_pcm_lib_write1 0-3 1358 NULL
+ipx_sendmsg_1362 ipx_sendmsg 4 1362 NULL
+fw_stats_raw_read_1369 fw_stats_raw_read 3 1369 NULL
+ocfs2_prepare_inode_for_write_1372 ocfs2_prepare_inode_for_write 3 1372 NULL
++xpcs_reg_addr_read_1381 xpcs_reg_addr_read 3 1381 NULL
+sctp_setsockopt_initmsg_1383 sctp_setsockopt_initmsg 3 1383 NULL
+do_msgsnd_1387 do_msgsnd 4 1387 NULL
+SYSC_io_getevents_1392 SYSC_io_getevents 3 1392 NULL
-+file_read_actor_1401 file_read_actor 4-0 1401 NULL
+cfs_trace_copyout_string_1416 cfs_trace_copyout_string 2 1416 NULL
+init_rs_internal_1436 init_rs_internal 1 1436 NULL
+stack_max_size_read_1445 stack_max_size_read 3 1445 NULL
@@ -118977,6 +118435,7 @@ index 0000000..3d3508d
+mei_cl_recv_1665 mei_cl_recv 3 1665 NULL
+rmap_add_1677 rmap_add 3 1677 NULL
+configfs_read_file_1683 configfs_read_file 3 1683 NULL
++iwl_dbgfs_d0i3_refs_read_1705 iwl_dbgfs_d0i3_refs_read 3 1705 NULL
+pdu_write_u_1710 pdu_write_u 3 1710 NULL
+coda_psdev_write_1711 coda_psdev_write 3 1711 NULL
+btrfs_dir_data_len_1714 btrfs_dir_data_len 0 1714 NULL
@@ -118993,17 +118452,18 @@ index 0000000..3d3508d
+SyS_add_key_1900 SyS_add_key 4 1900 NULL
+uhid_char_read_1920 uhid_char_read 3 1920 NULL
+tx_tx_retry_data_read_1926 tx_tx_retry_data_read 3 1926 NULL
++azx_get_position_1927 azx_get_position 0 1927 NULL
+bdev_erase_1933 bdev_erase 3 1933 NULL
+ext3_fiemap_1936 ext3_fiemap 4 1936 NULL
-+cyttsp_probe_1940 cyttsp_probe 4 1940 NULL
++cyttsp_probe_1940 cyttsp_probe 4 1940 NULL nohasharray
++nvif_object_sclass_1940 nvif_object_sclass 3 1940 &cyttsp_probe_1940
+ieee80211_if_fmt_dot11MeshConfirmTimeout_1945 ieee80211_if_fmt_dot11MeshConfirmTimeout 3 1945 NULL
-+update_qd_1955 update_qd 0 1955 NULL
+ivtv_v4l2_read_1964 ivtv_v4l2_read 3 1964 NULL
++qla2xxx_get_vpd_field_1965 qla2xxx_get_vpd_field 4 1965 NULL
+sel_read_avc_hash_stats_1984 sel_read_avc_hash_stats 3 1984 NULL
+gpio_power_write_1991 gpio_power_write 3 1991 NULL
+__alloc_bootmem_node_1992 __alloc_bootmem_node 2 1992 NULL
+rx_rx_defrag_read_2010 rx_rx_defrag_read 3 2010 NULL
-+xfs_mru_cache_insert_2013 xfs_mru_cache_insert 0 2013 NULL
+ocfs2_global_qinit_alloc_2018 ocfs2_global_qinit_alloc 0 2018 NULL
+write_flush_pipefs_2021 write_flush_pipefs 3 2021 NULL
+BcmCopySection_2035 BcmCopySection 5 2035 NULL
@@ -119012,6 +118472,7 @@ index 0000000..3d3508d
+__generic_copy_from_user_intel_2073 __generic_copy_from_user_intel 0-3 2073 NULL
+diva_set_driver_dbg_mask_2077 diva_set_driver_dbg_mask 0 2077 NULL
+iwl_dbgfs_current_sleep_command_read_2081 iwl_dbgfs_current_sleep_command_read 3 2081 NULL
++xgmac_reg_value_read_2095 xgmac_reg_value_read 3 2095 NULL
+idetape_chrdev_read_2097 idetape_chrdev_read 3 2097 NULL
+audit_expand_2098 audit_expand 0 2098 NULL
+__set_print_fmt_2106 __set_print_fmt 0 2106 NULL
@@ -119020,22 +118481,20 @@ index 0000000..3d3508d
+btrfs_file_extent_inline_len_2116 btrfs_file_extent_inline_len 0 2116 NULL
+enable_read_2117 enable_read 3 2117 NULL
+pcf50633_write_block_2124 pcf50633_write_block 2-3 2124 NULL
-+xfs_recover_inode_owner_change_2132 xfs_recover_inode_owner_change 0 2132 NULL
+check_load_and_stores_2143 check_load_and_stores 2 2143 NULL
+iov_iter_count_2152 iov_iter_count 0 2152 NULL
+__copy_to_user_ll_2157 __copy_to_user_ll 0-3 2157 NULL
+_ore_get_io_state_2166 _ore_get_io_state 3-4-5 2166 NULL
+bio_integrity_alloc_2194 bio_integrity_alloc 3 2194 NULL
+picolcd_debug_reset_write_2195 picolcd_debug_reset_write 3 2195 NULL
-+xfs_inobt_update_2206 xfs_inobt_update 0 2206 NULL
+u32_array_read_2219 u32_array_read 3 2219 NULL nohasharray
+mei_dbgfs_read_meclients_2219 mei_dbgfs_read_meclients 3 2219 &u32_array_read_2219
-+__ocfs2_journal_access_2241 __ocfs2_journal_access 0 2241 NULL
+ieee80211_if_read_dot11MeshHWMPRannInterval_2249 ieee80211_if_read_dot11MeshHWMPRannInterval 3 2249 NULL
+netlbl_secattr_catmap_walk_2255 netlbl_secattr_catmap_walk 0-2 2255 NULL
+sel_write_avc_cache_threshold_2256 sel_write_avc_cache_threshold 3 2256 NULL
+do_update_counters_2259 do_update_counters 4 2259 NULL
+ath6kl_wmi_bssinfo_event_rx_2275 ath6kl_wmi_bssinfo_event_rx 3 2275 NULL
++vpdma_alloc_desc_buf_2278 vpdma_alloc_desc_buf 2 2278 NULL
+debug_debug5_read_2291 debug_debug5_read 3 2291 NULL
+sr_read_cmd_2299 sr_read_cmd 5 2299 NULL
+kvm_clear_guest_page_2308 kvm_clear_guest_page 4 2308 NULL
@@ -119045,9 +118504,8 @@ index 0000000..3d3508d
+dice_hwdep_read_2326 dice_hwdep_read 3 2326 NULL
+__erst_read_to_erange_2341 __erst_read_to_erange 0 2341 NULL
+zr364xx_read_2354 zr364xx_read 3 2354 NULL
-+ntfs_file_aio_write_nolock_2360 ntfs_file_aio_write_nolock 0 2360 NULL
+viafb_iga2_odev_proc_write_2363 viafb_iga2_odev_proc_write 3 2363 NULL
-+xfs_buf_map_from_irec_2368 xfs_buf_map_from_irec 5-0 2368 NULL nohasharray
++xfs_buf_map_from_irec_2368 xfs_buf_map_from_irec 5 2368 NULL nohasharray
+rose_recvmsg_2368 rose_recvmsg 4 2368 &xfs_buf_map_from_irec_2368
+il_dbgfs_sensitivity_read_2370 il_dbgfs_sensitivity_read 3 2370 NULL
+rxpipe_rx_prep_beacon_drop_read_2403 rxpipe_rx_prep_beacon_drop_read 3 2403 NULL
@@ -119062,27 +118520,31 @@ index 0000000..3d3508d
+batadv_tvlv_container_list_size_2524 batadv_tvlv_container_list_size 0 2524 NULL
+smk_write_syslog_2529 smk_write_syslog 3 2529 NULL
+__ceph_setxattr_2532 __ceph_setxattr 4 2532 NULL
++sfw_create_rpc_2562 sfw_create_rpc 4 2562 NULL
+gspca_dev_probe_2570 gspca_dev_probe 4 2570 NULL
+pcm_sanity_check_2574 pcm_sanity_check 0 2574 NULL
+mdc_max_rpcs_in_flight_seq_write_2594 mdc_max_rpcs_in_flight_seq_write 3 2594 NULL
+slot_bytes_2609 slot_bytes 0 2609 NULL
+smk_write_logging_2618 smk_write_logging 3 2618 NULL
+switch_status_2629 switch_status 5 2629 NULL
++_proc_do_string_2632 _proc_do_string 2 2632 NULL
+tcp_xmit_size_goal_2661 tcp_xmit_size_goal 2 2661 NULL
+osc_build_ppga_2670 osc_build_ppga 2 2670 NULL
+ffs_ep0_read_2672 ffs_ep0_read 3 2672 NULL
+oti6858_write_2692 oti6858_write 4 2692 NULL
++copy_to_iter_iovec_2697 copy_to_iter_iovec 2 2697 NULL
+nfc_llcp_send_ui_frame_2702 nfc_llcp_send_ui_frame 5 2702 NULL
+memcpy_fromiovecend_2707 memcpy_fromiovecend 3-4 2707 NULL
+lprocfs_stats_counter_size_2708 lprocfs_stats_counter_size 0 2708 NULL
-+gfs2_glock_nq_num_2747 gfs2_glock_nq_num 0 2747 NULL
+xfs_readdir_2767 xfs_readdir 3 2767 NULL
++fsl_edma_alloc_desc_2769 fsl_edma_alloc_desc 2 2769 NULL
+mon_bin_ioctl_2771 mon_bin_ioctl 3 2771 NULL
+set_msr_hyperv_pw_2785 set_msr_hyperv_pw 3 2785 NULL
+device_add_attrs_2789 device_add_attrs 0 2789 NULL
+iwl_dbgfs_clear_ucode_statistics_write_2804 iwl_dbgfs_clear_ucode_statistics_write 3 2804 NULL
+sel_read_enforce_2828 sel_read_enforce 3 2828 NULL
+vb2_dc_get_userptr_2829 vb2_dc_get_userptr 2-3 2829 NULL
++sock_create_2838 sock_create 0 2838 NULL
+wait_for_avail_2847 wait_for_avail 0 2847 NULL
+sfq_alloc_2861 sfq_alloc 1 2861 NULL
+irnet_ctrl_read_2863 irnet_ctrl_read 4 2863 NULL
@@ -119099,7 +118561,6 @@ index 0000000..3d3508d
+bio_setup_sector_2970 bio_setup_sector 3 2970 NULL
+do_strnlen_user_2976 do_strnlen_user 0-2 2976 NULL
+p9_nr_pages_2992 p9_nr_pages 0-2 2992 NULL
-+_xfs_filestream_pick_ag_3007 _xfs_filestream_pick_ag 0 3007 NULL
+lov_stripetype_seq_write_3013 lov_stripetype_seq_write 3 3013 NULL
+do_dmabuf_dirty_sou_3017 do_dmabuf_dirty_sou 7 3017 NULL
+depth_write_3021 depth_write 3 3021 NULL
@@ -119113,21 +118574,25 @@ index 0000000..3d3508d
+il3945_ucode_rx_stats_read_3048 il3945_ucode_rx_stats_read 3 3048 NULL
+qp_alloc_ppn_set_3068 qp_alloc_ppn_set 2-4 3068 NULL
+__blk_end_bidi_request_3070 __blk_end_bidi_request 3-4 3070 NULL
-+dac960_user_command_proc_write_3071 dac960_user_command_proc_write 3 3071 NULL
++hfsplus_asc2uni_3071 hfsplus_asc2uni 0 3071 NULL nohasharray
++dac960_user_command_proc_write_3071 dac960_user_command_proc_write 3 3071 &hfsplus_asc2uni_3071
+read_file_antenna_diversity_3077 read_file_antenna_diversity 3 3077 NULL
++bio_integrity_intervals_3094 bio_integrity_intervals 0-2 3094 NULL
+ttusb2_msg_3100 ttusb2_msg 4 3100 NULL
+rb_alloc_3102 rb_alloc 1 3102 NULL
++ufshcd_get_rsp_upiu_result_3114 ufshcd_get_rsp_upiu_result 0 3114 NULL
+simple_write_to_buffer_3122 simple_write_to_buffer 5-2 3122 NULL
+print_time_3132 print_time 0 3132 NULL
+fill_write_buffer_3142 fill_write_buffer 3 3142 NULL
+CIFSSMBSetPosixACL_3154 CIFSSMBSetPosixACL 5 3154 NULL
-+compat_sys_migrate_pages_3157 compat_sys_migrate_pages 2 3157 NULL
-+gfs2_rindex_update_3165 gfs2_rindex_update 0 3165 NULL
+uv_num_possible_blades_3177 uv_num_possible_blades 0 3177 NULL
-+uvc_video_stats_dump_3181 uvc_video_stats_dump 3 3181 NULL
++pkcs7_sig_note_signature_3178 pkcs7_sig_note_signature 5 3178 NULL
++uinput_ioctl_handler_3181 uinput_ioctl_handler 2 3181 NULL nohasharray
++uvc_video_stats_dump_3181 uvc_video_stats_dump 3 3181 &uinput_ioctl_handler_3181
+compat_do_ip6t_set_ctl_3184 compat_do_ip6t_set_ctl 4 3184 NULL
+mempool_create_node_3191 mempool_create_node 1 3191 NULL
+alloc_context_3194 alloc_context 1 3194 NULL
++dma_init_coherent_memory_3197 dma_init_coherent_memory 3 3197 NULL
+shmem_pread_slow_3198 shmem_pread_slow 3-2 3198 NULL
+codec_reg_write_file_3204 codec_reg_write_file 3 3204 NULL
+SyS_sendto_3219 SyS_sendto 6 3219 NULL
@@ -119138,27 +118603,24 @@ index 0000000..3d3508d
+ext3_xattr_find_entry_3237 ext3_xattr_find_entry 0 3237 NULL
+key_key_read_3241 key_key_read 3 3241 NULL
+__ilog2_u64_3284 __ilog2_u64 0 3284 NULL
-+__set_extent_bit_3305 __set_extent_bit 0 3305 NULL
++ieee80211_if_write_beacon_loss_3296 ieee80211_if_write_beacon_loss 3 3296 NULL
++cgroup_name_3300 cgroup_name 3 3300 NULL
+__iovec_copy_from_user_inatomic_3314 __iovec_copy_from_user_inatomic 0-4-3 3314 NULL
+_iwl_dbgfs_d3_sram_write_3315 _iwl_dbgfs_d3_sram_write 3 3315 NULL
+dbDiscardAG_3322 dbDiscardAG 3 3322 NULL
-+compat_sys_setsockopt_3326 compat_sys_setsockopt 5 3326 NULL
+read_from_oldmem_3337 read_from_oldmem 2 3337 NULL
+sysfs_create_group_3339 sysfs_create_group 0 3339 NULL
+tty_port_register_device_attr_3341 tty_port_register_device_attr 3 3341 NULL
+il_dbgfs_interrupt_read_3351 il_dbgfs_interrupt_read 3 3351 NULL
+gsm_control_rls_3353 gsm_control_rls 3 3353 NULL
+scnprintf_3360 scnprintf 0-2 3360 NULL
-+ReadByteAmd7930_3365 ReadByteAmd7930 0 3365 NULL
+sr_read_3366 sr_read 3 3366 NULL
+mtdchar_writeoob_3393 mtdchar_writeoob 4 3393 NULL
-+send_stream_3397 send_stream 4 3397 NULL
+isdn_readbchan_3401 isdn_readbchan 0-5 3401 NULL
+mei_io_cb_alloc_resp_buf_3414 mei_io_cb_alloc_resp_buf 2 3414 NULL
+pci_add_cap_save_buffer_3426 pci_add_cap_save_buffer 3 3426 NULL
+crystalhd_create_dio_pool_3427 crystalhd_create_dio_pool 2 3427 NULL
+SyS_msgsnd_3436 SyS_msgsnd 3 3436 NULL
-+pipe_iov_copy_to_user_3447 pipe_iov_copy_to_user 3 3447 NULL
+softsynth_write_3455 softsynth_write 3 3455 NULL
+snd_pcm_lib_readv_transfer_3464 snd_pcm_lib_readv_transfer 5-4-2 3464 NULL
+security_context_to_sid_default_3492 security_context_to_sid_default 2 3492 NULL
@@ -119166,6 +118628,7 @@ index 0000000..3d3508d
+mem_tx_free_mem_blks_read_3521 mem_tx_free_mem_blks_read 3 3521 NULL
+SyS_semtimedop_3532 SyS_semtimedop 3 3532 NULL
+SyS_readv_3539 SyS_readv 3 3539 NULL
++nouveau_fuse_create__3546 nouveau_fuse_create_ 4 3546 NULL
+btrfs_dir_name_len_3549 btrfs_dir_name_len 0 3549 NULL
+alloc_smp_resp_3566 alloc_smp_resp 1 3566 NULL
+evtchn_read_3569 evtchn_read 3 3569 NULL
@@ -119176,20 +118639,20 @@ index 0000000..3d3508d
+edac_mc_alloc_3611 edac_mc_alloc 4 3611 NULL
+tx_tx_starts_read_3617 tx_tx_starts_read 3 3617 NULL
+aligned_kmalloc_3628 aligned_kmalloc 1 3628 NULL
++fm10k_alloc_q_vector_3638 fm10k_alloc_q_vector 4-6 3638 NULL
+ath6kl_disconnect_timeout_read_3650 ath6kl_disconnect_timeout_read 3 3650 NULL
+i915_compat_ioctl_3656 i915_compat_ioctl 2 3656 NULL
-+xfs_attr3_leaf_list_int_3661 xfs_attr3_leaf_list_int 0 3661 NULL
+_iwl_dbgfs_tx_flush_write_3675 _iwl_dbgfs_tx_flush_write 3 3675 NULL
+snd_m3_assp_read_3703 snd_m3_assp_read 0 3703 NULL
+ci_ll_write_3740 ci_ll_write 4 3740 NULL
++msm_otg_mode_write_3788 msm_otg_mode_write 3 3788 NULL
+sctp_setsockopt_auth_key_3793 sctp_setsockopt_auth_key 3 3793 NULL
+ncp_file_write_3813 ncp_file_write 3 3813 NULL
+llc_ui_recvmsg_3826 llc_ui_recvmsg 4 3826 NULL
-+hfsplus_direct_IO_3835 hfsplus_direct_IO 4 3835 NULL
++ceph_do_getattr_3838 ceph_do_getattr 0 3838 NULL
+create_one_cdev_3852 create_one_cdev 2 3852 NULL
+smk_read_onlycap_3855 smk_read_onlycap 3 3855 NULL
+get_fd_set_3866 get_fd_set 1 3866 NULL
-+apei_res_sub_3873 apei_res_sub 0 3873 NULL
+garp_attr_create_3883 garp_attr_create 3 3883 NULL
+efivarfs_file_read_3893 efivarfs_file_read 3 3893 NULL
+nvram_write_3894 nvram_write 3 3894 NULL
@@ -119200,17 +118663,14 @@ index 0000000..3d3508d
+hdlc_irq_one_3944 hdlc_irq_one 2 3944 NULL
+brcmf_debugfs_fws_stats_read_3947 brcmf_debugfs_fws_stats_read 3 3947 NULL
+mite_bytes_written_to_memory_lb_3987 mite_bytes_written_to_memory_lb 0 3987 NULL
++copy_from_user_atomic_iovec_3990 copy_from_user_atomic_iovec 0-4 3990 NULL
+do_add_counters_3992 do_add_counters 3 3992 NULL
-+xfs_bmbt_lookup_eq_3997 xfs_bmbt_lookup_eq 0 3997 NULL
-+obd_alloc_memmd_4002 obd_alloc_memmd 0 4002 NULL
+userspace_status_4004 userspace_status 4 4004 NULL
+xfs_check_block_4005 xfs_check_block 4 4005 NULL nohasharray
+mei_write_4005 mei_write 3 4005 &xfs_check_block_4005
-+gfs2_dir_get_existing_buffer_4007 gfs2_dir_get_existing_buffer 0 4007 NULL
+snd_hdsp_capture_copy_4011 snd_hdsp_capture_copy 5 4011 NULL
+blk_end_request_4024 blk_end_request 3 4024 NULL
+ext4_xattr_find_entry_4025 ext4_xattr_find_entry 0 4025 NULL
-+xfs_free_ag_extent_4036 xfs_free_ag_extent 0 4036 NULL
+mtip_hw_read_registers_4037 mtip_hw_read_registers 3 4037 NULL
+read_file_queues_4078 read_file_queues 3 4078 NULL
+fbcon_do_set_font_4079 fbcon_do_set_font 2-3 4079 NULL
@@ -119221,16 +118681,18 @@ index 0000000..3d3508d
+get_alua_req_4166 get_alua_req 3 4166 NULL
+blk_dropped_read_4168 blk_dropped_read 3 4168 NULL
+read_file_bool_4180 read_file_bool 3 4180 NULL
-+ocfs2_find_cpos_for_right_leaf_4194 ocfs2_find_cpos_for_right_leaf 0 4194 NULL
++lstcon_test_add_4190 lstcon_test_add 10 4190 NULL
+vring_new_virtqueue_4199 vring_new_virtqueue 2 4199 NULL
+f1x_determine_channel_4202 f1x_determine_channel 2 4202 NULL
+_osd_req_list_objects_4204 _osd_req_list_objects 6 4204 NULL
+__snd_gf1_read_addr_4210 __snd_gf1_read_addr 0 4210 NULL
+ath6kl_force_roam_write_4282 ath6kl_force_roam_write 3 4282 NULL
+goldfish_audio_write_4284 goldfish_audio_write 3 4284 NULL
++get_connectors_for_crtc_4291 get_connectors_for_crtc 0 4291 NULL
+__usbnet_read_cmd_4299 __usbnet_read_cmd 7 4299 NULL
+dvb_ringbuffer_pkt_read_user_4303 dvb_ringbuffer_pkt_read_user 2-3-5 4303 NULL
-+count_strings_4315 count_strings 0 4315 NULL
++count_strings_4315 count_strings 0 4315 NULL nohasharray
++cfg80211_inform_bss_4315 cfg80211_inform_bss 9 4315 &count_strings_4315
+nouveau_fifo_create__4327 nouveau_fifo_create_ 5-6 4327 NULL
+snd_rawmidi_kernel_read_4328 snd_rawmidi_kernel_read 3 4328 NULL
+ima_eventdigest_init_common_4338 ima_eventdigest_init_common 2 4338 NULL
@@ -119246,15 +118708,15 @@ index 0000000..3d3508d
+snd_seq_expand_var_event_4481 snd_seq_expand_var_event 5-0 4481 NULL
+vmbus_establish_gpadl_4495 vmbus_establish_gpadl 3 4495 NULL
+set_link_security_4502 set_link_security 4 4502 NULL
-+xfs_btree_kill_root_4526 xfs_btree_kill_root 0 4526 NULL
+ll_max_readahead_per_file_mb_seq_write_4531 ll_max_readahead_per_file_mb_seq_write 3 4531 NULL
+tty_register_device_4544 tty_register_device 2 4544 NULL
++fsl_edma_prep_slave_sg_4555 fsl_edma_prep_slave_sg 3 4555 NULL
+btrfs_file_extent_inline_item_len_4575 btrfs_file_extent_inline_item_len 0 4575 NULL
+xfs_buf_get_maps_4581 xfs_buf_get_maps 2 4581 NULL
+bch_alloc_4593 bch_alloc 1 4593 NULL
-+ocfs2_refcount_lock_4595 ocfs2_refcount_lock 0 4595 NULL
+ll_rw_extents_stats_seq_write_4633 ll_rw_extents_stats_seq_write 3 4633 NULL
+iwl_dbgfs_tx_queue_read_4635 iwl_dbgfs_tx_queue_read 3 4635 NULL
++nve0_gpio_intr_mask_4665 nve0_gpio_intr_mask 4-3 4665 NULL
+skb_add_data_nocache_4682 skb_add_data_nocache 4 4682 NULL
+cx18_read_pos_4683 cx18_read_pos 3 4683 NULL
+short_retry_limit_read_4687 short_retry_limit_read 3 4687 NULL
@@ -119263,13 +118725,15 @@ index 0000000..3d3508d
+cxgbi_alloc_big_mem_4707 cxgbi_alloc_big_mem 1 4707 NULL
+ati_create_gatt_pages_4722 ati_create_gatt_pages 1 4722 NULL nohasharray
+show_header_4722 show_header 3 4722 &ati_create_gatt_pages_4722
-+bitmap_startwrite_4736 bitmap_startwrite 2 4736 NULL nohasharray
-+ll_rw_offset_stats_seq_write_4736 ll_rw_offset_stats_seq_write 3 4736 &bitmap_startwrite_4736
++ll_rw_offset_stats_seq_write_4736 ll_rw_offset_stats_seq_write 3 4736 NULL nohasharray
++bitmap_startwrite_4736 bitmap_startwrite 2 4736 &ll_rw_offset_stats_seq_write_4736
+lu_buf_alloc_4753 lu_buf_alloc 2 4753 NULL
+pwr_rcvd_bcns_cnt_read_4774 pwr_rcvd_bcns_cnt_read 3 4774 NULL
+create_subvol_4791 create_subvol 4 4791 NULL
+ncp__vol2io_4804 ncp__vol2io 5 4804 NULL
++C_SYSC_setsockopt_4806 C_SYSC_setsockopt 5 4806 NULL
+repair_io_failure_4815 repair_io_failure 4-3 4815 NULL
++scsi_end_request_4839 scsi_end_request 3-4 4839 NULL
+comedi_buf_write_free_4847 comedi_buf_write_free 2 4847 NULL
+gigaset_if_receive_4861 gigaset_if_receive 3 4861 NULL
+key_tx_spec_read_4862 key_tx_spec_read 3 4862 NULL
@@ -119277,42 +118741,46 @@ index 0000000..3d3508d
+hid_register_field_4874 hid_register_field 2-3 4874 NULL
+vga_arb_read_4886 vga_arb_read 3 4886 NULL
+ieee80211_if_fmt_ave_beacon_4941 ieee80211_if_fmt_ave_beacon 3 4941 NULL
-+ocfs2_should_refresh_lock_res_4958 ocfs2_should_refresh_lock_res 0 4958 NULL
+compat_rawv6_setsockopt_4967 compat_rawv6_setsockopt 5 4967 NULL
+ath10k_read_chip_id_4969 ath10k_read_chip_id 3 4969 NULL
+skb_network_header_len_4971 skb_network_header_len 0 4971 NULL
+ieee80211_if_fmt_dot11MeshHWMPconfirmationInterval_4976 ieee80211_if_fmt_dot11MeshHWMPconfirmationInterval 3 4976 NULL
+compat_SyS_ipc_5000 compat_SyS_ipc 3 5000 NULL
+do_mincore_5018 do_mincore 0-2-1 5018 NULL
-+btrfs_punch_hole_5041 btrfs_punch_hole 2 5041 NULL
+cfg80211_rx_mgmt_5056 cfg80211_rx_mgmt 5 5056 NULL
+ocfs2_check_range_for_holes_5066 ocfs2_check_range_for_holes 3-2 5066 NULL
+snd_mixart_BA1_read_5082 snd_mixart_BA1_read 5 5082 NULL
+snd_emu10k1_ptr20_read_5087 snd_emu10k1_ptr20_read 0 5087 NULL
-+kfifo_copy_from_user_5091 kfifo_copy_from_user 3-4-0 5091 NULL nohasharray
-+get_random_bytes_5091 get_random_bytes 2 5091 &kfifo_copy_from_user_5091 nohasharray
-+blk_rq_sectors_5091 blk_rq_sectors 0 5091 &get_random_bytes_5091
++get_random_bytes_5091 get_random_bytes 2 5091 NULL nohasharray
++kfifo_copy_from_user_5091 kfifo_copy_from_user 3-4-0 5091 &get_random_bytes_5091 nohasharray
++blk_rq_sectors_5091 blk_rq_sectors 0 5091 &kfifo_copy_from_user_5091
+sound_write_5102 sound_write 3 5102 NULL
+i40e_dbg_netdev_ops_write_5117 i40e_dbg_netdev_ops_write 3 5117 NULL
+qib_7220_handle_hwerrors_5142 qib_7220_handle_hwerrors 3 5142 NULL
++bucket_table_alloc_5149 bucket_table_alloc 1 5149 NULL
+__uwb_addr_print_5161 __uwb_addr_print 2 5161 NULL
+iwl_dbgfs_status_read_5171 iwl_dbgfs_status_read 3 5171 NULL
+acpi_pcc_get_sqty_5176 acpi_pcc_get_sqty 0 5176 NULL
++trf7970a_read_cont_5179 trf7970a_read_cont 4 5179 NULL
+ppp_cp_parse_cr_5214 ppp_cp_parse_cr 4 5214 NULL
+dwc2_hcd_urb_alloc_5217 dwc2_hcd_urb_alloc 2 5217 NULL
+ath6kl_debug_roam_tbl_event_5224 ath6kl_debug_roam_tbl_event 3 5224 NULL
++ipv4_tun_to_nlattr_5261 ipv4_tun_to_nlattr 4 5261 NULL
++dvb_ringbuffer_write_user_5270 dvb_ringbuffer_write_user 3 5270 NULL
++xgmac_reg_addr_read_5278 xgmac_reg_addr_read 3 5278 NULL
+usb_descriptor_fillbuf_5302 usb_descriptor_fillbuf 0 5302 NULL
+r592_write_fifo_pio_5315 r592_write_fifo_pio 3 5315 NULL
+sbc_get_write_same_sectors_5317 sbc_get_write_same_sectors 0 5317 NULL
+pwr_elp_enter_read_5324 pwr_elp_enter_read 3 5324 NULL
++uinput_ioctl_5342 uinput_ioctl 2 5342 NULL
+cq_free_res_5355 cq_free_res 5 5355 NULL
+ps_pspoll_utilization_read_5361 ps_pspoll_utilization_read 3 5361 NULL
+cciss_allocate_sg_chain_blocks_5368 cciss_allocate_sg_chain_blocks 3-2 5368 NULL
-+xfs_free_extent_5411 xfs_free_extent 0 5411 NULL
+xfs_efd_init_5463 xfs_efd_init 3 5463 NULL
+ll_xattr_cache_refill_5468 ll_xattr_cache_refill 0 5468 NULL
+kernfs_fop_write_5471 kernfs_fop_write 3 5471 NULL
+xfs_efi_init_5476 xfs_efi_init 2 5476 NULL
++pci_enable_msix_exact_5482 pci_enable_msix_exact 3 5482 NULL
+cifs_security_flags_proc_write_5484 cifs_security_flags_proc_write 3 5484 NULL
+tty_write_5494 tty_write 3 5494 NULL
+tomoyo_update_domain_5498 tomoyo_update_domain 2 5498 NULL nohasharray
@@ -119322,29 +118790,28 @@ index 0000000..3d3508d
+get_entry_msg_len_5552 get_entry_msg_len 0 5552 NULL
+le_readq_5557 le_readq 0 5557 NULL
+inw_5558 inw 0 5558 NULL
-+gfs2_extent_map_5561 gfs2_extent_map 0 5561 NULL
+bioset_create_5580 bioset_create 1 5580 NULL
+oz_ep_alloc_5587 oz_ep_alloc 1 5587 NULL
-+__remove_suid_5618 __remove_suid 0 5618 NULL
-+gfs2_unstuffer_page_5620 gfs2_unstuffer_page 0 5620 NULL
+SYSC_fsetxattr_5639 SYSC_fsetxattr 4 5639 NULL
+ext4_xattr_get_5661 ext4_xattr_get 0 5661 NULL
+posix_clock_register_5662 posix_clock_register 2 5662 NULL
+get_arg_5694 get_arg 3 5694 NULL
+subbuf_read_actor_5708 subbuf_read_actor 3 5708 NULL
+vmw_kms_readback_5727 vmw_kms_readback 6 5727 NULL
-+rts51x_transfer_data_partial_5735 rts51x_transfer_data_partial 6 5735 NULL
+sctp_setsockopt_autoclose_5775 sctp_setsockopt_autoclose 3 5775 NULL
+__vxge_hw_blockpool_malloc_5786 __vxge_hw_blockpool_malloc 2 5786 NULL
+nvme_trans_bdev_char_page_5797 nvme_trans_bdev_char_page 3 5797 NULL
-+skb_copy_datagram_iovec_5806 skb_copy_datagram_iovec 2-4 5806 NULL
++skb_copy_datagram_iovec_5806 skb_copy_datagram_iovec 2-4 5806 NULL nohasharray
++ath10k_core_create_5806 ath10k_core_create 1 5806 &skb_copy_datagram_iovec_5806
+nv50_disp_pioc_create__5812 nv50_disp_pioc_create_ 5 5812 NULL
+ceph_x_encrypt_buflen_5829 ceph_x_encrypt_buflen 0-1 5829 NULL
+ceph_msg_new_5846 ceph_msg_new 2 5846 NULL
+setup_req_5848 setup_req 3 5848 NULL
+ria_page_count_5849 ria_page_count 0 5849 NULL
+rx_filter_max_arp_queue_dep_read_5851 rx_filter_max_arp_queue_dep_read 3 5851 NULL
-+config_buf_5862 config_buf 0 5862 NULL
++uinput_compat_ioctl_5861 uinput_compat_ioctl 2 5861 NULL
++config_buf_5862 config_buf 0 5862 NULL nohasharray
++ufshcd_check_query_response_5862 ufshcd_check_query_response 0 5862 &config_buf_5862
+lprocfs_fid_width_seq_write_5889 lprocfs_fid_width_seq_write 3 5889 NULL
+port_show_regs_5904 port_show_regs 3 5904 NULL
+rbd_segment_length_5907 rbd_segment_length 0-3-2 5907 NULL
@@ -119356,11 +118823,12 @@ index 0000000..3d3508d
+__apu_get_register_5967 __apu_get_register 0 5967 NULL
+ieee80211_if_fmt_rc_rateidx_mask_5ghz_5971 ieee80211_if_fmt_rc_rateidx_mask_5ghz 3 5971 NULL
+SyS_semop_5980 SyS_semop 3 5980 NULL
++btrfs_item_offset_6019 btrfs_item_offset 0 6019 NULL
+alloc_msg_6072 alloc_msg 1 6072 NULL
+sctp_setsockopt_connectx_6073 sctp_setsockopt_connectx 3 6073 NULL
-+rts51x_ms_rw_multi_sector_6076 rts51x_ms_rw_multi_sector 3-4 6076 NULL
-+__mnt_want_write_6091 __mnt_want_write 0 6091 NULL
-+ipmi_addr_length_6110 ipmi_addr_length 0 6110 NULL
++_random_read_6098 _random_read 3 6098 NULL
++ipmi_addr_length_6110 ipmi_addr_length 0 6110 NULL nohasharray
++force_static_address_read_6110 force_static_address_read 3 6110 &ipmi_addr_length_6110
+dfs_global_file_write_6112 dfs_global_file_write 3 6112 NULL
+nouveau_parent_create__6131 nouveau_parent_create_ 7 6131 NULL
+ieee80211_if_fmt_beacon_timeout_6153 ieee80211_if_fmt_beacon_timeout 3 6153 NULL
@@ -119368,31 +118836,34 @@ index 0000000..3d3508d
+maybe_insert_hole_6167 maybe_insert_hole 3 6167 NULL
+wl1251_cmd_template_set_6172 wl1251_cmd_template_set 4 6172 NULL
+SyS_setgroups_6182 SyS_setgroups 1 6182 NULL
++snd_efw_command_get_phys_meters_6190 snd_efw_command_get_phys_meters 3 6190 NULL
+mxt_show_instance_6207 mxt_show_instance 2-0 6207 NULL
+v4l2_ctrl_new_std_menu_6221 v4l2_ctrl_new_std_menu 4 6221 NULL
+mqueue_read_file_6228 mqueue_read_file 3 6228 NULL
+f_hidg_read_6238 f_hidg_read 3 6238 NULL
+fbcon_prepare_logo_6246 fbcon_prepare_logo 5 6246 NULL
++of_gpio_count_6270 of_gpio_count 0 6270 NULL
+tx_tx_start_null_frame_read_6281 tx_tx_start_null_frame_read 3 6281 NULL
+snd_hda_override_conn_list_6282 snd_hda_override_conn_list 3-0 6282 NULL nohasharray
+xenbus_file_write_6282 xenbus_file_write 3 6282 &snd_hda_override_conn_list_6282
+posix_acl_fix_xattr_to_user_6283 posix_acl_fix_xattr_to_user 2 6283 NULL
+serial_port_in_6291 serial_port_in 0 6291 NULL
+qlcnic_sriov_alloc_bc_msg_6309 qlcnic_sriov_alloc_bc_msg 2 6309 NULL
-+hfa384x_inw_6329 hfa384x_inw 0 6329 NULL nohasharray
-+SyS_mincore_6329 SyS_mincore 2-1 6329 &hfa384x_inw_6329
++hfsplus_direct_IO_6313 hfsplus_direct_IO 4 6313 NULL
++SyS_mincore_6329 SyS_mincore 2-1 6329 NULL nohasharray
++hfa384x_inw_6329 hfa384x_inw 0 6329 &SyS_mincore_6329
+fuse_get_req_for_background_6337 fuse_get_req_for_background 2 6337 NULL
+ucs2_strnlen_6342 ucs2_strnlen 0 6342 NULL
+regcache_sync_block_raw_6350 regcache_sync_block_raw 5-4 6350 NULL
+mei_dbgfs_read_devstate_6352 mei_dbgfs_read_devstate 3 6352 NULL
-+_proc_do_string_6376 _proc_do_string 2 6376 NULL
-+osd_req_read_sg_kern_6378 osd_req_read_sg_kern 5 6378 NULL
-+gfs2_dir_read_stuffed_6380 gfs2_dir_read_stuffed 3 6380 NULL
-+xfs_bmap_extents_to_btree_6387 xfs_bmap_extents_to_btree 0 6387 NULL
++arch_gnttab_valloc_6372 arch_gnttab_valloc 2 6372 NULL
++osd_req_read_sg_kern_6378 osd_req_read_sg_kern 5 6378 NULL nohasharray
++sync_fence_alloc_6378 sync_fence_alloc 1 6378 &osd_req_read_sg_kern_6378
+posix_acl_fix_xattr_userns_6420 posix_acl_fix_xattr_userns 4 6420 NULL
+add_transaction_credits_6422 add_transaction_credits 2-3 6422 NULL
+ipr_change_queue_depth_6431 ipr_change_queue_depth 2 6431 NULL
+__alloc_bootmem_node_nopanic_6432 __alloc_bootmem_node_nopanic 2 6432 NULL
++C_SYSC_vmsplice_6470 C_SYSC_vmsplice 3 6470 NULL
+ieee80211_if_fmt_dot11MeshMaxRetries_6476 ieee80211_if_fmt_dot11MeshMaxRetries 3 6476 NULL
+qp_memcpy_from_queue_6479 qp_memcpy_from_queue 5-4 6479 NULL
+cipso_v4_map_lvl_hton_6490 cipso_v4_map_lvl_hton 0 6490 NULL
@@ -119403,7 +118874,6 @@ index 0000000..3d3508d
+dm_stats_create_6551 dm_stats_create 4-2-3 6551 NULL
+fb_alloc_cmap_6554 fb_alloc_cmap 2 6554 NULL
+SyS_semtimedop_6563 SyS_semtimedop 3 6563 NULL
-+xfs_iozero_6573 xfs_iozero 0 6573 NULL
+ecryptfs_filldir_6622 ecryptfs_filldir 3 6622 NULL
+xfs_do_div_6649 xfs_do_div 0-2 6649 NULL
+process_rcvd_data_6679 process_rcvd_data 3 6679 NULL
@@ -119412,8 +118882,10 @@ index 0000000..3d3508d
+bnad_debugfs_write_regrd_6706 bnad_debugfs_write_regrd 3 6706 NULL
+mpeg_read_6708 mpeg_read 3 6708 NULL
+ibmpex_query_sensor_count_6709 ibmpex_query_sensor_count 0 6709 NULL
++check_clk_sync_6717 check_clk_sync 2 6717 NULL
+video_proc_write_6724 video_proc_write 3 6724 NULL
+posix_acl_xattr_count_6725 posix_acl_xattr_count 0-1 6725 NULL
++inet_recv_error_6744 inet_recv_error 3 6744 NULL
+kobject_add_varg_6781 kobject_add_varg 0 6781 NULL
+iwl_dbgfs_channels_read_6784 iwl_dbgfs_channels_read 3 6784 NULL
+ieee80211_if_read_6785 ieee80211_if_read 3 6785 NULL
@@ -119421,13 +118893,14 @@ index 0000000..3d3508d
+hdlcdrv_register_6792 hdlcdrv_register 2 6792 NULL
+ll_xattr_cache_find_6798 ll_xattr_cache_find 0 6798 NULL
+tx_tx_done_data_read_6799 tx_tx_done_data_read 3 6799 NULL
++rounded_hashtable_size_6802 rounded_hashtable_size 0 6802 NULL
+lbs_rdrf_write_6826 lbs_rdrf_write 3 6826 NULL
+calc_pages_for_6838 calc_pages_for 0-1-2 6838 NULL
++blk_alloc_flush_queue_6839 blk_alloc_flush_queue 3 6839 NULL
+mon_bin_read_6841 mon_bin_read 3 6841 NULL
+snd_cs4281_BA0_read_6847 snd_cs4281_BA0_read 5 6847 NULL
-+xfs_rtany_summary_6851 xfs_rtany_summary 0 6851 NULL
+perf_output_sample_ustack_6868 perf_output_sample_ustack 2 6868 NULL
-+dio_complete_6879 dio_complete 0-2-3 6879 NULL
++dio_complete_6879 dio_complete 0-3-2 6879 NULL
+raw_seticmpfilter_6888 raw_seticmpfilter 3 6888 NULL nohasharray
+ieee80211_if_fmt_path_refresh_time_6888 ieee80211_if_fmt_path_refresh_time 3 6888 &raw_seticmpfilter_6888
+dlmfs_file_write_6892 dlmfs_file_write 3 6892 NULL
@@ -119435,18 +118908,17 @@ index 0000000..3d3508d
+spi_show_regs_6911 spi_show_regs 3 6911 &proc_sessionid_read_6911 nohasharray
+acm_alloc_minor_6911 acm_alloc_minor 0 6911 &spi_show_regs_6911
+__kfifo_dma_in_finish_r_6913 __kfifo_dma_in_finish_r 2-3 6913 NULL
-+lops_scan_elements_6916 lops_scan_elements 0 6916 NULL
+do_msgrcv_6921 do_msgrcv 3 6921 NULL
+cache_do_downcall_6926 cache_do_downcall 3 6926 NULL
+ipath_verbs_send_dma_6929 ipath_verbs_send_dma 6 6929 NULL
+qsfp_cks_6945 qsfp_cks 2-0 6945 NULL
+tg3_nvram_write_block_unbuffered_6955 tg3_nvram_write_block_unbuffered 3 6955 NULL
+pch_uart_hal_read_6961 pch_uart_hal_read 0 6961 NULL
-+rsa_extract_mpi_6973 rsa_extract_mpi 5 6973 NULL nohasharray
-+i40e_dbg_dump_write_6973 i40e_dbg_dump_write 3 6973 &rsa_extract_mpi_6973
++i40e_dbg_dump_write_6973 i40e_dbg_dump_write 3 6973 NULL nohasharray
++rsa_extract_mpi_6973 rsa_extract_mpi 5 6973 &i40e_dbg_dump_write_6973
++lustre_pack_reply_6982 lustre_pack_reply 2 6982 NULL
+request_key_async_6990 request_key_async 4 6990 NULL
+tpl_write_6998 tpl_write 3 6998 NULL
-+r871x_set_wpa_ie_7000 r871x_set_wpa_ie 3 7000 NULL
+cipso_v4_gentag_enum_7006 cipso_v4_gentag_enum 0 7006 NULL
+tracing_cpumask_read_7010 tracing_cpumask_read 3 7010 NULL
+ld_usb_write_7022 ld_usb_write 3 7022 NULL
@@ -119454,29 +118926,32 @@ index 0000000..3d3508d
+ceph_kvmalloc_7033 ceph_kvmalloc 1 7033 NULL
+ipath_get_base_info_7043 ipath_get_base_info 3 7043 NULL
+snd_pcm_oss_bytes_7051 snd_pcm_oss_bytes 2 7051 NULL
++nouveau_device_create__7063 nouveau_device_create_ 7 7063 NULL
+hci_sock_recvmsg_7072 hci_sock_recvmsg 4 7072 NULL
+event_enable_read_7074 event_enable_read 3 7074 NULL
-+beacon_interval_read_7091 beacon_interval_read 3 7091 NULL
++beacon_interval_read_7091 beacon_interval_read 3 7091 NULL nohasharray
++tipc_send_packet_7091 tipc_send_packet 4 7091 &beacon_interval_read_7091
+pipeline_enc_rx_stat_fifo_int_read_7107 pipeline_enc_rx_stat_fifo_int_read 3 7107 NULL
+osc_resend_count_seq_write_7120 osc_resend_count_seq_write 3 7120 NULL
+qib_format_hwerrors_7133 qib_format_hwerrors 5 7133 NULL
+kvm_mmu_notifier_test_young_7139 kvm_mmu_notifier_test_young 3 7139 NULL
++qlcnic_enable_msix_7144 qlcnic_enable_msix 2 7144 NULL
+__alloc_objio_seg_7203 __alloc_objio_seg 1 7203 NULL
+hdlc_loop_7255 hdlc_loop 0 7255 NULL
-+f_midi_start_ep_7270 f_midi_start_ep 0 7270 NULL
-+rx_rate_rx_frames_per_rates_read_7282 rx_rate_rx_frames_per_rates_read 3 7282 NULL
++rx_rate_rx_frames_per_rates_read_7282 rx_rate_rx_frames_per_rates_read 3 7282 NULL nohasharray
++kimage_alloc_init_7282 kimage_alloc_init 3 7282 &rx_rate_rx_frames_per_rates_read_7282
+get_string_7302 get_string 0 7302 NULL
-+security_inode_need_killpriv_7322 security_inode_need_killpriv 0 7322 NULL
+pci_vpd_info_field_size_7324 pci_vpd_info_field_size 0 7324 NULL
+mgmt_control_7349 mgmt_control 3 7349 NULL
+at_est2timeout_7365 at_est2timeout 0-1 7365 NULL
+ieee80211_if_read_dot11MeshHWMPactivePathTimeout_7368 ieee80211_if_read_dot11MeshHWMPactivePathTimeout 3 7368 NULL
-+xfs_btree_delete_7384 xfs_btree_delete 0 7384 NULL
+ath10k_read_fw_stats_7387 ath10k_read_fw_stats 3 7387 NULL
-+hweight_long_7388 hweight_long 1-0 7388 NULL
++hweight_long_7388 hweight_long 0-1 7388 NULL
+sl_change_mtu_7396 sl_change_mtu 2 7396 NULL
+_ore_add_stripe_unit_7399 _ore_add_stripe_unit 6-3 7399 NULL
++audmux_read_file_7400 audmux_read_file 3 7400 NULL
+readb_7401 readb 0 7401 NULL
++tipc_recvmsg_7402 tipc_recvmsg 4 7402 NULL
+drm_property_create_blob_7414 drm_property_create_blob 2 7414 NULL
+__copy_to_user_nocheck_7443 __copy_to_user_nocheck 0-3 7443 NULL
+ip_options_get_alloc_7448 ip_options_get_alloc 1 7448 NULL
@@ -119486,18 +118961,16 @@ index 0000000..3d3508d
+garp_request_join_7471 garp_request_join 4 7471 NULL nohasharray
+ReadHSCX_7471 ReadHSCX 0 7471 &garp_request_join_7471
+snd_pcm_lib_read1_7491 snd_pcm_lib_read1 0-3 7491 NULL
-+iwl_mvm_power_dbgfs_read_7502 iwl_mvm_power_dbgfs_read 0 7502 NULL
+ahash_instance_headroom_7509 ahash_instance_headroom 0 7509 NULL nohasharray
+sdhci_alloc_host_7509 sdhci_alloc_host 2 7509 &ahash_instance_headroom_7509
+array_zalloc_7519 array_zalloc 1-2 7519 NULL
+ath10k_read_htt_stats_mask_7557 ath10k_read_htt_stats_mask 3 7557 NULL
+smk_read_mapped_7562 smk_read_mapped 3 7562 NULL
++netvsc_get_slots_7565 netvsc_get_slots 0 7565 NULL
+cfs_cpt_num_estimate_7571 cfs_cpt_num_estimate 0 7571 NULL
-+ocfs2_lock_create_7612 ocfs2_lock_create 0 7612 NULL
+groups_alloc_7614 groups_alloc 1 7614 NULL nohasharray
+create_dir_7614 create_dir 0 7614 &groups_alloc_7614
+_rtw_zmalloc_7636 _rtw_zmalloc 1 7636 NULL
-+xfs_bmap_btalloc_nullfb_7654 xfs_bmap_btalloc_nullfb 0 7654 NULL
+fault_inject_write_7662 fault_inject_write 3 7662 NULL
+acpi_ex_allocate_name_string_7685 acpi_ex_allocate_name_string 2-1 7685 NULL
+acpi_ns_get_pathname_length_7699 acpi_ns_get_pathname_length 0 7699 NULL
@@ -119506,35 +118979,34 @@ index 0000000..3d3508d
+vxge_device_register_7752 vxge_device_register 4 7752 NULL
+iwl_dbgfs_bt_cmd_read_7770 iwl_dbgfs_bt_cmd_read 3 7770 NULL
+alloc_candev_7776 alloc_candev 1-2 7776 NULL
++__videobuf_read_start_7782 __videobuf_read_start 0 7782 NULL
+dfs_global_file_read_7787 dfs_global_file_read 3 7787 NULL
+bnx2_nvram_write_7790 bnx2_nvram_write 4-2 7790 NULL
+diva_os_copy_from_user_7792 diva_os_copy_from_user 4 7792 NULL nohasharray
+lustre_packed_msg_size_7792 lustre_packed_msg_size 0 7792 &diva_os_copy_from_user_7792
-+xfs_alloc_find_best_extent_7837 xfs_alloc_find_best_extent 0 7837 NULL
++seq_buf_alloc_7828 seq_buf_alloc 1 7828 NULL
+cfs_trace_dump_debug_buffer_usrstr_7861 cfs_trace_dump_debug_buffer_usrstr 2 7861 NULL
+tipc_alloc_entry_7875 tipc_alloc_entry 2 7875 NULL
+config_desc_7878 config_desc 0 7878 NULL
-+gfs2_permission_7884 gfs2_permission 0 7884 NULL
+dvb_dmxdev_read_sec_7892 dvb_dmxdev_read_sec 4 7892 NULL
+xfs_trans_get_efi_7898 xfs_trans_get_efi 2 7898 NULL
+libfc_host_alloc_7917 libfc_host_alloc 2 7917 NULL
+f_hidg_write_7932 f_hidg_write 3 7932 NULL
-+integrity_digsig_verify_7956 integrity_digsig_verify 3-0 7956 NULL
++integrity_digsig_verify_7956 integrity_digsig_verify 3 7956 NULL
+smk_write_load_self_7958 smk_write_load_self 3 7958 NULL
+tt3650_ci_msg_locked_8013 tt3650_ci_msg_locked 4 8013 NULL
+vcs_read_8017 vcs_read 3 8017 NULL
+vhost_add_used_and_signal_n_8038 vhost_add_used_and_signal_n 4 8038 NULL
-+ms_read_multiple_pages_8052 ms_read_multiple_pages 5-4 8052 NULL
+dgrp_mon_read_8065 dgrp_mon_read 3 8065 NULL
+spi_write_then_read_8073 spi_write_then_read 5-3 8073 NULL
+qla4xxx_post_ping_evt_work_8074 qla4xxx_post_ping_evt_work 4 8074 NULL
+venus_lookup_8121 venus_lookup 4 8121 NULL
+ieee80211_if_fmt_num_buffered_multicast_8127 ieee80211_if_fmt_num_buffered_multicast 3 8127 NULL
+xfs_file_fallocate_8150 xfs_file_fallocate 3-4 8150 NULL
++ufshcd_wait_for_dev_cmd_8168 ufshcd_wait_for_dev_cmd 0 8168 NULL
+__sk_mem_schedule_8185 __sk_mem_schedule 2 8185 NULL
+ieee80211_if_fmt_dot11MeshHoldingTimeout_8187 ieee80211_if_fmt_dot11MeshHoldingTimeout 3 8187 NULL
+recent_mt_proc_write_8206 recent_mt_proc_write 3 8206 NULL
-+__ocfs2_lock_refcount_tree_8207 __ocfs2_lock_refcount_tree 0 8207 NULL
+rt2x00debug_write_bbp_8212 rt2x00debug_write_bbp 3 8212 NULL
+ad7879_spi_multi_read_8218 ad7879_spi_multi_read 3 8218 NULL
+play_iframe_8219 play_iframe 3 8219 NULL
@@ -119546,6 +119018,7 @@ index 0000000..3d3508d
+rproc_recovery_write_8281 rproc_recovery_write 3 8281 NULL
+qib_decode_7220_err_8315 qib_decode_7220_err 3 8315 NULL
+ipwireless_send_packet_8328 ipwireless_send_packet 4 8328 NULL
++rtw_cfg80211_rx_action_8329 rtw_cfg80211_rx_action 3 8329 NULL
+tracing_entries_read_8345 tracing_entries_read 3 8345 NULL
+ieee80211_if_fmt_ht_opmode_8347 ieee80211_if_fmt_ht_opmode 3 8347 NULL
+generic_write_sync_8358 generic_write_sync 0 8358 NULL
@@ -119561,6 +119034,7 @@ index 0000000..3d3508d
+batadv_tt_len_8502 batadv_tt_len 0-1 8502 NULL
+dev_config_8506 dev_config 3 8506 NULL
+ACL_to_cifs_posix_8509 ACL_to_cifs_posix 3 8509 NULL
++nouveau_platform_device_create__8514 nouveau_platform_device_create_ 2 8514 NULL
+opticon_process_data_packet_8524 opticon_process_data_packet 3 8524 NULL
+user_on_off_8552 user_on_off 2 8552 NULL
+profile_remove_8556 profile_remove 3 8556 NULL
@@ -119569,37 +119043,35 @@ index 0000000..3d3508d
+tower_write_8580 tower_write 3 8580 NULL
+cfs_cpt_number_8618 cfs_cpt_number 0 8618 NULL
+shash_setkey_unaligned_8620 shash_setkey_unaligned 3 8620 NULL
-+xfs_qm_dqattach_locked_8625 xfs_qm_dqattach_locked 0 8625 NULL
+it821x_firmware_command_8628 it821x_firmware_command 3 8628 NULL
+scsi_dma_map_8632 scsi_dma_map 0 8632 NULL
-+fuse_send_write_pages_8636 fuse_send_write_pages 0-5 8636 NULL
++fuse_send_write_pages_8636 fuse_send_write_pages 5-0 8636 NULL
+mlx5_vzalloc_8663 mlx5_vzalloc 1 8663 NULL
+dio_bio_alloc_8677 dio_bio_alloc 5 8677 NULL
+lbs_bcnmiss_read_8678 lbs_bcnmiss_read 3 8678 NULL
++bpf_prog_size_8685 bpf_prog_size 0 8685 NULL
+rproc_trace_read_8686 rproc_trace_read 3 8686 NULL
+skb_frag_size_8695 skb_frag_size 0 8695 NULL
+arcfb_write_8702 arcfb_write 3 8702 NULL
+i_size_read_8703 i_size_read 0 8703 NULL nohasharray
+init_header_8703 init_header 0 8703 &i_size_read_8703
++ufshcd_get_tr_ocs_8706 ufshcd_get_tr_ocs 0 8706 NULL
+HDLC_irq_8709 HDLC_irq 2 8709 NULL
+ctrl_out_8712 ctrl_out 3-5 8712 NULL
+tracing_max_lat_write_8728 tracing_max_lat_write 3 8728 NULL
+jffs2_acl_count_8729 jffs2_acl_count 0-1 8729 NULL
-+__create_irqs_8733 __create_irqs 2 8733 NULL
++iov_iter_zero_8748 iov_iter_zero 1 8748 NULL
+tx_tx_exch_expiry_read_8749 tx_tx_exch_expiry_read 3 8749 NULL
+compound_order_8750 compound_order 0 8750 NULL
-+ocfs2_find_path_8754 ocfs2_find_path 0 8754 NULL
++cfg80211_inform_bss_width_8754 cfg80211_inform_bss_width 10 8754 NULL
+yurex_write_8761 yurex_write 3 8761 NULL
+joydev_compat_ioctl_8765 joydev_compat_ioctl 2 8765 NULL
+kstrtoint_from_user_8778 kstrtoint_from_user 2 8778 NULL
+paging32_prefetch_gpte_8783 paging32_prefetch_gpte 4 8783 NULL
-+ext4_try_to_write_inline_data_8785 ext4_try_to_write_inline_data 3-4 8785 NULL
++ext4_try_to_write_inline_data_8785 ext4_try_to_write_inline_data 4-3 8785 NULL
+__bitmap_weight_8796 __bitmap_weight 0-2 8796 NULL
-+gfs2_glock_nq_8808 gfs2_glock_nq 0 8808 NULL
-+ntfs_commit_pages_after_write_8809 ntfs_commit_pages_after_write 0 8809 NULL
+metronomefb_write_8823 metronomefb_write 3 8823 NULL
+SyS_llistxattr_8824 SyS_llistxattr 3 8824 NULL
-+extent_read_full_page_8826 extent_read_full_page 0 8826 NULL
+ll_xattr_cache_get_8829 ll_xattr_cache_get 0 8829 NULL
+get_queue_depth_8833 get_queue_depth 0 8833 NULL
+dvb_ringbuffer_pkt_next_8834 dvb_ringbuffer_pkt_next 0-2 8834 NULL
@@ -119607,6 +119079,7 @@ index 0000000..3d3508d
+iwl_rx_packet_len_8854 iwl_rx_packet_len 0 8854 NULL
+debug_debug1_read_8856 debug_debug1_read 3 8856 NULL
+wa_nep_queue_8858 wa_nep_queue 2 8858 NULL
++xgmac_reg_value_write_8860 xgmac_reg_value_write 3 8860 NULL
+radeon_drm_ioctl_8875 radeon_drm_ioctl 2 8875 NULL
+compressed_bio_size_8887 compressed_bio_size 0-2 8887 NULL
+ab3100_get_set_reg_8890 ab3100_get_set_reg 3 8890 NULL nohasharray
@@ -119615,6 +119088,7 @@ index 0000000..3d3508d
+sysfs_merge_group_8917 sysfs_merge_group 0 8917 NULL
+write_file_ani_8918 write_file_ani 3 8918 NULL
+layout_commit_8926 layout_commit 3 8926 NULL
++cp2112_hid_get_8933 cp2112_hid_get 4 8933 NULL
+adjust_priv_size_8935 adjust_priv_size 0-1 8935 NULL
+driver_stats_read_8944 driver_stats_read 3 8944 NULL
+read_file_tgt_stats_8959 read_file_tgt_stats 3 8959 NULL
@@ -119624,49 +119098,46 @@ index 0000000..3d3508d
+seq_open_net_8968 seq_open_net 4 8968 NULL nohasharray
+vol_cdev_read_8968 vol_cdev_read 3 8968 &seq_open_net_8968
+bio_integrity_get_tag_8974 bio_integrity_get_tag 3 8974 NULL
++sony_register_touchpad_8981 sony_register_touchpad 2 8981 NULL
+jbd2_journal_blocks_per_page_9004 jbd2_journal_blocks_per_page 0 9004 NULL
+il_dbgfs_clear_ucode_stats_write_9016 il_dbgfs_clear_ucode_stats_write 3 9016 NULL
-+xfs_inobt_get_rec_9023 xfs_inobt_get_rec 0 9023 NULL
+snd_emu10k1_ptr_read_9026 snd_emu10k1_ptr_read 0-2 9026 NULL
+fd_ioctl_9028 fd_ioctl 3 9028 NULL
+nla_put_9042 nla_put 3 9042 NULL
-+ffs_func_revmap_intf_9043 ffs_func_revmap_intf 0 9043 NULL
+sta_tx_latency_stat_header_9050 sta_tx_latency_stat_header 0-3-4 9050 NULL
+snd_emu10k1_synth_copy_from_user_9061 snd_emu10k1_synth_copy_from_user 3-5 9061 NULL
+snd_gus_dram_peek_9062 snd_gus_dram_peek 4 9062 NULL
+fib_info_hash_alloc_9075 fib_info_hash_alloc 1 9075 NULL
+create_queues_9088 create_queues 2-3 9088 NULL
++nvkm_output_create__9091 nvkm_output_create_ 6 9091 NULL
+ftdi_prepare_write_buffer_9093 ftdi_prepare_write_buffer 3 9093 NULL
+adxl34x_spi_read_block_9108 adxl34x_spi_read_block 3 9108 NULL
-+caif_stream_sendmsg_9110 caif_stream_sendmsg 4 9110 NULL nohasharray
-+gfn_to_rmap_9110 gfn_to_rmap 3-2 9110 &caif_stream_sendmsg_9110 nohasharray
-+jhead_scan_9110 jhead_scan 0 9110 &gfn_to_rmap_9110
-+udf_direct_IO_9111 udf_direct_IO 4 9111 NULL
++gfn_to_rmap_9110 gfn_to_rmap 3-2 9110 NULL nohasharray
++caif_stream_sendmsg_9110 caif_stream_sendmsg 4 9110 &gfn_to_rmap_9110
+pmcraid_change_queue_depth_9116 pmcraid_change_queue_depth 2 9116 NULL
-+apei_resources_merge_9149 apei_resources_merge 0 9149 NULL
+vb2_dma_sg_alloc_9157 vb2_dma_sg_alloc 2 9157 NULL
+dbg_command_buf_9165 dbg_command_buf 2 9165 NULL
+isr_irqs_read_9181 isr_irqs_read 3 9181 NULL
+count_leading_zeros_9183 count_leading_zeros 0 9183 NULL
-+xfs_btree_rshift_9187 xfs_btree_rshift 0 9187 NULL
+altera_swap_ir_9194 altera_swap_ir 2 9194 NULL
+snd_m3_get_pointer_9206 snd_m3_get_pointer 0 9206 NULL
++iwl_dbgfs_frame_stats_read_9211 iwl_dbgfs_frame_stats_read 3 9211 NULL
++card_send_command_9215 card_send_command 3 9215 NULL
+virtqueue_add_9217 virtqueue_add 4-5 9217 NULL
+tx_tx_prepared_descs_read_9221 tx_tx_prepared_descs_read 3 9221 NULL
++l2cap_create_connless_pdu_9222 l2cap_create_connless_pdu 3 9222 NULL
+sctp_getsockopt_delayed_ack_9232 sctp_getsockopt_delayed_ack 2 9232 NULL
-+xfs_error_trap_9239 xfs_error_trap 0-1 9239 NULL
+hfsplus_bnode_read_u16_9262 hfsplus_bnode_read_u16 0 9262 NULL
+hdpvr_read_9273 hdpvr_read 3 9273 NULL
+flakey_status_9274 flakey_status 5 9274 NULL
+iwl_dbgfs_stations_read_9309 iwl_dbgfs_stations_read 3 9309 NULL
+ceph_sync_setxattr_9310 ceph_sync_setxattr 4 9310 NULL
++__blockdev_direct_IO_9321 __blockdev_direct_IO 0-6 9321 NULL
+ieee80211_if_fmt_txpower_9334 ieee80211_if_fmt_txpower 3 9334 NULL
+nvme_trans_fmt_get_parm_header_9340 nvme_trans_fmt_get_parm_header 2 9340 NULL
+ocfs2_orphan_for_truncate_9342 ocfs2_orphan_for_truncate 4 9342 NULL
+ll_direct_rw_pages_9361 ll_direct_rw_pages 0 9361 NULL
+sta_beacon_loss_count_read_9370 sta_beacon_loss_count_read 3 9370 NULL
-+get_request_type_9393 get_request_type 0 9393 NULL nohasharray
-+mlx4_bitmap_init_9393 mlx4_bitmap_init 5-2 9393 &get_request_type_9393
+virtqueue_add_outbuf_9395 virtqueue_add_outbuf 3 9395 NULL
+read_9397 read 3 9397 NULL
+hash_ipportip4_expire_9415 hash_ipportip4_expire 4 9415 NULL
@@ -119674,8 +119145,8 @@ index 0000000..3d3508d
+bm_realloc_pages_9431 bm_realloc_pages 2 9431 NULL
+ffs_ep0_write_9438 ffs_ep0_write 3 9438 NULL
+ieee80211_if_fmt_fwded_unicast_9454 ieee80211_if_fmt_fwded_unicast 3 9454 NULL
-+agp_generic_alloc_user_9470 agp_generic_alloc_user 1 9470 NULL nohasharray
-+get_registers_9470 get_registers 4 9470 &agp_generic_alloc_user_9470
++get_registers_9470 get_registers 4 9470 NULL nohasharray
++agp_generic_alloc_user_9470 agp_generic_alloc_user 1 9470 &get_registers_9470
+crypt_status_9492 crypt_status 5 9492 NULL
+lbs_threshold_write_9502 lbs_threshold_write 5 9502 NULL
+lp_write_9511 lp_write 3 9511 NULL
@@ -119684,85 +119155,83 @@ index 0000000..3d3508d
+ll_max_read_ahead_whole_mb_seq_write_9528 ll_max_read_ahead_whole_mb_seq_write 3 9528 NULL
+read_file_dma_9530 read_file_dma 3 9530 NULL
+iwl_dbgfs_bf_params_read_9542 iwl_dbgfs_bf_params_read 3 9542 NULL
-+xfs_ialloc_read_agi_9545 xfs_ialloc_read_agi 0 9545 NULL
+il_dbgfs_missed_beacon_write_9546 il_dbgfs_missed_beacon_write 3 9546 NULL
+compat_SyS_pwritev64_9548 compat_SyS_pwritev64 3 9548 NULL
+fw_node_create_9559 fw_node_create 2 9559 NULL
+kobj_map_9566 kobj_map 2-3 9566 NULL
+f2fs_read_data_pages_9574 f2fs_read_data_pages 4 9574 NULL
+snd_emu10k1_fx8010_read_9605 snd_emu10k1_fx8010_read 5-6 9605 NULL
-+xfs_qm_dqattach_one_9612 xfs_qm_dqattach_one 0 9612 NULL
+lov_ost_pool_add_9626 lov_ost_pool_add 3 9626 NULL
+saa7164_buffer_alloc_user_9627 saa7164_buffer_alloc_user 2 9627 NULL
+ceph_copy_user_to_page_vector_9635 ceph_copy_user_to_page_vector 4-3 9635 NULL
+acpi_ex_insert_into_field_9638 acpi_ex_insert_into_field 3 9638 NULL
-+compat_sys_keyctl_9639 compat_sys_keyctl 4 9639 NULL
+ll_checksum_seq_write_9648 ll_checksum_seq_write 3 9648 NULL
+ocfs2_xattr_get_rec_9652 ocfs2_xattr_get_rec 0 9652 NULL
+queue_received_packet_9657 queue_received_packet 5 9657 NULL
++tipc_port_mcast_xmit_9663 tipc_port_mcast_xmit 4 9663 NULL
+snd_opl4_mem_proc_write_9670 snd_opl4_mem_proc_write 5 9670 NULL
+dns_query_9676 dns_query 3 9676 NULL
+qib_7322_handle_hwerrors_9678 qib_7322_handle_hwerrors 3 9678 NULL
+__erst_read_from_storage_9690 __erst_read_from_storage 0 9690 NULL
++lowpan_control_write_9699 lowpan_control_write 3 9699 NULL
+vx_transfer_end_9701 vx_transfer_end 0 9701 NULL
+fuse_iter_npages_9705 fuse_iter_npages 0 9705 NULL nohasharray
+ieee80211_if_read_aid_9705 ieee80211_if_read_aid 3 9705 &fuse_iter_npages_9705
+cfg80211_tx_mlme_mgmt_9715 cfg80211_tx_mlme_mgmt 3 9715 NULL
++parse_uac2_sample_rate_range_9718 parse_uac2_sample_rate_range 0 9718 NULL
+btrfs_stack_file_extent_num_bytes_9720 btrfs_stack_file_extent_num_bytes 0 9720 NULL
+SYSC_ppoll_9721 SYSC_ppoll 2 9721 NULL
+nla_get_u8_9736 nla_get_u8 0 9736 NULL
+ieee80211_if_fmt_num_mcast_sta_9738 ieee80211_if_fmt_num_mcast_sta 3 9738 NULL
-+shmem_replace_page_9740 shmem_replace_page 0 9740 NULL
+ddb_input_read_9743 ddb_input_read 3-0 9743 NULL
-+sta_last_ack_signal_read_9751 sta_last_ack_signal_read 3 9751 NULL
++regmap_multi_reg_write_bypassed_9751 regmap_multi_reg_write_bypassed 3 9751 NULL nohasharray
++sta_last_ack_signal_read_9751 sta_last_ack_signal_read 3 9751 &regmap_multi_reg_write_bypassed_9751
+btrfs_super_root_9763 btrfs_super_root 0 9763 NULL
++copy_page_from_iter_bvec_9767 copy_page_from_iter_bvec 0-3 9767 NULL
+__blk_queue_init_tags_9778 __blk_queue_init_tags 2 9778 NULL
+kvm_age_hva_9795 kvm_age_hva 2 9795 NULL
-+parse_uac2_sample_rate_range_9801 parse_uac2_sample_rate_range 0 9801 NULL
-+tpm_data_in_9802 tpm_data_in 0 9802 NULL
++bio_alloc_map_data_9798 bio_alloc_map_data 1 9798 NULL
+ieee80211_if_read_state_9813 ieee80211_if_read_state 3 9813 NULL nohasharray
+udpv6_recvmsg_9813 udpv6_recvmsg 4 9813 &ieee80211_if_read_state_9813
++compat_SyS_vmsplice_9828 compat_SyS_vmsplice 3 9828 NULL
+pmcraid_alloc_sglist_9864 pmcraid_alloc_sglist 1 9864 NULL
-+btrfs_free_reserved_extent_9867 btrfs_free_reserved_extent 2 9867 NULL
+f1x_translate_sysaddr_to_cs_9868 f1x_translate_sysaddr_to_cs 2 9868 NULL
+wil_read_file_ioblob_9878 wil_read_file_ioblob 3 9878 NULL
-+snd_midi_event_new_9893 snd_midi_event_new 1 9893 NULL nohasharray
-+bm_register_write_9893 bm_register_write 3 9893 &snd_midi_event_new_9893
-+snd_gf1_pcm_playback_copy_9895 snd_gf1_pcm_playback_copy 5-3 9895 NULL
++bm_register_write_9893 bm_register_write 3 9893 NULL nohasharray
++snd_midi_event_new_9893 snd_midi_event_new 1 9893 &bm_register_write_9893
++snd_gf1_pcm_playback_copy_9895 snd_gf1_pcm_playback_copy 3-5 9895 NULL
+nonpaging_page_fault_9908 nonpaging_page_fault 2 9908 NULL
++iwl_dbgfs_prph_reg_read_9928 iwl_dbgfs_prph_reg_read 3 9928 NULL
+root_nfs_parse_options_9937 root_nfs_parse_options 3 9937 NULL
+pstore_ftrace_knob_read_9947 pstore_ftrace_knob_read 3 9947 NULL
+read_file_misc_9948 read_file_misc 3 9948 NULL
+csum_partial_copy_fromiovecend_9957 csum_partial_copy_fromiovecend 3-4 9957 NULL
-+xfs_buf_geterror_9959 xfs_buf_geterror 0 9959 NULL
+SyS_gethostname_9964 SyS_gethostname 2 9964 NULL
+get_free_serial_index_9969 get_free_serial_index 0 9969 NULL
+btrfs_add_link_9973 btrfs_add_link 5 9973 NULL
-+gameport_read_9983 gameport_read 0 9983 NULL
+SYSC_move_pages_9986 SYSC_move_pages 2 9986 NULL
+ceph_oloc_oid_to_pg_10003 ceph_oloc_oid_to_pg 0 10003 NULL
+aat2870_dump_reg_10019 aat2870_dump_reg 0 10019 NULL
++asymmetric_key_generate_id_10064 asymmetric_key_generate_id 2-4 10064 NULL
+ieee80211_set_probe_resp_10077 ieee80211_set_probe_resp 3 10077 NULL
-+xfs_attr_rmtval_get_10092 xfs_attr_rmtval_get 0 10092 NULL
-+xfs_btree_check_lptr_10104 xfs_btree_check_lptr 0 10104 NULL
+get_elem_size_10110 get_elem_size 0-2 10110 NULL nohasharray
+dynamic_ps_timeout_read_10110 dynamic_ps_timeout_read 3 10110 &get_elem_size_10110
+gfs2_meta_read_10112 gfs2_meta_read 0 10112 NULL
+SyS_migrate_pages_10134 SyS_migrate_pages 2 10134 NULL
+aes_decrypt_packets_read_10155 aes_decrypt_packets_read 3 10155 NULL
-+rx_out_of_mem_read_10157 rx_out_of_mem_read 3 10157 NULL
++rx_out_of_mem_read_10157 rx_out_of_mem_read 3 10157 NULL nohasharray
++tracing_nsecs_write_10157 tracing_nsecs_write 3 10157 &rx_out_of_mem_read_10157
+hidg_alloc_ep_req_10159 hidg_alloc_ep_req 2 10159 NULL
+asd_store_update_bios_10165 asd_store_update_bios 4 10165 NULL
+kstrtol_from_user_10168 kstrtol_from_user 2 10168 NULL
-+persistent_ram_vmap_10169 persistent_ram_vmap 2-1 10169 NULL
+proc_pid_attr_read_10173 proc_pid_attr_read 3 10173 NULL
+jffs2_user_setxattr_10182 jffs2_user_setxattr 4 10182 NULL
-+xfs_attr_rmtval_copyout_10222 xfs_attr_rmtval_copyout 0 10222 NULL nohasharray
-+xfs_btree_read_buf_block_10222 xfs_btree_read_buf_block 0 10222 &xfs_attr_rmtval_copyout_10222
+hdlc_rpr_irq_10240 hdlc_rpr_irq 2 10240 NULL
++lmv_hsm_req_count_10245 lmv_hsm_req_count 0 10245 NULL
+cciss_proc_write_10259 cciss_proc_write 3 10259 NULL
+__qlcnic_pci_sriov_enable_10281 __qlcnic_pci_sriov_enable 2 10281 NULL
+snd_rme9652_capture_copy_10287 snd_rme9652_capture_copy 5 10287 NULL
++nvif_object_new_10300 nvif_object_new 5 10300 NULL
+read_emulate_10310 read_emulate 2-4 10310 NULL
+read_file_spectral_count_10320 read_file_spectral_count 3 10320 NULL
+compat_SyS_writev_10327 compat_SyS_writev 3 10327 NULL
@@ -119771,7 +119240,6 @@ index 0000000..3d3508d
+whci_add_cap_10350 whci_add_cap 0 10350 NULL
+dbAllocAny_10354 dbAllocAny 0 10354 NULL
+ath6kl_listen_int_read_10355 ath6kl_listen_int_read 3 10355 NULL
-+ms_write_multiple_pages_10362 ms_write_multiple_pages 6-5 10362 NULL
+sta_ht_capa_read_10366 sta_ht_capa_read 3 10366 NULL
+ecryptfs_decode_and_decrypt_filename_10379 ecryptfs_decode_and_decrypt_filename 5 10379 NULL
+do_compat_pselect_10398 do_compat_pselect 1 10398 NULL
@@ -119799,8 +119267,8 @@ index 0000000..3d3508d
+edge_write_10692 edge_write 4 10692 NULL
+selinux_inode_setxattr_10708 selinux_inode_setxattr 4 10708 NULL nohasharray
+inl_10708 inl 0 10708 &selinux_inode_setxattr_10708
-+shash_async_setkey_10720 shash_async_setkey 3 10720 NULL nohasharray
-+pvr2_ioread_read_10720 pvr2_ioread_read 3 10720 &shash_async_setkey_10720
++pvr2_ioread_read_10720 pvr2_ioread_read 3 10720 NULL nohasharray
++shash_async_setkey_10720 shash_async_setkey 3 10720 &pvr2_ioread_read_10720
+spi_sync_10731 spi_sync 0 10731 NULL
+sctp_getsockopt_maxseg_10737 sctp_getsockopt_maxseg 2 10737 NULL nohasharray
+apu_get_register_10737 apu_get_register 0 10737 &sctp_getsockopt_maxseg_10737
@@ -119812,6 +119280,7 @@ index 0000000..3d3508d
+ttm_dma_page_pool_free_10796 ttm_dma_page_pool_free 2-0 10796 NULL
+diva_set_trace_filter_10820 diva_set_trace_filter 0-1 10820 NULL
+lbs_sleepparams_read_10840 lbs_sleepparams_read 3 10840 NULL
++ext4_direct_IO_10843 ext4_direct_IO 4 10843 NULL
+ida_get_new_above_10853 ida_get_new_above 0 10853 NULL
+fuse_conn_max_background_read_10855 fuse_conn_max_background_read 3 10855 NULL
+snd_pcm_oss_write1_10872 snd_pcm_oss_write1 3 10872 NULL
@@ -119827,38 +119296,45 @@ index 0000000..3d3508d
+sched_autogroup_write_10984 sched_autogroup_write 3 10984 NULL
+xfrm_hash_alloc_10997 xfrm_hash_alloc 1 10997 NULL
+rx_filter_accum_arp_pend_requests_read_11003 rx_filter_accum_arp_pend_requests_read 3 11003 NULL
-+gfs2_dir_read_11017 gfs2_dir_read 0 11017 NULL
+SetLineNumber_11023 SetLineNumber 0 11023 NULL
++nouveau_gpio_create__11048 nouveau_gpio_create_ 4 11048 NULL
+tda10048_writeregbulk_11050 tda10048_writeregbulk 4 11050 NULL
-+insert_inline_extent_backref_11063 insert_inline_extent_backref 8 11063 NULL
++insert_inline_extent_backref_11063 insert_inline_extent_backref 8 11063 NULL nohasharray
++qlcnic_83xx_calculate_msix_vector_11063 qlcnic_83xx_calculate_msix_vector 0 11063 &insert_inline_extent_backref_11063
++xfs_collapse_file_space_11075 xfs_collapse_file_space 2-3 11075 NULL
+tcp_send_mss_11079 tcp_send_mss 0 11079 NULL
+count_argc_11083 count_argc 0 11083 NULL
+kvm_write_guest_cached_11106 kvm_write_guest_cached 4 11106 NULL
+tw_change_queue_depth_11116 tw_change_queue_depth 2 11116 NULL
++tc90522_master_xfer_11119 tc90522_master_xfer 3 11119 NULL
+page_offset_11120 page_offset 0 11120 NULL
-+cea_db_payload_len_11124 cea_db_payload_len 0 11124 NULL nohasharray
-+tracing_buffers_read_11124 tracing_buffers_read 3 11124 &cea_db_payload_len_11124
++tracing_buffers_read_11124 tracing_buffers_read 3 11124 NULL
+alloc_alien_cache_11127 alloc_alien_cache 2 11127 NULL
-+snd_gf1_pcm_playback_silence_11172 snd_gf1_pcm_playback_silence 4-3 11172 NULL
++snd_gf1_pcm_playback_silence_11172 snd_gf1_pcm_playback_silence 3-4 11172 NULL
++copy_from_iter_iovec_11196 copy_from_iter_iovec 2 11196 NULL
+il_dbgfs_rx_queue_read_11221 il_dbgfs_rx_queue_read 3 11221 NULL
+comedi_alloc_spriv_11234 comedi_alloc_spriv 2 11234 NULL
++of_irq_count_11253 of_irq_count 0 11253 NULL
+hugetlbfs_read_11268 hugetlbfs_read 3 11268 NULL
+ath6kl_power_params_write_11274 ath6kl_power_params_write 3 11274 NULL
++SYSC_getrandom_11294 SYSC_getrandom 2 11294 NULL
++tipc_msg_build_11304 tipc_msg_build 3-4-5 11304 NULL
+__proc_daemon_file_11305 __proc_daemon_file 5 11305 NULL
+ext4_xattr_check_names_11314 ext4_xattr_check_names 0 11314 NULL
+bcache_dev_sectors_dirty_add_11315 bcache_dev_sectors_dirty_add 3-4 11315 NULL
+sk_filter_size_11316 sk_filter_size 0 11316 NULL nohasharray
+tcp_send_rcvq_11316 tcp_send_rcvq 3 11316 &sk_filter_size_11316
-+shmem_radix_tree_replace_11325 shmem_radix_tree_replace 0 11325 NULL
+construct_key_11329 construct_key 3 11329 NULL nohasharray
+__kfifo_out_peek_11329 __kfifo_out_peek 0-3 11329 &construct_key_11329
+next_segment_11330 next_segment 0-2-1 11330 NULL
-+persistent_ram_buffer_map_11332 persistent_ram_buffer_map 2-1 11332 NULL
++persistent_ram_buffer_map_11332 persistent_ram_buffer_map 1-2 11332 NULL
+ext4_get_inline_size_11349 ext4_get_inline_size 0 11349 NULL
+sel_write_create_11353 sel_write_create 3 11353 NULL nohasharray
+nl80211_send_mgmt_11353 nl80211_send_mgmt 7 11353 &sel_write_create_11353
++of_get_available_child_count_11361 of_get_available_child_count 0 11361 NULL
+qib_get_base_info_11369 qib_get_base_info 3 11369 NULL
-+nft_value_dump_11381 nft_value_dump 3 11381 NULL
++tcf_register_action_11381 tcf_register_action 2 11381 NULL nohasharray
++nft_value_dump_11381 nft_value_dump 3 11381 &tcf_register_action_11381
+isku_sysfs_read_keys_capslock_11392 isku_sysfs_read_keys_capslock 6 11392 NULL
+dev_irnet_write_11398 dev_irnet_write 3 11398 NULL
+lprocfs_wr_evict_client_11402 lprocfs_wr_evict_client 3 11402 NULL
@@ -119866,23 +119342,18 @@ index 0000000..3d3508d
+str_to_user_11411 str_to_user 2 11411 NULL
+mem_fw_gen_free_mem_blks_read_11413 mem_fw_gen_free_mem_blks_read 3 11413 NULL
+ath6kl_wmi_test_rx_11414 ath6kl_wmi_test_rx 3 11414 NULL
-+xfs_btree_lookup_11417 xfs_btree_lookup 0 11417 NULL nohasharray
-+adis16480_show_firmware_revision_11417 adis16480_show_firmware_revision 3 11417 &xfs_btree_lookup_11417
++adis16480_show_firmware_revision_11417 adis16480_show_firmware_revision 3 11417 NULL
+trace_options_read_11419 trace_options_read 3 11419 NULL
+i40e_dbg_command_write_11421 i40e_dbg_command_write 3 11421 NULL
-+xd_read_multiple_pages_11422 xd_read_multiple_pages 5-4 11422 NULL
+bttv_read_11432 bttv_read 3 11432 NULL
+create_zero_mask_11453 create_zero_mask 0-1 11453 NULL
-+do_blockdev_direct_IO_11455 do_blockdev_direct_IO 0-6 11455 NULL
-+pci_set_power_state_11479 pci_set_power_state 0 11479 NULL nohasharray
-+sca3000_read_first_n_hw_rb_11479 sca3000_read_first_n_hw_rb 2 11479 &pci_set_power_state_11479
-+xfs_file_buffered_aio_write_11492 xfs_file_buffered_aio_write 4-0 11492 NULL
++ufshcd_change_queue_depth_11477 ufshcd_change_queue_depth 2 11477 NULL
++sca3000_read_first_n_hw_rb_11479 sca3000_read_first_n_hw_rb 2 11479 NULL nohasharray
++pci_set_power_state_11479 pci_set_power_state 0 11479 &sca3000_read_first_n_hw_rb_11479
+sd_do_mode_sense_11507 sd_do_mode_sense 5 11507 NULL
+kmem_zalloc_11510 kmem_zalloc 1 11510 NULL
+ll_direct_IO_26_seg_11518 ll_direct_IO_26_seg 0 11518 NULL
+twl_direction_in_11527 twl_direction_in 2 11527 NULL
-+xfs_rtcheck_alloc_range_11553 xfs_rtcheck_alloc_range 0 11553 NULL
-+radix_tree_extend_11555 radix_tree_extend 0 11555 NULL
+skb_cow_data_11565 skb_cow_data 0 11565 NULL
+lpfc_idiag_ctlacc_write_11576 lpfc_idiag_ctlacc_write 3 11576 NULL
+oprofilefs_ulong_to_user_11582 oprofilefs_ulong_to_user 3 11582 NULL
@@ -119891,30 +119362,34 @@ index 0000000..3d3508d
+fw_device_op_ioctl_11595 fw_device_op_ioctl 2 11595 NULL
+batadv_iv_ogm_orig_del_if_11604 batadv_iv_ogm_orig_del_if 2 11604 NULL
+SYSC_mq_timedsend_11607 SYSC_mq_timedsend 3 11607 NULL
++C_SYSC_migrate_pages_11618 C_SYSC_migrate_pages 2 11618 NULL
+sisusb_send_bridge_packet_11649 sisusb_send_bridge_packet 2 11649 NULL
-+nla_total_size_11658 nla_total_size 1-0 11658 NULL
-+slab_ksize_11664 slab_ksize 0 11664 NULL
++nla_total_size_11658 nla_total_size 0-1 11658 NULL
++srpc_create_client_rpc_11664 srpc_create_client_rpc 3 11664 NULL nohasharray
++slab_ksize_11664 slab_ksize 0 11664 &srpc_create_client_rpc_11664
+ide_queue_pc_tail_11673 ide_queue_pc_tail 5 11673 NULL
+compat_SyS_msgsnd_11675 compat_SyS_msgsnd 3 11675 NULL
+btrfs_alloc_delayed_item_11678 btrfs_alloc_delayed_item 1 11678 NULL
+sctp_setsockopt_hmac_ident_11687 sctp_setsockopt_hmac_ident 3 11687 NULL
+split_11691 split 2 11691 NULL
-+snd_ctl_elem_user_tlv_11695 snd_ctl_elem_user_tlv 3 11695 NULL
++compat_SyS_keyctl_11695 compat_SyS_keyctl 4 11695 NULL nohasharray
++snd_ctl_elem_user_tlv_11695 snd_ctl_elem_user_tlv 3 11695 &compat_SyS_keyctl_11695
+blk_rq_cur_bytes_11723 blk_rq_cur_bytes 0 11723 NULL
+dm_bio_prison_create_11749 dm_bio_prison_create 1 11749 NULL
+iwl_dbgfs_qos_read_11753 iwl_dbgfs_qos_read 3 11753 NULL
+ieee80211_get_num_supported_channels_11768 ieee80211_get_num_supported_channels 0 11768 NULL
++tipc_sendmsg_11769 tipc_sendmsg 4 11769 NULL
+ps_pspoll_timeouts_read_11776 ps_pspoll_timeouts_read 3 11776 NULL
+btrfs_key_blockptr_11786 btrfs_key_blockptr 0 11786 NULL
+pcpu_fc_alloc_11818 pcpu_fc_alloc 2 11818 NULL
-+xfs_ialloc_11819 xfs_ialloc 0 11819 NULL
+umc_device_register_11824 umc_device_register 0 11824 NULL
+zerocopy_sg_from_iovec_11828 zerocopy_sg_from_iovec 3 11828 NULL
+sctp_setsockopt_maxseg_11829 sctp_setsockopt_maxseg 3 11829 NULL
+rts51x_read_status_11830 rts51x_read_status 4 11830 NULL
+unix_stream_connect_11844 unix_stream_connect 3 11844 NULL
-+xfs_file_aio_write_checks_11851 xfs_file_aio_write_checks 0 11851 NULL
++pci_enable_msix_range_11852 pci_enable_msix_range 0-4 11852 NULL
+ecryptfs_copy_filename_11868 ecryptfs_copy_filename 4 11868 NULL
++l2cap_chan_send_11878 l2cap_chan_send 3 11878 NULL
+ieee80211_rx_bss_info_11887 ieee80211_rx_bss_info 3 11887 NULL
+mdc_rename_11899 mdc_rename 4-6 11899 NULL
+xstateregs_get_11906 xstateregs_get 4 11906 NULL
@@ -119925,14 +119400,12 @@ index 0000000..3d3508d
+r1_sync_page_io_11963 r1_sync_page_io 3 11963 NULL
+f1x_swap_interleaved_region_11970 f1x_swap_interleaved_region 0-2 11970 NULL
+read_and_add_raw_conns_11987 read_and_add_raw_conns 0 11987 NULL
-+i40e_pci_sriov_configure_12011 i40e_pci_sriov_configure 2 12011 NULL
+ftdi_elan_total_command_size_12045 ftdi_elan_total_command_size 0 12045 NULL
+ieee80211_if_read_user_power_level_12050 ieee80211_if_read_user_power_level 3 12050 NULL
+il4965_ucode_tx_stats_read_12064 il4965_ucode_tx_stats_read 3 12064 NULL
+ptc_proc_write_12076 ptc_proc_write 3 12076 NULL
+batadv_tt_global_size_mod_12085 batadv_tt_global_size_mod 3 12085 NULL
+rtw_malloc2d_12102 rtw_malloc2d 1-2-3 12102 NULL
-+gfs2_find_jhead_12117 gfs2_find_jhead 0 12117 NULL
+alloc_bulk_urbs_generic_12127 alloc_bulk_urbs_generic 5 12127 NULL
+set_powered_12129 set_powered 4 12129 NULL
+ramoops_init_prz_12134 ramoops_init_prz 5 12134 NULL
@@ -119949,7 +119422,6 @@ index 0000000..3d3508d
+snd_pcm_kernel_ioctl_12219 snd_pcm_kernel_ioctl 0 12219 NULL
+fuse_get_req_12221 fuse_get_req 2 12221 NULL nohasharray
+aat2870_reg_read_file_12221 aat2870_reg_read_file 3 12221 &fuse_get_req_12221
-+xfs_attr3_leaf_read_12222 xfs_attr3_leaf_read 0 12222 NULL
+__alloc_bootmem_low_nopanic_12235 __alloc_bootmem_low_nopanic 1 12235 NULL
+usnic_ib_qp_grp_dump_rows_12239 usnic_ib_qp_grp_dump_rows 3 12239 NULL
+ib_uverbs_unmarshall_recv_12251 ib_uverbs_unmarshall_recv 5 12251 NULL
@@ -119960,24 +119432,26 @@ index 0000000..3d3508d
+il_dbgfs_nvm_read_12288 il_dbgfs_nvm_read 3 12288 &roundup_to_multiple_of_64_12288
+bt_sock_recvmsg_12316 bt_sock_recvmsg 4 12316 NULL
+usnic_transport_sock_to_str_12322 usnic_transport_sock_to_str 2-0 12322 NULL
++ufshcd_copy_query_response_12324 ufshcd_copy_query_response 0 12324 NULL
+pcbit_writecmd_12332 pcbit_writecmd 2 12332 NULL
-+xfs_bmap_last_extent_12335 xfs_bmap_last_extent 0 12335 NULL
+mptctl_ioctl_12355 mptctl_ioctl 2 12355 NULL
+__nf_ct_ext_add_length_12364 __nf_ct_ext_add_length 3 12364 NULL
+xfs_iext_inline_to_direct_12384 xfs_iext_inline_to_direct 2 12384 NULL
-+populate_dir_12391 populate_dir 0 12391 NULL nohasharray
-+write_file_dump_12391 write_file_dump 3 12391 &populate_dir_12391
++write_file_dump_12391 write_file_dump 3 12391 NULL nohasharray
++btrfs_file_extent_ram_bytes_12391 btrfs_file_extent_ram_bytes 0 12391 &write_file_dump_12391 nohasharray
++populate_dir_12391 populate_dir 0 12391 &btrfs_file_extent_ram_bytes_12391
+hbucket_elem_add_12416 hbucket_elem_add 3 12416 NULL
+ieee80211_if_read_num_mcast_sta_12419 ieee80211_if_read_num_mcast_sta 3 12419 NULL
-+cfs_array_alloc_12441 cfs_array_alloc 2 12441 NULL
++cfs_array_alloc_12441 cfs_array_alloc 1-2 12441 NULL
+skb_do_copy_data_nocache_12465 skb_do_copy_data_nocache 5 12465 NULL
+x25_sendmsg_12487 x25_sendmsg 4 12487 NULL
+fnic_trace_ctrl_read_12497 fnic_trace_ctrl_read 3 12497 NULL
+__ceph_osdc_start_request_12502 __ceph_osdc_start_request 0 12502 NULL
+qib_alloc_fast_reg_mr_12526 qib_alloc_fast_reg_mr 2 12526 NULL
-+write_inode_now_12565 write_inode_now 0 12565 NULL
++nvkm_event_init_12565 nvkm_event_init 3-2 12565 NULL
+hvc_alloc_12579 hvc_alloc 4 12579 NULL
+pcpu_extend_area_map_12589 pcpu_extend_area_map 2 12589 NULL
++_iwl_dbgfs_prph_reg_write_12597 _iwl_dbgfs_prph_reg_write 3 12597 NULL
+tlbflush_write_file_12598 tlbflush_write_file 3 12598 NULL
+vhci_put_user_12604 vhci_put_user 4 12604 NULL
+sdhci_pltfm_init_12627 sdhci_pltfm_init 3 12627 NULL
@@ -119987,8 +119461,10 @@ index 0000000..3d3508d
+nr_recvmsg_12649 nr_recvmsg 4 12649 NULL
+rtw_android_get_link_speed_12655 rtw_android_get_link_speed 0 12655 NULL
+ocfs2_read_block_12659 ocfs2_read_block 0 12659 NULL
++lustre_pack_request_v2_12665 lustre_pack_request_v2 2 12665 NULL
+sel_read_class_12669 sel_read_class 3 12669 NULL nohasharray
+sparse_mem_maps_populate_node_12669 sparse_mem_maps_populate_node 4 12669 &sel_read_class_12669
++ext4_writepage_trans_blocks_12674 ext4_writepage_trans_blocks 0 12674 NULL
+iwl_dbgfs_calib_disabled_write_12707 iwl_dbgfs_calib_disabled_write 3 12707 NULL
+ieee80211_if_read_num_buffered_multicast_12716 ieee80211_if_read_num_buffered_multicast 3 12716 NULL
+ivtv_write_12721 ivtv_write 3 12721 NULL
@@ -119999,13 +119475,10 @@ index 0000000..3d3508d
+sctp_ssnmap_init_12772 sctp_ssnmap_init 2-3 12772 NULL
+scsi_adjust_queue_depth_12802 scsi_adjust_queue_depth 3 12802 NULL
+xfs_inumbers_fmt_12817 xfs_inumbers_fmt 3 12817 NULL
-+readq_12825 readq 0 12825 NULL
+SyS_add_key_12834 SyS_add_key 4 12834 NULL
-+gfs2_log_reserve_12835 gfs2_log_reserve 0 12835 NULL
+TSS_authhmac_12839 TSS_authhmac 3 12839 NULL
+spidev_sync_12842 spidev_sync 0 12842 NULL
+spidev_ioctl_12846 spidev_ioctl 2 12846 NULL
-+xfs_rtallocate_extent_exact_12865 xfs_rtallocate_extent_exact 0 12865 NULL
+ath9k_dump_4k_modal_eeprom_12883 ath9k_dump_4k_modal_eeprom 3-2 12883 NULL
+get_leb_cnt_12892 get_leb_cnt 0-2 12892 NULL
+get_virtual_node_size_12908 get_virtual_node_size 0 12908 NULL
@@ -120017,11 +119490,10 @@ index 0000000..3d3508d
+sk_peek_offset_12991 sk_peek_offset 0 12991 NULL
+bset_prev_bytes_13020 bset_prev_bytes 0 13020 NULL
+subsystem_filter_write_13022 subsystem_filter_write 3 13022 NULL
-+generic_segment_checks_13041 generic_segment_checks 0 13041 NULL
+ocfs2_write_begin_13045 ocfs2_write_begin 3-4 13045 NULL
+__dn_setsockopt_13060 __dn_setsockopt 5 13060 NULL nohasharray
+ptlrpc_lprocfs_threads_min_seq_write_13060 ptlrpc_lprocfs_threads_min_seq_write 3 13060 &__dn_setsockopt_13060
-+biovec_create_pool_13079 biovec_create_pool 2 13079 NULL
++ufshcd_compose_upiu_13076 ufshcd_compose_upiu 0 13076 NULL
+xattr_getsecurity_13090 xattr_getsecurity 0 13090 NULL
+ttm_dma_pool_alloc_new_pages_13105 ttm_dma_pool_alloc_new_pages 3 13105 NULL
+SyS_msgrcv_13109 SyS_msgrcv 3 13109 NULL
@@ -120044,15 +119516,15 @@ index 0000000..3d3508d
+bio_integrity_trim_13259 bio_integrity_trim 3-2 13259 NULL
+simple_attr_write_13260 simple_attr_write 3 13260 NULL
+pmcraid_notify_aen_13274 pmcraid_notify_aen 3 13274 NULL
++nvkm_ltc_create__13275 nvkm_ltc_create_ 4 13275 NULL
+il4965_stats_flag_13281 il4965_stats_flag 0-3 13281 NULL
+lpfc_idiag_mbxacc_get_setup_13282 lpfc_idiag_mbxacc_get_setup 0 13282 NULL
++nvkm_i2c_pad_create__13292 nvkm_i2c_pad_create_ 5 13292 NULL
+sd_major_13294 sd_major 0-1 13294 NULL
-+module_param_sysfs_setup_13296 module_param_sysfs_setup 0 13296 NULL
+read_file_phy_err_13318 read_file_phy_err 3 13318 NULL
+kvm_read_nested_guest_page_13337 kvm_read_nested_guest_page 5 13337 NULL
+round_event_name_len_13348 round_event_name_len 0 13348 NULL
+hscx_empty_fifo_13360 hscx_empty_fifo 2 13360 NULL
-+xfs_btree_delrec_13364 xfs_btree_delrec 0 13364 NULL
+iso_sched_alloc_13377 iso_sched_alloc 1 13377 NULL nohasharray
+wep_key_not_found_read_13377 wep_key_not_found_read 3 13377 &iso_sched_alloc_13377
+ext4_meta_trans_blocks_13380 ext4_meta_trans_blocks 0-3-2 13380 NULL
@@ -120060,10 +119532,10 @@ index 0000000..3d3508d
+dis_bypass_write_13388 dis_bypass_write 3 13388 &lov_mds_md_size_13388
+netxen_alloc_sds_rings_13417 netxen_alloc_sds_rings 2 13417 NULL
+sctp_setsockopt_peer_primary_addr_13440 sctp_setsockopt_peer_primary_addr 3 13440 NULL
-+ath6kl_cfg80211_connect_event_13443 ath6kl_cfg80211_connect_event 8-9-7 13443 NULL
++ath6kl_cfg80211_connect_event_13443 ath6kl_cfg80211_connect_event 7-8-9 13443 NULL
+sb_init_dio_done_wq_13482 sb_init_dio_done_wq 0 13482 NULL
-+data_read_13494 data_read 3 13494 NULL
-+ioat_chansts_32_13506 ioat_chansts_32 0 13506 NULL
++data_read_13494 data_read 3 13494 NULL nohasharray
++ext_prop_data_store_13494 ext_prop_data_store 3 13494 &data_read_13494
+ocfs2_align_bytes_to_blocks_13512 ocfs2_align_bytes_to_blocks 0-2 13512 NULL
+core_status_13515 core_status 4 13515 NULL
+smk_write_mapped_13519 smk_write_mapped 3 13519 NULL
@@ -120075,23 +119547,23 @@ index 0000000..3d3508d
+cache_write_13589 cache_write 3 13589 NULL
+Rd_Indx_13602 Rd_Indx 3-2 13602 NULL
+wm8994_bulk_write_13615 wm8994_bulk_write 2-3 13615 NULL
-+__ntfs_grab_cache_pages_13617 __ntfs_grab_cache_pages 0 13617 NULL
+pmcraid_get_minor_13619 pmcraid_get_minor 0 13619 NULL
+packet_snd_13634 packet_snd 3 13634 NULL
+blk_msg_write_13655 blk_msg_write 3 13655 NULL
+cache_downcall_13666 cache_downcall 3 13666 NULL
-+ext3_xattr_list_entries_13682 ext3_xattr_list_entries 0 13682 NULL
-+nv94_aux_13689 nv94_aux 2-5 13689 NULL
+usb_get_string_13693 usb_get_string 0 13693 NULL
+fw_iso_buffer_alloc_13704 fw_iso_buffer_alloc 2 13704 NULL
+audit_unpack_string_13748 audit_unpack_string 3 13748 NULL
++udf_direct_IO_13765 udf_direct_IO 4 13765 NULL
+ieee802154_alloc_device_13767 ieee802154_alloc_device 1 13767 NULL
+fb_sys_read_13778 fb_sys_read 3 13778 NULL
++alloc_indirect_13783 alloc_indirect 1 13783 NULL
+ath6kl_mgmt_powersave_ap_13791 ath6kl_mgmt_powersave_ap 6 13791 NULL
+random_read_13815 random_read 3 13815 NULL
+mutex_lock_interruptible_nested_13817 mutex_lock_interruptible_nested 0 13817 NULL
+hsi_register_board_info_13820 hsi_register_board_info 2 13820 NULL
+___mei_cl_send_13821 ___mei_cl_send 3 13821 NULL
++qce_ahash_hmac_setkey_13837 qce_ahash_hmac_setkey 3 13837 NULL
+enc_pools_insert_13849 enc_pools_insert 3 13849 NULL
+evdev_ioctl_compat_13851 evdev_ioctl_compat 2 13851 NULL
+compat_ip_setsockopt_13870 compat_ip_setsockopt 5 13870 NULL
@@ -120103,10 +119575,8 @@ index 0000000..3d3508d
+ocfs2_xa_value_truncate_13940 ocfs2_xa_value_truncate 2 13940 &ieee80211_if_read_dot11MeshForwarding_13940
+iwl_dbgfs_protection_mode_read_13943 iwl_dbgfs_protection_mode_read 3 13943 NULL
+ieee80211_if_read_min_discovery_timeout_13946 ieee80211_if_read_min_discovery_timeout 3 13946 NULL
-+lpfc_idiag_queacc_read_13950 lpfc_idiag_queacc_read 3 13950 NULL nohasharray
-+pagecache_write_end_13950 pagecache_write_end 0 13950 &lpfc_idiag_queacc_read_13950
++lpfc_idiag_queacc_read_13950 lpfc_idiag_queacc_read 3 13950 NULL
+osc_grant_shrink_interval_seq_write_13952 osc_grant_shrink_interval_seq_write 3 13952 NULL
-+ocfs2_refresh_slot_info_13957 ocfs2_refresh_slot_info 0 13957 NULL
+snd_pcm_plug_slave_size_13967 snd_pcm_plug_slave_size 0-2 13967 NULL
+qcam_read_13977 qcam_read 3 13977 NULL
+dsp_read_13980 dsp_read 2 13980 NULL
@@ -120117,14 +119587,11 @@ index 0000000..3d3508d
+iscsi_create_flashnode_conn_14022 iscsi_create_flashnode_conn 4 14022 NULL
+pci_add_ext_cap_save_buffer_14032 pci_add_ext_cap_save_buffer 3 14032 NULL
+dvb_usercopy_14036 dvb_usercopy 2 14036 NULL
-+read_def_modal_eeprom_14041 read_def_modal_eeprom 3 14041 NULL
-+xfs_bmap_alloc_14044 xfs_bmap_alloc 0 14044 NULL
+ieee80211_if_fmt_aid_14055 ieee80211_if_fmt_aid 3 14055 NULL
+ovs_nla_alloc_flow_actions_14056 ovs_nla_alloc_flow_actions 1 14056 NULL
+sta_agg_status_read_14058 sta_agg_status_read 3 14058 NULL
+lov_stripeoffset_seq_write_14078 lov_stripeoffset_seq_write 3 14078 NULL
+do_proc_readlink_14096 do_proc_readlink 3 14096 NULL
-+compat_sys_pselect6_14105 compat_sys_pselect6 1 14105 NULL
+ext4_journal_blocks_per_page_14127 ext4_journal_blocks_per_page 0 14127 NULL
+isku_sysfs_read_light_14140 isku_sysfs_read_light 6 14140 NULL
+em_canid_change_14150 em_canid_change 3 14150 NULL
@@ -120141,11 +119608,9 @@ index 0000000..3d3508d
+btrfs_token_file_extent_ram_bytes_14247 btrfs_token_file_extent_ram_bytes 0 14247 NULL
+ath6kl_connect_event_14267 ath6kl_connect_event 7-8-9 14267 NULL
+rr_status_14293 rr_status 5 14293 NULL
-+read_default_ldt_14302 read_default_ldt 2 14302 NULL
-+update_rgrp_lvb_14303 update_rgrp_lvb 0 14303 NULL
-+xfs_qm_qino_alloc_14309 xfs_qm_qino_alloc 0 14309 NULL
++read_default_ldt_14302 read_default_ldt 2 14302 NULL nohasharray
++lustre_pack_reply_flags_14302 lustre_pack_reply_flags 2 14302 &read_default_ldt_14302
+oo_objects_14319 oo_objects 0 14319 NULL
-+ll_get_user_pages_14328 ll_get_user_pages 3-2-0 14328 NULL
+p9_client_zc_rpc_14345 p9_client_zc_rpc 7 14345 NULL
+alloc_tx_struct_14349 alloc_tx_struct 1 14349 NULL
+hash_ipportnet4_expire_14354 hash_ipportnet4_expire 4 14354 NULL
@@ -120160,24 +119625,22 @@ index 0000000..3d3508d
+lmv_user_md_size_14456 lmv_user_md_size 0-1 14456 NULL
+snd_emu10k1_proc_spdif_status_14457 snd_emu10k1_proc_spdif_status 4-5 14457 NULL
+ath10k_write_htt_stats_mask_14458 ath10k_write_htt_stats_mask 3 14458 NULL
-+lustre_msg_size_v2_14470 lustre_msg_size_v2 0 14470 NULL
++lustre_msg_size_v2_14470 lustre_msg_size_v2 0-1 14470 NULL
+dma_transfer_size_14473 dma_transfer_size 0 14473 NULL
+udplite_getfrag_14479 udplite_getfrag 3-4 14479 NULL
+ieee80211_if_read_dot11MeshGateAnnouncementProtocol_14486 ieee80211_if_read_dot11MeshGateAnnouncementProtocol 3 14486 NULL
-+split_state_14491 split_state 0 14491 NULL
+ocfs2_debug_read_14507 ocfs2_debug_read 3 14507 NULL
-+ep0_write_14536 ep0_write 3 14536 NULL nohasharray
-+dataflash_read_user_otp_14536 dataflash_read_user_otp 3-2 14536 &ep0_write_14536
++dataflash_read_user_otp_14536 dataflash_read_user_otp 3-2 14536 NULL nohasharray
++ep0_write_14536 ep0_write 3 14536 &dataflash_read_user_otp_14536
+picolcd_debug_eeprom_read_14549 picolcd_debug_eeprom_read 3 14549 NULL
+qp_host_alloc_queue_14566 qp_host_alloc_queue 1 14566 NULL
+SyS_setdomainname_14569 SyS_setdomainname 2 14569 NULL
-+stuffed_readpage_14581 stuffed_readpage 0 14581 NULL
+idmap_pipe_downcall_14591 idmap_pipe_downcall 3 14591 NULL
+ceph_osdc_alloc_request_14597 ceph_osdc_alloc_request 3 14597 NULL
++ufshcd_compose_dev_cmd_14626 ufshcd_compose_dev_cmd 0 14626 NULL
+dbJoin_14644 dbJoin 0 14644 NULL
+profile_replace_14652 profile_replace 3 14652 NULL
+usnic_vnic_dump_14662 usnic_vnic_dump 3 14662 NULL
-+add_to_page_cache_locked_14668 add_to_page_cache_locked 0 14668 NULL
+min_bytes_needed_14675 min_bytes_needed 0 14675 NULL
+nvme_trans_log_info_exceptions_14677 nvme_trans_log_info_exceptions 3 14677 NULL
+pipeline_enc_tx_stat_fifo_int_read_14680 pipeline_enc_tx_stat_fifo_int_read 3 14680 NULL
@@ -120186,7 +119649,6 @@ index 0000000..3d3508d
+persistent_ram_ecc_string_14704 persistent_ram_ecc_string 0 14704 NULL
+u_audio_playback_14709 u_audio_playback 3 14709 NULL
+rtw_cbuf_alloc_14710 rtw_cbuf_alloc 1 14710 NULL
-+cgroup_path_14713 cgroup_path 3 14713 NULL
+vfd_write_14717 vfd_write 3 14717 NULL
+__blk_end_request_14729 __blk_end_request 3 14729 NULL
+raid1_resize_14740 raid1_resize 2 14740 NULL
@@ -120201,18 +119663,16 @@ index 0000000..3d3508d
+ttm_page_pool_free_14797 ttm_page_pool_free 2-0 14797 &__kfifo_in_14797
+hpet_readl_14801 hpet_readl 0 14801 NULL nohasharray
+snd_als300_gcr_read_14801 snd_als300_gcr_read 0 14801 &hpet_readl_14801
-+security_inode_rename_14805 security_inode_rename 0 14805 NULL
-+xfs_btree_kill_iroot_14824 xfs_btree_kill_iroot 0 14824 NULL
+do_tune_cpucache_14828 do_tune_cpucache 2 14828 NULL
+mrp_attr_create_14853 mrp_attr_create 3 14853 NULL
+lcd_write_14857 lcd_write 3 14857 NULL
+get_user_cpu_mask_14861 get_user_cpu_mask 2 14861 NULL
-+xfs_bmapi_convert_unwritten_14886 xfs_bmapi_convert_unwritten 0 14886 NULL
-+gmux_index_read8_14890 gmux_index_read8 0 14890 NULL
+acpi_os_allocate_14892 acpi_os_allocate 1 14892 NULL
+SYSC_readv_14901 SYSC_readv 3 14901 NULL
++netlbl_catmap_walk_14902 netlbl_catmap_walk 0-2 14902 NULL
+__arch_hweight64_14923 __arch_hweight64 0 14923 NULL nohasharray
-+qp_memcpy_to_queue_iov_14923 qp_memcpy_to_queue_iov 5-2 14923 &__arch_hweight64_14923
++qp_memcpy_to_queue_iov_14923 qp_memcpy_to_queue_iov 5-2 14923 &__arch_hweight64_14923 nohasharray
++ptlrpc_prep_req_pool_14923 ptlrpc_prep_req_pool 4 14923 &qp_memcpy_to_queue_iov_14923
+ocfs2_expand_nonsparse_inode_14936 ocfs2_expand_nonsparse_inode 3-4 14936 NULL
+queue_cnt_14951 queue_cnt 0 14951 NULL
+unix_dgram_recvmsg_14952 unix_dgram_recvmsg 4 14952 NULL
@@ -120220,6 +119680,7 @@ index 0000000..3d3508d
+mce_flush_rx_buffer_14976 mce_flush_rx_buffer 2 14976 NULL
+setkey_14987 setkey 3 14987 NULL nohasharray
+gpio_twl4030_write_14987 gpio_twl4030_write 1 14987 &setkey_14987
++sctp_setsockopt_default_sndinfo_15011 sctp_setsockopt_default_sndinfo 3 15011 NULL
+blk_integrity_tuple_size_15027 blk_integrity_tuple_size 0 15027 NULL
+read_file_node_aggr_15040 read_file_node_aggr 3 15040 NULL
+cld_pipe_downcall_15058 cld_pipe_downcall 3 15058 NULL
@@ -120228,8 +119689,6 @@ index 0000000..3d3508d
+ntfs_copy_from_user_15072 ntfs_copy_from_user 3-5-0 15072 NULL
+pppoe_recvmsg_15073 pppoe_recvmsg 4 15073 NULL
+smscore_load_firmware_family2_15086 smscore_load_firmware_family2 3 15086 NULL
-+xfs_btree_insrec_15090 xfs_btree_insrec 0 15090 NULL
-+btrfs_readpage_15094 btrfs_readpage 0 15094 NULL
+compat_SyS_pwritev_15118 compat_SyS_pwritev 3 15118 NULL
+hex_dump_to_buffer_15121 hex_dump_to_buffer 6 15121 NULL
+start_port_15124 start_port 0 15124 NULL
@@ -120240,25 +119699,24 @@ index 0000000..3d3508d
+bfad_debugfs_write_regrd_15218 bfad_debugfs_write_regrd 3 15218 NULL
+iwl_dbgfs_sram_write_15239 iwl_dbgfs_sram_write 3 15239 NULL
+il_dbgfs_rx_stats_read_15243 il_dbgfs_rx_stats_read 3 15243 NULL
++wacom_led_putimage_15264 wacom_led_putimage 4 15264 NULL
+simple_strtol_15273 simple_strtol 0 15273 NULL
+fw_realloc_buffer_15280 fw_realloc_buffer 2 15280 NULL
-+ocfs2_read_refcount_block_15305 ocfs2_read_refcount_block 0 15305 NULL
+kovaplus_sysfs_read_15337 kovaplus_sysfs_read 6 15337 NULL
+ioread16_15342 ioread16 0 15342 NULL
+ept_prefetch_gpte_15348 ept_prefetch_gpte 4 15348 NULL
++blkdev_readpages_15357 blkdev_readpages 4 15357 NULL
+acpi_ut_create_string_object_15360 acpi_ut_create_string_object 1 15360 NULL
-+ext4_direct_IO_15369 ext4_direct_IO 4 15369 NULL
+graph_depth_read_15371 graph_depth_read 3 15371 NULL
-+compat_sys_process_vm_readv_15374 compat_sys_process_vm_readv 3-5 15374 NULL
+fq_codel_zalloc_15378 fq_codel_zalloc 1 15378 NULL
+alloc_fddidev_15382 alloc_fddidev 1 15382 NULL
+pipeline_csum_to_rx_xfer_swi_read_15403 pipeline_csum_to_rx_xfer_swi_read 3 15403 NULL
+get_modalias_15406 get_modalias 2 15406 NULL
-+blockdev_direct_IO_15408 blockdev_direct_IO 5 15408 NULL
+__videobuf_copy_to_user_15423 __videobuf_copy_to_user 4-0 15423 NULL
+tcp_mtu_to_mss_15438 tcp_mtu_to_mss 2-0 15438 NULL
+hpsa_change_queue_depth_15449 hpsa_change_queue_depth 2 15449 NULL
+memweight_15450 memweight 2 15450 NULL
++__clone_and_map_data_bio_15498 __clone_and_map_data_bio 3 15498 NULL
+zd_chip_is_zd1211b_15518 zd_chip_is_zd1211b 0 15518 NULL
+ifx_spi_write_15531 ifx_spi_write 3 15531 NULL
+p9_check_zc_errors_15534 p9_check_zc_errors 4 15534 NULL
@@ -120269,41 +119727,42 @@ index 0000000..3d3508d
+compat_fillonedir_15620 compat_fillonedir 3 15620 NULL
+proc_loginuid_read_15631 proc_loginuid_read 3 15631 NULL
+tomoyo_scan_bprm_15642 tomoyo_scan_bprm 2-4 15642 NULL nohasharray
-+sk_memory_allocated_add_15642 sk_memory_allocated_add 2 15642 &tomoyo_scan_bprm_15642 nohasharray
-+pipeline_hs_tx_stat_fifo_int_read_15642 pipeline_hs_tx_stat_fifo_int_read 3 15642 &sk_memory_allocated_add_15642
++pipeline_hs_tx_stat_fifo_int_read_15642 pipeline_hs_tx_stat_fifo_int_read 3 15642 &tomoyo_scan_bprm_15642 nohasharray
++sk_memory_allocated_add_15642 sk_memory_allocated_add 2 15642 &pipeline_hs_tx_stat_fifo_int_read_15642
+joydev_handle_JSIOCSBTNMAP_15643 joydev_handle_JSIOCSBTNMAP 3 15643 NULL
+fs_path_add_15648 fs_path_add 3 15648 NULL
-+__do_readpage_15652 __do_readpage 0 15652 NULL
+xsd_read_15653 xsd_read 3 15653 NULL
+unix_bind_15668 unix_bind 3 15668 NULL
+dm_read_15674 dm_read 3 15674 NULL nohasharray
+SyS_connect_15674 SyS_connect 3 15674 &dm_read_15674
++uinput_str_to_user_15695 uinput_str_to_user 3 15695 NULL
++__sk_migrate_realloc_15709 __sk_migrate_realloc 3 15709 NULL
+tracing_snapshot_write_15719 tracing_snapshot_write 3 15719 NULL
+HiSax_readstatus_15752 HiSax_readstatus 2 15752 NULL
+smk_read_direct_15803 smk_read_direct 3 15803 NULL
-+nameseq_list_15817 nameseq_list 3-0 15817 NULL nohasharray
-+gnttab_expand_15817 gnttab_expand 1 15817 &nameseq_list_15817
++gnttab_expand_15817 gnttab_expand 1 15817 NULL nohasharray
++nameseq_list_15817 nameseq_list 3-0 15817 &gnttab_expand_15817
+afs_proc_rootcell_write_15822 afs_proc_rootcell_write 3 15822 NULL
+table_size_15851 table_size 0-1-2 15851 NULL
+write_file_tx99_15856 write_file_tx99 3 15856 NULL
+media_entity_init_15870 media_entity_init 2-4 15870 NULL
+__mptctl_ioctl_15875 __mptctl_ioctl 2 15875 NULL
-+native_read_msr_15905 native_read_msr 0 15905 NULL
+parse_audio_stream_data_15937 parse_audio_stream_data 3 15937 NULL
+power_read_15939 power_read 3 15939 NULL
+lpfc_idiag_drbacc_read_15948 lpfc_idiag_drbacc_read 3 15948 NULL
+snd_pcm_lib_read_transfer_15952 snd_pcm_lib_read_transfer 5-2-4 15952 NULL
+memblock_virt_alloc_try_nid_15954 memblock_virt_alloc_try_nid 1 15954 NULL
++smk_read_ptrace_15974 smk_read_ptrace 3 15974 NULL
+viafb_vt1636_proc_write_16018 viafb_vt1636_proc_write 3 16018 NULL
+dccp_recvmsg_16056 dccp_recvmsg 4 16056 NULL
+read_file_spectral_period_16057 read_file_spectral_period 3 16057 NULL
++SYSC_kexec_file_load_16058 SYSC_kexec_file_load 3 16058 NULL
+si5351_msynth_params_address_16062 si5351_msynth_params_address 0-1 16062 NULL
+isr_tx_exch_complete_read_16103 isr_tx_exch_complete_read 3 16103 NULL
+isr_hw_pm_mode_changes_read_16110 isr_hw_pm_mode_changes_read 3 16110 NULL nohasharray
+dma_tx_requested_read_16110 dma_tx_requested_read 3 16110 &isr_hw_pm_mode_changes_read_16110
-+gfs2_jdesc_check_16122 gfs2_jdesc_check 0 16122 NULL
++udelay_test_write_16111 udelay_test_write 3 16111 NULL
+snd_dma_pointer_16126 snd_dma_pointer 0-2 16126 NULL
-+compat_sys_select_16131 compat_sys_select 1 16131 NULL
+fsm_init_16134 fsm_init 2 16134 NULL
+ext4_xattr_block_get_16148 ext4_xattr_block_get 0 16148 NULL
+optimal_reclaimed_pages_16172 optimal_reclaimed_pages 0 16172 NULL
@@ -120317,8 +119776,7 @@ index 0000000..3d3508d
+atomic_read_file_16227 atomic_read_file 3 16227 NULL
+BcmGetSectionValStartOffset_16235 BcmGetSectionValStartOffset 0 16235 NULL
+lov_prep_brw_set_16246 lov_prep_brw_set 3 16246 NULL
-+btrfs_dev_extent_chunk_offset_16247 btrfs_dev_extent_chunk_offset 0 16247 NULL nohasharray
-+i40e_dbg_dump_read_16247 i40e_dbg_dump_read 3 16247 &btrfs_dev_extent_chunk_offset_16247
++i40e_dbg_dump_read_16247 i40e_dbg_dump_read 3 16247 NULL
+il_dbgfs_disable_ht40_write_16249 il_dbgfs_disable_ht40_write 3 16249 NULL
+SyS_fgetxattr_16254 SyS_fgetxattr 4 16254 NULL
+reiserfs_acl_count_16265 reiserfs_acl_count 0-1 16265 NULL
@@ -120335,14 +119793,13 @@ index 0000000..3d3508d
+kvm_handle_hva_range_16312 kvm_handle_hva_range 3-2 16312 NULL
+sysfs_create_groups_16360 sysfs_create_groups 0 16360 NULL
+total_ps_buffered_read_16365 total_ps_buffered_read 3 16365 NULL
-+xfs_inobt_lookup_16367 xfs_inobt_lookup 0 16367 NULL
+iscsi_tcp_conn_setup_16376 iscsi_tcp_conn_setup 2 16376 NULL
-+gfs2_dinode_in_16378 gfs2_dinode_in 0 16378 NULL
-+xfs_btree_check_block_16419 xfs_btree_check_block 0 16419 NULL
++nv50_pioc_create_16389 nv50_pioc_create 5 16389 NULL
+ieee80211_if_read_tsf_16420 ieee80211_if_read_tsf 3 16420 NULL
+rxrpc_server_keyring_16431 rxrpc_server_keyring 3 16431 NULL
+__bio_add_page_16435 __bio_add_page 0-4 16435 NULL
+cmdline_store_16442 cmdline_store 4 16442 NULL
++copy_from_user_bvec_16447 copy_from_user_bvec 0-4 16447 NULL
+btrfs_truncate_inode_items_16452 btrfs_truncate_inode_items 4 16452 NULL
+netlink_change_ngroups_16457 netlink_change_ngroups 2 16457 NULL
+req_capsule_get_size_16467 req_capsule_get_size 0 16467 NULL
@@ -120352,11 +119809,12 @@ index 0000000..3d3508d
+raid10_resize_16537 raid10_resize 2 16537 NULL
+lpfc_debugfs_read_16566 lpfc_debugfs_read 3 16566 NULL
+agp_allocate_memory_wrap_16576 agp_allocate_memory_wrap 1 16576 NULL
-+lustre_msg_hdr_size_v2_16589 lustre_msg_hdr_size_v2 0 16589 NULL
-+gmux_index_read32_16604 gmux_index_read32 0 16604 NULL
++lustre_msg_hdr_size_v2_16589 lustre_msg_hdr_size_v2 0-1 16589 NULL
++compat_SyS_migrate_pages_16618 compat_SyS_migrate_pages 2 16618 NULL
+rtw_set_wpa_ie_16633 rtw_set_wpa_ie 3 16633 NULL
+btrfs_get_token_32_16651 btrfs_get_token_32 0 16651 NULL
+__wa_populate_dto_urb_16699 __wa_populate_dto_urb 3-4 16699 NULL
++_iwl_dbgfs_bt_force_ant_write_16701 _iwl_dbgfs_bt_force_ant_write 3 16701 NULL
+__proc_lnet_buffers_16717 __proc_lnet_buffers 5 16717 NULL
+__copy_to_user_swizzled_16748 __copy_to_user_swizzled 3-4 16748 NULL
+arcmsr_adjust_disk_queue_depth_16756 arcmsr_adjust_disk_queue_depth 2 16756 NULL
@@ -120366,21 +119824,19 @@ index 0000000..3d3508d
+drm_malloc_ab_16831 drm_malloc_ab 1-2 16831 NULL
+scsi_mode_sense_16835 scsi_mode_sense 5 16835 NULL
+hfsplus_min_io_size_16859 hfsplus_min_io_size 0 16859 NULL
-+xfs_dialloc_ag_16868 xfs_dialloc_ag 0 16868 NULL
-+alloc_idx_lebs_16872 alloc_idx_lebs 2 16872 NULL nohasharray
-+xfs_iget_16872 xfs_iget 0 16872 &alloc_idx_lebs_16872
++alloc_idx_lebs_16872 alloc_idx_lebs 2 16872 NULL
+carl9170_debugfs_ampdu_state_read_16873 carl9170_debugfs_ampdu_state_read 3 16873 NULL
+st_write_16874 st_write 3 16874 NULL
+__kfifo_peek_n_16877 __kfifo_peek_n 0 16877 NULL
-+transport_init_session_tags_16878 transport_init_session_tags 1-2 16878 NULL
-+snd_gf1_mem_proc_dump_16926 snd_gf1_mem_proc_dump 5 16926 NULL nohasharray
-+psb_unlocked_ioctl_16926 psb_unlocked_ioctl 2 16926 &snd_gf1_mem_proc_dump_16926
++psb_unlocked_ioctl_16926 psb_unlocked_ioctl 2 16926 NULL nohasharray
++snd_gf1_mem_proc_dump_16926 snd_gf1_mem_proc_dump 5 16926 &psb_unlocked_ioctl_16926
+_sp2d_alloc_16944 _sp2d_alloc 1-2-3 16944 NULL
+squashfs_read_table_16945 squashfs_read_table 3 16945 NULL
++svcxdr_dupstr_16963 svcxdr_dupstr 3 16963 NULL
+keyctl_instantiate_key_iov_16969 keyctl_instantiate_key_iov 3 16969 NULL
-+ocfs2_read_quota_phys_block_16990 ocfs2_read_quota_phys_block 0 16990 NULL
+ceph_read_dir_17005 ceph_read_dir 3 17005 NULL
+copy_counters_to_user_17027 copy_counters_to_user 5 17027 NULL
++C_SYSC_keyctl_17041 C_SYSC_keyctl 4 17041 NULL
+jffs2_trusted_setxattr_17048 jffs2_trusted_setxattr 4 17048 NULL
+__arch_hweight32_17060 __arch_hweight32 0 17060 NULL
+sddr55_read_data_17072 sddr55_read_data 4 17072 NULL
@@ -120388,20 +119844,20 @@ index 0000000..3d3508d
+simple_transaction_read_17076 simple_transaction_read 3 17076 NULL
+carl9170_debugfs_mem_usage_read_17084 carl9170_debugfs_mem_usage_read 3 17084 NULL
+entry_length_17093 entry_length 0 17093 NULL
-+ocfs2_get_refcount_cpos_end_17113 ocfs2_get_refcount_cpos_end 0 17113 NULL
+write_mem_17114 write_mem 3 17114 NULL
+pvr2_hdw_state_report_17121 pvr2_hdw_state_report 3 17121 NULL
++do_blockdev_direct_IO_17143 do_blockdev_direct_IO 0-6 17143 NULL
+nouveau_instobj_create__17144 nouveau_instobj_create_ 4 17144 NULL
+jumpshot_write_data_17151 jumpshot_write_data 4 17151 NULL
++mxt_upload_cfg_mem_17157 mxt_upload_cfg_mem 4 17157 NULL
+sep_read_17161 sep_read 3 17161 NULL
+befs_nls2utf_17163 befs_nls2utf 3 17163 NULL
+tx_tx_start_templates_read_17164 tx_tx_start_templates_read 3 17164 NULL
+UniStrnlen_17169 UniStrnlen 0 17169 NULL
+access_remote_vm_17189 access_remote_vm 0 17189 NULL nohasharray
-+iwl_dbgfs_txfifo_flush_write_17189 iwl_dbgfs_txfifo_flush_write 3 17189 &access_remote_vm_17189 nohasharray
-+ocfs2_flock_handle_signal_17189 ocfs2_flock_handle_signal 0 17189 &iwl_dbgfs_txfifo_flush_write_17189
-+iscsit_find_cmd_from_itt_or_dump_17194 iscsit_find_cmd_from_itt_or_dump 3 17194 NULL nohasharray
-+driver_state_read_17194 driver_state_read 3 17194 &iscsit_find_cmd_from_itt_or_dump_17194
++iwl_dbgfs_txfifo_flush_write_17189 iwl_dbgfs_txfifo_flush_write 3 17189 &access_remote_vm_17189
++driver_state_read_17194 driver_state_read 3 17194 NULL nohasharray
++iscsit_find_cmd_from_itt_or_dump_17194 iscsit_find_cmd_from_itt_or_dump 3 17194 &driver_state_read_17194
+sync_request_17208 sync_request 2 17208 NULL
+dn_recvmsg_17213 dn_recvmsg 4 17213 NULL
+lprocfs_read_frac_helper_17261 lprocfs_read_frac_helper 0 17261 NULL
@@ -120412,6 +119868,7 @@ index 0000000..3d3508d
+hmac_sha256_17278 hmac_sha256 2 17278 NULL
+neigh_hash_grow_17283 neigh_hash_grow 2 17283 NULL
+minstrel_stats_read_17290 minstrel_stats_read 3 17290 NULL
++__ptlrpc_request_bufs_pack_17298 __ptlrpc_request_bufs_pack 4 17298 NULL
+ieee80211_if_fmt_dot11MeshForwarding_17301 ieee80211_if_fmt_dot11MeshForwarding 3 17301 NULL
+mb_cache_create_17307 mb_cache_create 2 17307 NULL
+gnttab_map_frames_v2_17314 gnttab_map_frames_v2 2 17314 NULL
@@ -120419,19 +119876,21 @@ index 0000000..3d3508d
+ath6kl_wmi_send_mgmt_cmd_17347 ath6kl_wmi_send_mgmt_cmd 7 17347 NULL
+mdc_import_seq_write_17409 mdc_import_seq_write 3 17409 NULL
+lpfc_debugfs_dif_err_write_17424 lpfc_debugfs_dif_err_write 3 17424 NULL
-+compat_sys_ppoll_17430 compat_sys_ppoll 2 17430 NULL
++copy_from_iter_17433 copy_from_iter 2 17433 NULL
+sta_connected_time_read_17435 sta_connected_time_read 3 17435 NULL
+libcfs_ipif_enumerate_17445 libcfs_ipif_enumerate 0 17445 NULL
-+xfs_btree_lshift_17448 xfs_btree_lshift 0 17448 NULL
+nla_get_u32_17455 nla_get_u32 0 17455 NULL
+__ref_totlen_17461 __ref_totlen 0 17461 NULL
+probe_kernel_write_17481 probe_kernel_write 3 17481 NULL
+TSS_rawhmac_17486 TSS_rawhmac 3 17486 NULL
++copy_page_from_iter_17512 copy_page_from_iter 3-0 17512 NULL
++reiserfs_direct_IO_17513 reiserfs_direct_IO 4 17513 NULL
+lbs_highrssi_write_17515 lbs_highrssi_write 3 17515 NULL
+qp_free_res_17541 qp_free_res 5 17541 NULL
-+__copy_to_user_17551 __copy_to_user 3-0 17551 NULL
-+copy_from_user_17559 copy_from_user 0-3 17559 NULL
++__copy_to_user_17551 __copy_to_user 0-3 17551 NULL
++copy_from_user_17559 copy_from_user 3-0 17559 NULL
+hash_netport4_expire_17573 hash_netport4_expire 4 17573 NULL
++wil_write_file_rxon_17581 wil_write_file_rxon 3 17581 NULL
+acpi_ut_create_package_object_17594 acpi_ut_create_package_object 1 17594 NULL
+neigh_hash_alloc_17595 neigh_hash_alloc 1 17595 NULL
+osst_execute_17607 osst_execute 7-6 17607 NULL
@@ -120441,13 +119900,13 @@ index 0000000..3d3508d
+SYSC_migrate_pages_17657 SYSC_migrate_pages 2 17657 NULL
+packet_setsockopt_17662 packet_setsockopt 5 17662 NULL
+pwr_enable_ps_read_17686 pwr_enable_ps_read 3 17686 NULL
-+filemap_fdatawait_17688 filemap_fdatawait 0 17688 NULL
-+venus_rename_17707 venus_rename 4-5 17707 NULL nohasharray
-+__einj_error_trigger_17707 __einj_error_trigger 0 17707 &venus_rename_17707
++venus_rename_17707 venus_rename 4-5 17707 NULL
+exofs_read_lookup_dev_table_17733 exofs_read_lookup_dev_table 3 17733 NULL
+sctpprobe_read_17741 sctpprobe_read 3 17741 NULL
-+dgap_do_fep_load_17765 dgap_do_fep_load 3 17765 NULL
++nv92_gpio_intr_mask_17773 nv92_gpio_intr_mask 4-3 17773 NULL
+shrink_slab_node_17794 shrink_slab_node 3 17794 NULL
++lpuart_copy_rx_to_tty_17801 lpuart_copy_rx_to_tty 3 17801 NULL
++_iwl_dbgfs_set_nic_temperature_write_17804 _iwl_dbgfs_set_nic_temperature_write 3 17804 NULL
+gnet_stats_copy_app_17821 gnet_stats_copy_app 3 17821 NULL
+cipso_v4_gentag_rbm_17836 cipso_v4_gentag_rbm 0 17836 NULL
+em28xx_audio_ep_packet_size_17844 em28xx_audio_ep_packet_size 0 17844 NULL
@@ -120461,8 +119920,9 @@ index 0000000..3d3508d
+init_per_cpu_17880 init_per_cpu 1 17880 NULL
+ieee80211_if_fmt_dot11MeshMaxPeerLinks_17883 ieee80211_if_fmt_dot11MeshMaxPeerLinks 3 17883 NULL
+ieee80211_if_fmt_dot11MeshHWMPRootMode_17890 ieee80211_if_fmt_dot11MeshHWMPRootMode 3 17890 NULL
++dev_pm_opp_get_opp_count_17911 dev_pm_opp_get_opp_count 0 17911 NULL
+xfs_buf_associate_memory_17915 xfs_buf_associate_memory 3 17915 NULL
-+xfs_rtallocate_extent_near_17916 xfs_rtallocate_extent_near 0 17916 NULL
++tipc_port_iovec_rcv_17921 tipc_port_iovec_rcv 3 17921 NULL
+scsi_bufflen_17933 scsi_bufflen 0 17933 NULL
+__mutex_lock_check_stamp_17947 __mutex_lock_check_stamp 0 17947 NULL
+beacon_interval_write_17952 beacon_interval_write 3 17952 NULL
@@ -120471,8 +119931,6 @@ index 0000000..3d3508d
+smk_write_cipso_17989 smk_write_cipso 3 17989 NULL
+gnttab_max_grant_frames_17993 gnttab_max_grant_frames 0 17993 NULL
+pvr2_v4l2_read_18006 pvr2_v4l2_read 3 18006 NULL
-+alloc_rx_desc_ring_18016 alloc_rx_desc_ring 2 18016 NULL
-+cpufreq_add_dev_symlink_18028 cpufreq_add_dev_symlink 0 18028 NULL
+o2hb_highest_node_18034 o2hb_highest_node 0 18034 NULL
+cryptd_alloc_instance_18048 cryptd_alloc_instance 2-3 18048 NULL
+__btrfs_drop_extents_18049 __btrfs_drop_extents 5 18049 NULL
@@ -120483,17 +119941,16 @@ index 0000000..3d3508d
+SYSC_pselect6_18076 SYSC_pselect6 1 18076 NULL
+SYSC_semtimedop_18091 SYSC_semtimedop 3 18091 NULL
+mpi_alloc_18094 mpi_alloc 1 18094 NULL
-+hfs_direct_IO_18104 hfs_direct_IO 4 18104 NULL
+dfs_file_read_18116 dfs_file_read 3 18116 NULL
+svc_getnl_18120 svc_getnl 0 18120 NULL
+paging32_gpte_to_gfn_lvl_18131 paging32_gpte_to_gfn_lvl 0-2-1 18131 NULL
-+xfs_zero_eof_18134 xfs_zero_eof 0 18134 NULL
+selinux_inode_setsecurity_18148 selinux_inode_setsecurity 4 18148 NULL
++enable_ints_write_18170 enable_ints_write 3 18170 NULL
+pccard_store_cis_18176 pccard_store_cis 6 18176 NULL
+orinoco_add_extscan_result_18207 orinoco_add_extscan_result 3 18207 NULL
+gsm_control_message_18209 gsm_control_message 4 18209 NULL
-+read_rindex_entry_18213 read_rindex_entry 0 18213 NULL
+do_ipv6_setsockopt_18215 do_ipv6_setsockopt 5 18215 NULL
++fill_ext_prop_18233 fill_ext_prop 0 18233 NULL
+gnttab_alloc_grant_references_18240 gnttab_alloc_grant_references 1 18240 NULL
+alloc_trace_uprobe_18247 alloc_trace_uprobe 3 18247 NULL
+rfcomm_sock_setsockopt_18254 rfcomm_sock_setsockopt 5 18254 NULL
@@ -120506,12 +119963,13 @@ index 0000000..3d3508d
+mmc_send_bus_test_18285 mmc_send_bus_test 4 18285 NULL
+um_idi_write_18293 um_idi_write 3 18293 NULL
+nouveau_disp_create__18305 nouveau_disp_create_ 4-7 18305 NULL
-+vga_r_18310 vga_r 0 18310 NULL
++lustre_msg_hdr_size_18308 lustre_msg_hdr_size 2 18308 NULL
+class_add_profile_18315 class_add_profile 1-3-5 18315 NULL
+csio_mem_read_18319 csio_mem_read 3 18319 NULL
+alloc_and_copy_string_18321 alloc_and_copy_string 2 18321 NULL
+ecryptfs_send_message_18322 ecryptfs_send_message 2 18322 NULL
+bio_integrity_advance_18324 bio_integrity_advance 2 18324 NULL
++copy_page_to_iter_18345 copy_page_to_iter 0-3 18345 NULL
+lcd_proc_write_18351 lcd_proc_write 3 18351 NULL
+pwr_power_save_off_read_18355 pwr_power_save_off_read 3 18355 NULL
+SyS_process_vm_readv_18366 SyS_process_vm_readv 3-5 18366 NULL
@@ -120521,11 +119979,10 @@ index 0000000..3d3508d
+ci_role_write_18388 ci_role_write 3 18388 NULL
+hdlc_empty_fifo_18397 hdlc_empty_fifo 2 18397 NULL
+adis16136_show_serial_18402 adis16136_show_serial 3 18402 NULL
-+crystalhd_user_data_18407 crystalhd_user_data 3 18407 NULL
++nvif_device_init_18418 nvif_device_init 6 18418 NULL
+memblock_virt_alloc_node_nopanic_18431 memblock_virt_alloc_node_nopanic 1 18431 NULL
+iscsi_create_flashnode_sess_18433 iscsi_create_flashnode_sess 4 18433 NULL
+snd_hda_get_connections_18437 snd_hda_get_connections 0 18437 NULL
-+flash_dev_cache_miss_18454 flash_dev_cache_miss 4 18454 NULL
+fuse_perform_write_18457 fuse_perform_write 4 18457 NULL
+regset_tls_set_18459 regset_tls_set 4 18459 NULL
+pci_vpd_lrdt_size_18479 pci_vpd_lrdt_size 0 18479 NULL nohasharray
@@ -120533,20 +119990,19 @@ index 0000000..3d3508d
+udpv6_setsockopt_18487 udpv6_setsockopt 5 18487 NULL
+btrfs_fiemap_18501 btrfs_fiemap 3 18501 NULL
+__copy_user_zeroing_intel_18510 __copy_user_zeroing_intel 0-3 18510 NULL
-+__block_write_begin_18511 __block_write_begin 0 18511 NULL
+snd_vx_inb_18514 snd_vx_inb 0 18514 NULL
+snd_gus_dram_poke_18525 snd_gus_dram_poke 4 18525 NULL
+nouveau_fifo_channel_create__18530 nouveau_fifo_channel_create_ 9 18530 NULL
++tipc_send2port_18531 tipc_send2port 4 18531 NULL
+seq_copy_in_user_18543 seq_copy_in_user 3 18543 NULL
+sas_change_queue_depth_18555 sas_change_queue_depth 2 18555 NULL
+smk_write_rules_list_18565 smk_write_rules_list 3 18565 NULL
+debug_output_18575 debug_output 3 18575 NULL
-+xfs_btree_read_bufl_18597 xfs_btree_read_bufl 0 18597 NULL
+filemap_fdatawait_range_18600 filemap_fdatawait_range 0 18600 NULL nohasharray
+slabinfo_write_18600 slabinfo_write 3 18600 &filemap_fdatawait_range_18600
+iowarrior_write_18604 iowarrior_write 3 18604 NULL
-+nvc0_ram_create__18624 nvc0_ram_create_ 4 18624 NULL
+from_buffer_18625 from_buffer 3 18625 NULL
++kmalloc_kernel_18641 kmalloc_kernel 1 18641 NULL
+snd_pcm_oss_write3_18657 snd_pcm_oss_write3 0-3 18657 NULL
+ieee80211_if_fmt_rssi_threshold_18664 ieee80211_if_fmt_rssi_threshold 3 18664 NULL
+xfs_iext_insert_18667 xfs_iext_insert 3 18667 NULL
@@ -120555,28 +120011,28 @@ index 0000000..3d3508d
+iwl_dbgfs_rx_handlers_read_18708 iwl_dbgfs_rx_handlers_read 3 18708 NULL
+ceph_alloc_page_vector_18710 ceph_alloc_page_vector 1 18710 NULL
+blk_rq_bytes_18715 blk_rq_bytes 0 18715 NULL
++nfs4_init_callback_netid_18717 nfs4_init_callback_netid 3 18717 NULL
+snd_als4k_gcr_read_addr_18741 snd_als4k_gcr_read_addr 0 18741 NULL
+o2hb_debug_create_18744 o2hb_debug_create 4 18744 NULL
+__erst_read_to_erange_from_nvram_18748 __erst_read_to_erange_from_nvram 0 18748 NULL
+wep_packets_read_18751 wep_packets_read 3 18751 NULL
+read_file_dump_nfcal_18766 read_file_dump_nfcal 3 18766 NULL
-+ffs_epfile_read_18775 ffs_epfile_read 3 18775 NULL
+SyS_lsetxattr_18776 SyS_lsetxattr 4 18776 NULL
+alloc_fcdev_18780 alloc_fcdev 1 18780 NULL
-+prealloc_18800 prealloc 0 18800 NULL
++fence_context_alloc_18792 fence_context_alloc 1 18792 NULL
+dm_stats_print_18815 dm_stats_print 7 18815 NULL
+sys_modify_ldt_18824 sys_modify_ldt 3 18824 NULL
+mtf_test_write_18844 mtf_test_write 3 18844 NULL
+sctp_setsockopt_events_18862 sctp_setsockopt_events 3 18862 NULL
+ieee80211_if_read_element_ttl_18869 ieee80211_if_read_element_ttl 3 18869 NULL
+xlog_find_verify_log_record_18870 xlog_find_verify_log_record 2 18870 NULL
++devm_mdiobus_alloc_size_18902 devm_mdiobus_alloc_size 2 18902 NULL
++tracing_thresh_write_18909 tracing_thresh_write 3 18909 NULL
+ceph_setxattr_18913 ceph_setxattr 4 18913 NULL
-+page_cache_tree_insert_18916 page_cache_tree_insert 0 18916 NULL
++xfs_buf_read_uncached_18922 xfs_buf_read_uncached 3 18922 NULL
+ieee80211_rx_mgmt_disassoc_18927 ieee80211_rx_mgmt_disassoc 3 18927 NULL
+snapshot_write_next_18937 snapshot_write_next 0 18937 NULL
-+clean_journal_18955 clean_journal 0 18955 NULL
+__nla_reserve_18974 __nla_reserve 3 18974 NULL
-+__blockdev_direct_IO_18977 __blockdev_direct_IO 0-6 18977 NULL
+layout_in_gaps_19006 layout_in_gaps 2 19006 NULL
+huge_page_size_19008 huge_page_size 0 19008 NULL
+hash_netport6_expire_19013 hash_netport6_expire 4 19013 NULL
@@ -120584,18 +120040,19 @@ index 0000000..3d3508d
+revalidate_19043 revalidate 2 19043 NULL
+afs_vnode_store_data_19048 afs_vnode_store_data 2-3-4-5 19048 NULL
+osc_pinger_recov_seq_write_19056 osc_pinger_recov_seq_write 3 19056 NULL
-+get_log_header_19063 get_log_header 0 19063 NULL
+create_gpadl_header_19064 create_gpadl_header 2 19064 NULL
+ceph_create_snap_context_19082 ceph_create_snap_context 1 19082 NULL
+sta_last_seq_ctrl_read_19106 sta_last_seq_ctrl_read 3 19106 NULL
+cifs_readv_from_socket_19109 cifs_readv_from_socket 3 19109 NULL
++skb_gro_offset_19123 skb_gro_offset 0 19123 NULL
++cma_bitmap_maxno_19135 cma_bitmap_maxno 0 19135 NULL
+snd_als4k_iobase_readl_19136 snd_als4k_iobase_readl 0 19136 NULL
+alloc_irdadev_19140 alloc_irdadev 1 19140 NULL
+sleep_auth_read_19159 sleep_auth_read 3 19159 NULL
+smk_write_access2_19170 smk_write_access2 3 19170 NULL
++read_extent_buffer_to_user_19189 read_extent_buffer_to_user 4-3 19189 NULL
+iwl_dbgfs_reply_tx_error_read_19205 iwl_dbgfs_reply_tx_error_read 3 19205 NULL
-+vmw_unlocked_ioctl_19212 vmw_unlocked_ioctl 2 19212 NULL
-+__copy_to_user_inatomic_19214 __copy_to_user_inatomic 3-0 19214 NULL
++__copy_to_user_inatomic_19214 __copy_to_user_inatomic 0-3 19214 NULL
+dev_counters_read_19216 dev_counters_read 3 19216 NULL
+wbcir_tx_19219 wbcir_tx 3 19219 NULL
+snd_mask_max_19224 snd_mask_max 0 19224 NULL
@@ -120616,6 +120073,7 @@ index 0000000..3d3508d
+interpret_user_input_19393 interpret_user_input 2 19393 NULL
+sync_fill_pt_info_19397 sync_fill_pt_info 0 19397 NULL
+pep_recvmsg_19402 pep_recvmsg 4 19402 NULL
++hid_hw_raw_request_19408 hid_hw_raw_request 0 19408 NULL
+dvbdmx_write_19423 dvbdmx_write 3 19423 NULL
+SyS_sched_getaffinity_19444 SyS_sched_getaffinity 2 19444 NULL
+xfrm_alg_auth_len_19454 xfrm_alg_auth_len 0 19454 NULL
@@ -120627,21 +120085,19 @@ index 0000000..3d3508d
+ext4_add_new_descs_19509 ext4_add_new_descs 3 19509 NULL
+batadv_tvlv_container_register_19520 batadv_tvlv_container_register 5 19520 NULL
+ttm_dma_page_pool_free_19527 ttm_dma_page_pool_free 2-0 19527 NULL
-+apei_exec_pre_map_gars_19529 apei_exec_pre_map_gars 0 19529 NULL nohasharray
-+cfc_write_array_to_buffer_19529 cfc_write_array_to_buffer 3 19529 &apei_exec_pre_map_gars_19529
++cfc_write_array_to_buffer_19529 cfc_write_array_to_buffer 3 19529 NULL
+nfc_llcp_build_tlv_19536 nfc_llcp_build_tlv 3 19536 NULL
+gfn_to_index_19558 gfn_to_index 0-1-3-2 19558 NULL
+ocfs2_control_message_19564 ocfs2_control_message 3 19564 NULL
+nfsd_read_19568 nfsd_read 5 19568 NULL
+ieee80211_key_alloc_19575 ieee80211_key_alloc 3 19575 NULL
-+mnt_want_write_file_19579 mnt_want_write_file 0 19579 NULL
+bm_status_read_19583 bm_status_read 3 19583 NULL
+load_xattr_datum_19594 load_xattr_datum 0 19594 NULL
-+fallocate_chunk_19610 fallocate_chunk 0 19610 NULL
++drbg_sec_strength_19604 drbg_sec_strength 0 19604 NULL
+__mei_cl_recv_19636 __mei_cl_recv 3 19636 NULL
++parser_init_19651 parser_init 2 19651 NULL
+LoadBitmap_19658 LoadBitmap 2 19658 NULL
+memblock_virt_alloc_low_nopanic_19714 memblock_virt_alloc_low_nopanic 1 19714 NULL
-+ocfs2_control_get_this_node_19721 ocfs2_control_get_this_node 0 19721 NULL
+read_reg_19723 read_reg 0 19723 NULL
+wm8350_block_write_19727 wm8350_block_write 2-3 19727 NULL
+memcpy_toiovecend_19736 memcpy_toiovecend 4-3 19736 NULL
@@ -120651,8 +120107,8 @@ index 0000000..3d3508d
+ocfs2_readpages_19759 ocfs2_readpages 4 19759 NULL
+jffs2_acl_from_medium_19762 jffs2_acl_from_medium 2 19762 NULL
+readhscx_19769 readhscx 0 19769 NULL
++ath10k_write_htt_max_amsdu_ampdu_19820 ath10k_write_htt_max_amsdu_ampdu 3 19820 NULL
+irda_setsockopt_19824 irda_setsockopt 5 19824 NULL
-+xfs_bmap_add_extent_hole_real_19828 xfs_bmap_add_extent_hole_real 0 19828 NULL
+vfs_getxattr_19832 vfs_getxattr 0 19832 NULL
+crypt_alloc_buffer_19846 crypt_alloc_buffer 2 19846 NULL
+cfg80211_mlme_register_mgmt_19852 cfg80211_mlme_register_mgmt 5 19852 NULL
@@ -120661,31 +120117,36 @@ index 0000000..3d3508d
+aes_decrypt_interrupt_read_19910 aes_decrypt_interrupt_read 3 19910 NULL
+ps_upsd_max_apturn_read_19918 ps_upsd_max_apturn_read 3 19918 NULL
+mangle_name_19923 mangle_name 0 19923 NULL
++tipc_sk_show_19928 tipc_sk_show 3-0 19928 NULL
+cgroup_task_count_19930 cgroup_task_count 0 19930 NULL
+guest_read_tsc_19931 guest_read_tsc 0 19931 NULL
++azx_get_pos_lpib_19933 azx_get_pos_lpib 0 19933 NULL
++v4l2_ctrl_new_19942 v4l2_ctrl_new 8-12 19942 NULL
+iwl_dbgfs_rx_queue_read_19943 iwl_dbgfs_rx_queue_read 3 19943 NULL
+cfg80211_rx_assoc_resp_19944 cfg80211_rx_assoc_resp 4 19944 NULL
+ll_xattr_cache_list_19954 ll_xattr_cache_list 0 19954 NULL
+get_jack_mode_name_19976 get_jack_mode_name 4 19976 NULL
+attach_hdlc_protocol_19986 attach_hdlc_protocol 3 19986 NULL
-+rtw_set_wps_probe_resp_19989 rtw_set_wps_probe_resp 3 19989 NULL
++rtw_set_wps_probe_resp_19989 rtw_set_wps_probe_resp 3 19989 NULL nohasharray
++i40e_reserve_msix_vectors_19989 i40e_reserve_msix_vectors 2 19989 &rtw_set_wps_probe_resp_19989
++lustre_pack_request_19992 lustre_pack_request 3 19992 NULL
++find_overflow_devnum_19995 find_overflow_devnum 0 19995 NULL
+diva_um_idi_read_20003 diva_um_idi_read 0 20003 NULL
-+event_trigger_write_20009 event_trigger_write 3 20009 NULL nohasharray
-+lov_stripe_md_size_20009 lov_stripe_md_size 0-1 20009 &event_trigger_write_20009
++lov_stripe_md_size_20009 lov_stripe_md_size 0-1 20009 NULL nohasharray
++event_trigger_write_20009 event_trigger_write 3 20009 &lov_stripe_md_size_20009
+tree_mod_log_eb_move_20011 tree_mod_log_eb_move 5 20011 NULL
+SYSC_fgetxattr_20027 SYSC_fgetxattr 4 20027 NULL
+split_scan_timeout_read_20029 split_scan_timeout_read 3 20029 NULL
-+alloc_ieee80211_20063 alloc_ieee80211 1 20063 NULL
-+iwl_mvm_power_mac_dbgfs_read_20067 iwl_mvm_power_mac_dbgfs_read 4 20067 NULL
++iwl_mvm_power_mac_dbgfs_read_20067 iwl_mvm_power_mac_dbgfs_read 0-4 20067 NULL
+target_message_20072 target_message 2 20072 NULL
+rawv6_sendmsg_20080 rawv6_sendmsg 4 20080 NULL
+fuse_conn_limit_read_20084 fuse_conn_limit_read 3 20084 NULL
+aat2870_reg_write_file_20086 aat2870_reg_write_file 3 20086 NULL
+team_options_register_20091 team_options_register 3 20091 NULL
+qla2x00_adjust_sdev_qdepth_up_20097 qla2x00_adjust_sdev_qdepth_up 2 20097 NULL
-+xfs_qm_dqget_20103 xfs_qm_dqget 0 20103 NULL
+root_nfs_copy_20111 root_nfs_copy 3 20111 NULL
+hptiop_adjust_disk_queue_depth_20122 hptiop_adjust_disk_queue_depth 2 20122 NULL
++ext4_ext_direct_IO_20165 ext4_ext_direct_IO 4 20165 NULL
+tomoyo_commit_ok_20167 tomoyo_commit_ok 2 20167 NULL
+read_flush_pipefs_20171 read_flush_pipefs 3 20171 NULL
+wep_addr_key_count_read_20174 wep_addr_key_count_read 3 20174 NULL
@@ -120702,10 +120163,9 @@ index 0000000..3d3508d
+gfs2_glock_nq_m_20347 gfs2_glock_nq_m 1 20347 NULL
+handle_arr_calc_size_20355 handle_arr_calc_size 0-1 20355 NULL
+smk_set_cipso_20379 smk_set_cipso 3 20379 NULL
-+snd_nm256_readl_20394 snd_nm256_readl 0 20394 NULL nohasharray
-+read_7220_creg32_20394 read_7220_creg32 0 20394 &snd_nm256_readl_20394
-+__kfifo_from_user_20399 __kfifo_from_user 3 20399 NULL nohasharray
-+SyS_get_mempolicy_20399 SyS_get_mempolicy 3 20399 &__kfifo_from_user_20399
++snd_nm256_readl_20394 snd_nm256_readl 0 20394 NULL
++SyS_get_mempolicy_20399 SyS_get_mempolicy 3 20399 NULL nohasharray
++__kfifo_from_user_20399 __kfifo_from_user 3 20399 &SyS_get_mempolicy_20399
+compat_ipv6_setsockopt_20468 compat_ipv6_setsockopt 5 20468 NULL
+read_buf_20469 read_buf 2 20469 NULL
+bio_trim_20472 bio_trim 2 20472 NULL
@@ -120717,39 +120177,38 @@ index 0000000..3d3508d
+venus_create_20555 venus_create 4 20555 NULL
+btrfs_super_log_root_20565 btrfs_super_log_root 0 20565 NULL
+crypto_ahash_reqsize_20569 crypto_ahash_reqsize 0 20569 NULL
-+xfs_bmap_isaeof_20570 xfs_bmap_isaeof 0 20570 NULL
-+ocfs2_cluster_lock_20588 ocfs2_cluster_lock 0 20588 NULL
+kvm_test_age_hva_20593 kvm_test_age_hva 2 20593 NULL
++set_secure_conn_20596 set_secure_conn 4 20596 NULL
+sync_timeline_create_20601 sync_timeline_create 2 20601 NULL
+lirc_write_20604 lirc_write 3 20604 NULL
-+qib_qsfp_write_20614 qib_qsfp_write 0-2-4 20614 NULL
++qib_qsfp_write_20614 qib_qsfp_write 0-4-2 20614 NULL
+snd_pcm_oss_prepare_20641 snd_pcm_oss_prepare 0 20641 NULL
+get_extent_skip_holes_20642 get_extent_skip_holes 2 20642 NULL
+kfifo_copy_to_user_20646 kfifo_copy_to_user 3-4 20646 NULL
+cpulist_scnprintf_20648 cpulist_scnprintf 2-0 20648 NULL
+oz_add_farewell_20652 oz_add_farewell 5 20652 NULL
+oz_cdev_read_20659 oz_cdev_read 3 20659 NULL
-+snd_hdsp_playback_copy_20676 snd_hdsp_playback_copy 5 20676 NULL nohasharray
-+btrfs_qgroup_reserve_20676 btrfs_qgroup_reserve 0 20676 &snd_hdsp_playback_copy_20676
++snd_hdsp_playback_copy_20676 snd_hdsp_playback_copy 5 20676 NULL
+dvb_dmxdev_buffer_read_20682 dvb_dmxdev_buffer_read 0-4 20682 NULL
+cpumask_size_20683 cpumask_size 0 20683 NULL
+btrfs_node_blockptr_20685 btrfs_node_blockptr 0 20685 NULL
++xpcs_reg_addr_write_20694 xpcs_reg_addr_write 3 20694 NULL
+read_file_tgt_int_stats_20697 read_file_tgt_int_stats 3 20697 NULL
+__maestro_read_20700 __maestro_read 0 20700 NULL
+cipso_v4_gentag_rng_20703 cipso_v4_gentag_rng 0 20703 NULL
+pcpu_page_first_chunk_20712 pcpu_page_first_chunk 1 20712 NULL
++hfs_direct_IO_20714 hfs_direct_IO 4 20714 NULL
+ocfs2_read_xattr_bucket_20722 ocfs2_read_xattr_bucket 0 20722 NULL
+security_context_to_sid_force_20724 security_context_to_sid_force 2 20724 NULL
+fb_prepare_logo_20743 fb_prepare_logo 0 20743 NULL
+vol_cdev_direct_write_20751 vol_cdev_direct_write 3 20751 NULL
+ocfs2_align_bytes_to_clusters_20754 ocfs2_align_bytes_to_clusters 2 20754 NULL
-+brcmf_p2p_escan_20763 brcmf_p2p_escan 2 20763 NULL nohasharray
-+mnt_clone_write_20763 mnt_clone_write 0 20763 &brcmf_p2p_escan_20763
++brcmf_p2p_escan_20763 brcmf_p2p_escan 2 20763 NULL
+fb_alloc_cmap_gfp_20792 fb_alloc_cmap_gfp 2 20792 NULL
+iwl_dbgfs_rxon_flags_read_20795 iwl_dbgfs_rxon_flags_read 3 20795 NULL
++edid_write_20797 edid_write 3 20797 NULL
+lowpan_write_20800 lowpan_write 3 20800 NULL
-+strndup_user_20819 strndup_user 2 20819 NULL nohasharray
-+do_glock_20819 do_glock 0 20819 &strndup_user_20819
++strndup_user_20819 strndup_user 2 20819 NULL
+tipc_msg_build_20825 tipc_msg_build 3 20825 NULL
+wl1271_format_buffer_20834 wl1271_format_buffer 2 20834 NULL
+uvc_alloc_entity_20836 uvc_alloc_entity 4-3 20836 NULL
@@ -120760,12 +120219,14 @@ index 0000000..3d3508d
+snd_pcm_capture_avail_20867 snd_pcm_capture_avail 0 20867 NULL
+srq_free_res_20868 srq_free_res 5 20868 NULL
+cfs_cpt_table_create_20884 cfs_cpt_table_create 1 20884 NULL
++req_capsule_filled_sizes_20888 req_capsule_filled_sizes 0 20888 NULL
+rb_simple_write_20890 rb_simple_write 3 20890 NULL
+sisusb_send_packet_20891 sisusb_send_packet 2 20891 NULL
+key_icverrors_read_20895 key_icverrors_read 3 20895 NULL
+vfio_msi_enable_20906 vfio_msi_enable 2 20906 NULL
+lbs_rdbbp_write_20918 lbs_rdbbp_write 3 20918 NULL
+htable_bits_20933 htable_bits 0 20933 NULL
++cfg80211_rx_assoc_resp_20934 cfg80211_rx_assoc_resp 4 20934 NULL
+altera_set_ir_post_20948 altera_set_ir_post 2 20948 NULL
+rx_rx_phy_hdr_read_20950 rx_rx_phy_hdr_read 3 20950 NULL
+rsxx_cram_read_20957 rsxx_cram_read 3 20957 NULL
@@ -120773,13 +120234,12 @@ index 0000000..3d3508d
+snd_rme9652_playback_copy_20970 snd_rme9652_playback_copy 5 20970 NULL
+alg_setsockopt_20985 alg_setsockopt 5 20985 NULL
+qib_verbs_send_20999 qib_verbs_send 5-3 20999 NULL
-+btrfs_dirty_pages_21019 btrfs_dirty_pages 0 21019 NULL
+btrfs_inode_ref_name_len_21024 btrfs_inode_ref_name_len 0 21024 NULL
-+xfs_btree_new_root_21028 xfs_btree_new_root 0 21028 NULL
++arch_gnttab_init_21030 arch_gnttab_init 1 21030 NULL
+rx_defrag_tkip_called_read_21031 rx_defrag_tkip_called_read 3 21031 NULL
+srp_change_queue_depth_21038 srp_change_queue_depth 2 21038 NULL
++fsl_edma_prep_dma_cyclic_21042 fsl_edma_prep_dma_cyclic 4-3 21042 NULL
+lbs_threshold_read_21046 lbs_threshold_read 5 21046 NULL
-+reiserfs_direct_IO_21051 reiserfs_direct_IO 4 21051 NULL
+proc_fault_inject_write_21058 proc_fault_inject_write 3 21058 NULL
+qdisc_get_default_21072 qdisc_get_default 2 21072 NULL
+event_calibration_read_21083 event_calibration_read 3 21083 NULL
@@ -120789,41 +120249,41 @@ index 0000000..3d3508d
+ath6kl_send_go_probe_resp_21113 ath6kl_send_go_probe_resp 3 21113 NULL
+_efx_mcdi_rpc_async_21119 _efx_mcdi_rpc_async 4-5 21119 NULL
+i2400m_rx_trace_21127 i2400m_rx_trace 3 21127 NULL
++mei_dbgfs_read_active_21172 mei_dbgfs_read_active 3 21172 NULL
++bioset_create_nobvec_21180 bioset_create_nobvec 1 21180 NULL
+cx18_v4l2_read_21196 cx18_v4l2_read 3 21196 NULL
+ipc_rcu_alloc_21208 ipc_rcu_alloc 1 21208 NULL
+scsi_execute_req_flags_21215 scsi_execute_req_flags 5 21215 NULL
+get_numpages_21227 get_numpages 0-1-2 21227 NULL
+input_ff_create_21240 input_ff_create 2 21240 NULL
+cfg80211_notify_new_peer_candidate_21242 cfg80211_notify_new_peer_candidate 4 21242 NULL
-+use_debug_keys_read_21251 use_debug_keys_read 3 21251 NULL
+fru_length_21257 fru_length 0 21257 NULL
+rtw_set_wps_beacon_21262 rtw_set_wps_beacon 3 21262 NULL
+ocfs2_blocks_for_bytes_21268 ocfs2_blocks_for_bytes 0-2 21268 NULL
-+xfs_alloc_ag_vextent_size_21276 xfs_alloc_ag_vextent_size 0 21276 NULL
++drm_universal_plane_init_21296 drm_universal_plane_init 6 21296 NULL
+do_msg_fill_21307 do_msg_fill 3 21307 NULL
+add_res_range_21310 add_res_range 4 21310 NULL
+get_zeroed_page_21322 get_zeroed_page 0 21322 NULL
+ftrace_profile_read_21327 ftrace_profile_read 3 21327 NULL
+read_file_bool_bmps_21344 read_file_bool_bmps 3 21344 NULL
++azx_get_delay_from_lpib_21348 azx_get_delay_from_lpib 3 21348 NULL
+gfs2_ea_get_copy_21353 gfs2_ea_get_copy 0 21353 NULL
++allocate_cmdlines_buffer_21355 allocate_cmdlines_buffer 1 21355 NULL
+alloc_orinocodev_21371 alloc_orinocodev 1 21371 NULL
+SYSC_rt_sigpending_21379 SYSC_rt_sigpending 2 21379 NULL
+video_ioctl2_21380 video_ioctl2 2 21380 NULL
+insert_ptr_21386 insert_ptr 6 21386 NULL
+diva_get_driver_dbg_mask_21399 diva_get_driver_dbg_mask 0 21399 NULL
-+__clone_and_map_simple_bio_21404 __clone_and_map_simple_bio 4 21404 NULL
+snd_m3_inw_21406 snd_m3_inw 0 21406 NULL
+usnic_ib_dump_vf_hdr_21423 usnic_ib_dump_vf_hdr 3 21423 NULL
+snapshot_read_next_21426 snapshot_read_next 0 21426 NULL
+tcp_bound_to_half_wnd_21429 tcp_bound_to_half_wnd 0-2 21429 NULL
-+tracing_saved_cmdlines_read_21434 tracing_saved_cmdlines_read 3 21434 NULL
+aggr_size_tx_agg_vs_rate_read_21438 aggr_size_tx_agg_vs_rate_read 3 21438 NULL
++nouveau_clock_create__21449 nouveau_clock_create_ 8 21449 NULL
+__ertm_hdr_size_21450 __ertm_hdr_size 0 21450 NULL
-+ReadISAR_21453 ReadISAR 0 21453 NULL
+mei_nfc_send_21477 mei_nfc_send 3 21477 NULL
+read_file_xmit_21487 read_file_xmit 3 21487 NULL
+mmc_alloc_sg_21504 mmc_alloc_sg 1 21504 NULL
-+btrfs_file_aio_write_21520 btrfs_file_aio_write 4 21520 NULL
+il_dbgfs_stations_read_21532 il_dbgfs_stations_read 3 21532 NULL
+cipso_v4_map_cat_enum_hton_21540 cipso_v4_map_cat_enum_hton 0 21540 NULL
+rxrpc_send_data_21553 rxrpc_send_data 5 21553 NULL
@@ -120832,15 +120292,14 @@ index 0000000..3d3508d
+snd_es18xx_mixer_read_21586 snd_es18xx_mixer_read 0 21586 NULL
+ocfs2_acl_from_xattr_21604 ocfs2_acl_from_xattr 2 21604 NULL
+filemap_get_page_21606 filemap_get_page 2 21606 NULL
-+gfs2_glock_nq_init_21624 gfs2_glock_nq_init 0 21624 NULL
+ocfs2_refcount_cow_hunk_21630 ocfs2_refcount_cow_hunk 3-4 21630 NULL
+__jfs_getxattr_21631 __jfs_getxattr 0 21631 NULL
+atalk_sendmsg_21677 atalk_sendmsg 4 21677 NULL
+ocfs2_xattr_get_nolock_21678 ocfs2_xattr_get_nolock 0 21678 NULL
-+rtllib_alloc_txb_21687 rtllib_alloc_txb 1 21687 NULL
++regmap_register_patch_21681 regmap_register_patch 3 21681 NULL
++rtllib_alloc_txb_21687 rtllib_alloc_txb 1 21687 NULL nohasharray
++proc_maps_open_21687 proc_maps_open 4 21687 &rtllib_alloc_txb_21687
+evdev_ioctl_handler_21705 evdev_ioctl_handler 2 21705 NULL
-+xfs_btree_insert_21712 xfs_btree_insert 0 21712 NULL
-+update_time_21719 update_time 0 21719 NULL
+unix_skb_len_21722 unix_skb_len 0 21722 NULL
+lprocfs_wr_import_21728 lprocfs_wr_import 3 21728 NULL
+mthca_alloc_init_21754 mthca_alloc_init 2 21754 NULL
@@ -120848,15 +120307,18 @@ index 0000000..3d3508d
+gen_pool_add_21776 gen_pool_add 3 21776 NULL
+xfs_da_grow_inode_int_21785 xfs_da_grow_inode_int 3 21785 NULL
+dvb_generic_ioctl_21810 dvb_generic_ioctl 2 21810 NULL
-+__ocfs2_cluster_lock_21812 __ocfs2_cluster_lock 0 21812 NULL
+_iwl_dbgfs_sta_drain_write_21837 _iwl_dbgfs_sta_drain_write 3 21837 NULL
+oom_adj_read_21847 oom_adj_read 3 21847 NULL
+lpfc_idiag_extacc_avail_get_21865 lpfc_idiag_extacc_avail_get 0-3 21865 NULL
+brcms_debugfs_hardware_read_21867 brcms_debugfs_hardware_read 3 21867 NULL
++msix_capability_init_21870 msix_capability_init 0 21870 NULL
+sisusbcon_bmove_21873 sisusbcon_bmove 6-5-7 21873 NULL
+ldlm_lock_create_21888 ldlm_lock_create 7 21888 NULL
-+dbAllocCtl_21911 dbAllocCtl 0 21911 NULL
++__btrfs_direct_write_21894 __btrfs_direct_write 3 21894 NULL
++dbAllocCtl_21911 dbAllocCtl 0 21911 NULL nohasharray
++nvme_submit_sync_cmd_21911 nvme_submit_sync_cmd 0 21911 &dbAllocCtl_21911
+qsfp_1_read_21915 qsfp_1_read 3 21915 NULL
++twl_i2c_write_u16_21953 twl_i2c_write_u16 3 21953 NULL
+__build_xattrs_21979 __build_xattrs 0 21979 NULL
+SYSC_prctl_21980 SYSC_prctl 4 21980 NULL
+compat_rw_copy_check_uvector_22001 compat_rw_copy_check_uvector 0-3 22001 NULL nohasharray
@@ -120864,18 +120326,16 @@ index 0000000..3d3508d
+regcache_sync_block_raw_flush_22021 regcache_sync_block_raw_flush 3-4 22021 NULL
+btrfs_get_16_22023 btrfs_get_16 0 22023 NULL
+_sp2d_min_pg_22032 _sp2d_min_pg 0 22032 NULL
-+lookup_metapath_22039 lookup_metapath 0 22039 NULL
+zd_usb_read_fw_22049 zd_usb_read_fw 4 22049 NULL
+ieee80211_if_fmt_dropped_frames_ttl_22054 ieee80211_if_fmt_dropped_frames_ttl 3 22054 NULL
+btrfs_reloc_clone_csums_22077 btrfs_reloc_clone_csums 2-3 22077 NULL
+mem_rw_22085 mem_rw 3 22085 NULL
-+xfs_bmapi_reserve_delalloc_22086 xfs_bmapi_reserve_delalloc 0 22086 NULL
+kstrtos32_from_user_22087 kstrtos32_from_user 2 22087 NULL
+rt2x00debug_read_crypto_stats_22109 rt2x00debug_read_crypto_stats 3 22109 NULL
-+shmem_add_to_page_cache_22121 shmem_add_to_page_cache 0 22121 NULL
+snd_hda_codec_read_22130 snd_hda_codec_read 0 22130 NULL
+SyS_sched_setaffinity_22148 SyS_sched_setaffinity 2 22148 NULL
+do_tcp_sendpages_22155 do_tcp_sendpages 4 22155 NULL
++nve0_aux_mask_22158 nve0_aux_mask 2 22158 NULL
+__kfifo_alloc_22173 __kfifo_alloc 3 22173 NULL
+rfcomm_sock_recvmsg_22227 rfcomm_sock_recvmsg 4 22227 NULL
+mem_write_22232 mem_write 3 22232 NULL
@@ -120884,7 +120344,6 @@ index 0000000..3d3508d
+compat_process_vm_rw_22254 compat_process_vm_rw 3-5 22254 NULL
+ping_common_sendmsg_22261 ping_common_sendmsg 5 22261 NULL
+add_res_tree_22263 add_res_tree 7 22263 NULL
-+__btrfs_direct_write_22273 __btrfs_direct_write 4-0 22273 NULL
+queue_max_sectors_22280 queue_max_sectors 0 22280 NULL
+__tun_chr_ioctl_22300 __tun_chr_ioctl 4 22300 NULL nohasharray
+pci_vpd_srdt_size_22300 pci_vpd_srdt_size 0 22300 &__tun_chr_ioctl_22300
@@ -120903,13 +120362,16 @@ index 0000000..3d3508d
+queue_max_segments_22441 queue_max_segments 0 22441 NULL
+handle_received_packet_22457 handle_received_packet 3 22457 NULL
+ecryptfs_write_22488 ecryptfs_write 4-3 22488 NULL
-+qib_user_sdma_alloc_header_22490 qib_user_sdma_alloc_header 2 22490 NULL
++qib_user_sdma_alloc_header_22490 qib_user_sdma_alloc_header 2 22490 NULL nohasharray
++video_write_22490 video_write 3 22490 &qib_user_sdma_alloc_header_22490
+cache_write_procfs_22491 cache_write_procfs 3 22491 NULL
+mutex_lock_interruptible_22505 mutex_lock_interruptible 0 22505 NULL
+trim_no_bitmap_22524 trim_no_bitmap 4-3 22524 NULL
++ntb_setup_bwd_msix_22549 ntb_setup_bwd_msix 2 22549 NULL
+ocfs2_read_extent_block_22550 ocfs2_read_extent_block 0 22550 NULL
+agp_alloc_page_array_22554 agp_alloc_page_array 1 22554 NULL
+dbFindCtl_22587 dbFindCtl 0 22587 NULL
++cfs_expr_list_values_22600 cfs_expr_list_values 0 22600 NULL
+snapshot_read_22601 snapshot_read 3 22601 NULL
+sctp_setsockopt_connectx_old_22631 sctp_setsockopt_connectx_old 3 22631 NULL
+ide_core_cp_entry_22636 ide_core_cp_entry 3 22636 NULL
@@ -120917,25 +120379,21 @@ index 0000000..3d3508d
+pwr_wake_on_timer_exp_read_22640 pwr_wake_on_timer_exp_read 3 22640 NULL
+iwl_dbgfs_calib_disabled_read_22649 iwl_dbgfs_calib_disabled_read 3 22649 NULL
+compat_SyS_msgrcv_22661 compat_SyS_msgrcv 3 22661 NULL
-+ext4_ext_direct_IO_22679 ext4_ext_direct_IO 4 22679 NULL
+l2tp_ip_recvmsg_22681 l2tp_ip_recvmsg 4 22681 NULL
+bch_dump_read_22685 bch_dump_read 3 22685 NULL
+reg_umr_22686 reg_umr 5 22686 NULL
++SYSC_vmsplice_22697 SYSC_vmsplice 3 22697 NULL
+nr_cpusets_22705 nr_cpusets 0 22705 NULL
+alloc_libipw_22708 alloc_libipw 1 22708 NULL
+cx18_copy_buf_to_user_22735 cx18_copy_buf_to_user 4-0 22735 NULL
+ceph_decode_32_22738 ceph_decode_32 0 22738 NULL nohasharray
+__mei_cl_send_22738 __mei_cl_send 3 22738 &ceph_decode_32_22738
-+__writeback_single_inode_22739 __writeback_single_inode 0 22739 NULL
+iio_debugfs_write_reg_22742 iio_debugfs_write_reg 3 22742 NULL
+qlcnic_sriov_init_22762 qlcnic_sriov_init 2 22762 NULL
+print_frame_22769 print_frame 0 22769 NULL
+ftrace_arch_read_dyn_info_22773 ftrace_arch_read_dyn_info 0 22773 NULL
-+__break_lease_22777 __break_lease 0 22777 NULL
+vnic_dev_get_res_count_22791 vnic_dev_get_res_count 0 22791 NULL
-+pla_ocp_write_22802 pla_ocp_write 4 22802 NULL
+__generic_copy_to_user_intel_22806 __generic_copy_to_user_intel 0-3 22806 NULL
-+read_file_rcstat_22854 read_file_rcstat 3 22854 NULL
+create_attr_set_22861 create_attr_set 1 22861 NULL
+hash_ip6_expire_22867 hash_ip6_expire 4 22867 NULL
+vmw_execbuf_process_22885 vmw_execbuf_process 5 22885 NULL
@@ -120943,6 +120401,7 @@ index 0000000..3d3508d
+mdc800_device_read_22896 mdc800_device_read 3 22896 NULL
+ion_handle_test_kernel_22900 ion_handle_test_kernel 4-3 22900 NULL nohasharray
+policy_emit_config_values_22900 policy_emit_config_values 3 22900 &ion_handle_test_kernel_22900
++nfs4_acl_bytes_22915 nfs4_acl_bytes 0-1 22915 NULL
+__set_xattr_22923 __set_xattr 0 22923 NULL
+xstateregs_set_22932 xstateregs_set 4 22932 NULL
+pcpu_mem_zalloc_22948 pcpu_mem_zalloc 1 22948 NULL
@@ -120955,11 +120414,10 @@ index 0000000..3d3508d
+remote_settings_file_write_22987 remote_settings_file_write 3 22987 NULL
+viafb_dvp0_proc_write_23023 viafb_dvp0_proc_write 3 23023 NULL
+cifs_local_to_utf16_bytes_23025 cifs_local_to_utf16_bytes 0 23025 NULL
-+ocfs2_refcount_cow_xattr_23029 ocfs2_refcount_cow_xattr 0-6-7 23029 NULL
++ocfs2_refcount_cow_xattr_23029 ocfs2_refcount_cow_xattr 6-7 23029 NULL
+st_status_23032 st_status 5 23032 NULL
+nv50_disp_chan_create__23056 nv50_disp_chan_create_ 5 23056 NULL
+comedi_buf_write_n_available_23057 comedi_buf_write_n_available 0 23057 NULL
-+security_inode_killpriv_23060 security_inode_killpriv 0 23060 NULL
+reiserfs_add_entry_23062 reiserfs_add_entry 4 23062 NULL nohasharray
+unix_seqpacket_recvmsg_23062 unix_seqpacket_recvmsg 4 23062 &reiserfs_add_entry_23062
+mei_cl_send_23068 mei_cl_send 3 23068 NULL
@@ -120969,12 +120427,10 @@ index 0000000..3d3508d
+isr_tx_procs_read_23084 isr_tx_procs_read 3 23084 NULL
+rt2x00debug_write_eeprom_23091 rt2x00debug_write_eeprom 3 23091 NULL
+ntfs_ucstonls_23097 ntfs_ucstonls 3-5 23097 NULL
-+xfs_dir_ialloc_23100 xfs_dir_ialloc 0 23100 NULL
-+pipe_iov_copy_from_user_23102 pipe_iov_copy_from_user 3 23102 NULL
+dgram_recvmsg_23104 dgram_recvmsg 4 23104 NULL
+mwl8k_cmd_set_beacon_23110 mwl8k_cmd_set_beacon 4 23110 NULL
-+nl80211_send_rx_auth_23111 nl80211_send_rx_auth 4 23111 NULL nohasharray
-+bset_tree_bytes_23111 bset_tree_bytes 0 23111 &nl80211_send_rx_auth_23111
++bset_tree_bytes_23111 bset_tree_bytes 0 23111 NULL nohasharray
++nl80211_send_rx_auth_23111 nl80211_send_rx_auth 4 23111 &bset_tree_bytes_23111
+__clear_user_23118 __clear_user 0-2 23118 NULL
+drm_mode_create_tv_properties_23122 drm_mode_create_tv_properties 2 23122 NULL
+ata_scsi_change_queue_depth_23126 ata_scsi_change_queue_depth 2 23126 NULL
@@ -120982,34 +120438,36 @@ index 0000000..3d3508d
+usblp_write_23178 usblp_write 3 23178 NULL
+gss_pipe_downcall_23182 gss_pipe_downcall 3 23182 NULL
+mpi_alloc_limb_space_23190 mpi_alloc_limb_space 1 23190 NULL
++tipc_sendmcast_23214 tipc_sendmcast 4 23214 NULL
++mcryptd_alloc_instance_23221 mcryptd_alloc_instance 2-3 23221 NULL
++nft_hash_tbl_alloc_23224 nft_hash_tbl_alloc 1 23224 NULL
+tty_buffer_request_room_23228 tty_buffer_request_room 2-0 23228 NULL
+xlog_get_bp_23229 xlog_get_bp 2 23229 NULL nohasharray
+__read_status_pci_23229 __read_status_pci 0 23229 &xlog_get_bp_23229
+ft1000_read_dpram_mag_32_23232 ft1000_read_dpram_mag_32 0 23232 NULL
+rxrpc_client_sendmsg_23236 rxrpc_client_sendmsg 5 23236 NULL
-+__gfn_to_rmap_23240 __gfn_to_rmap 2-1 23240 NULL
++__gfn_to_rmap_23240 __gfn_to_rmap 1-2 23240 NULL
+nv50_ram_create__23241 nv50_ram_create_ 4 23241 NULL
+sctp_recvmsg_23265 sctp_recvmsg 4 23265 NULL
+uwb_dev_addr_print_23282 uwb_dev_addr_print 2 23282 NULL
++ec_i2c_count_message_23285 ec_i2c_count_message 0-2 23285 NULL
+diva_get_trace_filter_23286 diva_get_trace_filter 0 23286 NULL
+i2cdev_write_23310 i2cdev_write 3 23310 NULL
+__aa_kvmalloc_23320 __aa_kvmalloc 1 23320 NULL
+page_readlink_23346 page_readlink 3 23346 NULL
+kmem_zalloc_large_23351 kmem_zalloc_large 1 23351 NULL
-+get_dst_timing_23358 get_dst_timing 0 23358 NULL nohasharray
-+write_inode_23358 write_inode 0 23358 &get_dst_timing_23358
++get_dst_timing_23358 get_dst_timing 0 23358 NULL
+fd_setup_write_same_buf_23369 fd_setup_write_same_buf 3 23369 NULL
+iscsi_change_queue_depth_23416 iscsi_change_queue_depth 2 23416 NULL
-+vga_mm_r_23419 vga_mm_r 0 23419 NULL
+ocfs2_zero_tail_23447 ocfs2_zero_tail 3 23447 NULL
+hidraw_send_report_23449 hidraw_send_report 3 23449 NULL
+__ata_change_queue_depth_23484 __ata_change_queue_depth 3 23484 NULL
-+linear_conf_23485 linear_conf 2 23485 NULL nohasharray
-+sync_mapping_buffers_23485 sync_mapping_buffers 0 23485 &linear_conf_23485
++linear_conf_23485 linear_conf 2 23485 NULL
+event_filter_read_23494 event_filter_read 3 23494 NULL
+lustre_acl_xattr_merge2ext_23502 lustre_acl_xattr_merge2ext 2 23502 NULL
+devm_iio_device_alloc_23511 devm_iio_device_alloc 2 23511 NULL
+__proc_cpt_table_23516 __proc_cpt_table 5 23516 NULL
++hash_ipmark6_expire_23518 hash_ipmark6_expire 4 23518 NULL
+ima_show_measurements_count_23536 ima_show_measurements_count 3 23536 NULL
+tcp_current_mss_23552 tcp_current_mss 0 23552 NULL
+btrfs_super_bytenr_23561 btrfs_super_bytenr 0 23561 NULL
@@ -121018,13 +120476,12 @@ index 0000000..3d3508d
+xfpregs_get_23586 xfpregs_get 4 23586 NULL
+snd_interval_min_23590 snd_interval_min 0 23590 NULL
+islpci_mgt_transaction_23610 islpci_mgt_transaction 5 23610 NULL
-+xfs_qm_dqread_23613 xfs_qm_dqread 0 23613 NULL
-+ocfs2_journal_access_23616 ocfs2_journal_access 0 23616 NULL
+__i2400mu_send_barker_23652 __i2400mu_send_barker 3 23652 NULL
+sInW_23663 sInW 0 23663 NULL
+SyS_connect_23669 SyS_connect 3 23669 NULL
+cx18_read_23699 cx18_read 3 23699 NULL
+at_get_23708 at_get 0 23708 NULL
++get_conn_info_23723 get_conn_info 4 23723 NULL
+rx_rx_dropped_frame_read_23748 rx_rx_dropped_frame_read 3 23748 NULL
+__kfifo_max_r_23768 __kfifo_max_r 0-2-1 23768 NULL
+__build_packet_message_23778 __build_packet_message 4-10 23778 NULL
@@ -121033,79 +120490,72 @@ index 0000000..3d3508d
+mpt_free_res_23793 mpt_free_res 5 23793 NULL
+map_write_23795 map_write 3 23795 NULL
+rx_path_reset_read_23801 rx_path_reset_read 3 23801 NULL
-+ocfs2_replace_cow_23803 ocfs2_replace_cow 0 23803 NULL
+__earlyonly_bootmem_alloc_23824 __earlyonly_bootmem_alloc 2 23824 NULL
+lustre_msg_buflen_23827 lustre_msg_buflen 0 23827 NULL
-+ceph_copy_page_vector_to_user_23829 ceph_copy_page_vector_to_user 0-4-3 23829 NULL
+pgdat_end_pfn_23842 pgdat_end_pfn 0 23842 NULL
+iwl_dbgfs_nvm_read_23845 iwl_dbgfs_nvm_read 3 23845 NULL
+p54_init_common_23850 p54_init_common 1 23850 NULL
+bin_to_hex_dup_23853 bin_to_hex_dup 2 23853 NULL
+ocfs2_xattr_get_clusters_23857 ocfs2_xattr_get_clusters 0 23857 NULL
+ieee80211_if_read_dot11MeshMaxPeerLinks_23878 ieee80211_if_read_dot11MeshMaxPeerLinks 3 23878 NULL
-+writeback_single_inode_23881 writeback_single_inode 0 23881 NULL nohasharray
-+nouveau_clock_create__23881 nouveau_clock_create_ 5 23881 &writeback_single_inode_23881
+tipc_snprintf_23893 tipc_snprintf 2-0 23893 NULL
++iov_iter_get_pages_alloc_23903 iov_iter_get_pages_alloc 3-0 23903 NULL
+add_new_gdb_meta_bg_23911 add_new_gdb_meta_bg 3 23911 NULL nohasharray
+ieee80211_if_read_hw_queues_23911 ieee80211_if_read_hw_queues 3 23911 &add_new_gdb_meta_bg_23911
+f2fs_getxattr_23917 f2fs_getxattr 0 23917 NULL
-+mpihelp_mul_karatsuba_case_23918 mpihelp_mul_karatsuba_case 5-3 23918 NULL nohasharray
-+ipath_reg_phys_mr_23918 ipath_reg_phys_mr 3 23918 &mpihelp_mul_karatsuba_case_23918
++ipath_reg_phys_mr_23918 ipath_reg_phys_mr 3 23918 NULL nohasharray
++mpihelp_mul_karatsuba_case_23918 mpihelp_mul_karatsuba_case 5-3 23918 &ipath_reg_phys_mr_23918
+kvm_read_guest_23928 kvm_read_guest 4-2 23928 NULL
+uvc_endpoint_max_bpi_23944 uvc_endpoint_max_bpi 0 23944 NULL
+cifs_setxattr_23957 cifs_setxattr 4 23957 NULL
+size_roundup_power2_23958 size_roundup_power2 0-1 23958 NULL
+sddr55_write_data_23983 sddr55_write_data 4 23983 NULL
+zd_usb_iowrite16v_async_23984 zd_usb_iowrite16v_async 3 23984 NULL
++xfs_zero_file_space_24000 xfs_zero_file_space 2-3 24000 NULL
+cxgb_alloc_mem_24007 cxgb_alloc_mem 1 24007 NULL
+give_pages_24021 give_pages 3 24021 NULL
+adis16400_show_serial_number_24037 adis16400_show_serial_number 3 24037 NULL
+hmac_setkey_24043 hmac_setkey 3 24043 NULL
+afs_cell_alloc_24052 afs_cell_alloc 2 24052 NULL
-+blkcipher_copy_iv_24075 blkcipher_copy_iv 3 24075 NULL
++iwl_dbgfs_low_latency_read_24062 iwl_dbgfs_low_latency_read 3 24062 NULL
+vb2_fop_read_24080 vb2_fop_read 3 24080 NULL
++C_SYSC_process_vm_writev_24102 C_SYSC_process_vm_writev 3-5 24102 NULL
+pipeline_post_proc_swi_read_24108 pipeline_post_proc_swi_read 3 24108 NULL
+request_key_auth_read_24109 request_key_auth_read 3 24109 NULL
+lov_brw_24122 lov_brw 4 24122 NULL
-+mpu401_read_24126 mpu401_read 3-0 24126 NULL
++mpu401_read_24126 mpu401_read 3 24126 NULL
+_picolcd_flash_write_24134 _picolcd_flash_write 4 24134 NULL
-+irnet_ctrl_write_24139 irnet_ctrl_write 3 24139 NULL nohasharray
-+xfs_btree_increment_24139 xfs_btree_increment 0 24139 &irnet_ctrl_write_24139
++irnet_ctrl_write_24139 irnet_ctrl_write 3 24139 NULL
+SyS_sethostname_24150 SyS_sethostname 2 24150 NULL
+trim_bitmaps_24158 trim_bitmaps 3 24158 NULL
+adu_read_24177 adu_read 3 24177 NULL
+safe_prepare_write_buffer_24187 safe_prepare_write_buffer 3 24187 NULL
-+irq_remapping_setup_msi_irqs_24194 irq_remapping_setup_msi_irqs 2 24194 NULL
++nv94_aux_24197 nv94_aux 3-6 24197 NULL
+ieee80211_if_read_dot11MeshHWMPpreqMinInterval_24208 ieee80211_if_read_dot11MeshHWMPpreqMinInterval 3 24208 NULL
++efx_vf_size_24213 efx_vf_size 0 24213 NULL
+tcpprobe_sprint_24222 tcpprobe_sprint 0-2 24222 NULL
+pcpu_embed_first_chunk_24224 pcpu_embed_first_chunk 3-2-1 24224 NULL nohasharray
+mei_amthif_read_24224 mei_amthif_read 4 24224 &pcpu_embed_first_chunk_24224
+pci_num_vf_24235 pci_num_vf 0 24235 NULL
+sel_read_bool_24236 sel_read_bool 3 24236 NULL
-+xfs_bmap_rtalloc_24237 xfs_bmap_rtalloc 0 24237 NULL
+em28xx_alloc_urbs_24260 em28xx_alloc_urbs 4-6 24260 NULL
+calculate_sizes_24273 calculate_sizes 2 24273 NULL
+thin_status_24278 thin_status 5 24278 NULL
+msg_size_24288 msg_size 0 24288 NULL
-+gserial_connect_24302 gserial_connect 0 24302 NULL
+btmrvl_pscmd_read_24308 btmrvl_pscmd_read 3 24308 NULL
-+reserve_metadata_bytes_24313 reserve_metadata_bytes 0 24313 NULL
+ath6kl_add_bss_if_needed_24317 ath6kl_add_bss_if_needed 6 24317 NULL
+si476x_radio_read_acf_blob_24336 si476x_radio_read_acf_blob 3 24336 NULL
+C_SYSC_pwritev_24345 C_SYSC_pwritev 3 24345 NULL
-+prepare_pages_24349 prepare_pages 0 24349 NULL
+kzalloc_node_24352 kzalloc_node 1 24352 NULL
+qla2x00_handle_queue_full_24365 qla2x00_handle_queue_full 2 24365 NULL
+cfi_read_pri_24366 cfi_read_pri 3 24366 NULL
+btrfs_item_size_nr_24367 btrfs_item_size_nr 0 24367 NULL
-+igetword_24373 igetword 0 24373 NULL nohasharray
-+break_deleg_24373 break_deleg 0 24373 &igetword_24373
-+max_io_len_24384 max_io_len 0-1 24384 NULL
++igetword_24373 igetword 0 24373 NULL
+mpt_alloc_res_24387 mpt_alloc_res 5 24387 NULL
-+xfs_bmapi_read_24392 xfs_bmapi_read 0 24392 NULL
+osc_cur_grant_bytes_seq_write_24396 osc_cur_grant_bytes_seq_write 3 24396 NULL
+getxattr_24398 getxattr 4 24398 NULL nohasharray
+pvr2_v4l2_ioctl_24398 pvr2_v4l2_ioctl 2 24398 &getxattr_24398
++populate_msi_sysfs_24399 populate_msi_sysfs 0 24399 NULL
+blk_update_bidi_request_24415 blk_update_bidi_request 3-4 24415 NULL
+nvme_trans_log_supp_pages_24418 nvme_trans_log_supp_pages 3 24418 NULL
+b43_debugfs_read_24425 b43_debugfs_read 3 24425 NULL
@@ -121129,12 +120579,11 @@ index 0000000..3d3508d
+SyS_pselect6_24582 SyS_pselect6 1 24582 NULL
+udf_compute_nr_groups_24594 udf_compute_nr_groups 0 24594 NULL
+sensor_hub_get_physical_device_count_24605 sensor_hub_get_physical_device_count 0 24605 NULL nohasharray
-+lov_alloc_memmd_24605 lov_alloc_memmd 2 24605 &sensor_hub_get_physical_device_count_24605
++lov_alloc_memmd_24605 lov_alloc_memmd 2 24605 &sensor_hub_get_physical_device_count_24605 nohasharray
++i915_error_state_buf_init_24605 i915_error_state_buf_init 3 24605 &lov_alloc_memmd_24605
+SyS_poll_24620 SyS_poll 2 24620 NULL
+context_alloc_24645 context_alloc 3 24645 NULL
+blk_rq_err_bytes_24650 blk_rq_err_bytes 0 24650 NULL
-+xfs_log_commit_cil_24653 xfs_log_commit_cil 0 24653 NULL
-+btrfs_check_data_free_space_24692 btrfs_check_data_free_space 0 24692 NULL
+datafab_write_data_24696 datafab_write_data 4 24696 NULL
+intelfbhw_get_p1p2_24703 intelfbhw_get_p1p2 2 24703 NULL
+simple_attr_read_24738 simple_attr_read 3 24738 NULL
@@ -121148,22 +120597,21 @@ index 0000000..3d3508d
+user_regset_copyout_24796 user_regset_copyout 7 24796 NULL
+kvm_read_guest_virt_helper_24804 kvm_read_guest_virt_helper 3-1 24804 NULL
+ath6kl_fwlog_mask_write_24810 ath6kl_fwlog_mask_write 3 24810 NULL
-+net2272_read_24825 net2272_read 0 24825 NULL
+snd_als4k_gcr_read_24840 snd_als4k_gcr_read 0 24840 NULL
+snd_pcm_lib_buffer_bytes_24865 snd_pcm_lib_buffer_bytes 0 24865 NULL
+pnp_alloc_24869 pnp_alloc 1 24869 NULL nohasharray
+l2cap_create_basic_pdu_24869 l2cap_create_basic_pdu 3 24869 &pnp_alloc_24869
+queues_read_24877 queues_read 3 24877 NULL
-+__vxge_hw_vp_initialize_24885 __vxge_hw_vp_initialize 2 24885 NULL
-+xfs_qm_dqattach_24898 xfs_qm_dqattach 0 24898 NULL
++iov_iter_npages_bvec_24905 iov_iter_npages_bvec 0-2 24905 NULL
+codec_list_read_file_24910 codec_list_read_file 3 24910 NULL
-+v4l2_ctrl_new_24927 v4l2_ctrl_new 7 24927 NULL nohasharray
-+__btrfs_free_extent_24927 __btrfs_free_extent 7 24927 &v4l2_ctrl_new_24927
++xpcs_reg_value_write_24922 xpcs_reg_value_write 3 24922 NULL
++v4l2_ctrl_new_24927 v4l2_ctrl_new 7 24927 NULL
+ocfs2_fiemap_24949 ocfs2_fiemap 4-3 24949 NULL
+packet_sendmsg_24954 packet_sendmsg 4 24954 NULL
+twl_i2c_write_u8_24976 twl_i2c_write_u8 3 24976 NULL
-+llc_ui_sendmsg_24987 llc_ui_sendmsg 4 24987 NULL
-+slot_get_24999 slot_get 0 24999 NULL
++llc_ui_sendmsg_24987 llc_ui_sendmsg 4 24987 NULL nohasharray
++ath10k_fw_crash_dump_read_24987 ath10k_fw_crash_dump_read 3 24987 &llc_ui_sendmsg_24987
++info_debugfs_read_helper_24988 info_debugfs_read_helper 0 24988 NULL
+key_conf_hw_key_idx_read_25003 key_conf_hw_key_idx_read 3 25003 NULL
+il_dbgfs_channels_read_25005 il_dbgfs_channels_read 3 25005 NULL
+ni_660x_num_counters_25031 ni_660x_num_counters 0 25031 NULL
@@ -121172,35 +120620,34 @@ index 0000000..3d3508d
+btrfs_stack_key_blockptr_25058 btrfs_stack_key_blockptr 0 25058 NULL
+gs_buf_alloc_25067 gs_buf_alloc 2 25067 NULL
+ll_track_pid_seq_write_25068 ll_track_pid_seq_write 3 25068 NULL
++do_add_page_to_bio_25071 do_add_page_to_bio 2 25071 NULL
+SYSC_listxattr_25072 SYSC_listxattr 3 25072 NULL
+ima_appraise_measurement_25093 ima_appraise_measurement 6 25093 NULL
-+blkg_path_25099 blkg_path 3 25099 NULL
+snd_rawmidi_kernel_write_25106 snd_rawmidi_kernel_write 3 25106 NULL
-+gfs2_quota_check_25130 gfs2_quota_check 0 25130 NULL
+ipath_init_qp_table_25167 ipath_init_qp_table 2 25167 NULL
+kvm_mmu_notifier_change_pte_25169 kvm_mmu_notifier_change_pte 3 25169 NULL
+sctp_getsockopt_local_addrs_25178 sctp_getsockopt_local_addrs 2 25178 NULL
++security_socket_post_create_25221 security_socket_post_create 0 25221 NULL
+mon_stat_read_25238 mon_stat_read 3 25238 NULL
+stripe_status_25259 stripe_status 5 25259 NULL
+snd_pcm_start_25273 snd_pcm_start 0 25273 NULL
+crypto_alloc_instance2_25277 crypto_alloc_instance2 3 25277 NULL
+vfs_writev_25278 vfs_writev 3 25278 NULL
+l2tp_session_create_25286 l2tp_session_create 1 25286 NULL
++cx25821_write_frame_25315 cx25821_write_frame 3 25315 NULL
+ath9k_debugfs_read_buf_25316 ath9k_debugfs_read_buf 3 25316 NULL
+rng_buffer_size_25348 rng_buffer_size 0 25348 NULL
+SYSC_kexec_load_25361 SYSC_kexec_load 2 25361 NULL
+unix_mkname_25368 unix_mkname 0-2 25368 NULL
+sel_read_mls_25369 sel_read_mls 3 25369 NULL
+vsp1_entity_init_25407 vsp1_entity_init 3 25407 NULL
-+xfs_ialloc_pagi_init_25411 xfs_ialloc_pagi_init 0 25411 NULL
++mcp795_rtcc_read_25415 mcp795_rtcc_read 4 25415 NULL
+dai_list_read_file_25421 dai_list_read_file 3 25421 NULL
-+xfs_qm_dqtobp_25448 xfs_qm_dqtobp 0 25448 NULL
-+generic_file_buffered_write_25464 generic_file_buffered_write 4-0-7 25464 NULL
+ipath_decode_err_25468 ipath_decode_err 3 25468 NULL
+crypto_hash_digestsize_25469 crypto_hash_digestsize 0 25469 NULL
+ivtv_buf_copy_from_user_25502 ivtv_buf_copy_from_user 4-0 25502 NULL
+snd_pcm_plugin_build_25505 snd_pcm_plugin_build 5 25505 NULL
-+xfs_alloc_fix_freelist_25514 xfs_alloc_fix_freelist 0 25514 NULL
++mxt_obj_size_25510 mxt_obj_size 0 25510 NULL
+sb_permission_25523 sb_permission 0 25523 NULL
+ext3_get_inode_loc_25542 ext3_get_inode_loc 0 25542 NULL
+ieee80211_if_read_path_refresh_time_25545 ieee80211_if_read_path_refresh_time 3 25545 NULL
@@ -121212,18 +120659,19 @@ index 0000000..3d3508d
+proc_coredump_filter_write_25625 proc_coredump_filter_write 3 25625 NULL
+befs_utf2nls_25628 befs_utf2nls 3 25628 NULL nohasharray
+__get_user_pages_25628 __get_user_pages 0 25628 &befs_utf2nls_25628
-+__direct_map_25647 __direct_map 5-6 25647 NULL
++__direct_map_25647 __direct_map 6-5 25647 NULL
+aircable_prepare_write_buffer_25669 aircable_prepare_write_buffer 3 25669 NULL
+lpfc_idiag_cmd_get_25672 lpfc_idiag_cmd_get 2 25672 NULL
+sta_inactive_ms_read_25690 sta_inactive_ms_read 3 25690 NULL
++prom_early_alloc_25692 prom_early_alloc 1 25692 NULL
+rx_filter_mc_filter_read_25712 rx_filter_mc_filter_read 3 25712 NULL
+ibmasm_new_command_25714 ibmasm_new_command 2 25714 NULL
+__alloc_bootmem_low_node_25726 __alloc_bootmem_low_node 2 25726 NULL nohasharray
+sel_write_context_25726 sel_write_context 3 25726 &__alloc_bootmem_low_node_25726
++xgbe_common_read_25743 xgbe_common_read 2 25743 NULL
+cxgbi_device_portmap_create_25747 cxgbi_device_portmap_create 3 25747 NULL
+event_rx_pool_read_25792 event_rx_pool_read 3 25792 NULL
+sg_read_25799 sg_read 3 25799 NULL
-+xfs_alloc_ag_vextent_exact_25810 xfs_alloc_ag_vextent_exact 0 25810 NULL
+system_enable_read_25815 system_enable_read 3 25815 NULL
+realloc_buffer_25816 realloc_buffer 2 25816 NULL
+pwr_missing_bcns_read_25824 pwr_missing_bcns_read 3 25824 NULL
@@ -121241,13 +120689,14 @@ index 0000000..3d3508d
+key_flags_read_25931 key_flags_read 3 25931 NULL
+copy_play_buf_25932 copy_play_buf 3 25932 NULL
+flush_25957 flush 2 25957 NULL
++_regmap_multi_reg_write_25967 _regmap_multi_reg_write 3 25967 NULL
+udp_setsockopt_25985 udp_setsockopt 5 25985 NULL
+lustre_msg_buflen_v2_25997 lustre_msg_buflen_v2 0 25997 NULL
+SyS_process_vm_readv_26019 SyS_process_vm_readv 3-5 26019 NULL
+mptscsih_change_queue_depth_26036 mptscsih_change_queue_depth 2 26036 NULL
+selinux_inode_post_setxattr_26037 selinux_inode_post_setxattr 4 26037 NULL
+keyctl_update_key_26061 keyctl_update_key 3 26061 NULL
-+btrfs_wait_ordered_range_26086 btrfs_wait_ordered_range 0 26086 NULL
++pri_wm_latency_write_26063 pri_wm_latency_write 3 26063 NULL
+rx_rx_wa_density_dropped_frame_read_26095 rx_rx_wa_density_dropped_frame_read 3 26095 NULL
+i8042_pnp_id_to_string_26108 i8042_pnp_id_to_string 3 26108 NULL
+read_sb_page_26119 read_sb_page 5 26119 NULL
@@ -121256,17 +120705,15 @@ index 0000000..3d3508d
+gfs2_xattr_acl_get_26166 gfs2_xattr_acl_get 0 26166 NULL nohasharray
+ath6kl_roam_table_read_26166 ath6kl_roam_table_read 3 26166 &gfs2_xattr_acl_get_26166
+disk_devt_26180 disk_devt 0 26180 NULL
-+cgroup_setxattr_26188 cgroup_setxattr 4 26188 NULL
+ieee80211_if_fmt_dot11MeshTTL_26198 ieee80211_if_fmt_dot11MeshTTL 3 26198 NULL
+xfs_idata_realloc_26199 xfs_idata_realloc 2 26199 NULL
+mce_write_26201 mce_write 3 26201 NULL
+mwifiex_regrdwr_write_26225 mwifiex_regrdwr_write 3 26225 NULL
+_scsih_change_queue_depth_26230 _scsih_change_queue_depth 2 26230 NULL
+rxrpc_recvmsg_26233 rxrpc_recvmsg 4 26233 NULL
-+simple_setattr_26234 simple_setattr 0 26234 NULL
++nlm_end_grace_read_26234 nlm_end_grace_read 3 26234 NULL
+genwqe_ffdc_buff_size_26263 genwqe_ffdc_buff_size 0 26263 NULL
+crypto_ctxsize_26278 crypto_ctxsize 0 26278 NULL
-+apei_resources_request_26279 apei_resources_request 0 26279 NULL
+wacom_set_device_mode_26280 wacom_set_device_mode 3 26280 NULL
+snd_pcm_plug_client_channels_buf_26309 snd_pcm_plug_client_channels_buf 0-3 26309 NULL
+pwr_wake_on_host_read_26321 pwr_wake_on_host_read 3 26321 NULL
@@ -121282,7 +120729,8 @@ index 0000000..3d3508d
+enc_pools_add_pages_26461 enc_pools_add_pages 1 26461 &tower_read_26461
+ib_alloc_device_26483 ib_alloc_device 1 26483 NULL
+ulong_write_file_26485 ulong_write_file 3 26485 NULL
-+dvb_ca_en50221_io_ioctl_26490 dvb_ca_en50221_io_ioctl 2 26490 NULL
++dvb_ca_en50221_io_ioctl_26490 dvb_ca_en50221_io_ioctl 2 26490 NULL nohasharray
++msi_verify_entries_26490 msi_verify_entries 0 26490 &dvb_ca_en50221_io_ioctl_26490
+read_vmcore_26501 read_vmcore 3 26501 NULL
+uhid_char_write_26502 uhid_char_write 3 26502 NULL
+vfio_pci_set_msi_trigger_26507 vfio_pci_set_msi_trigger 4-3 26507 NULL
@@ -121292,10 +120740,10 @@ index 0000000..3d3508d
+__vhost_add_used_n_26554 __vhost_add_used_n 3 26554 NULL
+dio_new_bio_26562 dio_new_bio 0 26562 NULL
+rts51x_read_mem_26577 rts51x_read_mem 4 26577 NULL
-+xfs_rtcheck_range_26614 xfs_rtcheck_range 0 26614 NULL
++kernfs_name_locked_26617 kernfs_name_locked 3 26617 NULL
+pwr_fix_tsf_ps_read_26627 pwr_fix_tsf_ps_read 3 26627 NULL
-+irq_alloc_generic_chip_26650 irq_alloc_generic_chip 2 26650 NULL nohasharray
-+inb_p_26650 inb_p 0 26650 &irq_alloc_generic_chip_26650
++amdtp_stream_get_max_payload_26645 amdtp_stream_get_max_payload 0 26645 NULL
++irq_alloc_generic_chip_26650 irq_alloc_generic_chip 2 26650 NULL
+nouveau_volt_create__26654 nouveau_volt_create_ 4 26654 NULL
+cipso_v4_map_cat_rbm_hton_26680 cipso_v4_map_cat_rbm_hton 0 26680 NULL
+flowinfo_read_26683 flowinfo_read 3 26683 NULL
@@ -121309,7 +120757,7 @@ index 0000000..3d3508d
+cipso_v4_genopt_26812 cipso_v4_genopt 0 26812 NULL
+iwl_trans_read_mem32_26825 iwl_trans_read_mem32 0 26825 NULL
+smk_write_load_26829 smk_write_load 3 26829 NULL
-+xfs_alloc_pagf_init_26834 xfs_alloc_pagf_init 0 26834 NULL
++snd_pcm_action_mutex_26832 snd_pcm_action_mutex 0 26832 NULL
+scnprint_id_26842 scnprint_id 3-0 26842 NULL
+ecryptfs_miscdev_write_26847 ecryptfs_miscdev_write 3 26847 NULL
+ss_alloc_ep_req_26848 ss_alloc_ep_req 2 26848 NULL
@@ -121320,6 +120768,7 @@ index 0000000..3d3508d
+hhf_zalloc_26912 hhf_zalloc 1 26912 NULL
+cfg80211_process_auth_26916 cfg80211_process_auth 3 26916 NULL
+x25_asy_change_mtu_26928 x25_asy_change_mtu 2 26928 NULL
++brcmf_usb_dl_cmd_26931 brcmf_usb_dl_cmd 4 26931 NULL
+scsi_tgt_copy_sense_26933 scsi_tgt_copy_sense 3 26933 NULL
+sctp_setsockopt_adaptation_layer_26935 sctp_setsockopt_adaptation_layer 3 26935 NULL nohasharray
+pwr_ps_enter_read_26935 pwr_ps_enter_read 3 26935 &sctp_setsockopt_adaptation_layer_26935
@@ -121327,27 +120776,29 @@ index 0000000..3d3508d
+do_trimming_26952 do_trimming 3 26952 NULL nohasharray
+extract_entropy_user_26952 extract_entropy_user 3 26952 &do_trimming_26952
+do_direct_IO_26979 do_direct_IO 0 26979 NULL
-+xfs_filestream_associate_27030 xfs_filestream_associate 0 27030 NULL
++lustre_msg_size_26995 lustre_msg_size 2 26995 NULL
++sc16is7xx_port_read_27051 sc16is7xx_port_read 0 27051 NULL
+__videobuf_alloc_vb_27062 __videobuf_alloc_vb 1 27062 NULL
-+ext4_convert_unwritten_extents_27064 ext4_convert_unwritten_extents 4-3-0 27064 NULL
++ext4_convert_unwritten_extents_27064 ext4_convert_unwritten_extents 4-3 27064 NULL
+snd_pcm_lib_period_bytes_27071 snd_pcm_lib_period_bytes 0 27071 NULL
+paravirt_read_msr_27077 paravirt_read_msr 0 27077 NULL
+alloc_fdmem_27083 alloc_fdmem 1 27083 NULL
+btmrvl_hscmd_write_27089 btmrvl_hscmd_write 3 27089 NULL nohasharray
+ath9k_hw_4k_dump_eeprom_27089 ath9k_hw_4k_dump_eeprom 5-4 27089 &btmrvl_hscmd_write_27089
+__devcgroup_inode_permission_27108 __devcgroup_inode_permission 0 27108 NULL
-+get_kernel_page_27133 get_kernel_page 0 27133 NULL
+drbd_get_capacity_27141 drbd_get_capacity 0 27141 NULL
+pms_capture_27142 pms_capture 4 27142 NULL
+btmrvl_hscfgcmd_write_27143 btmrvl_hscfgcmd_write 3 27143 NULL
++wil_write_file_wmi_27150 wil_write_file_wmi 3 27150 NULL
+snd_compr_calc_avail_27165 snd_compr_calc_avail 0 27165 NULL
+ieee80211_if_read_rc_rateidx_mask_5ghz_27183 ieee80211_if_read_rc_rateidx_mask_5ghz 3 27183 NULL
-+__sg_alloc_table_27198 __sg_alloc_table 0 27198 NULL
-+write_kmem_27225 write_kmem 3 27225 NULL
++write_kmem_27225 write_kmem 3 27225 NULL nohasharray
++svcxdr_tmpalloc_27225 svcxdr_tmpalloc 2 27225 &write_kmem_27225
+dbAllocAG_27228 dbAllocAG 0 27228 NULL
+rxrpc_request_key_27235 rxrpc_request_key 3 27235 NULL
+ll_track_gid_seq_write_27267 ll_track_gid_seq_write 3 27267 NULL
+comedi_alloc_devpriv_27272 comedi_alloc_devpriv 2 27272 NULL
++get_rx_fifo_content_27283 get_rx_fifo_content 0 27283 NULL
+copy_from_buf_27308 copy_from_buf 4-2 27308 NULL
+virtqueue_add_inbuf_27312 virtqueue_add_inbuf 3 27312 NULL
+snd_pcm_oss_write2_27332 snd_pcm_oss_write2 3-0 27332 NULL
@@ -121357,26 +120808,25 @@ index 0000000..3d3508d
+seq_read_27411 seq_read 3 27411 NULL
+ib_dma_map_sg_27413 ib_dma_map_sg 0 27413 NULL
+ieee80211_if_read_smps_27416 ieee80211_if_read_smps 3 27416 NULL
-+ocfs2_refcount_cal_cow_clusters_27422 ocfs2_refcount_cal_cow_clusters 0-3-4 27422 NULL
++ocfs2_refcount_cal_cow_clusters_27422 ocfs2_refcount_cal_cow_clusters 3-4 27422 NULL
+cypress_write_27423 cypress_write 4 27423 NULL
+sddr09_read_data_27447 sddr09_read_data 3 27447 NULL
-+xfs_btree_lookup_get_block_27448 xfs_btree_lookup_get_block 0 27448 NULL
+v4l2_ctrl_new_std_menu_items_27487 v4l2_ctrl_new_std_menu_items 4 27487 NULL
+hcd_buffer_alloc_27495 hcd_buffer_alloc 2 27495 NULL
+ip_set_get_h32_27498 ip_set_get_h32 0 27498 NULL
+btrfs_get_64_27499 btrfs_get_64 0 27499 NULL
-+garmin_read_process_27509 garmin_read_process 3 27509 NULL
++garmin_read_process_27509 garmin_read_process 3 27509 NULL nohasharray
++mcryptd_hash_setkey_27509 mcryptd_hash_setkey 3 27509 &garmin_read_process_27509
+oti_alloc_cookies_27510 oti_alloc_cookies 2 27510 NULL
+ib_copy_to_udata_27525 ib_copy_to_udata 3 27525 NULL
+snd_sonicvibes_getdmaa_27552 snd_sonicvibes_getdmaa 0 27552 NULL
+SyS_fgetxattr_27571 SyS_fgetxattr 4 27571 NULL
+sco_sock_recvmsg_27572 sco_sock_recvmsg 4 27572 NULL
+libipw_alloc_txb_27579 libipw_alloc_txb 1 27579 NULL
++C_SYSC_mbind_27636 C_SYSC_mbind 5 27636 NULL
+ocfs2_xattr_ibody_get_27642 ocfs2_xattr_ibody_get 0 27642 NULL nohasharray
-+nl80211_send_connect_result_27642 nl80211_send_connect_result 5-7 27642 &ocfs2_xattr_ibody_get_27642 nohasharray
-+read_flush_procfs_27642 read_flush_procfs 3 27642 &nl80211_send_connect_result_27642 nohasharray
-+ocfs2_direct_IO_27642 ocfs2_direct_IO 4 27642 &read_flush_procfs_27642 nohasharray
-+xfs_alloc_vextent_27642 xfs_alloc_vextent 0 27642 &ocfs2_direct_IO_27642
++read_flush_procfs_27642 read_flush_procfs 3 27642 &ocfs2_xattr_ibody_get_27642 nohasharray
++nl80211_send_connect_result_27642 nl80211_send_connect_result 5-7 27642 &read_flush_procfs_27642
+add_new_gdb_27643 add_new_gdb 3 27643 NULL
+btrfs_fallocate_27647 btrfs_fallocate 3-4 27647 NULL
+qnx6_readpages_27657 qnx6_readpages 4 27657 NULL
@@ -121386,7 +120836,9 @@ index 0000000..3d3508d
+evm_write_key_27715 evm_write_key 3 27715 NULL
+ieee80211_if_fmt_dot11MeshGateAnnouncementProtocol_27722 ieee80211_if_fmt_dot11MeshGateAnnouncementProtocol 3 27722 NULL
+xfs_dir2_block_sfsize_27727 xfs_dir2_block_sfsize 0 27727 NULL
++load_scode_27738 load_scode 2 27738 NULL
+SyS_setsockopt_27759 SyS_setsockopt 5 27759 NULL
++transport_init_session_tags_27776 transport_init_session_tags 1-2 27776 NULL
+__lov_setstripe_27782 __lov_setstripe 2 27782 NULL
+twl4030_set_gpio_dataout_27792 twl4030_set_gpio_dataout 1 27792 NULL
+SyS_readv_27804 SyS_readv 3 27804 NULL
@@ -121397,31 +120849,30 @@ index 0000000..3d3508d
+sky2_pci_read16_27863 sky2_pci_read16 0 27863 NULL
+ieee80211_if_read_dot11MeshHWMProotInterval_27873 ieee80211_if_read_dot11MeshHWMProotInterval 3 27873 NULL
+unix_seqpacket_sendmsg_27893 unix_seqpacket_sendmsg 4 27893 NULL
++i915_error_object_create_sized_27919 i915_error_object_create_sized 4 27919 NULL
+check_mapped_name_27943 check_mapped_name 3 27943 NULL
+bio_next_split_27961 bio_next_split 2 27961 NULL nohasharray
+tracing_clock_write_27961 tracing_clock_write 3 27961 &bio_next_split_27961
-+security_path_chown_27966 security_path_chown 0 27966 NULL
+tipc_media_addr_printf_27971 tipc_media_addr_printf 2 27971 NULL
-+device_register_27972 device_register 0 27972 NULL nohasharray
-+mic_rx_pkts_read_27972 mic_rx_pkts_read 3 27972 &device_register_27972
-+xfs_alloc_fixup_trees_27975 xfs_alloc_fixup_trees 0 27975 NULL
-+pci_enable_device_flags_27977 pci_enable_device_flags 0 27977 NULL nohasharray
-+__kernfs_setattr_27977 __kernfs_setattr 0 27977 &pci_enable_device_flags_27977
++mic_rx_pkts_read_27972 mic_rx_pkts_read 3 27972 NULL nohasharray
++device_register_27972 device_register 0 27972 &mic_rx_pkts_read_27972
++compat_SyS_set_mempolicy_27975 compat_SyS_set_mempolicy 3 27975 NULL
++pci_enable_device_flags_27977 pci_enable_device_flags 0 27977 NULL
+edt_ft5x06_debugfs_raw_data_read_28002 edt_ft5x06_debugfs_raw_data_read 3 28002 NULL
+seq_get_buf_28006 seq_get_buf 0 28006 NULL
+snd_rawmidi_write_28008 snd_rawmidi_write 3 28008 NULL
+powercap_register_zone_28028 powercap_register_zone 6 28028 NULL
+sctp_setsockopt_maxburst_28041 sctp_setsockopt_maxburst 3 28041 NULL
-+rts51x_xd_rw_28046 rts51x_xd_rw 3-4 28046 NULL
+cx231xx_init_vbi_isoc_28053 cx231xx_init_vbi_isoc 3-2-4 28053 NULL
+pool_status_28055 pool_status 5 28055 NULL
+init_rs_non_canonical_28059 init_rs_non_canonical 1 28059 NULL
+lpfc_idiag_mbxacc_read_28061 lpfc_idiag_mbxacc_read 3 28061 NULL
+tx_frag_bad_mblk_num_read_28064 tx_frag_bad_mblk_num_read 3 28064 NULL
++acpi_gsb_i2c_write_bytes_28082 acpi_gsb_i2c_write_bytes 4 28082 NULL
+mmc_test_alloc_mem_28102 mmc_test_alloc_mem 3-2 28102 NULL
+rx_defrag_need_defrag_read_28117 rx_defrag_need_defrag_read 3 28117 NULL
+vgacon_adjust_height_28124 vgacon_adjust_height 2 28124 NULL
-+memblock_virt_alloc_from_nopanic_28146 memblock_virt_alloc_from_nopanic 1 28146 NULL
++m25p80_read_reg_28132 m25p80_read_reg 4 28132 NULL
+video_read_28148 video_read 3 28148 NULL
+snd_midi_channel_alloc_set_28153 snd_midi_channel_alloc_set 1 28153 NULL
+stats_dot11FCSErrorCount_read_28154 stats_dot11FCSErrorCount_read 3 28154 NULL
@@ -121429,11 +120880,11 @@ index 0000000..3d3508d
+macvtap_get_user_28185 macvtap_get_user 4 28185 NULL
+counter_free_res_28187 counter_free_res 5 28187 NULL
+read_disk_sb_28188 read_disk_sb 2 28188 NULL
++nvkm_output_dp_create__28192 nvkm_output_dp_create_ 6 28192 NULL
+nouveau_mxm_create__28200 nouveau_mxm_create_ 4 28200 NULL
+__qp_memcpy_from_queue_28220 __qp_memcpy_from_queue 3-4 28220 NULL
+line6_alloc_sysex_buffer_28225 line6_alloc_sysex_buffer 4 28225 NULL
+amd_nb_num_28228 amd_nb_num 0 28228 NULL
-+fuse_direct_IO_28275 fuse_direct_IO 4 28275 NULL
+usemap_size_28281 usemap_size 0 28281 NULL
+inline_xattr_size_28285 inline_xattr_size 0 28285 NULL
+dma_map_sg_attrs_28289 dma_map_sg_attrs 0 28289 NULL
@@ -121441,8 +120892,7 @@ index 0000000..3d3508d
+kstrtos16_from_user_28300 kstrtos16_from_user 2 28300 NULL
+nouveau_compat_ioctl_28305 nouveau_compat_ioctl 2 28305 NULL
+snd_pcm_oss_read_28317 snd_pcm_oss_read 3 28317 NULL
-+security_inode_link_28327 security_inode_link 0 28327 NULL
-+generic_write_checks_28329 generic_write_checks 0 28329 NULL
++xpcs_mmd_read_28331 xpcs_mmd_read 3 28331 NULL
+bm_entry_write_28338 bm_entry_write 3 28338 NULL
+tcp_copy_to_iovec_28344 tcp_copy_to_iovec 3 28344 NULL
+snapshot_write_28351 snapshot_write 3 28351 NULL
@@ -121452,32 +120902,33 @@ index 0000000..3d3508d
+tx_frag_cache_miss_read_28394 tx_frag_cache_miss_read 3 28394 NULL
+bypass_pwup_write_28416 bypass_pwup_write 3 28416 NULL
+subdev_ioctl_28417 subdev_ioctl 2 28417 NULL
++__videobuf_mmap_setup_28421 __videobuf_mmap_setup 0 28421 NULL
+ksocknal_alloc_tx_28426 ksocknal_alloc_tx 2 28426 NULL
++hid_hw_output_report_28429 hid_hw_output_report 0 28429 NULL
+mpage_readpages_28436 mpage_readpages 3 28436 NULL
-+xfs_rtfind_back_28450 xfs_rtfind_back 0 28450 NULL
+snd_emu10k1_efx_read_28452 snd_emu10k1_efx_read 2 28452 NULL
+key_mic_failures_read_28457 key_mic_failures_read 3 28457 NULL
+alloc_irq_cpu_rmap_28459 alloc_irq_cpu_rmap 1 28459 NULL
-+__filemap_fdatawrite_28485 __filemap_fdatawrite 0 28485 NULL
+ps_poll_upsd_utilization_read_28519 ps_poll_upsd_utilization_read 3 28519 NULL
-+i2400m_tx_stats_read_28527 i2400m_tx_stats_read 3 28527 NULL
++sh_irda_init_iobuf_28527 sh_irda_init_iobuf 2 28527 NULL nohasharray
++i2400m_tx_stats_read_28527 i2400m_tx_stats_read 3 28527 &sh_irda_init_iobuf_28527
++early_init_dt_alloc_memory_arch_28528 early_init_dt_alloc_memory_arch 1 28528 NULL
+sel_read_policycap_28544 sel_read_policycap 3 28544 NULL
-+mptctl_getiocinfo_28545 mptctl_getiocinfo 2 28545 NULL nohasharray
-+run_delalloc_range_28545 run_delalloc_range 3-4 28545 &mptctl_getiocinfo_28545 nohasharray
-+aio_read_events_28545 aio_read_events 3 28545 &run_delalloc_range_28545
-+sysfs_create_bin_file_28551 sysfs_create_bin_file 0 28551 NULL
++run_delalloc_range_28545 run_delalloc_range 3-4 28545 NULL nohasharray
++aio_read_events_28545 aio_read_events 3 28545 &run_delalloc_range_28545 nohasharray
++mptctl_getiocinfo_28545 mptctl_getiocinfo 2 28545 &aio_read_events_28545
+b43legacy_debugfs_write_28556 b43legacy_debugfs_write 3 28556 NULL
+asymmetric_verify_28567 asymmetric_verify 3 28567 NULL
-+gfs2_meta_indirect_buffer_28573 gfs2_meta_indirect_buffer 0 28573 NULL
+oxygen_read32_28582 oxygen_read32 0 28582 NULL
++task_cgroup_path_28599 task_cgroup_path 3 28599 NULL
+extract_entropy_28604 extract_entropy 5-3 28604 NULL
++xgbe_common_write_28609 xgbe_common_write 2 28609 NULL
+kfifo_unused_28612 kfifo_unused 0 28612 NULL
+snd_nm256_capture_copy_28622 snd_nm256_capture_copy 5-3 28622 NULL
+setup_usemap_28636 setup_usemap 3-4 28636 NULL
+qib_handle_6120_hwerrors_28642 qib_handle_6120_hwerrors 3 28642 NULL
-+xfs_bmap_finish_28644 xfs_bmap_finish 0 28644 NULL
+p9_fcall_alloc_28652 p9_fcall_alloc 1 28652 NULL
-+read_nic_io_byte_28654 read_nic_io_byte 0 28654 NULL
++iwl_dbgfs_nic_temp_read_28662 iwl_dbgfs_nic_temp_read 3 28662 NULL
+blk_queue_resize_tags_28670 blk_queue_resize_tags 2 28670 NULL
+SyS_setgroups16_28686 SyS_setgroups16 1 28686 NULL
+kvm_mmu_get_page_28692 kvm_mmu_get_page 2 28692 NULL
@@ -121486,13 +120937,15 @@ index 0000000..3d3508d
+snd_pcm_aio_write_28738 snd_pcm_aio_write 3 28738 NULL
+read_file_btcoex_28743 read_file_btcoex 3 28743 NULL
+max_hw_blocks_28748 max_hw_blocks 0 28748 NULL
++nv50_dmac_create_28762 nv50_dmac_create 5 28762 NULL
+rpc_pipe_generic_upcall_28766 rpc_pipe_generic_upcall 4 28766 NULL
+ath6kl_get_num_reg_28780 ath6kl_get_num_reg 0 28780 NULL
+sel_write_member_28800 sel_write_member 3 28800 NULL
+iwl_dbgfs_rxon_filter_flags_read_28832 iwl_dbgfs_rxon_filter_flags_read 3 28832 NULL
++kernel_tree_alloc_28833 kernel_tree_alloc 1 28833 NULL
++parser_init_byteStream_28841 parser_init_byteStream 2 28841 NULL
+vp_request_msix_vectors_28849 vp_request_msix_vectors 2 28849 NULL
+ipv6_renew_options_28867 ipv6_renew_options 5 28867 NULL
-+max_io_len_target_boundary_28879 max_io_len_target_boundary 0-1 28879 NULL
+packet_sendmsg_spkt_28885 packet_sendmsg_spkt 4 28885 NULL
+da9055_group_write_28904 da9055_group_write 2-3 28904 NULL
+ps_upsd_timeouts_read_28924 ps_upsd_timeouts_read 3 28924 NULL
@@ -121502,7 +120955,6 @@ index 0000000..3d3508d
+btrfs_trim_block_group_28963 btrfs_trim_block_group 3-4 28963 NULL
+alloc_sched_domains_28972 alloc_sched_domains 1 28972 NULL
+hash_net6_expire_28979 hash_net6_expire 4 28979 NULL
-+xfs_alloc_update_28982 xfs_alloc_update 0 28982 NULL
+hci_sock_setsockopt_28993 hci_sock_setsockopt 5 28993 NULL
+bin_uuid_28999 bin_uuid 3 28999 NULL
+fd_execute_rw_29004 fd_execute_rw 3 29004 NULL
@@ -121512,10 +120964,9 @@ index 0000000..3d3508d
+iso_packets_buffer_init_29061 iso_packets_buffer_init 3-4 29061 NULL
+lpfc_idiag_extacc_drivr_get_29067 lpfc_idiag_extacc_drivr_get 0-3 29067 NULL
+sctp_getsockopt_assoc_stats_29074 sctp_getsockopt_assoc_stats 2 29074 NULL
-+xfs_alloc_ag_vextent_small_29084 xfs_alloc_ag_vextent_small 0 29084 NULL
+iwl_dbgfs_log_event_write_29088 iwl_dbgfs_log_event_write 3 29088 NULL
-+i915_error_object_create_sized_29091 i915_error_object_create_sized 3 29091 NULL
+ccp_init_dm_workarea_29097 ccp_init_dm_workarea 3 29097 NULL
++__compat_sys_preadv64_29103 __compat_sys_preadv64 3 29103 NULL
+isdn_ppp_write_29109 isdn_ppp_write 4 29109 NULL
+snprintf_29125 snprintf 0 29125 NULL
+iov_shorten_29130 iov_shorten 0 29130 NULL
@@ -121528,14 +120979,15 @@ index 0000000..3d3508d
+irq_domain_add_linear_29236 irq_domain_add_linear 2 29236 NULL
+evdev_handle_get_val_29242 evdev_handle_get_val 5-6 29242 NULL
+security_context_to_sid_core_29248 security_context_to_sid_core 2 29248 NULL
++rbd_osd_req_create_29260 rbd_osd_req_create 3 29260 NULL
++mwifiex_hscfg_write_29262 mwifiex_hscfg_write 3 29262 NULL
+prism2_set_genericelement_29277 prism2_set_genericelement 3 29277 NULL
+ext4_fiemap_29296 ext4_fiemap 4 29296 NULL
-+xfs_bmap_btree_to_extents_29297 xfs_bmap_btree_to_extents 0 29297 NULL
+sn9c102_read_29305 sn9c102_read 3 29305 NULL
+__fuse_get_req_29315 __fuse_get_req 2 29315 NULL
+lprocfs_write_helper_29323 lprocfs_write_helper 2 29323 NULL
-+xfs_bmbt_change_owner_29325 xfs_bmbt_change_owner 0 29325 NULL
+kvm_handle_hva_29326 kvm_handle_hva 2 29326 NULL
++obd_proc_jobid_name_seq_write_29332 obd_proc_jobid_name_seq_write 3 29332 NULL
+tun_put_user_29337 tun_put_user 5 29337 NULL
+__alloc_ei_netdev_29338 __alloc_ei_netdev 1 29338 NULL
+l2cap_sock_setsockopt_old_29346 l2cap_sock_setsockopt_old 4 29346 NULL
@@ -121544,6 +120996,7 @@ index 0000000..3d3508d
+crypto_ahash_alignmask_29445 crypto_ahash_alignmask 0 29445 NULL
+p9_client_prepare_req_29448 p9_client_prepare_req 3 29448 NULL
+validate_scan_freqs_29462 validate_scan_freqs 0 29462 NULL
++memcg_update_cache_params_29465 memcg_update_cache_params 2 29465 NULL
+SyS_flistxattr_29474 SyS_flistxattr 3 29474 NULL
+do_register_entry_29478 do_register_entry 4 29478 NULL
+simple_strtoul_29480 simple_strtoul 0 29480 NULL
@@ -121552,22 +121005,23 @@ index 0000000..3d3508d
+usnic_vnic_spec_dump_29508 usnic_vnic_spec_dump 2 29508 NULL
+write_file_regidx_29517 write_file_regidx 3 29517 NULL
+atk_debugfs_ggrp_read_29522 atk_debugfs_ggrp_read 3 29522 NULL
-+add_to_page_cache_lru_29534 add_to_page_cache_lru 0 29534 NULL
++pci_enable_msix_29524 pci_enable_msix 0 29524 NULL
++mic_vringh_copy_29531 mic_vringh_copy 4 29531 NULL
+ftrace_write_29551 ftrace_write 3 29551 NULL
+idetape_queue_rw_tail_29562 idetape_queue_rw_tail 3 29562 NULL
-+leaf_dealloc_29566 leaf_dealloc 3-2 29566 NULL
++leaf_dealloc_29566 leaf_dealloc 3 29566 NULL
+kvm_read_guest_virt_system_29569 kvm_read_guest_virt_system 4-2 29569 NULL
+lbs_lowsnr_read_29571 lbs_lowsnr_read 3 29571 NULL
-+security_path_chmod_29578 security_path_chmod 0 29578 NULL
+iwl_dbgfs_missed_beacon_write_29586 iwl_dbgfs_missed_beacon_write 3 29586 NULL
+pvr2_hdw_report_unlocked_29589 pvr2_hdw_report_unlocked 4-0 29589 NULL
+dio_set_defer_completion_29599 dio_set_defer_completion 0 29599 NULL
+slots_per_page_29601 slots_per_page 0 29601 NULL
+osc_cached_mb_seq_write_29610 osc_cached_mb_seq_write 3 29610 NULL
++lstcon_rpc_init_29623 lstcon_rpc_init 4 29623 NULL
+nla_get_u16_29624 nla_get_u16 0 29624 NULL
-+gfs2_alloc_blocks_29630 gfs2_alloc_blocks 0 29630 NULL
+tx_frag_cache_hit_read_29639 tx_frag_cache_hit_read 3 29639 NULL
-+sctp_make_abort_user_29654 sctp_make_abort_user 3 29654 NULL
++sctp_make_abort_user_29654 sctp_make_abort_user 3 29654 NULL nohasharray
++spmi_controller_alloc_29654 spmi_controller_alloc 2 29654 &sctp_make_abort_user_29654
+sisusb_write_mem_bulk_29678 sisusb_write_mem_bulk 4 29678 NULL
+lustre_posix_acl_xattr_2ext_29693 lustre_posix_acl_xattr_2ext 2 29693 NULL
+posix_acl_from_xattr_29708 posix_acl_from_xattr 3 29708 NULL
@@ -121576,35 +121030,32 @@ index 0000000..3d3508d
+xfs_new_eof_29737 xfs_new_eof 2 29737 NULL
+std_nic_write_29752 std_nic_write 3 29752 NULL
+static_key_count_29771 static_key_count 0 29771 NULL
++tg3_irq_count_29786 tg3_irq_count 0 29786 NULL
+dbAlloc_29794 dbAlloc 0 29794 NULL
+tcp_sendpage_29829 tcp_sendpage 4 29829 NULL
+__probe_kernel_write_29842 __probe_kernel_write 3 29842 NULL
+kvm_read_hva_atomic_29848 kvm_read_hva_atomic 3 29848 NULL
+count_partial_29850 count_partial 0 29850 NULL
-+xfs_rtfind_forw_29866 xfs_rtfind_forw 0 29866 NULL
+write_file_bool_bmps_29870 write_file_bool_bmps 3 29870 NULL
+ipv6_setsockopt_29871 ipv6_setsockopt 5 29871 NULL
-+scsi_end_request_29876 scsi_end_request 3 29876 NULL
+crypto_aead_alignmask_29885 crypto_aead_alignmask 0 29885 NULL
-+xfs_alloc_read_agf_29893 xfs_alloc_read_agf 0 29893 NULL
++rtw_cfg80211_indicate_sta_assoc_29897 rtw_cfg80211_indicate_sta_assoc 3 29897 NULL
++nv94_gpio_intr_mask_29907 nv94_gpio_intr_mask 4-3 29907 NULL
+lov_ost_pool_extend_29914 lov_ost_pool_extend 2 29914 NULL
+write_file_queue_29922 write_file_queue 3 29922 NULL
+__btrfs_getxattr_29947 __btrfs_getxattr 0 29947 NULL nohasharray
+ipv6_recv_error_29947 ipv6_recv_error 3 29947 &__btrfs_getxattr_29947
++zero_iovec_29955 zero_iovec 1 29955 NULL
+dev_mem_write_30028 dev_mem_write 3 30028 NULL
+alloc_netdev_mqs_30030 alloc_netdev_mqs 1 30030 NULL
+sysfs_add_file_mode_ns_30038 sysfs_add_file_mode_ns 0 30038 NULL
-+scsi_vpd_inquiry_30040 scsi_vpd_inquiry 4 30040 NULL
++scsi_vpd_inquiry_30040 scsi_vpd_inquiry 0-4 30040 NULL
+drp_wmove_30043 drp_wmove 4 30043 NULL
-+mem_cgroup_charge_common_30047 mem_cgroup_charge_common 0 30047 NULL
-+__pci_request_selected_regions_30058 __pci_request_selected_regions 0 30058 NULL
+cxgbi_ddp_reserve_30091 cxgbi_ddp_reserve 4 30091 NULL
+snd_midi_channel_init_set_30092 snd_midi_channel_init_set 1 30092 NULL
+rx_filter_data_filter_read_30098 rx_filter_data_filter_read 3 30098 NULL
+defragment_dma_buffer_30113 defragment_dma_buffer 0 30113 NULL
-+xfs_iget_cache_miss_30115 xfs_iget_cache_miss 0 30115 NULL
+spi_async_locked_30117 spi_async_locked 0 30117 NULL
-+recv_stream_30138 recv_stream 4 30138 NULL
+u_memcpya_30139 u_memcpya 3-2 30139 NULL
+dbg_port_buf_30145 dbg_port_buf 2 30145 NULL
+elfcorehdr_read_30159 elfcorehdr_read 2 30159 NULL
@@ -121614,13 +121065,10 @@ index 0000000..3d3508d
+drm_property_create_bitmask_30195 drm_property_create_bitmask 5 30195 NULL
+__genwqe_readq_30197 __genwqe_readq 0 30197 NULL
+usblp_ioctl_30203 usblp_ioctl 2 30203 NULL
-+read_4k_modal_eeprom_30212 read_4k_modal_eeprom 3 30212 NULL
+SyS_semop_30227 SyS_semop 3 30227 NULL
+bitmap_file_set_bit_30228 bitmap_file_set_bit 2 30228 NULL
-+shmem_unuse_inode_30263 shmem_unuse_inode 0 30263 NULL
+rawv6_recvmsg_30265 rawv6_recvmsg 4 30265 NULL
-+try_break_deleg_30271 try_break_deleg 0 30271 NULL nohasharray
-+isr_pci_pm_read_30271 isr_pci_pm_read 3 30271 &try_break_deleg_30271
++isr_pci_pm_read_30271 isr_pci_pm_read 3 30271 NULL
+compat_readv_30273 compat_readv 3 30273 NULL
+skcipher_sendmsg_30290 skcipher_sendmsg 4 30290 NULL
+pipeline_sec_frag_swi_read_30294 pipeline_sec_frag_swi_read 3 30294 NULL
@@ -121630,13 +121078,11 @@ index 0000000..3d3508d
+i8254_read_30330 i8254_read 0 30330 NULL
+resource_from_user_30341 resource_from_user 3 30341 NULL
+o2nm_this_node_30342 o2nm_this_node 0 30342 NULL
-+gfs2_trans_begin_30359 gfs2_trans_begin 0 30359 NULL
+kstrtou32_from_user_30361 kstrtou32_from_user 2 30361 NULL
-+pagecache_write_begin_30364 pagecache_write_begin 0 30364 NULL
++pvscsi_change_queue_depth_30365 pvscsi_change_queue_depth 2 30365 NULL
+C_SYSC_readv_30369 C_SYSC_readv 3 30369 NULL
+blkdev_issue_zeroout_30392 blkdev_issue_zeroout 3 30392 NULL
+c4iw_init_resource_30393 c4iw_init_resource 2-3 30393 NULL
-+get_kernel_pages_30397 get_kernel_pages 0 30397 NULL
+vb2_fop_write_30420 vb2_fop_write 3 30420 NULL
+tx_tx_template_prepared_read_30424 tx_tx_template_prepared_read 3 30424 NULL
+lstcon_session_info_30425 lstcon_session_info 6 30425 NULL
@@ -121644,16 +121090,15 @@ index 0000000..3d3508d
+tx_tx_template_programmed_read_30461 tx_tx_template_programmed_read 3 30461 NULL
+urandom_read_30462 urandom_read 3 30462 NULL
+zoran_ioctl_30465 zoran_ioctl 2 30465 NULL
-+i2c_ctrl_read_30467 i2c_ctrl_read 0 30467 NULL
+adu_write_30487 adu_write 3 30487 NULL
+dtim_interval_write_30489 dtim_interval_write 3 30489 NULL
+batadv_send_tt_request_30493 batadv_send_tt_request 5 30493 NULL
-+__send_duplicate_bios_30498 __send_duplicate_bios 4 30498 NULL
+memblock_virt_alloc_node_30515 memblock_virt_alloc_node 1 30515 NULL
+dwc3_testmode_write_30516 dwc3_testmode_write 3 30516 NULL
-+set_config_30526 set_config 0 30526 NULL nohasharray
-+debug_debug2_read_30526 debug_debug2_read 3 30526 &set_config_30526
-+xfs_sb_version_hasftype_30559 xfs_sb_version_hasftype 0 30559 NULL
++debug_debug2_read_30526 debug_debug2_read 3 30526 NULL nohasharray
++set_config_30526 set_config 0 30526 &debug_debug2_read_30526
++xfs_sb_version_hasftype_30559 xfs_sb_version_hasftype 0 30559 NULL nohasharray
++ixgbevf_acquire_msix_vectors_30559 ixgbevf_acquire_msix_vectors 2 30559 &xfs_sb_version_hasftype_30559
+disk_expand_part_tbl_30561 disk_expand_part_tbl 2 30561 NULL
+set_le_30581 set_le 4 30581 NULL
+blk_init_tags_30592 blk_init_tags 1 30592 NULL
@@ -121666,22 +121111,26 @@ index 0000000..3d3508d
+SyS_listxattr_30647 SyS_listxattr 3 30647 NULL
+jffs2_flash_read_30667 jffs2_flash_read 0 30667 NULL
+ni_ai_fifo_read_30681 ni_ai_fifo_read 3 30681 NULL
-+dccp_setsockopt_ccid_30701 dccp_setsockopt_ccid 4 30701 NULL nohasharray
-+xfs_bmap_add_extent_unwritten_real_30701 xfs_bmap_add_extent_unwritten_real 0 30701 &dccp_setsockopt_ccid_30701
++sst_hsw_get_dsp_position_30691 sst_hsw_get_dsp_position 0 30691 NULL
++get_pages_alloc_iovec_30699 get_pages_alloc_iovec 3-0 30699 NULL
++dccp_setsockopt_ccid_30701 dccp_setsockopt_ccid 4 30701 NULL
+lbs_wrbbp_write_30712 lbs_wrbbp_write 3 30712 NULL
+lbs_debugfs_read_30721 lbs_debugfs_read 3 30721 NULL
+snd_nm256_playback_silence_30727 snd_nm256_playback_silence 4-3 30727 NULL
+snapshot_status_30744 snapshot_status 5 30744 NULL
++fuse_direct_IO_30753 fuse_direct_IO 4 30753 NULL
+fuse_conn_limit_write_30777 fuse_conn_limit_write 3 30777 NULL
+__bio_alloc_30787 __bio_alloc 3 30787 NULL
+smk_read_doi_30813 smk_read_doi 3 30813 NULL
-+xlog_grant_head_wait_30829 xlog_grant_head_wait 0 30829 NULL
+get_kobj_path_length_30831 get_kobj_path_length 0 30831 NULL
+ath10k_write_fw_dbglog_30835 ath10k_write_fw_dbglog 3 30835 NULL
++of_gpio_named_count_30841 of_gpio_named_count 0 30841 NULL
+sctp_setsockopt_auth_chunk_30843 sctp_setsockopt_auth_chunk 3 30843 NULL
++cfg80211_rx_mgmt_30844 cfg80211_rx_mgmt 5 30844 NULL
+wd_autoreset_write_30862 wd_autoreset_write 3 30862 NULL
+ieee80211_if_fmt_dropped_frames_no_route_30884 ieee80211_if_fmt_dropped_frames_no_route 3 30884 NULL
+pn_recvmsg_30887 pn_recvmsg 4 30887 NULL
++copy_to_iter_30901 copy_to_iter 2 30901 NULL
+usnic_debugfs_buildinfo_read_30928 usnic_debugfs_buildinfo_read 3 30928 NULL
+sctp_setsockopt_rtoinfo_30941 sctp_setsockopt_rtoinfo 3 30941 NULL
+tty_insert_flip_string_flags_30969 tty_insert_flip_string_flags 4 30969 NULL
@@ -121690,21 +121139,19 @@ index 0000000..3d3508d
+lbs_host_sleep_read_31013 lbs_host_sleep_read 3 31013 NULL
+ima_eventsig_init_31022 ima_eventsig_init 5 31022 NULL
+template_fmt_size_31033 template_fmt_size 0 31033 NULL
-+do_setup_msi_irqs_31043 do_setup_msi_irqs 2 31043 NULL
+stride_pg_count_31053 stride_pg_count 0-3-2-1-4-5 31053 NULL
+lbs_failcount_read_31063 lbs_failcount_read 3 31063 NULL
+sctp_setsockopt_context_31091 sctp_setsockopt_context 3 31091 NULL
+proc_gid_map_write_31093 proc_gid_map_write 3 31093 NULL
-+compat_sys_get_mempolicy_31109 compat_sys_get_mempolicy 3 31109 NULL
+depth_read_31112 depth_read 3 31112 NULL
+hash_ipportnet6_expire_31118 hash_ipportnet6_expire 4 31118 NULL
+kimage_normal_alloc_31140 kimage_normal_alloc 3 31140 NULL
+size_inside_page_31141 size_inside_page 0 31141 NULL
+w9966_v4l_read_31148 w9966_v4l_read 3 31148 NULL
++nvme_set_features_31169 nvme_set_features 0 31169 NULL
+ch_do_scsi_31171 ch_do_scsi 4 31171 NULL
+r592_read_fifo_pio_31198 r592_read_fifo_pio 3 31198 NULL
+mtdchar_readoob_31200 mtdchar_readoob 4 31200 NULL
-+__btrfs_free_reserved_extent_31207 __btrfs_free_reserved_extent 2 31207 NULL
+cpumask_weight_31215 cpumask_weight 0 31215 NULL
+__read_reg_31216 __read_reg 0 31216 NULL
+atm_get_addr_31221 atm_get_addr 3 31221 NULL
@@ -121713,11 +121160,12 @@ index 0000000..3d3508d
+_create_sg_bios_31244 _create_sg_bios 4 31244 NULL
+ieee80211_if_read_last_beacon_31257 ieee80211_if_read_last_beacon 3 31257 NULL
+hash_netportnet4_expire_31290 hash_netportnet4_expire 4 31290 NULL
++iwl_dbgfs_set_nic_temperature_read_31300 iwl_dbgfs_set_nic_temperature_read 3 31300 NULL
+uvc_simplify_fraction_31303 uvc_simplify_fraction 3 31303 NULL
+sisusbcon_scroll_31315 sisusbcon_scroll 5-2-3 31315 NULL
+command_file_write_31318 command_file_write 3 31318 NULL
+hwerr_crcbits_31334 hwerr_crcbits 4 31334 NULL
-+radix_tree_insert_31336 radix_tree_insert 0 31336 NULL
++_regmap_raw_multi_reg_write_31336 _regmap_raw_multi_reg_write 3 31336 NULL
+em28xx_init_usb_xfer_31337 em28xx_init_usb_xfer 4-6 31337 NULL
+outlen_write_31358 outlen_write 3 31358 NULL
+ieee80211_rx_mgmt_auth_31366 ieee80211_rx_mgmt_auth 3 31366 NULL
@@ -121725,6 +121173,7 @@ index 0000000..3d3508d
+vb2_vmalloc_get_userptr_31374 vb2_vmalloc_get_userptr 3-2 31374 NULL
+trace_parser_get_init_31379 trace_parser_get_init 2 31379 NULL
+inb_31388 inb 0 31388 NULL
++mp_ioapic_pin_count_31393 mp_ioapic_pin_count 0 31393 NULL
+key_ifindex_read_31411 key_ifindex_read 3 31411 NULL
+_sp2d_max_pg_31422 _sp2d_max_pg 0 31422 NULL
+TSS_checkhmac1_31429 TSS_checkhmac1 5 31429 NULL
@@ -121743,9 +121192,8 @@ index 0000000..3d3508d
+osst_write_31581 osst_write 3 31581 NULL
+snd_compr_get_avail_31584 snd_compr_get_avail 0 31584 NULL
+iwl_dbgfs_ucode_tx_stats_read_31611 iwl_dbgfs_ucode_tx_stats_read 3 31611 NULL
-+mtd_get_user_prot_info_31616 mtd_get_user_prot_info 0 31616 NULL
-+arvo_sysfs_read_31617 arvo_sysfs_read 6 31617 NULL nohasharray
-+memblock_virt_alloc_nopanic_31617 memblock_virt_alloc_nopanic 1 31617 &arvo_sysfs_read_31617
++memblock_virt_alloc_nopanic_31617 memblock_virt_alloc_nopanic 1 31617 NULL nohasharray
++arvo_sysfs_read_31617 arvo_sysfs_read 6 31617 &memblock_virt_alloc_nopanic_31617
+usnic_ib_dump_vf_31623 usnic_ib_dump_vf 3 31623 NULL
+videobuf_read_one_31637 videobuf_read_one 3 31637 NULL
+pod_alloc_sysex_buffer_31651 pod_alloc_sysex_buffer 3 31651 NULL
@@ -121754,18 +121202,17 @@ index 0000000..3d3508d
+copy_from_user_nmi_31672 copy_from_user_nmi 3-0 31672 NULL
+forced_ps_read_31685 forced_ps_read 3 31685 NULL
+fst_recover_rx_error_31687 fst_recover_rx_error 3 31687 NULL
-+gfs2_dir_check_31711 gfs2_dir_check 0 31711 NULL
+rs_pretty_print_rate_31727 rs_pretty_print_rate 0 31727 NULL
-+utf16s_to_utf8s_31735 utf16s_to_utf8s 0 31735 NULL nohasharray
-+lu_buf_check_and_grow_31735 lu_buf_check_and_grow 2 31735 &utf16s_to_utf8s_31735
++lu_buf_check_and_grow_31735 lu_buf_check_and_grow 2 31735 NULL nohasharray
++utf16s_to_utf8s_31735 utf16s_to_utf8s 0 31735 &lu_buf_check_and_grow_31735
+shmem_pwrite_slow_31741 shmem_pwrite_slow 3-2 31741 NULL
+input_abs_get_max_31742 input_abs_get_max 0 31742 NULL nohasharray
+NCR_700_change_queue_depth_31742 NCR_700_change_queue_depth 2 31742 &input_abs_get_max_31742
+bcm_char_read_31750 bcm_char_read 3 31750 NULL
+snd_seq_device_new_31753 snd_seq_device_new 4 31753 NULL
+SyS_lsetxattr_31766 SyS_lsetxattr 4 31766 NULL
-+osync_buffers_list_31789 osync_buffers_list 0 31789 NULL
+usblp_cache_device_id_string_31790 usblp_cache_device_id_string 0 31790 NULL
++get_count_order_31800 get_count_order 0 31800 NULL
+ecryptfs_send_message_locked_31801 ecryptfs_send_message_locked 2 31801 NULL
+isr_rx_procs_read_31804 isr_rx_procs_read 3 31804 NULL
+data_write_31805 data_write 3 31805 NULL
@@ -121774,7 +121221,6 @@ index 0000000..3d3508d
+sta_last_signal_read_31818 sta_last_signal_read 3 31818 NULL
+clone_bio_31854 clone_bio 4-3 31854 NULL
+SyS_ppoll_31855 SyS_ppoll 2 31855 NULL
-+foreach_descriptor_31873 foreach_descriptor 0 31873 NULL
+iwl_dbgfs_disable_ht40_write_31876 iwl_dbgfs_disable_ht40_write 3 31876 NULL
+drm_mode_crtc_set_gamma_size_31881 drm_mode_crtc_set_gamma_size 2 31881 NULL
+ddb_output_write_31902 ddb_output_write 3-0 31902 NULL
@@ -121782,9 +121228,10 @@ index 0000000..3d3508d
+lu_buf_realloc_31915 lu_buf_realloc 2 31915 NULL
+new_dir_31919 new_dir 3 31919 NULL
+kmem_alloc_31920 kmem_alloc 1 31920 NULL
++era_status_31934 era_status 5 31934 NULL
+SYSC_sethostname_31940 SYSC_sethostname 2 31940 NULL
-+read_mem_31942 read_mem 3 31942 NULL nohasharray
-+iov_iter_copy_from_user_31942 iov_iter_copy_from_user 4-0 31942 &read_mem_31942
++read_mem_31942 read_mem 3 31942 NULL
++ext4_zero_range_31944 ext4_zero_range 3-2 31944 NULL
+vb2_write_31948 vb2_write 3 31948 NULL
+pvr2_ctrl_get_valname_31951 pvr2_ctrl_get_valname 4 31951 NULL
+regcache_rbtree_sync_31964 regcache_rbtree_sync 2 31964 NULL
@@ -121797,20 +121244,22 @@ index 0000000..3d3508d
+sysfs_create_file_31996 sysfs_create_file 0 31996 NULL
+calc_hmac_32010 calc_hmac 3 32010 NULL
+aead_len_32021 aead_len 0 32021 NULL
++sci_dma_rx_push_32029 sci_dma_rx_push 2 32029 NULL
+stk_read_32038 stk_read 3 32038 NULL
+SYSC_llistxattr_32061 SYSC_llistxattr 3 32061 NULL
+proc_scsi_devinfo_write_32064 proc_scsi_devinfo_write 3 32064 NULL
-+xfs_buf_iowait_32068 xfs_buf_iowait 0 32068 NULL
+cow_file_range_inline_32091 cow_file_range_inline 3 32091 NULL
++kiblnd_alloc_pages_32092 kiblnd_alloc_pages 3 32092 NULL
+bio_alloc_32095 bio_alloc 2 32095 NULL
+ath6kl_fwlog_read_32101 ath6kl_fwlog_read 3 32101 NULL
++wil_read_file_recovery_32104 wil_read_file_recovery 3 32104 NULL
+disk_status_32120 disk_status 4 32120 NULL
+kobject_add_internal_32133 kobject_add_internal 0 32133 NULL
+venus_link_32165 venus_link 5 32165 NULL
++ocfs2_direct_IO_32168 ocfs2_direct_IO 4 32168 NULL
+do_writepages_32173 do_writepages 0 32173 NULL
+del_ptr_32197 del_ptr 4 32197 NULL
+wusb_ccm_mac_32199 wusb_ccm_mac 7 32199 NULL
-+__mem_cgroup_try_charge_swapin_32204 __mem_cgroup_try_charge_swapin 0 32204 NULL
+riva_get_cmap_len_32218 riva_get_cmap_len 0 32218 NULL
+caif_seqpkt_recvmsg_32241 caif_seqpkt_recvmsg 4 32241 NULL
+lbs_lowrssi_read_32242 lbs_lowrssi_read 3 32242 NULL
@@ -121820,27 +121269,22 @@ index 0000000..3d3508d
+SyS_select_32319 SyS_select 1 32319 NULL
+nouveau_bar_create__32332 nouveau_bar_create_ 4 32332 NULL
+nl80211_send_mlme_event_32337 nl80211_send_mlme_event 4 32337 NULL
-+xfs_bmap_extsize_align_32338 xfs_bmap_extsize_align 0 32338 NULL
+t4_alloc_mem_32342 t4_alloc_mem 1 32342 NULL
+dispatch_ioctl_32357 dispatch_ioctl 2 32357 NULL nohasharray
+rx_streaming_always_write_32357 rx_streaming_always_write 3 32357 &dispatch_ioctl_32357
-+ReadHDLCPCI_32362 ReadHDLCPCI 0 32362 NULL nohasharray
-+sel_read_initcon_32362 sel_read_initcon 3 32362 &ReadHDLCPCI_32362
-+ocfs2_cancel_convert_32392 ocfs2_cancel_convert 0 32392 NULL
++sel_read_initcon_32362 sel_read_initcon 3 32362 NULL nohasharray
++ReadHDLCPCI_32362 ReadHDLCPCI 0 32362 &sel_read_initcon_32362
+ll_setxattr_common_32398 ll_setxattr_common 4 32398 NULL
+xfs_iext_add_indirect_multi_32400 xfs_iext_add_indirect_multi 3 32400 NULL
+vmci_qp_alloc_32405 vmci_qp_alloc 5-3 32405 NULL
-+xfs_alloc_put_freelist_32437 xfs_alloc_put_freelist 0 32437 NULL
+cache_status_32462 cache_status 5 32462 NULL
+fill_readbuf_32464 fill_readbuf 3 32464 NULL
-+dgap_usertoboard_32490 dgap_usertoboard 4 32490 NULL
+ide_driver_proc_write_32493 ide_driver_proc_write 3 32493 NULL
+bypass_pwoff_write_32499 bypass_pwoff_write 3 32499 NULL
+mdc_pinger_recov_seq_write_32510 mdc_pinger_recov_seq_write 3 32510 NULL
+ctrl_std_val_to_sym_32516 ctrl_std_val_to_sym 5 32516 NULL
+disconnect_32521 disconnect 4 32521 NULL
+qsfp_read_32522 qsfp_read 0-2-4 32522 NULL
-+ocfs2_refresh_qinfo_32524 ocfs2_refresh_qinfo 0 32524 NULL
+ilo_read_32531 ilo_read 3 32531 NULL
+ieee80211_if_read_estab_plinks_32533 ieee80211_if_read_estab_plinks 3 32533 NULL
+format_devstat_counter_32550 format_devstat_counter 3 32550 NULL
@@ -121850,35 +121294,33 @@ index 0000000..3d3508d
+pipeline_tcp_tx_stat_fifo_int_read_32589 pipeline_tcp_tx_stat_fifo_int_read 3 32589 NULL
+read_file_beacon_32595 read_file_beacon 3 32595 NULL
+ieee80211_if_read_dropped_frames_congestion_32603 ieee80211_if_read_dropped_frames_congestion 3 32603 NULL
-+xfs_bmap_last_offset_32614 xfs_bmap_last_offset 0 32614 NULL
+irda_recvmsg_dgram_32631 irda_recvmsg_dgram 4 32631 NULL
+cfg80211_roamed_32632 cfg80211_roamed 5-7 32632 NULL
++xpcs_reg_value_read_32644 xpcs_reg_value_read 3 32644 NULL
+kvmalloc_32646 kvmalloc 1 32646 NULL
+ib_sg_dma_len_32649 ib_sg_dma_len 0 32649 NULL
+generic_readlink_32654 generic_readlink 3 32654 NULL
+move_addr_to_kernel_32673 move_addr_to_kernel 2 32673 NULL
-+apei_res_add_32674 apei_res_add 0 32674 NULL
+compat_SyS_preadv_32679 compat_SyS_preadv 3 32679 NULL
+jfs_readpages_32702 jfs_readpages 4 32702 NULL
-+xfs_filestream_new_ag_32711 xfs_filestream_new_ag 0 32711 NULL
+rt2x00debug_read_queue_dump_32712 rt2x00debug_read_queue_dump 3 32712 NULL
-+xfs_bmbt_update_32713 xfs_bmbt_update 0 32713 NULL
-+i40e_pci_sriov_enable_32742 i40e_pci_sriov_enable 2 32742 NULL
++_xfs_buf_get_pages_32715 _xfs_buf_get_pages 2 32715 NULL
+megasas_change_queue_depth_32747 megasas_change_queue_depth 2 32747 NULL
+stats_read_ul_32751 stats_read_ul 3 32751 NULL
+vmci_transport_dgram_dequeue_32775 vmci_transport_dgram_dequeue 4 32775 NULL
+sctp_tsnmap_grow_32784 sctp_tsnmap_grow 2 32784 NULL
-+xfs_trans_read_buf_32795 xfs_trans_read_buf 0 32795 NULL
+rproc_name_read_32805 rproc_name_read 3 32805 NULL
+sta_tx_latency_stat_read_32862 sta_tx_latency_stat_read 3 32862 NULL
+new_tape_buffer_32866 new_tape_buffer 2 32866 NULL
+cifs_writedata_alloc_32880 cifs_writedata_alloc 1 32880 NULL nohasharray
+ath6kl_usb_submit_ctrl_in_32880 ath6kl_usb_submit_ctrl_in 6 32880 &cifs_writedata_alloc_32880
+vp702x_usb_inout_cmd_32884 vp702x_usb_inout_cmd 4-6 32884 NULL
-+il_dbgfs_tx_stats_read_32913 il_dbgfs_tx_stats_read 3 32913 NULL
++visorchannel_dump_section_32893 visorchannel_dump_section 4 32893 NULL
++tipc_link_iovec_xmit_fast_32913 tipc_link_iovec_xmit_fast 3 32913 NULL nohasharray
++il_dbgfs_tx_stats_read_32913 il_dbgfs_tx_stats_read 3 32913 &tipc_link_iovec_xmit_fast_32913
+zlib_inflate_workspacesize_32927 zlib_inflate_workspacesize 0 32927 NULL
+rmap_recycle_32938 rmap_recycle 3 32938 NULL
-+xfs_log_reserve_32959 xfs_log_reserve 0 32959 NULL
++ptlrpc_prep_bulk_imp_32997 ptlrpc_prep_bulk_imp 2 32997 NULL
+compat_filldir_32999 compat_filldir 3 32999 NULL
+SyS_syslog_33007 SyS_syslog 3 33007 NULL
+br_multicast_set_hash_max_33012 br_multicast_set_hash_max 2 33012 NULL
@@ -121892,14 +121334,13 @@ index 0000000..3d3508d
+sel_read_checkreqprot_33068 sel_read_checkreqprot 3 33068 NULL
+alloc_tio_33077 alloc_tio 3 33077 NULL
+acl_permission_check_33083 acl_permission_check 0 33083 NULL
++f2fs_llseek_33098 f2fs_llseek 2 33098 NULL
+fb_sys_write_33130 fb_sys_write 3 33130 NULL
-+notify_change_33143 notify_change 0 33143 NULL
+SyS_poll_33152 SyS_poll 2 33152 NULL
+_pci_add_cap_save_buffer_33153 _pci_add_cap_save_buffer 4 33153 NULL
+debug_debug6_read_33168 debug_debug6_read 3 33168 NULL
+dataflash_read_fact_otp_33204 dataflash_read_fact_otp 3-2 33204 NULL
+pp_read_33210 pp_read 3 33210 NULL
-+xfs_file_aio_write_33234 xfs_file_aio_write 4 33234 NULL
+snd_pcm_plug_client_size_33267 snd_pcm_plug_client_size 0-2 33267 NULL
+cachefiles_cook_key_33274 cachefiles_cook_key 2 33274 NULL
+sync_pt_create_33282 sync_pt_create 2 33282 NULL
@@ -121913,10 +121354,10 @@ index 0000000..3d3508d
+read_file_regidx_33370 read_file_regidx 3 33370 NULL
+ieee80211_if_read_dropped_frames_no_route_33383 ieee80211_if_read_dropped_frames_no_route 3 33383 NULL
+scsi_varlen_cdb_length_33385 scsi_varlen_cdb_length 0 33385 NULL
++nvc0_ram_create__33391 nvc0_ram_create_ 5 33391 NULL
+ocfs2_allocate_unwritten_extents_33394 ocfs2_allocate_unwritten_extents 3-2 33394 NULL
+cfs_trace_copyin_string_33396 cfs_trace_copyin_string 4 33396 NULL
+snd_pcm_capture_ioctl1_33408 snd_pcm_capture_ioctl1 0 33408 NULL
-+filemap_fdatawrite_33415 filemap_fdatawrite 0 33415 NULL
+hash_netiface6_expire_33421 hash_netiface6_expire 4 33421 NULL
+dis_tap_write_33426 dis_tap_write 3 33426 NULL
+message_stats_list_33440 message_stats_list 5 33440 NULL
@@ -121936,31 +121377,30 @@ index 0000000..3d3508d
+scsi_execute_33596 scsi_execute 5 33596 NULL
+comedi_buf_write_n_allocated_33604 comedi_buf_write_n_allocated 0 33604 NULL
+xt_compat_target_offset_33608 xt_compat_target_offset 0 33608 NULL
-+usb_gstrings_attach_33615 usb_gstrings_attach 3 33615 NULL nohasharray
-+il_dbgfs_qos_read_33615 il_dbgfs_qos_read 3 33615 &usb_gstrings_attach_33615
-+xfs_btree_check_sblock_33618 xfs_btree_check_sblock 0 33618 NULL
++il_dbgfs_qos_read_33615 il_dbgfs_qos_read 3 33615 NULL nohasharray
++usb_gstrings_attach_33615 usb_gstrings_attach 3 33615 &il_dbgfs_qos_read_33615
+stride_page_count_33641 stride_page_count 2 33641 NULL
+irq_blk_threshold_read_33666 irq_blk_threshold_read 3 33666 NULL
+inw_p_33668 inw_p 0 33668 NULL
+arp_hdr_len_33671 arp_hdr_len 0 33671 NULL
+i2c_hid_alloc_buffers_33673 i2c_hid_alloc_buffers 2 33673 NULL
-+submit_one_bio_33683 submit_one_bio 0 33683 NULL
+nv50_disp_dmac_create__33696 nv50_disp_dmac_create_ 6 33696 NULL
+netlink_sendmsg_33708 netlink_sendmsg 4 33708 NULL
+tipc_link_stats_33716 tipc_link_stats 3 33716 NULL
-+ext4_wb_update_i_disksize_33717 ext4_wb_update_i_disksize 2 33717 NULL
+pvr2_stream_buffer_count_33719 pvr2_stream_buffer_count 2 33719 NULL
+write_file_spectral_count_33723 write_file_spectral_count 3 33723 NULL
+read_file_node_recv_33729 read_file_node_recv 3 33729 NULL
+__mutex_lock_interruptible_slowpath_33735 __mutex_lock_interruptible_slowpath 0 33735 NULL
+vifs_state_read_33762 vifs_state_read 3 33762 NULL
+hashtab_create_33769 hashtab_create 3 33769 NULL
++__btrfs_free_reserved_extent_33782 __btrfs_free_reserved_extent 2 33782 NULL
+if_sdio_read_rx_len_33800 if_sdio_read_rx_len 0 33800 NULL
+filter_write_33819 filter_write 3 33819 NULL
+sep_create_msgarea_context_33829 sep_create_msgarea_context 4 33829 NULL
+scrub_setup_recheck_block_33831 scrub_setup_recheck_block 5-4 33831 NULL
+ext4_journal_extend_33835 ext4_journal_extend 2 33835 NULL
+oz_cdev_write_33852 oz_cdev_write 3 33852 NULL
++azx_get_pos_posbuf_33867 azx_get_pos_posbuf 0 33867 NULL
+get_user_pages_33908 get_user_pages 0 33908 NULL
+sg_nents_33909 sg_nents 0 33909 NULL
+ath6kl_roam_mode_write_33912 ath6kl_roam_mode_write 3 33912 NULL
@@ -121968,14 +121408,15 @@ index 0000000..3d3508d
+sel_read_avc_cache_threshold_33942 sel_read_avc_cache_threshold 3 33942 NULL
+lpfc_idiag_ctlacc_read_33943 lpfc_idiag_ctlacc_read 3 33943 NULL
+read_file_tgt_rx_stats_33944 read_file_tgt_rx_stats 3 33944 NULL
++rs_sta_dbgfs_drv_tx_stats_read_33946 rs_sta_dbgfs_drv_tx_stats_read 3 33946 NULL
+__proc_dump_kernel_33954 __proc_dump_kernel 5 33954 NULL
-+btrfs_delalloc_reserve_metadata_33963 btrfs_delalloc_reserve_metadata 0 33963 NULL
+vga_switcheroo_debugfs_write_33984 vga_switcheroo_debugfs_write 3 33984 NULL
+lbs_lowrssi_write_34025 lbs_lowrssi_write 3 34025 NULL
+ppp_write_34034 ppp_write 3 34034 NULL
+tty_insert_flip_string_34042 tty_insert_flip_string 3-0 34042 NULL
++bm_page_io_async_34050 bm_page_io_async 2 34050 NULL
++calc_linear_pos_34067 calc_linear_pos 0-4 34067 NULL
+memcg_update_all_caches_34068 memcg_update_all_caches 1 34068 NULL
-+xfs_dialloc_34078 xfs_dialloc 0 34078 NULL
+pipeline_pipeline_fifo_full_read_34095 pipeline_pipeline_fifo_full_read 3 34095 NULL
+__irq_domain_add_34101 __irq_domain_add 2 34101 NULL
+proc_scsi_host_write_34107 proc_scsi_host_write 3 34107 NULL
@@ -121983,29 +121424,31 @@ index 0000000..3d3508d
+ttm_dma_page_pool_free_34135 ttm_dma_page_pool_free 2-0 34135 NULL
+ixgbe_dbg_netdev_ops_write_34141 ixgbe_dbg_netdev_ops_write 3 34141 NULL
+shmem_pread_fast_34147 shmem_pread_fast 3 34147 NULL
-+ocfs2_xattr_list_entry_34165 ocfs2_xattr_list_entry 0 34165 NULL
+skb_to_sgvec_34171 skb_to_sgvec 0 34171 NULL
-+xfs_bmapi_write_34208 xfs_bmapi_write 0 34208 NULL
++rsi_debug_zone_write_34206 rsi_debug_zone_write 3 34206 NULL nohasharray
++rbd_osd_req_create_34206 rbd_osd_req_create 3 34206 &rsi_debug_zone_write_34206
+ext4_da_write_begin_34215 ext4_da_write_begin 3-4 34215 NULL
+bl_pipe_downcall_34264 bl_pipe_downcall 3 34264 NULL
-+ocfs2_dlm_lock_34265 ocfs2_dlm_lock 0 34265 NULL
+device_private_init_34279 device_private_init 0 34279 NULL
++xgmac_reg_addr_write_34284 xgmac_reg_addr_write 3 34284 NULL
+ext4_get_groups_count_34324 ext4_get_groups_count 0 34324 NULL
+pcpu_need_to_extend_34326 pcpu_need_to_extend 0 34326 NULL nohasharray
+iov_iter_single_seg_count_34326 iov_iter_single_seg_count 0 34326 &pcpu_need_to_extend_34326
++proc_thread_self_readlink_34357 proc_thread_self_readlink 3 34357 NULL
+crypto_ablkcipher_ivsize_34363 crypto_ablkcipher_ivsize 0 34363 NULL nohasharray
+sync_page_io_34363 sync_page_io 3 34363 &crypto_ablkcipher_ivsize_34363
+rngapi_reset_34366 rngapi_reset 3 34366 NULL
-+ea_read_34378 ea_read 0 34378 NULL
-+fuse_send_read_34379 fuse_send_read 4 34379 NULL
++ea_read_34378 ea_read 0 34378 NULL nohasharray
++_iwl_dbgfs_low_latency_write_34378 _iwl_dbgfs_low_latency_write 3 34378 &ea_read_34378
++fuse_send_read_34379 fuse_send_read 0-4 34379 NULL
+av7110_vbi_write_34384 av7110_vbi_write 3 34384 NULL
+usbvision_v4l2_read_34386 usbvision_v4l2_read 3 34386 NULL
+read_rbu_image_type_34387 read_rbu_image_type 6 34387 NULL
-+iwl_calib_set_34400 iwl_calib_set 3 34400 NULL nohasharray
-+ivtv_read_pos_34400 ivtv_read_pos 3 34400 &iwl_calib_set_34400
++ivtv_read_pos_34400 ivtv_read_pos 3 34400 NULL nohasharray
++iwl_calib_set_34400 iwl_calib_set 3 34400 &ivtv_read_pos_34400
+wd_exp_mode_write_34407 wd_exp_mode_write 3 34407 NULL
+nl80211_send_disassoc_34424 nl80211_send_disassoc 4 34424 NULL
-+__extent_read_full_page_34437 __extent_read_full_page 0 34437 NULL
++security_socket_create_34439 security_socket_create 0 34439 NULL
+usbtest_alloc_urb_34446 usbtest_alloc_urb 3-5 34446 NULL
+mwifiex_regrdwr_read_34472 mwifiex_regrdwr_read 3 34472 NULL
+skcipher_sndbuf_34476 skcipher_sndbuf 0 34476 NULL
@@ -122019,6 +121462,7 @@ index 0000000..3d3508d
+hugetlbfs_read_actor_34547 hugetlbfs_read_actor 2-5-4-0 34547 NULL
+dbBackSplit_34561 dbBackSplit 0 34561 NULL
+alloc_ieee80211_rsl_34564 alloc_ieee80211_rsl 1 34564 NULL
++ext4_ind_direct_IO_34574 ext4_ind_direct_IO 4 34574 NULL
+lov_stripecount_seq_write_34582 lov_stripecount_seq_write 3 34582 NULL
+init_send_hfcd_34586 init_send_hfcd 1 34586 NULL
+inet6_ifla6_size_34591 inet6_ifla6_size 0 34591 NULL
@@ -122026,11 +121470,11 @@ index 0000000..3d3508d
+cw1200_queue_init_34599 cw1200_queue_init 4 34599 &ceph_msgpool_init_34599
+bio_integrity_bytes_34602 bio_integrity_bytes 2 34602 NULL
+__jffs2_ref_totlen_34609 __jffs2_ref_totlen 0 34609 NULL
-+apei_get_nvs_resources_34616 apei_get_nvs_resources 0 34616 NULL
+__cfg80211_disconnected_34622 __cfg80211_disconnected 3 34622 NULL
+cnic_alloc_dma_34641 cnic_alloc_dma 3 34641 NULL
+kvm_set_spte_hva_34671 kvm_set_spte_hva 2 34671 NULL
+sleep_auth_write_34676 sleep_auth_write 3 34676 NULL
++f2fs_direct_IO_34685 f2fs_direct_IO 4 34685 NULL
+isr_fiqs_read_34687 isr_fiqs_read 3 34687 NULL
+batadv_tvlv_realloc_packet_buff_34688 batadv_tvlv_realloc_packet_buff 3-4 34688 NULL
+port_print_34704 port_print 3 34704 NULL
@@ -122040,8 +121484,8 @@ index 0000000..3d3508d
+lsm_alloc_plain_34755 lsm_alloc_plain 1 34755 NULL
+bootmode_store_34762 bootmode_store 4 34762 NULL
+device_add_34766 device_add 0 34766 NULL
-+xfs_iget_cache_hit_34767 xfs_iget_cache_hit 0 34767 NULL
+qib_cdev_init_34778 qib_cdev_init 1 34778 NULL
++ext3_direct_IO_34798 ext3_direct_IO 4 34798 NULL
+SYSC_keyctl_34800 SYSC_keyctl 4 34800 NULL
+can_nocow_extent_34801 can_nocow_extent 2 34801 NULL
+drbd_get_max_capacity_34804 drbd_get_max_capacity 0 34804 NULL
@@ -122055,49 +121499,48 @@ index 0000000..3d3508d
+ieee80211_if_read_txpower_34871 ieee80211_if_read_txpower 3 34871 NULL
+msg_print_text_34889 msg_print_text 0 34889 NULL
+ieee80211_if_write_34894 ieee80211_if_write 3 34894 NULL
-+gfs2_glock_wait_34913 gfs2_glock_wait 0 34913 NULL
+si476x_radio_read_rsq_primary_blob_34916 si476x_radio_read_rsq_primary_blob 3 34916 NULL
+btrfs_super_chunk_root_34925 btrfs_super_chunk_root 0 34925 NULL nohasharray
+__inode_permission_34925 __inode_permission 0 34925 &btrfs_super_chunk_root_34925
-+ceph_aio_write_34930 ceph_aio_write 4 34930 NULL
+sec_flags2str_34933 sec_flags2str 3 34933 NULL
+snd_info_entry_read_34938 snd_info_entry_read 3 34938 NULL
-+i2c_transfer_34958 i2c_transfer 0 34958 NULL
++compat_SyS_kexec_load_34947 compat_SyS_kexec_load 2 34947 NULL
+do_add_page_to_bio_34974 do_add_page_to_bio 2-10 34974 NULL
-+print_message_35000 print_message 0 35000 NULL
++sdebug_change_qdepth_34994 sdebug_change_qdepth 2 34994 NULL
+rx_rx_hdr_overflow_read_35002 rx_rx_hdr_overflow_read 3 35002 NULL
+l2cap_skbuff_fromiovec_35003 l2cap_skbuff_fromiovec 4-3 35003 NULL
+sisusb_copy_memory_35016 sisusb_copy_memory 4 35016 NULL
+coda_psdev_read_35029 coda_psdev_read 3 35029 NULL
++hwdep_read_locked_35037 hwdep_read_locked 3 35037 NULL
+proc_setgroups_write_35039 proc_setgroups_write 3 35039 NULL
-+xfs_rtallocate_extent_35052 xfs_rtallocate_extent 0 35052 NULL
+pwr_connection_out_of_sync_read_35061 pwr_connection_out_of_sync_read 3 35061 NULL
-+ntfs_attr_extend_initialized_35084 ntfs_attr_extend_initialized 0 35084 NULL
+__kfifo_uint_must_check_helper_35097 __kfifo_uint_must_check_helper 0-1 35097 NULL
+capi_write_35104 capi_write 3 35104 NULL nohasharray
+tx_tx_done_template_read_35104 tx_tx_done_template_read 3 35104 &capi_write_35104
+ide_settings_proc_write_35110 ide_settings_proc_write 3 35110 NULL
+ceph_osdc_start_request_35122 ceph_osdc_start_request 0 35122 NULL
++addrs_per_inode_35151 addrs_per_inode 0 35151 NULL
+message_stats_print_35158 message_stats_print 6 35158 NULL
+iscsi_conn_setup_35159 iscsi_conn_setup 2 35159 NULL
+ieee80211_if_read_bssid_35161 ieee80211_if_read_bssid 3 35161 NULL
++compat_SyS_pselect6_35203 compat_SyS_pselect6 1 35203 NULL
+unix_stream_recvmsg_35210 unix_stream_recvmsg 4 35210 NULL
+striped_read_35218 striped_read 0-2 35218 NULL nohasharray
+security_key_getsecurity_35218 security_key_getsecurity 0 35218 &striped_read_35218
+rx_rx_cmplt_task_read_35226 rx_rx_cmplt_task_read 3 35226 NULL
++kimage_file_prepare_segments_35232 kimage_file_prepare_segments 5 35232 NULL
+set_fd_set_35249 set_fd_set 1 35249 NULL
+ioapic_setup_resources_35255 ioapic_setup_resources 1 35255 NULL
-+jbd2_journal_get_write_access_35263 jbd2_journal_get_write_access 0 35263 NULL
+dis_disc_write_35265 dis_disc_write 3 35265 NULL
+dma_show_regs_35266 dma_show_regs 3 35266 NULL
+irda_recvmsg_stream_35280 irda_recvmsg_stream 4 35280 NULL
+i2o_block_end_request_35282 i2o_block_end_request 3 35282 NULL
-+isr_rx_rdys_read_35283 isr_rx_rdys_read 3 35283 NULL
-+__btrfs_buffered_write_35311 __btrfs_buffered_write 3-0 35311 NULL nohasharray
++isr_rx_rdys_read_35283 isr_rx_rdys_read 3 35283 NULL nohasharray
++nvkm_notify_init_35283 nvkm_notify_init 7 35283 &isr_rx_rdys_read_35283
++__btrfs_buffered_write_35311 __btrfs_buffered_write 3 35311 NULL nohasharray
+brcmf_sdio_forensic_read_35311 brcmf_sdio_forensic_read 3 35311 &__btrfs_buffered_write_35311
+tracing_read_pipe_35312 tracing_read_pipe 3 35312 NULL
+sta_tx_latency_stat_write_35323 sta_tx_latency_stat_write 3 35323 NULL
-+xfs_btree_check_lblock_35333 xfs_btree_check_lblock 0 35333 NULL
+ieee80211_if_fmt_ap_power_level_35347 ieee80211_if_fmt_ap_power_level 3 35347 NULL
+nouveau_devinit_create__35348 nouveau_devinit_create_ 4 35348 NULL
+ieee80211_rx_mgmt_deauth_35351 ieee80211_rx_mgmt_deauth 3 35351 NULL
@@ -122105,6 +121548,7 @@ index 0000000..3d3508d
+read_kmem_35372 read_kmem 3 35372 NULL
+SyS_getxattr_35408 SyS_getxattr 4 35408 NULL
+rawv6_send_hdrinc_35425 rawv6_send_hdrinc 3 35425 NULL
++iwl_dbgfs_drv_rx_stats_read_35430 iwl_dbgfs_drv_rx_stats_read 3 35430 NULL
+buffer_to_user_35439 buffer_to_user 3 35439 NULL
+efx_mcdi_rpc_async_quiet_35460 efx_mcdi_rpc_async_quiet 4-5 35460 NULL
+macvtap_do_read_35475 macvtap_do_read 3 35475 NULL
@@ -122118,42 +121562,40 @@ index 0000000..3d3508d
+ocfs2_write_zero_page_35539 ocfs2_write_zero_page 3 35539 NULL
+ibnl_put_attr_35541 ibnl_put_attr 3 35541 NULL
+ieee80211_if_write_smps_35550 ieee80211_if_write_smps 3 35550 NULL
++C_SYSC_kexec_load_35565 C_SYSC_kexec_load 2 35565 NULL
+ext4_blocks_for_truncate_35579 ext4_blocks_for_truncate 0 35579 NULL
+ext2_acl_from_disk_35580 ext2_acl_from_disk 2 35580 NULL
+spk_msg_set_35586 spk_msg_set 3 35586 NULL
+kernel_readv_35617 kernel_readv 3 35617 NULL
+reiserfs_readpages_35629 reiserfs_readpages 4 35629 NULL
-+pci_request_regions_35635 pci_request_regions 0 35635 NULL
+ptlrpcd_steal_rqset_35637 ptlrpcd_steal_rqset 0 35637 NULL
+spi_register_board_info_35651 spi_register_board_info 2 35651 NULL
+rdmaltWithLock_35669 rdmaltWithLock 0 35669 NULL
-+compat_sys_kexec_load_35674 compat_sys_kexec_load 2 35674 NULL
+SYSC_pwritev_35690 SYSC_pwritev 3 35690 NULL
+rds_page_copy_user_35691 rds_page_copy_user 4 35691 NULL
+md_super_write_35703 md_super_write 4 35703 NULL
+iwl_dbgfs_disable_ht40_read_35761 iwl_dbgfs_disable_ht40_read 3 35761 NULL
+udf_alloc_i_data_35786 udf_alloc_i_data 2 35786 NULL
++alloc_netdev_mqs_35806 alloc_netdev_mqs 1 35806 NULL
+pvr2_hdw_cpufw_get_35824 pvr2_hdw_cpufw_get 0-4-2 35824 NULL
+tx_tx_cmplt_read_35854 tx_tx_cmplt_read 3 35854 NULL
+vx_query_hbuffer_size_35859 vx_query_hbuffer_size 0 35859 NULL
+mthca_buf_alloc_35861 mthca_buf_alloc 2 35861 NULL
-+fls64_35862 fls64 0 35862 NULL
+kvm_dirty_bitmap_bytes_35886 kvm_dirty_bitmap_bytes 0 35886 NULL
+ieee80211_if_fmt_dot11MeshRetryTimeout_35890 ieee80211_if_fmt_dot11MeshRetryTimeout 3 35890 NULL
+uwb_rc_cmd_done_35892 uwb_rc_cmd_done 4 35892 NULL
-+SyS_set_mempolicy_35909 SyS_set_mempolicy 3 35909 NULL
+kernel_setsockopt_35913 kernel_setsockopt 5 35913 NULL
+rbio_nr_pages_35916 rbio_nr_pages 0-1-2 35916 NULL
+sctp_tsnmap_mark_35929 sctp_tsnmap_mark 2 35929 NULL
+rx_defrag_init_called_read_35935 rx_defrag_init_called_read 3 35935 NULL
+put_cmsg_compat_35937 put_cmsg_compat 4 35937 NULL
-+ext_rts51x_sd_execute_write_data_35971 ext_rts51x_sd_execute_write_data 9 35971 NULL
-+ceph_buffer_new_35974 ceph_buffer_new 1 35974 NULL nohasharray
-+generic_ocp_read_35974 generic_ocp_read 3 35974 &ceph_buffer_new_35974
++generic_ocp_read_35974 generic_ocp_read 3 35974 NULL nohasharray
++ceph_buffer_new_35974 ceph_buffer_new 1 35974 &generic_ocp_read_35974
+acl_alloc_35979 acl_alloc 1 35979 NULL
+device_add_class_symlinks_35985 device_add_class_symlinks 0 35985 NULL
+write_file_antenna_35998 write_file_antenna 3 35998 NULL nohasharray
+kuc_alloc_35998 kuc_alloc 1 35998 &write_file_antenna_35998
++lov_mds_md_max_stripe_count_36008 lov_mds_md_max_stripe_count 0-1 36008 NULL
+il3945_ucode_tx_stats_read_36016 il3945_ucode_tx_stats_read 3 36016 NULL
+__videobuf_alloc_36031 __videobuf_alloc 1 36031 NULL
+account_shadowed_36048 account_shadowed 2 36048 NULL
@@ -122178,18 +121620,16 @@ index 0000000..3d3508d
+atomic_stats_read_36228 atomic_stats_read 3 36228 NULL
+viafb_iga1_odev_proc_write_36241 viafb_iga1_odev_proc_write 3 36241 NULL
+SYSC_getxattr_36242 SYSC_getxattr 4 36242 NULL
-+rproc_recovery_read_36245 rproc_recovery_read 3 36245 NULL
-+scrub_stripe_36248 scrub_stripe 5-4 36248 NULL
-+compat_sys_mbind_36256 compat_sys_mbind 5 36256 NULL
-+usb_buffer_alloc_36276 usb_buffer_alloc 2 36276 NULL nohasharray
-+cfs_hash_buckets_realloc_36276 cfs_hash_buckets_realloc 4 36276 &usb_buffer_alloc_36276
++vmsplice_to_user_36245 vmsplice_to_user 3 36245 NULL nohasharray
++rproc_recovery_read_36245 rproc_recovery_read 3 36245 &vmsplice_to_user_36245
++cfs_hash_buckets_realloc_36276 cfs_hash_buckets_realloc 4 36276 NULL
+codec_reg_read_file_36280 codec_reg_read_file 3 36280 NULL
+crypto_shash_digestsize_36284 crypto_shash_digestsize 0 36284 NULL
-+nouveau_cli_create_36293 nouveau_cli_create 3 36293 NULL
+lpfc_debugfs_dif_err_read_36303 lpfc_debugfs_dif_err_read 3 36303 NULL
+cfg80211_rx_mlme_mgmt_36306 cfg80211_rx_mlme_mgmt 3 36306 NULL
+ad7879_spi_xfer_36311 ad7879_spi_xfer 3 36311 NULL
-+fat_compat_ioctl_filldir_36328 fat_compat_ioctl_filldir 3 36328 NULL
++fat_compat_ioctl_filldir_36328 fat_compat_ioctl_filldir 3 36328 NULL nohasharray
++__compat_sys_pwritev64_36328 __compat_sys_pwritev64 3 36328 &fat_compat_ioctl_filldir_36328
+lc_create_36332 lc_create 4 36332 NULL
+jbd2_journal_init_revoke_table_36336 jbd2_journal_init_revoke_table 1 36336 NULL
+isku_sysfs_read_key_mask_36343 isku_sysfs_read_key_mask 6 36343 NULL
@@ -122199,16 +121639,16 @@ index 0000000..3d3508d
+tunables_read_36385 tunables_read 3 36385 NULL
+afs_alloc_flat_call_36399 afs_alloc_flat_call 2-3 36399 NULL
+sierra_write_36402 sierra_write 4 36402 NULL
-+qdsb_get_36409 qdsb_get 0 36409 NULL
+SyS_sethostname_36417 SyS_sethostname 2 36417 NULL
++soc_pcm_codec_params_fixup_36434 soc_pcm_codec_params_fixup 2 36434 NULL
+ReadW6692B_36445 ReadW6692B 0 36445 NULL
+sctp_tsnmap_init_36446 sctp_tsnmap_init 2 36446 NULL
+alloc_etherdev_mqs_36450 alloc_etherdev_mqs 1 36450 NULL
+SyS_process_vm_writev_36476 SyS_process_vm_writev 3-5 36476 NULL
-+lock_and_cleanup_extent_if_need_36480 lock_and_cleanup_extent_if_need 0 36480 NULL
+b43_nphy_load_samples_36481 b43_nphy_load_samples 3 36481 NULL
-+ip6_append_data_36490 ip6_append_data 4 36490 NULL nohasharray
-+tx_tx_checksum_result_read_36490 tx_tx_checksum_result_read 3 36490 &ip6_append_data_36490
++ds1343_nvram_write_36489 ds1343_nvram_write 5-6 36489 NULL
++tx_tx_checksum_result_read_36490 tx_tx_checksum_result_read 3 36490 NULL nohasharray
++ip6_append_data_36490 ip6_append_data 4 36490 &tx_tx_checksum_result_read_36490
+cmd_loop_36491 cmd_loop 0 36491 NULL
+__hwahc_op_set_ptk_36510 __hwahc_op_set_ptk 5 36510 NULL
+mcam_v4l_read_36513 mcam_v4l_read 3 36513 NULL
@@ -122230,6 +121670,7 @@ index 0000000..3d3508d
+iscsi_host_alloc_36671 iscsi_host_alloc 2 36671 NULL
+xillybus_read_36678 xillybus_read 3 36678 NULL
+gsmtty_write_36702 gsmtty_write 3 36702 NULL
++path_getxattr_36717 path_getxattr 4 36717 NULL
+snd_rawmidi_kernel_read1_36740 snd_rawmidi_kernel_read1 4-0 36740 NULL
+cxgbi_device_register_36746 cxgbi_device_register 1-2 36746 NULL
+ps_poll_upsd_timeouts_read_36755 ps_poll_upsd_timeouts_read 3 36755 NULL
@@ -122241,64 +121682,58 @@ index 0000000..3d3508d
+fc_change_queue_depth_36841 fc_change_queue_depth 2 36841 NULL
+keyctl_describe_key_36853 keyctl_describe_key 3 36853 NULL
+cm_write_36858 cm_write 3 36858 NULL
-+tx_tx_data_programmed_read_36871 tx_tx_data_programmed_read 3 36871 NULL
++tipc_link_iovec_long_xmit_36871 tipc_link_iovec_long_xmit 3 36871 NULL nohasharray
++tx_tx_data_programmed_read_36871 tx_tx_data_programmed_read 3 36871 &tipc_link_iovec_long_xmit_36871
+svc_setsockopt_36876 svc_setsockopt 5 36876 NULL
+raid56_parity_write_36877 raid56_parity_write 5 36877 NULL
+__btrfs_map_block_36883 __btrfs_map_block 3 36883 NULL
+ib_ucm_alloc_data_36885 ib_ucm_alloc_data 3 36885 NULL
+selinux_inode_notifysecctx_36896 selinux_inode_notifysecctx 3 36896 NULL
-+OS_kmalloc_36909 OS_kmalloc 1 36909 NULL
-+crypto_blkcipher_ivsize_36944 crypto_blkcipher_ivsize 0 36944 NULL
+il4965_rs_sta_dbgfs_scale_table_write_36979 il4965_rs_sta_dbgfs_scale_table_write 3 36979 NULL
-+xfs_btree_check_sptr_36984 xfs_btree_check_sptr 0 36984 NULL
+drbd_new_dev_size_36998 drbd_new_dev_size 0-3 36998 NULL
+auok190xfb_write_37001 auok190xfb_write 3 37001 NULL
+setxattr_37006 setxattr 4 37006 NULL
-+ocfs2_dlm_unlock_37037 ocfs2_dlm_unlock 0 37037 NULL
++ec_i2c_xfer_37029 ec_i2c_xfer 3 37029 NULL
++ieee80211_chsw_switch_vifs_37030 ieee80211_chsw_switch_vifs 2 37030 NULL
+command_file_read_37038 command_file_read 3 37038 NULL
+figure_loop_size_37051 figure_loop_size 2-3 37051 NULL
-+ieee80211_if_read_drop_unencrypted_37053 ieee80211_if_read_drop_unencrypted 3 37053 NULL nohasharray
-+qp_broker_create_37053 qp_broker_create 6-5 37053 &ieee80211_if_read_drop_unencrypted_37053
++qp_broker_create_37053 qp_broker_create 6-5 37053 NULL nohasharray
++ieee80211_if_read_drop_unencrypted_37053 ieee80211_if_read_drop_unencrypted 3 37053 &qp_broker_create_37053
++_iwl_dbgfs_bcast_filters_macs_write_37069 _iwl_dbgfs_bcast_filters_macs_write 3 37069 NULL
+SYSC_setxattr_37078 SYSC_setxattr 4 37078 NULL
+parse_command_37079 parse_command 2 37079 NULL
+pipeline_cs_rx_packet_in_read_37089 pipeline_cs_rx_packet_in_read 3 37089 NULL
+tun_get_user_37094 tun_get_user 5 37094 NULL
-+xlog_grant_head_check_37116 xlog_grant_head_check 0 37116 NULL
+has_wrprotected_page_37123 has_wrprotected_page 3-2 37123 NULL
+snd_hda_get_conn_list_37132 snd_hda_get_conn_list 0 37132 NULL
+mtt_free_res_37144 mtt_free_res 5 37144 NULL
+msg_word_37164 msg_word 0 37164 NULL
-+f2fs_direct_IO_37167 f2fs_direct_IO 4 37167 NULL
+vcc_recvmsg_37198 vcc_recvmsg 4 37198 NULL
+forced_ps_write_37209 forced_ps_write 3 37209 NULL
-+crypto_shash_descsize_37212 crypto_shash_descsize 0 37212 NULL nohasharray
-+ext4_ind_direct_IO_37212 ext4_ind_direct_IO 0-4 37212 &crypto_shash_descsize_37212
++crypto_shash_descsize_37212 crypto_shash_descsize 0 37212 NULL
+bchannel_get_rxbuf_37213 bchannel_get_rxbuf 2-0 37213 NULL
+regmap_access_read_file_37223 regmap_access_read_file 3 37223 NULL
+__do_replace_37227 __do_replace 5 37227 NULL
+iwl_dbgfs_d3_sram_read_37237 iwl_dbgfs_d3_sram_read 3 37237 NULL
-+rx_filter_dup_filter_read_37238 rx_filter_dup_filter_read 3 37238 NULL
-+xfs_reclaim_inode_37257 xfs_reclaim_inode 0 37257 NULL
++rx_filter_dup_filter_read_37238 rx_filter_dup_filter_read 3 37238 NULL nohasharray
++__btrfs_inc_extent_ref_37238 __btrfs_inc_extent_ref 7 37238 &rx_filter_dup_filter_read_37238
+exofs_max_io_pages_37263 exofs_max_io_pages 0-2 37263 NULL
+_iwl_dbgfs_fw_restart_write_37270 _iwl_dbgfs_fw_restart_write 3 37270 NULL
+ieee80211_if_read_power_mode_37305 ieee80211_if_read_power_mode 3 37305 NULL
-+ext3_direct_IO_37308 ext3_direct_IO 4 37308 NULL
+jffs2_write_dirent_37311 jffs2_write_dirent 5 37311 NULL
-+send_msg_37323 send_msg 4 37323 NULL
++tipc_send_37315 tipc_send 3 37315 NULL
+l2cap_create_connless_pdu_37327 l2cap_create_connless_pdu 3 37327 NULL nohasharray
+bnx2x_vf_fill_fw_str_37327 bnx2x_vf_fill_fw_str 3 37327 &l2cap_create_connless_pdu_37327
+scsi_mode_select_37330 scsi_mode_select 6 37330 NULL
+rxrpc_server_sendmsg_37331 rxrpc_server_sendmsg 4 37331 NULL
-+xfs_iomap_write_allocate_37336 xfs_iomap_write_allocate 0 37336 NULL
+security_inode_getsecurity_37354 security_inode_getsecurity 0 37354 NULL
++seek_firmware_37372 seek_firmware 2 37372 NULL
+hci_sock_sendmsg_37420 hci_sock_sendmsg 4 37420 NULL
+acpi_os_allocate_zeroed_37422 acpi_os_allocate_zeroed 1 37422 NULL
+tty_insert_flip_string_fixed_flag_37428 tty_insert_flip_string_fixed_flag 4-0 37428 NULL
+iwl_print_last_event_logs_37433 iwl_print_last_event_logs 0-7-9 37433 NULL
+fru_alloc_37442 fru_alloc 1 37442 NULL
-+tcp_established_options_37450 tcp_established_options 0 37450 NULL nohasharray
-+tipc_send2port_37450 tipc_send2port 4 37450 &tcp_established_options_37450
-+xfs_btree_dec_cursor_37452 xfs_btree_dec_cursor 0 37452 NULL
++tcp_established_options_37450 tcp_established_options 0 37450 NULL
+brcmf_sdio_dump_console_37455 brcmf_sdio_dump_console 4 37455 NULL
+get_est_timing_37484 get_est_timing 0 37484 NULL
+kmem_realloc_37489 kmem_realloc 2 37489 NULL
@@ -122310,41 +121745,38 @@ index 0000000..3d3508d
+hdr_size_37536 hdr_size 0 37536 NULL
+extent_map_end_37550 extent_map_end 0 37550 NULL
+sep_create_dcb_dmatables_context_37551 sep_create_dcb_dmatables_context 6 37551 NULL
-+fat_cont_expand_37552 fat_cont_expand 0 37552 NULL
-+ioat_chansts_37558 ioat_chansts 0 37558 NULL
+xhci_alloc_streams_37586 xhci_alloc_streams 5 37586 NULL
+qla2x00_debounce_register_37597 qla2x00_debounce_register 0 37597 NULL
+kvm_read_guest_page_mmu_37611 kvm_read_guest_page_mmu 6 37611 NULL
+SYSC_mbind_37622 SYSC_mbind 5 37622 NULL
+SyS_mbind_37638 SyS_mbind 5 37638 NULL
-+may_delete_37656 may_delete 0 37656 NULL
+bio_copy_user_iov_37660 bio_copy_user_iov 4 37660 NULL
-+rfcomm_sock_sendmsg_37661 rfcomm_sock_sendmsg 4 37661 NULL nohasharray
-+vmw_framebuffer_dmabuf_dirty_37661 vmw_framebuffer_dmabuf_dirty 6 37661 &rfcomm_sock_sendmsg_37661
++vmw_framebuffer_dmabuf_dirty_37661 vmw_framebuffer_dmabuf_dirty 6 37661 NULL nohasharray
++rfcomm_sock_sendmsg_37661 rfcomm_sock_sendmsg 4 37661 &vmw_framebuffer_dmabuf_dirty_37661
+SYSC_get_mempolicy_37664 SYSC_get_mempolicy 3 37664 NULL
+__wa_seg_calculate_isoc_frame_count_37672 __wa_seg_calculate_isoc_frame_count 0 37672 NULL
+ieee80211_if_read_rc_rateidx_mcs_mask_2ghz_37675 ieee80211_if_read_rc_rateidx_mcs_mask_2ghz 3 37675 NULL
++tracing_saved_cmdlines_size_write_37684 tracing_saved_cmdlines_size_write 3 37684 NULL
+regmap_map_read_file_37685 regmap_map_read_file 3 37685 NULL
+nametbl_header_37698 nametbl_header 2-0 37698 NULL
+__le32_to_cpup_37702 __le32_to_cpup 0 37702 NULL
+dynamic_ps_timeout_write_37713 dynamic_ps_timeout_write 3 37713 NULL
+read_enabled_file_bool_37744 read_enabled_file_bool 3 37744 NULL
-+xfs_read_agf_37749 xfs_read_agf 0 37749 NULL
+ocfs2_control_cfu_37750 ocfs2_control_cfu 2 37750 NULL
+ipath_cdev_init_37752 ipath_cdev_init 1 37752 NULL
+dccp_setsockopt_cscov_37766 dccp_setsockopt_cscov 2 37766 NULL
+il4965_rs_sta_dbgfs_rate_scale_data_read_37792 il4965_rs_sta_dbgfs_rate_scale_data_read 3 37792 NULL
+smk_read_logging_37804 smk_read_logging 3 37804 NULL
++nvkm_notify_init_37806 nvkm_notify_init 6 37806 NULL
+ocrdma_alloc_frmr_page_list_37815 ocrdma_alloc_frmr_page_list 2 37815 NULL
+rx_decrypt_key_not_found_read_37820 rx_decrypt_key_not_found_read 3 37820 NULL
+android_get_p2p_addr_37832 android_get_p2p_addr 0 37832 NULL
-+jbd2_journal_get_undo_access_37837 jbd2_journal_get_undo_access 0 37837 NULL
+o2hb_debug_read_37851 o2hb_debug_read 3 37851 NULL
+xfs_dir2_block_to_sf_37868 xfs_dir2_block_to_sf 3 37868 NULL
-+set_registers_37883 set_registers 4 37883 NULL
++btrfs_leaf_data_37869 btrfs_leaf_data 0 37869 NULL
+btrfs_stack_file_extent_disk_bytenr_37888 btrfs_stack_file_extent_disk_bytenr 0 37888 NULL
-+pkt_alloc_packet_data_37928 pkt_alloc_packet_data 1 37928 NULL nohasharray
-+_rtw_malloc_37928 _rtw_malloc 1 37928 &pkt_alloc_packet_data_37928
++_rtw_malloc_37928 _rtw_malloc 1 37928 NULL nohasharray
++pkt_alloc_packet_data_37928 pkt_alloc_packet_data 1 37928 &_rtw_malloc_37928
+read_rbu_packet_size_37939 read_rbu_packet_size 6 37939 NULL
+write_file_bool_37957 write_file_bool 3 37957 NULL
+fifo_alloc_37961 fifo_alloc 1 37961 NULL
@@ -122354,54 +121786,59 @@ index 0000000..3d3508d
+aggr_recv_addba_req_evt_38037 aggr_recv_addba_req_evt 4 38037 NULL
+il_dbgfs_chain_noise_read_38044 il_dbgfs_chain_noise_read 3 38044 NULL nohasharray
+klsi_105_prepare_write_buffer_38044 klsi_105_prepare_write_buffer 3 38044 &il_dbgfs_chain_noise_read_38044
++parser_init_guts_38046 parser_init_guts 2 38046 NULL
+SyS_llistxattr_38048 SyS_llistxattr 3 38048 NULL
+sysfs_do_create_link_38051 sysfs_do_create_link 0 38051 NULL
+_xfs_buf_alloc_38058 _xfs_buf_alloc 3 38058 NULL
+nsm_create_handle_38060 nsm_create_handle 4 38060 NULL
+alloc_ltalkdev_38071 alloc_ltalkdev 1 38071 NULL
-+xfs_buf_readahead_map_38081 xfs_buf_readahead_map 3 38081 NULL nohasharray
-+wcn36xx_smd_rsp_process_38081 wcn36xx_smd_rsp_process 3 38081 &xfs_buf_readahead_map_38081
++cifs_send_async_read_38077 cifs_send_async_read 2 38077 NULL
++xfs_buf_readahead_map_38081 xfs_buf_readahead_map 3 38081 NULL
+uwb_mac_addr_print_38085 uwb_mac_addr_print 2 38085 NULL
+request_key_auth_new_38092 request_key_auth_new 3 38092 NULL
+proc_self_readlink_38094 proc_self_readlink 3 38094 NULL
+ep0_read_38095 ep0_read 3 38095 NULL
-+sk_wmem_schedule_38096 sk_wmem_schedule 2 38096 NULL nohasharray
-+osc_checksum_seq_write_38096 osc_checksum_seq_write 3 38096 &sk_wmem_schedule_38096
++osc_checksum_seq_write_38096 osc_checksum_seq_write 3 38096 NULL nohasharray
++sk_wmem_schedule_38096 sk_wmem_schedule 2 38096 &osc_checksum_seq_write_38096
+o2hb_read_slots_38105 o2hb_read_slots 2 38105 NULL
+snd_pcm_oss_write_38108 snd_pcm_oss_write 3 38108 NULL
+vmw_kms_present_38130 vmw_kms_present 9 38130 NULL
-+__ntfs_copy_from_user_iovec_inatomic_38153 __ntfs_copy_from_user_iovec_inatomic 0-4-3 38153 NULL
-+btrfs_extent_same_38163 btrfs_extent_same 3-2 38163 NULL
++__ntfs_copy_from_user_iovec_inatomic_38153 __ntfs_copy_from_user_iovec_inatomic 3-4-0 38153 NULL
++btrfs_extent_same_38163 btrfs_extent_same 3-2-5 38163 NULL
+kvm_clear_guest_38164 kvm_clear_guest 3-2 38164 NULL
+cdev_add_38176 cdev_add 2-3 38176 NULL
+rt2x00debug_write_rf_38195 rt2x00debug_write_rf 3 38195 NULL
+get_ucode_user_38202 get_ucode_user 3 38202 NULL
-+osd_req_list_partition_collections_38223 osd_req_list_partition_collections 5 38223 NULL nohasharray
-+xfs_rtallocate_range_38223 xfs_rtallocate_range 0 38223 &osd_req_list_partition_collections_38223
++osd_req_list_partition_collections_38223 osd_req_list_partition_collections 5 38223 NULL
+ceph_decode_16_38239 ceph_decode_16 0 38239 NULL
+_ipw_read_reg32_38245 _ipw_read_reg32 0 38245 NULL
-+xfs_qm_dqrepair_38262 xfs_qm_dqrepair 0 38262 NULL
++nvkm_dmaobj_create__38250 nvkm_dmaobj_create_ 6 38250 NULL
+mthca_alloc_icm_table_38268 mthca_alloc_icm_table 4-3 38268 NULL nohasharray
+ieee80211_if_read_auto_open_plinks_38268 ieee80211_if_read_auto_open_plinks 3 38268 &mthca_alloc_icm_table_38268 nohasharray
+SYSC_msgrcv_38268 SYSC_msgrcv 3 38268 &ieee80211_if_read_auto_open_plinks_38268
+xfs_bmbt_to_bmdr_38275 xfs_bmbt_to_bmdr 3 38275 NULL nohasharray
+xfs_bmdr_to_bmbt_38275 xfs_bmdr_to_bmbt 5 38275 &xfs_bmbt_to_bmdr_38275
+ftdi_process_packet_38281 ftdi_process_packet 4 38281 NULL
++C_SYSC_pselect6_38296 C_SYSC_pselect6 1 38296 NULL
+ucma_query_path_38305 ucma_query_path 3 38305 NULL
+isr_rx_headers_read_38325 isr_rx_headers_read 3 38325 NULL
+ida_simple_get_38326 ida_simple_get 0 38326 NULL
+__snd_gf1_look8_38333 __snd_gf1_look8 0 38333 NULL
++usb_ext_prop_put_name_38352 usb_ext_prop_put_name 0-3 38352 NULL
+btrfs_file_extent_disk_num_bytes_38363 btrfs_file_extent_disk_num_bytes 0 38363 NULL
+xfs_free_file_space_38383 xfs_free_file_space 2-3 38383 NULL
+dn_sendmsg_38390 dn_sendmsg 4 38390 NULL
+ieee80211_if_read_dtim_count_38419 ieee80211_if_read_dtim_count 3 38419 NULL
+pmcraid_copy_sglist_38431 pmcraid_copy_sglist 3 38431 NULL
++iov_iter_npages_iovec_38448 iov_iter_npages_iovec 0-2 38448 NULL
+kvm_write_guest_38454 kvm_write_guest 4-2 38454 NULL
++videobuf_waiton_38459 videobuf_waiton 0 38459 NULL
+_iwl_dbgfs_scan_ant_rxchain_write_38479 _iwl_dbgfs_scan_ant_rxchain_write 3 38479 NULL
+blk_end_bidi_request_38482 blk_end_bidi_request 3-4 38482 NULL
+dev_names_read_38509 dev_names_read 3 38509 NULL
+iscsi_create_iface_38510 iscsi_create_iface 5 38510 NULL
+event_rx_mismatch_read_38518 event_rx_mismatch_read 3 38518 NULL
++set_queue_count_38519 set_queue_count 0 38519 NULL
+ubifs_idx_node_sz_38546 ubifs_idx_node_sz 0-2 38546 NULL
+btrfs_discard_extent_38547 btrfs_discard_extent 2 38547 NULL
+kuc_len_38557 kuc_len 0-1 38557 NULL
@@ -122418,8 +121855,9 @@ index 0000000..3d3508d
+qp_broker_alloc_38646 qp_broker_alloc 6-5 38646 NULL
+mmc_send_cxd_data_38655 mmc_send_cxd_data 5 38655 NULL
+nouveau_instmem_create__38664 nouveau_instmem_create_ 4 38664 NULL
-+snd_es1371_wait_src_ready_38673 snd_es1371_wait_src_ready 0 38673 NULL
++ufshcd_read_sdev_qdepth_38676 ufshcd_read_sdev_qdepth 0 38676 NULL
+iscsit_dump_data_payload_38683 iscsit_dump_data_payload 2 38683 NULL
++tracing_nsecs_read_38689 tracing_nsecs_read 3 38689 NULL
+rbio_add_io_page_38700 rbio_add_io_page 6 38700 NULL
+w83977af_sir_interrupt_38738 w83977af_sir_interrupt 0 38738 NULL
+udf_readpages_38761 udf_readpages 4 38761 NULL
@@ -122431,7 +121869,6 @@ index 0000000..3d3508d
+ipv6_renew_option_38813 ipv6_renew_option 3 38813 NULL
+direct_entry_38836 direct_entry 3 38836 NULL
+compat_udp_setsockopt_38840 compat_udp_setsockopt 5 38840 NULL
-+read_nic_io_word_38853 read_nic_io_word 0 38853 NULL
+interfaces_38859 interfaces 2 38859 NULL
+dbgfs_state_38894 dbgfs_state 3 38894 NULL
+il_dbgfs_sram_write_38942 il_dbgfs_sram_write 3 38942 NULL
@@ -122443,10 +121880,10 @@ index 0000000..3d3508d
+lpfc_idiag_extacc_write_38998 lpfc_idiag_extacc_write 3 38998 NULL
+get_nodes_39012 get_nodes 3 39012 NULL
+twl6030_interrupt_unmask_39013 twl6030_interrupt_unmask 2 39013 NULL
++force_sc_support_read_39014 force_sc_support_read 3 39014 NULL
+__blkdev_issue_zeroout_39020 __blkdev_issue_zeroout 3 39020 NULL
+_zd_iowrite32v_async_locked_39034 _zd_iowrite32v_async_locked 3 39034 NULL
+do_write_kmem_39051 do_write_kmem 0-1-3 39051 NULL
-+ReadHFC_39104 ReadHFC 0 39104 NULL
+tomoyo_truncate_39105 tomoyo_truncate 0 39105 NULL
+__kfifo_to_user_r_39123 __kfifo_to_user_r 5-3 39123 NULL
+ea_foreach_39133 ea_foreach 0 39133 NULL
@@ -122455,9 +121892,11 @@ index 0000000..3d3508d
+ath9k_hw_ar9003_dump_eeprom_39156 ath9k_hw_ar9003_dump_eeprom 5-4 39156 NULL
+echo_client_kbrw_39170 echo_client_kbrw 6 39170 NULL
+ext3_xattr_check_names_39174 ext3_xattr_check_names 0 39174 NULL
++mlx4_en_create_tx_ring_39179 mlx4_en_create_tx_ring 4 39179 NULL
+ubi_more_update_data_39189 ubi_more_update_data 4 39189 NULL
+qcam_read_bytes_39205 qcam_read_bytes 0 39205 NULL
+ivtv_v4l2_write_39226 ivtv_v4l2_write 3 39226 NULL
++SyS_getrandom_39235 SyS_getrandom 2 39235 NULL
+posix_acl_to_xattr_39237 posix_acl_to_xattr 0 39237 NULL
+snd_pcm_capture_forward_39248 snd_pcm_capture_forward 2 39248 NULL
+r128_compat_ioctl_39250 r128_compat_ioctl 2 39250 NULL nohasharray
@@ -122469,20 +121908,18 @@ index 0000000..3d3508d
+insert_reserved_file_extent_39327 insert_reserved_file_extent 3 39327 NULL
+wimax_msg_alloc_39343 wimax_msg_alloc 4 39343 NULL
+ide_complete_rq_39354 ide_complete_rq 3 39354 NULL
-+gfs2_dir_write_data_39357 gfs2_dir_write_data 3-4 39357 NULL
+do_write_log_from_user_39362 do_write_log_from_user 3-0 39362 NULL
+vortex_wtdma_getlinearpos_39371 vortex_wtdma_getlinearpos 0 39371 NULL
+regmap_name_read_file_39379 regmap_name_read_file 3 39379 NULL
+fnic_trace_debugfs_read_39380 fnic_trace_debugfs_read 3 39380 NULL
+ps_poll_ps_poll_utilization_read_39383 ps_poll_ps_poll_utilization_read 3 39383 NULL
+__send_to_port_39386 __send_to_port 3 39386 NULL
-+xfs_btree_dup_cursor_39394 xfs_btree_dup_cursor 0 39394 NULL
-+gfs2_internal_read_39413 gfs2_internal_read 0 39413 NULL
+user_power_read_39414 user_power_read 3 39414 NULL
++hash_ipmark4_expire_39419 hash_ipmark4_expire 4 39419 NULL
+alloc_agpphysmem_i8xx_39427 alloc_agpphysmem_i8xx 1 39427 NULL
+mic_desc_size_39464 mic_desc_size 0 39464 NULL
-+apei_resources_add_39470 apei_resources_add 0 39470 NULL
+setkey_unaligned_39474 setkey_unaligned 3 39474 NULL
++usif_ioctl_39481 usif_ioctl 3 39481 NULL
+ieee80211_if_fmt_dot11MeshHWMPmaxPREQretries_39499 ieee80211_if_fmt_dot11MeshHWMPmaxPREQretries 3 39499 NULL
+cl_req_alloc_39523 cl_req_alloc 4 39523 NULL
+int_proc_write_39542 int_proc_write 3 39542 NULL
@@ -122494,7 +121931,6 @@ index 0000000..3d3508d
+batadv_tt_tvlv_generate_39615 batadv_tt_tvlv_generate 4 39615 NULL
+nfs_idmap_get_key_39616 nfs_idmap_get_key 2 39616 NULL
+sdio_readb_39618 sdio_readb 0 39618 NULL
-+prepare_uptodate_page_39622 prepare_uptodate_page 0 39622 NULL
+set_dev_class_39645 set_dev_class 4 39645 NULL
+snd_rme32_capture_copy_39653 snd_rme32_capture_copy 5 39653 NULL
+tcp_try_rmem_schedule_39657 tcp_try_rmem_schedule 3 39657 NULL
@@ -122502,21 +121938,19 @@ index 0000000..3d3508d
+v4l_stk_read_39672 v4l_stk_read 3 39672 NULL
+hsc_msg_len_get_39673 hsc_msg_len_get 0 39673 NULL
+do_surface_dirty_sou_39678 do_surface_dirty_sou 7 39678 NULL
-+sd_completed_bytes_39705 sd_completed_bytes 0 39705 NULL
+ftrace_pid_write_39710 ftrace_pid_write 3 39710 NULL
+adt7316_spi_multi_read_39765 adt7316_spi_multi_read 3 39765 NULL
-+persistent_ram_buffer_map_39776 persistent_ram_buffer_map 1-2 39776 NULL
+security_inode_listsecurity_39812 security_inode_listsecurity 0 39812 NULL
+snd_pcm_oss_writev3_39818 snd_pcm_oss_writev3 3 39818 NULL
+get_priv_size_39828 get_priv_size 0-1 39828 NULL
++netlbl_catmap_walkrng_39885 netlbl_catmap_walkrng 0-2 39885 NULL
+pkt_add_39897 pkt_add 3 39897 NULL
+read_file_modal_eeprom_39909 read_file_modal_eeprom 3 39909 NULL
+gen_pool_add_virt_39913 gen_pool_add_virt 4 39913 NULL
+dw210x_op_rw_39915 dw210x_op_rw 6 39915 NULL
-+__mnt_want_write_file_39917 __mnt_want_write_file 0 39917 NULL
+aes_encrypt_interrupt_read_39919 aes_encrypt_interrupt_read 3 39919 NULL
-+exofs_read_kern_39921 exofs_read_kern 6 39921 NULL nohasharray
-+oom_score_adj_read_39921 oom_score_adj_read 3 39921 &exofs_read_kern_39921
++oom_score_adj_read_39921 oom_score_adj_read 3 39921 NULL nohasharray
++exofs_read_kern_39921 exofs_read_kern 6 39921 &oom_score_adj_read_39921
+__spi_async_39932 __spi_async 0 39932 NULL
+__get_order_39935 __get_order 0 39935 NULL
+error_error_frame_read_39947 error_error_frame_read 3 39947 NULL
@@ -122525,6 +121959,7 @@ index 0000000..3d3508d
+bio_chain_clone_range_39967 bio_chain_clone_range 3 39967 NULL
+dma_push_rx_39973 dma_push_rx 2 39973 NULL
+broadsheetfb_write_39976 broadsheetfb_write 3 39976 NULL
++lustre_pack_reply_v2_39978 lustre_pack_reply_v2 2 39978 NULL
+mthca_array_init_39987 mthca_array_init 2 39987 NULL
+fw_device_op_read_39990 fw_device_op_read 3 39990 NULL
+server_name2svname_39998 server_name2svname 4 39998 NULL
@@ -122536,11 +121971,11 @@ index 0000000..3d3508d
+l2cap_create_iframe_pdu_40055 l2cap_create_iframe_pdu 3 40055 NULL nohasharray
+add_tty_40055 add_tty 1 40055 &l2cap_create_iframe_pdu_40055
+atomic_xchg_40070 atomic_xchg 0 40070 NULL
-+xfs_rtbuf_get_40107 xfs_rtbuf_get 0 40107 NULL
+sctp_setsockopt_delayed_ack_40129 sctp_setsockopt_delayed_ack 3 40129 NULL
+dwc2_max_desc_num_40132 dwc2_max_desc_num 0 40132 NULL
+rx_rx_frame_checksum_read_40140 rx_rx_frame_checksum_read 3 40140 NULL
-+ath10k_write_simulate_fw_crash_40143 ath10k_write_simulate_fw_crash 3 40143 NULL
++ath10k_write_simulate_fw_crash_40143 ath10k_write_simulate_fw_crash 3 40143 NULL nohasharray
++kvm_mmu_notifier_clear_flush_young_40143 kvm_mmu_notifier_clear_flush_young 3-4 40143 &ath10k_write_simulate_fw_crash_40143
+iwch_alloc_fastreg_pbl_40153 iwch_alloc_fastreg_pbl 2 40153 NULL
+pt_write_40159 pt_write 3 40159 NULL
+scsi_sg_count_40182 scsi_sg_count 0 40182 NULL
@@ -122548,13 +121983,17 @@ index 0000000..3d3508d
+allocate_probes_40204 allocate_probes 1 40204 NULL
+au0828_v4l2_read_40220 au0828_v4l2_read 3 40220 NULL
+compress_file_range_40225 compress_file_range 3-4 40225 NULL
++ocrdma_dbgfs_ops_read_40232 ocrdma_dbgfs_ops_read 3 40232 NULL
+osst_read_40237 osst_read 3 40237 NULL
-+lpage_info_slot_40243 lpage_info_slot 3-1 40243 NULL
++lpage_info_slot_40243 lpage_info_slot 1-3 40243 NULL
+ocfs2_zero_extend_get_range_40248 ocfs2_zero_extend_get_range 4-3 40248 NULL
++of_get_child_count_40254 of_get_child_count 0 40254 NULL nohasharray
++fsl_edma_prep_dma_cyclic_40254 fsl_edma_prep_dma_cyclic 3-4 40254 &of_get_child_count_40254
+rs_sta_dbgfs_scale_table_read_40262 rs_sta_dbgfs_scale_table_read 3 40262 NULL
+ext2_fiemap_40271 ext2_fiemap 4 40271 NULL
+usbnet_read_cmd_40275 usbnet_read_cmd 7 40275 NULL
+rx_xfr_hint_trig_read_40283 rx_xfr_hint_trig_read 3 40283 NULL
++tracing_thresh_read_40295 tracing_thresh_read 3 40295 NULL
+SyS_bind_40303 SyS_bind 3 40303 NULL
+ib_get_mad_data_offset_40336 ib_get_mad_data_offset 0 40336 NULL
+mmio_read_40348 mmio_read 4 40348 NULL
@@ -122562,6 +122001,8 @@ index 0000000..3d3508d
+ocfs2_check_range_for_refcount_40365 ocfs2_check_range_for_refcount 3-2 40365 NULL
+get_chars_40373 get_chars 3 40373 NULL
+fb_prepare_extra_logos_40429 fb_prepare_extra_logos 0-2 40429 NULL
++proc_write_driver_40432 proc_write_driver 3 40432 NULL
++repair_io_failure_40452 repair_io_failure 4-3 40452 NULL
+tomoyo_update_policy_40458 tomoyo_update_policy 2 40458 NULL
+zd_usb_scnprint_id_40459 zd_usb_scnprint_id 0-3 40459 NULL
+gp2ap020a00f_write_event_threshold_40461 gp2ap020a00f_write_event_threshold 2 40461 NULL
@@ -122570,13 +122011,12 @@ index 0000000..3d3508d
+afs_fs_store_data_40484 afs_fs_store_data 3-4-5-6 40484 NULL
+batadv_hash_new_40491 batadv_hash_new 1 40491 NULL
+devcgroup_inode_permission_40492 devcgroup_inode_permission 0 40492 NULL
-+xfs_iread_extents_40510 xfs_iread_extents 0 40510 NULL
+__ethtool_get_sset_count_40511 __ethtool_get_sset_count 0 40511 NULL
+TSS_checkhmac2_40520 TSS_checkhmac2 5-7 40520 NULL
+ixgbe_dbg_reg_ops_read_40540 ixgbe_dbg_reg_ops_read 3 40540 NULL
+ima_write_policy_40548 ima_write_policy 3 40548 NULL
+esp_alloc_tmp_40558 esp_alloc_tmp 3-2 40558 NULL
-+b1_get_byte_40597 b1_get_byte 0 40597 NULL
++bl_alloc_init_bio_40569 bl_alloc_init_bio 1 40569 NULL
+get_priv_descr_and_size_40612 get_priv_descr_and_size 0 40612 NULL
+twl4030_kpwrite_u8_40665 twl4030_kpwrite_u8 3 40665 NULL
+__cfg80211_roamed_40668 __cfg80211_roamed 4-6 40668 NULL
@@ -122588,7 +122028,9 @@ index 0000000..3d3508d
+pci_enable_resources_40680 pci_enable_resources 0 40680 NULL
+nfc_hci_set_param_40697 nfc_hci_set_param 5 40697 NULL
+__seq_open_private_40715 __seq_open_private 3 40715 NULL
-+set_extent_bit_40719 set_extent_bit 0 40719 NULL
++lnet_new_text_buf_40717 lnet_new_text_buf 1 40717 NULL
++ip_skb_dst_mtu_40718 ip_skb_dst_mtu 0 40718 NULL
++of_pdt_build_one_prop_40735 of_pdt_build_one_prop 5 40735 NULL
+fuse_readpages_40737 fuse_readpages 4 40737 NULL
+xfs_iext_remove_direct_40744 xfs_iext_remove_direct 3 40744 NULL
+security_inode_listxattr_40752 security_inode_listxattr 0 40752 NULL
@@ -122597,12 +122039,12 @@ index 0000000..3d3508d
+pg_write_40766 pg_write 3 40766 NULL
+kernfs_fop_read_40770 kernfs_fop_read 3 40770 NULL
+show_list_40775 show_list 3-0 40775 NULL
-+kfifo_out_copy_r_40784 kfifo_out_copy_r 3-0 40784 NULL
++kfifo_out_copy_r_40784 kfifo_out_copy_r 0-3 40784 NULL
+bitmap_weight_40791 bitmap_weight 0-2 40791 NULL
+pyra_sysfs_read_40795 pyra_sysfs_read 6 40795 NULL
++rtw_add_beacon_40801 rtw_add_beacon 3-5 40801 NULL
+add_action_40811 add_action 4 40811 NULL
+nl80211_send_roamed_40825 nl80211_send_roamed 5-7 40825 NULL
-+SyS_mbind_40828 SyS_mbind 5 40828 NULL
+nilfs_mdt_init_40849 nilfs_mdt_init 3 40849 NULL
+v9fs_file_read_40858 v9fs_file_read 3 40858 NULL
+read_file_queue_40895 read_file_queue 3 40895 NULL
@@ -122610,12 +122052,14 @@ index 0000000..3d3508d
+isdn_add_channels_40905 isdn_add_channels 3 40905 NULL
+gfs2_ea_find_40913 gfs2_ea_find 0 40913 NULL
+vol_cdev_write_40915 vol_cdev_write 3 40915 NULL
-+snd_vx_create_40948 snd_vx_create 4 40948 NULL nohasharray
-+sg_alloc_table_40948 sg_alloc_table 0 40948 &snd_vx_create_40948
++snd_vx_create_40948 snd_vx_create 4 40948 NULL
++path_listxattr_40949 path_listxattr 3 40949 NULL
+rds_sendmsg_40976 rds_sendmsg 4 40976 NULL
++ima_appraise_measurement_40978 ima_appraise_measurement 6 40978 NULL
+il_dbgfs_fh_reg_read_40993 il_dbgfs_fh_reg_read 3 40993 NULL
+iwl_dbgfs_scan_ant_rxchain_read_40999 iwl_dbgfs_scan_ant_rxchain_read 3 40999 NULL
+mac80211_format_buffer_41010 mac80211_format_buffer 2 41010 NULL
++get_pages_alloc_bvec_41012 get_pages_alloc_bvec 0-3 41012 NULL
+__proc_dobitmasks_41029 __proc_dobitmasks 5 41029 NULL
+_req_append_segment_41031 _req_append_segment 2 41031 NULL
+mISDN_sock_sendmsg_41035 mISDN_sock_sendmsg 4 41035 NULL
@@ -122623,23 +122067,27 @@ index 0000000..3d3508d
+lprocfs_write_frac_helper_41050 lprocfs_write_frac_helper 2 41050 NULL
+vfs_listxattr_41062 vfs_listxattr 0 41062 NULL nohasharray
+beacon_filtering_write_41062 beacon_filtering_write 3 41062 &vfs_listxattr_41062
++sc_only_mode_read_41076 sc_only_mode_read 3 41076 NULL
+cfg80211_inform_bss_frame_41078 cfg80211_inform_bss_frame 4 41078 NULL
+nvme_map_user_pages_41093 nvme_map_user_pages 4-3 41093 NULL nohasharray
+roccat_read_41093 roccat_read 3 41093 &nvme_map_user_pages_41093
+dma_attach_41094 dma_attach 5-6 41094 NULL
++nl80211_send_mlme_event_41099 nl80211_send_mlme_event 4 41099 NULL
+provide_user_output_41105 provide_user_output 3 41105 NULL
+f_audio_buffer_alloc_41110 f_audio_buffer_alloc 1 41110 NULL
+ath10k_read_wmi_services_41112 ath10k_read_wmi_services 3 41112 NULL
+v4l2_ctrl_new_int_menu_41151 v4l2_ctrl_new_int_menu 4 41151 NULL
+tx_frag_mpdu_alloc_failed_read_41167 tx_frag_mpdu_alloc_failed_read 3 41167 NULL
+dvb_ca_write_41171 dvb_ca_write 3 41171 NULL
-+compat_sys_process_vm_writev_41194 compat_sys_process_vm_writev 3-5 41194 NULL
++netif_get_num_default_rss_queues_41187 netif_get_num_default_rss_queues 0 41187 NULL
+dfs_file_write_41196 dfs_file_write 3 41196 NULL
+nfs_page_array_len_41219 nfs_page_array_len 0-2-1 41219 NULL
+cfg80211_process_disassoc_41231 cfg80211_process_disassoc 3 41231 NULL
+hiddev_compat_ioctl_41255 hiddev_compat_ioctl 2 41255 NULL
+erst_read_41260 erst_read 0 41260 NULL
+alloc_context_41283 alloc_context 1 41283 NULL
++of_count_phandle_with_args_41291 of_count_phandle_with_args 0 41291 NULL
++virtscsi_change_queue_depth_41327 virtscsi_change_queue_depth 2 41327 NULL
+o2hb_setup_one_bio_41341 o2hb_setup_one_bio 4 41341 NULL
+twl_change_queue_depth_41342 twl_change_queue_depth 2 41342 NULL
+rtw_android_set_block_41347 rtw_android_set_block 0 41347 NULL
@@ -122652,7 +122100,7 @@ index 0000000..3d3508d
+isdn_ppp_fill_rq_41428 isdn_ppp_fill_rq 2 41428 NULL
+lbs_rdrf_read_41431 lbs_rdrf_read 3 41431 NULL
+iio_device_alloc_41440 iio_device_alloc 1 41440 NULL
-+ntfs_file_buffered_write_41442 ntfs_file_buffered_write 6-4-0 41442 NULL
++ntfs_file_buffered_write_41442 ntfs_file_buffered_write 6-4 41442 NULL
+pcpu_build_alloc_info_41443 pcpu_build_alloc_info 1-2-3 41443 NULL
+se_io_cb_41461 se_io_cb 3 41461 NULL
+layout_leb_in_gaps_41470 layout_leb_in_gaps 0 41470 NULL
@@ -122660,7 +122108,6 @@ index 0000000..3d3508d
+bl_alloc_init_bio_41478 bl_alloc_init_bio 1 41478 NULL
+kvm_unmap_hva_range_41484 kvm_unmap_hva_range 3-2 41484 NULL
+wep_interrupt_read_41492 wep_interrupt_read 3 41492 NULL
-+SyS_get_mempolicy_41495 SyS_get_mempolicy 3 41495 NULL
+hpfs_translate_name_41497 hpfs_translate_name 3 41497 NULL
+xfrm_hash_new_size_41505 xfrm_hash_new_size 0-1 41505 NULL
+SyS_preadv_41523 SyS_preadv 3 41523 NULL
@@ -122670,8 +122117,8 @@ index 0000000..3d3508d
+nr_status_frames_41559 nr_status_frames 0-1 41559 NULL nohasharray
+si476x_radio_fops_read_41559 si476x_radio_fops_read 3 41559 &nr_status_frames_41559
+rng_dev_read_41581 rng_dev_read 3 41581 NULL
++nfsd_readv_41585 nfsd_readv 4 41585 NULL
+batadv_tvlv_container_ogm_append_41588 batadv_tvlv_container_ogm_append 4 41588 NULL
-+vga_io_r_41609 vga_io_r 0 41609 NULL
+tcp_hdrlen_41610 tcp_hdrlen 0 41610 NULL
+lbs_bcnmiss_write_41613 lbs_bcnmiss_write 3 41613 NULL nohasharray
+usb_endpoint_maxp_41613 usb_endpoint_maxp 0 41613 &lbs_bcnmiss_write_41613
@@ -122683,28 +122130,29 @@ index 0000000..3d3508d
+ieee80211_if_fmt_bssid_41677 ieee80211_if_fmt_bssid 3 41677 NULL
+fill_pcm_stream_name_41685 fill_pcm_stream_name 2 41685 NULL
+lov_unpackmd_41701 lov_unpackmd 4 41701 NULL
-+apei_exec_for_each_entry_41717 apei_exec_for_each_entry 0 41717 NULL
++connector_write_41709 connector_write 3 41709 NULL
+fillonedir_41746 fillonedir 3 41746 NULL
+iwl_dbgfs_bt_notif_read_41794 iwl_dbgfs_bt_notif_read 3 41794 NULL
+hsi_alloc_controller_41802 hsi_alloc_controller 1 41802 NULL
++ptlrpc_new_bulk_41804 ptlrpc_new_bulk 1 41804 NULL
+rtw_android_get_macaddr_41812 rtw_android_get_macaddr 0 41812 NULL
+sco_send_frame_41815 sco_send_frame 3 41815 NULL
++kimage_file_alloc_init_41827 kimage_file_alloc_init 5 41827 NULL
++copy_page_to_iter_bvec_41830 copy_page_to_iter_bvec 0-3 41830 NULL
+ixgbe_dbg_netdev_ops_read_41839 ixgbe_dbg_netdev_ops_read 3 41839 NULL
+do_ip_setsockopt_41852 do_ip_setsockopt 5 41852 NULL
+keyctl_instantiate_key_41855 keyctl_instantiate_key 3 41855 NULL
-+xfs_rtget_summary_41864 xfs_rtget_summary 0 41864 NULL
+pci_map_single_41869 pci_map_single 0 41869 NULL
+usb_gadget_get_string_41871 usb_gadget_get_string 0 41871 NULL
+v_APCI3120_InterruptDmaMoveBlock16bit_41914 v_APCI3120_InterruptDmaMoveBlock16bit 4 41914 NULL
+get_fdb_entries_41916 get_fdb_entries 3 41916 NULL
-+ext4_da_write_inline_data_begin_41935 ext4_da_write_inline_data_begin 3-4 41935 NULL
++ext4_da_write_inline_data_begin_41935 ext4_da_write_inline_data_begin 4-3 41935 NULL
+sci_rxfill_41945 sci_rxfill 0 41945 NULL
+read_gssp_41947 read_gssp 3 41947 NULL
+ocfs2_xattr_bucket_get_name_value_41949 ocfs2_xattr_bucket_get_name_value 0 41949 NULL
+portnames_read_41958 portnames_read 3 41958 NULL
+dst_mtu_41969 dst_mtu 0 41969 NULL
+cx24116_writeregN_41975 cx24116_writeregN 4 41975 NULL
-+xfs_qm_dqalloc_41985 xfs_qm_dqalloc 0 41985 NULL
+pool_allocate_42012 pool_allocate 3 42012 NULL
+spidev_sync_read_42014 spidev_sync_read 0 42014 NULL
+rs_sta_dbgfs_scale_table_write_42017 rs_sta_dbgfs_scale_table_write 3 42017 NULL
@@ -122715,6 +122163,7 @@ index 0000000..3d3508d
+jffs2_do_link_42048 jffs2_do_link 6 42048 NULL
+ps_poll_upsd_max_ap_turn_read_42050 ps_poll_upsd_max_ap_turn_read 3 42050 NULL
+InterfaceTransmitPacket_42058 InterfaceTransmitPacket 3 42058 NULL
++ufshcd_dev_cmd_completion_42080 ufshcd_dev_cmd_completion 0 42080 NULL
+scsi_execute_req_42088 scsi_execute_req 5 42088 NULL
+sk_chk_filter_42095 sk_chk_filter 2 42095 NULL
+submit_inquiry_42108 submit_inquiry 3 42108 NULL
@@ -122725,8 +122174,8 @@ index 0000000..3d3508d
+oprofilefs_str_to_user_42182 oprofilefs_str_to_user 3 42182 NULL
+write_file_beacon_42185 write_file_beacon 3 42185 NULL
+get_znodes_to_commit_42201 get_znodes_to_commit 0 42201 NULL
-+pla_ocp_read_42235 pla_ocp_read 3 42235 NULL
-+xfs_rtfree_range_42244 xfs_rtfree_range 0 42244 NULL
++blockdev_direct_IO_42235 blockdev_direct_IO 5 42235 NULL nohasharray
++pla_ocp_read_42235 pla_ocp_read 3 42235 &blockdev_direct_IO_42235
+rx_defrag_need_decrypt_read_42253 rx_defrag_need_decrypt_read 3 42253 NULL
+find_last_bit_42260 find_last_bit 0 42260 NULL
+__pcpu_size_to_slot_42271 __pcpu_size_to_slot 0 42271 NULL
@@ -122740,16 +122189,17 @@ index 0000000..3d3508d
+hysdn_conf_read_42324 hysdn_conf_read 3 42324 NULL
+tcp_sync_mss_42330 tcp_sync_mss 2-0 42330 NULL
+ide_raw_taskfile_42355 ide_raw_taskfile 4 42355 NULL
-+tipc_send_42374 tipc_send 3 42374 NULL
+drbd_md_last_sector_42378 drbd_md_last_sector 0 42378 NULL
+il_dbgfs_disable_ht40_read_42386 il_dbgfs_disable_ht40_read 3 42386 NULL
+msnd_fifo_read_42406 msnd_fifo_read 0-3 42406 NULL
+krng_get_random_42420 krng_get_random 3 42420 NULL
+gsm_data_alloc_42437 gsm_data_alloc 3 42437 NULL
++spr_wm_latency_write_42441 spr_wm_latency_write 3 42441 NULL
+key_conf_keyidx_read_42443 key_conf_keyidx_read 3 42443 NULL
+snd_pcm_action_group_42452 snd_pcm_action_group 0 42452 NULL
+tcm_loop_change_queue_depth_42454 tcm_loop_change_queue_depth 2 42454 NULL
+kuc_free_42455 kuc_free 2 42455 NULL
++cp2112_gpio_get_42467 cp2112_gpio_get 2 42467 NULL
+__simple_xattr_set_42474 __simple_xattr_set 4 42474 NULL
+omfs_readpages_42490 omfs_readpages 4 42490 NULL
+bypass_write_42498 bypass_write 3 42498 NULL
@@ -122760,17 +122210,19 @@ index 0000000..3d3508d
+dbAllocNear_42546 dbAllocNear 0 42546 NULL
+ath6kl_wmi_proc_events_vif_42549 ath6kl_wmi_proc_events_vif 5 42549 NULL
+udp_recvmsg_42558 udp_recvmsg 4 42558 NULL
-+iwl_print_event_log_42566 iwl_print_event_log 7-5-0 42566 NULL
++iwl_print_event_log_42566 iwl_print_event_log 0-7-5 42566 NULL
+xfrm_new_hash_mask_42579 xfrm_new_hash_mask 0-1 42579 NULL
+oom_score_adj_write_42594 oom_score_adj_write 3 42594 NULL
+ieee80211_if_fmt_dot11MeshHWMPactivePathTimeout_42635 ieee80211_if_fmt_dot11MeshHWMPactivePathTimeout 3 42635 NULL
+scsi_activate_tcq_42640 scsi_activate_tcq 2 42640 NULL
+br_mdb_rehash_42643 br_mdb_rehash 2 42643 NULL
-+parport_pc_compat_write_block_pio_42644 parport_pc_compat_write_block_pio 3 42644 NULL
++parport_pc_compat_write_block_pio_42644 parport_pc_compat_write_block_pio 3 42644 NULL nohasharray
++num_controllers_42644 num_controllers 0 42644 &parport_pc_compat_write_block_pio_42644
+_regmap_raw_write_42652 _regmap_raw_write 4-2 42652 NULL
+request_key_and_link_42693 request_key_and_link 4 42693 NULL
+vb2_read_42703 vb2_read 3 42703 NULL
+read_status_42722 read_status 0 42722 NULL
++iwl_mvm_coex_dump_mbox_old_42727 iwl_mvm_coex_dump_mbox_old 4-3-0 42727 NULL
+dvb_demux_ioctl_42733 dvb_demux_ioctl 2 42733 NULL
+set_aoe_iflist_42737 set_aoe_iflist 2 42737 NULL
+ax25_setsockopt_42740 ax25_setsockopt 5 42740 NULL
@@ -122792,16 +122244,15 @@ index 0000000..3d3508d
+xpc_kmalloc_cacheline_aligned_42895 xpc_kmalloc_cacheline_aligned 1 42895 NULL
+hd_end_request_42904 hd_end_request 2 42904 NULL
+sta_last_rx_rate_read_42909 sta_last_rx_rate_read 3 42909 NULL
-+xfs_bmapi_allocate_42938 xfs_bmapi_allocate 0 42938 NULL
+sctp_getsockopt_maxburst_42941 sctp_getsockopt_maxburst 2 42941 NULL
+vx_reset_chk_42946 vx_reset_chk 0 42946 NULL
-+blkdev_direct_IO_42962 blkdev_direct_IO 4 42962 NULL
++ntb_setup_snb_msix_42971 ntb_setup_snb_msix 2 42971 NULL
+compat_udpv6_setsockopt_42981 compat_udpv6_setsockopt 5 42981 NULL
+nfs_idmap_get_desc_42990 nfs_idmap_get_desc 4-2 42990 NULL nohasharray
+rtw_os_xmit_resource_alloc_42990 rtw_os_xmit_resource_alloc 3 42990 &nfs_idmap_get_desc_42990
-+xfs_da_read_buf_43008 xfs_da_read_buf 0 43008 NULL
+isr_rx_mem_overflow_read_43025 isr_rx_mem_overflow_read 3 43025 NULL
+wep_default_key_count_read_43035 wep_default_key_count_read 3 43035 NULL
++__bioset_create_43059 __bioset_create 1 43059 NULL
+nouveau_gpuobj_create__43072 nouveau_gpuobj_create_ 9 43072 NULL
+nfs_map_group_to_gid_43082 nfs_map_group_to_gid 3 43082 NULL
+_xfer_secondary_pool_43089 _xfer_secondary_pool 2 43089 NULL
@@ -122809,7 +122260,6 @@ index 0000000..3d3508d
+ieee80211_if_fmt_drop_unencrypted_43107 ieee80211_if_fmt_drop_unencrypted 3 43107 NULL
+calculate_node_totalpages_43118 calculate_node_totalpages 2-3 43118 NULL
+read_file_dfs_43145 read_file_dfs 3 43145 NULL
-+gfs2_dir_write_stuffed_43147 gfs2_dir_write_stuffed 0-4 43147 NULL
+cfs_cpt_table_alloc_43159 cfs_cpt_table_alloc 1 43159 NULL
+usb_string_sub_43164 usb_string_sub 0 43164 NULL
+il_dbgfs_power_save_status_read_43165 il_dbgfs_power_save_status_read 3 43165 NULL
@@ -122819,34 +122269,30 @@ index 0000000..3d3508d
+iso_callback_43208 iso_callback 3 43208 NULL
+ath10k_p2p_calc_noa_ie_len_43209 ath10k_p2p_calc_noa_ie_len 0 43209 NULL
+f2fs_acl_from_disk_43210 f2fs_acl_from_disk 2 43210 NULL
-+atomic_long_add_return_43217 atomic_long_add_return 1-0 43217 NULL
-+inode_init_always_43225 inode_init_always 0 43225 NULL
++atomic_long_add_return_43217 atomic_long_add_return 1 43217 NULL
++gfs2_direct_IO_43220 gfs2_direct_IO 4 43220 NULL
+batadv_tt_tvlv_unicast_handler_v1_43239 batadv_tt_tvlv_unicast_handler_v1 5 43239 NULL
+vmemmap_alloc_block_43245 vmemmap_alloc_block 1 43245 NULL
+ide_end_rq_43269 ide_end_rq 4 43269 NULL
-+nilfs_direct_IO_43271 nilfs_direct_IO 4 43271 NULL
-+parport_pc_ecp_write_block_pio_43278 parport_pc_ecp_write_block_pio 3 43278 NULL nohasharray
-+evtchn_write_43278 evtchn_write 3 43278 &parport_pc_ecp_write_block_pio_43278
++evtchn_write_43278 evtchn_write 3 43278 NULL nohasharray
++parport_pc_ecp_write_block_pio_43278 parport_pc_ecp_write_block_pio 3 43278 &evtchn_write_43278
+filemap_write_and_wait_range_43279 filemap_write_and_wait_range 0 43279 NULL
+mpage_alloc_43299 mpage_alloc 3 43299 NULL
-+mmu_set_spte_43327 mmu_set_spte 6-7 43327 NULL
++mmu_set_spte_43327 mmu_set_spte 7-6 43327 NULL
+__ext4_get_inode_loc_43332 __ext4_get_inode_loc 0 43332 NULL
-+xfs_log_regrant_43350 xfs_log_regrant 0 43350 NULL
-+gfs2_rgrp_bh_get_43375 gfs2_rgrp_bh_get 0 43375 NULL
-+xfs_btree_new_iroot_43392 xfs_btree_new_iroot 0 43392 NULL
+xenfb_write_43412 xenfb_write 3 43412 NULL
+ext4_xattr_check_names_43422 ext4_xattr_check_names 0 43422 NULL
+__alloc_bootmem_low_43423 __alloc_bootmem_low 1 43423 NULL
+usb_alloc_urb_43436 usb_alloc_urb 1 43436 NULL
-+cifs_writev_43437 cifs_writev 4 43437 NULL
+ath6kl_wmi_roam_tbl_event_rx_43440 ath6kl_wmi_roam_tbl_event_rx 3 43440 NULL
-+usb_string_43443 usb_string 0 43443 NULL nohasharray
-+usemap_size_43443 usemap_size 0-2-1 43443 &usb_string_43443
++usemap_size_43443 usemap_size 0-2-1 43443 NULL nohasharray
++usb_string_43443 usb_string 0 43443 &usemap_size_43443
+get_vm_area_size_43444 get_vm_area_size 0 43444 NULL
++fs_path_prepare_for_add_43453 fs_path_prepare_for_add 2 43453 NULL
+nvme_trans_device_id_page_43466 nvme_trans_device_id_page 4 43466 NULL
+tx_tx_data_prepared_read_43497 tx_tx_data_prepared_read 3 43497 NULL
+ieee80211_if_fmt_dot11MeshHWMPnetDiameterTraversalTime_43505 ieee80211_if_fmt_dot11MeshHWMPnetDiameterTraversalTime 3 43505 NULL
-+do_readlink_43518 do_readlink 2 43518 NULL
++ll_direct_IO_26_43530 ll_direct_IO_26 4 43530 NULL
+dvb_ca_en50221_io_write_43533 dvb_ca_en50221_io_write 3 43533 NULL
+read_events_43534 read_events 3 43534 NULL
+cachefiles_daemon_write_43535 cachefiles_daemon_write 3 43535 NULL
@@ -122864,63 +122310,60 @@ index 0000000..3d3508d
+write_file_tx99_power_43670 write_file_tx99_power 3 43670 NULL
+dmam_declare_coherent_memory_43679 dmam_declare_coherent_memory 4 43679 NULL
+max77693_bulk_write_43698 max77693_bulk_write 2-3 43698 NULL
++nvkm_connector_create__43711 nvkm_connector_create_ 6 43711 NULL
++fuse_send_read_43725 fuse_send_read 4-0 43725 NULL
+drbd_md_first_sector_43729 drbd_md_first_sector 0 43729 NULL
+snd_rme32_playback_copy_43732 snd_rme32_playback_copy 5 43732 NULL
++__alloc_alien_cache_43734 __alloc_alien_cache 2 43734 NULL
+fuse_conn_congestion_threshold_write_43736 fuse_conn_congestion_threshold_write 3 43736 NULL
+gigaset_initcs_43753 gigaset_initcs 2 43753 NULL
+sctp_setsockopt_active_key_43755 sctp_setsockopt_active_key 3 43755 NULL
-+xfs_alloc_lookup_eq_43775 xfs_alloc_lookup_eq 0 43775 NULL
+ocfs2_xattr_get_value_outside_43787 ocfs2_xattr_get_value_outside 0 43787 NULL nohasharray
-+byte_pos_43787 byte_pos 0-2 43787 &ocfs2_xattr_get_value_outside_43787
-+xfs_trans_reserve_quota_bydquots_43797 xfs_trans_reserve_quota_bydquots 0 43797 NULL
++byte_pos_43787 byte_pos 0 43787 &ocfs2_xattr_get_value_outside_43787
+btrfs_copy_from_user_43806 btrfs_copy_from_user 0-3-1 43806 NULL
-+_xfs_filestream_update_ag_43824 _xfs_filestream_update_ag 0 43824 NULL
+ieee80211_if_fmt_element_ttl_43825 ieee80211_if_fmt_element_ttl 3 43825 NULL
+ieee80211_alloc_hw_43829 ieee80211_alloc_hw 1 43829 NULL
+read_flush_43851 read_flush 3 43851 NULL
+pm860x_bulk_write_43875 pm860x_bulk_write 2-3 43875 NULL
++ec_dbgfs_cmd_write_43895 ec_dbgfs_cmd_write 3 43895 NULL
+SendString_43928 SendString 3 43928 NULL
+stats_dot11RTSFailureCount_read_43948 stats_dot11RTSFailureCount_read 3 43948 NULL
-+xfs_trans_dqresv_43960 xfs_trans_dqresv 0 43960 NULL
+__get_required_blob_size_43980 __get_required_blob_size 0-3-2 43980 NULL
+nla_reserve_43984 nla_reserve 3 43984 NULL
+__clkdev_alloc_43990 __clkdev_alloc 1 43990 NULL
-+scsi_command_size_43992 scsi_command_size 0 43992 NULL nohasharray
-+kvm_read_guest_virt_43992 kvm_read_guest_virt 4-2 43992 &scsi_command_size_43992 nohasharray
-+bcm_recvmsg_43992 bcm_recvmsg 4 43992 &kvm_read_guest_virt_43992
-+ulist_add_43994 ulist_add 0 43994 NULL
++kvm_read_guest_virt_43992 kvm_read_guest_virt 4-2 43992 NULL nohasharray
++scsi_command_size_43992 scsi_command_size 0 43992 &kvm_read_guest_virt_43992 nohasharray
++bcm_recvmsg_43992 bcm_recvmsg 4 43992 &scsi_command_size_43992
+emit_flags_44006 emit_flags 4-3 44006 NULL
+write_flush_procfs_44011 write_flush_procfs 3 44011 NULL
+fru_strlen_44046 fru_strlen 0 44046 NULL
+ath9k_def_dump_modal_eeprom_44078 ath9k_def_dump_modal_eeprom 3-2-0 44078 NULL
+SYSC_add_key_44079 SYSC_add_key 4 44079 NULL
-+pci_msix_vec_count_44093 pci_msix_vec_count 0 44093 NULL nohasharray
-+__vxge_hw_vpath_tim_configure_44093 __vxge_hw_vpath_tim_configure 2 44093 &pci_msix_vec_count_44093
++pci_msix_vec_count_44093 pci_msix_vec_count 0 44093 NULL
+xlog_recover_add_to_cont_trans_44102 xlog_recover_add_to_cont_trans 4 44102 NULL
+skb_frag_dma_map_44112 skb_frag_dma_map 0 44112 NULL
-+file_remove_suid_44122 file_remove_suid 0 44122 NULL nohasharray
-+tracing_set_trace_read_44122 tracing_set_trace_read 3 44122 &file_remove_suid_44122
++nouveau_clock_create__44116 nouveau_clock_create_ 6 44116 NULL
++tracing_set_trace_read_44122 tracing_set_trace_read 3 44122 NULL
+SyS_process_vm_writev_44129 SyS_process_vm_writev 3-5 44129 NULL
++tracing_resize_saved_cmdlines_44140 tracing_resize_saved_cmdlines 1 44140 NULL
+ttm_get_pages_44142 ttm_get_pages 2 44142 NULL
+scsi_get_resid_44147 scsi_get_resid 0 44147 NULL
+ocfs2_xattr_bucket_find_44174 ocfs2_xattr_bucket_find 0 44174 NULL
+SYSC_set_mempolicy_44176 SYSC_set_mempolicy 3 44176 NULL
+readreg_ipac_44186 readreg_ipac 0 44186 NULL
+handle_eviocgbit_44193 handle_eviocgbit 3 44193 NULL
++btrfs_item_offset_nr_44220 btrfs_item_offset_nr 0 44220 NULL
+srp_alloc_iu_44227 srp_alloc_iu 2 44227 NULL
+scsi_track_queue_full_44239 scsi_track_queue_full 2 44239 NULL
+sigma_action_write_regmap_44240 sigma_action_write_regmap 3 44240 NULL
-+apei_resources_sub_44252 apei_resources_sub 0 44252 NULL
+device_create_file_44285 device_create_file 0 44285 NULL
+ath6kl_keepalive_read_44303 ath6kl_keepalive_read 3 44303 NULL
+bitmap_scnprintf_44318 bitmap_scnprintf 0-2 44318 NULL
+dispatch_proc_write_44320 dispatch_proc_write 3 44320 NULL
+ccp_init_data_44324 ccp_init_data 5 44324 NULL
+rs_init_44327 rs_init 1 44327 NULL
-+radix_tree_maybe_preload_44346 radix_tree_maybe_preload 0 44346 NULL
-+blk_queue_init_tags_44355 blk_queue_init_tags 2 44355 NULL nohasharray
-+nfs_fscache_get_super_cookie_44355 nfs_fscache_get_super_cookie 3 44355 &blk_queue_init_tags_44355
-+alloc_requests_44372 alloc_requests 0 44372 NULL
++nfs_fscache_get_super_cookie_44355 nfs_fscache_get_super_cookie 3 44355 NULL nohasharray
++blk_queue_init_tags_44355 blk_queue_init_tags 2 44355 &nfs_fscache_get_super_cookie_44355
+rts_threshold_read_44384 rts_threshold_read 3 44384 NULL
+mtip_hw_read_flags_44396 mtip_hw_read_flags 3 44396 NULL
+aoedev_flush_44398 aoedev_flush 2 44398 NULL
@@ -122928,7 +122371,7 @@ index 0000000..3d3508d
+drm_buffer_alloc_44405 drm_buffer_alloc 2 44405 NULL
+osst_do_scsi_44410 osst_do_scsi 4 44410 NULL
+ieee80211_if_read_rc_rateidx_mcs_mask_5ghz_44423 ieee80211_if_read_rc_rateidx_mcs_mask_5ghz 3 44423 NULL
-+xfs_mod_incore_sb_44439 xfs_mod_incore_sb 0 44439 NULL
++mic_virtio_copy_to_user_44472 mic_virtio_copy_to_user 3-4 44472 NULL
+write_file_debug_44476 write_file_debug 3 44476 NULL
+btrfs_chunk_item_size_44478 btrfs_chunk_item_size 0-1 44478 NULL
+sdio_align_size_44489 sdio_align_size 0-2 44489 NULL
@@ -122942,19 +122385,23 @@ index 0000000..3d3508d
+ieee80211_rx_mgmt_assoc_resp_44525 ieee80211_rx_mgmt_assoc_resp 3 44525 NULL
+comm_write_44537 comm_write 3 44537 NULL
+dgrp_config_proc_write_44571 dgrp_config_proc_write 3 44571 NULL
-+btrfs_set_extent_delalloc_44587 btrfs_set_extent_delalloc 0 44587 NULL
++l2cap_sock_memcpy_fromiovec_cb_44573 l2cap_sock_memcpy_fromiovec_cb 4 44573 NULL
+nouveau_perfmon_create__44602 nouveau_perfmon_create_ 4 44602 NULL
-+xfs_bmapi_delay_44630 xfs_bmapi_delay 0 44630 NULL
++xpcs_mmd_write_44633 xpcs_mmd_write 3 44633 NULL
+alloc_ctrl_packet_44667 alloc_ctrl_packet 1 44667 NULL
+mpi_resize_44674 mpi_resize 2 44674 NULL
+sysfs_create_link_44685 sysfs_create_link 0 44685 NULL
+ts_read_44687 ts_read 3 44687 NULL
++write_file_spectral_bins_44696 write_file_spectral_bins 3 44696 NULL
+lov_emerg_alloc_44698 lov_emerg_alloc 1 44698 NULL
-+xfer_to_user_44713 xfer_to_user 3 44713 NULL nohasharray
-+__generic_block_fiemap_44713 __generic_block_fiemap 4 44713 &xfer_to_user_44713
++C_SYSC_select_44701 C_SYSC_select 1 44701 NULL
++__generic_block_fiemap_44713 __generic_block_fiemap 4 44713 NULL nohasharray
++xfer_to_user_44713 xfer_to_user 3 44713 &__generic_block_fiemap_44713
++nft_hash_tbl_size_44724 nft_hash_tbl_size 0 44724 NULL
+_zd_iowrite32v_locked_44725 _zd_iowrite32v_locked 3 44725 NULL
+clusterip_proc_write_44729 clusterip_proc_write 3 44729 NULL
+fib_count_nexthops_44730 fib_count_nexthops 0 44730 NULL
++efx_wanted_parallelism_44732 efx_wanted_parallelism 0 44732 NULL
+key_tx_rx_count_read_44742 key_tx_rx_count_read 3 44742 NULL
+bch_bio_max_sectors_44755 bch_bio_max_sectors 0 44755 NULL
+tnode_new_44757 tnode_new 3 44757 NULL nohasharray
@@ -122965,6 +122412,7 @@ index 0000000..3d3508d
+sctp_setsockopt_44788 sctp_setsockopt 5 44788 NULL
+rx_dropped_read_44799 rx_dropped_read 3 44799 NULL
+qla4xxx_alloc_work_44813 qla4xxx_alloc_work 2 44813 NULL
++force_static_address_write_44819 force_static_address_write 3 44819 NULL
+mei_cl_read_start_44824 mei_cl_read_start 2 44824 NULL
+rmap_write_protect_44833 rmap_write_protect 2 44833 NULL
+sisusb_write_44834 sisusb_write 3 44834 NULL
@@ -122974,16 +122422,17 @@ index 0000000..3d3508d
+set_advertising_44870 set_advertising 4 44870 NULL
+init_rs_44873 init_rs 1 44873 NULL
+skb_availroom_44883 skb_availroom 0 44883 NULL
-+ocfs2_wait_for_mask_44893 ocfs2_wait_for_mask 0 44893 NULL
+do_tty_write_44896 do_tty_write 5 44896 NULL
+regmap_spi_read_44921 regmap_spi_read 3-5 44921 NULL
+tx_queue_status_read_44978 tx_queue_status_read 3 44978 NULL
-+bytepos_delta_45017 bytepos_delta 0-2 45017 NULL
++bytepos_delta_45017 bytepos_delta 0 45017 NULL
+ptrace_writedata_45021 ptrace_writedata 4 45021 NULL
+dm_kvzalloc_45025 dm_kvzalloc 1 45025 NULL
+sysfs_do_create_link_sd_45057 sysfs_do_create_link_sd 0 45057 NULL
+sel_write_user_45060 sel_write_user 3 45060 NULL
+snd_mixart_BA0_read_45069 snd_mixart_BA0_read 5 45069 NULL
++lnet_expand1tb_45102 lnet_expand1tb 6 45102 NULL
++snd_card_new_45104 snd_card_new 5 45104 NULL
+kvm_mmu_page_get_gfn_45110 kvm_mmu_page_get_gfn 0-2 45110 NULL
+pwr_missing_bcns_cnt_read_45113 pwr_missing_bcns_cnt_read 3 45113 NULL
+usbdev_read_45114 usbdev_read 3 45114 NULL
@@ -122996,7 +122445,6 @@ index 0000000..3d3508d
+sta_agg_status_write_45164 sta_agg_status_write 3 45164 NULL
+snd_sb_csp_load_user_45190 snd_sb_csp_load_user 3 45190 NULL nohasharray
+sctp_pack_cookie_45190 sctp_pack_cookie 6 45190 &snd_sb_csp_load_user_45190
-+__radix_tree_preload_45197 __radix_tree_preload 0 45197 NULL
+iso_alloc_urb_45206 iso_alloc_urb 4-5 45206 NULL
+spi_alloc_master_45223 spi_alloc_master 2 45223 NULL
+ieee80211_if_read_peer_45233 ieee80211_if_read_peer 3 45233 NULL
@@ -123005,22 +122453,21 @@ index 0000000..3d3508d
+input_mt_init_slots_45279 input_mt_init_slots 2 45279 NULL
+gfs2_fiemap_45282 gfs2_fiemap 4 45282 NULL
+snd_pcm_oss_sync1_45298 snd_pcm_oss_sync1 2 45298 NULL
-+xfs_alert_fsblock_zero_45304 xfs_alert_fsblock_zero 0 45304 NULL
+e1000_tx_map_45309 e1000_tx_map 5 45309 NULL
+copy_vm86_regs_from_user_45340 copy_vm86_regs_from_user 3 45340 NULL
+brcmf_sdio_died_dump_45359 brcmf_sdio_died_dump 3 45359 NULL
+null_alloc_repbuf_45375 null_alloc_repbuf 3 45375 NULL
++count_skb_frag_slots_45395 count_skb_frag_slots 0 45395 NULL
+sock_recv_errqueue_45412 sock_recv_errqueue 3 45412 NULL
+ieee80211_if_fmt_dot11MeshHWMProotInterval_45421 ieee80211_if_fmt_dot11MeshHWMProotInterval 3 45421 NULL
+ll_iocontrol_register_45430 ll_iocontrol_register 2 45430 NULL
+tty_buffer_alloc_45437 tty_buffer_alloc 2 45437 NULL
++blkdev_direct_IO_45440 blkdev_direct_IO 4 45440 NULL
+__node_remap_45458 __node_remap 4 45458 NULL
+rds_ib_set_wr_signal_state_45463 rds_ib_set_wr_signal_state 0 45463 NULL
+tracing_read_dyn_info_45468 tracing_read_dyn_info 3 45468 NULL
+__calc_request_pg_45470 __calc_request_pg 0 45470 NULL
-+xfs_btree_block_change_owner_45476 xfs_btree_block_change_owner 0 45476 NULL
+rds_message_copy_from_user_45510 rds_message_copy_from_user 3 45510 NULL
-+i40e_alloc_vfs_45511 i40e_alloc_vfs 2 45511 NULL
+copy_macs_45534 copy_macs 4 45534 NULL
+nla_attr_size_45545 nla_attr_size 0-1 45545 NULL
+v9fs_direct_read_45546 v9fs_direct_read 3 45546 NULL
@@ -123031,14 +122478,15 @@ index 0000000..3d3508d
+venus_rmdir_45564 venus_rmdir 4 45564 NULL
+ath6kl_keepalive_write_45600 ath6kl_keepalive_write 3 45600 NULL
+hidraw_get_report_45609 hidraw_get_report 3 45609 NULL
++ip_dst_mtu_maybe_forward_45627 ip_dst_mtu_maybe_forward 0 45627 NULL
+compat_mpctl_ioctl_45671 compat_mpctl_ioctl 2 45671 NULL
+dgram_sendmsg_45679 dgram_sendmsg 4 45679 NULL
+smk_write_ambient_45691 smk_write_ambient 3 45691 NULL
-+unix_dgram_sendmsg_45699 unix_dgram_sendmsg 4 45699 NULL nohasharray
-+bscnl_emit_45699 bscnl_emit 2-5-0 45699 &unix_dgram_sendmsg_45699
++bscnl_emit_45699 bscnl_emit 2-5-0 45699 NULL nohasharray
++unix_dgram_sendmsg_45699 unix_dgram_sendmsg 4 45699 &bscnl_emit_45699
+sg_proc_write_adio_45704 sg_proc_write_adio 3 45704 NULL
-+snd_cs46xx_io_read_45734 snd_cs46xx_io_read 5 45734 NULL nohasharray
-+task_cgroup_path_45734 task_cgroup_path 3 45734 &snd_cs46xx_io_read_45734
++wlcore_smart_config_decode_event_45714 wlcore_smart_config_decode_event 2-4 45714 NULL
++snd_cs46xx_io_read_45734 snd_cs46xx_io_read 5 45734 NULL
+rw_copy_check_uvector_45748 rw_copy_check_uvector 3-0 45748 NULL nohasharray
+v4l2_ctrl_new_std_45748 v4l2_ctrl_new_std 5 45748 &rw_copy_check_uvector_45748
+lkdtm_debugfs_read_45752 lkdtm_debugfs_read 3 45752 NULL
@@ -123051,11 +122499,9 @@ index 0000000..3d3508d
+ll_max_readahead_mb_seq_write_45815 ll_max_readahead_mb_seq_write 3 45815 NULL
+memcg_update_cache_size_45828 memcg_update_cache_size 2 45828 NULL
+ipv6_recv_rxpmtu_45830 ipv6_recv_rxpmtu 3 45830 NULL
-+insert_state_45848 insert_state 0 45848 NULL
+x509_process_extension_45854 x509_process_extension 5 45854 NULL
+efx_tx_queue_insert_45859 efx_tx_queue_insert 2 45859 NULL
+isdn_write_45863 isdn_write 3 45863 NULL
-+tpm_config_in_45880 tpm_config_in 0 45880 NULL
+get_rdac_req_45882 get_rdac_req 3 45882 NULL
+ocfs2_xattr_block_find_45891 ocfs2_xattr_block_find 0 45891 NULL
+cfs_cpt_weight_45903 cfs_cpt_weight 0 45903 NULL
@@ -123066,17 +122512,16 @@ index 0000000..3d3508d
+copy_to_45969 copy_to 3 45969 NULL
+rb_simple_read_45972 rb_simple_read 3 45972 NULL
+ioat2_dca_count_dca_slots_45984 ioat2_dca_count_dca_slots 0 45984 NULL
-+kobject_init_and_add_46003 kobject_init_and_add 0 46003 NULL
+sierra_setup_urb_46029 sierra_setup_urb 5 46029 NULL
+fnic_reset_stats_read_46030 fnic_reset_stats_read 3 46030 NULL nohasharray
+get_free_entries_46030 get_free_entries 1 46030 &fnic_reset_stats_read_46030
+__access_remote_vm_46031 __access_remote_vm 0 46031 NULL
+snd_emu10k1x_ptr_read_46049 snd_emu10k1x_ptr_read 0 46049 NULL
-+__ocfs2_move_extent_46060 __ocfs2_move_extent 3-4 46060 NULL nohasharray
-+dma_tx_errors_read_46060 dma_tx_errors_read 3 46060 &__ocfs2_move_extent_46060
++dma_tx_errors_read_46060 dma_tx_errors_read 3 46060 NULL nohasharray
++__ocfs2_move_extent_46060 __ocfs2_move_extent 3-4 46060 &dma_tx_errors_read_46060
+sel_commit_bools_write_46077 sel_commit_bools_write 3 46077 NULL
-+il3945_ucode_general_stats_read_46111 il3945_ucode_general_stats_read 3 46111 NULL nohasharray
-+memcg_update_array_size_46111 memcg_update_array_size 1 46111 &il3945_ucode_general_stats_read_46111
++memcg_update_array_size_46111 memcg_update_array_size 1 46111 NULL nohasharray
++il3945_ucode_general_stats_read_46111 il3945_ucode_general_stats_read 3 46111 &memcg_update_array_size_46111
+C_SYSC_writev_46113 C_SYSC_writev 3 46113 NULL
+mlx4_ib_alloc_fast_reg_page_list_46119 mlx4_ib_alloc_fast_reg_page_list 2 46119 NULL
+rtw_buf_update_46138 rtw_buf_update 4 46138 NULL
@@ -123092,16 +122537,16 @@ index 0000000..3d3508d
+hash_netiface4_expire_46226 hash_netiface4_expire 4 46226 NULL
+xen_setup_msi_irqs_46245 xen_setup_msi_irqs 2 46245 NULL
+mpi_read_raw_data_46248 mpi_read_raw_data 2 46248 NULL
-+ReadReg_46277 ReadReg 0 46277 NULL
+sg_proc_write_dressz_46316 sg_proc_write_dressz 3 46316 NULL
++C_SYSC_ppoll_46319 C_SYSC_ppoll 2 46319 NULL
+__hwahc_dev_set_key_46328 __hwahc_dev_set_key 5 46328 NULL nohasharray
+compat_SyS_readv_46328 compat_SyS_readv 3 46328 &__hwahc_dev_set_key_46328
+iwl_dbgfs_chain_noise_read_46355 iwl_dbgfs_chain_noise_read 3 46355 NULL
+smk_write_direct_46363 smk_write_direct 3 46363 NULL
-+fuse_file_aio_write_46399 fuse_file_aio_write 4 46399 NULL
+crypto_ablkcipher_reqsize_46411 crypto_ablkcipher_reqsize 0 46411 NULL
+ttm_page_pool_get_pages_46431 ttm_page_pool_get_pages 0-5 46431 NULL
+cfs_power2_roundup_46433 cfs_power2_roundup 0-1 46433 NULL
++wdata_alloc_and_fillpages_46437 wdata_alloc_and_fillpages 1 46437 NULL
+cp210x_set_config_46447 cp210x_set_config 4 46447 NULL
+parport_pc_fifo_write_block_46455 parport_pc_fifo_write_block 3 46455 NULL
+il_dbgfs_clear_traffic_stats_write_46458 il_dbgfs_clear_traffic_stats_write 3 46458 NULL
@@ -123111,13 +122556,15 @@ index 0000000..3d3508d
+mthca_alloc_cq_buf_46512 mthca_alloc_cq_buf 3 46512 NULL
+kmsg_read_46514 kmsg_read 3 46514 NULL nohasharray
+nouveau_drm_ioctl_46514 nouveau_drm_ioctl 2 46514 &kmsg_read_46514
++nlm_end_grace_write_46517 nlm_end_grace_write 3 46517 NULL
+nl80211_send_rx_assoc_46538 nl80211_send_rx_assoc 4 46538 NULL
++__btrfs_free_extent_46573 __btrfs_free_extent 7 46573 NULL
+dn_current_mss_46574 dn_current_mss 0 46574 NULL
+serverworks_create_gatt_pages_46582 serverworks_create_gatt_pages 1 46582 NULL
+snd_compr_write_data_46592 snd_compr_write_data 3 46592 NULL
+il3945_stats_flag_46606 il3945_stats_flag 0-3 46606 NULL
+vscnprintf_46617 vscnprintf 0-2 46617 NULL
-+__kfifo_out_r_46623 __kfifo_out_r 3-0 46623 NULL
++__kfifo_out_r_46623 __kfifo_out_r 0-3 46623 NULL
+request_key_async_with_auxdata_46624 request_key_async_with_auxdata 4 46624 NULL
+pci_enable_device_46642 pci_enable_device 0 46642 NULL
+vfs_getxattr_alloc_46649 vfs_getxattr_alloc 0 46649 NULL
@@ -123132,23 +122579,22 @@ index 0000000..3d3508d
+ext4_count_free_46754 ext4_count_free 2 46754 NULL
+hest_ghes_dev_register_46766 hest_ghes_dev_register 1 46766 NULL
+int_hw_irq_en_46776 int_hw_irq_en 3 46776 NULL
-+_xfs_buf_get_pages_46811 _xfs_buf_get_pages 2 46811 NULL
+xfs_iroot_realloc_46826 xfs_iroot_realloc 2 46826 NULL
++shmem_pwrite_fast_46842 shmem_pwrite_fast 3 46842 NULL
+readreg_46845 readreg 0 46845 NULL
+spi_async_46857 spi_async 0 46857 NULL
-+SyS_move_pages_46863 SyS_move_pages 2 46863 NULL nohasharray
-+vsnprintf_46863 vsnprintf 0 46863 &SyS_move_pages_46863
++vsnprintf_46863 vsnprintf 0 46863 NULL
+nvme_alloc_queue_46865 nvme_alloc_queue 3 46865 NULL
+qp_memcpy_from_queue_iov_46874 qp_memcpy_from_queue_iov 5-4 46874 NULL
+lov_iocontrol_46876 lov_iocontrol 3 46876 NULL
+ixgbe_dbg_reg_ops_write_46895 ixgbe_dbg_reg_ops_write 3 46895 NULL
+sk_mem_pages_46896 sk_mem_pages 0-1 46896 NULL
++alloc_cmdid_46904 alloc_cmdid 0 46904 NULL
+ieee80211_if_fmt_power_mode_46906 ieee80211_if_fmt_power_mode 3 46906 NULL
+wlcore_alloc_hw_46917 wlcore_alloc_hw 1-3 46917 NULL
+fb_write_46924 fb_write 3 46924 NULL
+__sctp_setsockopt_connectx_46949 __sctp_setsockopt_connectx 3 46949 NULL
-+qla4xxx_post_aen_work_46953 qla4xxx_post_aen_work 3 46953 NULL nohasharray
-+ntfs_truncate_46953 ntfs_truncate 0 46953 &qla4xxx_post_aen_work_46953
++qla4xxx_post_aen_work_46953 qla4xxx_post_aen_work 3 46953 NULL
+SYSC_poll_46965 SYSC_poll 2 46965 NULL
+crypto_tfm_alg_alignmask_46971 crypto_tfm_alg_alignmask 0 46971 NULL
+mgmt_pending_add_46976 mgmt_pending_add 5 46976 NULL
@@ -123159,7 +122605,6 @@ index 0000000..3d3508d
+cx231xx_init_bulk_47024 cx231xx_init_bulk 3-2-4 47024 NULL
+fs_path_len_47060 fs_path_len 0 47060 NULL
+event_trigger_regex_write_47067 event_trigger_regex_write 3 47067 NULL
-+ext4_xattr_list_entries_47070 ext4_xattr_list_entries 0 47070 NULL
+pipeline_dec_packet_in_read_47076 pipeline_dec_packet_in_read 3 47076 NULL
+scsi_deactivate_tcq_47086 scsi_deactivate_tcq 2 47086 NULL
+iwl_dump_nic_event_log_47089 iwl_dump_nic_event_log 0 47089 NULL
@@ -123170,8 +122615,6 @@ index 0000000..3d3508d
+ses_recv_diag_47143 ses_recv_diag 4 47143 &acpi_ut_initialize_buffer_47143
+mxms_headerlen_47161 mxms_headerlen 0 47161 NULL
+rs_sta_dbgfs_rate_scale_data_read_47165 rs_sta_dbgfs_rate_scale_data_read 3 47165 NULL
-+rts51x_ms_rw_47171 rts51x_ms_rw 3-4 47171 NULL
-+xfs_btree_get_buf_block_47197 xfs_btree_get_buf_block 0 47197 NULL
+options_write_47243 options_write 3 47243 NULL
+portcntrs_1_read_47253 portcntrs_1_read 3 47253 NULL
+ablkcipher_next_slow_47274 ablkcipher_next_slow 4-3 47274 NULL
@@ -123179,16 +122622,16 @@ index 0000000..3d3508d
+vsnprintf_47291 vsnprintf 0 47291 NULL
+SYSC_semop_47292 SYSC_semop 3 47292 NULL
+tx_internal_desc_overflow_read_47300 tx_internal_desc_overflow_read 3 47300 NULL
-+xfs_trans_reserve_quota_nblks_47313 xfs_trans_reserve_quota_nblks 0 47313 NULL
++virtqueue_add_47306 virtqueue_add 3 47306 NULL
+nouveau_fb_create__47316 nouveau_fb_create_ 4 47316 NULL
+ieee80211_if_read_dot11MeshHoldingTimeout_47356 ieee80211_if_read_dot11MeshHoldingTimeout 3 47356 NULL
-+gfs2_replay_read_block_47357 gfs2_replay_read_block 0 47357 NULL
++nvme_submit_admin_cmd_47357 nvme_submit_admin_cmd 0 47357 NULL
+avc_get_hash_stats_47359 avc_get_hash_stats 0 47359 NULL
+kvm_arch_create_memslot_47364 kvm_arch_create_memslot 3 47364 NULL nohasharray
+__output_copy_user_47364 __output_copy_user 3 47364 &kvm_arch_create_memslot_47364
+__bio_map_kern_47379 __bio_map_kern 3 47379 NULL
-+trace_options_core_read_47390 trace_options_core_read 3 47390 NULL nohasharray
-+nv_rd32_47390 nv_rd32 0 47390 &trace_options_core_read_47390
++nv_rd32_47390 nv_rd32 0 47390 NULL nohasharray
++trace_options_core_read_47390 trace_options_core_read 3 47390 &nv_rd32_47390
+nametbl_list_47391 nametbl_list 2 47391 NULL
+dgrp_net_write_47392 dgrp_net_write 3 47392 NULL
+pfkey_sendmsg_47394 pfkey_sendmsg 4 47394 NULL
@@ -123196,17 +122639,22 @@ index 0000000..3d3508d
+sta_vht_capa_read_47409 sta_vht_capa_read 3 47409 NULL
+crypto_ablkcipher_alignmask_47410 crypto_ablkcipher_alignmask 0 47410 NULL
+lbs_wrrf_write_47418 lbs_wrrf_write 3 47418 NULL
++C_SYSC_set_mempolicy_47466 C_SYSC_set_mempolicy 3 47466 NULL
++lprocfs_fid_write_common_47471 lprocfs_fid_write_common 2 47471 NULL
+nvme_trans_send_fw_cmd_47479 nvme_trans_send_fw_cmd 4 47479 NULL
+newpart_47485 newpart 6-4 47485 NULL
++mcp23s17_read_regs_47491 mcp23s17_read_regs 4 47491 NULL
+core_sys_select_47494 core_sys_select 1 47494 NULL
++as3722_block_write_47503 as3722_block_write 2-3 47503 NULL
+alloc_arraycache_47505 alloc_arraycache 2 47505 NULL
+unlink_simple_47506 unlink_simple 3 47506 NULL
+pstore_decompress_47510 pstore_decompress 0 47510 NULL
++ec_i2c_count_response_47518 ec_i2c_count_response 0 47518 NULL
+__proc_lnet_portal_rotor_47529 __proc_lnet_portal_rotor 5 47529 NULL
+process_vm_rw_47533 process_vm_rw 3-5 47533 NULL nohasharray
+vscnprintf_47533 vscnprintf 0-2 47533 &process_vm_rw_47533
-+einj_check_trigger_header_47534 einj_check_trigger_header 0 47534 NULL
+ieee80211_if_fmt_min_discovery_timeout_47539 ieee80211_if_fmt_min_discovery_timeout 3 47539 NULL
++drbg_statelen_47551 drbg_statelen 0 47551 NULL
+read_ldt_47570 read_ldt 2 47570 NULL
+isku_sysfs_read_last_set_47572 isku_sysfs_read_last_set 6 47572 NULL
+btrfs_stack_header_bytenr_47589 btrfs_stack_header_bytenr 0 47589 NULL
@@ -123216,6 +122664,7 @@ index 0000000..3d3508d
+twl4030_clear_set_47624 twl4030_clear_set 4 47624 NULL
+ccp_sha_setkey_47633 ccp_sha_setkey 3 47633 NULL
+get_size_47644 get_size 1-2 47644 NULL
++osc_brw_prep_request_47680 osc_brw_prep_request 5 47680 NULL
+packet_recvmsg_47700 packet_recvmsg 4 47700 NULL nohasharray
+ipath_format_hwmsg_47700 ipath_format_hwmsg 2 47700 &packet_recvmsg_47700
+save_microcode_47717 save_microcode 3 47717 NULL
@@ -123227,10 +122676,12 @@ index 0000000..3d3508d
+uwb_ie_dump_hex_47774 uwb_ie_dump_hex 4 47774 NULL
+SyS_setgroups16_47780 SyS_setgroups16 1 47780 NULL
+error_error_numll_frame_cts_start_read_47781 error_error_numll_frame_cts_start_read 3 47781 NULL
++ptlrpc_prep_req_47792 ptlrpc_prep_req 4 47792 NULL
+posix_acl_fix_xattr_from_user_47793 posix_acl_fix_xattr_from_user 2 47793 NULL
+W6692_empty_Bfifo_47804 W6692_empty_Bfifo 2 47804 NULL
+lov_packmd_47810 lov_packmd 0 47810 NULL
+tree_mod_log_insert_move_47823 tree_mod_log_insert_move 5 47823 NULL
++read_file_spectral_bins_47829 read_file_spectral_bins 3 47829 NULL
+pinconf_dbg_config_write_47835 pinconf_dbg_config_write 3 47835 NULL
+KEY_SIZE_47855 KEY_SIZE 0 47855 NULL
+vhci_read_47878 vhci_read 3 47878 NULL
@@ -123238,14 +122689,14 @@ index 0000000..3d3508d
+cfs_percpt_alloc_47918 cfs_percpt_alloc 2 47918 NULL
+comedi_write_47926 comedi_write 3 47926 NULL
+nvme_trans_get_blk_desc_len_47946 nvme_trans_get_blk_desc_len 0-2 47946 NULL
++arch_setup_msi_irq_47959 arch_setup_msi_irq 0 47959 NULL
+gether_get_ifname_47972 gether_get_ifname 3 47972 NULL
+mempool_resize_47983 mempool_resize 2 47983 NULL nohasharray
+iwl_dbgfs_ucode_tracing_read_47983 iwl_dbgfs_ucode_tracing_read 3 47983 &mempool_resize_47983
+dbg_port_buf_47990 dbg_port_buf 2 47990 NULL
+ib_umad_write_47993 ib_umad_write 3 47993 NULL
-+lustre_cfg_len_48002 lustre_cfg_len 0 48002 NULL
++lustre_cfg_len_48002 lustre_cfg_len 0-1 48002 NULL
+gdm_tty_recv_complete_48011 gdm_tty_recv_complete 2 48011 NULL
-+ffs_epfile_write_48014 ffs_epfile_write 3 48014 NULL
+bio_integrity_set_tag_48035 bio_integrity_set_tag 3 48035 NULL
+pppoe_sendmsg_48039 pppoe_sendmsg 4 48039 NULL
+SYSC_writev_48040 SYSC_writev 3 48040 NULL
@@ -123254,11 +122705,13 @@ index 0000000..3d3508d
+palmas_bulk_write_48068 palmas_bulk_write 2-3-5 48068 NULL
+disc_write_48070 disc_write 3 48070 NULL
+mmc_alloc_host_48097 mmc_alloc_host 1 48097 NULL
-+xfs_read_agi_48100 xfs_read_agi 0 48100 NULL
+skb_copy_datagram_const_iovec_48102 skb_copy_datagram_const_iovec 4-2-5 48102 NULL
++wm_latency_write_48125 wm_latency_write 3 48125 NULL
++load_firmware_48128 load_firmware 2 48128 NULL
+vmw_framebuffer_surface_dirty_48132 vmw_framebuffer_surface_dirty 6 48132 NULL
+set_discoverable_48141 set_discoverable 4 48141 NULL
+dn_fib_count_nhs_48145 dn_fib_count_nhs 0 48145 NULL
++SyS_vmsplice_48150 SyS_vmsplice 3 48150 NULL
+_add_to_r4w_48152 _add_to_r4w 4 48152 NULL
+isr_dma1_done_read_48159 isr_dma1_done_read 3 48159 NULL
+c4iw_id_table_alloc_48163 c4iw_id_table_alloc 3 48163 NULL
@@ -123267,7 +122720,6 @@ index 0000000..3d3508d
+cfg80211_process_deauth_48200 cfg80211_process_deauth 3 48200 NULL
+ext4_index_trans_blocks_48205 ext4_index_trans_blocks 0-2 48205 NULL
+snd_seq_dump_var_event_48209 snd_seq_dump_var_event 0 48209 NULL
-+ll_direct_IO_26_48216 ll_direct_IO_26 4 48216 NULL
+uv_blade_nr_possible_cpus_48226 uv_blade_nr_possible_cpus 0 48226 NULL
+nilfs_readpages_48229 nilfs_readpages 4 48229 NULL
+read_file_recv_48232 read_file_recv 3 48232 NULL
@@ -123275,6 +122727,7 @@ index 0000000..3d3508d
+nouveau_i2c_port_create__48240 nouveau_i2c_port_create_ 7 48240 NULL
+nfsctl_transaction_read_48250 nfsctl_transaction_read 3 48250 NULL
+batadv_socket_read_48257 batadv_socket_read 3 48257 NULL
++__videobuf_free_48260 __videobuf_free 0 48260 NULL
+cache_write_pipefs_48270 cache_write_pipefs 3 48270 NULL
+trace_options_write_48275 trace_options_write 3 48275 NULL
+send_set_info_48288 send_set_info 7 48288 NULL
@@ -123284,13 +122737,16 @@ index 0000000..3d3508d
+kvm_mmu_pte_write_48340 kvm_mmu_pte_write 2 48340 NULL
+skb_add_data_48363 skb_add_data 3 48363 NULL
+tx_frag_init_called_read_48377 tx_frag_init_called_read 3 48377 NULL
++ath10k_read_htt_max_amsdu_ampdu_48401 ath10k_read_htt_max_amsdu_ampdu 3 48401 NULL
+lbs_debugfs_write_48413 lbs_debugfs_write 3 48413 NULL
+uhid_event_from_user_48417 uhid_event_from_user 2 48417 NULL
+div64_u64_rem_48418 div64_u64_rem 0-1-2 48418 NULL
+pwr_tx_without_ps_read_48423 pwr_tx_without_ps_read 3 48423 NULL
+print_filtered_48442 print_filtered 2-0 48442 NULL
+tun_recvmsg_48463 tun_recvmsg 4 48463 NULL
++copy_page_from_iter_iovec_48466 copy_page_from_iter_iovec 3-0 48466 NULL
+compat_SyS_preadv64_48469 compat_SyS_preadv64 3 48469 NULL
++_iwl_dbgfs_bt_tx_prio_write_48473 _iwl_dbgfs_bt_tx_prio_write 3 48473 NULL
+ipath_format_hwerrors_48487 ipath_format_hwerrors 5 48487 NULL
+r8712_usbctrl_vendorreq_48489 r8712_usbctrl_vendorreq 6 48489 NULL
+ocfs2_refcount_cow_48495 ocfs2_refcount_cow 3 48495 NULL
@@ -123301,23 +122757,22 @@ index 0000000..3d3508d
+phantom_get_free_48514 phantom_get_free 0 48514 NULL
+drbd_bm_capacity_48530 drbd_bm_capacity 0 48530 NULL
+raid10_size_48571 raid10_size 0-2-3 48571 NULL
++nvif_notify_init_48578 nvif_notify_init 7 48578 NULL
+llog_data_len_48607 llog_data_len 1 48607 NULL
+do_ip_vs_set_ctl_48641 do_ip_vs_set_ctl 4 48641 NULL
++kernel_sock_ioctl_48644 kernel_sock_ioctl 0 48644 NULL
+ll_rw_extents_stats_pp_seq_write_48651 ll_rw_extents_stats_pp_seq_write 3 48651 NULL
+mtd_read_48655 mtd_read 0 48655 NULL
+aes_encrypt_packets_read_48666 aes_encrypt_packets_read 3 48666 NULL
+sm501_create_subdev_48668 sm501_create_subdev 3-4 48668 NULL
-+security_inode_setattr_48689 security_inode_setattr 0 48689 NULL
+hysdn_log_write_48694 hysdn_log_write 3 48694 NULL
+altera_drscan_48698 altera_drscan 2 48698 NULL
+kvm_set_irq_routing_48704 kvm_set_irq_routing 3 48704 NULL
-+recv_msg_48709 recv_msg 4 48709 NULL
+lpfc_idiag_drbacc_write_48712 lpfc_idiag_drbacc_write 3 48712 NULL
+SyS_lgetxattr_48719 SyS_lgetxattr 4 48719 NULL
+ath6kl_usb_bmi_read_48745 ath6kl_usb_bmi_read 3 48745 NULL
+ath6kl_regwrite_read_48747 ath6kl_regwrite_read 3 48747 NULL
+l2cap_segment_sdu_48772 l2cap_segment_sdu 4 48772 NULL
-+gfs2_direct_IO_48774 gfs2_direct_IO 4 48774 NULL
+il3945_sta_dbgfs_stats_table_read_48802 il3945_sta_dbgfs_stats_table_read 3 48802 NULL
+twa_change_queue_depth_48808 twa_change_queue_depth 2 48808 NULL
+atomic_counters_read_48827 atomic_counters_read 3 48827 NULL
@@ -123325,8 +122780,8 @@ index 0000000..3d3508d
+vc_do_resize_48842 vc_do_resize 3-4 48842 NULL
+comedi_buf_write_alloc_48846 comedi_buf_write_alloc 0-2 48846 NULL
+suspend_dtim_interval_write_48854 suspend_dtim_interval_write 3 48854 NULL
-+C_SYSC_pwritev64_48864 C_SYSC_pwritev64 3 48864 NULL nohasharray
-+viafb_dvp1_proc_write_48864 viafb_dvp1_proc_write 3 48864 &C_SYSC_pwritev64_48864
++viafb_dvp1_proc_write_48864 viafb_dvp1_proc_write 3 48864 NULL nohasharray
++C_SYSC_pwritev64_48864 C_SYSC_pwritev64 3 48864 &viafb_dvp1_proc_write_48864
+__ffs_ep0_read_events_48868 __ffs_ep0_read_events 3 48868 NULL
+crypto_cipher_ctxsize_48890 crypto_cipher_ctxsize 0 48890 NULL
+joydev_handle_JSIOCSAXMAP_48898 joydev_handle_JSIOCSAXMAP 3 48898 NULL
@@ -123337,28 +122792,26 @@ index 0000000..3d3508d
+event_heart_beat_read_48961 event_heart_beat_read 3 48961 NULL
+nand_ecc_test_run_48966 nand_ecc_test_run 1 48966 NULL
+vmci_handle_arr_create_48971 vmci_handle_arr_create 1 48971 NULL
-+xfs_trans_commit_48982 xfs_trans_commit 0 48982 NULL
-+gfs2_dir_add_48987 gfs2_dir_add 0 48987 NULL
++nilfs_direct_IO_48981 nilfs_direct_IO 4 48981 NULL
+rds_rm_size_48996 rds_rm_size 0-2 48996 NULL
+sel_write_enforce_48998 sel_write_enforce 3 48998 NULL
+null_alloc_rs_49019 null_alloc_rs 2 49019 NULL
+filemap_check_errors_49022 filemap_check_errors 0 49022 NULL
+transient_status_49027 transient_status 4 49027 NULL
+ll_xattr_cache_add_49032 ll_xattr_cache_add 4-0 49032 NULL
-+iwl_mvm_power_legacy_dbgfs_read_49038 iwl_mvm_power_legacy_dbgfs_read 4 49038 NULL
+scsi_register_49094 scsi_register 2 49094 NULL
+compat_do_readv_writev_49102 compat_do_readv_writev 4 49102 NULL
-+gfs2_diradd_alloc_required_49105 gfs2_diradd_alloc_required 0 49105 NULL
+xfrm_replay_state_esn_len_49119 xfrm_replay_state_esn_len 0 49119 NULL
+ll_max_cached_mb_seq_write_49122 ll_max_cached_mb_seq_write 3 49122 NULL
-+pt_read_49136 pt_read 3 49136 NULL
++pt_read_49136 pt_read 3 49136 NULL nohasharray
++netxen_setup_msi_interrupts_49136 netxen_setup_msi_interrupts 2 49136 &pt_read_49136
+ipwireless_tty_received_49154 ipwireless_tty_received 3 49154 NULL
+f2fs_acl_count_49155 f2fs_acl_count 0-1 49155 NULL
+ipw_queue_tx_init_49161 ipw_queue_tx_init 3 49161 NULL
+__jfs_setxattr_49175 __jfs_setxattr 5 49175 NULL
+ath6kl_bgscan_int_write_49178 ath6kl_bgscan_int_write 3 49178 NULL
+dvb_dvr_ioctl_49182 dvb_dvr_ioctl 2 49182 NULL
-+print_queue_49191 print_queue 4-0 49191 NULL
++print_queue_49191 print_queue 0-4 49191 NULL
+root_nfs_cat_49192 root_nfs_cat 3 49192 NULL
+iwl_dbgfs_ucode_general_stats_read_49199 iwl_dbgfs_ucode_general_stats_read 3 49199 NULL
+il4965_rs_sta_dbgfs_stats_table_read_49206 il4965_rs_sta_dbgfs_stats_table_read 3 49206 NULL
@@ -123383,7 +122836,8 @@ index 0000000..3d3508d
+compat_do_msg_fill_49440 compat_do_msg_fill 3 49440 NULL
+__hfsplus_getxattr_49460 __hfsplus_getxattr 0 49460 NULL
+agp_3_5_isochronous_node_enable_49465 agp_3_5_isochronous_node_enable 3 49465 NULL
-+xfs_iformat_local_49472 xfs_iformat_local 4-0 49472 NULL
++xfs_iformat_local_49472 xfs_iformat_local 4 49472 NULL
++tipc_bclink_get_mtu_49483 tipc_bclink_get_mtu 0 49483 NULL
+isr_decrypt_done_read_49490 isr_decrypt_done_read 3 49490 NULL
+iwl_dbgfs_disable_power_off_read_49517 iwl_dbgfs_disable_power_off_read 3 49517 NULL
+SyS_listxattr_49519 SyS_listxattr 3 49519 NULL
@@ -123392,8 +122846,6 @@ index 0000000..3d3508d
+alloc_chunk_49575 alloc_chunk 1 49575 NULL
+sctp_setsockopt_default_send_param_49578 sctp_setsockopt_default_send_param 3 49578 NULL
+readfifo_49583 readfifo 1 49583 NULL
-+gfs2_quota_lock_49587 gfs2_quota_lock 0 49587 NULL
-+evm_inode_setattr_49594 evm_inode_setattr 0 49594 NULL
+tap_write_49595 tap_write 3 49595 NULL
+isr_wakeups_read_49607 isr_wakeups_read 3 49607 NULL
+btrfs_mksubvol_49616 btrfs_mksubvol 3 49616 NULL
@@ -123401,13 +122853,13 @@ index 0000000..3d3508d
+smk_write_doi_49621 smk_write_doi 3 49621 NULL
+port_fops_read_49626 port_fops_read 3 49626 NULL
+btrfsic_cmp_log_and_dev_bytenr_49628 btrfsic_cmp_log_and_dev_bytenr 2 49628 NULL
-+xfs_ialloc_get_rec_49648 xfs_ialloc_get_rec 0 49648 NULL
-+aa_simple_write_to_buffer_49683 aa_simple_write_to_buffer 4-3 49683 NULL
++aa_simple_write_to_buffer_49683 aa_simple_write_to_buffer 3-4 49683 NULL
+SyS_pwritev_49688 SyS_pwritev 3 49688 NULL
+__copy_from_user_nocheck_49699 __copy_from_user_nocheck 0-3 49699 NULL
+cx2341x_ctrl_new_menu_49700 cx2341x_ctrl_new_menu 3 49700 NULL
+write_pool_49718 write_pool 3 49718 NULL
-+kvm_mmu_notifier_invalidate_page_49723 kvm_mmu_notifier_invalidate_page 3 49723 NULL
++kvm_mmu_notifier_invalidate_page_49723 kvm_mmu_notifier_invalidate_page 3 49723 NULL nohasharray
++sfw_create_test_rpc_49723 sfw_create_test_rpc 4 49723 &kvm_mmu_notifier_invalidate_page_49723
+sep_create_dcb_dmatables_context_kernel_49728 sep_create_dcb_dmatables_context_kernel 6 49728 NULL
+zd_usb_iowrite16v_49744 zd_usb_iowrite16v 3 49744 NULL
+btrfs_chunk_num_stripes_49751 btrfs_chunk_num_stripes 0 49751 NULL
@@ -123417,6 +122869,7 @@ index 0000000..3d3508d
+w83977af_fir_interrupt_49775 w83977af_fir_interrupt 0 49775 NULL
+ceph_osdc_readpages_49789 ceph_osdc_readpages 0 49789 NULL
+nfs4_acl_new_49806 nfs4_acl_new 1 49806 NULL
++__of_parse_phandle_with_args_49807 __of_parse_phandle_with_args 0 49807 NULL
+ntfs_copy_from_user_iovec_49829 ntfs_copy_from_user_iovec 3-6-0 49829 NULL
+add_uuid_49831 add_uuid 4 49831 NULL
+iraw_loop_49842 iraw_loop 0-1 49842 NULL
@@ -123426,16 +122879,15 @@ index 0000000..3d3508d
+fiemap_count_to_size_49869 fiemap_count_to_size 0-1 49869 NULL
+sctp_setsockopt_bindx_49870 sctp_setsockopt_bindx 3 49870 NULL
+osc_brw_49896 osc_brw 4 49896 NULL
-+config_ep_by_speed_49939 config_ep_by_speed 0 49939 NULL
-+xfs_ialloc_ag_alloc_49960 xfs_ialloc_ag_alloc 0 49960 NULL
++fuse_send_write_49915 fuse_send_write 4-0 49915 NULL
+ieee80211_if_fmt_dtim_count_49987 ieee80211_if_fmt_dtim_count 3 49987 NULL
+drm_buffer_copy_from_user_49990 drm_buffer_copy_from_user 3 49990 NULL
+l2cap_chan_send_49995 l2cap_chan_send 3 49995 NULL
+dn_mss_from_pmtu_50011 dn_mss_from_pmtu 0-2 50011 NULL
-+xfs_ialloc_inode_init_50015 xfs_ialloc_inode_init 0 50015 NULL
+security_context_to_sid_50019 security_context_to_sid 2 50019 NULL
+isdn_read_50021 isdn_read 3 50021 NULL
+mdc_rename_pack_50023 mdc_rename_pack 4-6 50023 NULL
++xlog_recovery_process_trans_50028 xlog_recovery_process_trans 4 50028 NULL
+brcmf_debugfs_chipinfo_read_50033 brcmf_debugfs_chipinfo_read 3 50033 NULL
+ioread8_50049 ioread8 0 50049 NULL
+fuse_conn_max_background_write_50061 fuse_conn_max_background_write 3 50061 NULL
@@ -123447,10 +122899,8 @@ index 0000000..3d3508d
+android_set_cntry_50100 android_set_cntry 0 50100 NULL
+read_file_slot_50111 read_file_slot 3 50111 NULL
+rx_streaming_interval_write_50120 rx_streaming_interval_write 3 50120 NULL
-+jfs_direct_IO_50125 jfs_direct_IO 4 50125 NULL
+SYSC_preadv_50134 SYSC_preadv 3 50134 NULL
+tx_frag_need_fragmentation_read_50153 tx_frag_need_fragmentation_read 3 50153 NULL
-+xfs_bwrite_50154 xfs_bwrite 0 50154 NULL
+kmalloc_node_50163 kmalloc_node 1 50163 NULL
+rx_filter_ibss_filter_read_50167 rx_filter_ibss_filter_read 3 50167 NULL
+ahd_probe_stack_size_50168 ahd_probe_stack_size 0 50168 NULL
@@ -123460,7 +122910,6 @@ index 0000000..3d3508d
+cfg80211_roamed_bss_50198 cfg80211_roamed_bss 4-6 50198 NULL
+cyttsp4_probe_50201 cyttsp4_probe 4 50201 NULL
+rx_rx_timeout_wa_read_50204 rx_rx_timeout_wa_read 3 50204 NULL
-+mthca_buddy_init_50206 mthca_buddy_init 2 50206 NULL
+l2cap_sock_setsockopt_50207 l2cap_sock_setsockopt 5 50207 NULL
+mon_bin_compat_ioctl_50234 mon_bin_compat_ioctl 3 50234 NULL
+sg_kmalloc_50240 sg_kmalloc 1 50240 NULL
@@ -123482,19 +122931,15 @@ index 0000000..3d3508d
+l2tp_ip_sendmsg_50411 l2tp_ip_sendmsg 4 50411 NULL
+iscsi_create_conn_50425 iscsi_create_conn 2 50425 NULL
+validate_acl_mac_addrs_50429 validate_acl_mac_addrs 0 50429 NULL
-+xfs_alloc_update_counters_50441 xfs_alloc_update_counters 0 50441 NULL
+btrfs_error_discard_extent_50444 btrfs_error_discard_extent 2 50444 NULL
+pgctrl_write_50453 pgctrl_write 3 50453 NULL
+device_create_sys_dev_entry_50458 device_create_sys_dev_entry 0 50458 NULL
+cfs_size_round_50472 cfs_size_round 0-1 50472 NULL
+cdrom_read_cdda_50478 cdrom_read_cdda 4 50478 NULL
-+xfs_iformat_extents_50486 xfs_iformat_extents 0 50486 NULL
-+gfs2_block_map_50492 gfs2_block_map 0 50492 NULL
+mei_io_cb_alloc_req_buf_50493 mei_io_cb_alloc_req_buf 2 50493 NULL
+pwr_rcvd_awake_beacons_read_50505 pwr_rcvd_awake_beacons_read 3 50505 NULL
+ath6kl_set_ap_probe_resp_ies_50539 ath6kl_set_ap_probe_resp_ies 3 50539 NULL
-+bh_get_50543 bh_get 0 50543 NULL
-+gfs2_meta_inode_buffer_50544 gfs2_meta_inode_buffer 0 50544 NULL
++trigger_request_store_50548 trigger_request_store 4 50548 NULL
+usbat_flash_write_data_50553 usbat_flash_write_data 4 50553 NULL
+fat_readpages_50582 fat_readpages 4 50582 NULL
+iwl_dbgfs_missed_beacon_read_50584 iwl_dbgfs_missed_beacon_read 3 50584 NULL
@@ -123502,7 +122947,6 @@ index 0000000..3d3508d
+rx_rx_checksum_result_read_50617 rx_rx_checksum_result_read 3 50617 NULL
+sparse_early_usemaps_alloc_node_50623 sparse_early_usemaps_alloc_node 4 50623 NULL
+simple_transaction_get_50633 simple_transaction_get 3 50633 NULL
-+gfs2_unstuff_dinode_50644 gfs2_unstuff_dinode 0 50644 NULL
+ath6kl_tm_rx_event_50664 ath6kl_tm_rx_event 3 50664 NULL
+bnad_debugfs_read_50665 bnad_debugfs_read 3 50665 NULL
+prism2_read_fid_reg_50689 prism2_read_fid_reg 0 50689 NULL
@@ -123512,7 +122956,6 @@ index 0000000..3d3508d
+__ext3_get_inode_loc_50744 __ext3_get_inode_loc 0 50744 NULL
+ocfs2_xattr_block_get_50773 ocfs2_xattr_block_get 0 50773 NULL
+tm6000_read_write_usb_50774 tm6000_read_write_usb 7 50774 NULL
-+bio_alloc_map_data_50782 bio_alloc_map_data 2 50782 NULL
+tpm_write_50798 tpm_write 3 50798 NULL
+tun_do_read_50800 tun_do_read 4 50800 NULL
+write_flush_50803 write_flush 3 50803 NULL
@@ -123520,12 +122963,12 @@ index 0000000..3d3508d
+btrfs_stack_file_extent_disk_num_bytes_50825 btrfs_stack_file_extent_disk_num_bytes 0 50825 NULL
+dpcm_show_state_50827 dpcm_show_state 0 50827 NULL
+SetArea_50835 SetArea 4 50835 NULL
++nft_trans_alloc_50836 nft_trans_alloc 3 50836 NULL
+videobuf_dma_init_user_50839 videobuf_dma_init_user 4-3 50839 NULL
+carl9170_debugfs_write_50857 carl9170_debugfs_write 3 50857 NULL
+SyS_lgetxattr_50889 SyS_lgetxattr 4 50889 NULL
+netlbl_secattr_catmap_walk_rng_50894 netlbl_secattr_catmap_walk_rng 0-2 50894 NULL
+__bdev_writeseg_50903 __bdev_writeseg 4 50903 NULL
-+xfs_alloc_get_freelist_50906 xfs_alloc_get_freelist 0 50906 NULL
+xfs_iext_remove_50909 xfs_iext_remove 3 50909 NULL
+blk_rq_cur_sectors_50910 blk_rq_cur_sectors 0 50910 NULL
+hash_recvmsg_50924 hash_recvmsg 4 50924 NULL
@@ -123535,6 +122978,7 @@ index 0000000..3d3508d
+virtio_cread16_50951 virtio_cread16 0 50951 NULL
+sdio_uart_write_50954 sdio_uart_write 3 50954 NULL
+SyS_setxattr_50957 SyS_setxattr 4 50957 NULL
++of_modalias_node_50975 of_modalias_node 3 50975 NULL
+iwl_statistics_flag_50981 iwl_statistics_flag 0-3 50981 NULL
+timeout_write_50991 timeout_write 3 50991 NULL
+proc_write_51003 proc_write 3 51003 NULL
@@ -123547,16 +122991,19 @@ index 0000000..3d3508d
+srpt_alloc_ioctx_51042 srpt_alloc_ioctx 2-3 51042 NULL
+do_arpt_set_ctl_51053 do_arpt_set_ctl 4 51053 NULL
+wusb_prf_64_51065 wusb_prf_64 7 51065 NULL
++rsc_mgr_init_51067 rsc_mgr_init 3 51067 NULL
+jbd2_journal_init_revoke_51088 jbd2_journal_init_revoke 2 51088 NULL
++__ipv4_tun_to_nlattr_51095 __ipv4_tun_to_nlattr 4 51095 NULL
+__ocfs2_find_path_51096 __ocfs2_find_path 0 51096 NULL
+ti_recv_51110 ti_recv 3 51110 NULL
+alloc_rtllib_51136 alloc_rtllib 1 51136 NULL
+simple_xattr_set_51140 simple_xattr_set 4 51140 NULL
+xfs_trans_get_efd_51148 xfs_trans_get_efd 3 51148 NULL
++i40evf_acquire_msix_vectors_51190 i40evf_acquire_msix_vectors 2 51190 NULL
++iwl_dbgfs_bcast_filters_macs_read_51231 iwl_dbgfs_bcast_filters_macs_read 3 51231 NULL
+nf_ct_ext_create_51232 nf_ct_ext_create 3 51232 NULL
+snd_pcm_write_51235 snd_pcm_write 3 51235 NULL
+drm_property_create_51239 drm_property_create 4 51239 NULL
-+__mxt_read_reg_51249 __mxt_read_reg 0 51249 NULL
+st_read_51251 st_read 3 51251 NULL
+compat_dccp_setsockopt_51263 compat_dccp_setsockopt 5 51263 NULL
+target_alloc_sgl_51264 target_alloc_sgl 3 51264 NULL
@@ -123567,6 +123014,7 @@ index 0000000..3d3508d
+init_map_ipmac_51317 init_map_ipmac 5 51317 NULL
+alloc_hippi_dev_51320 alloc_hippi_dev 1 51320 NULL
+ext2_xattr_get_51327 ext2_xattr_get 0 51327 NULL
++smk_write_ptrace_51333 smk_write_ptrace 3 51333 NULL
+alloc_smp_req_51337 alloc_smp_req 1 51337 NULL
+ipw_get_event_log_len_51341 ipw_get_event_log_len 0 51341 NULL
+ieee80211_if_fmt_estab_plinks_51370 ieee80211_if_fmt_estab_plinks 3 51370 NULL
@@ -123574,11 +123022,12 @@ index 0000000..3d3508d
+blk_register_region_51424 blk_register_region 1-2 51424 NULL
+mwifiex_rdeeprom_read_51429 mwifiex_rdeeprom_read 3 51429 NULL
+hfsplus_brec_read_51436 hfsplus_brec_read 0 51436 NULL
-+xfs_mod_incore_sb_unlocked_51439 xfs_mod_incore_sb_unlocked 0 51439 NULL
+ieee80211_if_read_dot11MeshHWMPRootMode_51441 ieee80211_if_read_dot11MeshHWMPRootMode 3 51441 NULL
+print_devstats_dot11ACKFailureCount_51443 print_devstats_dot11ACKFailureCount 3 51443 NULL
++vmxnet3_acquire_msix_vectors_51462 vmxnet3_acquire_msix_vectors 2 51462 NULL
+____alloc_ei_netdev_51475 ____alloc_ei_netdev 1 51475 NULL
+xfs_buf_get_uncached_51477 xfs_buf_get_uncached 2 51477 NULL
++osc_brw_internal_51489 osc_brw_internal 5 51489 NULL
+kvm_fetch_guest_virt_51493 kvm_fetch_guest_virt 4-2 51493 NULL
+ieee80211_if_write_uapsd_queues_51526 ieee80211_if_write_uapsd_queues 3 51526 NULL
+__alloc_eip_netdev_51549 __alloc_eip_netdev 1 51549 NULL
@@ -123589,19 +123038,21 @@ index 0000000..3d3508d
+extent_fiemap_51621 extent_fiemap 3 51621 NULL
+sctp_auth_create_key_51641 sctp_auth_create_key 1 51641 NULL
+iscsi_create_session_51647 iscsi_create_session 3 51647 NULL
-+xfs_iformat_btree_51651 xfs_iformat_btree 0 51651 NULL
+ps_upsd_utilization_read_51669 ps_upsd_utilization_read 3 51669 NULL
+sctp_setsockopt_associnfo_51684 sctp_setsockopt_associnfo 3 51684 NULL
++rtw_os_xmit_resource_alloc23a_51693 rtw_os_xmit_resource_alloc23a 3 51693 NULL
+host_mapping_level_51696 host_mapping_level 0 51696 NULL
+sel_write_access_51704 sel_write_access 3 51704 NULL
+tty_cdev_add_51714 tty_cdev_add 2-4 51714 NULL
+v9fs_alloc_rdir_buf_51716 v9fs_alloc_rdir_buf 2 51716 NULL
+drm_compat_ioctl_51717 drm_compat_ioctl 2 51717 NULL
+sg_read_oxfer_51724 sg_read_oxfer 3 51724 NULL
++str_read_51731 str_read 4 51731 NULL
+cm4040_read_51732 cm4040_read 3 51732 NULL
+get_user_pages_fast_51751 get_user_pages_fast 0 51751 NULL
+ifx_spi_insert_flip_string_51752 ifx_spi_insert_flip_string 3 51752 NULL
+if_write_51756 if_write 3 51756 NULL
++ssd1307fb_alloc_array_51788 ssd1307fb_alloc_array 1 51788 NULL
+qib_alloc_devdata_51819 qib_alloc_devdata 2 51819 NULL
+buffer_from_user_51826 buffer_from_user 3 51826 NULL
+ioread32_51847 ioread32 0 51847 NULL nohasharray
@@ -123619,10 +123070,9 @@ index 0000000..3d3508d
+__tcp_mtu_to_mss_51938 __tcp_mtu_to_mss 0-2 51938 NULL
+xfrm_alg_len_51940 xfrm_alg_len 0 51940 NULL
+scsi_get_vpd_page_51951 scsi_get_vpd_page 4 51951 NULL
++get_clock_info_51952 get_clock_info 4 51952 NULL
+snd_mask_min_51969 snd_mask_min 0 51969 NULL
-+__blkdev_get_51972 __blkdev_get 0 51972 NULL
+get_zone_51981 get_zone 0-1 51981 NULL
-+cifs_strict_writev_51984 cifs_strict_writev 4 51984 NULL
+ath6kl_sdio_alloc_prep_scat_req_51986 ath6kl_sdio_alloc_prep_scat_req 2 51986 NULL
+_c4iw_write_mem_dma_51991 _c4iw_write_mem_dma 3 51991 NULL
+dwc3_mode_write_51997 dwc3_mode_write 3 51997 NULL
@@ -123637,38 +123087,37 @@ index 0000000..3d3508d
+isofs_readpages_52067 isofs_readpages 4 52067 NULL
+mxuport_process_read_urb_data_52072 mxuport_process_read_urb_data 3 52072 NULL
+nsm_get_handle_52089 nsm_get_handle 4 52089 NULL
-+ulist_add_merge_52096 ulist_add_merge 0 52096 NULL
+o2net_debug_read_52105 o2net_debug_read 3 52105 NULL
+smsdvb_stats_read_52114 smsdvb_stats_read 3 52114 NULL
+split_scan_timeout_write_52128 split_scan_timeout_write 3 52128 NULL
+retry_count_read_52129 retry_count_read 3 52129 NULL
-+xfs_btree_change_owner_52137 xfs_btree_change_owner 0 52137 NULL
+gdm_usb_hci_send_52138 gdm_usb_hci_send 3 52138 NULL
+sub_alloc_52140 sub_alloc 0 52140 NULL
+hysdn_conf_write_52145 hysdn_conf_write 3 52145 NULL
+htable_size_52148 htable_size 0-1 52148 NULL
-+gfs2_rs_alloc_52152 gfs2_rs_alloc 0 52152 NULL
+smk_write_load2_52155 smk_write_load2 3 52155 NULL
++tipc_node_get_mtu_52157 tipc_node_get_mtu 0 52157 NULL
+ieee80211_if_read_dot11MeshRetryTimeout_52168 ieee80211_if_read_dot11MeshRetryTimeout 3 52168 NULL
+mga_compat_ioctl_52170 mga_compat_ioctl 2 52170 NULL
+print_prefix_52176 print_prefix 0 52176 NULL
+proc_pid_readlink_52186 proc_pid_readlink 3 52186 NULL
+reiserfs_posix_acl_from_disk_52191 reiserfs_posix_acl_from_disk 2 52191 NULL
++f2fs_seek_block_52194 f2fs_seek_block 2 52194 NULL
+vmci_qp_broker_alloc_52216 vmci_qp_broker_alloc 6-5 52216 NULL
-+fuse_request_alloc_52243 fuse_request_alloc 1 52243 NULL nohasharray
-+xfs_iomap_eof_align_last_fsb_52243 xfs_iomap_eof_align_last_fsb 0 52243 &fuse_request_alloc_52243
++fuse_request_alloc_52243 fuse_request_alloc 1 52243 NULL
+mdiobus_alloc_size_52259 mdiobus_alloc_size 1 52259 NULL
+shrink_slab_52261 shrink_slab 2 52261 NULL
++ext2_direct_IO_52270 ext2_direct_IO 4 52270 NULL
+sisusbcon_do_font_op_52271 sisusbcon_do_font_op 9 52271 NULL
+handle_supp_msgs_52284 handle_supp_msgs 4 52284 NULL
+kobject_set_name_vargs_52309 kobject_set_name_vargs 0 52309 NULL
+read_file_reset_52310 read_file_reset 3 52310 NULL
++ssd1307fb_write_52315 ssd1307fb_write 3 52315 NULL
+request_asymmetric_key_52317 request_asymmetric_key 2-4 52317 NULL
+hwflags_read_52318 hwflags_read 3 52318 NULL
+test_unaligned_bulk_52333 test_unaligned_bulk 3 52333 NULL
+hur_len_52339 hur_len 0 52339 NULL
-+bytes_to_frames_52362 bytes_to_frames 0-2 52362 NULL nohasharray
-+cap_inode_killpriv_52362 cap_inode_killpriv 0 52362 &bytes_to_frames_52362
++bytes_to_frames_52362 bytes_to_frames 0-2 52362 NULL
+copy_entries_to_user_52367 copy_entries_to_user 1 52367 NULL
+iwl_dump_fh_52371 iwl_dump_fh 0 52371 NULL
+hfsplus_find_attr_52374 hfsplus_find_attr 0 52374 NULL
@@ -123676,29 +123125,26 @@ index 0000000..3d3508d
+isdn_writebuf_stub_52383 isdn_writebuf_stub 4 52383 NULL
+jfs_setxattr_52389 jfs_setxattr 4 52389 NULL
+aer_inject_write_52399 aer_inject_write 3 52399 NULL
-+cgroup_file_write_52417 cgroup_file_write 3 52417 NULL
+line6_midibuf_init_52425 line6_midibuf_init 2 52425 NULL
+hso_serial_common_create_52428 hso_serial_common_create 4 52428 NULL
+delay_status_52431 delay_status 5 52431 NULL
+ath6kl_delete_qos_write_52435 ath6kl_delete_qos_write 3 52435 NULL
+ieee80211_if_fmt_num_sta_ps_52438 ieee80211_if_fmt_num_sta_ps 3 52438 NULL
-+acpi_nvs_for_each_region_52448 acpi_nvs_for_each_region 0 52448 NULL
+alauda_read_data_52452 alauda_read_data 3 52452 NULL
++bt_alloc_52457 bt_alloc 2 52457 NULL
+ieee80211_alloc_txb_52477 ieee80211_alloc_txb 1 52477 NULL
+usb_tranzport_write_52479 usb_tranzport_write 3 52479 NULL
+ocfs2_extend_no_holes_52483 ocfs2_extend_no_holes 3-4 52483 NULL
+fd_do_rw_52495 fd_do_rw 3 52495 NULL
+int_tasklet_entry_52500 int_tasklet_entry 3 52500 NULL
-+xfs_alloc_get_rec_52502 xfs_alloc_get_rec 0 52502 NULL
+lmv_get_easize_52504 lmv_get_easize 0 52504 NULL
+pm_qos_power_write_52513 pm_qos_power_write 3 52513 NULL
+bt_sock_stream_recvmsg_52518 bt_sock_stream_recvmsg 4 52518 NULL
+dup_variable_bug_52525 dup_variable_bug 3 52525 NULL
+raw_recvmsg_52529 raw_recvmsg 4 52529 NULL
++SyS_vmsplice_52540 SyS_vmsplice 3 52540 NULL
+dccpprobe_read_52549 dccpprobe_read 3 52549 NULL
-+ntfs_prepare_pages_for_non_resident_write_52556 ntfs_prepare_pages_for_non_resident_write 0 52556 NULL
+debug_level_proc_write_52572 debug_level_proc_write 3 52572 NULL
-+kernfs_setattr_52583 kernfs_setattr 0 52583 NULL
+isku_sysfs_read_macro_52587 isku_sysfs_read_macro 6 52587 NULL
+SyS_setsockopt_52610 SyS_setsockopt 5 52610 NULL
+ll_sa_entry_alloc_52611 ll_sa_entry_alloc 4 52611 NULL
@@ -123716,6 +123162,7 @@ index 0000000..3d3508d
+carl9170_debugfs_vif_dump_read_52755 carl9170_debugfs_vif_dump_read 3 52755 NULL
+ieee80211_if_read_beacon_timeout_52756 ieee80211_if_read_beacon_timeout 3 52756 NULL
+nvme_trans_ext_inq_page_52776 nvme_trans_ext_inq_page 3 52776 NULL
++xenvif_write_io_ring_52802 xenvif_write_io_ring 3 52802 NULL
+pwr_rcvd_beacons_read_52836 pwr_rcvd_beacons_read 3 52836 NULL
+lb_alloc_ep_req_52837 lb_alloc_ep_req 2 52837 NULL
+mon_bin_get_event_52863 mon_bin_get_event 4-6 52863 NULL
@@ -123725,45 +123172,46 @@ index 0000000..3d3508d
+pvr2_ctrl_value_to_sym_internal_52881 pvr2_ctrl_value_to_sym_internal 5 52881 NULL
+cache_read_procfs_52882 cache_read_procfs 3 52882 NULL
+kvm_kvzalloc_52894 kvm_kvzalloc 1 52894 NULL
++copy_from_iter_bvec_52912 copy_from_iter_bvec 0-2 52912 NULL
+dio_bio_reap_52913 dio_bio_reap 0 52913 NULL
+__kfifo_out_peek_r_52919 __kfifo_out_peek_r 3 52919 NULL
+iblock_get_bio_52936 iblock_get_bio 3 52936 NULL
+__nodes_remap_52951 __nodes_remap 5 52951 NULL
-+send_packet_52960 send_packet 4 52960 NULL
+ieee80211_if_fmt_fwded_mcast_52961 ieee80211_if_fmt_fwded_mcast 3 52961 NULL
+tx_tx_exch_read_52986 tx_tx_exch_read 3 52986 NULL
+num_node_state_52989 num_node_state 0 52989 NULL
++efivarfs_file_write_53000 efivarfs_file_write 3 53000 NULL
+btrfs_free_and_pin_reserved_extent_53016 btrfs_free_and_pin_reserved_extent 2 53016 NULL
+tx_tx_exch_pending_read_53018 tx_tx_exch_pending_read 3 53018 NULL
-+xfs_rtfree_extent_53024 xfs_rtfree_extent 0 53024 NULL
+bio_cur_bytes_53037 bio_cur_bytes 0 53037 NULL
++nv50_chan_create_53039 nv50_chan_create 5 53039 NULL
+regcache_lzo_block_count_53056 regcache_lzo_block_count 0 53056 NULL
++fimc_get_alpha_mask_53057 fimc_get_alpha_mask 0 53057 NULL
+cfi_read_query_53066 cfi_read_query 0 53066 NULL
+iwl_dbgfs_interrupt_write_53069 iwl_dbgfs_interrupt_write 3 53069 NULL
+mwifiex_debug_read_53074 mwifiex_debug_read 3 53074 NULL
+mic_virtio_copy_from_user_53107 mic_virtio_copy_from_user 3 53107 NULL
++ath10k_mac_create_53118 ath10k_mac_create 1 53118 NULL
+verity_status_53120 verity_status 5 53120 NULL
+brcmf_usb_dl_cmd_53130 brcmf_usb_dl_cmd 4 53130 NULL
-+inode_newsize_ok_53140 inode_newsize_ok 0 53140 NULL nohasharray
-+ps_poll_ps_poll_max_ap_turn_read_53140 ps_poll_ps_poll_max_ap_turn_read 3 53140 &inode_newsize_ok_53140
++ps_poll_ps_poll_max_ap_turn_read_53140 ps_poll_ps_poll_max_ap_turn_read 3 53140 NULL
++copy_user_segment_list_53150 copy_user_segment_list 2 53150 NULL
+ieee80211_bss_info_update_53170 ieee80211_bss_info_update 4 53170 NULL
+btrfs_io_bio_alloc_53179 btrfs_io_bio_alloc 2 53179 NULL
-+find_good_lh_53183 find_good_lh 0 53183 NULL
+clear_capture_buf_53192 clear_capture_buf 2 53192 NULL
-+xfs_btree_updkey_53195 xfs_btree_updkey 0 53195 NULL
+tx_tx_start_data_read_53219 tx_tx_start_data_read 3 53219 NULL
+ptlrpc_lprocfs_req_history_max_seq_write_53243 ptlrpc_lprocfs_req_history_max_seq_write 3 53243 NULL
-+xfs_trans_read_buf_map_53258 xfs_trans_read_buf_map 5-0 53258 NULL
++xfs_trans_read_buf_map_53258 xfs_trans_read_buf_map 5 53258 NULL
+wil_write_file_ssid_53266 wil_write_file_ssid 3 53266 NULL
+btrfs_file_extent_num_bytes_53269 btrfs_file_extent_num_bytes 0 53269 NULL
++f2fs_fiemap_53310 f2fs_fiemap 4 53310 NULL
+ftrace_profile_write_53327 ftrace_profile_write 3 53327 NULL
+find_nr_power_limit_53330 find_nr_power_limit 0 53330 NULL
+gsm_control_reply_53333 gsm_control_reply 4 53333 NULL
+btree_keys_bytes_53348 btree_keys_bytes 0 53348 NULL
-+read_6120_creg32_53363 read_6120_creg32 0 53363 NULL
+sock_setbindtodevice_53369 sock_setbindtodevice 3 53369 NULL
+get_random_bytes_arch_53370 get_random_bytes_arch 2 53370 NULL
-+xfs_imap_53389 xfs_imap 0 53389 NULL
++test_fw_misc_read_53384 test_fw_misc_read 3 53384 NULL
+isr_cmd_cmplt_read_53439 isr_cmd_cmplt_read 3 53439 NULL
+mwifiex_info_read_53447 mwifiex_info_read 3 53447 NULL
+apei_exec_run_optional_53452 apei_exec_run_optional 0 53452 NULL
@@ -123775,15 +123223,15 @@ index 0000000..3d3508d
+do_verify_xattr_datum_53499 do_verify_xattr_datum 0 53499 NULL
+snd_pcm_format_physical_width_53505 snd_pcm_format_physical_width 0 53505 NULL
+dbAllocNext_53506 dbAllocNext 0 53506 NULL
-+check_acl_53512 check_acl 0 53512 NULL
-+ll_xattr_cache_update_53515 ll_xattr_cache_update 4 53515 NULL
++check_acl_53512 check_acl 0 53512 NULL nohasharray
++force_sc_support_write_53512 force_sc_support_write 3 53512 &check_acl_53512
+nft_data_dump_53549 nft_data_dump 5 53549 NULL
+SYSC_bind_53582 SYSC_bind 3 53582 NULL
+cifs_utf16_bytes_53593 cifs_utf16_bytes 0 53593 NULL
+proc_uid_map_write_53596 proc_uid_map_write 3 53596 NULL
+pfkey_recvmsg_53604 pfkey_recvmsg 4 53604 NULL
-+___alloc_bootmem_nopanic_53626 ___alloc_bootmem_nopanic 1 53626 NULL
-+xd_write_multiple_pages_53633 xd_write_multiple_pages 6-5 53633 NULL
++___alloc_bootmem_nopanic_53626 ___alloc_bootmem_nopanic 1 53626 NULL nohasharray
++wil_write_file_txmgmt_53626 wil_write_file_txmgmt 3 53626 &___alloc_bootmem_nopanic_53626
+ccid_getsockopt_builtin_ccids_53634 ccid_getsockopt_builtin_ccids 2 53634 NULL
+nr_sendmsg_53656 nr_sendmsg 4 53656 NULL
+fuse_fill_write_pages_53682 fuse_fill_write_pages 0-4 53682 NULL
@@ -123793,8 +123241,7 @@ index 0000000..3d3508d
+find_overflow_devnum_53711 find_overflow_devnum 0 53711 NULL
+__proc_debug_mb_53732 __proc_debug_mb 5 53732 NULL
+wdm_write_53735 wdm_write 3 53735 NULL
-+amdtp_out_stream_get_max_payload_53755 amdtp_out_stream_get_max_payload 0 53755 NULL nohasharray
-+lpfc_idiag_queacc_read_qe_53755 lpfc_idiag_queacc_read_qe 0-2 53755 &amdtp_out_stream_get_max_payload_53755
++lpfc_idiag_queacc_read_qe_53755 lpfc_idiag_queacc_read_qe 0-2 53755 NULL
+wa_populate_buf_in_urb_53758 wa_populate_buf_in_urb 3-4 53758 NULL
+ext2_acl_count_53773 ext2_acl_count 0-1 53773 NULL
+__kfifo_dma_in_prepare_r_53792 __kfifo_dma_in_prepare_r 4-5 53792 NULL
@@ -123803,13 +123250,13 @@ index 0000000..3d3508d
+lpfc_idiag_ctlacc_read_reg_53809 lpfc_idiag_ctlacc_read_reg 0-3 53809 NULL
+nls_nullsize_53815 nls_nullsize 0 53815 NULL
+setup_data_read_53822 setup_data_read 3 53822 NULL
-+pms_read_53873 pms_read 3 53873 NULL
++btrfs_free_reserved_extent_53873 btrfs_free_reserved_extent 2 53873 NULL nohasharray
++pms_read_53873 pms_read 3 53873 &btrfs_free_reserved_extent_53873
+ieee80211_if_fmt_dropped_frames_congestion_53883 ieee80211_if_fmt_dropped_frames_congestion 3 53883 NULL
+SyS_setgroups_53900 SyS_setgroups 1 53900 NULL
-+posix_acl_chmod_53904 posix_acl_chmod 0 53904 NULL
+batadv_tt_tvlv_ogm_handler_v1_53909 batadv_tt_tvlv_ogm_handler_v1 5 53909 NULL
++azx_via_get_position_53916 azx_via_get_position 0 53916 NULL
+usb_serial_generic_write_53927 usb_serial_generic_write 4 53927 NULL
-+ocfs2_make_clusters_writable_53938 ocfs2_make_clusters_writable 0 53938 NULL
+idetape_chrdev_write_53976 idetape_chrdev_write 3 53976 NULL
+__ocfs2_xattr_set_value_outside_53981 __ocfs2_xattr_set_value_outside 5 53981 NULL
+ieee80211_if_fmt_dot11MeshHWMPperrMinInterval_53998 ieee80211_if_fmt_dot11MeshHWMPperrMinInterval 3 53998 NULL
@@ -123821,10 +123268,9 @@ index 0000000..3d3508d
+pipeline_dec_packet_out_read_54052 pipeline_dec_packet_out_read 3 54052 NULL
+nl80211_send_disconnected_54056 nl80211_send_disconnected 5 54056 NULL
+rproc_state_read_54057 rproc_state_read 3 54057 NULL
-+_malloc_54077 _malloc 1 54077 NULL
+bitmap_bitremap_54096 bitmap_bitremap 4 54096 NULL
+altera_set_ir_pre_54103 altera_set_ir_pre 2 54103 NULL nohasharray
-+lustre_posix_acl_xattr_filter_54103 lustre_posix_acl_xattr_filter 2-0 54103 &altera_set_ir_pre_54103
++lustre_posix_acl_xattr_filter_54103 lustre_posix_acl_xattr_filter 2 54103 &altera_set_ir_pre_54103
+__comedi_buf_write_alloc_54112 __comedi_buf_write_alloc 0-2 54112 NULL
+strn_len_54122 strn_len 0 54122 NULL
+isku_receive_54130 isku_receive 4 54130 NULL
@@ -123836,33 +123282,38 @@ index 0000000..3d3508d
+do_sys_poll_54221 do_sys_poll 2 54221 NULL
+__register_chrdev_54223 __register_chrdev 2-3 54223 NULL
+pi_read_regr_54231 pi_read_regr 0 54231 NULL
++mcp23s08_read_regs_54246 mcp23s08_read_regs 4 54246 NULL
+reada_add_block_54247 reada_add_block 2 54247 NULL
++write_file_spec_scan_ctl_54248 write_file_spec_scan_ctl 3 54248 NULL
+xfs_dir2_sf_addname_hard_54254 xfs_dir2_sf_addname_hard 3 54254 NULL
+ceph_msgpool_get_54258 ceph_msgpool_get 2 54258 NULL
+audio_write_54261 audio_write 4 54261 NULL nohasharray
+wusb_prf_54261 wusb_prf 7 54261 &audio_write_54261
+mwifiex_getlog_read_54269 mwifiex_getlog_read 3 54269 NULL
+kstrtou16_from_user_54274 kstrtou16_from_user 2 54274 NULL
-+tipc_multicast_54285 tipc_multicast 4 54285 NULL
++sizeof_long_54276 sizeof_long 0 54276 NULL
+altera_set_dr_post_54291 altera_set_dr_post 2 54291 NULL
+dlm_alloc_pagevec_54296 dlm_alloc_pagevec 1 54296 NULL
+reclaim_pages_54301 reclaim_pages 3 54301 NULL
+sprintf_54306 sprintf 0 54306 NULL
++path_setxattr_54308 path_setxattr 4 54308 NULL
+bio_add_pc_page_54319 bio_add_pc_page 4 54319 NULL
+br_fdb_fillbuf_54339 br_fdb_fillbuf 0 54339 NULL
+__alloc_dev_table_54343 __alloc_dev_table 2 54343 NULL
+__get_free_pages_54352 __get_free_pages 0 54352 NULL
++readlink_copy_54366 readlink_copy 2 54366 NULL
+read_file_credit_dist_stats_54367 read_file_credit_dist_stats 3 54367 NULL
-+vfs_readlink_54368 vfs_readlink 3 54368 NULL
-+do_dccp_setsockopt_54377 do_dccp_setsockopt 5 54377 NULL nohasharray
-+intel_sdvo_write_cmd_54377 intel_sdvo_write_cmd 4 54377 &do_dccp_setsockopt_54377
++intel_sdvo_write_cmd_54377 intel_sdvo_write_cmd 4 54377 NULL nohasharray
++do_dccp_setsockopt_54377 do_dccp_setsockopt 5 54377 &intel_sdvo_write_cmd_54377
+ah_alloc_tmp_54378 ah_alloc_tmp 3-2 54378 NULL
-+snd_pcm_oss_read2_54387 snd_pcm_oss_read2 3-0 54387 NULL
-+iwl_dbgfs_power_save_status_read_54392 iwl_dbgfs_power_save_status_read 3 54392 NULL
++snd_pcm_oss_read2_54387 snd_pcm_oss_read2 0-3 54387 NULL
++iwl_dbgfs_power_save_status_read_54392 iwl_dbgfs_power_save_status_read 3 54392 NULL nohasharray
++hash_mac4_expire_54392 hash_mac4_expire 4 54392 &iwl_dbgfs_power_save_status_read_54392
+ll_ra_count_get_54410 ll_ra_count_get 3 54410 NULL
+copy_gadget_strings_54417 copy_gadget_strings 2-3 54417 NULL
+sparse_early_mem_maps_alloc_node_54485 sparse_early_mem_maps_alloc_node 4 54485 NULL
+simple_strtoull_54493 simple_strtoull 0 54493 NULL
++l2cap_create_basic_pdu_54508 l2cap_create_basic_pdu 3 54508 NULL
+btrfs_ordered_sum_size_54509 btrfs_ordered_sum_size 0-2 54509 NULL
+rfc4106_set_key_54519 rfc4106_set_key 3 54519 NULL
+vmci_transport_dgram_enqueue_54525 vmci_transport_dgram_enqueue 4 54525 NULL
@@ -123876,32 +123327,33 @@ index 0000000..3d3508d
+nvme_npages_54601 nvme_npages 0-1 54601 NULL
+irq_pkt_threshold_write_54605 irq_pkt_threshold_write 3 54605 NULL
+port_fops_write_54627 port_fops_write 3 54627 NULL
++tipc_send_stream_54648 tipc_send_stream 4 54648 NULL
+irq_timeout_read_54653 irq_timeout_read 3 54653 NULL
+dns_resolver_read_54658 dns_resolver_read 3 54658 NULL
+twl6030_interrupt_mask_54659 twl6030_interrupt_mask 2 54659 NULL
++simple_alloc_urb_54661 simple_alloc_urb 3 54661 NULL
+tdp_page_fault_54663 tdp_page_fault 2 54663 NULL
+bus_add_device_54665 bus_add_device 0 54665 NULL
+cw1200_queue_stats_init_54670 cw1200_queue_stats_init 2 54670 NULL
+bio_kmalloc_54672 bio_kmalloc 2 54672 NULL
+evm_read_key_54674 evm_read_key 3 54674 NULL
-+tipc_link_send_sections_fast_54689 tipc_link_send_sections_fast 3 54689 NULL
-+__btrfs_inc_extent_ref_54706 __btrfs_inc_extent_ref 7 54706 NULL
++jfs_direct_IO_54687 jfs_direct_IO 4 54687 NULL
+rfkill_fop_read_54711 rfkill_fop_read 3 54711 NULL
+ocfs2_control_write_54737 ocfs2_control_write 3 54737 NULL
+kzalloc_54740 kzalloc 1 54740 NULL
+wep_iv_read_54744 wep_iv_read 3 54744 NULL
+lpfc_idiag_pcicfg_write_54749 lpfc_idiag_pcicfg_write 3 54749 NULL
++crystalhd_user_data_54754 crystalhd_user_data 3 54754 NULL
+iio_event_chrdev_read_54757 iio_event_chrdev_read 3 54757 NULL
+adis16480_show_firmware_date_54762 adis16480_show_firmware_date 3 54762 NULL
+ldsem_atomic_update_54774 ldsem_atomic_update 1 54774 NULL
-+xfs_rtallocate_extent_block_54791 xfs_rtallocate_extent_block 0 54791 NULL
+flexcop_device_kmalloc_54793 flexcop_device_kmalloc 1 54793 NULL
+nfsd_write_54809 nfsd_write 6 54809 NULL
+ar9287_dump_modal_eeprom_54814 ar9287_dump_modal_eeprom 3-2 54814 NULL
-+crypto_tfm_ctx_alignment_54815 crypto_tfm_ctx_alignment 0 54815 NULL nohasharray
-+kvzalloc_54815 kvzalloc 1 54815 &crypto_tfm_ctx_alignment_54815 nohasharray
-+aes_decrypt_fail_read_54815 aes_decrypt_fail_read 3 54815 &kvzalloc_54815
-+generic_perform_write_54832 generic_perform_write 3-0 54832 NULL
++kvzalloc_54815 kvzalloc 1 54815 NULL nohasharray
++crypto_tfm_ctx_alignment_54815 crypto_tfm_ctx_alignment 0 54815 &kvzalloc_54815 nohasharray
++aes_decrypt_fail_read_54815 aes_decrypt_fail_read 3 54815 &crypto_tfm_ctx_alignment_54815
++generic_perform_write_54832 generic_perform_write 3 54832 NULL
+write_rio_54837 write_rio 3 54837 NULL
+ext3_acl_from_disk_54839 ext3_acl_from_disk 2 54839 NULL nohasharray
+nouveau_engctx_create__54839 nouveau_engctx_create_ 8 54839 &ext3_acl_from_disk_54839
@@ -123909,20 +123361,20 @@ index 0000000..3d3508d
+printer_read_54851 printer_read 3 54851 NULL
+broadsheet_spiflash_rewrite_sector_54864 broadsheet_spiflash_rewrite_sector 2 54864 NULL
+prism_build_supp_rates_54865 prism_build_supp_rates 0 54865 NULL
-+xfs_alloc_read_agfl_54879 xfs_alloc_read_agfl 0 54879 NULL
+iscsi_pool_init_54913 iscsi_pool_init 2-4 54913 NULL nohasharray
+kobject_set_name_vargs_54913 kobject_set_name_vargs 0 54913 &iscsi_pool_init_54913
+btrfs_stack_chunk_num_stripes_54923 btrfs_stack_chunk_num_stripes 0 54923 NULL
+bio_add_page_54933 bio_add_page 0-3 54933 NULL
+mxms_structlen_54939 mxms_structlen 0 54939 NULL
+add_port_54941 add_port 2 54941 NULL
-+ath9k_dump_btcoex_54949 ath9k_dump_btcoex 3-0 54949 NULL
++tipc_send2name_54946 tipc_send2name 5 54946 NULL
++ath9k_dump_btcoex_54949 ath9k_dump_btcoex 0-3 54949 NULL
+alauda_write_data_54967 alauda_write_data 3 54967 NULL
+c4_add_card_54968 c4_add_card 3 54968 NULL
+ext3_xattr_get_54989 ext3_xattr_get 0 54989 NULL
+cx231xx_v4l2_read_55014 cx231xx_v4l2_read 3 55014 NULL
+error_error_null_Frame_tx_start_read_55024 error_error_null_Frame_tx_start_read 3 55024 NULL
-+dgap_do_bios_load_55025 dgap_do_bios_load 3 55025 NULL
++efw_transaction_55052 efw_transaction 5-7 55052 NULL
+apei_exec_run_55075 apei_exec_run 0 55075 NULL
+bitmap_storage_alloc_55077 bitmap_storage_alloc 2 55077 NULL
+read_dma_55086 read_dma 3 55086 NULL
@@ -123930,77 +123382,75 @@ index 0000000..3d3508d
+crypto_ahash_setkey_55134 crypto_ahash_setkey 3 55134 NULL
+filldir_55137 filldir 3 55137 NULL
+ocfs2_truncate_file_55148 ocfs2_truncate_file 3 55148 NULL
-+xfs_check_agi_freecount_55149 xfs_check_agi_freecount 0 55149 NULL nohasharray
-+npages_to_npools_55149 npages_to_npools 0-1 55149 &xfs_check_agi_freecount_55149
++npages_to_npools_55149 npages_to_npools 0-1 55149 NULL
+ieee80211_if_read_uapsd_queues_55150 ieee80211_if_read_uapsd_queues 3 55150 NULL
-+xfs_icsb_modify_counters_55156 xfs_icsb_modify_counters 0 55156 NULL
-+gfs2_ri_update_55185 gfs2_ri_update 0 55185 NULL
-+mtd_get_fact_prot_info_55186 mtd_get_fact_prot_info 0 55186 NULL
+sel_write_relabel_55195 sel_write_relabel 3 55195 NULL
++compat_SyS_ppoll_55196 compat_SyS_ppoll 2 55196 NULL
+sched_feat_write_55202 sched_feat_write 3 55202 NULL
+ht40allow_map_read_55209 ht40allow_map_read 3 55209 NULL
+__kfifo_dma_out_prepare_r_55211 __kfifo_dma_out_prepare_r 4-5 55211 NULL
++mlx4_load_one_55213 mlx4_load_one 3 55213 NULL
+do_raw_setsockopt_55215 do_raw_setsockopt 5 55215 NULL
+qxl_alloc_client_monitors_config_55216 qxl_alloc_client_monitors_config 2 55216 NULL
+nouveau_mc_create__55217 nouveau_mc_create_ 4 55217 NULL
+dbAllocDmap_55227 dbAllocDmap 0 55227 NULL
+memcpy_fromiovec_55247 memcpy_fromiovec 3 55247 NULL
+lbs_failcount_write_55276 lbs_failcount_write 3 55276 NULL
-+persistent_ram_new_55286 persistent_ram_new 2-1 55286 NULL
++persistent_ram_new_55286 persistent_ram_new 1-2 55286 NULL
+rx_streaming_interval_read_55291 rx_streaming_interval_read 3 55291 NULL
+lov_get_stripecnt_55297 lov_get_stripecnt 0-3 55297 NULL
+gsm_control_modem_55303 gsm_control_modem 3 55303 NULL
+wimax_msg_len_55304 wimax_msg_len 0 55304 NULL
-+qp_alloc_guest_work_55305 qp_alloc_guest_work 5-3 55305 NULL
-+gfs2_dir_read_data_55327 gfs2_dir_read_data 3 55327 NULL
-+__vxge_hw_vpath_initialize_55328 __vxge_hw_vpath_initialize 2 55328 NULL
++qp_alloc_guest_work_55305 qp_alloc_guest_work 5-3 55305 NULL nohasharray
++compat_SyS_process_vm_readv_55305 compat_SyS_process_vm_readv 3-5 55305 &qp_alloc_guest_work_55305
++compat_SyS_mbind_55329 compat_SyS_mbind 5 55329 NULL
+vme_user_read_55338 vme_user_read 3 55338 NULL
+__wa_xfer_setup_sizes_55342 __wa_xfer_setup_sizes 0 55342 NULL nohasharray
+sctp_datamsg_from_user_55342 sctp_datamsg_from_user 4 55342 &__wa_xfer_setup_sizes_55342
-+tipc_send2name_55373 tipc_send2name 5 55373 NULL
+cw1200_sdio_align_size_55391 cw1200_sdio_align_size 2 55391 NULL
+iwl_dbgfs_plcp_delta_read_55407 iwl_dbgfs_plcp_delta_read 3 55407 NULL
-+sysfs_chmod_file_55408 sysfs_chmod_file 0 55408 NULL
++nouveau_cli_create_55425 nouveau_cli_create 3 55425 NULL
+si476x_radio_read_rds_blckcnt_blob_55427 si476x_radio_read_rds_blckcnt_blob 3 55427 NULL
+__vxge_hw_channel_allocate_55462 __vxge_hw_channel_allocate 3 55462 NULL
+cx23888_ir_rx_read_55473 cx23888_ir_rx_read 3 55473 NULL
++ufshcd_exec_dev_cmd_55479 ufshcd_exec_dev_cmd 0 55479 NULL
+snd_pcm_lib_write_55483 snd_pcm_lib_write 0-3 55483 NULL
+i2o_pool_alloc_55485 i2o_pool_alloc 4 55485 NULL
+batadv_tt_entries_55487 batadv_tt_entries 0-1 55487 NULL
+ras_stride_increase_window_55501 ras_stride_increase_window 3 55501 NULL
+tx_tx_done_int_template_read_55511 tx_tx_done_int_template_read 3 55511 NULL
-+xfs_btree_split_55515 xfs_btree_split 0 55515 NULL
+ea_get_55522 ea_get 3-0 55522 NULL
+buffer_size_55534 buffer_size 0 55534 NULL
+set_msr_interception_55538 set_msr_interception 2 55538 NULL
+tty_port_register_device_55543 tty_port_register_device 3 55543 NULL
-+dgap_do_config_load_55548 dgap_do_config_load 2 55548 NULL
+hash_ipport6_expire_55549 hash_ipport6_expire 4 55549 NULL
+dm_stats_list_55551 dm_stats_list 4 55551 NULL
++compat_SyS_setsockopt_55581 compat_SyS_setsockopt 5 55581 NULL
+add_partition_55588 add_partition 2 55588 NULL
+kstrtou8_from_user_55599 kstrtou8_from_user 2 55599 NULL
+SyS_keyctl_55602 SyS_keyctl 4 55602 NULL
+macvtap_put_user_55609 macvtap_put_user 4 55609 NULL
+selinux_setprocattr_55611 selinux_setprocattr 4 55611 NULL
+edge_tty_recv_55622 edge_tty_recv 3 55622 NULL
-+pktgen_if_write_55628 pktgen_if_write 3 55628 NULL nohasharray
-+reiserfs_xattr_get_55628 reiserfs_xattr_get 0 55628 &pktgen_if_write_55628
++reiserfs_xattr_get_55628 reiserfs_xattr_get 0 55628 NULL nohasharray
++pktgen_if_write_55628 pktgen_if_write 3 55628 &reiserfs_xattr_get_55628
+osc_obd_max_pages_per_rpc_seq_write_55636 osc_obd_max_pages_per_rpc_seq_write 3 55636 NULL
+xfs_bmbt_maxrecs_55649 xfs_bmbt_maxrecs 0-2 55649 NULL
+lpfc_idiag_queinfo_read_55662 lpfc_idiag_queinfo_read 3 55662 NULL
+il_dbgfs_tx_queue_read_55668 il_dbgfs_tx_queue_read 3 55668 NULL
+get_info_55681 get_info 3 55681 NULL
+iwl_dbgfs_plcp_delta_write_55682 iwl_dbgfs_plcp_delta_write 3 55682 NULL
++ext4_alloc_file_blocks_55689 ext4_alloc_file_blocks 3 55689 NULL
+genl_allocate_reserve_groups_55705 genl_allocate_reserve_groups 1 55705 NULL
+pm8001_store_update_fw_55716 pm8001_store_update_fw 4 55716 NULL
-+ocfs2_lock_refcount_tree_55719 ocfs2_lock_refcount_tree 0 55719 NULL
+tap_pwup_write_55723 tap_pwup_write 3 55723 NULL
+__iio_allocate_kfifo_55738 __iio_allocate_kfifo 2 55738 NULL
+set_local_name_55757 set_local_name 4 55757 NULL
++ethtool_copy_validate_indir_55769 ethtool_copy_validate_indir 4 55769 NULL
+strlen_55778 strlen 0 55778 NULL
+set_spte_55783 set_spte 4-5 55783 NULL
-+req_bio_endio_55786 req_bio_endio 3 55786 NULL nohasharray
-+conf_read_55786 conf_read 3 55786 &req_bio_endio_55786
++conf_read_55786 conf_read 3 55786 NULL nohasharray
++req_bio_endio_55786 req_bio_endio 3 55786 &conf_read_55786
+uwb_rc_neh_grok_event_55799 uwb_rc_neh_grok_event 3 55799 NULL
+sb16_copy_from_user_55836 sb16_copy_from_user 10-6-7 55836 NULL
+ip_hdrlen_55849 ip_hdrlen 0 55849 NULL
@@ -124011,30 +123461,29 @@ index 0000000..3d3508d
+pm_qos_power_read_55891 pm_qos_power_read 3 55891 NULL
+hash_ip4_expire_55911 hash_ip4_expire 4 55911 NULL
+snd_pcm_hw_param_value_min_55917 snd_pcm_hw_param_value_min 0 55917 NULL
-+ext2_direct_IO_55932 ext2_direct_IO 4 55932 NULL
+kvm_write_guest_virt_system_55944 kvm_write_guest_virt_system 4-2 55944 NULL
+sel_read_policy_55947 sel_read_policy 3 55947 NULL
+ceph_get_direct_page_vector_55956 ceph_get_direct_page_vector 2 55956 NULL
-+simple_read_from_buffer_55957 simple_read_from_buffer 2-5 55957 NULL
++simple_read_from_buffer_55957 simple_read_from_buffer 5-2-0 55957 NULL
+tx_tx_imm_resp_read_55964 tx_tx_imm_resp_read 3 55964 NULL
-+btrfs_clone_55977 btrfs_clone 5-3 55977 NULL
++btrfs_clone_55977 btrfs_clone 5-3-6 55977 NULL
+wa_xfer_create_subset_sg_55992 wa_xfer_create_subset_sg 3-2 55992 NULL
+nvme_alloc_iod_56027 nvme_alloc_iod 1-2 56027 NULL
-+usb_ocp_write_56047 usb_ocp_write 4 56047 NULL
++iwl_trans_read_prph_56052 iwl_trans_read_prph 0 56052 NULL
+dccp_sendmsg_56058 dccp_sendmsg 4 56058 NULL
+pscsi_get_bio_56103 pscsi_get_bio 1 56103 NULL
-+add_sysfs_param_56108 add_sysfs_param 0 56108 NULL
+usb_alloc_stream_buffers_56123 usb_alloc_stream_buffers 3 56123 NULL
+sel_read_handle_status_56139 sel_read_handle_status 3 56139 NULL
+write_file_frameerrors_56145 write_file_frameerrors 3 56145 NULL
-+__i2c_transfer_56162 __i2c_transfer 0 56162 NULL
+rawv6_setsockopt_56165 rawv6_setsockopt 5 56165 NULL
-+ath9k_dump_legacy_btcoex_56194 ath9k_dump_legacy_btcoex 3-0 56194 NULL
++ath9k_dump_legacy_btcoex_56194 ath9k_dump_legacy_btcoex 0-3 56194 NULL
+vring_add_indirect_56222 vring_add_indirect 4 56222 NULL
+ocfs2_find_xe_in_bucket_56224 ocfs2_find_xe_in_bucket 0 56224 NULL
++ufshcd_query_descriptor_56236 ufshcd_query_descriptor 0 56236 NULL
+do_ipt_set_ctl_56238 do_ipt_set_ctl 4 56238 NULL
+fd_copyin_56247 fd_copyin 3 56247 NULL
+sk_rmem_schedule_56255 sk_rmem_schedule 3 56255 NULL
++acpi_ex_get_serial_access_length_56275 acpi_ex_get_serial_access_length 0-2 56275 NULL
+il4965_ucode_general_stats_read_56277 il4965_ucode_general_stats_read 3 56277 NULL
+ieee80211_if_fmt_user_power_level_56283 ieee80211_if_fmt_user_power_level 3 56283 NULL
+RESIZE_IF_NEEDED_56286 RESIZE_IF_NEEDED 2 56286 NULL
@@ -124046,16 +123495,18 @@ index 0000000..3d3508d
+snd_rawmidi_read_56337 snd_rawmidi_read 3 56337 NULL
+vxge_os_dma_malloc_async_56348 vxge_os_dma_malloc_async 3 56348 NULL
+mite_device_bytes_transferred_56355 mite_device_bytes_transferred 0 56355 NULL
-+qd_get_56365 qd_get 0 56365 NULL
-+iov_iter_copy_from_user_atomic_56368 iov_iter_copy_from_user_atomic 4-0 56368 NULL
++iov_iter_copy_from_user_atomic_56368 iov_iter_copy_from_user_atomic 0-4 56368 NULL
+dev_read_56369 dev_read 3 56369 NULL
+ath10k_read_simulate_fw_crash_56371 ath10k_read_simulate_fw_crash 3 56371 NULL
++lnet_ping_56378 lnet_ping 4 56378 NULL
+write_gssp_56404 write_gssp 3 56404 NULL
+ocfs2_control_read_56405 ocfs2_control_read 3 56405 NULL
-+do_get_write_access_56410 do_get_write_access 0 56410 NULL
+store_msg_56417 store_msg 3 56417 NULL
+pppol2tp_sendmsg_56420 pppol2tp_sendmsg 4 56420 NULL
-+l2cap_segment_le_sdu_56426 l2cap_segment_le_sdu 4 56426 NULL
++l2cap_segment_le_sdu_56426 l2cap_segment_le_sdu 4 56426 NULL nohasharray
++nvme_submit_cmd_56426 nvme_submit_cmd 0 56426 &l2cap_segment_le_sdu_56426
++lprocfs_fid_space_seq_write_56431 lprocfs_fid_space_seq_write 3 56431 NULL nohasharray
++ec_dbgfs_cmd_read_56431 ec_dbgfs_cmd_read 3 56431 &lprocfs_fid_space_seq_write_56431
+fl_create_56435 fl_create 5 56435 NULL
+gnttab_map_56439 gnttab_map 2 56439 NULL
+cx231xx_init_isoc_56453 cx231xx_init_isoc 3-2-4 56453 NULL
@@ -124064,30 +123515,30 @@ index 0000000..3d3508d
+putused_user_56467 putused_user 3 56467 NULL
+ocfs2_zero_extend_range_56468 ocfs2_zero_extend_range 3-2 56468 NULL
+lbs_rdmac_write_56471 lbs_rdmac_write 3 56471 NULL
-+calc_linear_pos_56472 calc_linear_pos 0-3 56472 NULL
+crypto_shash_alignmask_56486 crypto_shash_alignmask 0 56486 NULL
+ieee80211_rx_mgmt_probe_beacon_56491 ieee80211_rx_mgmt_probe_beacon 3 56491 NULL
+memblock_virt_alloc_56501 memblock_virt_alloc 1 56501 NULL
+init_map_ip_56508 init_map_ip 5 56508 NULL
-+lustre_posix_acl_xattr_reduce_space_56512 lustre_posix_acl_xattr_reduce_space 3-0-2 56512 NULL
++lustre_posix_acl_xattr_reduce_space_56512 lustre_posix_acl_xattr_reduce_space 3 56512 NULL
+cfg80211_connect_result_56515 cfg80211_connect_result 4-6 56515 NULL
+ip_options_get_56538 ip_options_get 4 56538 NULL
+ll_wr_track_id_56544 ll_wr_track_id 2 56544 NULL
+alloc_apertures_56561 alloc_apertures 1 56561 NULL
+rs_sta_dbgfs_stats_table_read_56573 rs_sta_dbgfs_stats_table_read 3 56573 NULL
+portcntrs_2_read_56586 portcntrs_2_read 3 56586 NULL
++gro_pull_from_frag0_56593 gro_pull_from_frag0 2 56593 NULL
+event_filter_write_56609 event_filter_write 3 56609 NULL
+nvme_trans_log_temperature_56613 nvme_trans_log_temperature 3 56613 NULL
-+edac_device_create_block_56619 edac_device_create_block 0 56619 NULL
+gather_array_56641 gather_array 3 56641 NULL
+lookup_extent_backref_56644 lookup_extent_backref 9 56644 NULL
+uvc_debugfs_stats_read_56651 uvc_debugfs_stats_read 3 56651 NULL
++nv50_gpio_intr_mask_56665 nv50_gpio_intr_mask 4-3 56665 NULL
+tg3_nvram_write_block_56666 tg3_nvram_write_block 3 56666 NULL
+snd_gus_dram_read_56686 snd_gus_dram_read 4 56686 NULL
+dvb_ringbuffer_read_user_56702 dvb_ringbuffer_read_user 3-0 56702 NULL
++sfw_alloc_pages_56709 sfw_alloc_pages 3 56709 NULL
+sta_flags_read_56710 sta_flags_read 3 56710 NULL
+ipv6_getsockopt_sticky_56711 ipv6_getsockopt_sticky 5 56711 NULL
-+xfs_btree_decrement_56718 xfs_btree_decrement 0 56718 NULL
+__wa_xfer_setup_segs_56725 __wa_xfer_setup_segs 2 56725 NULL
+__copy_from_user_ll_56738 __copy_from_user_ll 0-3 56738 NULL
+drm_agp_bind_pages_56748 drm_agp_bind_pages 3 56748 NULL
@@ -124098,18 +123549,18 @@ index 0000000..3d3508d
+mtdchar_write_56831 mtdchar_write 3 56831 NULL
+snd_rawmidi_kernel_write1_56847 snd_rawmidi_kernel_write1 4-0 56847 NULL
+si476x_radio_read_agc_blob_56849 si476x_radio_read_agc_blob 3 56849 NULL
++gk20a_ram_get_56863 gk20a_ram_get 2 56863 NULL
+ext3_xattr_ibody_get_56880 ext3_xattr_ibody_get 0 56880 NULL
+pvr2_debugifc_print_status_56890 pvr2_debugifc_print_status 3 56890 NULL
+debug_debug3_read_56894 debug_debug3_read 3 56894 NULL
-+batadv_tt_update_changes_56895 batadv_tt_update_changes 3 56895 NULL
++le_auto_conn_write_56895 le_auto_conn_write 3 56895 NULL nohasharray
++batadv_tt_update_changes_56895 batadv_tt_update_changes 3 56895 &le_auto_conn_write_56895
+hfsplus_find_cat_56899 hfsplus_find_cat 0 56899 NULL
+strcspn_56913 strcspn 0 56913 NULL
+__kfifo_out_56927 __kfifo_out 0-3 56927 NULL
+journal_init_revoke_56933 journal_init_revoke 2 56933 NULL
-+xfs_alloc_ag_vextent_56943 xfs_alloc_ag_vextent 0 56943 NULL
+nouveau_xtensa_create__56952 nouveau_xtensa_create_ 8 56952 NULL
+diva_get_driver_info_56967 diva_get_driver_info 0 56967 NULL
-+nouveau_device_create__56984 nouveau_device_create_ 6 56984 NULL
+sptlrpc_secflags2str_56995 sptlrpc_secflags2str 3 56995 NULL
+vlsi_alloc_ring_57003 vlsi_alloc_ring 3-4 57003 NULL
+btrfs_super_csum_size_57004 btrfs_super_csum_size 0 57004 NULL
@@ -124126,18 +123577,19 @@ index 0000000..3d3508d
+hpfs_readpages_57106 hpfs_readpages 4 57106 NULL
+crypto_compress_ctxsize_57109 crypto_compress_ctxsize 0 57109 NULL
+cipso_v4_gentag_loc_57119 cipso_v4_gentag_loc 0 57119 NULL
-+rds_ib_sub_signaled_57136 rds_ib_sub_signaled 2 57136 NULL nohasharray
-+nl80211_send_deauth_57136 nl80211_send_deauth 4 57136 &rds_ib_sub_signaled_57136 nohasharray
-+ima_show_htable_value_57136 ima_show_htable_value 2 57136 &nl80211_send_deauth_57136
++ima_show_htable_value_57136 ima_show_htable_value 2 57136 NULL nohasharray
++rds_ib_sub_signaled_57136 rds_ib_sub_signaled 2 57136 &ima_show_htable_value_57136 nohasharray
++nl80211_send_deauth_57136 nl80211_send_deauth 4 57136 &rds_ib_sub_signaled_57136
+snd_sonicvibes_getdmac_57140 snd_sonicvibes_getdmac 0 57140 NULL
+_iwl_dbgfs_bf_params_write_57141 _iwl_dbgfs_bf_params_write 3 57141 NULL
++acpi_gsb_i2c_read_bytes_57145 acpi_gsb_i2c_read_bytes 4 57145 NULL
+udl_prime_create_57159 udl_prime_create 2 57159 NULL
+stk_prepare_sio_buffers_57168 stk_prepare_sio_buffers 2 57168 NULL
+rx_hw_stuck_read_57179 rx_hw_stuck_read 3 57179 NULL
+hash_netnet6_expire_57191 hash_netnet6_expire 4 57191 NULL
+tt3650_ci_msg_57219 tt3650_ci_msg 4 57219 NULL
-+dma_fifo_alloc_57236 dma_fifo_alloc 5-3-2 57236 NULL
-+flush_space_57241 flush_space 0 57241 NULL
++dma_fifo_alloc_57236 dma_fifo_alloc 2-3-5 57236 NULL
++drbg_blocklen_57239 drbg_blocklen 0 57239 NULL
+rsxx_cram_write_57244 rsxx_cram_write 3 57244 NULL
+ieee80211_if_fmt_tsf_57249 ieee80211_if_fmt_tsf 3 57249 NULL
+oprofilefs_ulong_from_user_57251 oprofilefs_ulong_from_user 3 57251 NULL
@@ -124145,80 +123597,78 @@ index 0000000..3d3508d
+lbs_sleepparams_write_57283 lbs_sleepparams_write 3 57283 NULL
+pstore_file_read_57288 pstore_file_read 3 57288 NULL
+snd_pcm_read_57289 snd_pcm_read 3 57289 NULL
++string_length_no_trail_57290 string_length_no_trail 0-2 57290 NULL
+ftdi_elan_write_57309 ftdi_elan_write 3 57309 NULL
-+xfs_iread_57313 xfs_iread 0 57313 NULL nohasharray
-+write_file_regval_57313 write_file_regval 3 57313 &xfs_iread_57313
++write_file_regval_57313 write_file_regval 3 57313 NULL
+__mxt_write_reg_57326 __mxt_write_reg 3 57326 NULL
+usblp_read_57342 usblp_read 3 57342 NULL
+print_devstats_dot11RTSFailureCount_57347 print_devstats_dot11RTSFailureCount 3 57347 NULL
+dio_send_cur_page_57348 dio_send_cur_page 0 57348 NULL
+tipc_bclink_stats_57372 tipc_bclink_stats 2 57372 NULL
+tty_register_device_attr_57381 tty_register_device_attr 2 57381 NULL
++bzImage64_load_57388 bzImage64_load 7 57388 NULL
+read_file_blob_57406 read_file_blob 3 57406 NULL
+enclosure_register_57412 enclosure_register 3 57412 NULL
++read_file_eeprom_57428 read_file_eeprom 3 57428 NULL
+compat_keyctl_instantiate_key_iov_57431 compat_keyctl_instantiate_key_iov 3 57431 NULL
+copy_to_user_fromio_57432 copy_to_user_fromio 3 57432 NULL
+__roundup_pow_of_two_57461 __roundup_pow_of_two 0 57461 NULL
+sisusb_clear_vram_57466 sisusb_clear_vram 2-3 57466 NULL
+ieee80211_if_read_flags_57470 ieee80211_if_read_flags 3 57470 NULL
-+tipc_port_reject_sections_57478 tipc_port_reject_sections 4 57478 NULL
++read_file_skb_rx_57490 read_file_skb_rx 3 57490 NULL
+bnad_debugfs_write_regwr_57500 bnad_debugfs_write_regwr 3 57500 NULL
+skb_headlen_57501 skb_headlen 0 57501 NULL
+copy_in_user_57502 copy_in_user 3 57502 NULL
-+ckhdid_printf_57505 ckhdid_printf 2 57505 NULL nohasharray
-+gfs2_quota_hold_57505 gfs2_quota_hold 0 57505 &ckhdid_printf_57505
++ckhdid_printf_57505 ckhdid_printf 2 57505 NULL
+init_tag_map_57515 init_tag_map 3 57515 NULL
-+il_dbgfs_force_reset_read_57517 il_dbgfs_force_reset_read 3 57517 NULL nohasharray
-+wil_read_file_ssid_57517 wil_read_file_ssid 3 57517 &il_dbgfs_force_reset_read_57517
++wil_read_file_ssid_57517 wil_read_file_ssid 3 57517 NULL nohasharray
++il_dbgfs_force_reset_read_57517 il_dbgfs_force_reset_read 3 57517 &wil_read_file_ssid_57517
+cmm_read_57520 cmm_read 3 57520 NULL
+inode_permission_57531 inode_permission 0 57531 NULL
+acpi_dev_get_resources_57534 acpi_dev_get_resources 0 57534 NULL
+ptlrpc_lprocfs_hp_ratio_seq_write_57537 ptlrpc_lprocfs_hp_ratio_seq_write 3 57537 NULL
++compat_SyS_process_vm_writev_57542 compat_SyS_process_vm_writev 3-5 57542 NULL
+ReadHDLCPnP_57559 ReadHDLCPnP 0 57559 NULL
-+obd_unpackmd_57563 obd_unpackmd 0 57563 NULL
+snd_pcm_playback_ioctl1_57569 snd_pcm_playback_ioctl1 0 57569 NULL
+get_bridge_ifindices_57579 get_bridge_ifindices 0 57579 NULL
+ldlm_cli_enqueue_local_57582 ldlm_cli_enqueue_local 11 57582 NULL
+il_dbgfs_interrupt_write_57591 il_dbgfs_interrupt_write 3 57591 NULL
+read_file_spectral_fft_period_57593 read_file_spectral_fft_period 3 57593 NULL
++copy_to_iter_bvec_57604 copy_to_iter_bvec 0-2 57604 NULL
+tx_tx_retry_template_read_57623 tx_tx_retry_template_read 3 57623 NULL
+sisusbcon_putcs_57630 sisusbcon_putcs 3 57630 NULL
+mem_read_57631 mem_read 3 57631 NULL
-+xfs_alloc_ag_vextent_near_57653 xfs_alloc_ag_vextent_near 0 57653 NULL
+r3964_write_57662 r3964_write 4 57662 NULL
+proc_ns_readlink_57664 proc_ns_readlink 3 57664 NULL
+__lgwrite_57669 __lgwrite 4 57669 NULL
+f1x_match_to_this_node_57695 f1x_match_to_this_node 3 57695 NULL
+i2400m_rx_stats_read_57706 i2400m_rx_stats_read 3 57706 NULL
+ieee80211_if_read_dot11MeshHWMPconfirmationInterval_57722 ieee80211_if_read_dot11MeshHWMPconfirmationInterval 3 57722 NULL
-+nouveau_gpio_create__57735 nouveau_gpio_create_ 4-5 57735 NULL
-+pppol2tp_recvmsg_57742 pppol2tp_recvmsg 4 57742 NULL nohasharray
-+compat_sys_set_mempolicy_57742 compat_sys_set_mempolicy 3 57742 &pppol2tp_recvmsg_57742
++pppol2tp_recvmsg_57742 pppol2tp_recvmsg 4 57742 NULL
+ieee80211_if_fmt_dot11MeshHWMPpreqMinInterval_57762 ieee80211_if_fmt_dot11MeshHWMPpreqMinInterval 3 57762 NULL
+SYSC_process_vm_writev_57776 SYSC_process_vm_writev 3-5 57776 NULL
-+apei_exec_collect_resources_57788 apei_exec_collect_resources 0 57788 NULL
-+security_inode_unlink_57791 security_inode_unlink 0 57791 NULL
+ld2_57794 ld2 0 57794 NULL
+ivtv_read_57796 ivtv_read 3 57796 NULL
+ion_test_ioctl_57799 ion_test_ioctl 2 57799 NULL
+bfad_debugfs_read_regrd_57830 bfad_debugfs_read_regrd 3 57830 NULL
+copy_to_user_57835 copy_to_user 3-0 57835 NULL
-+xfs_rtpick_extent_57843 xfs_rtpick_extent 0 57843 NULL nohasharray
-+flash_read_57843 flash_read 3 57843 &xfs_rtpick_extent_57843
++flash_read_57843 flash_read 3 57843 NULL
+kiblnd_create_tx_pool_57846 kiblnd_create_tx_pool 2 57846 NULL
+radeon_ttm_gtt_read_57879 radeon_ttm_gtt_read 3 57879 NULL
+xt_alloc_table_info_57903 xt_alloc_table_info 1 57903 NULL
+iio_read_first_n_kfifo_57910 iio_read_first_n_kfifo 2 57910 NULL
+ll_xattr_find_get_lock_57912 ll_xattr_find_get_lock 0 57912 NULL
+memcg_caches_array_size_57918 memcg_caches_array_size 0-1 57918 NULL
++mwifiex_hscfg_read_57920 mwifiex_hscfg_read 3 57920 NULL
+twl_i2c_write_57923 twl_i2c_write 3-4 57923 NULL
+__snd_gf1_look16_57925 __snd_gf1_look16 0 57925 NULL
+sel_read_handle_unknown_57933 sel_read_handle_unknown 3 57933 NULL
-+xfs_inode_item_format_convert_57937 xfs_inode_item_format_convert 0 57937 NULL
+xfs_mru_cache_create_57943 xfs_mru_cache_create 3 57943 NULL
+key_algorithm_read_57946 key_algorithm_read 3 57946 NULL
++arch_gnttab_init_57948 arch_gnttab_init 2-1 57948 NULL
+ip_set_alloc_57953 ip_set_alloc 1 57953 NULL nohasharray
+ioat3_dca_count_dca_slots_57953 ioat3_dca_count_dca_slots 0 57953 &ip_set_alloc_57953
++iov_iter_npages_57979 iov_iter_npages 0-2 57979 NULL
+do_rx_dma_57996 do_rx_dma 5 57996 NULL
+rx_reset_counter_read_58001 rx_reset_counter_read 3 58001 NULL
+iwl_dbgfs_ucode_rx_stats_read_58023 iwl_dbgfs_ucode_rx_stats_read 3 58023 NULL
@@ -124227,11 +123677,9 @@ index 0000000..3d3508d
+ocfs2_find_leaf_58065 ocfs2_find_leaf 0 58065 NULL
+dt3155_alloc_coherent_58073 dt3155_alloc_coherent 2 58073 NULL
+cm4040_write_58079 cm4040_write 3 58079 NULL
++savemem_58129 savemem 3 58129 NULL
+ipv6_flowlabel_opt_58135 ipv6_flowlabel_opt 3 58135 NULL nohasharray
+slhc_init_58135 slhc_init 1-2 58135 &ipv6_flowlabel_opt_58135
-+rd_build_prot_space_58137 rd_build_prot_space 2 58137 NULL
-+xfs_bmap_add_extent_delay_real_58151 xfs_bmap_add_extent_delay_real 0 58151 NULL
-+xfs_btree_update_58167 xfs_btree_update 0 58167 NULL
+garmin_write_bulk_58191 garmin_write_bulk 3 58191 NULL
+ieee80211_if_fmt_flags_58205 ieee80211_if_fmt_flags 3 58205 NULL
+i40evf_allocate_virt_mem_d_58210 i40evf_allocate_virt_mem_d 3 58210 NULL
@@ -124242,45 +123690,50 @@ index 0000000..3d3508d
+profile_load_58267 profile_load 3 58267 NULL
+kstrtos8_from_user_58268 kstrtos8_from_user 2 58268 NULL
+acpi_ds_build_internal_package_obj_58271 acpi_ds_build_internal_package_obj 3 58271 NULL
++r100_mm_rreg_58276 r100_mm_rreg 0 58276 NULL
+iscsi_decode_text_input_58292 iscsi_decode_text_input 4 58292 NULL
+ieee80211_if_read_dot11MeshTTL_58307 ieee80211_if_read_dot11MeshTTL 3 58307 NULL
++mic_virtio_copy_from_user_58323 mic_virtio_copy_from_user 3 58323 NULL
+tx_tx_start_int_templates_read_58324 tx_tx_start_int_templates_read 3 58324 NULL
++lstcon_rpc_prep_58325 lstcon_rpc_prep 4 58325 NULL
+ext4_ext_truncate_extend_restart_58331 ext4_ext_truncate_extend_restart 3 58331 NULL
+__copy_from_user_swizzled_58337 __copy_from_user_swizzled 2-4 58337 NULL
-+SyS_migrate_pages_58348 SyS_migrate_pages 2 58348 NULL
++ec_i2c_parse_response_58347 ec_i2c_parse_response 0 58347 NULL
+brcmf_debugfs_sdio_counter_read_58369 brcmf_debugfs_sdio_counter_read 3 58369 NULL
+il_dbgfs_status_read_58388 il_dbgfs_status_read 3 58388 NULL
+_drbd_md_sync_page_io_58403 _drbd_md_sync_page_io 6 58403 NULL
+kvm_mmu_write_protect_pt_masked_58406 kvm_mmu_write_protect_pt_masked 3 58406 NULL nohasharray
+idetape_pad_zeros_58406 idetape_pad_zeros 2 58406 &kvm_mmu_write_protect_pt_masked_58406
-+xfs_btree_get_rec_58410 xfs_btree_get_rec 0 58410 NULL
+i2400m_pld_size_58415 i2400m_pld_size 0 58415 NULL
+capabilities_read_58457 capabilities_read 3 58457 NULL
+usnic_vnic_get_resources_58462 usnic_vnic_get_resources 3 58462 NULL
-+lpfc_idiag_baracc_read_58466 lpfc_idiag_baracc_read 3 58466 NULL nohasharray
-+compat_do_ipt_set_ctl_58466 compat_do_ipt_set_ctl 4 58466 &lpfc_idiag_baracc_read_58466
++compat_do_ipt_set_ctl_58466 compat_do_ipt_set_ctl 4 58466 NULL nohasharray
++lpfc_idiag_baracc_read_58466 lpfc_idiag_baracc_read 3 58466 &compat_do_ipt_set_ctl_58466
+nv_rd08_58472 nv_rd08 0 58472 NULL
-+acpi_tables_sysfs_init_58477 acpi_tables_sysfs_init 0 58477 NULL
+snd_gf1_read_addr_58483 snd_gf1_read_addr 0 58483 NULL
+snd_rme96_capture_copy_58484 snd_rme96_capture_copy 5 58484 NULL
-+btrfs_cont_expand_58498 btrfs_cont_expand 0-2-3 58498 NULL
-+gfs2_dir_get_new_buffer_58509 gfs2_dir_get_new_buffer 0 58509 NULL
++dw_spi_show_regs_58486 dw_spi_show_regs 3 58486 NULL
++btrfs_cont_expand_58498 btrfs_cont_expand 2-3 58498 NULL
++tcf_hash_create_58507 tcf_hash_create 4 58507 NULL
++cifs_write_from_iter_58526 cifs_write_from_iter 2 58526 NULL
+rndis_add_response_58544 rndis_add_response 2 58544 NULL
+wep_decrypt_fail_read_58567 wep_decrypt_fail_read 3 58567 NULL
+scnprint_mac_oui_58578 scnprint_mac_oui 3-0 58578 NULL
++cur_wm_latency_write_58581 cur_wm_latency_write 3 58581 NULL
+get_rhf_errstring_58582 get_rhf_errstring 3 58582 NULL
+ea_read_inline_58589 ea_read_inline 0 58589 NULL
+isku_sysfs_read_keys_thumbster_58590 isku_sysfs_read_keys_thumbster 6 58590 NULL
+xip_file_read_58592 xip_file_read 3 58592 NULL
+ecryptfs_write_end_58594 ecryptfs_write_end 5-3 58594 NULL
+radeon_bo_size_58606 radeon_bo_size 0 58606 NULL
++btrfs_direct_IO_58608 btrfs_direct_IO 4 58608 NULL
+skb_copy_to_page_nocache_58624 skb_copy_to_page_nocache 6 58624 NULL
-+filemap_fdatawrite_range_58630 filemap_fdatawrite_range 0 58630 NULL
+tx_tx_start_fw_gen_read_58648 tx_tx_start_fw_gen_read 3 58648 NULL
+iwl_dbgfs_rx_handlers_write_58655 iwl_dbgfs_rx_handlers_write 3 58655 NULL
+find_zero_58685 find_zero 0-1 58685 NULL
+uwb_bce_print_IEs_58686 uwb_bce_print_IEs 4 58686 NULL
+tps6586x_writes_58689 tps6586x_writes 2-3 58689 NULL
++visor_charqueue_create_58703 visor_charqueue_create 1 58703 NULL
+vx_send_msg_58711 vx_send_msg 0 58711 NULL
+csum_exist_in_range_58730 csum_exist_in_range 2-3 58730 NULL
+frames_to_bytes_58741 frames_to_bytes 0-2 58741 NULL
@@ -124297,11 +123750,9 @@ index 0000000..3d3508d
+lprocfs_wr_pinger_recov_58914 lprocfs_wr_pinger_recov 3 58914 NULL
+print_devstats_dot11FCSErrorCount_58919 print_devstats_dot11FCSErrorCount 3 58919 NULL
+pipeline_cs_rx_packet_out_read_58926 pipeline_cs_rx_packet_out_read 3 58926 NULL
-+xfs_bmap_read_extents_58936 xfs_bmap_read_extents 0 58936 NULL
+wait_table_hash_nr_entries_58962 wait_table_hash_nr_entries 0 58962 NULL
+ieee80211_if_fmt_dot11MeshHWMPactivePathToRootTimeout_58965 ieee80211_if_fmt_dot11MeshHWMPactivePathToRootTimeout 3 58965 NULL
+crypto_aead_ivsize_58970 crypto_aead_ivsize 0 58970 NULL
-+__mem_cgroup_try_charge_58976 __mem_cgroup_try_charge 0 58976 NULL
+init_list_set_59005 init_list_set 3 59005 NULL
+ep_write_59008 ep_write 3 59008 NULL
+lpfc_idiag_baracc_write_59014 lpfc_idiag_baracc_write 3 59014 NULL
@@ -124311,17 +123762,16 @@ index 0000000..3d3508d
+crypto_aead_reqsize_59039 crypto_aead_reqsize 0 59039 NULL
+regmap_bulk_write_59049 regmap_bulk_write 2-4 59049 NULL
+mmc_sd_num_wr_blocks_59112 mmc_sd_num_wr_blocks 0 59112 NULL
-+scsi_io_completion_59122 scsi_io_completion 2 59122 NULL nohasharray
-+sta_tx_latency_stat_table_59122 sta_tx_latency_stat_table 0-4-5 59122 &scsi_io_completion_59122
++sta_tx_latency_stat_table_59122 sta_tx_latency_stat_table 0-4-5 59122 NULL nohasharray
++scsi_io_completion_59122 scsi_io_completion 2 59122 &sta_tx_latency_stat_table_59122
+nfc_llcp_send_i_frame_59130 nfc_llcp_send_i_frame 3 59130 NULL
-+print_devstats_dot11RTSSuccessCount_59145 print_devstats_dot11RTSSuccessCount 3 59145 NULL nohasharray
-+framebuffer_alloc_59145 framebuffer_alloc 1 59145 &print_devstats_dot11RTSSuccessCount_59145
++framebuffer_alloc_59145 framebuffer_alloc 1 59145 NULL nohasharray
++print_devstats_dot11RTSSuccessCount_59145 print_devstats_dot11RTSSuccessCount 3 59145 &framebuffer_alloc_59145
+radeon_compat_ioctl_59150 radeon_compat_ioctl 2 59150 NULL
+pvr2_hdw_report_clients_59152 pvr2_hdw_report_clients 3 59152 NULL
+ksize_59176 ksize 0 59176 NULL
+setup_window_59178 setup_window 4-2-5-7 59178 NULL
+ocfs2_move_extent_59187 ocfs2_move_extent 2-5 59187 NULL
-+xfs_ialloc_next_rec_59193 xfs_ialloc_next_rec 0 59193 NULL
+xfs_iext_realloc_indirect_59211 xfs_iext_realloc_indirect 2 59211 NULL
+check_mapped_selector_name_59216 check_mapped_selector_name 5 59216 NULL
+dt3155_read_59226 dt3155_read 3 59226 NULL
@@ -124329,38 +123779,37 @@ index 0000000..3d3508d
+nla_len_59258 nla_len 0 59258 NULL
+drbd_bm_write_page_59290 drbd_bm_write_page 2 59290 NULL
+btrfs_insert_dir_item_59304 btrfs_insert_dir_item 4 59304 NULL
-+xfs_iformat_fork_59312 xfs_iformat_fork 0 59312 NULL
+fd_copyout_59323 fd_copyout 3 59323 NULL
-+read_9287_modal_eeprom_59327 read_9287_modal_eeprom 3 59327 NULL
+rx_defrag_in_process_called_read_59338 rx_defrag_in_process_called_read 3 59338 NULL
-+xfs_attrmulti_attr_set_59346 xfs_attrmulti_attr_set 4 59346 NULL nohasharray
-+xfs_alloc_lookup_le_59346 xfs_alloc_lookup_le 0 59346 &xfs_attrmulti_attr_set_59346
++xfs_attrmulti_attr_set_59346 xfs_attrmulti_attr_set 4 59346 NULL
+__map_request_59350 __map_request 0 59350 NULL
-+gfs2_quota_lock_check_59353 gfs2_quota_lock_check 0 59353 NULL
++SyS_getrandom_59366 SyS_getrandom 2 59366 NULL
+f2fs_fallocate_59377 f2fs_fallocate 4-3 59377 NULL
+pvr2_debugifc_print_info_59380 pvr2_debugifc_print_info 3 59380 NULL
+journal_init_dev_59384 journal_init_dev 5 59384 NULL
+__net_get_random_once_59389 __net_get_random_once 2 59389 NULL
+isku_sysfs_read_keys_function_59412 isku_sysfs_read_keys_function 6 59412 NULL
-+pci_ctrl_read_59424 pci_ctrl_read 0 59424 NULL
+vxge_hw_ring_rxds_per_block_get_59425 vxge_hw_ring_rxds_per_block_get 0 59425 NULL
+SyS_sched_setaffinity_59442 SyS_sched_setaffinity 2 59442 NULL
+fs_path_ensure_buf_59445 fs_path_ensure_buf 2 59445 NULL
++tipc_recv_stream_59456 tipc_recv_stream 4 59456 NULL
++_iwl_dbgfs_bcast_filters_write_59491 _iwl_dbgfs_bcast_filters_write 3 59491 NULL
+ib_copy_from_udata_59502 ib_copy_from_udata 3 59502 NULL
++C_SYSC_get_mempolicy_59516 C_SYSC_get_mempolicy 3 59516 NULL
+mic_vringh_copy_59523 mic_vringh_copy 4 59523 NULL
++msix_setup_entries_59545 msix_setup_entries 0 59545 NULL
+mpi_get_nbits_59551 mpi_get_nbits 0 59551 NULL
+tunables_write_59563 tunables_write 3 59563 NULL
+bio_split_59564 bio_split 2 59564 NULL
+__copy_from_user_ll_nozero_59571 __copy_from_user_ll_nozero 0-3 59571 NULL
+write_pbl_59583 write_pbl 4 59583 NULL
+memdup_user_59590 memdup_user 2 59590 NULL
-+xrcdn_free_res_59616 xrcdn_free_res 5 59616 NULL nohasharray
-+mem_fwlog_free_mem_blks_read_59616 mem_fwlog_free_mem_blks_read 3 59616 &xrcdn_free_res_59616
++mem_fwlog_free_mem_blks_read_59616 mem_fwlog_free_mem_blks_read 3 59616 NULL nohasharray
++xrcdn_free_res_59616 xrcdn_free_res 5 59616 &mem_fwlog_free_mem_blks_read_59616
+ath6kl_endpoint_stats_write_59621 ath6kl_endpoint_stats_write 3 59621 NULL
+mtrr_write_59622 mtrr_write 3 59622 NULL
+find_first_zero_bit_59636 find_first_zero_bit 0 59636 NULL
+SyS_setdomainname_59646 SyS_setdomainname 2 59646 NULL
-+file_update_time_59647 file_update_time 0 59647 NULL
+hidraw_read_59650 hidraw_read 3 59650 NULL
+v9fs_xattr_set_acl_59651 v9fs_xattr_set_acl 4 59651 NULL
+__devcgroup_check_permission_59665 __devcgroup_check_permission 0 59665 NULL
@@ -124369,13 +123818,12 @@ index 0000000..3d3508d
+mic_calc_failure_read_59700 mic_calc_failure_read 3 59700 NULL
+ioperm_get_59701 ioperm_get 4-3 59701 NULL
+prism2_info_scanresults_59729 prism2_info_scanresults 3 59729 NULL
-+ieee80211_if_read_fwded_unicast_59740 ieee80211_if_read_fwded_unicast 3 59740 NULL
-+fat_direct_IO_59741 fat_direct_IO 4 59741 NULL
++ieee80211_if_read_fwded_unicast_59740 ieee80211_if_read_fwded_unicast 3 59740 NULL nohasharray
++nv94_aux_mask_59740 nv94_aux_mask 2 59740 &ieee80211_if_read_fwded_unicast_59740
+qib_decode_7220_sdma_errs_59745 qib_decode_7220_sdma_errs 4 59745 NULL
+strnlen_59746 strnlen 0 59746 NULL
+ext3_acl_count_59754 ext3_acl_count 0-1 59754 NULL
-+long_retry_limit_read_59766 long_retry_limit_read 3 59766 NULL nohasharray
-+cap_inode_need_killpriv_59766 cap_inode_need_killpriv 0 59766 &long_retry_limit_read_59766
++long_retry_limit_read_59766 long_retry_limit_read 3 59766 NULL
+venus_remove_59781 venus_remove 4 59781 NULL
+mei_nfc_recv_59784 mei_nfc_recv 3 59784 NULL
+C_SYSC_preadv_59801 C_SYSC_preadv 3 59801 NULL
@@ -124384,6 +123832,7 @@ index 0000000..3d3508d
+ieee80211_if_read_dot11MeshHWMPmaxPREQretries_59829 ieee80211_if_read_dot11MeshHWMPmaxPREQretries 3 59829 NULL
+gspca_dev_probe2_59833 gspca_dev_probe2 4 59833 NULL
+regmap_raw_write_async_59849 regmap_raw_write_async 2-4 59849 NULL
++biovec_create_pool_59878 biovec_create_pool 1 59878 NULL
+pvr2_ioread_set_sync_key_59882 pvr2_ioread_set_sync_key 3 59882 NULL
+l2cap_sock_recvmsg_59886 l2cap_sock_recvmsg 4 59886 NULL
+ffs_prepare_buffer_59892 ffs_prepare_buffer 2 59892 NULL
@@ -124401,7 +123850,6 @@ index 0000000..3d3508d
+mthca_init_cq_60011 mthca_init_cq 2 60011 NULL
+osd_req_list_dev_partitions_60027 osd_req_list_dev_partitions 4 60027 NULL
+xlog_bread_offset_60030 xlog_bread_offset 3 60030 NULL
-+xfs_imap_to_bp_60034 xfs_imap_to_bp 0 60034 NULL
+bio_integrity_hw_sectors_60039 bio_integrity_hw_sectors 0-2 60039 NULL
+do_ip6t_set_ctl_60040 do_ip6t_set_ctl 4 60040 NULL
+vcs_size_60050 vcs_size 0 60050 NULL
@@ -124409,10 +123857,12 @@ index 0000000..3d3508d
+compat_writev_60063 compat_writev 3 60063 NULL
+ath6kl_listen_int_write_60066 ath6kl_listen_int_write 3 60066 NULL
+c4iw_num_stags_60073 c4iw_num_stags 0 60073 NULL
++usb_os_desc_prepare_interf_dir_60075 usb_os_desc_prepare_interf_dir 2 60075 NULL
+rxrpc_kernel_send_data_60083 rxrpc_kernel_send_data 3 60083 NULL
+ieee80211_if_fmt_fwded_frames_60103 ieee80211_if_fmt_fwded_frames 3 60103 NULL
+SYSC_msgsnd_60113 SYSC_msgsnd 3 60113 NULL
+nfs_idmap_request_key_60124 nfs_idmap_request_key 2 60124 NULL
++pcpu_need_to_extend_60133 pcpu_need_to_extend 0 60133 NULL
+__mutex_lock_common_60134 __mutex_lock_common 0 60134 NULL
+ld_usb_read_60156 ld_usb_read 3 60156 NULL
+jmb38x_ms_count_slots_60164 jmb38x_ms_count_slots 0 60164 NULL
@@ -124420,7 +123870,8 @@ index 0000000..3d3508d
+jffs2_alloc_full_dirent_60179 jffs2_alloc_full_dirent 1 60179 NULL nohasharray
+sg_build_sgat_60179 sg_build_sgat 3 60179 &jffs2_alloc_full_dirent_60179
+fuse_async_req_send_60183 fuse_async_req_send 0-3 60183 NULL
-+rx_rx_tkip_replays_read_60193 rx_rx_tkip_replays_read 3 60193 NULL
++rx_rx_tkip_replays_read_60193 rx_rx_tkip_replays_read 3 60193 NULL nohasharray
++arch_setup_msi_irqs_60193 arch_setup_msi_irqs 0 60193 &rx_rx_tkip_replays_read_60193
+qib_reg_phys_mr_60202 qib_reg_phys_mr 3 60202 NULL
+btrfs_get_token_16_60220 btrfs_get_token_16 0 60220 NULL
+irq_alloc_domain_generic_chips_60264 irq_alloc_domain_generic_chips 2-3 60264 NULL
@@ -124428,8 +123879,10 @@ index 0000000..3d3508d
+printer_write_60276 printer_write 3 60276 NULL
+do_xip_mapping_read_60297 do_xip_mapping_read 5 60297 NULL
+getDataLength_60301 getDataLength 0 60301 NULL
++bch_subtract_dirty_60306 bch_subtract_dirty 3-4 60306 NULL
+usb_alphatrack_write_60341 usb_alphatrack_write 3 60341 NULL
+__kfifo_from_user_r_60345 __kfifo_from_user_r 5-3 60345 NULL
++max_unfragmented_pages_60362 max_unfragmented_pages 0 60362 NULL
+dccp_setsockopt_60367 dccp_setsockopt 5 60367 NULL
+mthca_alloc_resize_buf_60394 mthca_alloc_resize_buf 3 60394 NULL
+ocfs2_zero_extend_60396 ocfs2_zero_extend 3 60396 NULL
@@ -124441,53 +123894,49 @@ index 0000000..3d3508d
+snd_hda_get_num_raw_conns_60462 snd_hda_get_num_raw_conns 0 60462 NULL
+crypto_shash_setkey_60483 crypto_shash_setkey 3 60483 NULL
+lustre_msg_early_size_60496 lustre_msg_early_size 0 60496 NULL
-+xfs_btree_make_block_unfull_60511 xfs_btree_make_block_unfull 0 60511 NULL
++compat_SyS_get_mempolicy_60527 compat_SyS_get_mempolicy 3 60527 NULL
+v9fs_fid_readn_60544 v9fs_fid_readn 4 60544 NULL
+nonpaging_map_60551 nonpaging_map 4 60551 NULL
+osc_lockless_truncate_seq_write_60553 osc_lockless_truncate_seq_write 3 60553 NULL
++xfs_vm_direct_IO_60557 xfs_vm_direct_IO 4 60557 NULL
+tracing_entries_write_60563 tracing_entries_write 3 60563 NULL
+memblock_virt_alloc_try_nid_nopanic_60604 memblock_virt_alloc_try_nid_nopanic 1 60604 NULL
-+inode_change_ok_60614 inode_change_ok 0 60614 NULL
+skb_transport_offset_60619 skb_transport_offset 0 60619 NULL
+wl1273_fm_fops_write_60621 wl1273_fm_fops_write 3 60621 NULL
+acl_alloc_stack_init_60630 acl_alloc_stack_init 1 60630 NULL
+__proc_lnet_stats_60647 __proc_lnet_stats 5 60647 NULL
+if_sdio_host_to_card_60666 if_sdio_host_to_card 4 60666 NULL
+ieee80211_if_read_dot11MeshConfirmTimeout_60670 ieee80211_if_read_dot11MeshConfirmTimeout 3 60670 NULL
-+vga_rcrt_60731 vga_rcrt 0 60731 NULL
+snd_ice1712_ds_read_60754 snd_ice1712_ds_read 0 60754 NULL
+raid_status_60755 raid_status 5 60755 NULL
+sel_write_checkreqprot_60774 sel_write_checkreqprot 3 60774 NULL
+opticon_write_60775 opticon_write 4 60775 NULL
+acl_alloc_num_60778 acl_alloc_num 1-2 60778 NULL
+snd_pcm_oss_readv3_60792 snd_pcm_oss_readv3 3 60792 NULL
-+gfs2_bmap_alloc_60822 gfs2_bmap_alloc 0 60822 NULL
++nvif_object_init_60848 nvif_object_init 6 60848 NULL
+pwr_tx_with_ps_read_60851 pwr_tx_with_ps_read 3 60851 NULL
-+__clone_and_map_data_bio_60861 __clone_and_map_data_bio 4-3 60861 NULL
+alloc_buf_60864 alloc_buf 3-2 60864 NULL
+generic_writepages_60871 generic_writepages 0 60871 NULL
+ext4_update_inline_data_60888 ext4_update_inline_data 3 60888 NULL
+iio_debugfs_read_reg_60908 iio_debugfs_read_reg 3 60908 NULL
+libcfs_sock_ioctl_60915 libcfs_sock_ioctl 0 60915 NULL
+mgt_set_varlen_60916 mgt_set_varlen 4 60916 NULL
-+scrub_chunk_60926 scrub_chunk 5 60926 NULL
+submit_extent_page_60928 submit_extent_page 5 60928 NULL
-+xfs_rtallocate_extent_size_60939 xfs_rtallocate_extent_size 0 60939 NULL
+pti_char_write_60960 pti_char_write 3 60960 NULL
+mwifiex_alloc_sdio_mpa_buffers_60961 mwifiex_alloc_sdio_mpa_buffers 2-3 60961 NULL
+__a2mp_build_60987 __a2mp_build 3 60987 NULL
+hsc_msg_alloc_60990 hsc_msg_alloc 1 60990 NULL
++generic_file_direct_write_60995 generic_file_direct_write 0 60995 NULL
+ath6kl_lrssi_roam_read_61022 ath6kl_lrssi_roam_read 3 61022 NULL
+graph_depth_write_61024 graph_depth_write 3 61024 NULL
+sdhci_pltfm_register_61031 sdhci_pltfm_register 3 61031 NULL
++read_file_ackto_61037 read_file_ackto 3 61037 NULL
+lpfc_idiag_queacc_write_61043 lpfc_idiag_queacc_write 3 61043 NULL
+symtab_init_61050 symtab_init 2 61050 NULL
+fuse_send_write_61053 fuse_send_write 0-4 61053 NULL
+bitmap_scnlistprintf_61062 bitmap_scnlistprintf 0-2 61062 NULL
+ahash_align_buffer_size_61070 ahash_align_buffer_size 0-1-2 61070 NULL
-+xfs_dabuf_map_61093 xfs_dabuf_map 0 61093 NULL
+get_derived_key_61100 get_derived_key 4 61100 NULL
-+mem_cgroup_cache_charge_61101 mem_cgroup_cache_charge 0 61101 NULL
+i40e_calculate_l2fpm_size_61104 i40e_calculate_l2fpm_size 0-4-3-2-1 61104 NULL
+alloc_chrdev_region_61112 alloc_chrdev_region 0 61112 NULL
+__probe_kernel_read_61119 __probe_kernel_read 3 61119 NULL
@@ -124497,14 +123946,16 @@ index 0000000..3d3508d
+event_oom_late_read_61175 event_oom_late_read 3 61175 &pair_device_61175
+dio_bio_add_page_61178 dio_bio_add_page 0 61178 NULL
+SyS_prctl_61202 SyS_prctl 4 61202 NULL
++srp_create_fr_pool_61207 srp_create_fr_pool 3 61207 NULL
+arch_hibernation_header_save_61212 arch_hibernation_header_save 0 61212 NULL
+smk_read_ambient_61220 smk_read_ambient 3 61220 NULL
+v9fs_mmap_file_read_61262 v9fs_mmap_file_read 3 61262 NULL
-+btrfs_bio_alloc_61270 btrfs_bio_alloc 3 61270 NULL nohasharray
-+find_get_pages_tag_61270 find_get_pages_tag 0 61270 &btrfs_bio_alloc_61270 nohasharray
-+ifalias_store_61270 ifalias_store 4 61270 &find_get_pages_tag_61270
-+vortex_adbdma_getlinearpos_61283 vortex_adbdma_getlinearpos 0 61283 NULL nohasharray
-+hfsplus_getxattr_finder_info_61283 hfsplus_getxattr_finder_info 0 61283 &vortex_adbdma_getlinearpos_61283
++kvm_age_hva_61267 kvm_age_hva 2-3 61267 NULL
++find_get_pages_tag_61270 find_get_pages_tag 0 61270 NULL nohasharray
++btrfs_bio_alloc_61270 btrfs_bio_alloc 3 61270 &find_get_pages_tag_61270 nohasharray
++ifalias_store_61270 ifalias_store 4 61270 &btrfs_bio_alloc_61270
++hfsplus_getxattr_finder_info_61283 hfsplus_getxattr_finder_info 0 61283 NULL nohasharray
++vortex_adbdma_getlinearpos_61283 vortex_adbdma_getlinearpos 0 61283 &hfsplus_getxattr_finder_info_61283
+nvme_trans_copy_to_user_61288 nvme_trans_copy_to_user 3 61288 NULL
+xfer_from_user_61307 xfer_from_user 3 61307 NULL
+xfrm_user_sec_ctx_size_61320 xfrm_user_sec_ctx_size 0 61320 NULL
@@ -124514,14 +123965,16 @@ index 0000000..3d3508d
+rx_rx_wa_ba_not_expected_read_61341 rx_rx_wa_ba_not_expected_read 3 61341 NULL
+__dm_get_reserved_ios_61342 __dm_get_reserved_ios 0-3-2 61342 NULL
+f1x_map_sysaddr_to_csrow_61344 f1x_map_sysaddr_to_csrow 2 61344 NULL
++wil_write_file_recovery_61354 wil_write_file_recovery 3 61354 NULL
+debug_debug4_read_61367 debug_debug4_read 3 61367 NULL
+system_enable_write_61396 system_enable_write 3 61396 NULL
+xfs_zero_remaining_bytes_61423 xfs_zero_remaining_bytes 3 61423 NULL
+unix_stream_sendmsg_61455 unix_stream_sendmsg 4 61455 NULL
+snd_pcm_lib_writev_transfer_61483 snd_pcm_lib_writev_transfer 5-4-2 61483 NULL
+btrfs_item_size_61485 btrfs_item_size 0 61485 NULL
-+ocfs2_get_refcount_rec_61514 ocfs2_get_refcount_rec 0 61514 NULL
+erst_errno_61526 erst_errno 0 61526 NULL
++proc_write_device_61541 proc_write_device 3 61541 NULL
++compat_SyS_select_61542 compat_SyS_select 1 61542 NULL
+trace_options_core_write_61551 trace_options_core_write 3 61551 NULL
+dvb_net_ioctl_61559 dvb_net_ioctl 2 61559 NULL
+parport_pc_fifo_write_block_dma_61568 parport_pc_fifo_write_block_dma 3 61568 NULL
@@ -124544,30 +123997,29 @@ index 0000000..3d3508d
+lock_loop_61681 lock_loop 1 61681 NULL
+__do_tune_cpucache_61684 __do_tune_cpucache 2 61684 NULL
+filter_read_61692 filter_read 3 61692 NULL
++SyS_kexec_file_load_61715 SyS_kexec_file_load 3 61715 NULL
+iov_length_61716 iov_length 0 61716 NULL
+fragmentation_threshold_read_61718 fragmentation_threshold_read 3 61718 NULL
+null_alloc_reqbuf_61719 null_alloc_reqbuf 3 61719 NULL
+read_file_interrupt_61742 read_file_interrupt 3 61742 NULL nohasharray
+read_file_regval_61742 read_file_regval 3 61742 &read_file_interrupt_61742
+SyS_sendto_61763 SyS_sendto 6 61763 NULL
-+gfs2_meta_wait_61773 gfs2_meta_wait 0 61773 NULL
-+xfs_file_dio_aio_write_61801 xfs_file_dio_aio_write 0 61801 NULL
+mls_compute_context_len_61812 mls_compute_context_len 0 61812 NULL
+bfad_debugfs_write_regwr_61841 bfad_debugfs_write_regwr 3 61841 NULL
+regcache_sync_block_61846 regcache_sync_block 5-4 61846 NULL
+ath9k_hw_def_dump_eeprom_61853 ath9k_hw_def_dump_eeprom 5-4 61853 NULL
-+fs_path_prepare_for_add_61854 fs_path_prepare_for_add 2 61854 NULL
++__skb_flow_dissect_61855 __skb_flow_dissect 5 61855 NULL
+evdev_compute_buffer_size_61863 evdev_compute_buffer_size 0 61863 NULL
+SYSC_lsetxattr_61869 SYSC_lsetxattr 4 61869 NULL
+get_fw_name_61874 get_fw_name 3 61874 NULL
+btrfs_ioctl_clone_61886 btrfs_ioctl_clone 3-4-5 61886 NULL
+lprocfs_write_frac_u64_helper_61897 lprocfs_write_frac_u64_helper 2 61897 NULL
-+lov_mds_md_stripecnt_61899 lov_mds_md_stripecnt 0-1 61899 NULL
+clear_refs_write_61904 clear_refs_write 3 61904 NULL
++kernfs_name_61910 kernfs_name 3 61910 NULL
+rx_filter_arp_filter_read_61914 rx_filter_arp_filter_read 3 61914 NULL
+au0828_init_isoc_61917 au0828_init_isoc 3-2-4 61917 NULL
+sctp_sendmsg_61919 sctp_sendmsg 4 61919 NULL
-+edac_device_create_instance_61940 edac_device_create_instance 0 61940 NULL
++efi_get_runtime_map_size_61927 efi_get_runtime_map_size 0 61927 NULL
+SyS_kexec_load_61946 SyS_kexec_load 2 61946 NULL
+il4965_ucode_rx_stats_read_61948 il4965_ucode_rx_stats_read 3 61948 NULL
+squashfs_read_id_index_table_61961 squashfs_read_id_index_table 4 61961 NULL
@@ -124575,38 +124027,35 @@ index 0000000..3d3508d
+ocfs2_quota_write_61972 ocfs2_quota_write 4-5 61972 NULL
+fd_locked_ioctl_61978 fd_locked_ioctl 3 61978 NULL
+cow_file_range_61979 cow_file_range 3 61979 NULL
-+set_extent_delalloc_61982 set_extent_delalloc 0 61982 NULL
+dequeue_event_62000 dequeue_event 3 62000 NULL
+xt_compat_match_offset_62011 xt_compat_match_offset 0 62011 NULL
+SyS_setxattr_62019 SyS_setxattr 4 62019 NULL
+jffs2_do_unlink_62020 jffs2_do_unlink 4 62020 NULL
+SYSC_select_62024 SYSC_select 1 62024 NULL
++comedi_write_array_to_buffer_62032 comedi_write_array_to_buffer 3 62032 NULL
+pmcraid_build_passthrough_ioadls_62034 pmcraid_build_passthrough_ioadls 2 62034 NULL
+sctp_user_addto_chunk_62047 sctp_user_addto_chunk 2-3 62047 NULL
+do_pselect_62061 do_pselect 1 62061 NULL
+pcpu_alloc_bootmem_62074 pcpu_alloc_bootmem 2 62074 NULL
-+_xfs_log_force_lsn_62083 _xfs_log_force_lsn 0 62083 NULL
-+fat_setattr_62084 fat_setattr 0 62084 NULL
+jffs2_security_setxattr_62107 jffs2_security_setxattr 4 62107 NULL
-+btrfs_direct_IO_62114 btrfs_direct_IO 4 62114 NULL
+ip_recv_error_62117 ip_recv_error 3 62117 NULL
+generic_block_fiemap_62122 generic_block_fiemap 4 62122 NULL
+llc_ui_header_len_62131 llc_ui_header_len 0 62131 NULL
-+kobject_add_varg_62133 kobject_add_varg 0 62133 NULL nohasharray
-+qib_diag_write_62133 qib_diag_write 3 62133 &kobject_add_varg_62133
-+device_add_attrs_62135 device_add_attrs 0 62135 NULL nohasharray
-+ql_status_62135 ql_status 5 62135 &device_add_attrs_62135
++qib_diag_write_62133 qib_diag_write 3 62133 NULL nohasharray
++kobject_add_varg_62133 kobject_add_varg 0 62133 &qib_diag_write_62133
++ql_status_62135 ql_status 5 62135 NULL nohasharray
++device_add_attrs_62135 device_add_attrs 0 62135 &ql_status_62135
+video_usercopy_62151 video_usercopy 2 62151 NULL
+SyS_getxattr_62166 SyS_getxattr 4 62166 NULL
+prism54_wpa_bss_ie_get_62173 prism54_wpa_bss_ie_get 0 62173 NULL
+write_file_dfs_62180 write_file_dfs 3 62180 NULL
+alloc_upcall_62186 alloc_upcall 2 62186 NULL
++rounded_hashtable_size_62198 rounded_hashtable_size 0 62198 NULL
+sock_kmalloc_62205 sock_kmalloc 2 62205 NULL
+smk_read_syslog_62227 smk_read_syslog 3 62227 NULL
+SYSC_setgroups16_62232 SYSC_setgroups16 1 62232 NULL
-+nfsd_read_file_62241 nfsd_read_file 6 62241 NULL
-+subtract_dirty_62242 subtract_dirty 2-3 62242 NULL
+ion_handle_test_dma_62262 ion_handle_test_dma 4-5 62262 NULL
++get_random_int_62279 get_random_int 0 62279 NULL
+il_dbgfs_sram_read_62296 il_dbgfs_sram_read 3 62296 NULL
+sparse_early_usemaps_alloc_pgdat_section_62304 sparse_early_usemaps_alloc_pgdat_section 2 62304 NULL
+subsystem_filter_read_62310 subsystem_filter_read 3 62310 NULL
@@ -124618,54 +124067,51 @@ index 0000000..3d3508d
+rx_rx_timeout_read_62389 rx_rx_timeout_read 3 62389 NULL
+altera_irscan_62396 altera_irscan 2 62396 NULL
+set_ssp_62411 set_ssp 4 62411 NULL
-+udf_expand_file_adinicb_62470 udf_expand_file_adinicb 0 62470 NULL
-+persistent_ram_new_62493 persistent_ram_new 1-2 62493 NULL
-+ext_rts51x_sd_execute_read_data_62501 ext_rts51x_sd_execute_read_data 9 62501 NULL
++tracing_saved_cmdlines_size_read_62491 tracing_saved_cmdlines_size_read 3 62491 NULL
++srpc_alloc_bulk_62522 srpc_alloc_bulk 2 62522 NULL
+pep_sendmsg_62524 pep_sendmsg 4 62524 NULL
+test_iso_queue_62534 test_iso_queue 5 62534 NULL
+debugfs_read_62535 debugfs_read 3 62535 NULL
+sco_sock_sendmsg_62542 sco_sock_sendmsg 4 62542 NULL
+qib_refresh_qsfp_cache_62547 qib_refresh_qsfp_cache 0 62547 NULL
-+link_send_sections_long_62557 link_send_sections_long 3 62557 NULL
-+compute_bitstructs_62570 compute_bitstructs 0 62570 NULL
+xfrm_user_policy_62573 xfrm_user_policy 4 62573 NULL
+compat_SyS_rt_sigpending_62580 compat_SyS_rt_sigpending 2 62580 NULL
+get_subdir_62581 get_subdir 3 62581 NULL
-+nfsd_vfs_read_62605 nfsd_vfs_read 6 62605 NULL
-+tipc_port_recv_sections_62609 tipc_port_recv_sections 3 62609 NULL
+dut_mode_write_62630 dut_mode_write 3 62630 NULL
+vfs_fsync_range_62635 vfs_fsync_range 0 62635 NULL
+lpfc_sli4_queue_alloc_62646 lpfc_sli4_queue_alloc 3 62646 NULL
+printer_req_alloc_62687 printer_req_alloc 2 62687 NULL
++ieee80211_set_probe_resp_62700 ieee80211_set_probe_resp 3 62700 NULL
+bioset_integrity_create_62708 bioset_integrity_create 2 62708 NULL
+gfs2_log_write_62717 gfs2_log_write 3 62717 NULL
+rdm_62719 rdm 0 62719 NULL
-+add_to_page_cache_62724 add_to_page_cache 0 62724 NULL
+obd_ioctl_popdata_62741 obd_ioctl_popdata 3 62741 NULL
+key_replays_read_62746 key_replays_read 3 62746 NULL
+lov_verify_lmm_62747 lov_verify_lmm 2 62747 NULL
+mwifiex_rdeeprom_write_62754 mwifiex_rdeeprom_write 3 62754 NULL
-+ax25_sendmsg_62770 ax25_sendmsg 4 62770 NULL
++mxt_obj_instances_62764 mxt_obj_instances 0 62764 NULL
++copy_page_to_iter_iovec_62770 copy_page_to_iter_iovec 0-3 62770 NULL nohasharray
++ax25_sendmsg_62770 ax25_sendmsg 4 62770 &copy_page_to_iter_iovec_62770
+C_SYSC_ipc_62776 C_SYSC_ipc 3 62776 NULL
++ptlrpc_req_set_repsize_62784 ptlrpc_req_set_repsize 2 62784 NULL
+SyS_sched_getaffinity_62786 SyS_sched_getaffinity 2 62786 NULL
+dm_stats_account_io_62787 dm_stats_account_io 3 62787 NULL
++__add_action_62798 __add_action 4 62798 NULL
+tracing_total_entries_read_62817 tracing_total_entries_read 3 62817 NULL
+__rounddown_pow_of_two_62836 __rounddown_pow_of_two 0 62836 NULL
+bio_get_nr_vecs_62838 bio_get_nr_vecs 0 62838 NULL
+xlog_recover_add_to_trans_62839 xlog_recover_add_to_trans 4 62839 NULL
+rx_fcs_err_read_62844 rx_fcs_err_read 3 62844 NULL
-+read_nic_io_dword_62859 read_nic_io_dword 0 62859 NULL
+l2tp_ip6_recvmsg_62874 l2tp_ip6_recvmsg 4 62874 NULL
-+xfs_rtmodify_range_62877 xfs_rtmodify_range 0 62877 NULL
+aoechr_write_62883 aoechr_write 3 62883 NULL
+if_spi_host_to_card_62890 if_spi_host_to_card 4 62890 NULL
-+ocfs2_validate_gd_parent_62905 ocfs2_validate_gd_parent 0 62905 NULL
+mempool_create_slab_pool_62907 mempool_create_slab_pool 1 62907 NULL
+getdqbuf_62908 getdqbuf 1 62908 NULL
+ll_statahead_agl_seq_write_62928 ll_statahead_agl_seq_write 3 62928 NULL
+agp_create_user_memory_62955 agp_create_user_memory 1 62955 NULL
-+kstrtoull_from_user_63026 kstrtoull_from_user 2 63026 NULL nohasharray
-+xfs_trans_reserve_63026 xfs_trans_reserve 0 63026 &kstrtoull_from_user_63026
++nvif_object_mthd_62960 nvif_object_mthd 4 62960 NULL
++hwdep_read_62992 hwdep_read 3 62992 NULL
++kstrtoull_from_user_63026 kstrtoull_from_user 2 63026 NULL
+__vb2_perform_fileio_63033 __vb2_perform_fileio 3 63033 NULL
+pipeline_defrag_to_csum_swi_read_63037 pipeline_defrag_to_csum_swi_read 3 63037 NULL
+scsi_host_alloc_63041 scsi_host_alloc 2 63041 NULL
@@ -124675,31 +124121,34 @@ index 0000000..3d3508d
+sep_prepare_input_output_dma_table_in_dcb_63087 sep_prepare_input_output_dma_table_in_dcb 4-5 63087 NULL
+iwl_dbgfs_sensitivity_read_63116 iwl_dbgfs_sensitivity_read 3 63116 NULL
+ext4_chunk_trans_blocks_63123 ext4_chunk_trans_blocks 0-2 63123 NULL
++iwl_mvm_coex_dump_mbox_63153 iwl_mvm_coex_dump_mbox 4-3-0 63153 NULL
+smk_write_revoke_subj_63173 smk_write_revoke_subj 3 63173 NULL
+SyS_syslog_63178 SyS_syslog 3 63178 NULL
+vme_master_read_63221 vme_master_read 0 63221 NULL
+SyS_gethostname_63227 SyS_gethostname 2 63227 NULL
+ptp_read_63251 ptp_read 4 63251 NULL
+xfs_dir2_leaf_getdents_63262 xfs_dir2_leaf_getdents 3 63262 NULL
++iwl_dbgfs_fw_error_dump_read_63263 iwl_dbgfs_fw_error_dump_read 3 63263 NULL
+raid5_resize_63306 raid5_resize 2 63306 NULL
++nfsd_vfs_read_63307 nfsd_vfs_read 5 63307 NULL
+ath10k_read_fw_dbglog_63323 ath10k_read_fw_dbglog 3 63323 NULL
+proc_info_read_63344 proc_info_read 3 63344 NULL
++nvif_device_new_63358 nvif_device_new 5 63358 NULL
+ps_upsd_max_sptime_read_63362 ps_upsd_max_sptime_read 3 63362 NULL
+idmouse_read_63374 idmouse_read 3 63374 NULL
-+usbnet_read_cmd_nopm_63388 usbnet_read_cmd_nopm 7 63388 NULL nohasharray
-+edac_pci_alloc_ctl_info_63388 edac_pci_alloc_ctl_info 1 63388 &usbnet_read_cmd_nopm_63388
++edac_pci_alloc_ctl_info_63388 edac_pci_alloc_ctl_info 1 63388 NULL nohasharray
++usbnet_read_cmd_nopm_63388 usbnet_read_cmd_nopm 7 63388 &edac_pci_alloc_ctl_info_63388
+rxpipe_missed_beacon_host_int_trig_rx_data_read_63405 rxpipe_missed_beacon_host_int_trig_rx_data_read 3 63405 NULL
-+nouveau_event_create_63411 nouveau_event_create 1 63411 NULL
+l2cap_sock_sendmsg_63427 l2cap_sock_sendmsg 4 63427 NULL
+nfsd_symlink_63442 nfsd_symlink 6 63442 NULL
+si5351_bulk_write_63468 si5351_bulk_write 2-3 63468 NULL
+snd_info_entry_write_63474 snd_info_entry_write 3 63474 NULL
+reada_find_extent_63486 reada_find_extent 2 63486 NULL
+read_kcore_63488 read_kcore 3 63488 NULL
++iwl_dbgfs_bcast_filters_read_63489 iwl_dbgfs_bcast_filters_read 3 63489 NULL
+snd_pcm_plug_write_transfer_63503 snd_pcm_plug_write_transfer 0-3 63503 NULL
+efx_mcdi_rpc_async_63529 efx_mcdi_rpc_async 4-5 63529 NULL
-+ubi_more_leb_change_data_63534 ubi_more_leb_change_data 4 63534 NULL nohasharray
-+generic_cont_expand_simple_63534 generic_cont_expand_simple 0 63534 &ubi_more_leb_change_data_63534
++ubi_more_leb_change_data_63534 ubi_more_leb_change_data 4 63534 NULL
+write_file_spectral_period_63536 write_file_spectral_period 3 63536 NULL
+if_sdio_read_scratch_63540 if_sdio_read_scratch 0 63540 NULL
+append_to_buffer_63550 append_to_buffer 3 63550 NULL
@@ -124708,6 +124157,7 @@ index 0000000..3d3508d
+write_debug_level_63613 write_debug_level 3 63613 NULL
+__spi_validate_63618 __spi_validate 0 63618 NULL
+symbol_build_supp_rates_63634 symbol_build_supp_rates 0 63634 NULL
++hid_report_len_63637 hid_report_len 0 63637 NULL
+proc_loginuid_write_63648 proc_loginuid_write 3 63648 NULL
+ValidateDSDParamsChecksum_63654 ValidateDSDParamsChecksum 3 63654 NULL
+ldlm_cli_enqueue_63657 ldlm_cli_enqueue 8 63657 NULL
@@ -124716,23 +124166,25 @@ index 0000000..3d3508d
+write_file_spectral_fft_period_63696 write_file_spectral_fft_period 3 63696 NULL
+nouveau_object_create__63715 nouveau_object_create_ 5 63715 NULL
+btrfs_insert_delayed_dir_index_63720 btrfs_insert_delayed_dir_index 4 63720 NULL
++ntb_debugfs_read_63728 ntb_debugfs_read 3 63728 NULL
+selinux_secctx_to_secid_63744 selinux_secctx_to_secid 2 63744 NULL
+snd_pcm_oss_read1_63771 snd_pcm_oss_read1 3 63771 NULL
+snd_opl4_mem_proc_read_63774 snd_opl4_mem_proc_read 5 63774 NULL
+spidev_compat_ioctl_63778 spidev_compat_ioctl 2 63778 NULL
+mwifiex_11n_create_rx_reorder_tbl_63806 mwifiex_11n_create_rx_reorder_tbl 4 63806 NULL
+copy_nodes_to_user_63807 copy_nodes_to_user 2 63807 NULL
-+prepare_copy_63826 prepare_copy 2 63826 NULL
++C_SYSC_process_vm_readv_63811 C_SYSC_process_vm_readv 3-5 63811 NULL
++regmap_multi_reg_write_63826 regmap_multi_reg_write 3 63826 NULL nohasharray
++prepare_copy_63826 prepare_copy 2 63826 &regmap_multi_reg_write_63826
+sel_write_load_63830 sel_write_load 3 63830 NULL
-+ll_readlink_63836 ll_readlink 3 63836 NULL
+proc_pid_attr_write_63845 proc_pid_attr_write 3 63845 NULL
++nv10_gpio_intr_mask_63862 nv10_gpio_intr_mask 4-3 63862 NULL
+xhci_alloc_stream_info_63902 xhci_alloc_stream_info 3 63902 NULL
+uvc_alloc_urb_buffers_63922 uvc_alloc_urb_buffers 0-2-3 63922 NULL
+snd_compr_write_63923 snd_compr_write 3 63923 NULL
+afs_send_simple_reply_63940 afs_send_simple_reply 3 63940 NULL
+__team_options_register_63941 __team_options_register 3 63941 NULL
+macvtap_recvmsg_63949 macvtap_recvmsg 4 63949 NULL
-+xfs_iflush_63956 xfs_iflush 0 63956 NULL
+set_bredr_63975 set_bredr 4 63975 NULL
+construct_key_and_link_63985 construct_key_and_link 3 63985 NULL
+rs_extent_to_bm_page_63996 rs_extent_to_bm_page 0-1 63996 NULL
@@ -124740,14 +124192,14 @@ index 0000000..3d3508d
+SyS_rt_sigpending_64018 SyS_rt_sigpending 2 64018 NULL
+dbAllocDmapLev_64030 dbAllocDmapLev 0 64030 NULL
+SyS_fsetxattr_64039 SyS_fsetxattr 4 64039 NULL
-+__generic_file_aio_write_64049 __generic_file_aio_write 0 64049 NULL
++nl80211_send_rx_assoc_64040 nl80211_send_rx_assoc 4 64040 NULL
++__sock_create_64069 __sock_create 0 64069 NULL
+get_u8_64076 get_u8 0 64076 NULL
+xilly_malloc_64077 xilly_malloc 2 64077 NULL
+sl_realloc_bufs_64086 sl_realloc_bufs 2 64086 NULL
+vmci_handle_arr_get_size_64088 vmci_handle_arr_get_size 0 64088 NULL
+lbs_highrssi_read_64089 lbs_highrssi_read 3 64089 NULL
-+gfs2_inplace_reserve_64096 gfs2_inplace_reserve 0 64096 NULL nohasharray
-+SyS_set_mempolicy_64096 SyS_set_mempolicy 3 64096 &gfs2_inplace_reserve_64096
++SyS_set_mempolicy_64096 SyS_set_mempolicy 3 64096 NULL
+to_bytes_64103 to_bytes 0-1 64103 NULL
+SyS_mq_timedsend_64107 SyS_mq_timedsend 3 64107 NULL
+rdma_addr_size_64116 rdma_addr_size 0 64116 NULL
@@ -124757,27 +124209,30 @@ index 0000000..3d3508d
+init_bch_64130 init_bch 1-2 64130 NULL
+ablkcipher_copy_iv_64140 ablkcipher_copy_iv 3 64140 NULL
+dlfb_ops_write_64150 dlfb_ops_write 3 64150 NULL
++number_of_tds_64156 number_of_tds 0 64156 NULL
++bnx2x_vf_mcast_64166 bnx2x_vf_mcast 4 64166 NULL
+cpumask_scnprintf_64170 cpumask_scnprintf 0-2 64170 NULL
+kernfs_iop_setxattr_64220 kernfs_iop_setxattr 4 64220 NULL
-+xfs_vm_direct_IO_64223 xfs_vm_direct_IO 4 64223 NULL
+read_pulse_64227 read_pulse 0-3 64227 NULL
+ea_len_64229 ea_len 0 64229 NULL
-+xfs_rtmodify_summary_64265 xfs_rtmodify_summary 0 64265 NULL
+io_capture_transfer_64276 io_capture_transfer 4 64276 NULL
-+btrfs_file_extent_offset_64278 btrfs_file_extent_offset 0 64278 NULL
++btrfs_file_extent_offset_64278 btrfs_file_extent_offset 0 64278 NULL nohasharray
++bpf_check_classic_64278 bpf_check_classic 2 64278 &btrfs_file_extent_offset_64278
+sta_current_tx_rate_read_64286 sta_current_tx_rate_read 3 64286 NULL
-+xfs_dir_cilookup_result_64288 xfs_dir_cilookup_result 3-0 64288 NULL nohasharray
++xfs_dir_cilookup_result_64288 xfs_dir_cilookup_result 3 64288 NULL nohasharray
+event_id_read_64288 event_id_read 3 64288 &xfs_dir_cilookup_result_64288
++info_debugfs_read_64291 info_debugfs_read 3 64291 NULL
+ocfs2_block_check_validate_bhs_64302 ocfs2_block_check_validate_bhs 0 64302 NULL
+snd_hda_get_sub_nodes_64304 snd_hda_get_sub_nodes 0 64304 NULL
+error_error_bar_retry_read_64305 error_error_bar_retry_read 3 64305 NULL
+sisusbcon_clear_64329 sisusbcon_clear 4-3-5 64329 NULL
+ts_write_64336 ts_write 3 64336 NULL
+usbtmc_write_64340 usbtmc_write 3 64340 NULL
-+bnx2x_vfop_mcast_cmd_64354 bnx2x_vfop_mcast_cmd 5 64354 NULL
++qlcnic_82xx_calculate_msix_vector_64354 qlcnic_82xx_calculate_msix_vector 0 64354 NULL
+user_regset_copyin_64360 user_regset_copyin 7 64360 NULL
+wlc_phy_loadsampletable_nphy_64367 wlc_phy_loadsampletable_nphy 3 64367 NULL
-+reg_create_64372 reg_create 5 64372 NULL
++reg_create_64372 reg_create 5 64372 NULL nohasharray
++bnx2_enable_msix_64372 bnx2_enable_msix 2 64372 &reg_create_64372
+ilo_write_64378 ilo_write 3 64378 NULL
+btrfs_map_block_64379 btrfs_map_block 3 64379 NULL
+vmcs_readl_64381 vmcs_readl 0 64381 NULL
@@ -124785,30 +124240,28 @@ index 0000000..3d3508d
+ir_lirc_transmit_ir_64403 ir_lirc_transmit_ir 3 64403 NULL
+pidlist_allocate_64404 pidlist_allocate 1 64404 NULL
+rx_hdr_overflow_read_64407 rx_hdr_overflow_read 3 64407 NULL
-+snd_card_create_64418 snd_card_create 4 64418 NULL nohasharray
-+keyctl_get_security_64418 keyctl_get_security 3 64418 &snd_card_create_64418
++keyctl_get_security_64418 keyctl_get_security 3 64418 NULL
+oom_adj_write_64428 oom_adj_write 3 64428 NULL
+read_file_spectral_short_repeat_64431 read_file_spectral_short_repeat 3 64431 NULL
+ax25_recvmsg_64441 ax25_recvmsg 4 64441 NULL
+single_open_size_64483 single_open_size 4 64483 NULL
-+p54_parse_rssical_64493 p54_parse_rssical 3 64493 NULL nohasharray
-+xfs_inode_ag_walk_64493 xfs_inode_ag_walk 0 64493 &p54_parse_rssical_64493
++p54_parse_rssical_64493 p54_parse_rssical 3 64493 NULL
+msg_data_sz_64503 msg_data_sz 0 64503 NULL
+remove_uuid_64505 remove_uuid 4 64505 NULL
-+crypto_blkcipher_alignmask_64520 crypto_blkcipher_alignmask 0 64520 NULL
+opera1_usb_i2c_msgxfer_64521 opera1_usb_i2c_msgxfer 4 64521 NULL
+iwl_dbgfs_ucode_tracing_write_64524 iwl_dbgfs_ucode_tracing_write 3 64524 NULL
+ses_send_diag_64527 ses_send_diag 4 64527 NULL
+prctl_set_mm_64538 prctl_set_mm 3 64538 NULL
+SyS_bind_64544 SyS_bind 3 64544 NULL
-+rbd_obj_read_sync_64554 rbd_obj_read_sync 4-3 64554 NULL
++rbd_obj_read_sync_64554 rbd_obj_read_sync 3-4 64554 NULL
+__btrfs_prealloc_file_range_64557 __btrfs_prealloc_file_range 3 64557 NULL
-+__spi_sync_64561 __spi_sync 0 64561 NULL nohasharray
-+ll_max_rw_chunk_seq_write_64561 ll_max_rw_chunk_seq_write 3 64561 &__spi_sync_64561
++ll_max_rw_chunk_seq_write_64561 ll_max_rw_chunk_seq_write 3 64561 NULL nohasharray
++__spi_sync_64561 __spi_sync 0 64561 &ll_max_rw_chunk_seq_write_64561
+__apei_exec_run_64563 __apei_exec_run 0 64563 NULL
+kstrtoul_from_user_64569 kstrtoul_from_user 2 64569 NULL
+do_erase_64574 do_erase 4 64574 NULL
+fanotify_write_64623 fanotify_write 3 64623 NULL
++_iwl_dbgfs_d0i3_refs_write_64642 _iwl_dbgfs_d0i3_refs_write 3 64642 NULL
+regmap_read_debugfs_64658 regmap_read_debugfs 5 64658 NULL
+ocfs2_read_xattr_block_64661 ocfs2_read_xattr_block 0 64661 NULL nohasharray
+tlbflush_read_file_64661 tlbflush_read_file 3 64661 &ocfs2_read_xattr_block_64661
@@ -124819,15 +124272,16 @@ index 0000000..3d3508d
+dapm_bias_read_file_64715 dapm_bias_read_file 3 64715 NULL
+atomic_add_return_64720 atomic_add_return 0-1 64720 NULL
+i2400m_msg_to_dev_64722 i2400m_msg_to_dev 3 64722 NULL
-+AscGetChipVersion_64737 AscGetChipVersion 0 64737 NULL
+squashfs_read_inode_lookup_table_64739 squashfs_read_inode_lookup_table 4 64739 NULL
+bio_map_kern_64751 bio_map_kern 3 64751 NULL
+rt2x00debug_write_csr_64753 rt2x00debug_write_csr 3 64753 NULL
++hwdep_write_64776 hwdep_write 3 64776 NULL
+message_for_md_64777 message_for_md 5 64777 NULL
+isr_low_rssi_read_64789 isr_low_rssi_read 3 64789 NULL
+regmap_reg_ranges_read_file_64798 regmap_reg_ranges_read_file 3 64798 NULL
+nfsctl_transaction_write_64800 nfsctl_transaction_write 3 64800 NULL
-+rfkill_fop_write_64808 rfkill_fop_write 3 64808 NULL
++rfkill_fop_write_64808 rfkill_fop_write 3 64808 NULL nohasharray
++nv_mask_64808 nv_mask 0 64808 &rfkill_fop_write_64808
+proc_projid_map_write_64810 proc_projid_map_write 3 64810 NULL
+megaraid_change_queue_depth_64815 megaraid_change_queue_depth 2 64815 NULL
+ecryptfs_send_miscdev_64816 ecryptfs_send_miscdev 2 64816 NULL
@@ -124835,10 +124289,9 @@ index 0000000..3d3508d
+altera_set_dr_pre_64862 altera_set_dr_pre 2 64862 NULL
+pci_vc_do_save_buffer_64876 pci_vc_do_save_buffer 0 64876 NULL
+lprocfs_write_u64_helper_64880 lprocfs_write_u64_helper 2 64880 NULL
-+ffs_epfile_io_64886 ffs_epfile_io 3 64886 NULL
-+xfs_imap_lookup_64906 xfs_imap_lookup 0 64906 NULL
+ieee80211_if_read_ave_beacon_64924 ieee80211_if_read_ave_beacon 3 64924 NULL
-+ip_options_get_from_user_64958 ip_options_get_from_user 4 64958 NULL
++ip_options_get_from_user_64958 ip_options_get_from_user 4 64958 NULL nohasharray
++tipc_port_iovec_reject_64958 tipc_port_iovec_reject 4 64958 &ip_options_get_from_user_64958
+traceprobe_probes_write_64969 traceprobe_probes_write 3 64969 NULL
+suspend_dtim_interval_read_64971 suspend_dtim_interval_read 3 64971 NULL
+crypto_ahash_digestsize_65014 crypto_ahash_digestsize 0 65014 NULL
@@ -124849,16 +124302,16 @@ index 0000000..3d3508d
+__alloc_bootmem_node_high_65076 __alloc_bootmem_node_high 2 65076 NULL
+batadv_socket_write_65083 batadv_socket_write 3 65083 NULL
+ocfs2_truncate_cluster_pages_65086 ocfs2_truncate_cluster_pages 2 65086 NULL
-+ath9k_dump_mci_btcoex_65090 ath9k_dump_mci_btcoex 3-0 65090 NULL
-+generic_ocp_write_65107 generic_ocp_write 4 65107 NULL
-+__xfs_bmapi_allocate_65142 __xfs_bmapi_allocate 0 65142 NULL
++ath9k_dump_mci_btcoex_65090 ath9k_dump_mci_btcoex 0-3 65090 NULL
++usbtest_alloc_urb_65115 usbtest_alloc_urb 3-5 65115 NULL
+rx_rx_done_read_65217 rx_rx_done_read 3 65217 NULL
-+print_endpoint_stat_65232 print_endpoint_stat 3-4-0 65232 NULL
++nouveau_event_create_65229 nouveau_event_create 2-1 65229 NULL
++print_endpoint_stat_65232 print_endpoint_stat 0-4-3 65232 NULL
+whci_n_caps_65247 whci_n_caps 0 65247 NULL
+kmalloc_parameter_65279 kmalloc_parameter 1 65279 NULL
-+xfs_btree_check_ptr_65281 xfs_btree_check_ptr 0 65281 NULL
+compat_core_sys_select_65285 compat_core_sys_select 1 65285 NULL
+mpi_set_buffer_65294 mpi_set_buffer 3 65294 NULL
++fat_direct_IO_65295 fat_direct_IO 4 65295 NULL
+redirected_tty_write_65297 redirected_tty_write 3 65297 NULL
+get_var_len_65304 get_var_len 0 65304 NULL
+unpack_array_65318 unpack_array 0 65318 NULL
@@ -124870,14 +124323,12 @@ index 0000000..3d3508d
+__alloc_bootmem_nopanic_65397 __alloc_bootmem_nopanic 1 65397 NULL
+trace_seq_to_user_65398 trace_seq_to_user 3 65398 NULL
+__read_vmcore_65402 __read_vmcore 2 65402 NULL
-+usb_ep_enable_65405 usb_ep_enable 0 65405 NULL
+ocfs2_write_begin_nolock_65410 ocfs2_write_begin_nolock 3-4 65410 NULL
+device_add_groups_65423 device_add_groups 0 65423 NULL
+xpc_kzalloc_cacheline_aligned_65433 xpc_kzalloc_cacheline_aligned 1 65433 NULL
+usb_alloc_coherent_65444 usb_alloc_coherent 2 65444 NULL
+il_dbgfs_wd_timeout_write_65464 il_dbgfs_wd_timeout_write 3 65464 NULL
+clear_user_65470 clear_user 2 65470 NULL
-+xfs_alloc_lookup_ge_65481 xfs_alloc_lookup_ge 0 65481 NULL
+dpcm_state_read_file_65489 dpcm_state_read_file 3 65489 NULL
+lookup_inline_extent_backref_65493 lookup_inline_extent_backref 9 65493 NULL
+nvme_trans_standard_inquiry_page_65526 nvme_trans_standard_inquiry_page 4 65526 NULL
@@ -126297,10 +125748,10 @@ index 0000000..4ee2231
+ return 0;
+}
diff --git a/tools/include/linux/compiler.h b/tools/include/linux/compiler.h
-index fbc6665..5e9ce79 100644
+index 88461f0..6fb70a0 100644
--- a/tools/include/linux/compiler.h
+++ b/tools/include/linux/compiler.h
-@@ -35,4 +35,12 @@
+@@ -35,6 +35,14 @@
# define unlikely(x) __builtin_expect(!!(x), 0)
#endif
@@ -126312,12 +125763,14 @@ index fbc6665..5e9ce79 100644
+# define __intentional_overflow(...)
+#endif
+
+ #define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
+
#endif /* _TOOLS_LINUX_COMPILER_H */
diff --git a/tools/lib/api/Makefile b/tools/lib/api/Makefile
-index ed2f51e..cc2d8f6 100644
+index 36c08b1..87c72d1 100644
--- a/tools/lib/api/Makefile
+++ b/tools/lib/api/Makefile
-@@ -14,7 +14,7 @@ LIB_OBJS += $(OUTPUT)fs/debugfs.o
+@@ -21,7 +21,7 @@ LIB_OBJS += $(OUTPUT)fd/array.o
LIBFILE = libapikfs.a
@@ -126352,10 +125805,10 @@ index 0a578fe..b81f62d 100644
})
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
-index 6611253..eb4bc0f 100644
+index 3cee7b1..29cb7d8 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
-@@ -77,12 +77,17 @@ LIST_HEAD(vm_list);
+@@ -78,12 +78,17 @@ LIST_HEAD(vm_list);
static cpumask_var_t cpus_hardware_enabled;
static int kvm_usage_count = 0;
@@ -126375,7 +125828,7 @@ index 6611253..eb4bc0f 100644
struct dentry *kvm_debugfs_dir;
-@@ -768,7 +773,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
+@@ -786,7 +791,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
/* We can read the guest memory with __xxx_user() later on. */
if ((mem->slot < KVM_USER_MEM_SLOTS) &&
((mem->userspace_addr & (PAGE_SIZE - 1)) ||
@@ -126384,7 +125837,7 @@ index 6611253..eb4bc0f 100644
(void __user *)(unsigned long)mem->userspace_addr,
mem->memory_size)))
goto out;
-@@ -1625,9 +1630,17 @@ EXPORT_SYMBOL_GPL(kvm_read_guest_cached);
+@@ -1690,9 +1695,17 @@ EXPORT_SYMBOL_GPL(kvm_read_guest_cached);
int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len)
{
@@ -126404,7 +125857,7 @@ index 6611253..eb4bc0f 100644
}
EXPORT_SYMBOL_GPL(kvm_clear_guest_page);
-@@ -1877,7 +1890,7 @@ static int kvm_vcpu_release(struct inode *inode, struct file *filp)
+@@ -1941,7 +1954,7 @@ static int kvm_vcpu_release(struct inode *inode, struct file *filp)
return 0;
}
@@ -126413,7 +125866,7 @@ index 6611253..eb4bc0f 100644
.release = kvm_vcpu_release,
.unlocked_ioctl = kvm_vcpu_ioctl,
#ifdef CONFIG_COMPAT
-@@ -2545,7 +2558,7 @@ out:
+@@ -2650,7 +2663,7 @@ out:
}
#endif
@@ -126422,7 +125875,7 @@ index 6611253..eb4bc0f 100644
.release = kvm_vm_release,
.unlocked_ioctl = kvm_vm_ioctl,
#ifdef CONFIG_COMPAT
-@@ -2645,7 +2658,7 @@ out:
+@@ -2721,7 +2734,7 @@ out:
return r;
}
@@ -126431,7 +125884,7 @@ index 6611253..eb4bc0f 100644
.unlocked_ioctl = kvm_dev_ioctl,
.compat_ioctl = kvm_dev_ioctl,
.llseek = noop_llseek,
-@@ -2671,7 +2684,7 @@ static void hardware_enable_nolock(void *junk)
+@@ -2747,7 +2760,7 @@ static void hardware_enable_nolock(void *junk)
if (r) {
cpumask_clear_cpu(cpu, cpus_hardware_enabled);
@@ -126440,7 +125893,7 @@ index 6611253..eb4bc0f 100644
printk(KERN_INFO "kvm: enabling virtualization on "
"CPU%d failed\n", cpu);
}
-@@ -2727,10 +2740,10 @@ static int hardware_enable_all(void)
+@@ -2803,10 +2816,10 @@ static int hardware_enable_all(void)
kvm_usage_count++;
if (kvm_usage_count == 1) {
@@ -126453,7 +125906,7 @@ index 6611253..eb4bc0f 100644
hardware_disable_all_nolock();
r = -EBUSY;
}
-@@ -3134,7 +3147,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
+@@ -3213,7 +3226,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
kvm_arch_vcpu_put(vcpu);
}
@@ -126462,7 +125915,7 @@ index 6611253..eb4bc0f 100644
struct module *module)
{
int r;
-@@ -3181,7 +3194,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
+@@ -3260,7 +3273,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
if (!vcpu_align)
vcpu_align = __alignof__(struct kvm_vcpu);
kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, vcpu_align,
@@ -126471,7 +125924,7 @@ index 6611253..eb4bc0f 100644
if (!kvm_vcpu_cache) {
r = -ENOMEM;
goto out_free_3;
-@@ -3191,9 +3204,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
+@@ -3270,9 +3283,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
if (r)
goto out_free;
@@ -126483,7 +125936,7 @@ index 6611253..eb4bc0f 100644
r = misc_register(&kvm_dev);
if (r) {
-@@ -3203,9 +3218,6 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
+@@ -3282,9 +3297,6 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
register_syscore_ops(&kvm_syscore_ops);
diff --git a/main/linux-virtgrsec/kernelconfig.x86 b/main/linux-virtgrsec/kernelconfig.x86
index e70baf4dc7..bd160404f9 100644
--- a/main/linux-virtgrsec/kernelconfig.x86
+++ b/main/linux-virtgrsec/kernelconfig.x86
@@ -1,11 +1,12 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.5 Kernel Configuration
+# Linux/i386 3.18.6 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
CONFIG_X86=y
CONFIG_INSTRUCTION_DECODER=y
+CONFIG_PERF_EVENTS_INTEL_UNCORE=y
CONFIG_OUTPUT_FORMAT="elf32-i386"
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
CONFIG_LOCKDEP_SUPPORT=y
@@ -22,7 +23,6 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_ARCH_HAS_CPU_RELAX=y
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
@@ -39,6 +39,7 @@ CONFIG_X86_32_SMP=y
CONFIG_X86_HT=y
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_FIX_EARLYCON_MEM=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -68,21 +69,27 @@ CONFIG_SWAP=y
CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_POSIX_MQUEUE is not set
+CONFIG_CROSS_MEMORY_ATTACH=y
# CONFIG_FHANDLE is not set
+# CONFIG_USELIB is not set
# CONFIG_AUDIT is not set
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
#
# IRQ subsystem
#
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_LEGACY_ALLOC_HWIRQ=y
CONFIG_GENERIC_PENDING_IRQ=y
CONFIG_IRQ_DOMAIN=y
# CONFIG_IRQ_DOMAIN_DEBUG is not set
CONFIG_IRQ_FORCED_THREADING=y
CONFIG_SPARSE_IRQ=y
CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_KTIME_SCALAR=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
@@ -116,6 +123,7 @@ CONFIG_TASK_IO_ACCOUNTING=y
#
CONFIG_TREE_RCU=y
# CONFIG_PREEMPT_RCU is not set
+# CONFIG_TASKS_RCU is not set
CONFIG_RCU_STALL_COMMON=y
CONFIG_RCU_FANOUT=32
CONFIG_RCU_FANOUT_LEAF=16
@@ -123,12 +131,12 @@ CONFIG_RCU_FANOUT_LEAF=16
CONFIG_RCU_FAST_NO_HZ=y
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_RCU_NOCB_CPU is not set
+CONFIG_BUILD_BIN2C=y
CONFIG_IKCONFIG=m
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=14
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
-CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
CONFIG_CGROUPS=y
# CONFIG_CGROUP_DEBUG is not set
CONFIG_CGROUP_FREEZER=y
@@ -166,8 +174,11 @@ CONFIG_ANON_INODES=y
CONFIG_HAVE_UID16=y
CONFIG_SYSCTL_EXCEPTION_TRACE=y
CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_BPF=y
CONFIG_EXPERT=y
CONFIG_UID16=y
+# CONFIG_SGETMASK_SYSCALL is not set
+# CONFIG_SYSFS_SYSCALL is not set
CONFIG_SYSCTL_SYSCALL=y
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
@@ -181,8 +192,10 @@ CONFIG_EPOLL=y
CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
+# CONFIG_BPF_SYSCALL is not set
CONFIG_SHMEM=y
CONFIG_AIO=y
+CONFIG_ADVISE_SYSCALLS=y
CONFIG_PCI_QUIRKS=y
CONFIG_EMBEDDED=y
CONFIG_HAVE_PERF_EVENTS=y
@@ -205,6 +218,7 @@ CONFIG_HAVE_OPROFILE=y
CONFIG_OPROFILE_NMI_TIMER=y
# CONFIG_KPROBES is not set
# CONFIG_JUMP_LABEL is not set
+# CONFIG_UPROBES is not set
# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
CONFIG_ARCH_USE_BUILTIN_BSWAP=y
@@ -236,7 +250,6 @@ CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
# CONFIG_CC_STACKPROTECTOR is not set
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_ARCH_SOFT_DIRTY=y
CONFIG_MODULES_USE_ELF_REL=y
CONFIG_CLONE_BACKWARDS=y
CONFIG_OLD_SIGSUSPEND3=y
@@ -256,6 +269,7 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
# CONFIG_MODULE_SIG is not set
+# CONFIG_MODULE_COMPRESS is not set
CONFIG_STOP_MACHINE=y
CONFIG_BLOCK=y
CONFIG_LBDAF=y
@@ -307,7 +321,11 @@ CONFIG_INLINE_READ_UNLOCK=y
CONFIG_INLINE_READ_UNLOCK_IRQ=y
CONFIG_INLINE_WRITE_UNLOCK=y
CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_ARCH_USE_QUEUE_RWLOCK=y
+CONFIG_QUEUE_RWLOCK=y
CONFIG_FREEZER=y
#
@@ -315,17 +333,18 @@ CONFIG_FREEZER=y
#
CONFIG_ZONE_DMA=y
CONFIG_SMP=y
+CONFIG_X86_FEATURE_NAMES=y
# CONFIG_X86_MPPARSE is not set
CONFIG_X86_BIGSMP=y
# CONFIG_X86_EXTENDED_PLATFORM is not set
# CONFIG_X86_INTEL_LPSS is not set
+# CONFIG_IOSF_MBI is not set
# CONFIG_X86_32_IRIS is not set
CONFIG_SCHED_OMIT_FRAME_POINTER=y
CONFIG_HYPERVISOR_GUEST=y
CONFIG_PARAVIRT=y
# CONFIG_PARAVIRT_DEBUG is not set
CONFIG_PARAVIRT_SPINLOCKS=y
-# CONFIG_XEN_PRIVILEGED_GUEST is not set
CONFIG_KVM_GUEST=y
CONFIG_KVM_DEBUG_FS=y
# CONFIG_LGUEST_GUEST is not set
@@ -382,12 +401,12 @@ CONFIG_SCHED_MC=y
CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set
+CONFIG_X86_UP_APIC_MSI=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
# CONFIG_X86_MCE is not set
CONFIG_VM86=y
-# CONFIG_X86_16BIT is not set
# CONFIG_TOSHIBA is not set
# CONFIG_I8K is not set
# CONFIG_X86_REBOOTFIXUPS is not set
@@ -425,6 +444,7 @@ CONFIG_ARCH_DISCARD_MEMBLOCK=y
# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MEMORY_BALLOON=y
CONFIG_BALLOON_COMPACTION=y
CONFIG_COMPACTION=y
CONFIG_MIGRATION=y
@@ -437,13 +457,14 @@ CONFIG_MMU_NOTIFIER=y
CONFIG_KSM=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
# CONFIG_TRANSPARENT_HUGEPAGE is not set
-CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
# CONFIG_FRONTSWAP is not set
# CONFIG_CMA is not set
+# CONFIG_ZPOOL is not set
# CONFIG_ZBUD is not set
CONFIG_ZSMALLOC=y
# CONFIG_PGTABLE_MAPPING is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
# CONFIG_HIGHPTE is not set
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
CONFIG_X86_RESERVE_LOW=64
@@ -488,9 +509,10 @@ CONFIG_PM=y
# CONFIG_PM_DEBUG is not set
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ACPI=y
+CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
+CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_PROCFS=y
-CONFIG_ACPI_PROCFS_POWER=n
+# CONFIG_ACPI_PROCFS_POWER is not set
CONFIG_ACPI_EC_DEBUGFS=y
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
@@ -512,6 +534,9 @@ CONFIG_ACPI_CONTAINER=y
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=m
# CONFIG_ACPI_CUSTOM_METHOD is not set
+# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
+CONFIG_HAVE_ACPI_APEI=y
+CONFIG_HAVE_ACPI_APEI_NMI=y
CONFIG_ACPI_APEI=y
# CONFIG_ACPI_APEI_GHES is not set
CONFIG_ACPI_APEI_EINJ=m
@@ -528,7 +553,6 @@ CONFIG_ACPI_APEI_ERST_DEBUG=y
# CPU Idle
#
CONFIG_CPU_IDLE=y
-# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
@@ -601,6 +625,7 @@ CONFIG_HAVE_AOUT=y
CONFIG_BINFMT_MISC=m
CONFIG_COREDUMP=y
CONFIG_HAVE_ATOMIC_IOMAP=y
+CONFIG_PMC_ATOM=y
CONFIG_NET=y
#
@@ -642,6 +667,9 @@ CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
CONFIG_IP_PIMSM_V2=y
CONFIG_SYN_COOKIES=y
CONFIG_NET_IPVTI=m
+CONFIG_NET_UDP_TUNNEL=m
+# CONFIG_NET_FOU is not set
+# CONFIG_GENEVE is not set
CONFIG_INET_AH=m
CONFIG_INET_ESP=m
CONFIG_INET_IPCOMP=m
@@ -667,6 +695,7 @@ CONFIG_TCP_CONG_LP=m
CONFIG_TCP_CONG_VENO=m
CONFIG_TCP_CONG_YEAH=m
CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
CONFIG_DEFAULT_CUBIC=y
# CONFIG_DEFAULT_RENO is not set
CONFIG_DEFAULT_TCP_CONG="cubic"
@@ -697,11 +726,12 @@ CONFIG_IPV6_MROUTE=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
CONFIG_IPV6_PIMSM_V2=y
CONFIG_NETWORK_SECMARK=y
+CONFIG_NET_PTP_CLASSIFY=y
CONFIG_NETWORK_PHY_TIMESTAMPING=y
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=y
+CONFIG_BRIDGE_NETFILTER=m
#
# Core Netfilter Configuration
@@ -711,6 +741,7 @@ CONFIG_NETFILTER_NETLINK_ACCT=m
CONFIG_NETFILTER_NETLINK_QUEUE=m
CONFIG_NETFILTER_NETLINK_LOG=m
CONFIG_NF_CONNTRACK=m
+CONFIG_NF_LOG_COMMON=m
CONFIG_NF_CONNTRACK_MARK=y
CONFIG_NF_CONNTRACK_SECMARK=y
CONFIG_NF_CONNTRACK_ZONES=y
@@ -759,6 +790,7 @@ CONFIG_NFT_HASH=m
CONFIG_NFT_COUNTER=m
CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
CONFIG_NFT_NAT=m
CONFIG_NFT_QUEUE=m
CONFIG_NFT_REJECT=m
@@ -787,6 +819,7 @@ CONFIG_NETFILTER_XT_TARGET_HMARK=m
CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
CONFIG_NETFILTER_XT_TARGET_LOG=m
CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
CONFIG_NETFILTER_XT_TARGET_NETMAP=m
CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -855,9 +888,11 @@ CONFIG_IP_SET_BITMAP_IP=m
CONFIG_IP_SET_BITMAP_IPMAC=m
CONFIG_IP_SET_BITMAP_PORT=m
CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
CONFIG_IP_SET_HASH_IPPORT=m
CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_MAC=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m
CONFIG_IP_SET_HASH_NETNET=m
@@ -886,6 +921,7 @@ CONFIG_IP_VS_RR=m
CONFIG_IP_VS_WRR=m
CONFIG_IP_VS_LC=m
CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
CONFIG_IP_VS_LBLC=m
CONFIG_IP_VS_LBLCR=m
CONFIG_IP_VS_DH=m
@@ -911,11 +947,21 @@ CONFIG_IP_VS_PE_SIP=m
CONFIG_NF_DEFRAG_IPV4=m
CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+# CONFIG_NF_LOG_ARP is not set
+CONFIG_NF_LOG_IPV4=m
CONFIG_NF_TABLES_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NF_TABLES_ARP=m
+CONFIG_NF_NAT_IPV4=m
+CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NF_NAT_MASQUERADE_IPV4=m
+CONFIG_NFT_MASQ_IPV4=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m
@@ -924,15 +970,10 @@ CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT_IPV4=m
+CONFIG_IP_NF_NAT=m
CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_TARGET_CLUSTERIP=m
CONFIG_IP_NF_TARGET_ECN=m
@@ -949,8 +990,13 @@ CONFIG_NF_DEFRAG_IPV6=m
CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
+CONFIG_NF_REJECT_IPV6=m
CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
+CONFIG_NF_NAT_MASQUERADE_IPV6=m
+CONFIG_NFT_MASQ_IPV6=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -967,7 +1013,7 @@ CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m
-CONFIG_NF_NAT_IPV6=m
+CONFIG_IP6_NF_NAT=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m
@@ -976,6 +1022,9 @@ CONFIG_IP6_NF_TARGET_NPT=m
#
CONFIG_DECNET_NF_GRABULATOR=m
CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_META=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_LOG_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -996,7 +1045,6 @@ CONFIG_BRIDGE_EBT_MARK_T=m
CONFIG_BRIDGE_EBT_REDIRECT=m
CONFIG_BRIDGE_EBT_SNAT=m
CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
CONFIG_BRIDGE_EBT_NFLOG=m
CONFIG_IP_DCCP=m
CONFIG_INET_DCCP_DIAG=m
@@ -1059,9 +1107,8 @@ CONFIG_IPDDP_ENCAP=y
CONFIG_X25=m
CONFIG_LAPB=m
CONFIG_PHONET=m
+# CONFIG_6LOWPAN is not set
CONFIG_IEEE802154=m
-CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_6LOWPAN_IPHC=m
CONFIG_MAC802154=m
CONFIG_NET_SCHED=y
@@ -1146,7 +1193,7 @@ CONFIG_NET_MPLS_GSO=m
CONFIG_RPS=y
CONFIG_RFS_ACCEL=y
CONFIG_XPS=y
-CONFIG_CGROUP_NET_PRIO=m
+# CONFIG_CGROUP_NET_PRIO is not set
CONFIG_CGROUP_NET_CLASSID=y
CONFIG_NET_RX_BUSY_POLL=y
CONFIG_BQL=y
@@ -1181,6 +1228,7 @@ CONFIG_CEPH_LIB=m
#
# Generic Driver Options
#
+CONFIG_UEVENT_HELPER=y
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
@@ -1189,20 +1237,23 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=m
# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_ALLOW_DEV_COREDUMP=y
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_GENERIC_CPU_AUTOPROBE=y
CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_FENCE_TRACE is not set
#
# Bus devices
#
CONFIG_CONNECTOR=m
# CONFIG_MTD is not set
-CONFIG_PARPORT=m
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
# CONFIG_PARPORT_PC_FIFO is not set
@@ -1223,6 +1274,7 @@ CONFIG_BLK_DEV_FD=m
# CONFIG_PARIDE is not set
CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
CONFIG_ZRAM=m
+# CONFIG_ZRAM_LZ4_COMPRESS is not set
# CONFIG_ZRAM_DEBUG is not set
# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set
@@ -1256,7 +1308,6 @@ CONFIG_BLK_DEV_RBD=m
# CONFIG_SGI_IOC4 is not set
# CONFIG_TIFM_CORE is not set
# CONFIG_ICS932S401 is not set
-# CONFIG_ATMEL_SSC is not set
# CONFIG_ENCLOSURE_SERVICES is not set
# CONFIG_HP_ILO is not set
# CONFIG_APDS9802ALS is not set
@@ -1298,15 +1349,22 @@ CONFIG_TI_ST=m
# CONFIG_ALTERA_STAPL is not set
# CONFIG_INTEL_MEI is not set
# CONFIG_INTEL_MEI_ME is not set
+# CONFIG_INTEL_MEI_TXE is not set
CONFIG_VMWARE_VMCI=m
#
+# Intel MIC Bus Driver
+#
+
+#
# Intel MIC Host Driver
#
#
# Intel MIC Card Driver
#
+# CONFIG_ECHO is not set
+# CONFIG_CXL_BASE is not set
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -1317,8 +1375,8 @@ CONFIG_SCSI_MOD=y
CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y
CONFIG_SCSI_DMA=y
-CONFIG_SCSI_TGT=m
CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_MQ_DEFAULT is not set
CONFIG_SCSI_PROC_FS=y
#
@@ -1331,7 +1389,6 @@ CONFIG_BLK_DEV_SR=m
# CONFIG_BLK_DEV_SR_VENDOR is not set
CONFIG_CHR_DEV_SG=m
CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
CONFIG_SCSI_SCAN_ASYNC=y
@@ -1341,14 +1398,12 @@ CONFIG_SCSI_SCAN_ASYNC=y
#
CONFIG_SCSI_SPI_ATTRS=m
CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_FC_TGT_ATTRS=y
CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_SAS_ATTRS=m
CONFIG_SCSI_SAS_LIBSAS=m
CONFIG_SCSI_SAS_ATA=y
CONFIG_SCSI_SAS_HOST_SMP=y
CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
CONFIG_SCSI_LOWLEVEL=y
CONFIG_ISCSI_TCP=m
CONFIG_ISCSI_BOOT_SYSFS=m
@@ -1416,7 +1471,6 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_DEBUG is not set
# CONFIG_SCSI_PMCRAID is not set
# CONFIG_SCSI_PM8001 is not set
-# CONFIG_SCSI_SRP is not set
# CONFIG_SCSI_BFA_FC is not set
CONFIG_SCSI_VIRTIO=m
# CONFIG_SCSI_CHELSIO_FCOE is not set
@@ -1433,7 +1487,6 @@ CONFIG_ATA=y
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_ATA_VERBOSE_ERROR=y
CONFIG_ATA_ACPI=y
-# CONFIG_SATA_ZPODD is not set
CONFIG_SATA_PMP=y
#
@@ -1458,11 +1511,9 @@ CONFIG_ATA_BMDMA=y
# SATA SFF controllers with BMDMA
#
CONFIG_ATA_PIIX=y
-# CONFIG_SATA_HIGHBANK is not set
# CONFIG_SATA_MV is not set
# CONFIG_SATA_NV is not set
# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_RCAR is not set
# CONFIG_SATA_SIL is not set
# CONFIG_SATA_SIS is not set
# CONFIG_SATA_SVW is not set
@@ -1475,7 +1526,6 @@ CONFIG_ATA_PIIX=y
#
# CONFIG_PATA_ALI is not set
# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARASAN_CF is not set
# CONFIG_PATA_ARTOP is not set
# CONFIG_PATA_ATIIXP is not set
# CONFIG_PATA_ATP867X is not set
@@ -1555,6 +1605,7 @@ CONFIG_DM_THIN_PROVISIONING=m
CONFIG_DM_CACHE=m
CONFIG_DM_CACHE_MQ=m
CONFIG_DM_CACHE_CLEANER=m
+CONFIG_DM_ERA=m
CONFIG_DM_MIRROR=m
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_RAID=m
@@ -1621,7 +1672,6 @@ CONFIG_VXLAN=m
CONFIG_NETCONSOLE=m
CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
CONFIG_NET_POLL_CONTROLLER=y
CONFIG_TUN=m
CONFIG_VETH=m
@@ -1646,21 +1696,26 @@ CONFIG_VHOST=m
# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
# CONFIG_NET_DSA_MV88E6131 is not set
# CONFIG_NET_DSA_MV88E6123_61_65 is not set
+# CONFIG_NET_DSA_MV88E6171 is not set
+# CONFIG_NET_DSA_BCM_SF2 is not set
CONFIG_ETHERNET=y
# CONFIG_NET_VENDOR_3COM is not set
# CONFIG_NET_VENDOR_ADAPTEC is not set
+CONFIG_NET_VENDOR_AGERE=y
+# CONFIG_ET131X is not set
# CONFIG_NET_VENDOR_ALTEON is not set
+# CONFIG_ALTERA_TSE is not set
CONFIG_NET_VENDOR_AMD=y
# CONFIG_AMD8111_ETH is not set
CONFIG_PCNET32=m
+# CONFIG_NET_XGENE is not set
# CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_VENDOR_ATHEROS is not set
-# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_VENDOR_BROCADE is not set
-# CONFIG_NET_CALXEDA_XGMAC is not set
# CONFIG_NET_VENDOR_CHELSIO is not set
# CONFIG_NET_VENDOR_CISCO is not set
+# CONFIG_CX_ECAT is not set
# CONFIG_DNET is not set
CONFIG_NET_VENDOR_DEC=y
CONFIG_NET_TULIP=y
@@ -1688,6 +1743,7 @@ CONFIG_E1000=m
# CONFIG_IXGBEVF is not set
# CONFIG_I40E is not set
# CONFIG_I40EVF is not set
+# CONFIG_FM10K is not set
# CONFIG_NET_VENDOR_I825XX is not set
# CONFIG_IP1000 is not set
# CONFIG_JME is not set
@@ -1705,6 +1761,7 @@ CONFIG_NET_VENDOR_MELLANOX=y
# CONFIG_ETHOC is not set
# CONFIG_NET_PACKET_ENGINE is not set
# CONFIG_NET_VENDOR_QLOGIC is not set
+# CONFIG_NET_VENDOR_QUALCOMM is not set
CONFIG_NET_VENDOR_REALTEK=y
# CONFIG_ATP is not set
CONFIG_8139CP=m
@@ -1714,8 +1771,8 @@ CONFIG_8139TOO_PIO=y
# CONFIG_8139TOO_8129 is not set
# CONFIG_8139_OLD_RX_RESET is not set
CONFIG_R8169=m
-# CONFIG_SH_ETH is not set
# CONFIG_NET_VENDOR_RDC is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
# CONFIG_NET_VENDOR_SEEQ is not set
# CONFIG_NET_VENDOR_SILAN is not set
# CONFIG_NET_VENDOR_SIS is not set
@@ -1745,6 +1802,7 @@ CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
CONFIG_BROADCOM_PHY=m
+# CONFIG_BCM7XXX_PHY is not set
CONFIG_BCM87XX_PHY=m
CONFIG_ICPLUS_PHY=m
CONFIG_REALTEK_PHY=m
@@ -1754,13 +1812,15 @@ CONFIG_LSI_ET1011C_PHY=m
CONFIG_MICREL_PHY=m
CONFIG_MDIO_BITBANG=m
CONFIG_MDIO_GPIO=m
+# CONFIG_MDIO_BCM_UNIMAC is not set
# CONFIG_PLIP is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
#
-# USB Network Adapters
+# Host-side USB support is needed for USB Network Adapter support
#
+CONFIG_USB_NET_DRIVERS=m
# CONFIG_USB_CATC is not set
# CONFIG_USB_KAWETH is not set
# CONFIG_USB_PEGASUS is not set
@@ -1854,6 +1914,7 @@ CONFIG_INPUT_MISC=y
# CONFIG_INPUT_MPU3050 is not set
# CONFIG_INPUT_APANEL is not set
# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_BEEPER is not set
# CONFIG_INPUT_GPIO_TILT_POLLED is not set
# CONFIG_INPUT_WISTRON_BTNS is not set
# CONFIG_INPUT_ATLAS_BTNS is not set
@@ -1870,6 +1931,8 @@ CONFIG_INPUT_MISC=y
# CONFIG_INPUT_IMS_PCU is not set
# CONFIG_INPUT_CMA3000 is not set
# CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set
+# CONFIG_INPUT_DRV260X_HAPTICS is not set
+# CONFIG_INPUT_DRV2667_HAPTICS is not set
#
# Hardware I/O ports
@@ -1910,11 +1973,11 @@ CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
#
# Serial drivers
#
+CONFIG_SERIAL_EARLYCON=y
CONFIG_SERIAL_8250=y
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
CONFIG_SERIAL_8250_PNP=y
CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_FIX_EARLYCON_MEM=y
CONFIG_SERIAL_8250_DMA=y
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_NR_UARTS=16
@@ -1925,6 +1988,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
# CONFIG_SERIAL_8250_DETECT_IRQ is not set
CONFIG_SERIAL_8250_RSA=y
# CONFIG_SERIAL_8250_DW is not set
+# CONFIG_SERIAL_8250_FINTEK is not set
#
# Non-8250 serial port support
@@ -1934,6 +1998,7 @@ CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_SERIAL_JSM=m
# CONFIG_SERIAL_SCCNXP is not set
+# CONFIG_SERIAL_SC16IS7XX is not set
CONFIG_SERIAL_TIMBERDALE=m
CONFIG_SERIAL_ALTERA_JTAGUART=m
CONFIG_SERIAL_ALTERA_UART=m
@@ -1972,6 +2037,11 @@ CONFIG_HPET_MMAP=y
CONFIG_HANGCHECK_TIMER=m
# CONFIG_TCG_TPM is not set
# CONFIG_TELCLOCK is not set
+# CONFIG_XILLYBUS is not set
+
+#
+# I2C support
+#
CONFIG_I2C=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_COMPAT=y
@@ -2019,7 +2089,6 @@ CONFIG_I2C_PIIX4=m
# I2C system bus drivers (mostly embedded / system-on-chip)
#
# CONFIG_I2C_CBUS_GPIO is not set
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
# CONFIG_I2C_DESIGNWARE_PCI is not set
# CONFIG_I2C_EG20T is not set
# CONFIG_I2C_GPIO is not set
@@ -2048,6 +2117,7 @@ CONFIG_I2C_PIIX4=m
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
# CONFIG_SPI is not set
+# CONFIG_SPMI is not set
# CONFIG_HSI is not set
#
@@ -2076,10 +2146,10 @@ CONFIG_GPIO_ACPI=y
# Memory mapped GPIO drivers:
#
# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_IT8761E is not set
# CONFIG_GPIO_F7188X is not set
# CONFIG_GPIO_SCH311X is not set
-# CONFIG_GPIO_TS5500 is not set
# CONFIG_GPIO_SCH is not set
# CONFIG_GPIO_ICH is not set
# CONFIG_GPIO_VX855 is not set
@@ -2107,6 +2177,7 @@ CONFIG_GPIO_ACPI=y
#
# SPI GPIO expanders:
#
+# CONFIG_GPIO_MCP23S08 is not set
#
# AC97 GPIO expanders:
@@ -2170,6 +2241,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_K8TEMP is not set
# CONFIG_SENSORS_K10TEMP is not set
# CONFIG_SENSORS_FAM15H_POWER is not set
+# CONFIG_SENSORS_APPLESMC is not set
# CONFIG_SENSORS_ASB100 is not set
# CONFIG_SENSORS_ATXP1 is not set
# CONFIG_SENSORS_DS620 is not set
@@ -2179,17 +2251,34 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_F71882FG is not set
# CONFIG_SENSORS_F75375S is not set
# CONFIG_SENSORS_FSCHMD is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_G762 is not set
# CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_G762 is not set
# CONFIG_SENSORS_GPIO_FAN is not set
# CONFIG_SENSORS_HIH6130 is not set
-# CONFIG_SENSORS_HTU21 is not set
# CONFIG_SENSORS_CORETEMP is not set
# CONFIG_SENSORS_IT87 is not set
# CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_POWR1220 is not set
# CONFIG_SENSORS_LINEAGE is not set
+# CONFIG_SENSORS_LTC2945 is not set
+# CONFIG_SENSORS_LTC4151 is not set
+# CONFIG_SENSORS_LTC4215 is not set
+# CONFIG_SENSORS_LTC4222 is not set
+# CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_LTC4260 is not set
+# CONFIG_SENSORS_LTC4261 is not set
+# CONFIG_SENSORS_MAX16065 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX1668 is not set
+# CONFIG_SENSORS_MAX197 is not set
+# CONFIG_SENSORS_MAX6639 is not set
+# CONFIG_SENSORS_MAX6642 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_MAX6697 is not set
+# CONFIG_SENSORS_HTU21 is not set
+# CONFIG_SENSORS_MCP3021 is not set
# CONFIG_SENSORS_LM63 is not set
# CONFIG_SENSORS_LM73 is not set
# CONFIG_SENSORS_LM75 is not set
@@ -2202,32 +2291,20 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_LM90 is not set
# CONFIG_SENSORS_LM92 is not set
# CONFIG_SENSORS_LM93 is not set
-# CONFIG_SENSORS_LTC4151 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_LTC4261 is not set
# CONFIG_SENSORS_LM95234 is not set
# CONFIG_SENSORS_LM95241 is not set
# CONFIG_SENSORS_LM95245 is not set
-# CONFIG_SENSORS_MAX16065 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX1668 is not set
-# CONFIG_SENSORS_MAX197 is not set
-# CONFIG_SENSORS_MAX6639 is not set
-# CONFIG_SENSORS_MAX6642 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_MAX6697 is not set
-# CONFIG_SENSORS_MCP3021 is not set
-# CONFIG_SENSORS_NCT6775 is not set
-# CONFIG_SENSORS_NTC_THERMISTOR is not set
# CONFIG_SENSORS_PC87360 is not set
# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
+# CONFIG_SENSORS_NCT6683 is not set
+# CONFIG_SENSORS_NCT6775 is not set
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_PMBUS is not set
# CONFIG_SENSORS_SHT15 is not set
# CONFIG_SENSORS_SHT21 is not set
+# CONFIG_SENSORS_SHTC1 is not set
# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_SMM665 is not set
# CONFIG_SENSORS_DME1737 is not set
# CONFIG_SENSORS_EMC1403 is not set
# CONFIG_SENSORS_EMC2103 is not set
@@ -2238,6 +2315,8 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_SCH56XX_COMMON is not set
# CONFIG_SENSORS_SCH5627 is not set
# CONFIG_SENSORS_SCH5636 is not set
+# CONFIG_SENSORS_SMM665 is not set
+# CONFIG_SENSORS_ADC128D818 is not set
# CONFIG_SENSORS_ADS1015 is not set
# CONFIG_SENSORS_ADS7828 is not set
# CONFIG_SENSORS_AMC6821 is not set
@@ -2245,6 +2324,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_INA2XX is not set
# CONFIG_SENSORS_THMC50 is not set
# CONFIG_SENSORS_TMP102 is not set
+# CONFIG_SENSORS_TMP103 is not set
# CONFIG_SENSORS_TMP401 is not set
# CONFIG_SENSORS_TMP421 is not set
# CONFIG_SENSORS_VIA_CPUTEMP is not set
@@ -2260,7 +2340,6 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_W83L786NG is not set
# CONFIG_SENSORS_W83627HF is not set
# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_APPLESMC is not set
#
# ACPI drivers
@@ -2273,10 +2352,11 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
# CONFIG_THERMAL_GOV_FAIR_SHARE is not set
CONFIG_THERMAL_GOV_STEP_WISE=y
+# CONFIG_THERMAL_GOV_BANG_BANG is not set
# CONFIG_THERMAL_GOV_USER_SPACE is not set
# CONFIG_THERMAL_EMULATION is not set
# CONFIG_INTEL_POWERCLAMP is not set
-# CONFIG_ACPI_INT3403_THERMAL is not set
+# CONFIG_INT340X_THERMAL is not set
#
# Texas Instruments thermal drivers
@@ -2289,6 +2369,7 @@ CONFIG_WATCHDOG_CORE=y
# Watchdog Device Drivers
#
# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_XILINX_WATCHDOG is not set
# CONFIG_DW_WATCHDOG is not set
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_ADVANTECH_WDT is not set
@@ -2296,7 +2377,6 @@ CONFIG_WATCHDOG_CORE=y
# CONFIG_ALIM7101_WDT is not set
# CONFIG_F71808E_WDT is not set
# CONFIG_SP5100_TCO is not set
-# CONFIG_SC520_WDT is not set
# CONFIG_SBC_FITPC2_WATCHDOG is not set
# CONFIG_EUROTECH_WDT is not set
# CONFIG_IB700_WDT is not set
@@ -2320,8 +2400,6 @@ CONFIG_I6300ESB_WDT=m
# CONFIG_SMSC37B787_WDT is not set
# CONFIG_VIA_WDT is not set
# CONFIG_W83627HF_WDT is not set
-# CONFIG_W83697HF_WDT is not set
-# CONFIG_W83697UG_WDT is not set
# CONFIG_W83877F_WDT is not set
# CONFIG_W83977F_WDT is not set
# CONFIG_MACHZ_WDT is not set
@@ -2361,6 +2439,7 @@ CONFIG_BCMA_POSSIBLE=y
#
CONFIG_MFD_CORE=m
# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_MC13XXX_I2C is not set
# CONFIG_HTC_PASIC3 is not set
@@ -2368,12 +2447,15 @@ CONFIG_MFD_CORE=m
# CONFIG_LPC_SCH is not set
# CONFIG_MFD_JANZ_CMODIO is not set
# CONFIG_MFD_KEMPLD is not set
+# CONFIG_MFD_MENF21BMC is not set
# CONFIG_MFD_VIPERBOARD is not set
# CONFIG_MFD_RETU is not set
# CONFIG_MFD_PCF50633 is not set
# CONFIG_UCB1400_CORE is not set
# CONFIG_MFD_RDC321X is not set
# CONFIG_MFD_RTSX_PCI is not set
+# CONFIG_MFD_RTSX_USB is not set
+# CONFIG_MFD_RN5T618 is not set
# CONFIG_MFD_SI476X_CORE is not set
# CONFIG_MFD_SM501 is not set
# CONFIG_ABX500_CORE is not set
@@ -2384,6 +2466,7 @@ CONFIG_MFD_CORE=m
# CONFIG_TPS65010 is not set
# CONFIG_TPS6507X is not set
# CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TPS65218 is not set
# CONFIG_MFD_TPS65912 is not set
CONFIG_MFD_WL1273_CORE=m
# CONFIG_MFD_LM3533 is not set
@@ -2391,6 +2474,7 @@ CONFIG_MFD_WL1273_CORE=m
# CONFIG_MFD_TMIO is not set
# CONFIG_MFD_VX855 is not set
# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_WM8994 is not set
# CONFIG_REGULATOR is not set
# CONFIG_MEDIA_SUPPORT is not set
@@ -2411,6 +2495,10 @@ CONFIG_AGP_VIA=m
CONFIG_INTEL_GTT=m
# CONFIG_VGA_ARB is not set
# CONFIG_VGA_SWITCHEROO is not set
+
+#
+# Direct Rendering Manager
+#
CONFIG_DRM=m
CONFIG_DRM_KMS_HELPER=m
CONFIG_DRM_KMS_FB_HELPER=y
@@ -2423,6 +2511,7 @@ CONFIG_DRM_TTM=m
# CONFIG_DRM_I2C_CH7006 is not set
CONFIG_DRM_I2C_SIL164=m
# CONFIG_DRM_I2C_NXP_TDA998X is not set
+# CONFIG_DRM_PTN3460 is not set
CONFIG_DRM_TDFX=m
CONFIG_DRM_R128=m
CONFIG_DRM_RADEON=m
@@ -2433,7 +2522,6 @@ CONFIG_DRM_I915=m
# CONFIG_DRM_I915_KMS is not set
# CONFIG_DRM_I915_FBDEV is not set
# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
-# CONFIG_DRM_I915_UMS is not set
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
CONFIG_DRM_VIA=m
@@ -2449,11 +2537,13 @@ CONFIG_DRM_MGAG200=m
CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_QXL=m
# CONFIG_DRM_BOCHS is not set
-CONFIG_VGASTATE=m
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-CONFIG_HDMI=y
+
+#
+# Frame buffer Devices
+#
CONFIG_FB=m
# CONFIG_FIRMWARE_EDID is not set
+CONFIG_FB_CMDLINE=y
# CONFIG_FB_DDC is not set
# CONFIG_FB_BOOT_VESA_SUPPORT is not set
CONFIG_FB_CFB_FILLRECT=m
@@ -2509,17 +2599,14 @@ CONFIG_FB_UVESA=m
# CONFIG_FB_PM3 is not set
# CONFIG_FB_CARMINE is not set
# CONFIG_FB_GEODE is not set
-# CONFIG_FB_TMIO is not set
# CONFIG_FB_SMSCUFX is not set
# CONFIG_FB_UDL is not set
-# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_METRONOME is not set
# CONFIG_FB_MB862XX is not set
# CONFIG_FB_BROADSHEET is not set
# CONFIG_FB_AUO_K190X is not set
CONFIG_FB_HYPERV=m
-# CONFIG_EXYNOS_VIDEO is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_LCD_CLASS_DEVICE is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=m
@@ -2528,12 +2615,12 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m
# CONFIG_BACKLIGHT_SAHARA is not set
# CONFIG_BACKLIGHT_ADP8860 is not set
# CONFIG_BACKLIGHT_ADP8870 is not set
-# CONFIG_BACKLIGHT_LM3630A is not set
# CONFIG_BACKLIGHT_LM3639 is not set
-# CONFIG_BACKLIGHT_LP855X is not set
# CONFIG_BACKLIGHT_GPIO is not set
# CONFIG_BACKLIGHT_LV5207LP is not set
# CONFIG_BACKLIGHT_BD6107 is not set
+CONFIG_VGASTATE=m
+CONFIG_HDMI=y
#
# Console display driver support
@@ -2633,29 +2720,6 @@ CONFIG_SND_ENS1371=m
# CONFIG_SND_ES1938 is not set
# CONFIG_SND_ES1968 is not set
# CONFIG_SND_FM801 is not set
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_PREALLOC_SIZE=4096
-CONFIG_SND_HDA_HWDEP=y
-# CONFIG_SND_HDA_RECONFIG is not set
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INPUT_BEEP_MODE=0
-CONFIG_SND_HDA_INPUT_JACK=y
-# CONFIG_SND_HDA_PATCH_LOADER is not set
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_I915=y
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132=m
-# CONFIG_SND_HDA_CODEC_CA0132_DSP is not set
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
# CONFIG_SND_HDSP is not set
# CONFIG_SND_HDSPM is not set
# CONFIG_SND_ICE1712 is not set
@@ -2681,6 +2745,34 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
# CONFIG_SND_VIRTUOSO is not set
# CONFIG_SND_VX222 is not set
# CONFIG_SND_YMFPCI is not set
+
+#
+# HD-Audio
+#
+CONFIG_SND_HDA=m
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_PREALLOC_SIZE=4096
+CONFIG_SND_HDA_HWDEP=y
+# CONFIG_SND_HDA_RECONFIG is not set
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=0
+CONFIG_SND_HDA_INPUT_JACK=y
+# CONFIG_SND_HDA_PATCH_LOADER is not set
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_I915=y
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+# CONFIG_SND_HDA_CODEC_CA0132_DSP is not set
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
# CONFIG_SND_USB is not set
# CONFIG_SND_FIREWIRE is not set
# CONFIG_SND_SOC is not set
@@ -2707,6 +2799,7 @@ CONFIG_HID_GENERIC=m
# CONFIG_HID_CHERRY is not set
# CONFIG_HID_CHICONY is not set
# CONFIG_HID_PRODIKEYS is not set
+# CONFIG_HID_CP2112 is not set
# CONFIG_HID_CYPRESS is not set
# CONFIG_HID_DRAGONRISE is not set
# CONFIG_HID_EMS_FF is not set
@@ -2714,6 +2807,7 @@ CONFIG_HID_GENERIC=m
# CONFIG_HID_ELO is not set
# CONFIG_HID_EZKEY is not set
# CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_GT683R is not set
# CONFIG_HID_HUION is not set
# CONFIG_HID_KEYTOUCH is not set
# CONFIG_HID_KYE is not set
@@ -2724,7 +2818,7 @@ CONFIG_HID_GENERIC=m
# CONFIG_HID_TWINHAN is not set
# CONFIG_HID_KENSINGTON is not set
# CONFIG_HID_LCPOWER is not set
-# CONFIG_HID_LENOVO_TPKBD is not set
+# CONFIG_HID_LENOVO is not set
# CONFIG_HID_LOGITECH is not set
# CONFIG_HID_MAGICMOUSE is not set
# CONFIG_HID_MICROSOFT is not set
@@ -2733,6 +2827,7 @@ CONFIG_HID_GENERIC=m
# CONFIG_HID_NTRIG is not set
# CONFIG_HID_ORTEK is not set
# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PENMOUNT is not set
# CONFIG_HID_PETALYNX is not set
# CONFIG_HID_PICOLCD is not set
# CONFIG_HID_PRIMAX is not set
@@ -2743,6 +2838,7 @@ CONFIG_HID_GENERIC=m
# CONFIG_HID_SPEEDLINK is not set
# CONFIG_HID_STEELSERIES is not set
# CONFIG_HID_SUNPLUS is not set
+# CONFIG_HID_RMI is not set
# CONFIG_HID_GREENASIA is not set
CONFIG_HID_HYPERV_MOUSE=m
# CONFIG_HID_SMARTJOYPLUS is not set
@@ -2779,7 +2875,6 @@ CONFIG_USB_SUPPORT=y
CONFIG_USB_COMMON=m
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB=m
-# CONFIG_USB_DEBUG is not set
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
#
@@ -2789,6 +2884,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG_FSM is not set
CONFIG_USB_MON=m
# CONFIG_USB_WUSB_CBAF is not set
@@ -2797,6 +2893,7 @@ CONFIG_USB_MON=m
#
# CONFIG_USB_C67X00_HCD is not set
CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_PCI=m
CONFIG_USB_EHCI_HCD=m
# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
# CONFIG_USB_EHCI_TT_NEWSCHED is not set
@@ -2848,12 +2945,14 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
#
# USB Imaging devices
#
# CONFIG_USB_MDC800 is not set
# CONFIG_USB_MICROTEK is not set
+# CONFIG_USBIP_CORE is not set
# CONFIG_USB_MUSB_HDRC is not set
# CONFIG_USB_DWC3 is not set
# CONFIG_USB_DWC2 is not set
@@ -2891,19 +2990,16 @@ CONFIG_USB_STORAGE_ENE_UB6250=m
# CONFIG_USB_YUREX is not set
# CONFIG_USB_EZUSB_FX2 is not set
# CONFIG_USB_HSIC_USB3503 is not set
+# CONFIG_USB_LINK_LAYER_TEST is not set
# CONFIG_USB_ATM is not set
#
# USB Physical Layer drivers
#
# CONFIG_USB_PHY is not set
-# CONFIG_USB_OTG_FSM is not set
# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_SAMSUNG_USB2PHY is not set
-# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_USB_GPIO_VBUS is not set
# CONFIG_USB_ISP1301 is not set
-# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
# CONFIG_UWB is not set
# CONFIG_MMC is not set
@@ -2926,13 +3022,16 @@ CONFIG_LEDS_CLASS=y
# CONFIG_LEDS_CLEVO_MAIL is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PCA9685 is not set
# CONFIG_LEDS_BD2802 is not set
# CONFIG_LEDS_INTEL_SS4200 is not set
# CONFIG_LEDS_LT3593 is not set
# CONFIG_LEDS_TCA6507 is not set
# CONFIG_LEDS_LM355x is not set
# CONFIG_LEDS_OT200 is not set
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
# CONFIG_LEDS_BLINKM is not set
#
@@ -2974,6 +3073,7 @@ CONFIG_RTC_DRV_X1205=m
# CONFIG_RTC_DRV_PCF2127 is not set
# CONFIG_RTC_DRV_PCF8523 is not set
CONFIG_RTC_DRV_PCF8563=m
+# CONFIG_RTC_DRV_PCF85063 is not set
CONFIG_RTC_DRV_PCF8583=m
CONFIG_RTC_DRV_M41T80=m
CONFIG_RTC_DRV_M41T80_WDT=y
@@ -2997,6 +3097,7 @@ CONFIG_RTC_DRV_DS1286=m
CONFIG_RTC_DRV_DS1511=m
CONFIG_RTC_DRV_DS1553=m
CONFIG_RTC_DRV_DS1742=m
+# CONFIG_RTC_DRV_DS2404 is not set
CONFIG_RTC_DRV_STK17TA8=m
CONFIG_RTC_DRV_M48T86=m
CONFIG_RTC_DRV_M48T35=m
@@ -3005,12 +3106,11 @@ CONFIG_RTC_DRV_MSM6242=m
CONFIG_RTC_DRV_BQ4802=m
CONFIG_RTC_DRV_RP5C01=m
CONFIG_RTC_DRV_V3020=m
-# CONFIG_RTC_DRV_DS2404 is not set
#
# on-CPU RTC drivers
#
-# CONFIG_RTC_DRV_MOXART is not set
+# CONFIG_RTC_DRV_XGENE is not set
#
# HID Sensor RTC drivers
@@ -3027,7 +3127,6 @@ CONFIG_INTEL_IOATDMA=m
# CONFIG_DW_DMAC_CORE is not set
# CONFIG_DW_DMAC is not set
# CONFIG_DW_DMAC_PCI is not set
-CONFIG_TIMB_DMA=m
CONFIG_PCH_DMA=m
CONFIG_DMA_ENGINE=y
CONFIG_DMA_ACPI=y
@@ -3062,23 +3161,12 @@ CONFIG_HYPERV=m
CONFIG_HYPERV_UTILS=m
CONFIG_HYPERV_BALLOON=m
CONFIG_STAGING=y
-# CONFIG_ET131X is not set
# CONFIG_SLICOSS is not set
-# CONFIG_USBIP_CORE is not set
-# CONFIG_ECHO is not set
# CONFIG_COMEDI is not set
# CONFIG_PANEL is not set
-# CONFIG_RTS5139 is not set
# CONFIG_RTS5208 is not set
-# CONFIG_TRANZPORT is not set
-# CONFIG_IDE_PHISON is not set
# CONFIG_LINE6_USB is not set
-# CONFIG_DX_SEP is not set
-# CONFIG_FB_SM7XX is not set
-# CONFIG_CRYSTALHD is not set
# CONFIG_FB_XGI is not set
-# CONFIG_ACPI_QUICKSTART is not set
-# CONFIG_USB_ENESTORAGE is not set
# CONFIG_BCM_WIMAX is not set
# CONFIG_FT1000 is not set
@@ -3097,23 +3185,34 @@ CONFIG_STAGING=y
# CONFIG_USB_WPAN_HCD is not set
# CONFIG_WIMAX_GDM72XX is not set
# CONFIG_LTE_GDM724X is not set
-# CONFIG_NET_VENDOR_SILICOM is not set
-# CONFIG_CED1401 is not set
-# CONFIG_DGRP is not set
# CONFIG_FIREWIRE_SERIAL is not set
# CONFIG_LUSTRE_FS is not set
-# CONFIG_XILLYBUS is not set
# CONFIG_DGNC is not set
# CONFIG_DGAP is not set
+# CONFIG_GS_FPGABOOT is not set
# CONFIG_X86_PLATFORM_DEVICES is not set
# CONFIG_CHROME_PLATFORMS is not set
#
+# SOC (System On Chip) specific Drivers
+#
+# CONFIG_SOC_TI is not set
+
+#
# Hardware Spinlock drivers
#
+
+#
+# Clock Source drivers
+#
CONFIG_CLKSRC_I8253=y
CONFIG_CLKEVT_I8253=y
CONFIG_CLKBLD_I8253=y
+# CONFIG_ATMEL_PIT is not set
+# CONFIG_SH_TIMER_CMT is not set
+# CONFIG_SH_TIMER_MTU2 is not set
+# CONFIG_SH_TIMER_TMU is not set
+# CONFIG_EM_TIMER_STI is not set
# CONFIG_MAILBOX is not set
CONFIG_IOMMU_API=y
CONFIG_IOMMU_SUPPORT=y
@@ -3130,6 +3229,10 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y
#
# Rpmsg drivers
#
+
+#
+# SOC (System On Chip) specific Drivers
+#
# CONFIG_PM_DEVFREQ is not set
# CONFIG_EXTCON is not set
CONFIG_MEMORY=y
@@ -3145,8 +3248,10 @@ CONFIG_MEMORY=y
# PHY Subsystem
#
# CONFIG_GENERIC_PHY is not set
-# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set
+# CONFIG_BCM_KONA_USB2_PHY is not set
# CONFIG_POWERCAP is not set
+# CONFIG_MCB is not set
+# CONFIG_THUNDERBOLT is not set
#
# Firmware Drivers
@@ -3236,6 +3341,7 @@ CONFIG_QUOTACTL=y
CONFIG_AUTOFS4_FS=m
CONFIG_FUSE_FS=m
# CONFIG_CUSE is not set
+CONFIG_OVERLAY_FS=m
#
# Caches
@@ -3275,6 +3381,7 @@ CONFIG_NTFS_RW=y
#
CONFIG_PROC_FS=y
CONFIG_PROC_SYSCTL=y
+CONFIG_KERNFS=y
CONFIG_SYSFS=y
CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y
@@ -3349,6 +3456,7 @@ CONFIG_NFSD_V3=y
# CONFIG_NFSD_V3_ACL is not set
CONFIG_NFSD_V4=y
# CONFIG_NFSD_FAULT_INJECTION is not set
+CONFIG_GRACE_PERIOD=m
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_NFS_COMMON=y
@@ -3442,7 +3550,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
# printk and dmesg options
#
CONFIG_PRINTK_TIME=y
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_BOOT_PRINTK_DELAY is not set
# CONFIG_DYNAMIC_DEBUG is not set
@@ -3500,13 +3608,13 @@ CONFIG_PANIC_ON_OOPS_VALUE=0
CONFIG_PANIC_TIMEOUT=0
CONFIG_SCHED_DEBUG=y
CONFIG_SCHEDSTATS=y
+# CONFIG_SCHED_STACK_END_CHECK is not set
CONFIG_TIMER_STATS=y
#
# Lock Debugging (spinlocks, mutexes, etc...)
#
# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
@@ -3515,11 +3623,12 @@ CONFIG_TIMER_STATS=y
# CONFIG_LOCK_STAT is not set
# CONFIG_DEBUG_ATOMIC_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
CONFIG_STACKTRACE=y
# CONFIG_DEBUG_KOBJECT is not set
CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_WRITECOUNT is not set
CONFIG_DEBUG_LIST=y
+# CONFIG_DEBUG_PI_LIST is not set
# CONFIG_DEBUG_SG is not set
# CONFIG_DEBUG_NOTIFIERS is not set
# CONFIG_DEBUG_CREDENTIALS is not set
@@ -3528,6 +3637,7 @@ CONFIG_DEBUG_LIST=y
# RCU Debugging
#
# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_TORTURE_TEST is not set
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_RCU_CPU_STALL_TIMEOUT=60
# CONFIG_RCU_CPU_STALL_INFO is not set
@@ -3542,7 +3652,6 @@ CONFIG_USER_STACKTRACE_SUPPORT=y
CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
CONFIG_HAVE_DYNAMIC_FTRACE=y
CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
@@ -3564,9 +3673,13 @@ CONFIG_TRACING_SUPPORT=y
# CONFIG_ASYNC_RAID6_TEST is not set
# CONFIG_TEST_STRING_HELPERS is not set
CONFIG_TEST_KSTRTOX=m
+# CONFIG_TEST_RHASHTABLE is not set
# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_TEST_MODULE is not set
+# CONFIG_TEST_LKM is not set
# CONFIG_TEST_USER_COPY is not set
+# CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIRMWARE is not set
+# CONFIG_TEST_UDELAY is not set
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set
@@ -3668,6 +3781,7 @@ CONFIG_PAX_USERCOPY=y
CONFIG_GRKERNSEC_KMEM=y
# CONFIG_GRKERNSEC_VM86 is not set
# CONFIG_GRKERNSEC_IO is not set
+# CONFIG_GRKERNSEC_BPF_HARDEN is not set
CONFIG_GRKERNSEC_PERF_HARDEN=y
# CONFIG_GRKERNSEC_RAND_THREADSTACK is not set
CONFIG_GRKERNSEC_PROC_MEMMAP=y
@@ -3711,6 +3825,7 @@ CONFIG_GRKERNSEC_CHROOT_UNIX=y
CONFIG_GRKERNSEC_CHROOT_FINDTASK=y
CONFIG_GRKERNSEC_CHROOT_NICE=y
CONFIG_GRKERNSEC_CHROOT_SYSCTL=y
+CONFIG_GRKERNSEC_CHROOT_RENAME=y
CONFIG_GRKERNSEC_CHROOT_CAPS=y
# CONFIG_GRKERNSEC_CHROOT_INITRD is not set
@@ -3743,7 +3858,6 @@ CONFIG_GRKERNSEC_HARDEN_IPC=y
#
# Network Protections
#
-CONFIG_GRKERNSEC_RANDNET=y
# CONFIG_GRKERNSEC_BLACKHOLE is not set
CONFIG_GRKERNSEC_NO_SIMULT_CONNECT=y
# CONFIG_GRKERNSEC_SOCKET is not set
@@ -3807,6 +3921,7 @@ CONFIG_CRYPTO_NULL=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_WORKQUEUE=y
CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_MCRYPTD=m
CONFIG_CRYPTO_AUTHENC=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_ABLK_HELPER=m
@@ -3845,7 +3960,7 @@ CONFIG_CRYPTO_CRC32C=m
CONFIG_CRYPTO_CRC32C_INTEL=m
CONFIG_CRYPTO_CRC32=m
# CONFIG_CRYPTO_CRC32_PCLMUL is not set
-CONFIG_CRYPTO_CRCT10DIF=m
+CONFIG_CRYPTO_CRCT10DIF=y
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
@@ -3900,6 +4015,7 @@ CONFIG_CRYPTO_LZ4HC=m
# Random Number Generation
#
CONFIG_CRYPTO_ANSI_CPRNG=m
+# CONFIG_CRYPTO_DRBG_MENU is not set
CONFIG_CRYPTO_USER_API=m
CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m
@@ -3913,12 +4029,16 @@ CONFIG_CRYPTO_DEV_GEODE=m
CONFIG_CRYPTO_DEV_CCP=y
CONFIG_CRYPTO_DEV_CCP_DD=m
CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
+# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set
CONFIG_ASYMMETRIC_KEY_TYPE=m
CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
CONFIG_PUBLIC_KEY_ALGO_RSA=m
CONFIG_X509_CERTIFICATE_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=m
+# CONFIG_PKCS7_TEST_KEY is not set
CONFIG_HAVE_KVM=y
CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
CONFIG_HAVE_KVM_IRQ_ROUTING=y
CONFIG_HAVE_KVM_EVENTFD=y
CONFIG_KVM_APIC_ARCHITECTURE=y
@@ -3947,9 +4067,10 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_IO=y
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
CONFIG_CRC_CCITT=m
CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=m
+CONFIG_CRC_T10DIF=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC32=y
# CONFIG_CRC32_SELFTEST is not set
@@ -3960,6 +4081,7 @@ CONFIG_CRC32_SLICEBY8=y
CONFIG_CRC7=m
CONFIG_LIBCRC32C=m
CONFIG_CRC8=m
+# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
# CONFIG_RANDOM32_SELFTEST is not set
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
@@ -3987,12 +4109,15 @@ CONFIG_TEXTSEARCH_KMP=m
CONFIG_TEXTSEARCH_BM=m
CONFIG_TEXTSEARCH_FSM=m
CONFIG_BTREE=y
+CONFIG_INTERVAL_TREE=y
CONFIG_ASSOCIATIVE_ARRAY=y
CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
+CONFIG_HAS_IOPORT_MAP=y
CONFIG_HAS_DMA=y
CONFIG_CPU_RMAP=y
CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
CONFIG_NLATTR=y
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
CONFIG_LRU_CACHE=m
@@ -4006,3 +4131,4 @@ CONFIG_FONT_SUPPORT=m
# CONFIG_FONTS is not set
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
+CONFIG_ARCH_HAS_SG_CHAIN=y
diff --git a/main/linux-virtgrsec/kernelconfig.x86_64 b/main/linux-virtgrsec/kernelconfig.x86_64
index 20a7e92789..c249ce6ccd 100644
--- a/main/linux-virtgrsec/kernelconfig.x86_64
+++ b/main/linux-virtgrsec/kernelconfig.x86_64
@@ -1,11 +1,12 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.5 Kernel Configuration
+# Linux/x86 3.18.6 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
CONFIG_X86=y
CONFIG_INSTRUCTION_DECODER=y
+CONFIG_PERF_EVENTS_INTEL_UNCORE=y
CONFIG_OUTPUT_FORMAT="elf64-x86-64"
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
CONFIG_LOCKDEP_SUPPORT=y
@@ -23,7 +24,6 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_ARCH_HAS_CPU_RELAX=y
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
@@ -40,6 +40,7 @@ CONFIG_X86_64_SMP=y
CONFIG_X86_HT=y
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_FIX_EARLYCON_MEM=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -69,14 +70,18 @@ CONFIG_SWAP=y
CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_POSIX_MQUEUE is not set
+CONFIG_CROSS_MEMORY_ATTACH=y
# CONFIG_FHANDLE is not set
+# CONFIG_USELIB is not set
# CONFIG_AUDIT is not set
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
#
# IRQ subsystem
#
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_LEGACY_ALLOC_HWIRQ=y
CONFIG_GENERIC_PENDING_IRQ=y
CONFIG_IRQ_DOMAIN=y
# CONFIG_IRQ_DOMAIN_DEBUG is not set
@@ -84,6 +89,7 @@ CONFIG_IRQ_FORCED_THREADING=y
CONFIG_SPARSE_IRQ=y
CONFIG_CLOCKSOURCE_WATCHDOG=y
CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
CONFIG_GENERIC_TIME_VSYSCALL=y
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -120,6 +126,7 @@ CONFIG_TASK_IO_ACCOUNTING=y
#
CONFIG_TREE_RCU=y
# CONFIG_PREEMPT_RCU is not set
+# CONFIG_TASKS_RCU is not set
CONFIG_RCU_STALL_COMMON=y
# CONFIG_RCU_USER_QS is not set
CONFIG_RCU_FANOUT=32
@@ -128,13 +135,14 @@ CONFIG_RCU_FANOUT_LEAF=16
CONFIG_RCU_FAST_NO_HZ=y
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_RCU_NOCB_CPU is not set
+CONFIG_BUILD_BIN2C=y
CONFIG_IKCONFIG=m
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=14
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
CONFIG_ARCH_SUPPORTS_INT128=y
-CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
CONFIG_CGROUPS=y
# CONFIG_CGROUP_DEBUG is not set
CONFIG_CGROUP_FREEZER=y
@@ -171,7 +179,10 @@ CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
CONFIG_SYSCTL_EXCEPTION_TRACE=y
CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_BPF=y
CONFIG_EXPERT=y
+# CONFIG_SGETMASK_SYSCALL is not set
+# CONFIG_SYSFS_SYSCALL is not set
CONFIG_SYSCTL_SYSCALL=y
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
@@ -185,8 +196,10 @@ CONFIG_EPOLL=y
CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
+# CONFIG_BPF_SYSCALL is not set
CONFIG_SHMEM=y
CONFIG_AIO=y
+CONFIG_ADVISE_SYSCALLS=y
CONFIG_PCI_QUIRKS=y
CONFIG_EMBEDDED=y
CONFIG_HAVE_PERF_EVENTS=y
@@ -209,6 +222,7 @@ CONFIG_HAVE_OPROFILE=y
CONFIG_OPROFILE_NMI_TIMER=y
# CONFIG_KPROBES is not set
# CONFIG_JUMP_LABEL is not set
+# CONFIG_UPROBES is not set
# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
CONFIG_ARCH_USE_BUILTIN_BSWAP=y
@@ -220,6 +234,7 @@ CONFIG_HAVE_OPTPROBES=y
CONFIG_HAVE_KPROBES_ON_FTRACE=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_DMA_API_DEBUG=y
@@ -262,6 +277,7 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
# CONFIG_MODULE_SIG is not set
+# CONFIG_MODULE_COMPRESS is not set
CONFIG_STOP_MACHINE=y
CONFIG_BLOCK=y
CONFIG_BLK_DEV_BSG=y
@@ -312,7 +328,11 @@ CONFIG_INLINE_READ_UNLOCK=y
CONFIG_INLINE_READ_UNLOCK_IRQ=y
CONFIG_INLINE_WRITE_UNLOCK=y
CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_ARCH_USE_QUEUE_RWLOCK=y
+CONFIG_QUEUE_RWLOCK=y
CONFIG_FREEZER=y
#
@@ -320,10 +340,12 @@ CONFIG_FREEZER=y
#
CONFIG_ZONE_DMA=y
CONFIG_SMP=y
+CONFIG_X86_FEATURE_NAMES=y
CONFIG_X86_X2APIC=y
# CONFIG_X86_MPPARSE is not set
# CONFIG_X86_EXTENDED_PLATFORM is not set
# CONFIG_X86_INTEL_LPSS is not set
+# CONFIG_IOSF_MBI is not set
CONFIG_SCHED_OMIT_FRAME_POINTER=y
CONFIG_HYPERVISOR_GUEST=y
CONFIG_PARAVIRT=y
@@ -331,7 +353,6 @@ CONFIG_PARAVIRT=y
CONFIG_PARAVIRT_SPINLOCKS=y
CONFIG_XEN=y
CONFIG_XEN_DOM0=y
-CONFIG_XEN_PRIVILEGED_GUEST=y
CONFIG_XEN_PVHVM=y
CONFIG_XEN_MAX_DOMAIN_MEMORY=500
CONFIG_XEN_SAVE_RESTORE=y
@@ -373,11 +394,11 @@ CONFIG_SCHED_MC=y
CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set
+CONFIG_X86_UP_APIC_MSI=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
# CONFIG_X86_MCE is not set
-# CONFIG_X86_16BIT is not set
# CONFIG_I8K is not set
CONFIG_MICROCODE=m
CONFIG_MICROCODE_INTEL=y
@@ -415,6 +436,7 @@ CONFIG_MEMORY_HOTREMOVE=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_MEMORY_BALLOON=y
CONFIG_BALLOON_COMPACTION=y
CONFIG_COMPACTION=y
CONFIG_MIGRATION=y
@@ -427,12 +449,13 @@ CONFIG_MMU_NOTIFIER=y
CONFIG_KSM=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
# CONFIG_TRANSPARENT_HUGEPAGE is not set
-CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
# CONFIG_FRONTSWAP is not set
# CONFIG_CMA is not set
+# CONFIG_ZPOOL is not set
# CONFIG_ZBUD is not set
# CONFIG_ZSMALLOC is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
CONFIG_X86_RESERVE_LOW=64
CONFIG_MTRR=y
@@ -477,9 +500,10 @@ CONFIG_PM=y
# CONFIG_PM_DEBUG is not set
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ACPI=y
+CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
+CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_PROCFS=y
-CONFIG_ACPI_PROCFS_POWER=n
+# CONFIG_ACPI_PROCFS_POWER is not set
CONFIG_ACPI_EC_DEBUGFS=y
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
@@ -502,6 +526,9 @@ CONFIG_ACPI_HOTPLUG_MEMORY=y
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=m
# CONFIG_ACPI_CUSTOM_METHOD is not set
+# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
+CONFIG_HAVE_ACPI_APEI=y
+CONFIG_HAVE_ACPI_APEI_NMI=y
CONFIG_ACPI_APEI=y
# CONFIG_ACPI_APEI_GHES is not set
CONFIG_ACPI_APEI_EINJ=m
@@ -517,7 +544,6 @@ CONFIG_ACPI_APEI_ERST_DEBUG=y
# CPU Idle
#
CONFIG_CPU_IDLE=y
-# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
@@ -584,6 +610,7 @@ CONFIG_BINFMT_MISC=m
CONFIG_COREDUMP=y
# CONFIG_IA32_EMULATION is not set
CONFIG_X86_DEV_DMA_OPS=y
+CONFIG_PMC_ATOM=y
CONFIG_NET=y
#
@@ -625,6 +652,9 @@ CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
CONFIG_IP_PIMSM_V2=y
CONFIG_SYN_COOKIES=y
CONFIG_NET_IPVTI=m
+CONFIG_NET_UDP_TUNNEL=m
+# CONFIG_NET_FOU is not set
+# CONFIG_GENEVE is not set
CONFIG_INET_AH=m
CONFIG_INET_ESP=m
CONFIG_INET_IPCOMP=m
@@ -650,6 +680,7 @@ CONFIG_TCP_CONG_LP=m
CONFIG_TCP_CONG_VENO=m
CONFIG_TCP_CONG_YEAH=m
CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
CONFIG_DEFAULT_CUBIC=y
# CONFIG_DEFAULT_RENO is not set
CONFIG_DEFAULT_TCP_CONG="cubic"
@@ -680,11 +711,12 @@ CONFIG_IPV6_MROUTE=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
CONFIG_IPV6_PIMSM_V2=y
CONFIG_NETWORK_SECMARK=y
+CONFIG_NET_PTP_CLASSIFY=y
CONFIG_NETWORK_PHY_TIMESTAMPING=y
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=y
+CONFIG_BRIDGE_NETFILTER=m
#
# Core Netfilter Configuration
@@ -694,6 +726,7 @@ CONFIG_NETFILTER_NETLINK_ACCT=m
CONFIG_NETFILTER_NETLINK_QUEUE=m
CONFIG_NETFILTER_NETLINK_LOG=m
CONFIG_NF_CONNTRACK=m
+CONFIG_NF_LOG_COMMON=m
CONFIG_NF_CONNTRACK_MARK=y
CONFIG_NF_CONNTRACK_SECMARK=y
CONFIG_NF_CONNTRACK_ZONES=y
@@ -742,6 +775,7 @@ CONFIG_NFT_HASH=m
CONFIG_NFT_COUNTER=m
CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
CONFIG_NFT_NAT=m
CONFIG_NFT_QUEUE=m
CONFIG_NFT_REJECT=m
@@ -770,6 +804,7 @@ CONFIG_NETFILTER_XT_TARGET_HMARK=m
CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
CONFIG_NETFILTER_XT_TARGET_LOG=m
CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
CONFIG_NETFILTER_XT_TARGET_NETMAP=m
CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -838,9 +873,11 @@ CONFIG_IP_SET_BITMAP_IP=m
CONFIG_IP_SET_BITMAP_IPMAC=m
CONFIG_IP_SET_BITMAP_PORT=m
CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
CONFIG_IP_SET_HASH_IPPORT=m
CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_MAC=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m
CONFIG_IP_SET_HASH_NETNET=m
@@ -869,6 +906,7 @@ CONFIG_IP_VS_RR=m
CONFIG_IP_VS_WRR=m
CONFIG_IP_VS_LC=m
CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
CONFIG_IP_VS_LBLC=m
CONFIG_IP_VS_LBLCR=m
CONFIG_IP_VS_DH=m
@@ -894,11 +932,21 @@ CONFIG_IP_VS_PE_SIP=m
CONFIG_NF_DEFRAG_IPV4=m
CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+# CONFIG_NF_LOG_ARP is not set
+CONFIG_NF_LOG_IPV4=m
CONFIG_NF_TABLES_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NF_TABLES_ARP=m
+CONFIG_NF_NAT_IPV4=m
+CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NF_NAT_MASQUERADE_IPV4=m
+CONFIG_NFT_MASQ_IPV4=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m
@@ -907,15 +955,10 @@ CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT_IPV4=m
+CONFIG_IP_NF_NAT=m
CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_TARGET_CLUSTERIP=m
CONFIG_IP_NF_TARGET_ECN=m
@@ -932,8 +975,13 @@ CONFIG_NF_DEFRAG_IPV6=m
CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
+CONFIG_NF_REJECT_IPV6=m
CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
+CONFIG_NF_NAT_MASQUERADE_IPV6=m
+CONFIG_NFT_MASQ_IPV6=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -950,7 +998,7 @@ CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m
-CONFIG_NF_NAT_IPV6=m
+CONFIG_IP6_NF_NAT=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m
@@ -959,6 +1007,9 @@ CONFIG_IP6_NF_TARGET_NPT=m
#
CONFIG_DECNET_NF_GRABULATOR=m
CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_META=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_LOG_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -979,7 +1030,6 @@ CONFIG_BRIDGE_EBT_MARK_T=m
CONFIG_BRIDGE_EBT_REDIRECT=m
CONFIG_BRIDGE_EBT_SNAT=m
CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
CONFIG_BRIDGE_EBT_NFLOG=m
CONFIG_IP_DCCP=m
CONFIG_INET_DCCP_DIAG=m
@@ -1042,9 +1092,8 @@ CONFIG_IPDDP_ENCAP=y
CONFIG_X25=m
CONFIG_LAPB=m
CONFIG_PHONET=m
+# CONFIG_6LOWPAN is not set
CONFIG_IEEE802154=m
-CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_6LOWPAN_IPHC=m
CONFIG_MAC802154=m
CONFIG_NET_SCHED=y
@@ -1129,7 +1178,7 @@ CONFIG_NET_MPLS_GSO=m
CONFIG_RPS=y
CONFIG_RFS_ACCEL=y
CONFIG_XPS=y
-CONFIG_CGROUP_NET_PRIO=m
+# CONFIG_CGROUP_NET_PRIO is not set
CONFIG_CGROUP_NET_CLASSID=y
CONFIG_NET_RX_BUSY_POLL=y
CONFIG_BQL=y
@@ -1166,6 +1215,7 @@ CONFIG_HAVE_BPF_JIT=y
#
# Generic Driver Options
#
+CONFIG_UEVENT_HELPER=y
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
@@ -1174,20 +1224,23 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=m
# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_ALLOW_DEV_COREDUMP=y
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
CONFIG_SYS_HYPERVISOR=y
# CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_GENERIC_CPU_AUTOPROBE=y
CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_FENCE_TRACE is not set
#
# Bus devices
#
CONFIG_CONNECTOR=m
# CONFIG_MTD is not set
-CONFIG_PARPORT=m
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
# CONFIG_PARPORT_PC_FIFO is not set
@@ -1242,7 +1295,6 @@ CONFIG_BLK_DEV_RBD=m
# CONFIG_SGI_IOC4 is not set
# CONFIG_TIFM_CORE is not set
# CONFIG_ICS932S401 is not set
-# CONFIG_ATMEL_SSC is not set
# CONFIG_ENCLOSURE_SERVICES is not set
# CONFIG_HP_ILO is not set
# CONFIG_APDS9802ALS is not set
@@ -1256,7 +1308,6 @@ CONFIG_BLK_DEV_RBD=m
# CONFIG_DS1682 is not set
CONFIG_VMWARE_BALLOON=m
# CONFIG_BMP085_I2C is not set
-# CONFIG_PCH_PHUB is not set
# CONFIG_USB_SWITCH_FSA9480 is not set
# CONFIG_SRAM is not set
# CONFIG_C2PORT is not set
@@ -1284,18 +1335,24 @@ CONFIG_TI_ST=m
# CONFIG_ALTERA_STAPL is not set
# CONFIG_INTEL_MEI is not set
# CONFIG_INTEL_MEI_ME is not set
+# CONFIG_INTEL_MEI_TXE is not set
CONFIG_VMWARE_VMCI=m
#
+# Intel MIC Bus Driver
+#
+# CONFIG_INTEL_MIC_BUS is not set
+
+#
# Intel MIC Host Driver
#
-# CONFIG_INTEL_MIC_HOST is not set
#
# Intel MIC Card Driver
#
-# CONFIG_INTEL_MIC_CARD is not set
# CONFIG_GENWQE is not set
+# CONFIG_ECHO is not set
+# CONFIG_CXL_BASE is not set
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -1306,8 +1363,8 @@ CONFIG_SCSI_MOD=y
CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y
CONFIG_SCSI_DMA=y
-CONFIG_SCSI_TGT=m
CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_MQ_DEFAULT is not set
CONFIG_SCSI_PROC_FS=y
#
@@ -1320,7 +1377,6 @@ CONFIG_BLK_DEV_SR=m
# CONFIG_BLK_DEV_SR_VENDOR is not set
CONFIG_CHR_DEV_SG=m
CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
CONFIG_SCSI_SCAN_ASYNC=y
@@ -1330,14 +1386,12 @@ CONFIG_SCSI_SCAN_ASYNC=y
#
CONFIG_SCSI_SPI_ATTRS=m
CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_FC_TGT_ATTRS=y
CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_SAS_ATTRS=m
CONFIG_SCSI_SAS_LIBSAS=m
CONFIG_SCSI_SAS_ATA=y
CONFIG_SCSI_SAS_HOST_SMP=y
CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
CONFIG_SCSI_LOWLEVEL=y
CONFIG_ISCSI_TCP=m
CONFIG_ISCSI_BOOT_SYSFS=m
@@ -1370,6 +1424,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m
# CONFIG_SCSI_HPTIOP is not set
# CONFIG_SCSI_BUSLOGIC is not set
CONFIG_VMWARE_PVSCSI=y
+CONFIG_XEN_SCSI_FRONTEND=m
CONFIG_HYPERV_STORAGE=m
CONFIG_LIBFC=m
CONFIG_LIBFCOE=m
@@ -1404,7 +1459,6 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_DEBUG is not set
# CONFIG_SCSI_PMCRAID is not set
# CONFIG_SCSI_PM8001 is not set
-# CONFIG_SCSI_SRP is not set
# CONFIG_SCSI_BFA_FC is not set
CONFIG_SCSI_VIRTIO=m
# CONFIG_SCSI_CHELSIO_FCOE is not set
@@ -1421,7 +1475,6 @@ CONFIG_ATA=y
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_ATA_VERBOSE_ERROR=y
CONFIG_ATA_ACPI=y
-# CONFIG_SATA_ZPODD is not set
CONFIG_SATA_PMP=y
#
@@ -1446,11 +1499,9 @@ CONFIG_ATA_BMDMA=y
# SATA SFF controllers with BMDMA
#
CONFIG_ATA_PIIX=y
-# CONFIG_SATA_HIGHBANK is not set
# CONFIG_SATA_MV is not set
# CONFIG_SATA_NV is not set
# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_RCAR is not set
# CONFIG_SATA_SIL is not set
# CONFIG_SATA_SIS is not set
# CONFIG_SATA_SVW is not set
@@ -1463,14 +1514,10 @@ CONFIG_ATA_PIIX=y
#
# CONFIG_PATA_ALI is not set
# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARASAN_CF is not set
# CONFIG_PATA_ARTOP is not set
# CONFIG_PATA_ATIIXP is not set
# CONFIG_PATA_ATP867X is not set
# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CS5536 is not set
# CONFIG_PATA_CYPRESS is not set
# CONFIG_PATA_EFAR is not set
# CONFIG_PATA_HPT366 is not set
@@ -1490,7 +1537,6 @@ CONFIG_ATA_PIIX=y
# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_RADISYS is not set
# CONFIG_PATA_RDC is not set
-# CONFIG_PATA_SC1200 is not set
# CONFIG_PATA_SCH is not set
# CONFIG_PATA_SERVERWORKS is not set
# CONFIG_PATA_SIL680 is not set
@@ -1542,6 +1588,7 @@ CONFIG_DM_THIN_PROVISIONING=m
CONFIG_DM_CACHE=m
CONFIG_DM_CACHE_MQ=m
CONFIG_DM_CACHE_CLEANER=m
+CONFIG_DM_ERA=m
CONFIG_DM_MIRROR=m
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_RAID=m
@@ -1609,7 +1656,6 @@ CONFIG_VXLAN=m
CONFIG_NETCONSOLE=m
CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
CONFIG_NET_POLL_CONTROLLER=y
CONFIG_TUN=m
CONFIG_VETH=m
@@ -1634,21 +1680,25 @@ CONFIG_VHOST=m
# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
# CONFIG_NET_DSA_MV88E6131 is not set
# CONFIG_NET_DSA_MV88E6123_61_65 is not set
+# CONFIG_NET_DSA_MV88E6171 is not set
+# CONFIG_NET_DSA_BCM_SF2 is not set
CONFIG_ETHERNET=y
# CONFIG_NET_VENDOR_3COM is not set
# CONFIG_NET_VENDOR_ADAPTEC is not set
+# CONFIG_NET_VENDOR_AGERE is not set
# CONFIG_NET_VENDOR_ALTEON is not set
+# CONFIG_ALTERA_TSE is not set
CONFIG_NET_VENDOR_AMD=y
# CONFIG_AMD8111_ETH is not set
CONFIG_PCNET32=m
+# CONFIG_NET_XGENE is not set
# CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_VENDOR_ATHEROS is not set
-# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_VENDOR_BROCADE is not set
-# CONFIG_NET_CALXEDA_XGMAC is not set
# CONFIG_NET_VENDOR_CHELSIO is not set
# CONFIG_NET_VENDOR_CISCO is not set
+# CONFIG_CX_ECAT is not set
# CONFIG_DNET is not set
CONFIG_NET_VENDOR_DEC=y
CONFIG_NET_TULIP=y
@@ -1676,6 +1726,7 @@ CONFIG_E1000=m
# CONFIG_IXGBEVF is not set
# CONFIG_I40E is not set
# CONFIG_I40EVF is not set
+# CONFIG_FM10K is not set
# CONFIG_NET_VENDOR_I825XX is not set
# CONFIG_IP1000 is not set
# CONFIG_JME is not set
@@ -1693,6 +1744,7 @@ CONFIG_NET_VENDOR_MELLANOX=y
# CONFIG_ETHOC is not set
# CONFIG_NET_PACKET_ENGINE is not set
# CONFIG_NET_VENDOR_QLOGIC is not set
+# CONFIG_NET_VENDOR_QUALCOMM is not set
CONFIG_NET_VENDOR_REALTEK=y
# CONFIG_ATP is not set
CONFIG_8139CP=m
@@ -1702,8 +1754,8 @@ CONFIG_8139TOO_PIO=y
# CONFIG_8139TOO_8129 is not set
# CONFIG_8139_OLD_RX_RESET is not set
CONFIG_R8169=m
-# CONFIG_SH_ETH is not set
# CONFIG_NET_VENDOR_RDC is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
# CONFIG_NET_VENDOR_SEEQ is not set
# CONFIG_NET_VENDOR_SILAN is not set
# CONFIG_NET_VENDOR_SIS is not set
@@ -1733,6 +1785,7 @@ CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
CONFIG_BROADCOM_PHY=m
+# CONFIG_BCM7XXX_PHY is not set
CONFIG_BCM87XX_PHY=m
CONFIG_ICPLUS_PHY=m
CONFIG_REALTEK_PHY=m
@@ -1742,13 +1795,15 @@ CONFIG_LSI_ET1011C_PHY=m
CONFIG_MICREL_PHY=m
CONFIG_MDIO_BITBANG=m
CONFIG_MDIO_GPIO=m
+# CONFIG_MDIO_BCM_UNIMAC is not set
# CONFIG_PLIP is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
#
-# USB Network Adapters
+# Host-side USB support is needed for USB Network Adapter support
#
+CONFIG_USB_NET_DRIVERS=m
# CONFIG_USB_CATC is not set
# CONFIG_USB_KAWETH is not set
# CONFIG_USB_PEGASUS is not set
@@ -1844,6 +1899,7 @@ CONFIG_INPUT_MISC=y
# CONFIG_INPUT_MPU3050 is not set
# CONFIG_INPUT_APANEL is not set
# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_BEEPER is not set
# CONFIG_INPUT_GPIO_TILT_POLLED is not set
# CONFIG_INPUT_ATLAS_BTNS is not set
# CONFIG_INPUT_ATI_REMOTE2 is not set
@@ -1860,6 +1916,8 @@ CONFIG_INPUT_MISC=y
# CONFIG_INPUT_CMA3000 is not set
CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
# CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set
+# CONFIG_INPUT_DRV260X_HAPTICS is not set
+# CONFIG_INPUT_DRV2667_HAPTICS is not set
#
# Hardware I/O ports
@@ -1900,11 +1958,11 @@ CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
#
# Serial drivers
#
+CONFIG_SERIAL_EARLYCON=y
CONFIG_SERIAL_8250=y
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
CONFIG_SERIAL_8250_PNP=y
CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_FIX_EARLYCON_MEM=y
CONFIG_SERIAL_8250_DMA=y
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_NR_UARTS=16
@@ -1915,6 +1973,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
# CONFIG_SERIAL_8250_DETECT_IRQ is not set
CONFIG_SERIAL_8250_RSA=y
# CONFIG_SERIAL_8250_DW is not set
+# CONFIG_SERIAL_8250_FINTEK is not set
#
# Non-8250 serial port support
@@ -1924,12 +1983,11 @@ CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_SERIAL_JSM=m
# CONFIG_SERIAL_SCCNXP is not set
-CONFIG_SERIAL_TIMBERDALE=m
+# CONFIG_SERIAL_SC16IS7XX is not set
CONFIG_SERIAL_ALTERA_JTAGUART=m
CONFIG_SERIAL_ALTERA_UART=m
CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-CONFIG_SERIAL_PCH_UART=m
# CONFIG_SERIAL_ARC is not set
# CONFIG_SERIAL_RP2 is not set
# CONFIG_SERIAL_FSL_LPUART is not set
@@ -1960,6 +2018,11 @@ CONFIG_HPET_MMAP=y
CONFIG_HANGCHECK_TIMER=m
# CONFIG_TCG_TPM is not set
# CONFIG_TELCLOCK is not set
+# CONFIG_XILLYBUS is not set
+
+#
+# I2C support
+#
CONFIG_I2C=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_COMPAT=y
@@ -2007,9 +2070,7 @@ CONFIG_I2C_PIIX4=m
# I2C system bus drivers (mostly embedded / system-on-chip)
#
# CONFIG_I2C_CBUS_GPIO is not set
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
# CONFIG_I2C_DESIGNWARE_PCI is not set
-# CONFIG_I2C_EG20T is not set
# CONFIG_I2C_GPIO is not set
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_PCA_PLATFORM is not set
@@ -2035,6 +2096,7 @@ CONFIG_I2C_PIIX4=m
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
# CONFIG_SPI is not set
+# CONFIG_SPMI is not set
# CONFIG_HSI is not set
#
@@ -2051,7 +2113,6 @@ CONFIG_I2C_PIIX4=m
#
# CONFIG_PTP_1588_CLOCK is not set
# CONFIG_DP83640_PHY is not set
-# CONFIG_PTP_1588_CLOCK_PCH is not set
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_GPIOLIB=y
CONFIG_GPIO_DEVRES=y
@@ -2063,10 +2124,10 @@ CONFIG_GPIO_ACPI=y
# Memory mapped GPIO drivers:
#
# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_IT8761E is not set
# CONFIG_GPIO_F7188X is not set
# CONFIG_GPIO_SCH311X is not set
-# CONFIG_GPIO_TS5500 is not set
# CONFIG_GPIO_SCH is not set
# CONFIG_GPIO_ICH is not set
# CONFIG_GPIO_VX855 is not set
@@ -2087,13 +2148,13 @@ CONFIG_GPIO_ACPI=y
# CONFIG_GPIO_BT8XX is not set
# CONFIG_GPIO_AMD8111 is not set
# CONFIG_GPIO_INTEL_MID is not set
-# CONFIG_GPIO_PCH is not set
# CONFIG_GPIO_ML_IOH is not set
# CONFIG_GPIO_RDC321X is not set
#
# SPI GPIO expanders:
#
+# CONFIG_GPIO_MCP23S08 is not set
#
# AC97 GPIO expanders:
@@ -2157,6 +2218,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_K8TEMP is not set
# CONFIG_SENSORS_K10TEMP is not set
# CONFIG_SENSORS_FAM15H_POWER is not set
+# CONFIG_SENSORS_APPLESMC is not set
# CONFIG_SENSORS_ASB100 is not set
# CONFIG_SENSORS_ATXP1 is not set
# CONFIG_SENSORS_DS620 is not set
@@ -2166,17 +2228,34 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_F71882FG is not set
# CONFIG_SENSORS_F75375S is not set
# CONFIG_SENSORS_FSCHMD is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_G762 is not set
# CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_G762 is not set
# CONFIG_SENSORS_GPIO_FAN is not set
# CONFIG_SENSORS_HIH6130 is not set
-# CONFIG_SENSORS_HTU21 is not set
# CONFIG_SENSORS_CORETEMP is not set
# CONFIG_SENSORS_IT87 is not set
# CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_POWR1220 is not set
# CONFIG_SENSORS_LINEAGE is not set
+# CONFIG_SENSORS_LTC2945 is not set
+# CONFIG_SENSORS_LTC4151 is not set
+# CONFIG_SENSORS_LTC4215 is not set
+# CONFIG_SENSORS_LTC4222 is not set
+# CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_LTC4260 is not set
+# CONFIG_SENSORS_LTC4261 is not set
+# CONFIG_SENSORS_MAX16065 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX1668 is not set
+# CONFIG_SENSORS_MAX197 is not set
+# CONFIG_SENSORS_MAX6639 is not set
+# CONFIG_SENSORS_MAX6642 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_MAX6697 is not set
+# CONFIG_SENSORS_HTU21 is not set
+# CONFIG_SENSORS_MCP3021 is not set
# CONFIG_SENSORS_LM63 is not set
# CONFIG_SENSORS_LM73 is not set
# CONFIG_SENSORS_LM75 is not set
@@ -2189,32 +2268,20 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_LM90 is not set
# CONFIG_SENSORS_LM92 is not set
# CONFIG_SENSORS_LM93 is not set
-# CONFIG_SENSORS_LTC4151 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_LTC4261 is not set
# CONFIG_SENSORS_LM95234 is not set
# CONFIG_SENSORS_LM95241 is not set
# CONFIG_SENSORS_LM95245 is not set
-# CONFIG_SENSORS_MAX16065 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX1668 is not set
-# CONFIG_SENSORS_MAX197 is not set
-# CONFIG_SENSORS_MAX6639 is not set
-# CONFIG_SENSORS_MAX6642 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_MAX6697 is not set
-# CONFIG_SENSORS_MCP3021 is not set
-# CONFIG_SENSORS_NCT6775 is not set
-# CONFIG_SENSORS_NTC_THERMISTOR is not set
# CONFIG_SENSORS_PC87360 is not set
# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
+# CONFIG_SENSORS_NCT6683 is not set
+# CONFIG_SENSORS_NCT6775 is not set
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_PMBUS is not set
# CONFIG_SENSORS_SHT15 is not set
# CONFIG_SENSORS_SHT21 is not set
+# CONFIG_SENSORS_SHTC1 is not set
# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_SMM665 is not set
# CONFIG_SENSORS_DME1737 is not set
# CONFIG_SENSORS_EMC1403 is not set
# CONFIG_SENSORS_EMC2103 is not set
@@ -2225,6 +2292,8 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_SCH56XX_COMMON is not set
# CONFIG_SENSORS_SCH5627 is not set
# CONFIG_SENSORS_SCH5636 is not set
+# CONFIG_SENSORS_SMM665 is not set
+# CONFIG_SENSORS_ADC128D818 is not set
# CONFIG_SENSORS_ADS1015 is not set
# CONFIG_SENSORS_ADS7828 is not set
# CONFIG_SENSORS_AMC6821 is not set
@@ -2232,6 +2301,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_INA2XX is not set
# CONFIG_SENSORS_THMC50 is not set
# CONFIG_SENSORS_TMP102 is not set
+# CONFIG_SENSORS_TMP103 is not set
# CONFIG_SENSORS_TMP401 is not set
# CONFIG_SENSORS_TMP421 is not set
# CONFIG_SENSORS_VIA_CPUTEMP is not set
@@ -2247,7 +2317,6 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_W83L786NG is not set
# CONFIG_SENSORS_W83627HF is not set
# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_APPLESMC is not set
#
# ACPI drivers
@@ -2260,10 +2329,11 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
# CONFIG_THERMAL_GOV_FAIR_SHARE is not set
CONFIG_THERMAL_GOV_STEP_WISE=y
+# CONFIG_THERMAL_GOV_BANG_BANG is not set
# CONFIG_THERMAL_GOV_USER_SPACE is not set
# CONFIG_THERMAL_EMULATION is not set
# CONFIG_INTEL_POWERCLAMP is not set
-# CONFIG_ACPI_INT3403_THERMAL is not set
+# CONFIG_INT340X_THERMAL is not set
#
# Texas Instruments thermal drivers
@@ -2276,6 +2346,7 @@ CONFIG_WATCHDOG_CORE=y
# Watchdog Device Drivers
#
# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_XILINX_WATCHDOG is not set
# CONFIG_DW_WATCHDOG is not set
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_ADVANTECH_WDT is not set
@@ -2283,7 +2354,6 @@ CONFIG_WATCHDOG_CORE=y
# CONFIG_ALIM7101_WDT is not set
# CONFIG_F71808E_WDT is not set
# CONFIG_SP5100_TCO is not set
-# CONFIG_SC520_WDT is not set
# CONFIG_SBC_FITPC2_WATCHDOG is not set
# CONFIG_EUROTECH_WDT is not set
# CONFIG_IB700_WDT is not set
@@ -2299,14 +2369,11 @@ CONFIG_I6300ESB_WDT=m
# CONFIG_PC87413_WDT is not set
# CONFIG_NV_TCO is not set
# CONFIG_60XX_WDT is not set
-# CONFIG_SBC8360_WDT is not set
# CONFIG_CPU5_WDT is not set
# CONFIG_SMSC_SCH311X_WDT is not set
# CONFIG_SMSC37B787_WDT is not set
# CONFIG_VIA_WDT is not set
# CONFIG_W83627HF_WDT is not set
-# CONFIG_W83697HF_WDT is not set
-# CONFIG_W83697UG_WDT is not set
# CONFIG_W83877F_WDT is not set
# CONFIG_W83977F_WDT is not set
# CONFIG_MACHZ_WDT is not set
@@ -2346,7 +2413,7 @@ CONFIG_BCMA_POSSIBLE=y
# Multifunction device drivers
#
CONFIG_MFD_CORE=m
-# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_MC13XXX_I2C is not set
# CONFIG_HTC_PASIC3 is not set
@@ -2354,12 +2421,15 @@ CONFIG_MFD_CORE=m
# CONFIG_LPC_SCH is not set
# CONFIG_MFD_JANZ_CMODIO is not set
# CONFIG_MFD_KEMPLD is not set
+# CONFIG_MFD_MENF21BMC is not set
# CONFIG_MFD_VIPERBOARD is not set
# CONFIG_MFD_RETU is not set
# CONFIG_MFD_PCF50633 is not set
# CONFIG_UCB1400_CORE is not set
# CONFIG_MFD_RDC321X is not set
# CONFIG_MFD_RTSX_PCI is not set
+# CONFIG_MFD_RTSX_USB is not set
+# CONFIG_MFD_RN5T618 is not set
# CONFIG_MFD_SI476X_CORE is not set
# CONFIG_MFD_SM501 is not set
# CONFIG_ABX500_CORE is not set
@@ -2370,13 +2440,14 @@ CONFIG_MFD_CORE=m
# CONFIG_TPS65010 is not set
# CONFIG_TPS6507X is not set
# CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TPS65218 is not set
# CONFIG_MFD_TPS65912 is not set
CONFIG_MFD_WL1273_CORE=m
# CONFIG_MFD_LM3533 is not set
-# CONFIG_MFD_TIMBERDALE is not set
# CONFIG_MFD_TMIO is not set
# CONFIG_MFD_VX855 is not set
# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_WM8994 is not set
# CONFIG_REGULATOR is not set
# CONFIG_MEDIA_SUPPORT is not set
@@ -2391,6 +2462,10 @@ CONFIG_AGP_VIA=m
CONFIG_INTEL_GTT=m
# CONFIG_VGA_ARB is not set
# CONFIG_VGA_SWITCHEROO is not set
+
+#
+# Direct Rendering Manager
+#
CONFIG_DRM=m
CONFIG_DRM_KMS_HELPER=m
CONFIG_DRM_KMS_FB_HELPER=y
@@ -2403,6 +2478,7 @@ CONFIG_DRM_TTM=m
# CONFIG_DRM_I2C_CH7006 is not set
CONFIG_DRM_I2C_SIL164=m
# CONFIG_DRM_I2C_NXP_TDA998X is not set
+# CONFIG_DRM_PTN3460 is not set
CONFIG_DRM_TDFX=m
CONFIG_DRM_R128=m
CONFIG_DRM_RADEON=m
@@ -2413,7 +2489,6 @@ CONFIG_DRM_I915=m
# CONFIG_DRM_I915_KMS is not set
# CONFIG_DRM_I915_FBDEV is not set
# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
-# CONFIG_DRM_I915_UMS is not set
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
CONFIG_DRM_VIA=m
@@ -2429,11 +2504,13 @@ CONFIG_DRM_MGAG200=m
CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_QXL=m
# CONFIG_DRM_BOCHS is not set
-CONFIG_VGASTATE=m
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-CONFIG_HDMI=y
+
+#
+# Frame buffer Devices
+#
CONFIG_FB=m
# CONFIG_FIRMWARE_EDID is not set
+CONFIG_FB_CMDLINE=y
# CONFIG_FB_DDC is not set
# CONFIG_FB_BOOT_VESA_SUPPORT is not set
CONFIG_FB_CFB_FILLRECT=m
@@ -2487,10 +2564,8 @@ CONFIG_FB_UVESA=m
# CONFIG_FB_ARK is not set
# CONFIG_FB_PM3 is not set
# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_TMIO is not set
# CONFIG_FB_SMSCUFX is not set
# CONFIG_FB_UDL is not set
-# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_VIRTUAL is not set
CONFIG_XEN_FBDEV_FRONTEND=m
# CONFIG_FB_METRONOME is not set
@@ -2498,7 +2573,6 @@ CONFIG_XEN_FBDEV_FRONTEND=m
# CONFIG_FB_BROADSHEET is not set
# CONFIG_FB_AUO_K190X is not set
CONFIG_FB_HYPERV=m
-# CONFIG_EXYNOS_VIDEO is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_LCD_CLASS_DEVICE is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=m
@@ -2507,12 +2581,12 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m
# CONFIG_BACKLIGHT_SAHARA is not set
# CONFIG_BACKLIGHT_ADP8860 is not set
# CONFIG_BACKLIGHT_ADP8870 is not set
-# CONFIG_BACKLIGHT_LM3630A is not set
# CONFIG_BACKLIGHT_LM3639 is not set
-# CONFIG_BACKLIGHT_LP855X is not set
# CONFIG_BACKLIGHT_GPIO is not set
# CONFIG_BACKLIGHT_LV5207LP is not set
# CONFIG_BACKLIGHT_BD6107 is not set
+CONFIG_VGASTATE=m
+CONFIG_HDMI=y
#
# Console display driver support
@@ -2588,8 +2662,6 @@ CONFIG_SND_PCI=y
# CONFIG_SND_OXYGEN is not set
# CONFIG_SND_CS4281 is not set
# CONFIG_SND_CS46XX is not set
-# CONFIG_SND_CS5530 is not set
-# CONFIG_SND_CS5535AUDIO is not set
# CONFIG_SND_CTXFI is not set
# CONFIG_SND_DARLA20 is not set
# CONFIG_SND_GINA20 is not set
@@ -2612,29 +2684,6 @@ CONFIG_SND_ENS1371=m
# CONFIG_SND_ES1938 is not set
# CONFIG_SND_ES1968 is not set
# CONFIG_SND_FM801 is not set
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_PREALLOC_SIZE=4096
-CONFIG_SND_HDA_HWDEP=y
-# CONFIG_SND_HDA_RECONFIG is not set
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INPUT_BEEP_MODE=0
-CONFIG_SND_HDA_INPUT_JACK=y
-# CONFIG_SND_HDA_PATCH_LOADER is not set
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_I915=y
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132=m
-# CONFIG_SND_HDA_CODEC_CA0132_DSP is not set
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
# CONFIG_SND_HDSP is not set
# CONFIG_SND_HDSPM is not set
# CONFIG_SND_ICE1712 is not set
@@ -2659,6 +2708,34 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
# CONFIG_SND_VIRTUOSO is not set
# CONFIG_SND_VX222 is not set
# CONFIG_SND_YMFPCI is not set
+
+#
+# HD-Audio
+#
+CONFIG_SND_HDA=m
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_PREALLOC_SIZE=4096
+CONFIG_SND_HDA_HWDEP=y
+# CONFIG_SND_HDA_RECONFIG is not set
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=0
+CONFIG_SND_HDA_INPUT_JACK=y
+# CONFIG_SND_HDA_PATCH_LOADER is not set
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_I915=y
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+# CONFIG_SND_HDA_CODEC_CA0132_DSP is not set
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
# CONFIG_SND_USB is not set
# CONFIG_SND_FIREWIRE is not set
# CONFIG_SND_SOC is not set
@@ -2685,6 +2762,7 @@ CONFIG_HID_GENERIC=m
# CONFIG_HID_CHERRY is not set
# CONFIG_HID_CHICONY is not set
# CONFIG_HID_PRODIKEYS is not set
+# CONFIG_HID_CP2112 is not set
# CONFIG_HID_CYPRESS is not set
# CONFIG_HID_DRAGONRISE is not set
# CONFIG_HID_EMS_FF is not set
@@ -2692,6 +2770,7 @@ CONFIG_HID_GENERIC=m
# CONFIG_HID_ELO is not set
# CONFIG_HID_EZKEY is not set
# CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_GT683R is not set
# CONFIG_HID_HUION is not set
# CONFIG_HID_KEYTOUCH is not set
# CONFIG_HID_KYE is not set
@@ -2702,7 +2781,7 @@ CONFIG_HID_GENERIC=m
# CONFIG_HID_TWINHAN is not set
# CONFIG_HID_KENSINGTON is not set
# CONFIG_HID_LCPOWER is not set
-# CONFIG_HID_LENOVO_TPKBD is not set
+# CONFIG_HID_LENOVO is not set
# CONFIG_HID_LOGITECH is not set
# CONFIG_HID_MAGICMOUSE is not set
# CONFIG_HID_MICROSOFT is not set
@@ -2711,6 +2790,7 @@ CONFIG_HID_GENERIC=m
# CONFIG_HID_NTRIG is not set
# CONFIG_HID_ORTEK is not set
# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PENMOUNT is not set
# CONFIG_HID_PETALYNX is not set
# CONFIG_HID_PICOLCD is not set
# CONFIG_HID_PRIMAX is not set
@@ -2721,6 +2801,7 @@ CONFIG_HID_GENERIC=m
# CONFIG_HID_SPEEDLINK is not set
# CONFIG_HID_STEELSERIES is not set
# CONFIG_HID_SUNPLUS is not set
+# CONFIG_HID_RMI is not set
# CONFIG_HID_GREENASIA is not set
CONFIG_HID_HYPERV_MOUSE=m
# CONFIG_HID_SMARTJOYPLUS is not set
@@ -2757,7 +2838,6 @@ CONFIG_USB_SUPPORT=y
CONFIG_USB_COMMON=m
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB=m
-# CONFIG_USB_DEBUG is not set
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
#
@@ -2767,6 +2847,7 @@ CONFIG_USB_DEFAULT_PERSIST=y
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG_FSM is not set
CONFIG_USB_MON=m
# CONFIG_USB_WUSB_CBAF is not set
@@ -2775,6 +2856,7 @@ CONFIG_USB_MON=m
#
# CONFIG_USB_C67X00_HCD is not set
CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_PCI=m
CONFIG_USB_EHCI_HCD=m
# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
# CONFIG_USB_EHCI_TT_NEWSCHED is not set
@@ -2826,12 +2908,14 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
#
# USB Imaging devices
#
# CONFIG_USB_MDC800 is not set
# CONFIG_USB_MICROTEK is not set
+# CONFIG_USBIP_CORE is not set
# CONFIG_USB_MUSB_HDRC is not set
# CONFIG_USB_DWC3 is not set
# CONFIG_USB_DWC2 is not set
@@ -2869,19 +2953,16 @@ CONFIG_USB_STORAGE_ENE_UB6250=m
# CONFIG_USB_YUREX is not set
# CONFIG_USB_EZUSB_FX2 is not set
# CONFIG_USB_HSIC_USB3503 is not set
+# CONFIG_USB_LINK_LAYER_TEST is not set
# CONFIG_USB_ATM is not set
#
# USB Physical Layer drivers
#
# CONFIG_USB_PHY is not set
-# CONFIG_USB_OTG_FSM is not set
# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_SAMSUNG_USB2PHY is not set
-# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_USB_GPIO_VBUS is not set
# CONFIG_USB_ISP1301 is not set
-# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
# CONFIG_UWB is not set
# CONFIG_MMC is not set
@@ -2904,13 +2985,15 @@ CONFIG_LEDS_CLASS=y
# CONFIG_LEDS_CLEVO_MAIL is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PCA9685 is not set
# CONFIG_LEDS_BD2802 is not set
# CONFIG_LEDS_INTEL_SS4200 is not set
# CONFIG_LEDS_LT3593 is not set
# CONFIG_LEDS_TCA6507 is not set
# CONFIG_LEDS_LM355x is not set
-# CONFIG_LEDS_OT200 is not set
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
# CONFIG_LEDS_BLINKM is not set
#
@@ -2952,6 +3035,7 @@ CONFIG_RTC_DRV_X1205=m
# CONFIG_RTC_DRV_PCF2127 is not set
# CONFIG_RTC_DRV_PCF8523 is not set
CONFIG_RTC_DRV_PCF8563=m
+# CONFIG_RTC_DRV_PCF85063 is not set
CONFIG_RTC_DRV_PCF8583=m
CONFIG_RTC_DRV_M41T80=m
CONFIG_RTC_DRV_M41T80_WDT=y
@@ -2975,6 +3059,7 @@ CONFIG_RTC_DRV_DS1286=m
CONFIG_RTC_DRV_DS1511=m
CONFIG_RTC_DRV_DS1553=m
CONFIG_RTC_DRV_DS1742=m
+# CONFIG_RTC_DRV_DS2404 is not set
CONFIG_RTC_DRV_STK17TA8=m
CONFIG_RTC_DRV_M48T86=m
CONFIG_RTC_DRV_M48T35=m
@@ -2983,12 +3068,11 @@ CONFIG_RTC_DRV_MSM6242=m
CONFIG_RTC_DRV_BQ4802=m
CONFIG_RTC_DRV_RP5C01=m
CONFIG_RTC_DRV_V3020=m
-# CONFIG_RTC_DRV_DS2404 is not set
#
# on-CPU RTC drivers
#
-# CONFIG_RTC_DRV_MOXART is not set
+# CONFIG_RTC_DRV_XGENE is not set
#
# HID Sensor RTC drivers
@@ -3005,8 +3089,6 @@ CONFIG_INTEL_IOATDMA=m
# CONFIG_DW_DMAC_CORE is not set
# CONFIG_DW_DMAC is not set
# CONFIG_DW_DMAC_PCI is not set
-CONFIG_TIMB_DMA=m
-CONFIG_PCH_DMA=m
CONFIG_DMA_ENGINE=y
CONFIG_DMA_ACPI=y
@@ -3058,26 +3140,16 @@ CONFIG_XEN_GRANT_DEV_ALLOC=m
CONFIG_SWIOTLB_XEN=y
CONFIG_XEN_TMEM=m
CONFIG_XEN_PCIDEV_BACKEND=m
+CONFIG_XEN_SCSI_BACKEND=m
CONFIG_XEN_PRIVCMD=y
CONFIG_XEN_HAVE_PVMMU=y
CONFIG_STAGING=y
-# CONFIG_ET131X is not set
# CONFIG_SLICOSS is not set
-# CONFIG_USBIP_CORE is not set
-# CONFIG_ECHO is not set
# CONFIG_COMEDI is not set
# CONFIG_PANEL is not set
-# CONFIG_RTS5139 is not set
# CONFIG_RTS5208 is not set
-# CONFIG_TRANZPORT is not set
-# CONFIG_IDE_PHISON is not set
# CONFIG_LINE6_USB is not set
-# CONFIG_DX_SEP is not set
-# CONFIG_FB_SM7XX is not set
-# CONFIG_CRYSTALHD is not set
# CONFIG_FB_XGI is not set
-# CONFIG_ACPI_QUICKSTART is not set
-# CONFIG_USB_ENESTORAGE is not set
# CONFIG_BCM_WIMAX is not set
# CONFIG_FT1000 is not set
@@ -3096,22 +3168,36 @@ CONFIG_STAGING=y
# CONFIG_USB_WPAN_HCD is not set
# CONFIG_WIMAX_GDM72XX is not set
# CONFIG_LTE_GDM724X is not set
-# CONFIG_NET_VENDOR_SILICOM is not set
-# CONFIG_CED1401 is not set
-# CONFIG_DGRP is not set
# CONFIG_FIREWIRE_SERIAL is not set
# CONFIG_LUSTRE_FS is not set
-# CONFIG_XILLYBUS is not set
# CONFIG_DGNC is not set
# CONFIG_DGAP is not set
+# CONFIG_GS_FPGABOOT is not set
+# CONFIG_CRYPTO_SKEIN is not set
+# CONFIG_CRYPTO_THREEFISH is not set
+# CONFIG_UNISYSSPAR is not set
# CONFIG_X86_PLATFORM_DEVICES is not set
# CONFIG_CHROME_PLATFORMS is not set
#
+# SOC (System On Chip) specific Drivers
+#
+# CONFIG_SOC_TI is not set
+
+#
# Hardware Spinlock drivers
#
+
+#
+# Clock Source drivers
+#
CONFIG_CLKEVT_I8253=y
CONFIG_CLKBLD_I8253=y
+# CONFIG_ATMEL_PIT is not set
+# CONFIG_SH_TIMER_CMT is not set
+# CONFIG_SH_TIMER_MTU2 is not set
+# CONFIG_SH_TIMER_TMU is not set
+# CONFIG_EM_TIMER_STI is not set
# CONFIG_MAILBOX is not set
CONFIG_IOMMU_API=y
CONFIG_IOMMU_SUPPORT=y
@@ -3130,6 +3216,10 @@ CONFIG_IRQ_REMAP=y
#
# Rpmsg drivers
#
+
+#
+# SOC (System On Chip) specific Drivers
+#
# CONFIG_PM_DEVFREQ is not set
# CONFIG_EXTCON is not set
CONFIG_MEMORY=y
@@ -3145,8 +3235,10 @@ CONFIG_MEMORY=y
# PHY Subsystem
#
# CONFIG_GENERIC_PHY is not set
-# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set
+# CONFIG_BCM_KONA_USB2_PHY is not set
# CONFIG_POWERCAP is not set
+# CONFIG_MCB is not set
+# CONFIG_THUNDERBOLT is not set
#
# Firmware Drivers
@@ -3236,6 +3328,7 @@ CONFIG_QUOTACTL=y
CONFIG_AUTOFS4_FS=m
CONFIG_FUSE_FS=m
# CONFIG_CUSE is not set
+CONFIG_OVERLAY_FS=m
#
# Caches
@@ -3275,6 +3368,7 @@ CONFIG_NTFS_RW=y
#
CONFIG_PROC_FS=y
CONFIG_PROC_SYSCTL=y
+CONFIG_KERNFS=y
CONFIG_SYSFS=y
CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y
@@ -3349,6 +3443,7 @@ CONFIG_NFSD_V3=y
# CONFIG_NFSD_V3_ACL is not set
CONFIG_NFSD_V4=y
# CONFIG_NFSD_FAULT_INJECTION is not set
+CONFIG_GRACE_PERIOD=m
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_NFS_COMMON=y
@@ -3442,7 +3537,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
# printk and dmesg options
#
CONFIG_PRINTK_TIME=y
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_BOOT_PRINTK_DELAY is not set
# CONFIG_DYNAMIC_DEBUG is not set
@@ -3499,13 +3594,13 @@ CONFIG_PANIC_ON_OOPS_VALUE=0
CONFIG_PANIC_TIMEOUT=0
CONFIG_SCHED_DEBUG=y
CONFIG_SCHEDSTATS=y
+# CONFIG_SCHED_STACK_END_CHECK is not set
CONFIG_TIMER_STATS=y
#
# Lock Debugging (spinlocks, mutexes, etc...)
#
# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
@@ -3514,11 +3609,12 @@ CONFIG_TIMER_STATS=y
# CONFIG_LOCK_STAT is not set
# CONFIG_DEBUG_ATOMIC_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
CONFIG_STACKTRACE=y
# CONFIG_DEBUG_KOBJECT is not set
CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_WRITECOUNT is not set
CONFIG_DEBUG_LIST=y
+# CONFIG_DEBUG_PI_LIST is not set
# CONFIG_DEBUG_SG is not set
# CONFIG_DEBUG_NOTIFIERS is not set
# CONFIG_DEBUG_CREDENTIALS is not set
@@ -3527,6 +3623,7 @@ CONFIG_DEBUG_LIST=y
# RCU Debugging
#
# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_TORTURE_TEST is not set
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_RCU_CPU_STALL_TIMEOUT=60
# CONFIG_RCU_CPU_STALL_INFO is not set
@@ -3541,7 +3638,6 @@ CONFIG_USER_STACKTRACE_SUPPORT=y
CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
CONFIG_HAVE_DYNAMIC_FTRACE=y
CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
@@ -3564,9 +3660,13 @@ CONFIG_TRACING_SUPPORT=y
# CONFIG_ASYNC_RAID6_TEST is not set
# CONFIG_TEST_STRING_HELPERS is not set
CONFIG_TEST_KSTRTOX=m
+# CONFIG_TEST_RHASHTABLE is not set
# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_TEST_MODULE is not set
+# CONFIG_TEST_LKM is not set
# CONFIG_TEST_USER_COPY is not set
+# CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIRMWARE is not set
+# CONFIG_TEST_UDELAY is not set
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set
@@ -3664,7 +3764,7 @@ CONFIG_PAX_USERCOPY=y
#
CONFIG_GRKERNSEC_KMEM=y
# CONFIG_GRKERNSEC_IO is not set
-CONFIG_GRKERNSEC_JIT_HARDEN=y
+# CONFIG_GRKERNSEC_BPF_HARDEN is not set
CONFIG_GRKERNSEC_PERF_HARDEN=y
# CONFIG_GRKERNSEC_RAND_THREADSTACK is not set
CONFIG_GRKERNSEC_PROC_MEMMAP=y
@@ -3709,6 +3809,7 @@ CONFIG_GRKERNSEC_CHROOT_UNIX=y
CONFIG_GRKERNSEC_CHROOT_FINDTASK=y
CONFIG_GRKERNSEC_CHROOT_NICE=y
CONFIG_GRKERNSEC_CHROOT_SYSCTL=y
+CONFIG_GRKERNSEC_CHROOT_RENAME=y
CONFIG_GRKERNSEC_CHROOT_CAPS=y
# CONFIG_GRKERNSEC_CHROOT_INITRD is not set
@@ -3741,7 +3842,6 @@ CONFIG_GRKERNSEC_HARDEN_IPC=y
#
# Network Protections
#
-CONFIG_GRKERNSEC_RANDNET=y
# CONFIG_GRKERNSEC_BLACKHOLE is not set
CONFIG_GRKERNSEC_NO_SIMULT_CONNECT=y
# CONFIG_GRKERNSEC_SOCKET is not set
@@ -3805,6 +3905,7 @@ CONFIG_CRYPTO_NULL=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_WORKQUEUE=y
CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_MCRYPTD=m
CONFIG_CRYPTO_AUTHENC=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_ABLK_HELPER=m
@@ -3843,7 +3944,7 @@ CONFIG_CRYPTO_CRC32C=m
CONFIG_CRYPTO_CRC32C_INTEL=m
CONFIG_CRYPTO_CRC32=m
# CONFIG_CRYPTO_CRC32_PCLMUL is not set
-CONFIG_CRYPTO_CRCT10DIF=m
+CONFIG_CRYPTO_CRCT10DIF=y
# CONFIG_CRYPTO_CRCT10DIF_PCLMUL is not set
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_MD4=m
@@ -3857,6 +3958,7 @@ CONFIG_CRYPTO_SHA1=m
CONFIG_CRYPTO_SHA1_SSSE3=m
CONFIG_CRYPTO_SHA256_SSSE3=m
CONFIG_CRYPTO_SHA512_SSSE3=m
+CONFIG_CRYPTO_SHA1_MB=m
CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_TGR192=m
@@ -3884,6 +3986,7 @@ CONFIG_CRYPTO_CAST5_AVX_X86_64=m
CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CAST6_AVX_X86_64=m
CONFIG_CRYPTO_DES=m
+# CONFIG_CRYPTO_DES3_EDE_X86_64 is not set
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_KHAZAD=m
CONFIG_CRYPTO_SALSA20=m
@@ -3913,6 +4016,7 @@ CONFIG_CRYPTO_LZ4HC=m
# Random Number Generation
#
CONFIG_CRYPTO_ANSI_CPRNG=m
+# CONFIG_CRYPTO_DRBG_MENU is not set
CONFIG_CRYPTO_USER_API=m
CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m
@@ -3924,12 +4028,16 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
CONFIG_CRYPTO_DEV_CCP=y
CONFIG_CRYPTO_DEV_CCP_DD=m
CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
+# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set
CONFIG_ASYMMETRIC_KEY_TYPE=m
CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
CONFIG_PUBLIC_KEY_ALGO_RSA=m
CONFIG_X509_CERTIFICATE_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=m
+# CONFIG_PKCS7_TEST_KEY is not set
CONFIG_HAVE_KVM=y
CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
CONFIG_HAVE_KVM_IRQ_ROUTING=y
CONFIG_HAVE_KVM_EVENTFD=y
CONFIG_KVM_APIC_ARCHITECTURE=y
@@ -3958,9 +4066,10 @@ CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_IO=y
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
CONFIG_CRC_CCITT=m
CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=m
+CONFIG_CRC_T10DIF=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC32=y
# CONFIG_CRC32_SELFTEST is not set
@@ -3971,6 +4080,7 @@ CONFIG_CRC32_SLICEBY8=y
CONFIG_CRC7=m
CONFIG_LIBCRC32C=m
CONFIG_CRC8=m
+# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
# CONFIG_RANDOM32_SELFTEST is not set
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
@@ -3998,12 +4108,15 @@ CONFIG_TEXTSEARCH_KMP=m
CONFIG_TEXTSEARCH_BM=m
CONFIG_TEXTSEARCH_FSM=m
CONFIG_BTREE=y
+CONFIG_INTERVAL_TREE=y
CONFIG_ASSOCIATIVE_ARRAY=y
CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
+CONFIG_HAS_IOPORT_MAP=y
CONFIG_HAS_DMA=y
CONFIG_CPU_RMAP=y
CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
CONFIG_NLATTR=y
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
CONFIG_LRU_CACHE=m
@@ -4017,3 +4130,4 @@ CONFIG_FONT_SUPPORT=m
# CONFIG_FONTS is not set
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
+CONFIG_ARCH_HAS_SG_CHAIN=y
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 09:20:40 +0000