diff options
| -rw-r--r-- | 3.10.11/1010_linux-3.10.11.patch | 1130 | ||||
| -rw-r--r-- | 3.11.1/0000_README (renamed from 3.10.11/0000_README) | 6 | ||||
| -rw-r--r-- | 3.11.1/1000_linux-3.11.1.patch | 401 | ||||
| -rw-r--r-- | 3.11.1/4420_grsecurity-2.9.1-3.11.1-201309151124.patch (renamed from 3.10.11/4420_grsecurity-2.9.1-3.10.11-201309081953.patch) | 12617 | ||||
| -rw-r--r-- | 3.11.1/4425_grsec_remove_EI_PAX.patch (renamed from 3.10.11/4425_grsec_remove_EI_PAX.patch) | 0 | ||||
| -rw-r--r-- | 3.11.1/4427_force_XATTR_PAX_tmpfs.patch (renamed from 3.10.11/4427_force_XATTR_PAX_tmpfs.patch) | 0 | ||||
| -rw-r--r-- | 3.11.1/4430_grsec-remove-localversion-grsec.patch (renamed from 3.10.11/4430_grsec-remove-localversion-grsec.patch) | 0 | ||||
| -rw-r--r-- | 3.11.1/4435_grsec-mute-warnings.patch (renamed from 3.10.11/4435_grsec-mute-warnings.patch) | 0 | ||||
| -rw-r--r-- | 3.11.1/4440_grsec-remove-protected-paths.patch (renamed from 3.10.11/4440_grsec-remove-protected-paths.patch) | 0 | ||||
| -rw-r--r-- | 3.11.1/4450_grsec-kconfig-default-gids.patch (renamed from 3.10.11/4450_grsec-kconfig-default-gids.patch) | 0 | ||||
| -rw-r--r-- | 3.11.1/4465_selinux-avc_audit-log-curr_ip.patch (renamed from 3.10.11/4465_selinux-avc_audit-log-curr_ip.patch) | 0 | ||||
| -rw-r--r-- | 3.11.1/4470_disable-compat_vdso.patch (renamed from 3.10.11/4470_disable-compat_vdso.patch) | 0 | ||||
| -rw-r--r-- | 3.11.1/4475_emutramp_default_on.patch (renamed from 3.10.11/4475_emutramp_default_on.patch) | 0 | ||||
| -rw-r--r-- | 3.2.51/0000_README | 2 | ||||
| -rw-r--r-- | 3.2.51/4420_grsecurity-2.9.1-3.2.51-201309142348.patch (renamed from 3.2.51/4420_grsecurity-2.9.1-3.2.51-201309101928.patch) | 131 |
15 files changed, 5872 insertions, 8415 deletions
diff --git a/3.10.11/1010_linux-3.10.11.patch b/3.10.11/1010_linux-3.10.11.patch deleted file mode 100644 index ff57b3e..0000000 --- a/3.10.11/1010_linux-3.10.11.patch +++ /dev/null @@ -1,1130 +0,0 @@ -diff --git a/Documentation/hwmon/k10temp b/Documentation/hwmon/k10temp -index 90956b6..4dfdc8f 100644 ---- a/Documentation/hwmon/k10temp -+++ b/Documentation/hwmon/k10temp -@@ -12,6 +12,7 @@ Supported chips: - * AMD Family 12h processors: "Llano" (E2/A4/A6/A8-Series) - * AMD Family 14h processors: "Brazos" (C/E/G/Z-Series) - * AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity" -+* AMD Family 16h processors: "Kabini" - - Prefix: 'k10temp' - Addresses scanned: PCI space -diff --git a/Makefile b/Makefile -index b119684..595076d 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,6 +1,6 @@ - VERSION = 3 - PATCHLEVEL = 10 --SUBLEVEL = 10 -+SUBLEVEL = 11 - EXTRAVERSION = - NAME = TOSSUG Baby Fish - -diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c -index 13609e0..05db95d 100644 ---- a/arch/arm/xen/enlighten.c -+++ b/arch/arm/xen/enlighten.c -@@ -170,6 +170,7 @@ static void __init xen_percpu_init(void *unused) - per_cpu(xen_vcpu, cpu) = vcpup; - - enable_percpu_irq(xen_events_irq, 0); -+ put_cpu(); - } - - static void xen_restart(char str, const char *cmd) -diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig -index 74991fe..fe404e7 100644 ---- a/arch/powerpc/Kconfig -+++ b/arch/powerpc/Kconfig -@@ -986,6 +986,7 @@ config RELOCATABLE - must live at a different physical address than the primary - kernel. - -+# This value must have zeroes in the bottom 60 bits otherwise lots will break - config PAGE_OFFSET - hex - default "0xc000000000000000" -diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h -index 988c812..b9f4262 100644 ---- a/arch/powerpc/include/asm/page.h -+++ b/arch/powerpc/include/asm/page.h -@@ -211,9 +211,19 @@ extern long long virt_phys_offset; - #define __va(x) ((void *)(unsigned long)((phys_addr_t)(x) + VIRT_PHYS_OFFSET)) - #define __pa(x) ((unsigned long)(x) - VIRT_PHYS_OFFSET) - #else -+#ifdef CONFIG_PPC64 -+/* -+ * gcc miscompiles (unsigned long)(&static_var) - PAGE_OFFSET -+ * with -mcmodel=medium, so we use & and | instead of - and + on 64-bit. -+ */ -+#define __va(x) ((void *)(unsigned long)((phys_addr_t)(x) | PAGE_OFFSET)) -+#define __pa(x) ((unsigned long)(x) & 0x0fffffffffffffffUL) -+ -+#else /* 32-bit, non book E */ - #define __va(x) ((void *)(unsigned long)((phys_addr_t)(x) + PAGE_OFFSET - MEMORY_START)) - #define __pa(x) ((unsigned long)(x) - PAGE_OFFSET + MEMORY_START) - #endif -+#endif - - /* - * Unfortunately the PLT is in the BSS in the PPC32 ELF ABI, -diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c -index d92f387..e2a0a16 100644 ---- a/arch/powerpc/kernel/lparcfg.c -+++ b/arch/powerpc/kernel/lparcfg.c -@@ -35,7 +35,13 @@ - #include <asm/vdso_datapage.h> - #include <asm/vio.h> - #include <asm/mmu.h> -+#include <asm/machdep.h> - -+ -+/* -+ * This isn't a module but we expose that to userspace -+ * via /proc so leave the definitions here -+ */ - #define MODULE_VERS "1.9" - #define MODULE_NAME "lparcfg" - -@@ -418,7 +424,8 @@ static void parse_em_data(struct seq_file *m) - { - unsigned long retbuf[PLPAR_HCALL_BUFSIZE]; - -- if (plpar_hcall(H_GET_EM_PARMS, retbuf) == H_SUCCESS) -+ if (firmware_has_feature(FW_FEATURE_LPAR) && -+ plpar_hcall(H_GET_EM_PARMS, retbuf) == H_SUCCESS) - seq_printf(m, "power_mode_data=%016lx\n", retbuf[0]); - } - -@@ -677,7 +684,6 @@ static int lparcfg_open(struct inode *inode, struct file *file) - } - - static const struct file_operations lparcfg_fops = { -- .owner = THIS_MODULE, - .read = seq_read, - .write = lparcfg_write, - .open = lparcfg_open, -@@ -699,14 +705,4 @@ static int __init lparcfg_init(void) - } - return 0; - } -- --static void __exit lparcfg_cleanup(void) --{ -- remove_proc_subtree("powerpc/lparcfg", NULL); --} -- --module_init(lparcfg_init); --module_exit(lparcfg_cleanup); --MODULE_DESCRIPTION("Interface for LPAR configuration data"); --MODULE_AUTHOR("Dave Engebretsen"); --MODULE_LICENSE("GPL"); -+machine_device_initcall(pseries, lparcfg_init); -diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c -index 1f34e92..7a5bf1b 100644 ---- a/arch/x86/mm/init.c -+++ b/arch/x86/mm/init.c -@@ -78,8 +78,8 @@ __ref void *alloc_low_pages(unsigned int num) - return __va(pfn << PAGE_SHIFT); - } - --/* need 4 4k for initial PMD_SIZE, 4k for 0-ISA_END_ADDRESS */ --#define INIT_PGT_BUF_SIZE (5 * PAGE_SIZE) -+/* need 3 4k for initial PMD_SIZE, 3 4k for 0-ISA_END_ADDRESS */ -+#define INIT_PGT_BUF_SIZE (6 * PAGE_SIZE) - RESERVE_BRK(early_pgt_alloc, INIT_PGT_BUF_SIZE); - void __init early_alloc_pgt_buf(void) - { -diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c -index 80403c1..45af90a 100644 ---- a/drivers/acpi/ec.c -+++ b/drivers/acpi/ec.c -@@ -987,6 +987,10 @@ static struct dmi_system_id __initdata ec_dmi_table[] = { - ec_skip_dsdt_scan, "HP Folio 13", { - DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), - DMI_MATCH(DMI_PRODUCT_NAME, "HP Folio 13"),}, NULL}, -+ { -+ ec_validate_ecdt, "ASUS hardware", { -+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTek Computer Inc."), -+ DMI_MATCH(DMI_PRODUCT_NAME, "L4R"),}, NULL}, - {}, - }; - -diff --git a/drivers/base/memory.c b/drivers/base/memory.c -index 14f8a69..86abbff 100644 ---- a/drivers/base/memory.c -+++ b/drivers/base/memory.c -@@ -152,6 +152,8 @@ static ssize_t show_mem_removable(struct device *dev, - container_of(dev, struct memory_block, dev); - - for (i = 0; i < sections_per_block; i++) { -+ if (!present_section_nr(mem->start_section_nr + i)) -+ continue; - pfn = section_nr_to_pfn(mem->start_section_nr + i); - ret &= is_mem_section_removable(pfn, PAGES_PER_SECTION); - } -diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c -index 02f490b..bb8c3bb 100644 ---- a/drivers/base/regmap/regcache-rbtree.c -+++ b/drivers/base/regmap/regcache-rbtree.c -@@ -362,7 +362,7 @@ static int regcache_rbtree_write(struct regmap *map, unsigned int reg, - rbnode = kzalloc(sizeof *rbnode, GFP_KERNEL); - if (!rbnode) - return -ENOMEM; -- rbnode->blklen = sizeof(*rbnode); -+ rbnode->blklen = 1; - rbnode->base_reg = reg; - rbnode->block = kmalloc(rbnode->blklen * map->cache_word_size, - GFP_KERNEL); -diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h -index 01f6c2c..a365780 100644 ---- a/drivers/gpu/drm/i915/i915_reg.h -+++ b/drivers/gpu/drm/i915/i915_reg.h -@@ -4246,7 +4246,7 @@ - #define EDP_LINK_TRAIN_600MV_0DB_IVB (0x30 <<22) - #define EDP_LINK_TRAIN_600MV_3_5DB_IVB (0x36 <<22) - #define EDP_LINK_TRAIN_800MV_0DB_IVB (0x38 <<22) --#define EDP_LINK_TRAIN_800MV_3_5DB_IVB (0x33 <<22) -+#define EDP_LINK_TRAIN_800MV_3_5DB_IVB (0x3e <<22) - - /* legacy values */ - #define EDP_LINK_TRAIN_500MV_0DB_IVB (0x00 <<22) -diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/mc.h b/drivers/gpu/drm/nouveau/core/include/subdev/mc.h -index d550226..9d2cd20 100644 ---- a/drivers/gpu/drm/nouveau/core/include/subdev/mc.h -+++ b/drivers/gpu/drm/nouveau/core/include/subdev/mc.h -@@ -20,8 +20,8 @@ nouveau_mc(void *obj) - return (void *)nv_device(obj)->subdev[NVDEV_SUBDEV_MC]; - } - --#define nouveau_mc_create(p,e,o,d) \ -- nouveau_mc_create_((p), (e), (o), sizeof(**d), (void **)d) -+#define nouveau_mc_create(p,e,o,m,d) \ -+ nouveau_mc_create_((p), (e), (o), (m), sizeof(**d), (void **)d) - #define nouveau_mc_destroy(p) ({ \ - struct nouveau_mc *pmc = (p); _nouveau_mc_dtor(nv_object(pmc)); \ - }) -@@ -33,7 +33,8 @@ nouveau_mc(void *obj) - }) - - int nouveau_mc_create_(struct nouveau_object *, struct nouveau_object *, -- struct nouveau_oclass *, int, void **); -+ struct nouveau_oclass *, const struct nouveau_mc_intr *, -+ int, void **); - void _nouveau_mc_dtor(struct nouveau_object *); - int _nouveau_mc_init(struct nouveau_object *); - int _nouveau_mc_fini(struct nouveau_object *, bool); -diff --git a/drivers/gpu/drm/nouveau/core/subdev/mc/base.c b/drivers/gpu/drm/nouveau/core/subdev/mc/base.c -index 1c0330b..ec9cd6f 100644 ---- a/drivers/gpu/drm/nouveau/core/subdev/mc/base.c -+++ b/drivers/gpu/drm/nouveau/core/subdev/mc/base.c -@@ -80,7 +80,9 @@ _nouveau_mc_dtor(struct nouveau_object *object) - - int - nouveau_mc_create_(struct nouveau_object *parent, struct nouveau_object *engine, -- struct nouveau_oclass *oclass, int length, void **pobject) -+ struct nouveau_oclass *oclass, -+ const struct nouveau_mc_intr *intr_map, -+ int length, void **pobject) - { - struct nouveau_device *device = nv_device(parent); - struct nouveau_mc *pmc; -@@ -92,6 +94,8 @@ nouveau_mc_create_(struct nouveau_object *parent, struct nouveau_object *engine, - if (ret) - return ret; - -+ pmc->intr_map = intr_map; -+ - ret = request_irq(device->pdev->irq, nouveau_mc_intr, - IRQF_SHARED, "nouveau", pmc); - if (ret < 0) -diff --git a/drivers/gpu/drm/nouveau/core/subdev/mc/nv04.c b/drivers/gpu/drm/nouveau/core/subdev/mc/nv04.c -index 8c76971..64aa4ed 100644 ---- a/drivers/gpu/drm/nouveau/core/subdev/mc/nv04.c -+++ b/drivers/gpu/drm/nouveau/core/subdev/mc/nv04.c -@@ -50,12 +50,11 @@ nv04_mc_ctor(struct nouveau_object *parent, struct nouveau_object *engine, - struct nv04_mc_priv *priv; - int ret; - -- ret = nouveau_mc_create(parent, engine, oclass, &priv); -+ ret = nouveau_mc_create(parent, engine, oclass, nv04_mc_intr, &priv); - *pobject = nv_object(priv); - if (ret) - return ret; - -- priv->base.intr_map = nv04_mc_intr; - return 0; - } - -diff --git a/drivers/gpu/drm/nouveau/core/subdev/mc/nv44.c b/drivers/gpu/drm/nouveau/core/subdev/mc/nv44.c -index 5191937..d989178 100644 ---- a/drivers/gpu/drm/nouveau/core/subdev/mc/nv44.c -+++ b/drivers/gpu/drm/nouveau/core/subdev/mc/nv44.c -@@ -36,12 +36,11 @@ nv44_mc_ctor(struct nouveau_object *parent, struct nouveau_object *engine, - struct nv44_mc_priv *priv; - int ret; - -- ret = nouveau_mc_create(parent, engine, oclass, &priv); -+ ret = nouveau_mc_create(parent, engine, oclass, nv04_mc_intr, &priv); - *pobject = nv_object(priv); - if (ret) - return ret; - -- priv->base.intr_map = nv04_mc_intr; - return 0; - } - -diff --git a/drivers/gpu/drm/nouveau/core/subdev/mc/nv50.c b/drivers/gpu/drm/nouveau/core/subdev/mc/nv50.c -index d796924..732d810 100644 ---- a/drivers/gpu/drm/nouveau/core/subdev/mc/nv50.c -+++ b/drivers/gpu/drm/nouveau/core/subdev/mc/nv50.c -@@ -52,12 +52,11 @@ nv50_mc_ctor(struct nouveau_object *parent, struct nouveau_object *engine, - struct nv50_mc_priv *priv; - int ret; - -- ret = nouveau_mc_create(parent, engine, oclass, &priv); -+ ret = nouveau_mc_create(parent, engine, oclass, nv50_mc_intr, &priv); - *pobject = nv_object(priv); - if (ret) - return ret; - -- priv->base.intr_map = nv50_mc_intr; - return 0; - } - -diff --git a/drivers/gpu/drm/nouveau/core/subdev/mc/nv98.c b/drivers/gpu/drm/nouveau/core/subdev/mc/nv98.c -index e82fd21..0d57b4d 100644 ---- a/drivers/gpu/drm/nouveau/core/subdev/mc/nv98.c -+++ b/drivers/gpu/drm/nouveau/core/subdev/mc/nv98.c -@@ -54,12 +54,11 @@ nv98_mc_ctor(struct nouveau_object *parent, struct nouveau_object *engine, - struct nv98_mc_priv *priv; - int ret; - -- ret = nouveau_mc_create(parent, engine, oclass, &priv); -+ ret = nouveau_mc_create(parent, engine, oclass, nv98_mc_intr, &priv); - *pobject = nv_object(priv); - if (ret) - return ret; - -- priv->base.intr_map = nv98_mc_intr; - return 0; - } - -diff --git a/drivers/gpu/drm/nouveau/core/subdev/mc/nvc0.c b/drivers/gpu/drm/nouveau/core/subdev/mc/nvc0.c -index 737bd4b..4c97cd2 100644 ---- a/drivers/gpu/drm/nouveau/core/subdev/mc/nvc0.c -+++ b/drivers/gpu/drm/nouveau/core/subdev/mc/nvc0.c -@@ -56,12 +56,11 @@ nvc0_mc_ctor(struct nouveau_object *parent, struct nouveau_object *engine, - struct nvc0_mc_priv *priv; - int ret; - -- ret = nouveau_mc_create(parent, engine, oclass, &priv); -+ ret = nouveau_mc_create(parent, engine, oclass, nvc0_mc_intr, &priv); - *pobject = nv_object(priv); - if (ret) - return ret; - -- priv->base.intr_map = nvc0_mc_intr; - return 0; - } - -diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c -index 3751730..1a0bf07 100644 ---- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c -+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c -@@ -29,7 +29,9 @@ - #include <drm/drmP.h> - #include <drm/ttm/ttm_bo_driver.h> - --#define VMW_PPN_SIZE sizeof(unsigned long) -+#define VMW_PPN_SIZE (sizeof(unsigned long)) -+/* A future safe maximum remap size. */ -+#define VMW_PPN_PER_REMAP ((31 * 1024) / VMW_PPN_SIZE) - - static int vmw_gmr2_bind(struct vmw_private *dev_priv, - struct page *pages[], -@@ -38,43 +40,61 @@ static int vmw_gmr2_bind(struct vmw_private *dev_priv, - { - SVGAFifoCmdDefineGMR2 define_cmd; - SVGAFifoCmdRemapGMR2 remap_cmd; -- uint32_t define_size = sizeof(define_cmd) + 4; -- uint32_t remap_size = VMW_PPN_SIZE * num_pages + sizeof(remap_cmd) + 4; - uint32_t *cmd; - uint32_t *cmd_orig; -+ uint32_t define_size = sizeof(define_cmd) + sizeof(*cmd); -+ uint32_t remap_num = num_pages / VMW_PPN_PER_REMAP + ((num_pages % VMW_PPN_PER_REMAP) > 0); -+ uint32_t remap_size = VMW_PPN_SIZE * num_pages + (sizeof(remap_cmd) + sizeof(*cmd)) * remap_num; -+ uint32_t remap_pos = 0; -+ uint32_t cmd_size = define_size + remap_size; - uint32_t i; - -- cmd_orig = cmd = vmw_fifo_reserve(dev_priv, define_size + remap_size); -+ cmd_orig = cmd = vmw_fifo_reserve(dev_priv, cmd_size); - if (unlikely(cmd == NULL)) - return -ENOMEM; - - define_cmd.gmrId = gmr_id; - define_cmd.numPages = num_pages; - -+ *cmd++ = SVGA_CMD_DEFINE_GMR2; -+ memcpy(cmd, &define_cmd, sizeof(define_cmd)); -+ cmd += sizeof(define_cmd) / sizeof(*cmd); -+ -+ /* -+ * Need to split the command if there are too many -+ * pages that goes into the gmr. -+ */ -+ - remap_cmd.gmrId = gmr_id; - remap_cmd.flags = (VMW_PPN_SIZE > sizeof(*cmd)) ? - SVGA_REMAP_GMR2_PPN64 : SVGA_REMAP_GMR2_PPN32; -- remap_cmd.offsetPages = 0; -- remap_cmd.numPages = num_pages; - -- *cmd++ = SVGA_CMD_DEFINE_GMR2; -- memcpy(cmd, &define_cmd, sizeof(define_cmd)); -- cmd += sizeof(define_cmd) / sizeof(uint32); -+ while (num_pages > 0) { -+ unsigned long nr = min(num_pages, (unsigned long)VMW_PPN_PER_REMAP); -+ -+ remap_cmd.offsetPages = remap_pos; -+ remap_cmd.numPages = nr; - -- *cmd++ = SVGA_CMD_REMAP_GMR2; -- memcpy(cmd, &remap_cmd, sizeof(remap_cmd)); -- cmd += sizeof(remap_cmd) / sizeof(uint32); -+ *cmd++ = SVGA_CMD_REMAP_GMR2; -+ memcpy(cmd, &remap_cmd, sizeof(remap_cmd)); -+ cmd += sizeof(remap_cmd) / sizeof(*cmd); - -- for (i = 0; i < num_pages; ++i) { -- if (VMW_PPN_SIZE <= 4) -- *cmd = page_to_pfn(*pages++); -- else -- *((uint64_t *)cmd) = page_to_pfn(*pages++); -+ for (i = 0; i < nr; ++i) { -+ if (VMW_PPN_SIZE <= 4) -+ *cmd = page_to_pfn(*pages++); -+ else -+ *((uint64_t *)cmd) = page_to_pfn(*pages++); - -- cmd += VMW_PPN_SIZE / sizeof(*cmd); -+ cmd += VMW_PPN_SIZE / sizeof(*cmd); -+ } -+ -+ num_pages -= nr; -+ remap_pos += nr; - } - -- vmw_fifo_commit(dev_priv, define_size + remap_size); -+ BUG_ON(cmd != cmd_orig + cmd_size / sizeof(*cmd)); -+ -+ vmw_fifo_commit(dev_priv, cmd_size); - - return 0; - } -diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig -index 0428e8a..df064e8 100644 ---- a/drivers/hwmon/Kconfig -+++ b/drivers/hwmon/Kconfig -@@ -296,8 +296,8 @@ config SENSORS_K10TEMP - If you say yes here you get support for the temperature - sensor(s) inside your CPU. Supported are later revisions of - the AMD Family 10h and all revisions of the AMD Family 11h, -- 12h (Llano), 14h (Brazos) and 15h (Bulldozer/Trinity) -- microarchitectures. -+ 12h (Llano), 14h (Brazos), 15h (Bulldozer/Trinity) and -+ 16h (Kabini) microarchitectures. - - This driver can also be built as a module. If so, the module - will be called k10temp. -diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c -index e3b037c..e633856 100644 ---- a/drivers/hwmon/k10temp.c -+++ b/drivers/hwmon/k10temp.c -@@ -1,5 +1,5 @@ - /* -- * k10temp.c - AMD Family 10h/11h/12h/14h/15h processor hardware monitoring -+ * k10temp.c - AMD Family 10h/11h/12h/14h/15h/16h processor hardware monitoring - * - * Copyright (c) 2009 Clemens Ladisch <clemens@ladisch.de> - * -@@ -211,6 +211,7 @@ static DEFINE_PCI_DEVICE_TABLE(k10temp_id_table) = { - { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) }, - { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) }, - { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) }, -+ { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) }, - {} - }; - MODULE_DEVICE_TABLE(pci, k10temp_id_table); -diff --git a/drivers/misc/hpilo.c b/drivers/misc/hpilo.c -index 621c7a3..b83e3ca 100644 ---- a/drivers/misc/hpilo.c -+++ b/drivers/misc/hpilo.c -@@ -759,7 +759,7 @@ static int ilo_probe(struct pci_dev *pdev, - - /* Ignore subsystem_device = 0x1979 (set by BIOS) */ - if (pdev->subsystem_device == 0x1979) -- goto out; -+ return 0; - - if (max_ccb > MAX_CCB) - max_ccb = MAX_CCB; -@@ -899,7 +899,7 @@ static void __exit ilo_exit(void) - class_destroy(ilo_class); - } - --MODULE_VERSION("1.4"); -+MODULE_VERSION("1.4.1"); - MODULE_ALIAS(ILO_NAME); - MODULE_DESCRIPTION(ILO_NAME); - MODULE_AUTHOR("David Altobelli <david.altobelli@hp.com>"); -diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c -index 700fe55..1bf3f8b 100644 ---- a/drivers/misc/mei/hw-me.c -+++ b/drivers/misc/mei/hw-me.c -@@ -176,16 +176,14 @@ static void mei_me_hw_reset(struct mei_device *dev, bool intr_enable) - struct mei_me_hw *hw = to_me_hw(dev); - u32 hcsr = mei_hcsr_read(hw); - -- dev_dbg(&dev->pdev->dev, "before reset HCSR = 0x%08x.\n", hcsr); -- -- hcsr |= (H_RST | H_IG); -+ hcsr |= H_RST | H_IG | H_IS; - - if (intr_enable) - hcsr |= H_IE; - else -- hcsr |= ~H_IE; -+ hcsr &= ~H_IE; - -- mei_hcsr_set(hw, hcsr); -+ mei_me_reg_write(hw, H_CSR, hcsr); - - if (dev->dev_state == MEI_DEV_POWER_DOWN) - mei_me_hw_reset_release(dev); -diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c -index 6bd0e92..417a089 100644 ---- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c -+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c -@@ -448,6 +448,7 @@ static void ath9k_htc_tx_process(struct ath9k_htc_priv *priv, - struct ieee80211_conf *cur_conf = &priv->hw->conf; - bool txok; - int slot; -+ int hdrlen, padsize; - - slot = strip_drv_header(priv, skb); - if (slot < 0) { -@@ -504,6 +505,15 @@ send_mac80211: - - ath9k_htc_tx_clear_slot(priv, slot); - -+ /* Remove padding before handing frame back to mac80211 */ -+ hdrlen = ieee80211_get_hdrlen_from_skb(skb); -+ -+ padsize = hdrlen & 3; -+ if (padsize && skb->len > hdrlen + padsize) { -+ memmove(skb->data + padsize, skb->data, hdrlen); -+ skb_pull(skb, padsize); -+ } -+ - /* Send status to mac80211 */ - ieee80211_tx_status(priv->hw, skb); - } -diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c -index 2ba4945..bd126c2 100644 ---- a/drivers/net/wireless/ath/ath9k/init.c -+++ b/drivers/net/wireless/ath/ath9k/init.c -@@ -767,7 +767,8 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) - IEEE80211_HW_PS_NULLFUNC_STACK | - IEEE80211_HW_SPECTRUM_MGMT | - IEEE80211_HW_REPORTS_TX_ACK_STATUS | -- IEEE80211_HW_SUPPORTS_RC_TABLE; -+ IEEE80211_HW_SUPPORTS_RC_TABLE | -+ IEEE80211_HW_SUPPORTS_HT_CCK_RATES; - - if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) - hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION; -diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c -index 35ced10..e33a659 100644 ---- a/drivers/net/wireless/ath/ath9k/main.c -+++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -173,8 +173,7 @@ static void ath_restart_work(struct ath_softc *sc) - { - ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0); - -- if (AR_SREV_9340(sc->sc_ah) || AR_SREV_9485(sc->sc_ah) || -- AR_SREV_9550(sc->sc_ah)) -+ if (AR_SREV_9340(sc->sc_ah) || AR_SREV_9330(sc->sc_ah)) - ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work, - msecs_to_jiffies(ATH_PLL_WORK_INTERVAL)); - -diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c -index e9010a4..0686375 100644 ---- a/drivers/net/wireless/ath/carl9170/main.c -+++ b/drivers/net/wireless/ath/carl9170/main.c -@@ -1857,7 +1857,8 @@ void *carl9170_alloc(size_t priv_size) - IEEE80211_HW_SUPPORTS_PS | - IEEE80211_HW_PS_NULLFUNC_STACK | - IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC | -- IEEE80211_HW_SIGNAL_DBM; -+ IEEE80211_HW_SIGNAL_DBM | -+ IEEE80211_HW_SUPPORTS_HT_CCK_RATES; - - if (!modparam_noht) { - /* -diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c -index 900f5f8..a8eff95 100644 ---- a/drivers/net/wireless/iwlegacy/4965-mac.c -+++ b/drivers/net/wireless/iwlegacy/4965-mac.c -@@ -4446,9 +4446,9 @@ il4965_irq_tasklet(struct il_priv *il) - set_bit(S_RFKILL, &il->status); - } else { - clear_bit(S_RFKILL, &il->status); -- wiphy_rfkill_set_hw_state(il->hw->wiphy, hw_rf_kill); - il_force_reset(il, true); - } -+ wiphy_rfkill_set_hw_state(il->hw->wiphy, hw_rf_kill); - - handled |= CSR_INT_BIT_RF_KILL; - } -diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c -index 705aa33..7e66a90 100644 ---- a/drivers/net/wireless/rt2x00/rt2800lib.c -+++ b/drivers/net/wireless/rt2x00/rt2800lib.c -@@ -5912,7 +5912,8 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) - IEEE80211_HW_SUPPORTS_PS | - IEEE80211_HW_PS_NULLFUNC_STACK | - IEEE80211_HW_AMPDU_AGGREGATION | -- IEEE80211_HW_REPORTS_TX_ACK_STATUS; -+ IEEE80211_HW_REPORTS_TX_ACK_STATUS | -+ IEEE80211_HW_SUPPORTS_HT_CCK_RATES; - - /* - * Don't set IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING for USB devices -diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c -index 69dd49c..ce3f129d 100644 ---- a/drivers/scsi/pm8001/pm8001_hwi.c -+++ b/drivers/scsi/pm8001/pm8001_hwi.c -@@ -221,7 +221,7 @@ static void init_default_table_values(struct pm8001_hba_info *pm8001_ha) - pm8001_ha->main_cfg_tbl.pm8001_tbl.fatal_err_interrupt = 0x01; - for (i = 0; i < PM8001_MAX_INB_NUM; i++) { - pm8001_ha->inbnd_q_tbl[i].element_pri_size_cnt = -- PM8001_MPI_QUEUE | (64 << 16) | (0x00<<30); -+ PM8001_MPI_QUEUE | (pm8001_ha->iomb_size << 16) | (0x00<<30); - pm8001_ha->inbnd_q_tbl[i].upper_base_addr = - pm8001_ha->memoryMap.region[IB + i].phys_addr_hi; - pm8001_ha->inbnd_q_tbl[i].lower_base_addr = -@@ -247,7 +247,7 @@ static void init_default_table_values(struct pm8001_hba_info *pm8001_ha) - } - for (i = 0; i < PM8001_MAX_OUTB_NUM; i++) { - pm8001_ha->outbnd_q_tbl[i].element_size_cnt = -- PM8001_MPI_QUEUE | (64 << 16) | (0x01<<30); -+ PM8001_MPI_QUEUE | (pm8001_ha->iomb_size << 16) | (0x01<<30); - pm8001_ha->outbnd_q_tbl[i].upper_base_addr = - pm8001_ha->memoryMap.region[OB + i].phys_addr_hi; - pm8001_ha->outbnd_q_tbl[i].lower_base_addr = -diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c -index 302514d..e1c4896 100644 ---- a/drivers/scsi/pm8001/pm80xx_hwi.c -+++ b/drivers/scsi/pm8001/pm80xx_hwi.c -@@ -275,7 +275,7 @@ static void init_default_table_values(struct pm8001_hba_info *pm8001_ha) - - for (i = 0; i < PM8001_MAX_SPCV_INB_NUM; i++) { - pm8001_ha->inbnd_q_tbl[i].element_pri_size_cnt = -- PM8001_MPI_QUEUE | (64 << 16) | (0x00<<30); -+ PM8001_MPI_QUEUE | (pm8001_ha->iomb_size << 16) | (0x00<<30); - pm8001_ha->inbnd_q_tbl[i].upper_base_addr = - pm8001_ha->memoryMap.region[IB + i].phys_addr_hi; - pm8001_ha->inbnd_q_tbl[i].lower_base_addr = -@@ -301,7 +301,7 @@ static void init_default_table_values(struct pm8001_hba_info *pm8001_ha) - } - for (i = 0; i < PM8001_MAX_SPCV_OUTB_NUM; i++) { - pm8001_ha->outbnd_q_tbl[i].element_size_cnt = -- PM8001_MPI_QUEUE | (64 << 16) | (0x01<<30); -+ PM8001_MPI_QUEUE | (pm8001_ha->iomb_size << 16) | (0x01<<30); - pm8001_ha->outbnd_q_tbl[i].upper_base_addr = - pm8001_ha->memoryMap.region[OB + i].phys_addr_hi; - pm8001_ha->outbnd_q_tbl[i].lower_base_addr = -diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c -index 6455305..a532ca5 100644 ---- a/drivers/staging/imx-drm/imx-drm-core.c -+++ b/drivers/staging/imx-drm/imx-drm-core.c -@@ -681,6 +681,7 @@ found: - - return i; - } -+EXPORT_SYMBOL_GPL(imx_drm_encoder_get_mux_id); - - /* - * imx_drm_remove_encoder - remove an encoder -diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c -index 012ff8b..4c1b8db 100644 ---- a/drivers/target/iscsi/iscsi_target.c -+++ b/drivers/target/iscsi/iscsi_target.c -@@ -1086,7 +1086,6 @@ int iscsit_process_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, - if (cmd->reject_reason) - return 0; - -- target_put_sess_cmd(conn->sess->se_sess, &cmd->se_cmd); - return 1; - } - /* -@@ -1124,14 +1123,10 @@ after_immediate_data: - */ - cmdsn_ret = iscsit_sequence_cmd(cmd->conn, cmd, - (unsigned char *)hdr, hdr->cmdsn); -- if (cmdsn_ret == CMDSN_ERROR_CANNOT_RECOVER) { -+ if (cmdsn_ret == CMDSN_ERROR_CANNOT_RECOVER) - return -1; -- } else if (cmdsn_ret == CMDSN_LOWER_THAN_EXP) { -- target_put_sess_cmd(conn->sess->se_sess, &cmd->se_cmd); -- return 0; -- } - -- if (cmd->sense_reason) { -+ if (cmd->sense_reason || cmdsn_ret == CMDSN_LOWER_THAN_EXP) { - int rc; - - rc = iscsit_dump_data_payload(cmd->conn, -@@ -1541,6 +1536,10 @@ int iscsit_handle_nop_out(struct iscsi_conn *conn, struct iscsi_cmd *cmd, - if (hdr->itt == RESERVED_ITT && !(hdr->opcode & ISCSI_OP_IMMEDIATE)) { - pr_err("NOPOUT ITT is reserved, but Immediate Bit is" - " not set, protocol error.\n"); -+ if (!cmd) -+ return iscsit_add_reject(conn, ISCSI_REASON_PROTOCOL_ERROR, -+ (unsigned char *)hdr); -+ - return iscsit_reject_cmd(cmd, ISCSI_REASON_PROTOCOL_ERROR, - (unsigned char *)hdr); - } -@@ -1550,6 +1549,10 @@ int iscsit_handle_nop_out(struct iscsi_conn *conn, struct iscsi_cmd *cmd, - " greater than MaxXmitDataSegmentLength: %u, protocol" - " error.\n", payload_length, - conn->conn_ops->MaxXmitDataSegmentLength); -+ if (!cmd) -+ return iscsit_add_reject(conn, ISCSI_REASON_PROTOCOL_ERROR, -+ (unsigned char *)hdr); -+ - return iscsit_reject_cmd(cmd, ISCSI_REASON_PROTOCOL_ERROR, - (unsigned char *)hdr); - } -diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c -index 3402241..bc788c5 100644 ---- a/drivers/target/iscsi/iscsi_target_login.c -+++ b/drivers/target/iscsi/iscsi_target_login.c -@@ -1163,12 +1163,11 @@ static int __iscsi_target_login_thread(struct iscsi_np *np) - if (np->np_thread_state == ISCSI_NP_THREAD_RESET) { - spin_unlock_bh(&np->np_thread_lock); - complete(&np->np_restart_comp); -- if (ret == -ENODEV) { -- iscsit_put_transport(conn->conn_transport); -- kfree(conn); -- conn = NULL; -+ iscsit_put_transport(conn->conn_transport); -+ kfree(conn); -+ conn = NULL; -+ if (ret == -ENODEV) - goto out; -- } - /* Get another socket */ - return 1; - } -diff --git a/drivers/target/target_core_spc.c b/drivers/target/target_core_spc.c -index 4cb667d..9fabbf7 100644 ---- a/drivers/target/target_core_spc.c -+++ b/drivers/target/target_core_spc.c -@@ -97,9 +97,12 @@ spc_emulate_inquiry_std(struct se_cmd *cmd, unsigned char *buf) - - buf[7] = 0x2; /* CmdQue=1 */ - -- snprintf(&buf[8], 8, "LIO-ORG"); -- snprintf(&buf[16], 16, "%s", dev->t10_wwn.model); -- snprintf(&buf[32], 4, "%s", dev->t10_wwn.revision); -+ memcpy(&buf[8], "LIO-ORG ", 8); -+ memset(&buf[16], 0x20, 16); -+ memcpy(&buf[16], dev->t10_wwn.model, -+ min_t(size_t, strlen(dev->t10_wwn.model), 16)); -+ memcpy(&buf[32], dev->t10_wwn.revision, -+ min_t(size_t, strlen(dev->t10_wwn.revision), 4)); - buf[4] = 31; /* Set additional length to 31 */ - - return 0; -diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c -index 3396eb9..ac27671 100644 ---- a/drivers/tty/hvc/hvsi_lib.c -+++ b/drivers/tty/hvc/hvsi_lib.c -@@ -341,8 +341,8 @@ void hvsilib_establish(struct hvsi_priv *pv) - - pr_devel("HVSI@%x: ... waiting handshake\n", pv->termno); - -- /* Try for up to 200s */ -- for (timeout = 0; timeout < 20; timeout++) { -+ /* Try for up to 400ms */ -+ for (timeout = 0; timeout < 40; timeout++) { - if (pv->established) - goto established; - if (!hvsi_get_packet(pv)) -diff --git a/drivers/usb/gadget/f_acm.c b/drivers/usb/gadget/f_acm.c -index 4b7e33e..ab1065a 100644 ---- a/drivers/usb/gadget/f_acm.c -+++ b/drivers/usb/gadget/f_acm.c -@@ -285,6 +285,7 @@ static struct usb_string acm_string_defs[] = { - [ACM_CTRL_IDX].s = "CDC Abstract Control Model (ACM)", - [ACM_DATA_IDX].s = "CDC ACM Data", - [ACM_IAD_IDX ].s = "CDC Serial", -+ { } /* end of list */ - }; - - static struct usb_gadget_strings acm_string_table = { -diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c -index 0ddbece..c450fdb 100644 ---- a/fs/jfs/jfs_dtree.c -+++ b/fs/jfs/jfs_dtree.c -@@ -3047,6 +3047,14 @@ int jfs_readdir(struct file *filp, void *dirent, filldir_t filldir) - - dir_index = (u32) filp->f_pos; - -+ /* -+ * NFSv4 reserves cookies 1 and 2 for . and .. so we add -+ * the value we return to the vfs is one greater than the -+ * one we use internally. -+ */ -+ if (dir_index) -+ dir_index--; -+ - if (dir_index > 1) { - struct dir_table_slot dirtab_slot; - -@@ -3086,7 +3094,7 @@ int jfs_readdir(struct file *filp, void *dirent, filldir_t filldir) - if (p->header.flag & BT_INTERNAL) { - jfs_err("jfs_readdir: bad index table"); - DT_PUTPAGE(mp); -- filp->f_pos = -1; -+ filp->f_pos = DIREND; - return 0; - } - } else { -@@ -3094,7 +3102,7 @@ int jfs_readdir(struct file *filp, void *dirent, filldir_t filldir) - /* - * self "." - */ -- filp->f_pos = 0; -+ filp->f_pos = 1; - if (filldir(dirent, ".", 1, 0, ip->i_ino, - DT_DIR)) - return 0; -@@ -3102,7 +3110,7 @@ int jfs_readdir(struct file *filp, void *dirent, filldir_t filldir) - /* - * parent ".." - */ -- filp->f_pos = 1; -+ filp->f_pos = 2; - if (filldir(dirent, "..", 2, 1, PARENT(ip), DT_DIR)) - return 0; - -@@ -3123,24 +3131,25 @@ int jfs_readdir(struct file *filp, void *dirent, filldir_t filldir) - /* - * Legacy filesystem - OS/2 & Linux JFS < 0.3.6 - * -- * pn = index = 0: First entry "." -- * pn = 0; index = 1: Second entry ".." -+ * pn = 0; index = 1: First entry "." -+ * pn = 0; index = 2: Second entry ".." - * pn > 0: Real entries, pn=1 -> leftmost page - * pn = index = -1: No more entries - */ - dtpos = filp->f_pos; -- if (dtpos == 0) { -+ if (dtpos < 2) { - /* build "." entry */ - -+ filp->f_pos = 1; - if (filldir(dirent, ".", 1, filp->f_pos, ip->i_ino, - DT_DIR)) - return 0; -- dtoffset->index = 1; -+ dtoffset->index = 2; - filp->f_pos = dtpos; - } - - if (dtoffset->pn == 0) { -- if (dtoffset->index == 1) { -+ if (dtoffset->index == 2) { - /* build ".." entry */ - - if (filldir(dirent, "..", 2, filp->f_pos, -@@ -3233,6 +3242,12 @@ int jfs_readdir(struct file *filp, void *dirent, filldir_t filldir) - } - jfs_dirent->position = unique_pos++; - } -+ /* -+ * We add 1 to the index because we may -+ * use a value of 2 internally, and NFSv4 -+ * doesn't like that. -+ */ -+ jfs_dirent->position++; - } else { - jfs_dirent->position = dtpos; - len = min(d_namleft, DTLHDRDATALEN_LEGACY); -diff --git a/include/linux/regmap.h b/include/linux/regmap.h -index f91bb41..98c470ce 100644 ---- a/include/linux/regmap.h -+++ b/include/linux/regmap.h -@@ -16,6 +16,7 @@ - #include <linux/list.h> - #include <linux/rbtree.h> - #include <linux/err.h> -+#include <linux/bug.h> - - struct module; - struct device; -diff --git a/include/net/mac80211.h b/include/net/mac80211.h -index 885898a..4e50d36 100644 ---- a/include/net/mac80211.h -+++ b/include/net/mac80211.h -@@ -1484,6 +1484,7 @@ enum ieee80211_hw_flags { - IEEE80211_HW_SUPPORTS_RC_TABLE = 1<<24, - IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF = 1<<25, - IEEE80211_HW_TIMING_BEACON_ONLY = 1<<26, -+ IEEE80211_HW_SUPPORTS_HT_CCK_RATES = 1<<27, - }; - - /** -diff --git a/ipc/msg.c b/ipc/msg.c -index d0c6d96..f8fbe2c 100644 ---- a/ipc/msg.c -+++ b/ipc/msg.c -@@ -795,7 +795,7 @@ static inline void free_copy(struct msg_msg *copy) - - static struct msg_msg *find_msg(struct msg_queue *msq, long *msgtyp, int mode) - { -- struct msg_msg *msg; -+ struct msg_msg *msg, *found = NULL; - long count = 0; - - list_for_each_entry(msg, &msq->q_messages, m_list) { -@@ -804,6 +804,7 @@ static struct msg_msg *find_msg(struct msg_queue *msq, long *msgtyp, int mode) - *msgtyp, mode)) { - if (mode == SEARCH_LESSEQUAL && msg->m_type != 1) { - *msgtyp = msg->m_type - 1; -+ found = msg; - } else if (mode == SEARCH_NUMBER) { - if (*msgtyp == count) - return msg; -@@ -813,7 +814,7 @@ static struct msg_msg *find_msg(struct msg_queue *msq, long *msgtyp, int mode) - } - } - -- return ERR_PTR(-EAGAIN); -+ return found ?: ERR_PTR(-EAGAIN); - } - - -diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c -index 3bdf283..61ed862 100644 ---- a/kernel/time/timer_list.c -+++ b/kernel/time/timer_list.c -@@ -265,10 +265,9 @@ static inline void timer_list_header(struct seq_file *m, u64 now) - static int timer_list_show(struct seq_file *m, void *v) - { - struct timer_list_iter *iter = v; -- u64 now = ktime_to_ns(ktime_get()); - - if (iter->cpu == -1 && !iter->second_pass) -- timer_list_header(m, now); -+ timer_list_header(m, iter->now); - else if (!iter->second_pass) - print_cpu(m, iter->cpu, iter->now); - #ifdef CONFIG_GENERIC_CLOCKEVENTS -@@ -298,33 +297,41 @@ void sysrq_timer_list_show(void) - return; - } - --static void *timer_list_start(struct seq_file *file, loff_t *offset) -+static void *move_iter(struct timer_list_iter *iter, loff_t offset) - { -- struct timer_list_iter *iter = file->private; -- -- if (!*offset) { -- iter->cpu = -1; -- iter->now = ktime_to_ns(ktime_get()); -- } else if (iter->cpu >= nr_cpu_ids) { -+ for (; offset; offset--) { -+ iter->cpu = cpumask_next(iter->cpu, cpu_online_mask); -+ if (iter->cpu >= nr_cpu_ids) { - #ifdef CONFIG_GENERIC_CLOCKEVENTS -- if (!iter->second_pass) { -- iter->cpu = -1; -- iter->second_pass = true; -- } else -- return NULL; -+ if (!iter->second_pass) { -+ iter->cpu = -1; -+ iter->second_pass = true; -+ } else -+ return NULL; - #else -- return NULL; -+ return NULL; - #endif -+ } - } - return iter; - } - -+static void *timer_list_start(struct seq_file *file, loff_t *offset) -+{ -+ struct timer_list_iter *iter = file->private; -+ -+ if (!*offset) -+ iter->now = ktime_to_ns(ktime_get()); -+ iter->cpu = -1; -+ iter->second_pass = false; -+ return move_iter(iter, *offset); -+} -+ - static void *timer_list_next(struct seq_file *file, void *v, loff_t *offset) - { - struct timer_list_iter *iter = file->private; -- iter->cpu = cpumask_next(iter->cpu, cpu_online_mask); - ++*offset; -- return timer_list_start(file, offset); -+ return move_iter(iter, 1); - } - - static void timer_list_stop(struct seq_file *seq, void *v) -diff --git a/kernel/workqueue.c b/kernel/workqueue.c -index 6f01921..e52d002 100644 ---- a/kernel/workqueue.c -+++ b/kernel/workqueue.c -@@ -2188,6 +2188,15 @@ __acquires(&pool->lock) - dump_stack(); - } - -+ /* -+ * The following prevents a kworker from hogging CPU on !PREEMPT -+ * kernels, where a requeueing work item waiting for something to -+ * happen could deadlock with stop_machine as such work item could -+ * indefinitely requeue itself while all other CPUs are trapped in -+ * stop_machine. -+ */ -+ cond_resched(); -+ - spin_lock_irq(&pool->lock); - - /* clear cpu intensive status */ -diff --git a/mm/slab.h b/mm/slab.h -index f96b49e..4d6d836 100644 ---- a/mm/slab.h -+++ b/mm/slab.h -@@ -162,6 +162,8 @@ static inline const char *cache_name(struct kmem_cache *s) - - static inline struct kmem_cache *cache_from_memcg(struct kmem_cache *s, int idx) - { -+ if (!s->memcg_params) -+ return NULL; - return s->memcg_params->memcg_caches[idx]; - } - -diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c -index 170f9a7..3052672 100644 ---- a/net/mac80211/ibss.c -+++ b/net/mac80211/ibss.c -@@ -1166,6 +1166,7 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata) - clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &sdata->state); - ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED | - BSS_CHANGED_IBSS); -+ ieee80211_vif_release_channel(sdata); - synchronize_rcu(); - kfree(presp); - -diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c -index f5aed96..f3bbea1 100644 ---- a/net/mac80211/rc80211_minstrel_ht.c -+++ b/net/mac80211/rc80211_minstrel_ht.c -@@ -828,6 +828,9 @@ minstrel_ht_update_cck(struct minstrel_priv *mp, struct minstrel_ht_sta *mi, - if (sband->band != IEEE80211_BAND_2GHZ) - return; - -+ if (!(mp->hw->flags & IEEE80211_HW_SUPPORTS_HT_CCK_RATES)) -+ return; -+ - mi->cck_supported = 0; - mi->cck_supported_short = 0; - for (i = 0; i < 4; i++) { -diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c -index 75edcfa..1504bb1 100644 ---- a/net/sunrpc/xdr.c -+++ b/net/sunrpc/xdr.c -@@ -207,10 +207,13 @@ _shift_data_right_pages(struct page **pages, size_t pgto_base, - pgfrom_base -= copy; - - vto = kmap_atomic(*pgto); -- vfrom = kmap_atomic(*pgfrom); -- memmove(vto + pgto_base, vfrom + pgfrom_base, copy); -+ if (*pgto != *pgfrom) { -+ vfrom = kmap_atomic(*pgfrom); -+ memcpy(vto + pgto_base, vfrom + pgfrom_base, copy); -+ kunmap_atomic(vfrom); -+ } else -+ memmove(vto + pgto_base, vto + pgfrom_base, copy); - flush_dcache_page(*pgto); -- kunmap_atomic(vfrom); - kunmap_atomic(vto); - - } while ((len -= copy) != 0); -diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c -index b41ed86..e427dbf 100644 ---- a/sound/isa/opti9xx/opti92x-ad1848.c -+++ b/sound/isa/opti9xx/opti92x-ad1848.c -@@ -173,11 +173,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_opti9xx_pnpids); - - #endif /* CONFIG_PNP */ - --#ifdef OPTi93X --#define DEV_NAME "opti93x" --#else --#define DEV_NAME "opti92x" --#endif -+#define DEV_NAME KBUILD_MODNAME - - static char * snd_opti9xx_names[] = { - "unknown", -@@ -1168,7 +1164,7 @@ static int snd_opti9xx_pnp_resume(struct pnp_card_link *pcard) - - static struct pnp_card_driver opti9xx_pnpc_driver = { - .flags = PNP_DRIVER_RES_DISABLE, -- .name = "opti9xx", -+ .name = DEV_NAME, - .id_table = snd_opti9xx_pnpids, - .probe = snd_opti9xx_pnp_probe, - .remove = snd_opti9xx_pnp_remove, -diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c -index 496d7f2..5bc4194 100644 ---- a/sound/pci/hda/patch_hdmi.c -+++ b/sound/pci/hda/patch_hdmi.c -@@ -1715,6 +1715,9 @@ static int generic_hdmi_build_controls(struct hda_codec *codec) - struct snd_pcm_chmap *chmap; - struct snd_kcontrol *kctl; - int i; -+ -+ if (!codec->pcm_info[pin_idx].pcm) -+ break; - err = snd_pcm_add_chmap_ctls(codec->pcm_info[pin_idx].pcm, - SNDRV_PCM_STREAM_PLAYBACK, - NULL, 0, pin_idx, &chmap); -diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c -index 57f9f2a..458cf89 100644 ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -4207,6 +4207,7 @@ static const struct hda_fixup alc662_fixups[] = { - - static const struct snd_pci_quirk alc662_fixup_tbl[] = { - SND_PCI_QUIRK(0x1019, 0x9087, "ECS", ALC662_FIXUP_ASUS_MODE2), -+ SND_PCI_QUIRK(0x1025, 0x022f, "Acer Aspire One", ALC662_FIXUP_INV_DMIC), - SND_PCI_QUIRK(0x1025, 0x0308, "Acer Aspire 8942G", ALC662_FIXUP_ASPIRE), - SND_PCI_QUIRK(0x1025, 0x031c, "Gateway NV79", ALC662_FIXUP_SKU_IGNORE), - SND_PCI_QUIRK(0x1025, 0x0349, "eMachines eM250", ALC662_FIXUP_INV_DMIC), diff --git a/3.10.11/0000_README b/3.11.1/0000_README index a305fe5..53a2f00 100644 --- a/3.10.11/0000_README +++ b/3.11.1/0000_README @@ -2,11 +2,11 @@ README ----------------------------------------------------------------------------- Individual Patch Descriptions: ----------------------------------------------------------------------------- -Patch: 1010_linux-3.10.11.patch +Patch: 1000_linux-3.11.1.patch From: http://www.kernel.org -Desc: Linux 3.10.11 +Desc: Linux 3.11.1 -Patch: 4420_grsecurity-2.9.1-3.10.11-201309081953.patch +Patch: 4420_grsecurity-2.9.1-3.11.1-201309151124.patch From: http://www.grsecurity.net Desc: hardened-sources base patch from upstream grsecurity diff --git a/3.11.1/1000_linux-3.11.1.patch b/3.11.1/1000_linux-3.11.1.patch new file mode 100644 index 0000000..553a9f4 --- /dev/null +++ b/3.11.1/1000_linux-3.11.1.patch @@ -0,0 +1,401 @@ +diff --git a/Documentation/hwmon/k10temp b/Documentation/hwmon/k10temp +index 90956b6..4dfdc8f 100644 +--- a/Documentation/hwmon/k10temp ++++ b/Documentation/hwmon/k10temp +@@ -12,6 +12,7 @@ Supported chips: + * AMD Family 12h processors: "Llano" (E2/A4/A6/A8-Series) + * AMD Family 14h processors: "Brazos" (C/E/G/Z-Series) + * AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity" ++* AMD Family 16h processors: "Kabini" + + Prefix: 'k10temp' + Addresses scanned: PCI space +diff --git a/Makefile b/Makefile +index fe8204b..efd2396 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,6 @@ + VERSION = 3 + PATCHLEVEL = 11 +-SUBLEVEL = 0 ++SUBLEVEL = 1 + EXTRAVERSION = + NAME = Linux for Workgroups + +diff --git a/arch/x86/include/asm/xor_avx.h b/arch/x86/include/asm/xor_avx.h +index 7ea79c5..492b298 100644 +--- a/arch/x86/include/asm/xor_avx.h ++++ b/arch/x86/include/asm/xor_avx.h +@@ -167,12 +167,12 @@ static struct xor_block_template xor_block_avx = { + + #define AVX_XOR_SPEED \ + do { \ +- if (cpu_has_avx) \ ++ if (cpu_has_avx && cpu_has_osxsave) \ + xor_speed(&xor_block_avx); \ + } while (0) + + #define AVX_SELECT(FASTEST) \ +- (cpu_has_avx ? &xor_block_avx : FASTEST) ++ (cpu_has_avx && cpu_has_osxsave ? &xor_block_avx : FASTEST) + + #else + +diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c +index 80403c1..45af90a 100644 +--- a/drivers/acpi/ec.c ++++ b/drivers/acpi/ec.c +@@ -987,6 +987,10 @@ static struct dmi_system_id __initdata ec_dmi_table[] = { + ec_skip_dsdt_scan, "HP Folio 13", { + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Folio 13"),}, NULL}, ++ { ++ ec_validate_ecdt, "ASUS hardware", { ++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTek Computer Inc."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "L4R"),}, NULL}, + {}, + }; + +diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c +index 0df7590..461f47b 100644 +--- a/drivers/hv/channel_mgmt.c ++++ b/drivers/hv/channel_mgmt.c +@@ -262,6 +262,13 @@ static void vmbus_process_offer(struct work_struct *work) + } + + /* ++ * This state is used to indicate a successful open ++ * so that when we do close the channel normally, we ++ * can cleanup properly ++ */ ++ newchannel->state = CHANNEL_OPEN_STATE; ++ ++ /* + * Start the process of binding this offer to the driver + * We need to set the DeviceObject field before calling + * vmbus_child_dev_add() +@@ -287,13 +294,6 @@ static void vmbus_process_offer(struct work_struct *work) + kfree(newchannel->device_obj); + + free_channel(newchannel); +- } else { +- /* +- * This state is used to indicate a successful open +- * so that when we do close the channel normally, we +- * can cleanup properly +- */ +- newchannel->state = CHANNEL_OPEN_STATE; + } + } + +diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig +index e989f7f..1e27838 100644 +--- a/drivers/hwmon/Kconfig ++++ b/drivers/hwmon/Kconfig +@@ -296,8 +296,8 @@ config SENSORS_K10TEMP + If you say yes here you get support for the temperature + sensor(s) inside your CPU. Supported are later revisions of + the AMD Family 10h and all revisions of the AMD Family 11h, +- 12h (Llano), 14h (Brazos) and 15h (Bulldozer/Trinity) +- microarchitectures. ++ 12h (Llano), 14h (Brazos), 15h (Bulldozer/Trinity) and ++ 16h (Kabini) microarchitectures. + + This driver can also be built as a module. If so, the module + will be called k10temp. +diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c +index e3b037c..e633856 100644 +--- a/drivers/hwmon/k10temp.c ++++ b/drivers/hwmon/k10temp.c +@@ -1,5 +1,5 @@ + /* +- * k10temp.c - AMD Family 10h/11h/12h/14h/15h processor hardware monitoring ++ * k10temp.c - AMD Family 10h/11h/12h/14h/15h/16h processor hardware monitoring + * + * Copyright (c) 2009 Clemens Ladisch <clemens@ladisch.de> + * +@@ -211,6 +211,7 @@ static DEFINE_PCI_DEVICE_TABLE(k10temp_id_table) = { + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) }, ++ { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) }, + {} + }; + MODULE_DEVICE_TABLE(pci, k10temp_id_table); +diff --git a/drivers/misc/hpilo.c b/drivers/misc/hpilo.c +index 621c7a3..b83e3ca 100644 +--- a/drivers/misc/hpilo.c ++++ b/drivers/misc/hpilo.c +@@ -759,7 +759,7 @@ static int ilo_probe(struct pci_dev *pdev, + + /* Ignore subsystem_device = 0x1979 (set by BIOS) */ + if (pdev->subsystem_device == 0x1979) +- goto out; ++ return 0; + + if (max_ccb > MAX_CCB) + max_ccb = MAX_CCB; +@@ -899,7 +899,7 @@ static void __exit ilo_exit(void) + class_destroy(ilo_class); + } + +-MODULE_VERSION("1.4"); ++MODULE_VERSION("1.4.1"); + MODULE_ALIAS(ILO_NAME); + MODULE_DESCRIPTION(ILO_NAME); + MODULE_AUTHOR("David Altobelli <david.altobelli@hp.com>"); +diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c +index b22c7e2..3412adc 100644 +--- a/drivers/misc/mei/hw-me.c ++++ b/drivers/misc/mei/hw-me.c +@@ -176,21 +176,18 @@ static int mei_me_hw_reset(struct mei_device *dev, bool intr_enable) + struct mei_me_hw *hw = to_me_hw(dev); + u32 hcsr = mei_hcsr_read(hw); + +- dev_dbg(&dev->pdev->dev, "before reset HCSR = 0x%08x.\n", hcsr); +- +- hcsr |= (H_RST | H_IG); ++ hcsr |= H_RST | H_IG | H_IS; + + if (intr_enable) + hcsr |= H_IE; + else +- hcsr |= ~H_IE; ++ hcsr &= ~H_IE; + +- mei_hcsr_set(hw, hcsr); ++ mei_me_reg_write(hw, H_CSR, hcsr); + + if (dev->dev_state == MEI_DEV_POWER_DOWN) + mei_me_hw_reset_release(dev); + +- dev_dbg(&dev->pdev->dev, "current HCSR = 0x%08x.\n", mei_hcsr_read(hw)); + return 0; + } + +diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c +index 1753431..108267d 100644 +--- a/drivers/net/wireless/mwifiex/main.c ++++ b/drivers/net/wireless/mwifiex/main.c +@@ -458,20 +458,6 @@ static void mwifiex_fw_dpc(const struct firmware *firmware, void *context) + dev_err(adapter->dev, "cannot create default STA interface\n"); + goto err_add_intf; + } +- +- /* Create AP interface by default */ +- if (!mwifiex_add_virtual_intf(adapter->wiphy, "uap%d", +- NL80211_IFTYPE_AP, NULL, NULL)) { +- dev_err(adapter->dev, "cannot create default AP interface\n"); +- goto err_add_intf; +- } +- +- /* Create P2P interface by default */ +- if (!mwifiex_add_virtual_intf(adapter->wiphy, "p2p%d", +- NL80211_IFTYPE_P2P_CLIENT, NULL, NULL)) { +- dev_err(adapter->dev, "cannot create default P2P interface\n"); +- goto err_add_intf; +- } + rtnl_unlock(); + + mwifiex_drv_get_driver_version(adapter, fmt, sizeof(fmt) - 1); +diff --git a/drivers/rtc/rtc-max77686.c b/drivers/rtc/rtc-max77686.c +index 9915cb9..9efe118 100644 +--- a/drivers/rtc/rtc-max77686.c ++++ b/drivers/rtc/rtc-max77686.c +@@ -240,9 +240,9 @@ static int max77686_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) + } + + alrm->pending = 0; +- ret = regmap_read(info->max77686->regmap, MAX77686_REG_STATUS1, &val); ++ ret = regmap_read(info->max77686->regmap, MAX77686_REG_STATUS2, &val); + if (ret < 0) { +- dev_err(info->dev, "%s:%d fail to read status1 reg(%d)\n", ++ dev_err(info->dev, "%s:%d fail to read status2 reg(%d)\n", + __func__, __LINE__, ret); + goto out; + } +diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c +index 9854a1d..6bc205b 100644 +--- a/drivers/staging/imx-drm/imx-drm-core.c ++++ b/drivers/staging/imx-drm/imx-drm-core.c +@@ -678,6 +678,7 @@ found: + + return i; + } ++EXPORT_SYMBOL_GPL(imx_drm_encoder_get_mux_id); + + /* + * imx_drm_remove_encoder - remove an encoder +diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c +index f73da43..3a17930 100644 +--- a/drivers/target/iscsi/iscsi_target.c ++++ b/drivers/target/iscsi/iscsi_target.c +@@ -1086,7 +1086,6 @@ int iscsit_process_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, + if (cmd->reject_reason) + return 0; + +- target_put_sess_cmd(conn->sess->se_sess, &cmd->se_cmd); + return 1; + } + /* +@@ -1124,14 +1123,10 @@ after_immediate_data: + */ + cmdsn_ret = iscsit_sequence_cmd(cmd->conn, cmd, + (unsigned char *)hdr, hdr->cmdsn); +- if (cmdsn_ret == CMDSN_ERROR_CANNOT_RECOVER) { ++ if (cmdsn_ret == CMDSN_ERROR_CANNOT_RECOVER) + return -1; +- } else if (cmdsn_ret == CMDSN_LOWER_THAN_EXP) { +- target_put_sess_cmd(conn->sess->se_sess, &cmd->se_cmd); +- return 0; +- } + +- if (cmd->sense_reason) { ++ if (cmd->sense_reason || cmdsn_ret == CMDSN_LOWER_THAN_EXP) { + int rc; + + rc = iscsit_dump_data_payload(cmd->conn, +@@ -1527,6 +1522,10 @@ int iscsit_setup_nop_out(struct iscsi_conn *conn, struct iscsi_cmd *cmd, + if (hdr->itt == RESERVED_ITT && !(hdr->opcode & ISCSI_OP_IMMEDIATE)) { + pr_err("NOPOUT ITT is reserved, but Immediate Bit is" + " not set, protocol error.\n"); ++ if (!cmd) ++ return iscsit_add_reject(conn, ISCSI_REASON_PROTOCOL_ERROR, ++ (unsigned char *)hdr); ++ + return iscsit_reject_cmd(cmd, ISCSI_REASON_PROTOCOL_ERROR, + (unsigned char *)hdr); + } +@@ -1536,6 +1535,10 @@ int iscsit_setup_nop_out(struct iscsi_conn *conn, struct iscsi_cmd *cmd, + " greater than MaxXmitDataSegmentLength: %u, protocol" + " error.\n", payload_length, + conn->conn_ops->MaxXmitDataSegmentLength); ++ if (!cmd) ++ return iscsit_add_reject(conn, ISCSI_REASON_PROTOCOL_ERROR, ++ (unsigned char *)hdr); ++ + return iscsit_reject_cmd(cmd, ISCSI_REASON_PROTOCOL_ERROR, + (unsigned char *)hdr); + } +diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c +index 3402241..bc788c5 100644 +--- a/drivers/target/iscsi/iscsi_target_login.c ++++ b/drivers/target/iscsi/iscsi_target_login.c +@@ -1163,12 +1163,11 @@ static int __iscsi_target_login_thread(struct iscsi_np *np) + if (np->np_thread_state == ISCSI_NP_THREAD_RESET) { + spin_unlock_bh(&np->np_thread_lock); + complete(&np->np_restart_comp); +- if (ret == -ENODEV) { +- iscsit_put_transport(conn->conn_transport); +- kfree(conn); +- conn = NULL; ++ iscsit_put_transport(conn->conn_transport); ++ kfree(conn); ++ conn = NULL; ++ if (ret == -ENODEV) + goto out; +- } + /* Get another socket */ + return 1; + } +diff --git a/drivers/target/target_core_spc.c b/drivers/target/target_core_spc.c +index 4cb667d..9fabbf7 100644 +--- a/drivers/target/target_core_spc.c ++++ b/drivers/target/target_core_spc.c +@@ -97,9 +97,12 @@ spc_emulate_inquiry_std(struct se_cmd *cmd, unsigned char *buf) + + buf[7] = 0x2; /* CmdQue=1 */ + +- snprintf(&buf[8], 8, "LIO-ORG"); +- snprintf(&buf[16], 16, "%s", dev->t10_wwn.model); +- snprintf(&buf[32], 4, "%s", dev->t10_wwn.revision); ++ memcpy(&buf[8], "LIO-ORG ", 8); ++ memset(&buf[16], 0x20, 16); ++ memcpy(&buf[16], dev->t10_wwn.model, ++ min_t(size_t, strlen(dev->t10_wwn.model), 16)); ++ memcpy(&buf[32], dev->t10_wwn.revision, ++ min_t(size_t, strlen(dev->t10_wwn.revision), 4)); + buf[4] = 31; /* Set additional length to 31 */ + + return 0; +diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c +index 7172d00..d8e49d7 100644 +--- a/drivers/target/target_core_transport.c ++++ b/drivers/target/target_core_transport.c +@@ -2134,6 +2134,7 @@ static void transport_write_pending_qf(struct se_cmd *cmd) + + int transport_generic_free_cmd(struct se_cmd *cmd, int wait_for_tasks) + { ++ unsigned long flags; + int ret = 0; + + if (!(cmd->se_cmd_flags & SCF_SE_LUN_CMD)) { +@@ -2144,6 +2145,16 @@ int transport_generic_free_cmd(struct se_cmd *cmd, int wait_for_tasks) + } else { + if (wait_for_tasks) + transport_wait_for_tasks(cmd); ++ /* ++ * Handle WRITE failure case where transport_generic_new_cmd() ++ * has already added se_cmd to state_list, but fabric has ++ * failed command before I/O submission. ++ */ ++ if (cmd->state_active) { ++ spin_lock_irqsave(&cmd->t_state_lock, flags); ++ target_remove_from_state_list(cmd); ++ spin_unlock_irqrestore(&cmd->t_state_lock, flags); ++ } + + if (cmd->se_lun) + transport_lun_remove_cmd(cmd); +diff --git a/drivers/usb/gadget/f_acm.c b/drivers/usb/gadget/f_acm.c +index 4b7e33e..ab1065a 100644 +--- a/drivers/usb/gadget/f_acm.c ++++ b/drivers/usb/gadget/f_acm.c +@@ -285,6 +285,7 @@ static struct usb_string acm_string_defs[] = { + [ACM_CTRL_IDX].s = "CDC Abstract Control Model (ACM)", + [ACM_DATA_IDX].s = "CDC ACM Data", + [ACM_IAD_IDX ].s = "CDC Serial", ++ { } /* end of list */ + }; + + static struct usb_gadget_strings acm_string_table = { +diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig +index aa43854..805b83e 100644 +--- a/sound/soc/fsl/Kconfig ++++ b/sound/soc/fsl/Kconfig +@@ -109,11 +109,11 @@ config SND_SOC_IMX_SSI + tristate + + config SND_SOC_IMX_PCM_FIQ +- bool ++ tristate + select FIQ + + config SND_SOC_IMX_PCM_DMA +- bool ++ tristate + select SND_SOC_GENERIC_DMAENGINE_PCM + + config SND_SOC_IMX_AUDMUX +diff --git a/sound/soc/fsl/imx-pcm.h b/sound/soc/fsl/imx-pcm.h +index 67f656c..0e3619e 100644 +--- a/sound/soc/fsl/imx-pcm.h ++++ b/sound/soc/fsl/imx-pcm.h +@@ -32,7 +32,7 @@ imx_pcm_dma_params_init_data(struct imx_dma_data *dma_data, + dma_data->peripheral_type = IMX_DMATYPE_SSI; + } + +-#ifdef CONFIG_SND_SOC_IMX_PCM_DMA ++#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_DMA) + int imx_pcm_dma_init(struct platform_device *pdev); + void imx_pcm_dma_exit(struct platform_device *pdev); + #else +@@ -46,7 +46,7 @@ static inline void imx_pcm_dma_exit(struct platform_device *pdev) + } + #endif + +-#ifdef CONFIG_SND_SOC_IMX_PCM_FIQ ++#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_FIQ) + int imx_pcm_fiq_init(struct platform_device *pdev); + void imx_pcm_fiq_exit(struct platform_device *pdev); + #else diff --git a/3.10.11/4420_grsecurity-2.9.1-3.10.11-201309081953.patch b/3.11.1/4420_grsecurity-2.9.1-3.11.1-201309151124.patch index 8830014..c6067c6 100644 --- a/3.10.11/4420_grsecurity-2.9.1-3.10.11-201309081953.patch +++ b/3.11.1/4420_grsecurity-2.9.1-3.11.1-201309151124.patch @@ -229,7 +229,7 @@ index b89a739..79768fb 100644 +zconf.lex.c zoffset.h diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt -index 2fe6e76..889ee23 100644 +index 7f9d4f5..6d1afd6 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -976,6 +976,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. @@ -243,7 +243,7 @@ index 2fe6e76..889ee23 100644 hashdist= [KNL,NUMA] Large hashes allocated during boot are distributed across NUMA nodes. Defaults on for 64-bit NUMA, off otherwise. -@@ -1928,6 +1932,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. +@@ -1932,6 +1936,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. noexec=on: enable non-executable mappings (default) noexec=off: disable non-executable mappings @@ -254,7 +254,7 @@ index 2fe6e76..889ee23 100644 nosmap [X86] Disable SMAP (Supervisor Mode Access Prevention) even if it is supported by processor. -@@ -2195,6 +2203,25 @@ bytes respectively. Such letter suffixes can also be entirely omitted. +@@ -2199,6 +2207,25 @@ 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. @@ -281,7 +281,7 @@ index 2fe6e76..889ee23 100644 pcd. [PARIDE] diff --git a/Makefile b/Makefile -index 595076d..9b52b98 100644 +index efd2396..682975d 100644 --- a/Makefile +++ b/Makefile @@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ @@ -399,7 +399,7 @@ index 595076d..9b52b98 100644 +$(vmlinux-dirs): gcc-plugins prepare scripts $(Q)$(MAKE) $(build)=$@ - # Store (new) KERNELRELASE string in include/config/kernel.release + # Store (new) KERNELRELEASE string in include/config/kernel.release @@ -835,6 +897,7 @@ prepare0: archprepare FORCE $(Q)$(MAKE) $(build)=. @@ -443,7 +443,7 @@ index 595076d..9b52b98 100644 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \ -type f -print | xargs rm -f -@@ -1223,6 +1289,8 @@ PHONY += $(module-dirs) modules +@@ -1224,6 +1290,8 @@ PHONY += $(module-dirs) modules $(module-dirs): crmodverdir $(objtree)/Module.symvers $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@) @@ -452,7 +452,7 @@ index 595076d..9b52b98 100644 modules: $(module-dirs) @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost -@@ -1359,17 +1427,21 @@ else +@@ -1363,17 +1431,21 @@ else target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@)) endif @@ -478,7 +478,7 @@ index 595076d..9b52b98 100644 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) %.symtypes: %.c prepare scripts FORCE $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) -@@ -1379,11 +1451,15 @@ endif +@@ -1383,11 +1455,15 @@ endif $(cmd_crmodverdir) $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ $(build)=$(build-dir) @@ -497,10 +497,10 @@ index 595076d..9b52b98 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 c2cbe4f..f7264b4 100644 +index 78b03ef..da28a51 100644 --- a/arch/alpha/include/asm/atomic.h +++ b/arch/alpha/include/asm/atomic.h -@@ -250,6 +250,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) +@@ -292,6 +292,16 @@ 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)) @@ -579,7 +579,7 @@ index bc2a0da..8ad11ee 100644 static inline void diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h -index 81a4342..348b927 100644 +index d8f9b7e..f6222fa 100644 --- a/arch/alpha/include/asm/pgtable.h +++ b/arch/alpha/include/asm/pgtable.h @@ -102,6 +102,17 @@ struct vm_area_struct; @@ -614,10 +614,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 b9e37ad..44c24e7 100644 +index 1402fcc..0b1abd2 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c -@@ -1297,10 +1297,11 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p) +@@ -1298,10 +1298,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 @@ -631,7 +631,7 @@ index b9e37ad..44c24e7 100644 info.flags = 0; info.length = len; -@@ -1308,6 +1309,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len, +@@ -1309,6 +1310,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len, info.high_limit = limit; info.align_mask = 0; info.align_offset = 0; @@ -639,7 +639,7 @@ index b9e37ad..44c24e7 100644 return vm_unmapped_area(&info); } -@@ -1340,20 +1342,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, +@@ -1341,20 +1343,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? */ @@ -829,10 +829,10 @@ index 0c4132d..88f0d53 100644 /* Allow reads even for write-only mappings */ if (!(vma->vm_flags & (VM_READ | VM_WRITE))) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 18a9f5e..ca910b7 100644 +index 43594d5..da71e62 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1766,7 +1766,7 @@ config ALIGNMENT_TRAP +@@ -1791,7 +1791,7 @@ config ALIGNMENT_TRAP config UACCESS_WITH_MEMCPY bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()" @@ -1804,7 +1804,7 @@ index 12f71a1..04e063c 100644 #ifdef CONFIG_OUTER_CACHE diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h -index cbdc7a2..32f44fe 100644 +index 4355f0e..c229913 100644 --- a/arch/arm/include/asm/page.h +++ b/arch/arm/include/asm/page.h @@ -114,7 +114,7 @@ struct cpu_user_fns { @@ -1928,18 +1928,10 @@ index f97ee02..cc9fe9e 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 18f5cef..25b8f43 100644 +index 626989f..9d67a33 100644 --- a/arch/arm/include/asm/pgtable-3level-hwdef.h +++ b/arch/arm/include/asm/pgtable-3level-hwdef.h -@@ -41,6 +41,7 @@ - */ - #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2) - #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3) -+#define PMD_SECT_RDONLY (_AT(pmdval_t, 1) << 7) - #define PMD_SECT_S (_AT(pmdval_t, 3) << 8) - #define PMD_SECT_AF (_AT(pmdval_t, 1) << 10) - #define PMD_SECT_nG (_AT(pmdval_t, 1) << 11) -@@ -71,6 +72,7 @@ +@@ -75,6 +75,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 */ @@ -1948,10 +1940,10 @@ index 18f5cef..25b8f43 100644 /* diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h -index 86b8fe3..e25f975 100644 +index 5689c18..eea12f9 100644 --- a/arch/arm/include/asm/pgtable-3level.h +++ b/arch/arm/include/asm/pgtable-3level.h -@@ -74,6 +74,7 @@ +@@ -82,6 +82,7 @@ #define L_PTE_RDONLY (_AT(pteval_t, 1) << 7) /* AP[2] */ #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */ #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */ @@ -1959,7 +1951,7 @@ index 86b8fe3..e25f975 100644 #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 */ -@@ -82,6 +83,7 @@ +@@ -95,6 +96,7 @@ /* * To be used in assembly code with the upper page attributes. */ @@ -1968,10 +1960,10 @@ index 86b8fe3..e25f975 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 9bcd262..1ff999b 100644 +index 04aeb02..73b70dd 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h -@@ -30,6 +30,9 @@ +@@ -33,6 +33,9 @@ #include <asm/pgtable-2level.h> #endif @@ -1981,7 +1973,7 @@ index 9bcd262..1ff999b 100644 /* * Just any arbitrary offset to the start of the vmalloc VM area: the * current 8MB value just means that there will be a 8MB "hole" after the -@@ -45,6 +48,9 @@ +@@ -48,6 +51,9 @@ #define LIBRARY_TEXT_START 0x0c000000 #ifndef __ASSEMBLY__ @@ -1991,7 +1983,7 @@ index 9bcd262..1ff999b 100644 extern void __pte_error(const char *file, int line, pte_t); extern void __pmd_error(const char *file, int line, pmd_t); extern void __pgd_error(const char *file, int line, pgd_t); -@@ -53,6 +59,48 @@ extern void __pgd_error(const char *file, int line, pgd_t); +@@ -56,6 +62,48 @@ extern void __pgd_error(const char *file, int line, pgd_t); #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd) #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd) @@ -2040,7 +2032,7 @@ index 9bcd262..1ff999b 100644 /* * This is the lowest virtual address we can permit any user space * mapping to be mapped at. This is particularly important for -@@ -72,8 +120,8 @@ extern void __pgd_error(const char *file, int line, pgd_t); +@@ -75,8 +123,8 @@ extern void __pgd_error(const char *file, int line, pgd_t); /* * The pgprot_* and protection_map entries will be fixed up in runtime * to include the cachable and bufferable bits based on memory policy, @@ -2051,7 +2043,7 @@ index 9bcd262..1ff999b 100644 */ #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG -@@ -257,7 +305,7 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; } +@@ -260,7 +308,7 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; } 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 | @@ -2061,7 +2053,7 @@ index 9bcd262..1ff999b 100644 return pte; } diff --git a/arch/arm/include/asm/proc-fns.h b/arch/arm/include/asm/proc-fns.h -index f3628fb..a0672dd 100644 +index 5324c11..bcae5f0 100644 --- a/arch/arm/include/asm/proc-fns.h +++ b/arch/arm/include/asm/proc-fns.h @@ -75,7 +75,7 @@ extern struct processor { @@ -2074,7 +2066,7 @@ index f3628fb..a0672dd 100644 #ifndef MULTI_CPU extern void cpu_proc_init(void); diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h -index ce0dbe7..c085b6f 100644 +index c4ae171..ea0c0c2 100644 --- a/arch/arm/include/asm/psci.h +++ b/arch/arm/include/asm/psci.h @@ -29,7 +29,7 @@ struct psci_operations { @@ -2085,12 +2077,12 @@ index ce0dbe7..c085b6f 100644 +} __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 d3a22be..3a69ad5 100644 +index a8cae71c..65dd797 100644 --- a/arch/arm/include/asm/smp.h +++ b/arch/arm/include/asm/smp.h -@@ -107,7 +107,7 @@ struct smp_operations { +@@ -110,7 +110,7 @@ struct smp_operations { int (*cpu_disable)(unsigned int cpu); #endif #endif @@ -2100,7 +2092,7 @@ index d3a22be..3a69ad5 100644 /* * set platform specific SMP operations diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h -index f00b569..aa5bb41 100644 +index 2b8114f..8fe9bcf 100644 --- a/arch/arm/include/asm/thread_info.h +++ b/arch/arm/include/asm/thread_info.h @@ -77,9 +77,9 @@ struct thread_info { @@ -2327,10 +2319,10 @@ index 7e1f760..de33b13 100644 n = __copy_to_user(to, from, n); return n; diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h -index 96ee092..37f1844 100644 +index 5af0ed1..cea83883 100644 --- a/arch/arm/include/uapi/asm/ptrace.h +++ b/arch/arm/include/uapi/asm/ptrace.h -@@ -73,7 +73,7 @@ +@@ -92,7 +92,7 @@ * ARMv7 groups of PSR bits */ #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */ @@ -2366,7 +2358,7 @@ index 60d3b73..e5a0f22 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 d43c7e5..257c050 100644 +index 9cbe70c..a7b5e34 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -47,6 +47,87 @@ @@ -2508,17 +2500,7 @@ index d43c7e5..257c050 100644 sub sp, sp, #S_FRAME_SIZE ARM( stmib sp, {r1 - r12} ) THUMB( stmia sp, {r0 - r12} ) -@@ -357,7 +454,8 @@ ENDPROC(__pabt_svc) - .endm - - .macro kuser_cmpxchg_check --#if !defined(CONFIG_CPU_32v6K) && !defined(CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG) -+#if !defined(CONFIG_CPU_32v6K) && defined(CONFIG_KUSER_HELPERS) && \ -+ !defined(CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG) - #ifndef CONFIG_MMU - #warning "NPTL on non MMU needs fixing" - #else -@@ -414,7 +512,9 @@ __und_usr: +@@ -415,7 +512,9 @@ __und_usr: tst r3, #PSR_T_BIT @ Thumb mode? bne __und_usr_thumb sub r4, r2, #4 @ ARM instr at LR - 4 @@ -2528,7 +2510,7 @@ index d43c7e5..257c050 100644 #ifdef CONFIG_CPU_ENDIAN_BE8 rev r0, r0 @ little endian instruction #endif -@@ -449,10 +549,14 @@ __und_usr_thumb: +@@ -450,10 +549,14 @@ __und_usr_thumb: */ .arch armv6t2 #endif @@ -2543,7 +2525,7 @@ index d43c7e5..257c050 100644 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update orr r0, r0, r5, lsl #16 -@@ -481,7 +585,8 @@ ENDPROC(__und_usr) +@@ -482,7 +585,8 @@ ENDPROC(__und_usr) */ .pushsection .fixup, "ax" .align 2 @@ -2553,16 +2535,16 @@ index d43c7e5..257c050 100644 .popsection .pushsection __ex_table,"a" .long 1b, 4b -@@ -690,7 +795,7 @@ ENTRY(__switch_to) - THUMB( stmia ip!, {r4 - sl, fp} ) @ Store most regs on stack - THUMB( str sp, [ip], #4 ) +@@ -692,7 +796,7 @@ ENTRY(__switch_to) THUMB( str lr, [ip], #4 ) + ldr r4, [r2, #TI_TP_VALUE] + ldr r5, [r2, #TI_TP_VALUE + 4] -#ifdef CONFIG_CPU_USE_DOMAINS +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF) ldr r6, [r2, #TI_CPU_DOMAIN] #endif - set_tls r3, r4, r5 -@@ -699,7 +804,7 @@ ENTRY(__switch_to) + switch_tls r1, r4, r5, r3, r7 +@@ -701,7 +805,7 @@ ENTRY(__switch_to) ldr r8, =__stack_chk_guard ldr r7, [r7, #TSK_STACK_CANARY] #endif @@ -2572,7 +2554,7 @@ index d43c7e5..257c050 100644 #endif mov r5, r0 diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S -index bc5bc0a..d0998ca 100644 +index 94104bf..9732b1c 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -10,18 +10,46 @@ @@ -2625,17 +2607,9 @@ index bc5bc0a..d0998ca 100644 .align 5 /* * This is the fast syscall return path. We do as little as -@@ -350,6 +378,7 @@ ENDPROC(ftrace_stub) - - .align 5 - ENTRY(vector_swi) -+ - sub sp, sp, #S_FRAME_SIZE - stmia sp, {r0 - r12} @ Calling r0 - r12 - ARM( add r8, sp, #S_PC ) -@@ -399,6 +428,12 @@ ENTRY(vector_swi) - ldr scno, [lr, #-4] @ get SWI instruction +@@ -366,6 +394,12 @@ ENTRY(vector_swi) #endif + zero_fp + /* + * do this here to avoid a performance hit of wrapping the code above @@ -2647,10 +2621,10 @@ index bc5bc0a..d0998ca 100644 ldr ip, __cr_alignment ldr ip, [ip] diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S -index 160f337..db67ee4 100644 +index de23a9b..94c37c4 100644 --- a/arch/arm/kernel/entry-header.S +++ b/arch/arm/kernel/entry-header.S -@@ -73,6 +73,60 @@ +@@ -184,6 +184,60 @@ msr cpsr_c, \rtemp @ switch back to the SVC mode .endm @@ -2711,7 +2685,7 @@ index 160f337..db67ee4 100644 #ifndef CONFIG_THUMB2_KERNEL .macro svc_exit, rpsr, irq = 0 .if \irq != 0 -@@ -92,6 +146,9 @@ +@@ -203,6 +257,9 @@ blne trace_hardirqs_off #endif .endif @@ -2721,7 +2695,7 @@ index 160f337..db67ee4 100644 msr spsr_cxsf, \rpsr #if defined(CONFIG_CPU_V6) ldr r0, [sp] -@@ -155,6 +212,9 @@ +@@ -266,6 +323,9 @@ blne trace_hardirqs_off #endif .endif @@ -2732,34 +2706,22 @@ index 160f337..db67ee4 100644 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 25442f4..d4948fc 100644 +index 918875d..cd5fa27 100644 --- a/arch/arm/kernel/fiq.c +++ b/arch/arm/kernel/fiq.c -@@ -84,17 +84,16 @@ int show_fiq_list(struct seq_file *p, int prec) - - void set_fiq_handler(void *start, unsigned int length) - { --#if defined(CONFIG_CPU_USE_DOMAINS) -- void *base = (void *)0xffff0000; --#else +@@ -87,7 +87,10 @@ void set_fiq_handler(void *start, unsigned int length) void *base = vectors_page; --#endif unsigned offset = FIQ_OFFSET; + pax_open_kernel(); memcpy(base + offset, start, length); + pax_close_kernel(); + -+ if (!cache_is_vipt_nonaliasing()) -+ flush_icache_range(base + offset, offset + length); - flush_icache_range(0xffff0000 + offset, 0xffff0000 + offset + length); -- if (!vectors_high()) -- flush_icache_range(offset, offset + length); - } - - int claim_fiq(struct fiq_handler *f) + if (!cache_is_vipt_nonaliasing()) + flush_icache_range((unsigned long)base + offset, offset + + length); diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S -index 8bac553..caee108 100644 +index 2c7cc1e..ab2e911 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -52,7 +52,9 @@ @@ -2773,7 +2735,7 @@ index 8bac553..caee108 100644 .endm /* -@@ -434,7 +436,7 @@ __enable_mmu: +@@ -432,7 +434,7 @@ __enable_mmu: mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \ domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \ domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \ @@ -2782,21 +2744,8 @@ index 8bac553..caee108 100644 mcr p15, 0, r5, c3, c0, 0 @ load domain access register mcr p15, 0, r4, c2, c0, 0 @ load page table pointer #endif -diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c -index 1fd749e..47adb08 100644 ---- a/arch/arm/kernel/hw_breakpoint.c -+++ b/arch/arm/kernel/hw_breakpoint.c -@@ -1029,7 +1029,7 @@ static int __cpuinit dbg_reset_notify(struct notifier_block *self, - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata dbg_reset_nb = { -+static struct notifier_block dbg_reset_nb = { - .notifier_call = dbg_reset_notify, - }; - diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c -index 1e9be5d..03edbc2 100644 +index 85c3fb6..b3068b1 100644 --- a/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c @@ -37,12 +37,37 @@ @@ -2859,37 +2808,11 @@ index 07314af..c46655c 100644 flush_icache_range((uintptr_t)(addr), (uintptr_t)(addr) + size); -diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c -index e19edc6..e186ee1 100644 ---- a/arch/arm/kernel/perf_event.c -+++ b/arch/arm/kernel/perf_event.c -@@ -56,7 +56,7 @@ armpmu_map_hw_event(const unsigned (*event_map)[PERF_COUNT_HW_MAX], u64 config) - int mapping; - - if (config >= PERF_COUNT_HW_MAX) -- return -ENOENT; -+ return -EINVAL; - - mapping = (*event_map)[config]; - return mapping == HW_OP_UNSUPPORTED ? -ENOENT : mapping; -diff --git a/arch/arm/kernel/perf_event_cpu.c b/arch/arm/kernel/perf_event_cpu.c -index 1f2740e..b36e225 100644 ---- a/arch/arm/kernel/perf_event_cpu.c -+++ b/arch/arm/kernel/perf_event_cpu.c -@@ -171,7 +171,7 @@ static int __cpuinit cpu_pmu_notify(struct notifier_block *b, - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata cpu_pmu_hotplug_notifier = { -+static struct notifier_block cpu_pmu_hotplug_notifier = { - .notifier_call = cpu_pmu_notify, - }; - diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c -index 5bc2615..dcd439f 100644 +index 94f6b05..efd7312 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c -@@ -223,6 +223,7 @@ void machine_power_off(void) +@@ -217,6 +217,7 @@ void machine_power_off(void) if (pm_power_off) pm_power_off(); @@ -2897,16 +2820,16 @@ index 5bc2615..dcd439f 100644 } /* -@@ -236,7 +237,7 @@ void machine_power_off(void) +@@ -230,7 +231,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. */ -void machine_restart(char *cmd) +__noreturn void machine_restart(char *cmd) { + local_irq_disable(); smp_send_stop(); - -@@ -258,8 +259,8 @@ void __show_regs(struct pt_regs *regs) +@@ -253,8 +254,8 @@ void __show_regs(struct pt_regs *regs) show_regs_print_info(KERN_DEFAULT); @@ -2917,7 +2840,7 @@ index 5bc2615..dcd439f 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, -@@ -426,12 +427,6 @@ unsigned long get_wchan(struct task_struct *p) +@@ -422,12 +423,6 @@ unsigned long get_wchan(struct task_struct *p) return 0; } @@ -2930,7 +2853,7 @@ index 5bc2615..dcd439f 100644 #ifdef CONFIG_MMU #ifdef CONFIG_KUSER_HELPERS /* -@@ -447,7 +442,7 @@ static struct vm_area_struct gate_vma = { +@@ -443,7 +438,7 @@ static struct vm_area_struct gate_vma = { static int __init gate_vma_init(void) { @@ -2939,15 +2862,7 @@ index 5bc2615..dcd439f 100644 return 0; } arch_initcall(gate_vma_init); -@@ -466,48 +461,23 @@ int in_gate_area_no_mm(unsigned long addr) - { - return in_gate_area(NULL, addr); - } --#define is_gate_vma(vma) ((vma) = &gate_vma) -+#define is_gate_vma(vma) ((vma) == &gate_vma) - #else - #define is_gate_vma(vma) 0 - #endif +@@ -469,41 +464,16 @@ int in_gate_area_no_mm(unsigned long addr) const char *arch_vma_name(struct vm_area_struct *vma) { @@ -2993,7 +2908,7 @@ index 5bc2615..dcd439f 100644 } #endif diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c -index 3653164..d83e55d 100644 +index 4693188..4596c5e 100644 --- a/arch/arm/kernel/psci.c +++ b/arch/arm/kernel/psci.c @@ -24,7 +24,7 @@ @@ -3006,10 +2921,10 @@ index 3653164..d83e55d 100644 static int (*invoke_psci_fn)(u32, u32, u32, u32); diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c -index 03deeff..741ce88 100644 +index 0dd3b79..e018f64 100644 --- a/arch/arm/kernel/ptrace.c +++ b/arch/arm/kernel/ptrace.c -@@ -937,10 +937,19 @@ static int tracehook_report_syscall(struct pt_regs *regs, +@@ -929,10 +929,19 @@ static int tracehook_report_syscall(struct pt_regs *regs, return current_thread_info()->syscall; } @@ -3030,10 +2945,10 @@ index 03deeff..741ce88 100644 if (secure_computing(scno) == -1) return -1; diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c -index b4b1d39..efdc9be 100644 +index afc2489..6372bc8 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c -@@ -97,21 +97,23 @@ EXPORT_SYMBOL(system_serial_high); +@@ -98,21 +98,23 @@ EXPORT_SYMBOL(system_serial_high); unsigned int elf_hwcap __read_mostly; EXPORT_SYMBOL(elf_hwcap); @@ -3062,7 +2977,7 @@ index b4b1d39..efdc9be 100644 EXPORT_SYMBOL(outer_cache); #endif -@@ -236,9 +238,13 @@ static int __get_cpu_architecture(void) +@@ -245,9 +247,13 @@ static int __get_cpu_architecture(void) asm("mrc p15, 0, %0, c0, c1, 4" : "=r" (mmfr0)); if ((mmfr0 & 0x0000000f) >= 0x00000003 || @@ -3078,7 +2993,7 @@ index b4b1d39..efdc9be 100644 (mmfr0 & 0x000000f0) == 0x00000020) cpu_arch = CPU_ARCH_ARMv6; else -@@ -479,7 +485,7 @@ static void __init setup_processor(void) +@@ -571,7 +577,7 @@ static void __init setup_processor(void) __cpu_architecture = __get_cpu_architecture(); #ifdef MULTI_CPU @@ -3088,7 +3003,7 @@ index b4b1d39..efdc9be 100644 #ifdef MULTI_TLB cpu_tlb = *list->tlb; diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c -index 5a42c12..a2bb7c6 100644 +index ab33042..11248a8 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -45,8 +45,6 @@ static const unsigned long sigreturn_codes[7] = { @@ -3100,7 +3015,7 @@ index 5a42c12..a2bb7c6 100644 #ifdef CONFIG_CRUNCH static int preserve_crunch_context(struct crunch_sigframe __user *frame) { -@@ -406,8 +404,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig, +@@ -411,8 +409,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig, * except when the MPU has protected the vectors * page from PL0 */ @@ -3110,7 +3025,7 @@ index 5a42c12..a2bb7c6 100644 } else #endif { -@@ -611,33 +608,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall) +@@ -616,33 +613,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall) } while (thread_flags & _TIF_WORK_MASK); return 0; } @@ -3145,10 +3060,10 @@ index 5a42c12..a2bb7c6 100644 - return page; -} diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c -index 5919eb4..b5d6dfe 100644 +index 2dc1934..ecf0e21 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c -@@ -70,7 +70,7 @@ enum ipi_msg_type { +@@ -71,7 +71,7 @@ enum ipi_msg_type { static DECLARE_COMPLETION(cpu_running); @@ -3158,7 +3073,7 @@ index 5919eb4..b5d6dfe 100644 void __init smp_set_ops(struct smp_operations *ops) { diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c -index 6b9567e..b8af2d6 100644 +index ab517fc..9adf2fa 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -55,7 +55,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long); @@ -3199,7 +3114,7 @@ index 6b9567e..b8af2d6 100644 } return 0; -@@ -848,5 +855,9 @@ void __init early_trap_init(void *vectors_base) +@@ -849,7 +856,11 @@ void __init early_trap_init(void *vectors_base) kuser_init(vectors_base); flush_icache_range(vectors, vectors + PAGE_SIZE * 2); @@ -3209,9 +3124,11 @@ index 6b9567e..b8af2d6 100644 + modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT); +#endif + - } + #else /* ifndef CONFIG_CPU_V7M */ + /* + * 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 33f2ea3..0b91824 100644 +index 7bcee5c..64c9c5f 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S @@ -8,7 +8,11 @@ @@ -3227,7 +3144,7 @@ index 33f2ea3..0b91824 100644 #define PROC_INFO \ . = ALIGN(4); \ VMLINUX_SYMBOL(__proc_info_begin) = .; \ -@@ -94,6 +98,11 @@ SECTIONS +@@ -90,6 +94,11 @@ SECTIONS _text = .; HEAD_TEXT } @@ -3239,7 +3156,7 @@ index 33f2ea3..0b91824 100644 .text : { /* Real text segment */ _stext = .; /* Text and read-only data */ __exception_text_start = .; -@@ -116,6 +125,8 @@ SECTIONS +@@ -112,6 +121,8 @@ SECTIONS ARM_CPU_KEEP(PROC_INFO) } @@ -3248,7 +3165,7 @@ index 33f2ea3..0b91824 100644 RO_DATA(PAGE_SIZE) . = ALIGN(4); -@@ -146,7 +157,9 @@ SECTIONS +@@ -142,7 +153,9 @@ SECTIONS NOTES @@ -3259,7 +3176,7 @@ index 33f2ea3..0b91824 100644 #ifndef CONFIG_XIP_KERNEL . = ALIGN(PAGE_SIZE); -@@ -224,6 +237,11 @@ SECTIONS +@@ -220,6 +233,11 @@ SECTIONS . = PAGE_OFFSET + TEXT_OFFSET; #else __init_end = .; @@ -3272,7 +3189,7 @@ index 33f2ea3..0b91824 100644 __data_loc = .; #endif diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c -index ef1703b..46b77f3 100644 +index 741f66a..8a5615c 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -56,7 +56,7 @@ static unsigned long hyp_default_vectors; @@ -3423,7 +3340,7 @@ index 7d08b43..f7ca7ea 100644 #include "csumpartialcopygeneric.S" diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c -index 64dbfa5..84a3fd9 100644 +index 5306de3..aed6d03 100644 --- a/arch/arm/lib/delay.c +++ b/arch/arm/lib/delay.c @@ -28,7 +28,7 @@ @@ -3449,10 +3366,10 @@ index 025f742..8432b08 100644 /* * This test is stubbed out of the main function above to keep diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c -index f389228..592ef66 100644 +index e9238b5..6ed904a 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c -@@ -149,7 +149,16 @@ static void clk_gate_fn_disable(struct clk_hw *hw) +@@ -150,7 +150,16 @@ static void clk_gate_fn_disable(struct clk_hw *hw) clk_gate_ops.disable(hw); } @@ -3470,7 +3387,7 @@ index f389228..592ef66 100644 static struct clk __init *clk_register_gate_fn(struct device *dev, const char *name, -@@ -183,14 +192,6 @@ static struct clk __init *clk_register_gate_fn(struct device *dev, +@@ -184,14 +193,6 @@ static struct clk __init *clk_register_gate_fn(struct device *dev, gate_fn->fn_en = fn_en; gate_fn->fn_dis = fn_dis; @@ -3486,10 +3403,10 @@ index f389228..592ef66 100644 if (IS_ERR(clk)) diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c -index f6eeb87..cc90868 100644 +index 827d1500..2885dc6 100644 --- a/arch/arm/mach-omap2/board-n8x0.c +++ b/arch/arm/mach-omap2/board-n8x0.c -@@ -631,7 +631,7 @@ static int n8x0_menelaus_late_init(struct device *dev) +@@ -627,7 +627,7 @@ static int n8x0_menelaus_late_init(struct device *dev) } #endif @@ -3499,10 +3416,10 @@ index f6eeb87..cc90868 100644 }; diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c -index 6c4da12..d9ca72d 100644 +index f3fdd6a..3564800 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c -@@ -147,7 +147,6 @@ struct omap3_gpmc_regs { +@@ -148,7 +148,6 @@ struct omap3_gpmc_regs { }; static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ]; @@ -3510,7 +3427,7 @@ index 6c4da12..d9ca72d 100644 static unsigned gpmc_irq_start; static struct resource gpmc_mem_root; -@@ -711,6 +710,18 @@ static void gpmc_irq_noop(struct irq_data *data) { } +@@ -716,6 +715,18 @@ static void gpmc_irq_noop(struct irq_data *data) { } static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; } @@ -3529,7 +3446,7 @@ index 6c4da12..d9ca72d 100644 static int gpmc_setup_irq(void) { int i; -@@ -725,15 +736,6 @@ static int gpmc_setup_irq(void) +@@ -730,15 +741,6 @@ static int gpmc_setup_irq(void) return gpmc_irq_start; } @@ -3546,10 +3463,10 @@ index 6c4da12..d9ca72d 100644 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT; diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c -index f8bb3b9..831e7b8 100644 +index 813c615..ce467c6 100644 --- a/arch/arm/mach-omap2/omap-wakeupgen.c +++ b/arch/arm/mach-omap2/omap-wakeupgen.c -@@ -339,7 +339,7 @@ static int __cpuinit irq_cpu_hotplug_notify(struct notifier_block *self, +@@ -339,7 +339,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self, return NOTIFY_OK; } @@ -3559,10 +3476,10 @@ index f8bb3b9..831e7b8 100644 }; diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c -index e6d2307..d057195 100644 +index f99f68e..e573e20 100644 --- a/arch/arm/mach-omap2/omap_device.c +++ b/arch/arm/mach-omap2/omap_device.c -@@ -499,7 +499,7 @@ void omap_device_delete(struct omap_device *od) +@@ -504,7 +504,7 @@ void omap_device_delete(struct omap_device *od) struct platform_device __init *omap_device_build(const char *pdev_name, int pdev_id, struct omap_hwmod *oh, @@ -3571,7 +3488,7 @@ index e6d2307..d057195 100644 { struct omap_hwmod *ohs[] = { oh }; -@@ -527,7 +527,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name, +@@ -532,7 +532,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name, struct platform_device __init *omap_device_build_ss(const char *pdev_name, int pdev_id, struct omap_hwmod **ohs, @@ -3581,10 +3498,10 @@ index e6d2307..d057195 100644 { int ret = -ENOMEM; diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h -index 044c31d..2ee0861 100644 +index 17ca1ae..beba869 100644 --- a/arch/arm/mach-omap2/omap_device.h +++ b/arch/arm/mach-omap2/omap_device.h -@@ -72,12 +72,12 @@ int omap_device_idle(struct platform_device *pdev); +@@ -71,12 +71,12 @@ int omap_device_idle(struct platform_device *pdev); /* Core code interface */ struct platform_device *omap_device_build(const char *pdev_name, int pdev_id, @@ -3600,7 +3517,7 @@ index 044c31d..2ee0861 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 7341eff..fd75e34 100644 +index 7f4db12..0243012 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 { @@ -3641,10 +3558,10 @@ 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 0cdba8d..297993e 100644 +index 706aa42..f85e9131 100644 --- a/arch/arm/mach-tegra/cpuidle-tegra20.c +++ b/arch/arm/mach-tegra/cpuidle-tegra20.c -@@ -181,7 +181,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev, +@@ -180,7 +180,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev, bool entered_lp2 = false; if (tegra_pending_sgi()) @@ -3672,10 +3589,10 @@ index cad3ca86..1d79e0f 100644 extern void ux500_cpu_die(unsigned int cpu); diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig -index 08c9fe9..191320c 100644 +index cd2c88e..7430282 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig -@@ -436,7 +436,7 @@ config CPU_32v5 +@@ -446,7 +446,7 @@ config CPU_32v5 config CPU_32v6 bool @@ -3684,7 +3601,7 @@ index 08c9fe9..191320c 100644 select TLS_REG_EMUL if !CPU_32v6K && !MMU config CPU_32v6K -@@ -585,6 +585,7 @@ config CPU_CP15_MPU +@@ -601,6 +601,7 @@ config CPU_CP15_MPU config CPU_USE_DOMAINS bool @@ -3692,7 +3609,7 @@ index 08c9fe9..191320c 100644 help This option enables or disables the use of domain switching via the set_fs() function. -@@ -780,6 +781,7 @@ config NEED_KUSER_HELPERS +@@ -800,6 +801,7 @@ config NEED_KUSER_HELPERS config KUSER_HELPERS bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS default y @@ -3700,7 +3617,7 @@ index 08c9fe9..191320c 100644 help Warning: disabling this option may break user programs. -@@ -792,7 +794,7 @@ config KUSER_HELPERS +@@ -812,7 +814,7 @@ config KUSER_HELPERS See Documentation/arm/kernel_user_helpers.txt for details. However, the fixed address nature of these helpers can be used @@ -3775,10 +3692,10 @@ index 6f4585b..7b6f52b 100644 goto fault; \ } while (0) diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c -index eeab06e..2638dc2 100644 +index 4a05444..d21968c 100644 --- a/arch/arm/mm/context.c +++ b/arch/arm/mm/context.c -@@ -42,7 +42,7 @@ +@@ -43,7 +43,7 @@ #define NUM_USER_ASIDS ASID_FIRST_VERSION static DEFINE_RAW_SPINLOCK(cpu_asid_lock); @@ -3787,7 +3704,7 @@ index eeab06e..2638dc2 100644 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS); static DEFINE_PER_CPU(atomic64_t, active_asids); -@@ -188,7 +188,7 @@ static int is_reserved_asid(u64 asid) +@@ -183,7 +183,7 @@ static int is_reserved_asid(u64 asid) static u64 new_context(struct mm_struct *mm, unsigned int cpu) { u64 asid = atomic64_read(&mm->context.id); @@ -3796,7 +3713,7 @@ index eeab06e..2638dc2 100644 if (asid != 0 && is_reserved_asid(asid)) { /* -@@ -206,7 +206,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu) +@@ -201,7 +201,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu) */ asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1); if (asid == NUM_USER_ASIDS) { @@ -3805,7 +3722,7 @@ index eeab06e..2638dc2 100644 &asid_generation); flush_context(cpu); asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1); -@@ -235,14 +235,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk) +@@ -230,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); @@ -3823,7 +3740,7 @@ index eeab06e..2638dc2 100644 atomic64_set(&mm->context.id, asid); } diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c -index 5dbf13f..a2d1876 100644 +index c97f794..e5aeea5 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -25,6 +25,7 @@ @@ -3903,7 +3820,7 @@ index 5dbf13f..a2d1876 100644 /* * First Level Translation Fault Handler * -@@ -543,9 +592,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs) +@@ -545,9 +594,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs) const struct fsr_info *inf = fsr_info + fsr_fs(fsr); struct siginfo info; @@ -3926,7 +3843,7 @@ index 5dbf13f..a2d1876 100644 printk(KERN_ALERT "Unhandled fault: %s (0x%03x) at 0x%08lx\n", inf->name, fsr, addr); -@@ -569,15 +631,68 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs * +@@ -571,15 +633,68 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs * ifsr_info[nr].name = name; } @@ -3978,7 +3895,7 @@ index 5dbf13f..a2d1876 100644 + if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) { + unsigned int bkpt; + -+ if (!probe_kernel_address((unsigned int *)pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) { ++ if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) { + current->thread.error_code = ifsr; + current->thread.trap_no = 0; + pax_report_refcount_overflow(regs); @@ -4026,7 +3943,7 @@ 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 0ecc43f..190b956 100644 +index 15225d8..25e2e3c 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -30,6 +30,8 @@ @@ -4038,7 +3955,7 @@ index 0ecc43f..190b956 100644 #include <asm/mach/arch.h> #include <asm/mach/map.h> -@@ -726,7 +728,46 @@ void free_initmem(void) +@@ -683,7 +685,46 @@ void free_initmem(void) { #ifdef CONFIG_HAVE_TCM extern char __tcm_start, __tcm_end; @@ -4083,13 +4000,13 @@ index 0ecc43f..190b956 100644 + +#ifdef CONFIG_HAVE_TCM poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start); - free_reserved_area(&__tcm_start, &__tcm_end, 0, "TCM link"); + 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 04d9006..c547d85 100644 +index f123d6e..04bf569 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c -@@ -392,9 +392,9 @@ __arm_ioremap_exec(unsigned long phys_addr, size_t size, bool cached) +@@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached) unsigned int mtype; if (cached) @@ -4102,7 +4019,7 @@ index 04d9006..c547d85 100644 return __arm_ioremap_caller(phys_addr, size, mtype, __builtin_return_address(0)); diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c -index 10062ce..8695745 100644 +index 0c63562..7128a90 100644 --- a/arch/arm/mm/mmap.c +++ b/arch/arm/mm/mmap.c @@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, @@ -4190,7 +4107,7 @@ index 10062ce..8695745 100644 /* 8 bits of randomness in 20 address space bits */ if ((current->flags & PF_RANDOMIZE) && !(current->personality & ADDR_NO_RANDOMIZE)) -@@ -180,10 +194,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm) +@@ -180,9 +194,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm) if (mmap_is_legacy()) { mm->mmap_base = TASK_UNMAPPED_BASE + random_factor; @@ -4201,7 +4118,6 @@ index 10062ce..8695745 100644 +#endif + mm->get_unmapped_area = arch_get_unmapped_area; - mm->unmap_area = arch_unmap_area; } else { mm->mmap_base = mmap_base(random_factor); + @@ -4211,10 +4127,10 @@ index 10062ce..8695745 100644 +#endif + mm->get_unmapped_area = arch_get_unmapped_area_topdown; - mm->unmap_area = arch_unmap_area_topdown; } + } diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c -index daf336f..4e6392c 100644 +index 53cdbd3..670f177 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -36,6 +36,22 @@ @@ -4477,7 +4393,7 @@ index daf336f..4e6392c 100644 mem_types[MT_ROM].prot_sect |= cp->pmd; switch (cp->pmd) { -@@ -1166,18 +1255,15 @@ void __init arm_mm_memblock_reserve(void) +@@ -1186,18 +1275,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. */ @@ -4500,7 +4416,7 @@ index daf336f..4e6392c 100644 for (addr = VMALLOC_START; addr; addr += PMD_SIZE) pmd_clear(pmd_off_k(addr)); -@@ -1217,7 +1303,7 @@ static void __init devicemaps_init(struct machine_desc *mdesc) +@@ -1237,7 +1323,7 @@ static void __init devicemaps_init(struct machine_desc *mdesc) * location (0xffff0000). If we aren't using high-vectors, also * create a mapping at the low-vectors virtual address. */ @@ -4509,7 +4425,7 @@ index daf336f..4e6392c 100644 map.virtual = 0xffff0000; map.length = PAGE_SIZE; #ifdef CONFIG_KUSER_HELPERS -@@ -1287,8 +1373,39 @@ static void __init map_lowmem(void) +@@ -1309,8 +1395,39 @@ static void __init map_lowmem(void) map.pfn = __phys_to_pfn(start); map.virtual = __phys_to_virt(start); map.length = end - start; @@ -4576,32 +4492,6 @@ index ce6d763..cfea917 100644 extern void *samsung_dmadev_get_ops(void); extern void *s3c_dma_get_ops(void); -diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c -index f4726dc..39ed646 100644 ---- a/arch/arm64/kernel/debug-monitors.c -+++ b/arch/arm64/kernel/debug-monitors.c -@@ -149,7 +149,7 @@ static int __cpuinit os_lock_notify(struct notifier_block *self, - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata os_lock_nb = { -+static struct notifier_block os_lock_nb = { - .notifier_call = os_lock_notify, - }; - -diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c -index 5ab825c..96aaec8 100644 ---- a/arch/arm64/kernel/hw_breakpoint.c -+++ b/arch/arm64/kernel/hw_breakpoint.c -@@ -831,7 +831,7 @@ static int __cpuinit hw_breakpoint_reset_notify(struct notifier_block *self, - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata hw_breakpoint_reset_nb = { -+static struct notifier_block hw_breakpoint_reset_nb = { - .notifier_call = hw_breakpoint_reset_notify, - }; - diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h index c3a58a1..78fbf54 100644 --- a/arch/avr32/include/asm/cache.h @@ -4942,7 +4832,7 @@ index 96a8d92..617a1cf 100644 { return quicklist_alloc(0, GFP_KERNEL, NULL); diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h -index 815810c..d60bd4c 100644 +index 7935115..c0eca6a 100644 --- a/arch/ia64/include/asm/pgtable.h +++ b/arch/ia64/include/asm/pgtable.h @@ -12,7 +12,7 @@ @@ -5047,32 +4937,6 @@ index 449c8c0..18965fb 100644 __cu_len; \ }) -diff --git a/arch/ia64/kernel/err_inject.c b/arch/ia64/kernel/err_inject.c -index 2d67317..07d8bfa 100644 ---- a/arch/ia64/kernel/err_inject.c -+++ b/arch/ia64/kernel/err_inject.c -@@ -256,7 +256,7 @@ static int __cpuinit err_inject_cpu_callback(struct notifier_block *nfb, - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata err_inject_cpu_notifier = -+static struct notifier_block err_inject_cpu_notifier = - { - .notifier_call = err_inject_cpu_callback, - }; -diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c -index d7396db..b33e873 100644 ---- a/arch/ia64/kernel/mca.c -+++ b/arch/ia64/kernel/mca.c -@@ -1922,7 +1922,7 @@ static int __cpuinit mca_cpu_callback(struct notifier_block *nfb, - return NOTIFY_OK; - } - --static struct notifier_block mca_cpu_notifier __cpuinitdata = { -+static struct notifier_block mca_cpu_notifier = { - .notifier_call = mca_cpu_callback - }; - diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c index 24603be..948052d 100644 --- a/arch/ia64/kernel/module.c @@ -5166,10 +5030,10 @@ 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 2b3c2d7..a318d84 100644 +index ab33328..f39506c 100644 --- a/arch/ia64/kernel/palinfo.c +++ b/arch/ia64/kernel/palinfo.c -@@ -980,7 +980,7 @@ static int __cpuinit palinfo_cpu_callback(struct notifier_block *nfb, +@@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb, return NOTIFY_OK; } @@ -5178,19 +5042,6 @@ index 2b3c2d7..a318d84 100644 { .notifier_call = palinfo_cpu_callback, .priority = 0, -diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c -index 4bc580a..7767f24 100644 ---- a/arch/ia64/kernel/salinfo.c -+++ b/arch/ia64/kernel/salinfo.c -@@ -609,7 +609,7 @@ salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu - return NOTIFY_OK; - } - --static struct notifier_block salinfo_cpu_notifier __cpuinitdata = -+static struct notifier_block salinfo_cpu_notifier = - { - .notifier_call = salinfo_cpu_callback, - .priority = 0, diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c index 41e33f8..65180b2 100644 --- a/arch/ia64/kernel/sys_ia64.c @@ -5225,19 +5076,6 @@ index 41e33f8..65180b2 100644 return vm_unmapped_area(&info); } -diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c -index dc00b2c..cce53c2 100644 ---- a/arch/ia64/kernel/topology.c -+++ b/arch/ia64/kernel/topology.c -@@ -445,7 +445,7 @@ static int __cpuinit cache_cpu_callback(struct notifier_block *nfb, - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata cache_cpu_notifier = -+static struct notifier_block cache_cpu_notifier = - { - .notifier_call = cache_cpu_callback - }; diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S index 0ccb28f..8992469 100644 --- a/arch/ia64/kernel/vmlinux.lds.S @@ -5323,7 +5161,7 @@ index 76069c1..c2aa816 100644 } diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c -index d1fe4b4..2628f37 100644 +index b6f7f43..c04320d 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -120,6 +120,19 @@ ia64_init_addr_space (void) @@ -6486,7 +6324,7 @@ index d44622c..64990d2 100644 /** diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h -index f59552f..3abe9b9 100644 +index f6be474..12ad554 100644 --- a/arch/mips/include/asm/page.h +++ b/arch/mips/include/asm/page.h @@ -95,7 +95,7 @@ extern void copy_user_highpage(struct page *to, struct page *from, @@ -6514,11 +6352,23 @@ index 881d18b..cea38bc 100644 #endif /* +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 895320e..bf63e10 100644 +index 61215a3..213ee0e 100644 --- a/arch/mips/include/asm/thread_info.h +++ b/arch/mips/include/asm/thread_info.h -@@ -115,6 +115,8 @@ static inline struct thread_info *current_thread_info(void) +@@ -116,6 +116,8 @@ static inline struct thread_info *current_thread_info(void) #define TIF_32BIT_ADDR 23 /* 32-bit address space (o32/n32) */ #define TIF_FPUBOUND 24 /* thread bound to FPU-full CPU set */ #define TIF_LOAD_WATCH 25 /* If set, load watch registers */ @@ -6527,24 +6377,28 @@ index 895320e..bf63e10 100644 #define TIF_SYSCALL_TRACE 31 /* syscall trace active */ #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) -@@ -130,15 +132,18 @@ static inline struct thread_info *current_thread_info(void) +@@ -132,20 +134,18 @@ static inline struct thread_info *current_thread_info(void) #define _TIF_32BIT_ADDR (1<<TIF_32BIT_ADDR) #define _TIF_FPUBOUND (1<<TIF_FPUBOUND) #define _TIF_LOAD_WATCH (1<<TIF_LOAD_WATCH) +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID) -+ -+#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_GRSEC_SETXID) + +-#define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \ +- _TIF_SYSCALL_AUDIT) ++#define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_GRSEC_SETXID) /* work to do in syscall_trace_leave() */ --#define _TIF_WORK_SYSCALL_EXIT (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT) -+#define _TIF_WORK_SYSCALL_EXIT (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_GRSEC_SETXID) +-#define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \ +- _TIF_SYSCALL_AUDIT) ++#define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_GRSEC_SETXID) /* work to do on interrupt/exception return */ #define _TIF_WORK_MASK \ (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_NOTIFY_RESUME) /* work to do on any return to u-space */ --#define _TIF_ALLWORK_MASK (_TIF_WORK_MASK | _TIF_WORK_SYSCALL_EXIT) -+#define _TIF_ALLWORK_MASK (_TIF_WORK_MASK | _TIF_WORK_SYSCALL_EXIT | _TIF_GRSEC_SETXID) +-#define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \ +- _TIF_WORK_SYSCALL_EXIT) ++#define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | _TIF_WORK_SYSCALL_EXIT | _TIF_GRSEC_SETXID) #endif /* __KERNEL__ */ @@ -6610,10 +6464,10 @@ index d1fea7a..45602ea 100644 void __init init_IRQ(void) diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c -index c6a041d..b3e7318 100644 +index ddc7610..8c58f17 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c -@@ -563,15 +563,3 @@ unsigned long get_wchan(struct task_struct *task) +@@ -566,15 +566,3 @@ unsigned long get_wchan(struct task_struct *task) out: return pc; } @@ -6630,10 +6484,10 @@ index c6a041d..b3e7318 100644 - return sp & ALMASK; -} diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c -index 9c6299c..2fb4c22 100644 +index 8ae1ebe..1bcbf47 100644 --- a/arch/mips/kernel/ptrace.c +++ b/arch/mips/kernel/ptrace.c -@@ -528,6 +528,10 @@ static inline int audit_arch(void) +@@ -529,6 +529,10 @@ static inline int audit_arch(void) return arch; } @@ -6644,7 +6498,7 @@ index 9c6299c..2fb4c22 100644 /* * Notification of system call entry/exit * - triggered by current->work.syscall_trace -@@ -537,6 +541,11 @@ asmlinkage void syscall_trace_enter(struct pt_regs *regs) +@@ -540,6 +544,11 @@ asmlinkage void syscall_trace_enter(struct pt_regs *regs) /* do the secure computing check first */ secure_computing_strict(regs->regs[2]); @@ -6656,74 +6510,66 @@ index 9c6299c..2fb4c22 100644 if (!(current->ptrace & PT_PTRACED)) goto out; -diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S -index 9b36424..e7f4154 100644 ---- a/arch/mips/kernel/scall32-o32.S -+++ b/arch/mips/kernel/scall32-o32.S -@@ -52,7 +52,7 @@ NESTED(handle_sys, PT_SIZE, sp) - - stack_done: - lw t0, TI_FLAGS($28) # syscall tracing enabled? -- li t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT -+ li t1, _TIF_SYSCALL_WORK - and t0, t1 - bnez t0, syscall_trace_entry # -> yes - -diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S -index 97a5909..59622f8 100644 ---- a/arch/mips/kernel/scall64-64.S -+++ b/arch/mips/kernel/scall64-64.S -@@ -54,7 +54,7 @@ NESTED(handle_sys64, PT_SIZE, sp) - - sd a3, PT_R26(sp) # save a3 for syscall restarting - -- li t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT -+ li t1, _TIF_SYSCALL_WORK - LONG_L t0, TI_FLAGS($28) # syscall tracing enabled? - and t0, t1, t0 - bnez t0, syscall_trace_entry -diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S -index edcb659..fb2ab09 100644 ---- a/arch/mips/kernel/scall64-n32.S -+++ b/arch/mips/kernel/scall64-n32.S -@@ -47,7 +47,7 @@ NESTED(handle_sysn32, PT_SIZE, sp) - - sd a3, PT_R26(sp) # save a3 for syscall restarting - -- li t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT -+ li t1, _TIF_SYSCALL_WORK - LONG_L t0, TI_FLAGS($28) # syscall tracing enabled? - and t0, t1, t0 - bnez t0, n32_syscall_trace_entry -diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S -index 74f485d..47d2c38 100644 ---- a/arch/mips/kernel/scall64-o32.S -+++ b/arch/mips/kernel/scall64-o32.S -@@ -81,7 +81,7 @@ NESTED(handle_sys, PT_SIZE, sp) - PTR 4b, bad_stack - .previous +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)); + } + -- li t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT -+ li t1, _TIF_SYSCALL_WORK - LONG_L t0, TI_FLAGS($28) # syscall tracing enabled? - and t0, t1, t0 - bnez t0, trace_a_syscall diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c -index 1ff43d5..96fec68 100644 +index 84536bf..79caa4d 100644 --- a/arch/mips/kernel/sync-r4k.c +++ b/arch/mips/kernel/sync-r4k.c @@ -21,8 +21,8 @@ #include <asm/mipsregs.h> - static atomic_t __cpuinitdata count_start_flag = ATOMIC_INIT(0); --static atomic_t __cpuinitdata count_count_start = ATOMIC_INIT(0); --static atomic_t __cpuinitdata count_count_stop = ATOMIC_INIT(0); -+static atomic_unchecked_t __cpuinitdata count_count_start = ATOMIC_INIT(0); -+static atomic_unchecked_t __cpuinitdata count_count_stop = ATOMIC_INIT(0); - static atomic_t __cpuinitdata count_reference = ATOMIC_INIT(0); + static atomic_t count_start_flag = ATOMIC_INIT(0); +-static atomic_t count_count_start = ATOMIC_INIT(0); +-static atomic_t count_count_stop = ATOMIC_INIT(0); ++static atomic_unchecked_t count_count_start = ATOMIC_INIT(0); ++static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0); + static atomic_t count_reference = ATOMIC_INIT(0); #define COUNTON 100 -@@ -69,13 +69,13 @@ void __cpuinit synchronise_count_master(int cpu) +@@ -69,13 +69,13 @@ void synchronise_count_master(int cpu) for (i = 0; i < NR_LOOPS; i++) { /* slaves loop on '!= 2' */ @@ -6740,7 +6586,7 @@ index 1ff43d5..96fec68 100644 /* * Everyone initialises count in the last loop: -@@ -86,11 +86,11 @@ void __cpuinit synchronise_count_master(int cpu) +@@ -86,11 +86,11 @@ void synchronise_count_master(int cpu) /* * Wait for all slaves to leave the synchronization point: */ @@ -6755,7 +6601,7 @@ index 1ff43d5..96fec68 100644 } /* Arrange for an interrupt in a short while */ write_c0_compare(read_c0_count() + COUNTON); -@@ -131,8 +131,8 @@ void __cpuinit synchronise_count_slave(int cpu) +@@ -131,8 +131,8 @@ void synchronise_count_slave(int cpu) initcount = atomic_read(&count_reference); for (i = 0; i < NR_LOOPS; i++) { @@ -6766,7 +6612,7 @@ index 1ff43d5..96fec68 100644 mb(); /* -@@ -141,8 +141,8 @@ void __cpuinit synchronise_count_slave(int cpu) +@@ -141,8 +141,8 @@ void synchronise_count_slave(int cpu) if (i == NR_LOOPS-1) write_c0_count(initcount); @@ -6778,19 +6624,20 @@ index 1ff43d5..96fec68 100644 } /* Arrange for an interrupt in a short while */ diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c -index a75ae40..0d0f56a 100644 +index aec3408..74d79d3 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c -@@ -675,7 +675,17 @@ asmlinkage void do_ov(struct pt_regs *regs) - { +@@ -683,7 +683,18 @@ asmlinkage void do_ov(struct pt_regs *regs) siginfo_t info; + prev_state = exception_enter(); - die_if_kernel("Integer overflow", regs); + if (unlikely(!user_mode(regs))) { + +#ifdef CONFIG_PAX_REFCOUNT + if (fixup_exception(regs)) { + pax_report_refcount_overflow(regs); ++ exception_exit(prev_state); + return; + } +#endif @@ -6801,10 +6648,10 @@ index a75ae40..0d0f56a 100644 info.si_code = FPE_INTOVF; info.si_signo = SIGFPE; diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c -index 0fead53..eeb00a6 100644 +index 85df1cd..4f0a4de 100644 --- a/arch/mips/mm/fault.c +++ b/arch/mips/mm/fault.c -@@ -27,6 +27,23 @@ +@@ -28,6 +28,23 @@ #include <asm/highmem.h> /* For VMALLOC_END */ #include <linux/kdebug.h> @@ -6828,7 +6675,7 @@ index 0fead53..eeb00a6 100644 /* * This routine handles page faults. It determines the address, * and the problem, and then passes it off to one of the appropriate -@@ -196,6 +213,14 @@ bad_area: +@@ -197,6 +214,14 @@ bad_area: bad_area_nosemaphore: /* User mode accesses just cause a SIGSEGV */ if (user_mode(regs)) { @@ -6844,7 +6691,7 @@ index 0fead53..eeb00a6 100644 tsk->thread.error_code = write; #if 0 diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c -index 7e5fe27..9656513 100644 +index f1baadd..8537544 100644 --- a/arch/mips/mm/mmap.c +++ b/arch/mips/mm/mmap.c @@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp, @@ -6895,7 +6742,7 @@ index 7e5fe27..9656513 100644 if (current->flags & PF_RANDOMIZE) { random_factor = get_random_int(); random_factor = random_factor << PAGE_SHIFT; -@@ -157,42 +167,27 @@ void arch_pick_mmap_layout(struct mm_struct *mm) +@@ -157,40 +167,25 @@ void arch_pick_mmap_layout(struct mm_struct *mm) if (mmap_is_legacy()) { mm->mmap_base = TASK_UNMAPPED_BASE + random_factor; @@ -6906,7 +6753,6 @@ index 7e5fe27..9656513 100644 +#endif + mm->get_unmapped_area = arch_get_unmapped_area; - mm->unmap_area = arch_unmap_area; } else { mm->mmap_base = mmap_base(random_factor); + @@ -6916,7 +6762,6 @@ index 7e5fe27..9656513 100644 +#endif + mm->get_unmapped_area = arch_get_unmapped_area_topdown; - mm->unmap_area = arch_unmap_area_topdown; } } @@ -7127,7 +6972,7 @@ index fc987a1..6e068ef 100644 #endif diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h -index 1e40d7f..a3eb445 100644 +index 34899b5..02dd060 100644 --- a/arch/parisc/include/asm/pgtable.h +++ b/arch/parisc/include/asm/pgtable.h @@ -223,6 +223,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long); @@ -7699,7 +7544,7 @@ index 88693ce..ac6f9ab 100644 #include <asm-generic/getorder.h> diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h -index b66ae72..4a378cd 100644 +index f65e27b..23ffb5b 100644 --- a/arch/powerpc/include/asm/pgalloc-64.h +++ b/arch/powerpc/include/asm/pgalloc-64.h @@ -53,6 +53,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) @@ -7731,7 +7576,7 @@ index b66ae72..4a378cd 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 7aeb955..19f748e 100644 +index 7d6eacf..14c0240 100644 --- a/arch/powerpc/include/asm/pgtable.h +++ b/arch/powerpc/include/asm/pgtable.h @@ -2,6 +2,7 @@ @@ -7755,7 +7600,7 @@ 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 e1fb161..2290d1d 100644 +index 99222e2..f629aef 100644 --- a/arch/powerpc/include/asm/reg.h +++ b/arch/powerpc/include/asm/reg.h @@ -234,6 +234,7 @@ @@ -7814,7 +7659,7 @@ index ba7b197..d292e26 100644 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \ _TIF_NOTIFY_RESUME | _TIF_UPROBE) diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h -index 4db4959..aba5c41 100644 +index 9485b43..4718d50 100644 --- a/arch/powerpc/include/asm/uaccess.h +++ b/arch/powerpc/include/asm/uaccess.h @@ -318,52 +318,6 @@ do { \ @@ -8057,7 +7902,7 @@ index 2e3200c..72095ce 100644 /* Find this entry, or if that fails, the next avail. entry */ while (entry->jump[0]) { diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c -index 7baa27b..f6b394a 100644 +index 8083be2..10aa352 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@ -884,8 +884,8 @@ void show_regs(struct pt_regs * regs) @@ -8071,7 +7916,7 @@ index 7baa27b..f6b394a 100644 #endif #ifdef CONFIG_PPC_TRANSACTIONAL_MEM printk("PACATMSCRATCH [%llx]\n", get_paca()->tm_scratch); -@@ -1345,10 +1345,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack) +@@ -1349,10 +1349,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack) newsp = stack[0]; ip = stack[STACK_FRAME_LR_SAVE]; if (!firstframe || ip != lr) { @@ -8084,7 +7929,7 @@ index 7baa27b..f6b394a 100644 (void *)current->ret_stack[curr_frame].ret); curr_frame--; } -@@ -1368,7 +1368,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack) +@@ -1372,7 +1372,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; @@ -8093,7 +7938,7 @@ index 7baa27b..f6b394a 100644 regs->trap, (void *)regs->nip, (void *)lr); firstframe = 1; } -@@ -1404,58 +1404,3 @@ void notrace __ppc64_runlatch_off(void) +@@ -1408,58 +1408,3 @@ void notrace __ppc64_runlatch_off(void) mtspr(SPRN_CTRLT, ctrl); } #endif /* CONFIG_PPC64 */ @@ -8153,10 +7998,10 @@ index 7baa27b..f6b394a 100644 - return ret; -} diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c -index 64f7bd5..8dd550f 100644 +index 9a0d24c..e7fbedf 100644 --- a/arch/powerpc/kernel/ptrace.c +++ b/arch/powerpc/kernel/ptrace.c -@@ -1783,6 +1783,10 @@ long arch_ptrace(struct task_struct *child, long request, +@@ -1761,6 +1761,10 @@ long arch_ptrace(struct task_struct *child, long request, return ret; } @@ -8167,7 +8012,7 @@ index 64f7bd5..8dd550f 100644 /* * We must return the syscall number to actually look up in the table. * This can be -1L to skip running any syscall at all. -@@ -1795,6 +1799,11 @@ long do_syscall_trace_enter(struct pt_regs *regs) +@@ -1773,6 +1777,11 @@ long do_syscall_trace_enter(struct pt_regs *regs) secure_computing_strict(regs->gpr[0]); @@ -8179,7 +8024,7 @@ index 64f7bd5..8dd550f 100644 if (test_thread_flag(TIF_SYSCALL_TRACE) && tracehook_report_syscall_entry(regs)) /* -@@ -1829,6 +1838,11 @@ void do_syscall_trace_leave(struct pt_regs *regs) +@@ -1807,6 +1816,11 @@ void do_syscall_trace_leave(struct pt_regs *regs) { int step; @@ -8217,21 +8062,8 @@ index 887e99d..310bc11 100644 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; } else { err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); -diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c -index e68a845..8b140e6 100644 ---- a/arch/powerpc/kernel/sysfs.c -+++ b/arch/powerpc/kernel/sysfs.c -@@ -522,7 +522,7 @@ static int __cpuinit sysfs_cpu_notify(struct notifier_block *self, - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata sysfs_cpu_nb = { -+static struct notifier_block sysfs_cpu_nb = { - .notifier_call = sysfs_cpu_notify, - }; - diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c -index 88929b1..bece8f8 100644 +index e435bc0..41c2964 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -141,6 +141,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs) @@ -8254,7 +8086,7 @@ index 88929b1..bece8f8 100644 } diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c -index d4f463a..8fb7431 100644 +index 1d9c926..25f4741 100644 --- a/arch/powerpc/kernel/vdso.c +++ b/arch/powerpc/kernel/vdso.c @@ -34,6 +34,7 @@ @@ -8418,10 +8250,10 @@ index 8726779..a33c512 100644 _exception(SIGSEGV, regs, code, address); goto bail; } -diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c -index 67a42ed..cd463e0 100644 ---- a/arch/powerpc/mm/mmap_64.c -+++ b/arch/powerpc/mm/mmap_64.c +diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c +index cb8bdbe..d770680 100644 +--- a/arch/powerpc/mm/mmap.c ++++ b/arch/powerpc/mm/mmap.c @@ -57,6 +57,10 @@ static unsigned long mmap_rnd(void) { unsigned long rnd = 0; @@ -8433,7 +8265,7 @@ index 67a42ed..cd463e0 100644 if (current->flags & PF_RANDOMIZE) { /* 8MB for 32bit, 1GB for 64bit */ if (is_32bit_task()) -@@ -91,10 +95,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm) +@@ -91,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm) */ if (mmap_is_legacy()) { mm->mmap_base = TASK_UNMAPPED_BASE; @@ -8444,7 +8276,6 @@ index 67a42ed..cd463e0 100644 +#endif + mm->get_unmapped_area = arch_get_unmapped_area; - mm->unmap_area = arch_unmap_area; } else { mm->mmap_base = mmap_base(); + @@ -8454,34 +8285,8 @@ index 67a42ed..cd463e0 100644 +#endif + mm->get_unmapped_area = arch_get_unmapped_area_topdown; - mm->unmap_area = arch_unmap_area_topdown; } -diff --git a/arch/powerpc/mm/mmu_context_nohash.c b/arch/powerpc/mm/mmu_context_nohash.c -index e779642..e5bb889 100644 ---- a/arch/powerpc/mm/mmu_context_nohash.c -+++ b/arch/powerpc/mm/mmu_context_nohash.c -@@ -363,7 +363,7 @@ static int __cpuinit mmu_context_cpu_notify(struct notifier_block *self, - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata mmu_context_cpu_nb = { -+static struct notifier_block mmu_context_cpu_nb = { - .notifier_call = mmu_context_cpu_notify, - }; - -diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c -index cafad40..9cbc0fc 100644 ---- a/arch/powerpc/mm/numa.c -+++ b/arch/powerpc/mm/numa.c -@@ -920,7 +920,7 @@ static void __init *careful_zallocation(int nid, unsigned long size, - return ret; } - --static struct notifier_block __cpuinitdata ppc64_numa_nb = { -+static struct notifier_block ppc64_numa_nb = { - .notifier_call = cpu_numa_callback, - .priority = 1 /* Must run before sched domains notifier. */ - }; diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c index 3e99c14..f00953c 100644 --- a/arch/powerpc/mm/slice.c @@ -8536,19 +8341,6 @@ index 9098692..3d54cd1 100644 { struct spu_context *ctx = vma->vm_file->private_data; unsigned long offset = address - vma->vm_start; -diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c -index bdb738a..49c9f95 100644 ---- a/arch/powerpc/platforms/powermac/smp.c -+++ b/arch/powerpc/platforms/powermac/smp.c -@@ -885,7 +885,7 @@ static int smp_core99_cpu_notify(struct notifier_block *self, - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata smp_core99_cpu_nb = { -+static struct notifier_block smp_core99_cpu_nb = { - .notifier_call = smp_core99_cpu_notify, - }; - #endif /* CONFIG_HOTPLUG_CPU */ diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h index c797832..ce575c8 100644 --- a/arch/s390/include/asm/atomic.h @@ -8791,10 +8583,10 @@ index 2bc3edd..ab9d598 100644 - return ret; -} diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c -index 06bafec..2bca531 100644 +index 4002329..99b67cb 100644 --- a/arch/s390/mm/mmap.c +++ b/arch/s390/mm/mmap.c -@@ -90,10 +90,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm) +@@ -90,9 +90,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm) */ if (mmap_is_legacy()) { mm->mmap_base = TASK_UNMAPPED_BASE; @@ -8805,7 +8597,6 @@ index 06bafec..2bca531 100644 +#endif + mm->get_unmapped_area = arch_get_unmapped_area; - mm->unmap_area = arch_unmap_area; } else { mm->mmap_base = mmap_base(); + @@ -8815,9 +8606,9 @@ index 06bafec..2bca531 100644 +#endif + mm->get_unmapped_area = arch_get_unmapped_area_topdown; - mm->unmap_area = arch_unmap_area_topdown; } -@@ -175,10 +187,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm) + } +@@ -173,9 +185,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm) */ if (mmap_is_legacy()) { mm->mmap_base = TASK_UNMAPPED_BASE; @@ -8828,7 +8619,6 @@ index 06bafec..2bca531 100644 +#endif + mm->get_unmapped_area = s390_get_unmapped_area; - mm->unmap_area = arch_unmap_area; } else { mm->mmap_base = mmap_base(); + @@ -8838,8 +8628,8 @@ index 06bafec..2bca531 100644 +#endif + mm->get_unmapped_area = s390_get_unmapped_area_topdown; - mm->unmap_area = arch_unmap_area_topdown; } + } diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h index ae3d59f..f65f075 100644 --- a/arch/score/include/asm/cache.h @@ -8897,19 +8687,6 @@ index ef9e555..331bd29 100644 #define __read_mostly __attribute__((__section__(".data..read_mostly"))) -diff --git a/arch/sh/kernel/cpu/sh4a/smp-shx3.c b/arch/sh/kernel/cpu/sh4a/smp-shx3.c -index 03f2b55..b0270327 100644 ---- a/arch/sh/kernel/cpu/sh4a/smp-shx3.c -+++ b/arch/sh/kernel/cpu/sh4a/smp-shx3.c -@@ -143,7 +143,7 @@ shx3_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata shx3_cpu_notifier = { -+static struct notifier_block shx3_cpu_notifier = { - .notifier_call = shx3_cpu_callback, - }; - diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c index 6777177..cb5e44f 100644 --- a/arch/sh/mm/mmap.c @@ -9261,7 +9038,7 @@ index bcfe063..b333142 100644 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr) { diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h -index 6fc1348..390c50a 100644 +index 502f632..da1917f 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); @@ -9599,27 +9376,6 @@ index d432fb2..6056af1 100644 extra-y := head_$(BITS).o -diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c -index 5ef48da..11d460f 100644 ---- a/arch/sparc/kernel/ds.c -+++ b/arch/sparc/kernel/ds.c -@@ -783,6 +783,16 @@ void ldom_set_var(const char *var, const char *value) - char *base, *p; - int msg_len, loops; - -+ if (strlen(var) + strlen(value) + 2 > -+ sizeof(pkt) - sizeof(pkt.header)) { -+ printk(KERN_ERR PFX -+ "contents length: %zu, which more than max: %lu," -+ "so could not set (%s) variable to (%s).\n", -+ strlen(var) + strlen(value) + 2, -+ sizeof(pkt) - sizeof(pkt.header), var, value); -+ return; -+ } -+ - memset(&pkt, 0, sizeof(pkt)); - pkt.header.data.tag.type = DS_DATA; - pkt.header.data.handle = cp->handle; diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c index fdd819d..5af08c8 100644 --- a/arch/sparc/kernel/process_32.c @@ -9743,10 +9499,10 @@ index 7ff45e4..a58f271 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 77539ed..3ffffe7 100644 +index e142545..fd29654 100644 --- a/arch/sparc/kernel/smp_64.c +++ b/arch/sparc/kernel/smp_64.c -@@ -868,8 +868,8 @@ extern unsigned long xcall_flush_dcache_page_cheetah; +@@ -869,8 +869,8 @@ extern unsigned long xcall_flush_dcache_page_cheetah; extern unsigned long xcall_flush_dcache_page_spitfire; #ifdef CONFIG_DEBUG_DCFLUSH @@ -9757,7 +9513,7 @@ index 77539ed..3ffffe7 100644 #endif static inline void __local_flush_dcache_page(struct page *page) -@@ -893,7 +893,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu) +@@ -894,7 +894,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu) return; #ifdef CONFIG_DEBUG_DCFLUSH @@ -9766,7 +9522,7 @@ index 77539ed..3ffffe7 100644 #endif this_cpu = get_cpu(); -@@ -917,7 +917,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu) +@@ -918,7 +918,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 @@ -9775,7 +9531,7 @@ index 77539ed..3ffffe7 100644 #endif } } -@@ -936,7 +936,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page) +@@ -937,7 +937,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page) preempt_disable(); #ifdef CONFIG_DEBUG_DCFLUSH @@ -9784,7 +9540,7 @@ index 77539ed..3ffffe7 100644 #endif data0 = 0; pg_addr = page_address(page); -@@ -953,7 +953,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page) +@@ -954,7 +954,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 @@ -9807,7 +9563,7 @@ 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 2daaaa6..4fb84dc 100644 +index 51561b8..8256764 100644 --- a/arch/sparc/kernel/sys_sparc_64.c +++ b/arch/sparc/kernel/sys_sparc_64.c @@ -90,13 +90,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi @@ -9964,9 +9720,9 @@ index 2daaaa6..4fb84dc 100644 +#endif + mm->get_unmapped_area = arch_get_unmapped_area; - mm->unmap_area = arch_unmap_area; } else { -@@ -301,6 +333,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm) + /* We know it's 32-bit */ +@@ -300,6 +332,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); @@ -9977,8 +9733,8 @@ index 2daaaa6..4fb84dc 100644 +#endif + mm->get_unmapped_area = arch_get_unmapped_area_topdown; - mm->unmap_area = arch_unmap_area_topdown; } + } diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S index 22a1098..6255eb9 100644 --- a/arch/sparc/kernel/syscalls.S @@ -10019,19 +9775,6 @@ index 22a1098..6255eb9 100644 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc 2: -diff --git a/arch/sparc/kernel/sysfs.c b/arch/sparc/kernel/sysfs.c -index 654e8aa..45f431b 100644 ---- a/arch/sparc/kernel/sysfs.c -+++ b/arch/sparc/kernel/sysfs.c -@@ -266,7 +266,7 @@ static int __cpuinit sysfs_cpu_notify(struct notifier_block *self, - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata sysfs_cpu_nb = { -+static struct notifier_block sysfs_cpu_nb = { - .notifier_call = sysfs_cpu_notify, - }; - diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c index 6629829..036032d 100644 --- a/arch/sparc/kernel/traps_32.c @@ -11473,7 +11216,7 @@ index d2b5944..d878f3c 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 04fd55a..4ede686 100644 +index ed82eda..0d80e77 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c @@ -188,9 +188,9 @@ unsigned long sparc64_kern_sec_context __read_mostly; @@ -11550,7 +11293,7 @@ index a9a5299..0fce79e 100644 /* bytes per L2 cache line */ #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE() diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h -index 8a082bc..7a6bf87 100644 +index e4d44bd..99927a3 100644 --- a/arch/tile/include/asm/uaccess.h +++ b/arch/tile/include/asm/uaccess.h @@ -408,9 +408,9 @@ static inline unsigned long __must_check copy_from_user(void *to, @@ -11715,10 +11458,10 @@ 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 fe120da..24177f7 100644 +index b32ebf9..5704f98 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -239,7 +239,7 @@ config X86_HT +@@ -248,7 +248,7 @@ config X86_HT config X86_32_LAZY_GS def_bool y @@ -11727,7 +11470,7 @@ index fe120da..24177f7 100644 config ARCH_HWEIGHT_CFLAGS string -@@ -1073,6 +1073,7 @@ config MICROCODE_EARLY +@@ -1088,6 +1088,7 @@ config MICROCODE_EARLY config X86_MSR tristate "/dev/cpu/*/msr - Model-specific register support" @@ -11735,7 +11478,7 @@ index fe120da..24177f7 100644 ---help--- This device gives privileged processes access to the x86 Model-Specific Registers (MSRs). It is a character device with -@@ -1096,7 +1097,7 @@ choice +@@ -1111,7 +1112,7 @@ choice config NOHIGHMEM bool "off" @@ -11744,7 +11487,7 @@ index fe120da..24177f7 100644 ---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 -@@ -1133,7 +1134,7 @@ config NOHIGHMEM +@@ -1148,7 +1149,7 @@ config NOHIGHMEM config HIGHMEM4G bool "4GB" @@ -11753,7 +11496,7 @@ index fe120da..24177f7 100644 ---help--- Select this if you have a 32-bit processor and between 1 and 4 gigabytes of physical RAM. -@@ -1186,7 +1187,7 @@ config PAGE_OFFSET +@@ -1201,7 +1202,7 @@ config PAGE_OFFSET hex default 0xB0000000 if VMSPLIT_3G_OPT default 0x80000000 if VMSPLIT_2G @@ -11762,7 +11505,7 @@ index fe120da..24177f7 100644 default 0x40000000 if VMSPLIT_1G default 0xC0000000 depends on X86_32 -@@ -1584,6 +1585,7 @@ config SECCOMP +@@ -1599,6 +1600,7 @@ config SECCOMP config CC_STACKPROTECTOR bool "Enable -fstack-protector buffer overflow detection" @@ -11770,7 +11513,7 @@ index fe120da..24177f7 100644 ---help--- This option turns on the -fstack-protector GCC feature. This feature puts, at the beginning of functions, a canary value on -@@ -1703,6 +1705,8 @@ config X86_NEED_RELOCS +@@ -1718,6 +1720,8 @@ config X86_NEED_RELOCS config PHYSICAL_ALIGN hex "Alignment value to which kernel should be aligned" if X86_32 default "0x1000000" @@ -11779,7 +11522,7 @@ index fe120da..24177f7 100644 range 0x2000 0x1000000 ---help--- This value puts the alignment restrictions on physical address -@@ -1778,9 +1782,10 @@ config DEBUG_HOTPLUG_CPU0 +@@ -1793,9 +1797,10 @@ config DEBUG_HOTPLUG_CPU0 If unsure, say N. config COMPAT_VDSO @@ -11823,10 +11566,10 @@ index c026cca..14657ae 100644 config X86_MINIMUM_CPU_FAMILY int diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug -index c198b7e..63eea60 100644 +index 78d91af..8ceb94b 100644 --- a/arch/x86/Kconfig.debug +++ b/arch/x86/Kconfig.debug -@@ -84,7 +84,7 @@ config X86_PTDUMP +@@ -74,7 +74,7 @@ config X86_PTDUMP config DEBUG_RODATA bool "Write protect kernel read-only data structures" default y @@ -11835,7 +11578,7 @@ index c198b7e..63eea60 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 +@@ -92,7 +92,7 @@ config DEBUG_RODATA_TEST config DEBUG_SET_MODULE_RONX bool "Set loadable kernel module data as NX and text as RO" @@ -11845,7 +11588,7 @@ index c198b7e..63eea60 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 5c47726..8c4fa67 100644 +index 07639c6..6f2c901 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -54,6 +54,7 @@ else @@ -11856,9 +11599,9 @@ index 5c47726..8c4fa67 100644 KBUILD_AFLAGS += -m64 KBUILD_CFLAGS += -m64 -@@ -234,3 +235,12 @@ define archhelp - echo ' FDARGS="..." arguments for the booted kernel' +@@ -241,3 +242,12 @@ define archhelp echo ' FDINITRD=file initrd for the booted kernel' + echo ' kvmconfig - Enable additional options for guest kernel support' endef + +define OLD_LD @@ -11928,10 +11671,10 @@ index 5b75319..331a4ca 100644 return diff; } diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile -index 5ef205c..342191d 100644 +index dcd90df..c830d7d 100644 --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile -@@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=small +@@ -15,6 +15,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=small KBUILD_CFLAGS += $(cflags-y) KBUILD_CFLAGS += $(call cc-option,-ffreestanding) KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector) @@ -11942,7 +11685,7 @@ index 5ef205c..342191d 100644 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ GCOV_PROFILE := n diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c -index d606463..b887794 100644 +index b7388a4..03844ec 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -150,7 +150,6 @@ again: @@ -12036,10 +11779,10 @@ index 1e3184f..0d11e2e 100644 jmp 1b 2: diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S -index 16f24e6..47491a3 100644 +index 06e71c2..88a98264 100644 --- a/arch/x86/boot/compressed/head_64.S +++ b/arch/x86/boot/compressed/head_64.S -@@ -97,7 +97,7 @@ ENTRY(startup_32) +@@ -95,7 +95,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx #else @@ -12048,7 +11791,7 @@ index 16f24e6..47491a3 100644 #endif /* Target address to relocate to for decompression */ -@@ -272,7 +272,7 @@ preferred_addr: +@@ -270,7 +270,7 @@ preferred_addr: notq %rax andq %rax, %rbp #else @@ -12057,7 +11800,7 @@ index 16f24e6..47491a3 100644 #endif /* Target address to relocate to for decompression */ -@@ -363,8 +363,8 @@ gdt: +@@ -361,8 +361,8 @@ gdt: .long gdt .word 0 .quad 0x0000000000000000 /* NULL descriptor */ @@ -12069,10 +11812,10 @@ index 16f24e6..47491a3 100644 .quad 0x0000000000000000 /* TS continued */ gdt_end: diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c -index 7cb56c6..d382d84 100644 +index 0319c88..7c1931f 100644 --- a/arch/x86/boot/compressed/misc.c +++ b/arch/x86/boot/compressed/misc.c -@@ -303,7 +303,7 @@ static void parse_elf(void *output) +@@ -307,7 +307,7 @@ static void parse_elf(void *output) case PT_LOAD: #ifdef CONFIG_RELOCATABLE dest = output; @@ -12081,7 +11824,7 @@ index 7cb56c6..d382d84 100644 #else dest = (void *)(phdr->p_paddr); #endif -@@ -354,7 +354,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap, +@@ -358,7 +358,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap, error("Destination address too large"); #endif #ifndef CONFIG_RELOCATABLE @@ -12449,57 +12192,6 @@ index 477e9d7..3ab339f 100644 ret ENDPROC(aesni_xts_crypt8) -diff --git a/arch/x86/crypto/blowfish-avx2-asm_64.S b/arch/x86/crypto/blowfish-avx2-asm_64.S -index 784452e..46982c7 100644 ---- a/arch/x86/crypto/blowfish-avx2-asm_64.S -+++ b/arch/x86/crypto/blowfish-avx2-asm_64.S -@@ -221,6 +221,7 @@ __blowfish_enc_blk32: - - write_block(RXl, RXr); - -+ pax_force_retaddr 0, 1 - ret; - ENDPROC(__blowfish_enc_blk32) - -@@ -250,6 +251,7 @@ __blowfish_dec_blk32: - - write_block(RXl, RXr); - -+ pax_force_retaddr 0, 1 - ret; - ENDPROC(__blowfish_dec_blk32) - -@@ -284,6 +286,7 @@ ENTRY(blowfish_ecb_enc_32way) - - vzeroupper; - -+ pax_force_retaddr 0, 1 - ret; - ENDPROC(blowfish_ecb_enc_32way) - -@@ -318,6 +321,7 @@ ENTRY(blowfish_ecb_dec_32way) - - vzeroupper; - -+ pax_force_retaddr 0, 1 - ret; - ENDPROC(blowfish_ecb_dec_32way) - -@@ -365,6 +369,7 @@ ENTRY(blowfish_cbc_dec_32way) - - vzeroupper; - -+ pax_force_retaddr 0, 1 - ret; - ENDPROC(blowfish_cbc_dec_32way) - -@@ -445,5 +450,6 @@ ENTRY(blowfish_ctr_32way) - - vzeroupper; - -+ pax_force_retaddr 0, 1 - ret; - ENDPROC(blowfish_ctr_32way) diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S index 246c670..4d1ed00 100644 --- a/arch/x86/crypto/blowfish-x86_64-asm_64.S @@ -12640,7 +12332,7 @@ index ce71f92..2dd5b1e 100644 ENDPROC(camellia_xts_crypt_16way) diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S -index 91a1878..bcf340a 100644 +index 0e0b886..8fc756a 100644 --- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S +++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S @@ -11,6 +11,7 @@ @@ -12651,7 +12343,7 @@ index 91a1878..bcf340a 100644 #define CAMELLIA_TABLE_BYTE_LEN 272 -@@ -212,6 +213,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd: +@@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd: roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7, %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15, %rcx, (%r9)); @@ -12659,7 +12351,7 @@ index 91a1878..bcf340a 100644 ret; ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd) -@@ -220,6 +222,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab: +@@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab: roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3, %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11, %rax, (%r9)); @@ -12667,7 +12359,7 @@ index 91a1878..bcf340a 100644 ret; ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab) -@@ -802,6 +805,7 @@ __camellia_enc_blk32: +@@ -820,6 +823,7 @@ __camellia_enc_blk32: %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax)); @@ -12675,7 +12367,7 @@ index 91a1878..bcf340a 100644 ret; .align 8 -@@ -887,6 +891,7 @@ __camellia_dec_blk32: +@@ -905,6 +909,7 @@ __camellia_dec_blk32: %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax)); @@ -12683,7 +12375,7 @@ index 91a1878..bcf340a 100644 ret; .align 8 -@@ -930,6 +935,7 @@ ENTRY(camellia_ecb_enc_32way) +@@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way) vzeroupper; @@ -12691,7 +12383,7 @@ index 91a1878..bcf340a 100644 ret; ENDPROC(camellia_ecb_enc_32way) -@@ -962,6 +968,7 @@ ENTRY(camellia_ecb_dec_32way) +@@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way) vzeroupper; @@ -12699,7 +12391,7 @@ index 91a1878..bcf340a 100644 ret; ENDPROC(camellia_ecb_dec_32way) -@@ -1028,6 +1035,7 @@ ENTRY(camellia_cbc_dec_32way) +@@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way) vzeroupper; @@ -12707,7 +12399,7 @@ index 91a1878..bcf340a 100644 ret; ENDPROC(camellia_cbc_dec_32way) -@@ -1166,6 +1174,7 @@ ENTRY(camellia_ctr_32way) +@@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way) vzeroupper; @@ -12715,7 +12407,7 @@ index 91a1878..bcf340a 100644 ret; ENDPROC(camellia_ctr_32way) -@@ -1331,6 +1340,7 @@ camellia_xts_crypt_32way: +@@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way: vzeroupper; @@ -13410,74 +13102,6 @@ index 0505813..63b1d00 100644 + pax_force_retaddr 0, 1 ret; ENDPROC(twofish_xts_dec_8way) -diff --git a/arch/x86/crypto/twofish-avx2-asm_64.S b/arch/x86/crypto/twofish-avx2-asm_64.S -index e1a83b9..33006b9 100644 ---- a/arch/x86/crypto/twofish-avx2-asm_64.S -+++ b/arch/x86/crypto/twofish-avx2-asm_64.S -@@ -11,6 +11,7 @@ - */ - - #include <linux/linkage.h> -+#include <asm/alternative-asm.h> - #include "glue_helper-asm-avx2.S" - - .file "twofish-avx2-asm_64.S" -@@ -422,6 +423,7 @@ __twofish_enc_blk16: - outunpack_enc16(RA, RB, RC, RD); - write_blocks16(RA, RB, RC, RD); - -+ pax_force_retaddr_bts - ret; - ENDPROC(__twofish_enc_blk16) - -@@ -454,6 +456,7 @@ __twofish_dec_blk16: - outunpack_dec16(RA, RB, RC, RD); - write_blocks16(RA, RB, RC, RD); - -+ pax_force_retaddr_bts - ret; - ENDPROC(__twofish_dec_blk16) - -@@ -476,6 +479,7 @@ ENTRY(twofish_ecb_enc_16way) - popq %r12; - vzeroupper; - -+ pax_force_retaddr 0, 1 - ret; - ENDPROC(twofish_ecb_enc_16way) - -@@ -498,6 +502,7 @@ ENTRY(twofish_ecb_dec_16way) - popq %r12; - vzeroupper; - -+ pax_force_retaddr 0, 1 - ret; - ENDPROC(twofish_ecb_dec_16way) - -@@ -521,6 +526,7 @@ ENTRY(twofish_cbc_dec_16way) - popq %r12; - vzeroupper; - -+ pax_force_retaddr 0, 1 - ret; - ENDPROC(twofish_cbc_dec_16way) - -@@ -546,6 +552,7 @@ ENTRY(twofish_ctr_16way) - popq %r12; - vzeroupper; - -+ pax_force_retaddr 0, 1 - ret; - ENDPROC(twofish_ctr_16way) - -@@ -574,6 +581,7 @@ twofish_xts_crypt_16way: - popq %r12; - vzeroupper; - -+ pax_force_retaddr 0, 1 - ret; - ENDPROC(twofish_xts_crypt_16way) - diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S index 1c3b7ce..b365c5e 100644 --- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S @@ -13541,7 +13165,7 @@ index a039d21..29e7615 100644 ret ENDPROC(twofish_dec_blk) diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c -index 52ff81c..98af645 100644 +index bae3aba..c1788c1 100644 --- a/arch/x86/ia32/ia32_aout.c +++ b/arch/x86/ia32/ia32_aout.c @@ -159,6 +159,8 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file, @@ -13554,10 +13178,10 @@ index 52ff81c..98af645 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 cf1a471..5ba2673 100644 +index bccfca6..a312009 100644 --- a/arch/x86/ia32/ia32_signal.c +++ b/arch/x86/ia32/ia32_signal.c -@@ -340,7 +340,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs, +@@ -338,7 +338,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs, sp -= frame_size; /* Align the stack pointer according to the i386 ABI, * i.e. so that on function entry ((sp + 4) & 15) == 0. */ @@ -13566,7 +13190,7 @@ index cf1a471..5ba2673 100644 return (void __user *) sp; } -@@ -398,7 +398,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig, +@@ -396,7 +396,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig, * These are actually not used anymore, but left because some * gdb versions depend on them as a marker. */ @@ -13575,7 +13199,7 @@ index cf1a471..5ba2673 100644 } put_user_catch(err); if (err) -@@ -440,7 +440,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig, +@@ -438,7 +438,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig, 0xb8, __NR_ia32_rt_sigreturn, 0x80cd, @@ -13584,7 +13208,7 @@ index cf1a471..5ba2673 100644 }; frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate); -@@ -459,20 +459,22 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig, +@@ -457,20 +457,22 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig, else put_user_ex(0, &frame->uc.uc_flags); put_user_ex(0, &frame->uc.uc_link); @@ -14032,10 +13656,10 @@ index 58ed6d9..f1cbe58 100644 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \ ".popsection" diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h -index 3388034..050f0b9 100644 +index f8119b5..7209d5b 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h -@@ -44,7 +44,7 @@ static inline void generic_apic_probe(void) +@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void) #ifdef CONFIG_X86_LOCAL_APIC @@ -15171,7 +14795,7 @@ 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 e99ac27..10d834e 100644 +index 47538a6..44902d1 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -203,7 +203,7 @@ @@ -15200,7 +14824,17 @@ index e99ac27..10d834e 100644 #endif /* CONFIG_X86_64 */ #if __GNUC__ >= 4 -@@ -394,7 +395,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit) +@@ -403,7 +404,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit) + + #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS + t_warn: +- warn_pre_alternatives(); ++ if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID) ++ warn_pre_alternatives(); + return false; + #endif + #else /* GCC_VERSION >= 40500 */ +@@ -421,7 +423,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" @@ -15209,8 +14843,35 @@ index e99ac27..10d834e 100644 "3: movb $1,%0\n" "4:\n" ".previous\n" +@@ -457,7 +459,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" +- ".section .altinstr_replacement,\"ax\"\n" ++ ".section .altinstr_replacement,\"a\"\n" + "3: .byte 0xe9\n .long %l[t_no] - 2b\n" + "4:\n" + ".previous\n" +@@ -490,7 +492,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" +- ".section .altinstr_replacement,\"ax\"\n" ++ ".section .altinstr_replacement,\"a\"\n" + "3: movb $0,%0\n" + "4:\n" + ".previous\n" +@@ -504,7 +506,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" +- ".section .altinstr_replacement,\"ax\"\n" ++ ".section .altinstr_replacement,\"a\"\n" + "5: movb $1,%0\n" + "6:\n" + ".previous\n" diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h -index 8bf1c06..b6ae785 100644 +index b90e5df..b462c91 100644 --- a/arch/x86/include/asm/desc.h +++ b/arch/x86/include/asm/desc.h @@ -4,6 +4,7 @@ @@ -15234,16 +14895,17 @@ index 8bf1c06..b6ae785 100644 extern struct desc_ptr idt_descr; -extern gate_desc idt_table[]; - extern struct desc_ptr nmi_idt_descr; --extern gate_desc nmi_idt_table[]; +-extern struct desc_ptr debug_idt_descr; +-extern gate_desc debug_idt_table[]; - -struct gdt_page { - struct desc_struct gdt[GDT_ENTRIES]; -} __attribute__((aligned(PAGE_SIZE))); - -DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page); -+extern gate_desc idt_table[256]; -+extern gate_desc nmi_idt_table[256]; ++extern gate_desc idt_table[IDT_ENTRIES]; ++extern const struct desc_ptr debug_idt_descr; ++extern gate_desc debug_idt_table[IDT_ENTRIES]; +extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)]; static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu) @@ -15336,7 +14998,18 @@ index 8bf1c06..b6ae785 100644 { gate_desc s; -@@ -320,7 +333,7 @@ static inline void set_nmi_gate(int gate, void *addr) +@@ -321,8 +334,8 @@ static inline void set_nmi_gate(int gate, void *addr) + #endif + + #ifdef CONFIG_TRACING +-extern struct desc_ptr trace_idt_descr; +-extern gate_desc trace_idt_table[]; ++extern const struct desc_ptr trace_idt_descr; ++extern gate_desc trace_idt_table[IDT_ENTRIES]; + static inline void write_trace_idt_entry(int entry, const gate_desc *gate) + { + write_idt_entry(trace_idt_table, entry, gate); +@@ -333,7 +346,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate) } #endif @@ -15345,7 +15018,7 @@ index 8bf1c06..b6ae785 100644 unsigned dpl, unsigned ist, unsigned seg) { gate_desc s; -@@ -339,7 +352,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr, +@@ -353,7 +366,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr, * Pentium F0 0F bugfix can have resulted in the mapped * IDT being write-protected. */ @@ -15354,7 +15027,7 @@ index 8bf1c06..b6ae785 100644 { BUG_ON((unsigned)n > 0xFF); _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS); -@@ -369,19 +382,19 @@ static inline void alloc_intr_gate(unsigned int n, void *addr) +@@ -410,19 +423,19 @@ static inline void __alloc_intr_gate(unsigned int n, void *addr) /* * This routine sets up an interrupt gate at directory privilege level 3. */ @@ -15377,7 +15050,7 @@ index 8bf1c06..b6ae785 100644 { BUG_ON((unsigned)n > 0xFF); _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS); -@@ -390,19 +403,31 @@ static inline void set_trap_gate(unsigned int n, void *addr) +@@ -431,16 +444,16 @@ static inline void set_trap_gate(unsigned int n, void *addr) static inline void set_task_gate(unsigned int n, unsigned int gdt_entry) { BUG_ON((unsigned)n > 0xFF); @@ -15397,8 +15070,11 @@ index 8bf1c06..b6ae785 100644 { BUG_ON((unsigned)n > 0xFF); _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS); +@@ -512,4 +525,17 @@ static inline void load_current_idt(void) + else + load_idt((const struct desc_ptr *)&idt_descr); } - ++ +#ifdef CONFIG_X86_32 +static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu) +{ @@ -15511,22 +15187,22 @@ index 9c999c1..3860cb8 100644 * True on X86_32 or when emulating IA32 on X86_64 */ diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h -index 75ce3f4..882e801 100644 +index 77a99ac..39ff7f5 100644 --- a/arch/x86/include/asm/emergency-restart.h +++ b/arch/x86/include/asm/emergency-restart.h -@@ -13,6 +13,6 @@ enum reboot_type { - - extern enum reboot_type reboot_type; +@@ -1,6 +1,6 @@ + #ifndef _ASM_X86_EMERGENCY_RESTART_H + #define _ASM_X86_EMERGENCY_RESTART_H -extern void machine_emergency_restart(void); +extern void machine_emergency_restart(void) __noreturn; #endif /* _ASM_X86_EMERGENCY_RESTART_H */ diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h -index e25cc33..7d3ec01 100644 +index 4d0bda7..221da4d 100644 --- a/arch/x86/include/asm/fpu-internal.h +++ b/arch/x86/include/asm/fpu-internal.h -@@ -126,8 +126,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk) +@@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk) #define user_insn(insn, output, input...) \ ({ \ int err; \ @@ -15539,7 +15215,7 @@ index e25cc33..7d3ec01 100644 "2: " ASM_CLAC "\n" \ ".section .fixup,\"ax\"\n" \ "3: movl $-1,%[err]\n" \ -@@ -136,6 +139,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk) +@@ -134,6 +137,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk) _ASM_EXTABLE(1b, 3b) \ : [err] "=r" (err), output \ : "0"(0), input); \ @@ -15547,7 +15223,7 @@ index e25cc33..7d3ec01 100644 err; \ }) -@@ -300,7 +304,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk) +@@ -298,7 +302,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk) "emms\n\t" /* clear stack tags */ "fildl %P[addr]", /* set F?P to defined value */ X86_FEATURE_FXSAVE_LEAK, @@ -15644,10 +15320,10 @@ index be27ba1..04a8801 100644 *uval = oldval; return ret; diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h -index 1da97ef..9c2ebff 100644 +index e4ac559..c1c0c87 100644 --- a/arch/x86/include/asm/hw_irq.h +++ b/arch/x86/include/asm/hw_irq.h -@@ -148,8 +148,8 @@ extern void setup_ioapic_dest(void); +@@ -165,8 +165,8 @@ extern void setup_ioapic_dest(void); extern void enable_IO_APIC(void); /* Statistics */ @@ -15672,7 +15348,7 @@ 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 d8e8eef..1765f78 100644 +index 34f69cb..6d95446 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) \ @@ -16029,7 +15705,7 @@ 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 cdbf367..4c73c9e 100644 +index cdbf367..ce8f82b 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); @@ -16089,7 +15765,7 @@ index cdbf367..4c73c9e 100644 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) + if (static_cpu_has(X86_FEATURE_PCID)) { + if (static_cpu_has(X86_FEATURE_INVPCID)) { -+ unsigned long descriptor[2]; ++ u64 descriptor[2]; + descriptor[0] = PCID_USER; + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory"); + } else { @@ -16154,7 +15830,7 @@ index cdbf367..4c73c9e 100644 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) + if (static_cpu_has(X86_FEATURE_PCID)) { + if (static_cpu_has(X86_FEATURE_INVPCID)) { -+ unsigned long descriptor[2]; ++ u64 descriptor[2]; + descriptor[0] = PCID_USER; + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory"); + } else { @@ -16504,7 +16180,7 @@ index b4389a4..7024269 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 f2b489c..4f7e2e5 100644 +index 3bf2dd0..23d2a9f 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) @@ -16518,7 +16194,7 @@ index f2b489c..4f7e2e5 100644 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h -index 4cc9f2b..5fd9226 100644 +index 81bb91b..9392125 100644 --- a/arch/x86/include/asm/pgtable-3level.h +++ b/arch/x86/include/asm/pgtable-3level.h @@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) @@ -16539,7 +16215,7 @@ index 4cc9f2b..5fd9226 100644 /* diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h -index 1e67223..92a9585 100644 +index 1c00631..845f898 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page); @@ -16645,7 +16321,7 @@ index 1e67223..92a9585 100644 } static inline pte_t pte_mkdirty(pte_t pte) -@@ -394,6 +459,16 @@ pte_t *populate_extra_pte(unsigned long vaddr); +@@ -444,6 +509,16 @@ pte_t *populate_extra_pte(unsigned long vaddr); #endif #ifndef __ASSEMBLY__ @@ -16662,7 +16338,7 @@ index 1e67223..92a9585 100644 #include <linux/mm_types.h> #include <linux/log2.h> -@@ -529,7 +604,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud) +@@ -576,7 +651,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: */ @@ -16671,7 +16347,7 @@ index 1e67223..92a9585 100644 /* Find an entry in the second-level page table.. */ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address) -@@ -569,7 +644,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd) +@@ -616,7 +691,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: */ @@ -16680,7 +16356,7 @@ index 1e67223..92a9585 100644 /* to find an entry in a page-table-directory. */ static inline unsigned long pud_index(unsigned long address) -@@ -584,7 +659,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address) +@@ -631,7 +706,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address) static inline int pgd_bad(pgd_t pgd) { @@ -16689,7 +16365,7 @@ index 1e67223..92a9585 100644 } static inline int pgd_none(pgd_t pgd) -@@ -607,7 +682,12 @@ static inline int pgd_none(pgd_t pgd) +@@ -654,7 +729,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; */ @@ -16703,7 +16379,7 @@ index 1e67223..92a9585 100644 /* * a shortcut which implies the use of the kernel's pgd, instead * of a process's -@@ -618,6 +698,23 @@ static inline int pgd_none(pgd_t pgd) +@@ -665,6 +745,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) @@ -16727,7 +16403,7 @@ index 1e67223..92a9585 100644 #ifndef __ASSEMBLY__ extern int direct_gbpages; -@@ -784,11 +881,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm, +@@ -831,11 +928,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. */ @@ -16904,7 +16580,7 @@ index 2d88344..4679fc3 100644 #define EARLY_DYNAMIC_PAGE_TABLES 64 diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h -index e642300..0ef8f31 100644 +index f4843e0..a2526f8 100644 --- a/arch/x86/include/asm/pgtable_types.h +++ b/arch/x86/include/asm/pgtable_types.h @@ -16,13 +16,12 @@ @@ -16932,7 +16608,7 @@ index e642300..0ef8f31 100644 #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) -@@ -57,8 +55,10 @@ +@@ -84,8 +82,10 @@ #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX) @@ -16944,7 +16620,7 @@ index e642300..0ef8f31 100644 #endif #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE) -@@ -116,6 +116,9 @@ +@@ -143,6 +143,9 @@ #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \ _PAGE_ACCESSED) @@ -16954,7 +16630,7 @@ index e642300..0ef8f31 100644 #define __PAGE_KERNEL_EXEC \ (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL) #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX) -@@ -126,7 +129,7 @@ +@@ -153,7 +156,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) @@ -16963,7 +16639,7 @@ index e642300..0ef8f31 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) -@@ -188,8 +191,8 @@ +@@ -215,8 +218,8 @@ * bits are combined, this will alow user to access the high address mapped * VDSO in the presence of CONFIG_COMPAT_VDSO */ @@ -16974,7 +16650,7 @@ index e642300..0ef8f31 100644 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */ #endif -@@ -227,7 +230,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd) +@@ -254,7 +257,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd) { return native_pgd_val(pgd) & PTE_FLAGS_MASK; } @@ -16992,7 +16668,7 @@ index e642300..0ef8f31 100644 #if PAGETABLE_LEVELS > 3 typedef struct { pudval_t pud; } pud_t; -@@ -241,8 +254,6 @@ static inline pudval_t native_pud_val(pud_t pud) +@@ -268,8 +281,6 @@ static inline pudval_t native_pud_val(pud_t pud) return pud.pud; } #else @@ -17001,7 +16677,7 @@ index e642300..0ef8f31 100644 static inline pudval_t native_pud_val(pud_t pud) { return native_pgd_val(pud.pgd); -@@ -262,8 +273,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd) +@@ -289,8 +300,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd) return pmd.pmd; } #else @@ -17010,7 +16686,7 @@ index e642300..0ef8f31 100644 static inline pmdval_t native_pmd_val(pmd_t pmd) { return native_pgd_val(pmd.pud.pgd); -@@ -303,7 +312,6 @@ typedef struct page *pgtable_t; +@@ -330,7 +339,6 @@ typedef struct page *pgtable_t; extern pteval_t __supported_pte_mask; extern void set_nx(void); @@ -17019,10 +16695,10 @@ index e642300..0ef8f31 100644 #define pgprot_writecombine pgprot_writecombine extern pgprot_t pgprot_writecombine(pgprot_t prot); diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h -index 22224b3..b3a2f90 100644 +index 24cf5ae..4d9fa2d 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h -@@ -198,9 +198,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx, +@@ -199,9 +199,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx, : "memory"); } @@ -17045,7 +16721,7 @@ index 22224b3..b3a2f90 100644 } #ifdef CONFIG_X86_32 -@@ -282,7 +294,7 @@ struct tss_struct { +@@ -283,7 +295,7 @@ struct tss_struct { } ____cacheline_aligned; @@ -17054,7 +16730,7 @@ index 22224b3..b3a2f90 100644 /* * Save the original ist values for checking stack pointers during debugging -@@ -452,6 +464,7 @@ struct thread_struct { +@@ -453,6 +465,7 @@ struct thread_struct { unsigned short ds; unsigned short fsindex; unsigned short gsindex; @@ -17062,7 +16738,7 @@ index 22224b3..b3a2f90 100644 #endif #ifdef CONFIG_X86_32 unsigned long ip; -@@ -552,29 +565,8 @@ static inline void load_sp0(struct tss_struct *tss, +@@ -553,29 +566,8 @@ static inline void load_sp0(struct tss_struct *tss, extern unsigned long mmu_cr4_features; extern u32 *trampoline_cr4_features; @@ -17094,7 +16770,7 @@ index 22224b3..b3a2f90 100644 typedef struct { unsigned long seg; -@@ -823,11 +815,18 @@ static inline void spin_lock_prefetch(const void *x) +@@ -824,11 +816,18 @@ static inline void spin_lock_prefetch(const void *x) */ #define TASK_SIZE PAGE_OFFSET #define TASK_SIZE_MAX TASK_SIZE @@ -17115,7 +16791,7 @@ index 22224b3..b3a2f90 100644 .vm86_info = NULL, \ .sysenter_cs = __KERNEL_CS, \ .io_bitmap_ptr = NULL, \ -@@ -841,7 +840,7 @@ static inline void spin_lock_prefetch(const void *x) +@@ -842,7 +841,7 @@ static inline void spin_lock_prefetch(const void *x) */ #define INIT_TSS { \ .x86_tss = { \ @@ -17124,7 +16800,7 @@ index 22224b3..b3a2f90 100644 .ss0 = __KERNEL_DS, \ .ss1 = __KERNEL_CS, \ .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \ -@@ -852,11 +851,7 @@ static inline void spin_lock_prefetch(const void *x) +@@ -853,11 +852,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)) @@ -17137,7 +16813,7 @@ index 22224b3..b3a2f90 100644 /* * The below -8 is to reserve 8 bytes on top of the ring0 stack. -@@ -871,7 +866,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk); +@@ -872,7 +867,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk); #define task_pt_regs(task) \ ({ \ struct pt_regs *__regs__; \ @@ -17146,7 +16822,7 @@ index 22224b3..b3a2f90 100644 __regs__ - 1; \ }) -@@ -881,13 +876,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk); +@@ -882,13 +877,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk); /* * User space process size. 47bits minus one guard page. */ @@ -17162,7 +16838,7 @@ index 22224b3..b3a2f90 100644 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \ IA32_PAGE_OFFSET : TASK_SIZE_MAX) -@@ -898,11 +893,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk); +@@ -899,11 +894,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk); #define STACK_TOP_MAX TASK_SIZE_MAX #define INIT_THREAD { \ @@ -17176,7 +16852,7 @@ index 22224b3..b3a2f90 100644 } /* -@@ -930,6 +925,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip, +@@ -931,6 +926,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip, */ #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3)) @@ -17187,7 +16863,7 @@ index 22224b3..b3a2f90 100644 #define KSTK_EIP(task) (task_pt_regs(task)->ip) /* Get/set a process' ability to use the timestamp counter instruction */ -@@ -942,7 +941,8 @@ extern int set_tsc_mode(unsigned int val); +@@ -943,7 +942,8 @@ extern int set_tsc_mode(unsigned int val); extern u16 amd_get_nb_id(int cpu); struct aperfmperf { @@ -17197,7 +16873,7 @@ index 22224b3..b3a2f90 100644 }; static inline void get_aperfmperf(struct aperfmperf *am) -@@ -970,7 +970,7 @@ unsigned long calc_aperfmperf_ratio(struct aperfmperf *old, +@@ -971,7 +971,7 @@ unsigned long calc_aperfmperf_ratio(struct aperfmperf *old, return ratio; } @@ -17206,13 +16882,13 @@ index 22224b3..b3a2f90 100644 extern void free_init_pages(char *what, unsigned long begin, unsigned long end); void default_idle(void); -@@ -980,6 +980,6 @@ bool xen_set_default_idle(void); +@@ -981,6 +981,6 @@ bool xen_set_default_idle(void); #define xen_set_default_idle 0 #endif -void stop_this_cpu(void *dummy); +void stop_this_cpu(void *dummy) __noreturn; - + 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 942a086..6c26446 100644 @@ -17643,7 +17319,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 b073aae..39f9bdd 100644 +index 4137890..03fa172 100644 --- a/arch/x86/include/asm/smp.h +++ b/arch/x86/include/asm/smp.h @@ -36,7 +36,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map); @@ -17664,7 +17340,7 @@ index b073aae..39f9bdd 100644 /* Globals due to paravirt */ extern void set_cpu_sibling_map(int cpu); -@@ -191,14 +191,8 @@ extern unsigned disabled_cpus __cpuinitdata; +@@ -191,14 +191,8 @@ extern unsigned disabled_cpus; extern int safe_smp_processor_id(void); #elif defined(CONFIG_X86_64_SMP) @@ -17682,7 +17358,7 @@ index b073aae..39f9bdd 100644 #endif diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h -index 33692ea..350a534 100644 +index e3ddd7d..3611fce 100644 --- a/arch/x86/include/asm/spinlock.h +++ b/arch/x86/include/asm/spinlock.h @@ -172,6 +172,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock) @@ -17845,7 +17521,7 @@ index 4ec45b3..a4f0a8a 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 a1df6e8..e002940 100644 +index 2781119..618b59b 100644 --- a/arch/x86/include/asm/thread_info.h +++ b/arch/x86/include/asm/thread_info.h @@ -10,6 +10,7 @@ @@ -17895,7 +17571,7 @@ index a1df6e8..e002940 100644 #define init_stack (init_thread_union.stack) #else /* !__ASSEMBLY__ */ -@@ -97,6 +91,7 @@ struct thread_info { +@@ -96,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 */ @@ -17903,7 +17579,7 @@ index a1df6e8..e002940 100644 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME) -@@ -121,17 +116,18 @@ struct thread_info { +@@ -119,17 +114,18 @@ struct thread_info { #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT) #define _TIF_ADDR32 (1 << TIF_ADDR32) #define _TIF_X32 (1 << TIF_X32) @@ -17924,7 +17600,7 @@ index a1df6e8..e002940 100644 /* work to do on interrupt/exception return */ #define _TIF_WORK_MASK \ -@@ -142,7 +138,7 @@ struct thread_info { +@@ -140,7 +136,7 @@ struct thread_info { /* work to do on any return to user space */ #define _TIF_ALLWORK_MASK \ ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \ @@ -17933,7 +17609,7 @@ index a1df6e8..e002940 100644 /* Only used for 64 bit */ #define _TIF_DO_NOTIFY_MASK \ -@@ -158,45 +154,40 @@ struct thread_info { +@@ -156,45 +152,40 @@ struct thread_info { #define PREEMPT_ACTIVE 0x10000000 @@ -18004,7 +17680,7 @@ index a1df6e8..e002940 100644 /* * macros/functions for gaining access to the thread information structure * preempt_count needs to be 1 initially, until the scheduler is functional. -@@ -204,27 +195,8 @@ static inline struct thread_info *current_thread_info(void) +@@ -202,27 +193,8 @@ static inline struct thread_info *current_thread_info(void) #ifndef __ASSEMBLY__ DECLARE_PER_CPU(unsigned long, kernel_stack); @@ -18034,7 +17710,7 @@ index a1df6e8..e002940 100644 #endif #endif /* !X86_32 */ -@@ -283,5 +255,12 @@ static inline bool is_ia32_task(void) +@@ -281,5 +253,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); @@ -18048,7 +17724,7 @@ index a1df6e8..e002940 100644 #endif #endif /* _ASM_X86_THREAD_INFO_H */ diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h -index 50a7fc0..45844c0 100644 +index cf51200..63ff068 100644 --- a/arch/x86/include/asm/tlbflush.h +++ b/arch/x86/include/asm/tlbflush.h @@ -17,18 +17,44 @@ @@ -18056,7 +17732,7 @@ index 50a7fc0..45844c0 100644 static inline void __native_flush_tlb(void) { + if (static_cpu_has(X86_FEATURE_INVPCID)) { -+ unsigned long descriptor[2]; ++ u64 descriptor[2]; + + descriptor[0] = PCID_KERNEL; + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_MONGLOBAL) : "memory"); @@ -18081,7 +17757,7 @@ index 50a7fc0..45844c0 100644 { - unsigned long cr4; + if (static_cpu_has(X86_FEATURE_INVPCID)) { -+ unsigned long descriptor[2]; ++ u64 descriptor[2]; - cr4 = native_read_cr4(); - /* clear PGE */ @@ -18108,7 +17784,7 @@ index 50a7fc0..45844c0 100644 { + + if (static_cpu_has(X86_FEATURE_INVPCID)) { -+ unsigned long descriptor[2]; ++ u64 descriptor[2]; + + descriptor[0] = PCID_KERNEL; + descriptor[1] = addr; @@ -18596,7 +18272,7 @@ index 7f760a9..04b1c65 100644 } diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h -index 142810c..1dbe82f 100644 +index 4f7923d..20cb24e 100644 --- a/arch/x86/include/asm/uaccess_64.h +++ b/arch/x86/include/asm/uaccess_64.h @@ -10,6 +10,9 @@ @@ -18904,7 +18580,7 @@ index 142810c..1dbe82f 100644 ret, "q", "", "=r", 8); if (likely(!ret)) __put_user_asm(tmp, (u64 __user *)dst, -@@ -212,41 +277,72 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size) +@@ -212,41 +277,74 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size) return ret; } default: @@ -18956,9 +18632,10 @@ index 142810c..1dbe82f 100644 -static inline int -__copy_from_user_nocache(void *dst, const void __user *src, unsigned size) -+static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, unsigned long size) ++static inline unsigned long ++__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size) { - might_sleep(); + might_fault(); + + if (size > INT_MAX) + return size; @@ -18972,9 +18649,9 @@ index 142810c..1dbe82f 100644 } -static inline int --__copy_from_user_inatomic_nocache(void *dst, const void __user *src, ++static inline unsigned long + __copy_from_user_inatomic_nocache(void *dst, const void __user *src, - unsigned size) -+static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, const void __user *src, + unsigned long size) { + if (size > INT_MAX) @@ -18988,9 +18665,8 @@ index 142810c..1dbe82f 100644 return __copy_user_nocache(dst, src, size, 0); } --unsigned long + unsigned long -copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); -+extern unsigned long +copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3); #endif /* _ASM_X86_UACCESS_64_H */ @@ -19008,7 +18684,7 @@ index 5b238981..77fdd78 100644 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) } diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h -index d8d9922..bf6cecb 100644 +index 828a156..650e625 100644 --- a/arch/x86/include/asm/x86_init.h +++ b/arch/x86/include/asm/x86_init.h @@ -129,7 +129,7 @@ struct x86_init_ops { @@ -19027,9 +18703,9 @@ index d8d9922..bf6cecb 100644 -}; +} __no_const; - /** - * struct x86_platform_ops - platform specific runtime functions -@@ -166,7 +166,7 @@ struct x86_platform_ops { + struct timespec; + +@@ -168,7 +168,7 @@ struct x86_platform_ops { void (*save_sched_clock_state)(void); void (*restore_sched_clock_state)(void); void (*apic_post_init)(void); @@ -19038,7 +18714,7 @@ index d8d9922..bf6cecb 100644 struct pci_dev; struct msi_msg; -@@ -180,7 +180,7 @@ struct x86_msi_ops { +@@ -182,7 +182,7 @@ struct x86_msi_ops { void (*teardown_msi_irqs)(struct pci_dev *dev); void (*restore_msi_irqs)(struct pci_dev *dev, int irq); int (*setup_hpet_msi)(unsigned int irq, unsigned int id); @@ -19047,7 +18723,7 @@ index d8d9922..bf6cecb 100644 struct IO_APIC_route_entry; struct io_apic_irq_attr; -@@ -201,7 +201,7 @@ struct x86_io_apic_ops { +@@ -203,7 +203,7 @@ struct x86_io_apic_ops { unsigned int destination, int vector, struct io_apic_irq_attr *attr); void (*eoi_ioapic_pin)(int apic, int pin, int vector); @@ -19120,10 +18796,10 @@ index bbae024..e1528f9 100644 #define BIOS_ROM_BASE 0xffe00000 diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile -index 7bd3bd3..5dac791 100644 +index 88d99ea..9fc7e17 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile -@@ -22,7 +22,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o +@@ -24,7 +24,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o obj-$(CONFIG_IRQ_WORK) += irq_work.o obj-y += probe_roms.o @@ -19133,10 +18809,10 @@ index 7bd3bd3..5dac791 100644 obj-y += syscall_$(BITS).o obj-$(CONFIG_X86_64) += vsyscall_64.o diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c -index 230c8ea..f915130 100644 +index 2627a81..cd8325e 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c -@@ -1361,7 +1361,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d) +@@ -1368,7 +1368,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 */ @@ -19145,7 +18821,7 @@ index 230c8ea..f915130 100644 /* * Boxes that need ACPI disabled */ -@@ -1436,7 +1436,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = { +@@ -1443,7 +1443,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = { }; /* second table for DMI checks that should run after early-quirks */ @@ -19155,10 +18831,10 @@ index 230c8ea..f915130 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 ec94e11..7fbbec0 100644 +index 3312010..a65ca7b 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c -@@ -88,8 +88,12 @@ int acpi_suspend_lowlevel(void) +@@ -88,8 +88,12 @@ int x86_acpi_suspend_lowlevel(void) #else /* CONFIG_64BIT */ #ifdef CONFIG_SMP stack_start = (unsigned long)temp_stack + sizeof(temp_stack); @@ -19329,10 +19005,10 @@ index c15cf9a..0e63558 100644 } diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c -index 904611b..004dde6 100644 +index eca89c5..d566b78 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c -@@ -189,7 +189,7 @@ int first_system_vector = 0xfe; +@@ -190,7 +190,7 @@ int first_system_vector = 0xfe; /* * Debug level, exported for io_apic.c */ @@ -19341,7 +19017,7 @@ index 904611b..004dde6 100644 int pic_mode; -@@ -1955,7 +1955,7 @@ void smp_error_interrupt(struct pt_regs *regs) +@@ -1985,7 +1985,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs) apic_write(APIC_ESR, 0); v1 = apic_read(APIC_ESR); ack_APIC_irq(); @@ -19399,7 +19075,7 @@ 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 0874799..a7a7892 100644 +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, @@ -19462,7 +19138,7 @@ index 9ed796c..e930fe4 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 d661ee9..791fd33 100644 +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) @@ -19502,7 +19178,7 @@ index 77c95c0..434f8a4 100644 .name = "summit", .probe = probe_summit, diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c -index c88baa4..757aee1 100644 +index 140e29d..d88bc95 100644 --- a/arch/x86/kernel/apic/x2apic_cluster.c +++ b/arch/x86/kernel/apic/x2apic_cluster.c @@ -183,7 +183,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu) @@ -19537,10 +19213,10 @@ index 562a76d..a003c0f 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 794f6eb..67e1db2 100644 +index 1191ac1..2335fa4 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c -@@ -342,7 +342,7 @@ static int uv_probe(void) +@@ -357,7 +357,7 @@ static int uv_probe(void) return apic == &apic_x2apic_uv_x; } @@ -19677,7 +19353,7 @@ index e7c798b..2b2019b 100644 BLANK(); diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile -index b0684e4..22ccfd7 100644 +index 47b56a7..efc2bc6 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg @@ -19692,11 +19368,11 @@ index b0684e4..22ccfd7 100644 obj-y += proc.o capflags.o powerflags.o common.o obj-y += rdrand.o diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c -index 5013a48..0782c53 100644 +index 08a0890..e557865 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c -@@ -744,7 +744,7 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c, - unsigned int size) +@@ -743,7 +743,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) */ - if ((c->x86 == 6)) { @@ -19705,12 +19381,12 @@ index 5013a48..0782c53 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 22018f7..df77e23 100644 +index 25eb274..3a92d93 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c -@@ -88,60 +88,6 @@ static const struct cpu_dev __cpuinitconst default_cpu = { +@@ -88,60 +88,6 @@ static const struct cpu_dev default_cpu = { - static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; + static const struct cpu_dev *this_cpu = &default_cpu; -DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = { -#ifdef CONFIG_X86_64 @@ -19836,7 +19512,7 @@ index 22018f7..df77e23 100644 gdt_descr.size = GDT_SIZE - 1; load_gdt(&gdt_descr); /* Reload the per-cpu base */ -@@ -874,6 +871,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c) +@@ -875,6 +872,10 @@ static void identify_cpu(struct cpuinfo_x86 *c) setup_smep(c); setup_smap(c); @@ -19847,7 +19523,7 @@ index 22018f7..df77e23 100644 /* * The vendor-specific functions might have changed features. * Now we do "generic changes." -@@ -882,6 +883,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c) +@@ -883,6 +884,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); @@ -19858,7 +19534,7 @@ index 22018f7..df77e23 100644 /* If the model name is still unset, do table lookup. */ if (!c->x86_model_id[0]) { const char *p; -@@ -1069,10 +1074,12 @@ static __init int setup_disablecpuid(char *arg) +@@ -1070,10 +1075,12 @@ static __init int setup_disablecpuid(char *arg) } __setup("clearcpuid=", setup_disablecpuid); @@ -19866,14 +19542,15 @@ index 22018f7..df77e23 100644 +EXPORT_PER_CPU_SYMBOL(current_tinfo); + #ifdef CONFIG_X86_64 - struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table }; --struct desc_ptr nmi_idt_descr = { NR_VECTORS * 16 - 1, -- (unsigned long) nmi_idt_table }; -+struct desc_ptr nmi_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) nmi_idt_table }; +-struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table }; +-struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, +- (unsigned long) debug_idt_table }; ++struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table }; ++const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table }; DEFINE_PER_CPU_FIRST(union irq_stack_union, irq_stack_union) __aligned(PAGE_SIZE); -@@ -1086,7 +1093,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned = +@@ -1087,7 +1094,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned = EXPORT_PER_CPU_SYMBOL(current_task); DEFINE_PER_CPU(unsigned long, kernel_stack) = @@ -19882,7 +19559,7 @@ index 22018f7..df77e23 100644 EXPORT_PER_CPU_SYMBOL(kernel_stack); DEFINE_PER_CPU(char *, irq_stack_ptr) = -@@ -1231,7 +1238,7 @@ void __cpuinit cpu_init(void) +@@ -1232,7 +1239,7 @@ void cpu_init(void) load_ucode_ap(); cpu = stack_smp_processor_id(); @@ -19891,16 +19568,7 @@ index 22018f7..df77e23 100644 oist = &per_cpu(orig_ist, cpu); #ifdef CONFIG_NUMA -@@ -1257,7 +1264,7 @@ void __cpuinit cpu_init(void) - switch_to_new_gdt(cpu); - loadsegment(fs, 0); - -- load_idt((const struct desc_ptr *)&idt_descr); -+ load_idt(&idt_descr); - - memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8); - syscall_init(); -@@ -1266,7 +1273,6 @@ void __cpuinit cpu_init(void) +@@ -1267,7 +1274,6 @@ void cpu_init(void) wrmsrl(MSR_KERNEL_GS_BASE, 0); barrier(); @@ -19908,7 +19576,7 @@ index 22018f7..df77e23 100644 enable_x2apic(); /* -@@ -1318,7 +1324,7 @@ void __cpuinit cpu_init(void) +@@ -1319,7 +1325,7 @@ void cpu_init(void) { int cpu = smp_processor_id(); struct task_struct *curr = current; @@ -19918,10 +19586,10 @@ index 22018f7..df77e23 100644 show_ucode_info_early(); diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c -index 7c6f7d5..8cac382 100644 +index 1414c90..1159406 100644 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c -@@ -1017,6 +1017,22 @@ static struct attribute *default_attrs[] = { +@@ -1014,6 +1014,22 @@ static struct attribute *default_attrs[] = { }; #ifdef CONFIG_AMD_NB @@ -19941,10 +19609,10 @@ index 7c6f7d5..8cac382 100644 + NULL +}; + - static struct attribute ** __cpuinit amd_l3_attrs(void) + static struct attribute **amd_l3_attrs(void) { static struct attribute **attrs; -@@ -1027,18 +1043,7 @@ static struct attribute ** __cpuinit amd_l3_attrs(void) +@@ -1024,18 +1040,7 @@ static struct attribute **amd_l3_attrs(void) n = ARRAY_SIZE(default_attrs); @@ -19964,7 +19632,7 @@ index 7c6f7d5..8cac382 100644 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) { attrs[n++] = &cache_disable_0.attr; -@@ -1089,6 +1094,13 @@ static struct kobj_type ktype_cache = { +@@ -1086,6 +1091,13 @@ static struct kobj_type ktype_cache = { .default_attrs = default_attrs, }; @@ -19978,7 +19646,7 @@ index 7c6f7d5..8cac382 100644 static struct kobj_type ktype_percpu_entry = { .sysfs_ops = &sysfs_ops, }; -@@ -1154,20 +1166,26 @@ static int __cpuinit cache_add_dev(struct device *dev) +@@ -1151,20 +1163,26 @@ static int cache_add_dev(struct device *dev) return retval; } @@ -20008,17 +19676,8 @@ index 7c6f7d5..8cac382 100644 per_cpu(ici_cache_kobject, cpu), "index%1lu", i); if (unlikely(retval)) { -@@ -1222,7 +1240,7 @@ static int __cpuinit cacheinfo_cpu_callback(struct notifier_block *nfb, - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata cacheinfo_cpu_notifier = { -+static struct notifier_block cacheinfo_cpu_notifier = { - .notifier_call = cacheinfo_cpu_callback, - }; - diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c -index 9239504..b2471ce 100644 +index 87a65c9..92fcce6 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -45,6 +45,7 @@ @@ -20029,7 +19688,7 @@ index 9239504..b2471ce 100644 #include "mce-internal.h" -@@ -246,7 +247,7 @@ static void print_mce(struct mce *m) +@@ -249,7 +250,7 @@ static void print_mce(struct mce *m) !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "", m->cs, m->ip); @@ -20038,7 +19697,7 @@ index 9239504..b2471ce 100644 print_symbol("{%s}", m->ip); pr_cont("\n"); } -@@ -279,10 +280,10 @@ static void print_mce(struct mce *m) +@@ -282,10 +283,10 @@ static void print_mce(struct mce *m) #define PANIC_TIMEOUT 5 /* 5 seconds */ @@ -20051,7 +19710,7 @@ index 9239504..b2471ce 100644 /* Panic in progress. Enable interrupts and wait for final IPI */ static void wait_for_panic(void) -@@ -306,7 +307,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp) +@@ -309,7 +310,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp) /* * Make sure only one CPU runs in machine check panic */ @@ -20060,7 +19719,7 @@ index 9239504..b2471ce 100644 wait_for_panic(); barrier(); -@@ -314,7 +315,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp) +@@ -317,7 +318,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp) console_verbose(); } else { /* Don't log too much for fake panic */ @@ -20069,7 +19728,7 @@ index 9239504..b2471ce 100644 return; } /* First print corrected ones that are still unlogged */ -@@ -353,7 +354,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp) +@@ -356,7 +357,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; @@ -20078,7 +19737,7 @@ index 9239504..b2471ce 100644 } else pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg); } -@@ -683,7 +684,7 @@ static int mce_timed_out(u64 *t) +@@ -686,7 +687,7 @@ static int mce_timed_out(u64 *t) * might have been modified by someone else. */ rmb(); @@ -20087,7 +19746,7 @@ index 9239504..b2471ce 100644 wait_for_panic(); if (!mca_cfg.monarch_timeout) goto out; -@@ -1654,7 +1655,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code) +@@ -1657,7 +1658,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code) } /* Call the installed machine check handler for this CPU setup. */ @@ -20096,7 +19755,7 @@ index 9239504..b2471ce 100644 unexpected_machine_check; /* -@@ -1677,7 +1678,9 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c) +@@ -1680,7 +1681,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c) return; } @@ -20106,7 +19765,7 @@ index 9239504..b2471ce 100644 __mcheck_cpu_init_generic(); __mcheck_cpu_init_vendor(c); -@@ -1691,7 +1694,7 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c) +@@ -1694,7 +1697,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c) */ static DEFINE_SPINLOCK(mce_chrdev_state_lock); @@ -20115,7 +19774,7 @@ index 9239504..b2471ce 100644 static int mce_chrdev_open_exclu; /* already open exclusive? */ static int mce_chrdev_open(struct inode *inode, struct file *file) -@@ -1699,7 +1702,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file) +@@ -1702,7 +1705,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file) spin_lock(&mce_chrdev_state_lock); if (mce_chrdev_open_exclu || @@ -20124,7 +19783,7 @@ index 9239504..b2471ce 100644 spin_unlock(&mce_chrdev_state_lock); return -EBUSY; -@@ -1707,7 +1710,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file) +@@ -1710,7 +1713,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file) if (file->f_flags & O_EXCL) mce_chrdev_open_exclu = 1; @@ -20133,7 +19792,7 @@ index 9239504..b2471ce 100644 spin_unlock(&mce_chrdev_state_lock); -@@ -1718,7 +1721,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file) +@@ -1721,7 +1724,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file) { spin_lock(&mce_chrdev_state_lock); @@ -20142,16 +19801,7 @@ index 9239504..b2471ce 100644 mce_chrdev_open_exclu = 0; spin_unlock(&mce_chrdev_state_lock); -@@ -2364,7 +2367,7 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) - return NOTIFY_OK; - } - --static struct notifier_block mce_cpu_notifier __cpuinitdata = { -+static struct notifier_block mce_cpu_notifier = { - .notifier_call = mce_cpu_callback, - }; - -@@ -2374,7 +2377,7 @@ static __init void mce_init_banks(void) +@@ -2376,7 +2379,7 @@ static __init void mce_init_banks(void) for (i = 0; i < mca_cfg.banks; i++) { struct mce_bank *b = &mce_banks[i]; @@ -20160,7 +19810,7 @@ index 9239504..b2471ce 100644 sysfs_attr_init(&a->attr); a->attr.name = b->attrname; -@@ -2442,7 +2445,7 @@ struct dentry *mce_get_debugfs_dir(void) +@@ -2444,7 +2447,7 @@ struct dentry *mce_get_debugfs_dir(void) static void mce_reset(void) { cpu_missing = 0; @@ -20191,19 +19841,6 @@ index 1c044b1..37a2a43 100644 /* Make sure the vector pointer is visible before we enable MCEs: */ wmb(); -diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c -index 47a1870..8c019a7 100644 ---- a/arch/x86/kernel/cpu/mcheck/therm_throt.c -+++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c -@@ -288,7 +288,7 @@ thermal_throttle_cpu_callback(struct notifier_block *nfb, - return notifier_from_errno(err); - } - --static struct notifier_block thermal_throttle_cpu_notifier __cpuinitdata = -+static struct notifier_block thermal_throttle_cpu_notifier = - { - .notifier_call = thermal_throttle_cpu_callback, - }; diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c index e9a701a..35317d6 100644 --- a/arch/x86/kernel/cpu/mcheck/winchip.c @@ -20227,10 +19864,10 @@ index e9a701a..35317d6 100644 wmb(); diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c -index ca22b73..9987afe 100644 +index f961de9..8a9d332 100644 --- a/arch/x86/kernel/cpu/mtrr/main.c +++ b/arch/x86/kernel/cpu/mtrr/main.c -@@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex); +@@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex); u64 size_or_mask, size_and_mask; static bool mtrr_aps_delayed_init; @@ -20253,10 +19890,10 @@ 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 1025f3c..824f677 100644 +index a7c7305..b9705ab 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c -@@ -1311,7 +1311,7 @@ static void __init pmu_check_apic(void) +@@ -1348,7 +1348,7 @@ static void __init pmu_check_apic(void) pr_info("no hardware sampling interrupt available.\n"); } @@ -20265,7 +19902,7 @@ index 1025f3c..824f677 100644 .name = "format", .attrs = NULL, }; -@@ -1410,7 +1410,7 @@ static struct attribute *events_attr[] = { +@@ -1447,7 +1447,7 @@ static struct attribute *events_attr[] = { NULL, }; @@ -20274,7 +19911,7 @@ index 1025f3c..824f677 100644 .name = "events", .attrs = events_attr, }; -@@ -1920,7 +1920,7 @@ static unsigned long get_segment_base(unsigned int segment) +@@ -1957,7 +1957,7 @@ static unsigned long get_segment_base(unsigned int segment) if (idx > GDT_ENTRIES) return 0; @@ -20283,7 +19920,7 @@ index 1025f3c..824f677 100644 } return get_desc_base(desc + idx); -@@ -2010,7 +2010,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs) +@@ -2047,7 +2047,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs) break; perf_callchain_store(entry, frame.return_address); @@ -20292,11 +19929,24 @@ index 1025f3c..824f677 100644 } } +diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c +index 639d128..e92d7e5 100644 +--- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c ++++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c +@@ -405,7 +405,7 @@ static void perf_iommu_del(struct perf_event *event, int flags) + static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu) + { + struct attribute **attrs; +- struct attribute_group *attr_group; ++ attribute_group_no_const *attr_group; + int i = 0, j; + + 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 a9e2207..d70c83a 100644 +index a45d8d4..8abd32c 100644 --- a/arch/x86/kernel/cpu/perf_event_intel.c +++ b/arch/x86/kernel/cpu/perf_event_intel.c -@@ -2022,10 +2022,10 @@ __init int intel_pmu_init(void) +@@ -2099,10 +2099,10 @@ __init int intel_pmu_init(void) * v2 and above have a perf capabilities MSR */ if (version > 1) { @@ -20311,10 +19961,10 @@ index a9e2207..d70c83a 100644 intel_ds_init(); diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c -index 8aac56b..588fb13 100644 +index 1fb6c72..f5fa2a3 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c -@@ -3093,7 +3093,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types) +@@ -3095,7 +3095,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; @@ -20323,17 +19973,8 @@ index 8aac56b..588fb13 100644 struct attribute **attrs; int i, j; -@@ -3518,7 +3518,7 @@ static int - return NOTIFY_OK; - } - --static struct notifier_block uncore_cpu_nb __cpuinitdata = { -+static struct notifier_block uncore_cpu_nb = { - .notifier_call = uncore_cpu_notifier, - /* - * to migrate uncore events, our notifier should be executed diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h -index f952891..4722ad4 100644 +index 47b3d00c..2cf1751 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h @@ -488,7 +488,7 @@ struct intel_uncore_box { @@ -20346,10 +19987,10 @@ index f952891..4722ad4 100644 #define INTEL_UNCORE_EVENT_DESC(_name, _config) \ { \ diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c -index 1e4dbcf..b9a34c2 100644 +index 7d9481c..99c7e4b 100644 --- a/arch/x86/kernel/cpuid.c +++ b/arch/x86/kernel/cpuid.c -@@ -171,7 +171,7 @@ static int __cpuinit cpuid_class_cpu_callback(struct notifier_block *nfb, +@@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb, return notifier_from_errno(err); } @@ -20387,11 +20028,11 @@ index afa64ad..dce67dd 100644 iounmap(vaddr); return -EFAULT; } -diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c -index 155a13f..1672b9b 100644 ---- a/arch/x86/kernel/doublefault_32.c -+++ b/arch/x86/kernel/doublefault_32.c -@@ -11,7 +11,7 @@ +diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c +index 5d3fe8d..02e1429 100644 +--- a/arch/x86/kernel/doublefault.c ++++ b/arch/x86/kernel/doublefault.c +@@ -13,7 +13,7 @@ #define DOUBLEFAULT_STACKSIZE (1024) static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE]; @@ -20400,7 +20041,7 @@ index 155a13f..1672b9b 100644 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM) -@@ -21,7 +21,7 @@ static void doublefault_fn(void) +@@ -23,7 +23,7 @@ static void doublefault_fn(void) unsigned long gdt, tss; native_store_gdt(&gdt_desc); @@ -20409,7 +20050,7 @@ index 155a13f..1672b9b 100644 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size); -@@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = { +@@ -60,10 +60,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = { /* 0x2 bit is always set */ .flags = X86_EFLAGS_SF | 0x2, .sp = STACK_START, @@ -20810,7 +20451,7 @@ index d15f575..d692043 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 8f3e2de..6b71e39 100644 +index 2cfbc3a..b756682 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S @@ -177,13 +177,153 @@ @@ -21311,7 +20952,7 @@ index 8f3e2de..6b71e39 100644 .previous END(interrupt) -@@ -813,7 +1052,7 @@ ENTRY(coprocessor_error) +@@ -823,7 +1062,7 @@ ENTRY(coprocessor_error) pushl_cfi $do_coprocessor_error jmp error_code CFI_ENDPROC @@ -21320,7 +20961,7 @@ index 8f3e2de..6b71e39 100644 ENTRY(simd_coprocessor_error) RING0_INT_FRAME -@@ -826,7 +1065,7 @@ ENTRY(simd_coprocessor_error) +@@ -836,7 +1075,7 @@ ENTRY(simd_coprocessor_error) .section .altinstructions,"a" altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f .previous @@ -21329,7 +20970,7 @@ index 8f3e2de..6b71e39 100644 663: pushl $do_simd_coprocessor_error 664: .previous -@@ -835,7 +1074,7 @@ ENTRY(simd_coprocessor_error) +@@ -845,7 +1084,7 @@ ENTRY(simd_coprocessor_error) #endif jmp error_code CFI_ENDPROC @@ -21338,7 +20979,7 @@ index 8f3e2de..6b71e39 100644 ENTRY(device_not_available) RING0_INT_FRAME -@@ -844,18 +1083,18 @@ ENTRY(device_not_available) +@@ -854,18 +1093,18 @@ ENTRY(device_not_available) pushl_cfi $do_device_not_available jmp error_code CFI_ENDPROC @@ -21360,7 +21001,7 @@ index 8f3e2de..6b71e39 100644 #endif ENTRY(overflow) -@@ -865,7 +1104,7 @@ ENTRY(overflow) +@@ -875,7 +1114,7 @@ ENTRY(overflow) pushl_cfi $do_overflow jmp error_code CFI_ENDPROC @@ -21369,7 +21010,7 @@ index 8f3e2de..6b71e39 100644 ENTRY(bounds) RING0_INT_FRAME -@@ -874,7 +1113,7 @@ ENTRY(bounds) +@@ -884,7 +1123,7 @@ ENTRY(bounds) pushl_cfi $do_bounds jmp error_code CFI_ENDPROC @@ -21378,7 +21019,7 @@ index 8f3e2de..6b71e39 100644 ENTRY(invalid_op) RING0_INT_FRAME -@@ -883,7 +1122,7 @@ ENTRY(invalid_op) +@@ -893,7 +1132,7 @@ ENTRY(invalid_op) pushl_cfi $do_invalid_op jmp error_code CFI_ENDPROC @@ -21387,7 +21028,7 @@ index 8f3e2de..6b71e39 100644 ENTRY(coprocessor_segment_overrun) RING0_INT_FRAME -@@ -892,7 +1131,7 @@ ENTRY(coprocessor_segment_overrun) +@@ -902,7 +1141,7 @@ ENTRY(coprocessor_segment_overrun) pushl_cfi $do_coprocessor_segment_overrun jmp error_code CFI_ENDPROC @@ -21396,7 +21037,7 @@ index 8f3e2de..6b71e39 100644 ENTRY(invalid_TSS) RING0_EC_FRAME -@@ -900,7 +1139,7 @@ ENTRY(invalid_TSS) +@@ -910,7 +1149,7 @@ ENTRY(invalid_TSS) pushl_cfi $do_invalid_TSS jmp error_code CFI_ENDPROC @@ -21405,7 +21046,7 @@ index 8f3e2de..6b71e39 100644 ENTRY(segment_not_present) RING0_EC_FRAME -@@ -908,7 +1147,7 @@ ENTRY(segment_not_present) +@@ -918,7 +1157,7 @@ ENTRY(segment_not_present) pushl_cfi $do_segment_not_present jmp error_code CFI_ENDPROC @@ -21414,7 +21055,7 @@ index 8f3e2de..6b71e39 100644 ENTRY(stack_segment) RING0_EC_FRAME -@@ -916,7 +1155,7 @@ ENTRY(stack_segment) +@@ -926,7 +1165,7 @@ ENTRY(stack_segment) pushl_cfi $do_stack_segment jmp error_code CFI_ENDPROC @@ -21423,7 +21064,7 @@ index 8f3e2de..6b71e39 100644 ENTRY(alignment_check) RING0_EC_FRAME -@@ -924,7 +1163,7 @@ ENTRY(alignment_check) +@@ -934,7 +1173,7 @@ ENTRY(alignment_check) pushl_cfi $do_alignment_check jmp error_code CFI_ENDPROC @@ -21432,7 +21073,7 @@ index 8f3e2de..6b71e39 100644 ENTRY(divide_error) RING0_INT_FRAME -@@ -933,7 +1172,7 @@ ENTRY(divide_error) +@@ -943,7 +1182,7 @@ ENTRY(divide_error) pushl_cfi $do_divide_error jmp error_code CFI_ENDPROC @@ -21441,7 +21082,7 @@ index 8f3e2de..6b71e39 100644 #ifdef CONFIG_X86_MCE ENTRY(machine_check) -@@ -943,7 +1182,7 @@ ENTRY(machine_check) +@@ -953,7 +1192,7 @@ ENTRY(machine_check) pushl_cfi machine_check_vector jmp error_code CFI_ENDPROC @@ -21450,7 +21091,7 @@ index 8f3e2de..6b71e39 100644 #endif ENTRY(spurious_interrupt_bug) -@@ -953,7 +1192,7 @@ ENTRY(spurious_interrupt_bug) +@@ -963,7 +1202,7 @@ ENTRY(spurious_interrupt_bug) pushl_cfi $do_spurious_interrupt_bug jmp error_code CFI_ENDPROC @@ -21459,7 +21100,7 @@ index 8f3e2de..6b71e39 100644 /* * End of kprobes section */ -@@ -1063,7 +1302,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR, +@@ -1073,7 +1312,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR, ENTRY(mcount) ret @@ -21468,7 +21109,7 @@ index 8f3e2de..6b71e39 100644 ENTRY(ftrace_caller) cmpl $0, function_trace_stop -@@ -1096,7 +1335,7 @@ ftrace_graph_call: +@@ -1106,7 +1345,7 @@ ftrace_graph_call: .globl ftrace_stub ftrace_stub: ret @@ -21477,7 +21118,7 @@ index 8f3e2de..6b71e39 100644 ENTRY(ftrace_regs_caller) pushf /* push flags before compare (in cs location) */ -@@ -1197,7 +1436,7 @@ trace: +@@ -1207,7 +1446,7 @@ trace: popl %ecx popl %eax jmp ftrace_stub @@ -21486,7 +21127,7 @@ index 8f3e2de..6b71e39 100644 #endif /* CONFIG_DYNAMIC_FTRACE */ #endif /* CONFIG_FUNCTION_TRACER */ -@@ -1215,7 +1454,7 @@ ENTRY(ftrace_graph_caller) +@@ -1225,7 +1464,7 @@ ENTRY(ftrace_graph_caller) popl %ecx popl %eax ret @@ -21495,7 +21136,7 @@ index 8f3e2de..6b71e39 100644 .globl return_to_handler return_to_handler: -@@ -1271,15 +1510,18 @@ error_code: +@@ -1281,15 +1520,18 @@ error_code: movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart REG_TO_PTGS %ecx SET_KERNEL_GS %ecx @@ -21516,7 +21157,7 @@ index 8f3e2de..6b71e39 100644 /* * Debug traps and NMI can happen at the one SYSENTER instruction -@@ -1322,7 +1564,7 @@ debug_stack_correct: +@@ -1332,7 +1574,7 @@ debug_stack_correct: call do_debug jmp ret_from_exception CFI_ENDPROC @@ -21525,7 +21166,7 @@ index 8f3e2de..6b71e39 100644 /* * NMI is doubly nasty. It can happen _while_ we're handling -@@ -1360,6 +1602,9 @@ nmi_stack_correct: +@@ -1370,6 +1612,9 @@ nmi_stack_correct: xorl %edx,%edx # zero error code movl %esp,%eax # pt_regs pointer call do_nmi @@ -21535,7 +21176,7 @@ index 8f3e2de..6b71e39 100644 jmp restore_all_notrace CFI_ENDPROC -@@ -1396,12 +1641,15 @@ nmi_espfix_stack: +@@ -1406,12 +1651,15 @@ nmi_espfix_stack: FIXUP_ESPFIX_STACK # %eax == %esp xorl %edx,%edx # zero error code call do_nmi @@ -21552,7 +21193,7 @@ index 8f3e2de..6b71e39 100644 ENTRY(int3) RING0_INT_FRAME -@@ -1414,14 +1662,14 @@ ENTRY(int3) +@@ -1424,14 +1672,14 @@ ENTRY(int3) call do_int3 jmp ret_from_exception CFI_ENDPROC @@ -21569,7 +21210,7 @@ index 8f3e2de..6b71e39 100644 #ifdef CONFIG_KVM_GUEST ENTRY(async_page_fault) -@@ -1430,7 +1678,7 @@ ENTRY(async_page_fault) +@@ -1440,7 +1688,7 @@ ENTRY(async_page_fault) pushl_cfi $do_async_page_fault jmp error_code CFI_ENDPROC @@ -21579,7 +21220,7 @@ index 8f3e2de..6b71e39 100644 /* diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S -index 7272089..0b74104 100644 +index 1b69951..8430a6d 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -59,6 +59,8 @@ @@ -22435,8 +22076,8 @@ index 7272089..0b74104 100644 +ENDPROC(\sym) .endm - #ifdef CONFIG_SMP -@@ -1208,12 +1680,22 @@ ENTRY(\sym) + #ifdef CONFIG_TRACING +@@ -1230,12 +1702,22 @@ ENTRY(\sym) CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call error_entry DEFAULT_FRAME 0 @@ -22460,7 +22101,7 @@ index 7272089..0b74104 100644 .endm .macro paranoidzeroentry sym do_sym -@@ -1226,15 +1708,25 @@ ENTRY(\sym) +@@ -1248,15 +1730,25 @@ ENTRY(\sym) CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call save_paranoid TRACE_IRQS_OFF @@ -22488,7 +22129,7 @@ index 7272089..0b74104 100644 .macro paranoidzeroentry_ist sym do_sym ist ENTRY(\sym) INTR_FRAME -@@ -1245,14 +1737,30 @@ ENTRY(\sym) +@@ -1267,14 +1759,30 @@ ENTRY(\sym) CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call save_paranoid TRACE_IRQS_OFF_DEBUG @@ -22520,7 +22161,7 @@ index 7272089..0b74104 100644 .endm .macro errorentry sym do_sym -@@ -1264,13 +1772,23 @@ ENTRY(\sym) +@@ -1286,13 +1794,23 @@ ENTRY(\sym) CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call error_entry DEFAULT_FRAME 0 @@ -22545,7 +22186,7 @@ index 7272089..0b74104 100644 .endm /* error code is on the stack already */ -@@ -1284,13 +1802,23 @@ ENTRY(\sym) +@@ -1306,13 +1824,23 @@ ENTRY(\sym) call save_paranoid DEFAULT_FRAME 0 TRACE_IRQS_OFF @@ -22570,7 +22211,7 @@ index 7272089..0b74104 100644 .endm zeroentry divide_error do_divide_error -@@ -1320,9 +1848,10 @@ gs_change: +@@ -1342,9 +1870,10 @@ gs_change: 2: mfence /* workaround */ SWAPGS popfq_cfi @@ -22582,7 +22223,7 @@ index 7272089..0b74104 100644 _ASM_EXTABLE(gs_change,bad_gs) .section .fixup,"ax" -@@ -1350,9 +1879,10 @@ ENTRY(call_softirq) +@@ -1372,9 +1901,10 @@ ENTRY(call_softirq) CFI_DEF_CFA_REGISTER rsp CFI_ADJUST_CFA_OFFSET -8 decl PER_CPU_VAR(irq_count) @@ -22594,7 +22235,7 @@ index 7272089..0b74104 100644 #ifdef CONFIG_XEN zeroentry xen_hypervisor_callback xen_do_hypervisor_callback -@@ -1390,7 +1920,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs) +@@ -1412,7 +1942,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs) decl PER_CPU_VAR(irq_count) jmp error_exit CFI_ENDPROC @@ -22603,16 +22244,16 @@ index 7272089..0b74104 100644 /* * Hypervisor uses this for application faults while it executes. -@@ -1449,7 +1979,7 @@ ENTRY(xen_failsafe_callback) +@@ -1471,7 +2001,7 @@ ENTRY(xen_failsafe_callback) SAVE_ALL jmp error_exit CFI_ENDPROC -END(xen_failsafe_callback) +ENDPROC(xen_failsafe_callback) - apicinterrupt HYPERVISOR_CALLBACK_VECTOR \ + apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \ xen_hvm_callback_vector xen_evtchn_do_upcall -@@ -1501,18 +2031,33 @@ ENTRY(paranoid_exit) +@@ -1523,18 +2053,33 @@ ENTRY(paranoid_exit) DEFAULT_FRAME DISABLE_INTERRUPTS(CLBR_NONE) TRACE_IRQS_OFF_DEBUG @@ -22648,7 +22289,7 @@ index 7272089..0b74104 100644 jmp irq_return paranoid_userspace: GET_THREAD_INFO(%rcx) -@@ -1541,7 +2086,7 @@ paranoid_schedule: +@@ -1563,7 +2108,7 @@ paranoid_schedule: TRACE_IRQS_OFF jmp paranoid_userspace CFI_ENDPROC @@ -22657,7 +22298,7 @@ index 7272089..0b74104 100644 /* * Exception entry point. This expects an error code/orig_rax on the stack. -@@ -1568,12 +2113,13 @@ ENTRY(error_entry) +@@ -1590,12 +2135,13 @@ ENTRY(error_entry) movq_cfi r14, R14+8 movq_cfi r15, R15+8 xorl %ebx,%ebx @@ -22672,7 +22313,7 @@ index 7272089..0b74104 100644 ret /* -@@ -1600,7 +2146,7 @@ bstep_iret: +@@ -1622,7 +2168,7 @@ bstep_iret: movq %rcx,RIP+8(%rsp) jmp error_swapgs CFI_ENDPROC @@ -22681,7 +22322,7 @@ index 7272089..0b74104 100644 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */ -@@ -1611,7 +2157,7 @@ ENTRY(error_exit) +@@ -1633,7 +2179,7 @@ ENTRY(error_exit) DISABLE_INTERRUPTS(CLBR_NONE) TRACE_IRQS_OFF GET_THREAD_INFO(%rcx) @@ -22690,7 +22331,7 @@ index 7272089..0b74104 100644 jne retint_kernel LOCKDEP_SYS_EXIT_IRQ movl TI_flags(%rcx),%edx -@@ -1620,7 +2166,7 @@ ENTRY(error_exit) +@@ -1642,7 +2188,7 @@ ENTRY(error_exit) jnz retint_careful jmp retint_swapgs CFI_ENDPROC @@ -22699,7 +22340,7 @@ index 7272089..0b74104 100644 /* * Test if a given stack is an NMI stack or not. -@@ -1678,9 +2224,11 @@ ENTRY(nmi) +@@ -1700,9 +2246,11 @@ ENTRY(nmi) * If %cs was not the kernel segment, then the NMI triggered in user * space, which means it is definitely not nested. */ @@ -22712,7 +22353,7 @@ index 7272089..0b74104 100644 /* * Check the special variable on the stack to see if NMIs are * executing. -@@ -1714,8 +2262,7 @@ nested_nmi: +@@ -1736,8 +2284,7 @@ nested_nmi: 1: /* Set up the interrupted NMIs stack to jump to repeat_nmi */ @@ -22722,7 +22363,7 @@ index 7272089..0b74104 100644 CFI_ADJUST_CFA_OFFSET 1*8 leaq -10*8(%rsp), %rdx pushq_cfi $__KERNEL_DS -@@ -1733,6 +2280,7 @@ nested_nmi_out: +@@ -1755,6 +2302,7 @@ nested_nmi_out: CFI_RESTORE rdx /* No need to check faults here */ @@ -22730,7 +22371,7 @@ index 7272089..0b74104 100644 INTERRUPT_RETURN CFI_RESTORE_STATE -@@ -1849,6 +2397,8 @@ end_repeat_nmi: +@@ -1871,6 +2419,8 @@ end_repeat_nmi: */ movq %cr2, %r12 @@ -22739,7 +22380,7 @@ index 7272089..0b74104 100644 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */ movq %rsp,%rdi movq $-1,%rsi -@@ -1861,26 +2411,31 @@ end_repeat_nmi: +@@ -1883,26 +2433,31 @@ end_repeat_nmi: movq %r12, %cr2 1: @@ -22895,7 +22536,7 @@ index 55b6761..a6456fc 100644 init_level4_pgt[511] = early_level4_pgt[511]; diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S -index 73afd11..0ef46f2 100644 +index 5dd87a8..d68b3f4 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S @@ -26,6 +26,12 @@ @@ -23065,7 +22706,7 @@ index 73afd11..0ef46f2 100644 num_subarch_entries = (. - subarch_entries) / 4 .previous #else -@@ -355,6 +427,7 @@ default_entry: +@@ -354,6 +426,7 @@ default_entry: movl pa(mmu_cr4_features),%eax movl %eax,%cr4 @@ -23073,7 +22714,7 @@ index 73afd11..0ef46f2 100644 testb $X86_CR4_PAE, %al # check if PAE is enabled jz enable_paging -@@ -383,6 +456,9 @@ default_entry: +@@ -382,6 +455,9 @@ default_entry: /* Make changes effective */ wrmsr @@ -23083,7 +22724,7 @@ index 73afd11..0ef46f2 100644 enable_paging: /* -@@ -451,14 +527,20 @@ is486: +@@ -449,14 +525,20 @@ is486: 1: movl $(__KERNEL_DS),%eax # reload all the segment registers movl %eax,%ss # after changing gdt. @@ -23105,7 +22746,7 @@ index 73afd11..0ef46f2 100644 movl %eax,%gs xorl %eax,%eax # Clear LDT -@@ -534,8 +616,11 @@ setup_once: +@@ -512,8 +594,11 @@ setup_once: * relocation. Manually set base address in stack canary * segment descriptor. */ @@ -23118,7 +22759,7 @@ index 73afd11..0ef46f2 100644 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax) shrl $16, %ecx movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax) -@@ -566,7 +651,7 @@ ENDPROC(early_idt_handlers) +@@ -544,7 +629,7 @@ ENDPROC(early_idt_handlers) /* This is global to keep gas from relaxing the jumps */ ENTRY(early_idt_handler) cld @@ -23127,7 +22768,7 @@ index 73afd11..0ef46f2 100644 je hlt_loop incl %ss:early_recursion_flag -@@ -604,8 +689,8 @@ ENTRY(early_idt_handler) +@@ -582,8 +667,8 @@ ENTRY(early_idt_handler) pushl (20+6*4)(%esp) /* trapno */ pushl $fault_msg call printk @@ -23137,7 +22778,7 @@ index 73afd11..0ef46f2 100644 hlt_loop: hlt jmp hlt_loop -@@ -624,8 +709,11 @@ ENDPROC(early_idt_handler) +@@ -602,8 +687,11 @@ ENDPROC(early_idt_handler) /* This is the default interrupt "handler" :-) */ ALIGN ignore_int: @@ -23150,7 +22791,7 @@ index 73afd11..0ef46f2 100644 pushl %eax pushl %ecx pushl %edx -@@ -634,9 +722,6 @@ ignore_int: +@@ -612,9 +700,6 @@ ignore_int: movl $(__KERNEL_DS),%eax movl %eax,%ds movl %eax,%es @@ -23160,7 +22801,7 @@ index 73afd11..0ef46f2 100644 pushl 16(%esp) pushl 24(%esp) pushl 32(%esp) -@@ -670,29 +755,43 @@ ENTRY(setup_once_ref) +@@ -648,29 +733,34 @@ ENTRY(setup_once_ref) /* * BSS section */ @@ -23188,15 +22829,6 @@ index 73afd11..0ef46f2 100644 +#else .fill 1024,4,0 +#endif -+ -+/* -+ * The IDT has to be page-aligned to simplify the Pentium -+ * F0 0F bug workaround.. We have a special link segment -+ * for this. -+ */ -+.section .idt,"a",@progbits -+ENTRY(idt_table) -+ .fill 256,8,0 /* * This starts the data section. @@ -23209,7 +22841,7 @@ index 73afd11..0ef46f2 100644 ENTRY(initial_page_table) .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */ # if KPMDS == 3 -@@ -711,12 +810,20 @@ ENTRY(initial_page_table) +@@ -689,12 +779,20 @@ ENTRY(initial_page_table) # error "Kernel PMDs should be 1, 2 or 3" # endif .align PAGE_SIZE /* needs to be page-sized too */ @@ -23231,7 +22863,7 @@ index 73afd11..0ef46f2 100644 __INITRODATA int_msg: -@@ -744,7 +851,7 @@ fault_msg: +@@ -722,7 +820,7 @@ fault_msg: * segment size, and 32-bit linear address value: */ @@ -23240,7 +22872,7 @@ index 73afd11..0ef46f2 100644 .globl boot_gdt_descr .globl idt_descr -@@ -753,7 +860,7 @@ fault_msg: +@@ -731,7 +829,7 @@ fault_msg: .word 0 # 32 bit align gdt_desc.address boot_gdt_descr: .word __BOOT_DS+7 @@ -23249,7 +22881,7 @@ index 73afd11..0ef46f2 100644 .word 0 # 32-bit align idt_desc.address idt_descr: -@@ -764,7 +871,7 @@ idt_descr: +@@ -742,7 +840,7 @@ idt_descr: .word 0 # 32 bit align gdt_desc.address ENTRY(early_gdt_descr) .word GDT_ENTRIES*8-1 @@ -23258,7 +22890,7 @@ index 73afd11..0ef46f2 100644 /* * The boot_gdt must mirror the equivalent in setup.S and is -@@ -773,5 +880,65 @@ ENTRY(early_gdt_descr) +@@ -751,5 +849,65 @@ ENTRY(early_gdt_descr) .align L1_CACHE_BYTES ENTRY(boot_gdt) .fill GDT_ENTRY_BOOT_CS,8,0 @@ -23327,7 +22959,7 @@ index 73afd11..0ef46f2 100644 + .fill PAGE_SIZE_asm - GDT_SIZE,1,0 + .endr diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S -index a836860..1b5c665 100644 +index e1aabdb..73dcad8 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -20,6 +20,8 @@ @@ -23507,7 +23139,7 @@ index a836860..1b5c665 100644 NEXT_PAGE(level2_kernel_pgt) /* * 512 MB kernel mapping. We spend a full page on this pagetable -@@ -488,39 +544,70 @@ NEXT_PAGE(level2_kernel_pgt) +@@ -488,30 +544,62 @@ NEXT_PAGE(level2_kernel_pgt) KERNEL_IMAGE_SIZE/PMD_SIZE) NEXT_PAGE(level2_fixmap_pgt) @@ -23574,25 +23206,11 @@ index a836860..1b5c665 100644 #include "../../x86/xen/xen-head.S" - -- .section .bss, "aw", @nobits +- __PAGE_ALIGNED_BSS + + .section .rodata,"a",@progbits -+NEXT_PAGE(empty_zero_page) -+ .skip PAGE_SIZE -+ - .align PAGE_SIZE - ENTRY(idt_table) -- .skip IDT_ENTRIES * 16 -+ .fill 512,8,0 - - .align L1_CACHE_BYTES - ENTRY(nmi_idt_table) -- .skip IDT_ENTRIES * 16 -- -- __PAGE_ALIGNED_BSS --NEXT_PAGE(empty_zero_page) -- .skip PAGE_SIZE -+ .fill 512,8,0 + NEXT_PAGE(empty_zero_page) + .skip PAGE_SIZE diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c index 0fa6912..b37438b 100644 --- a/arch/x86/kernel/i386_ksyms_32.c @@ -23623,7 +23241,7 @@ index 0fa6912..b37438b 100644 +EXPORT_SYMBOL(cpu_pgd); +#endif diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c -index f7ea30d..6318acc 100644 +index 5d576ab..1403a03 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) @@ -23737,19 +23355,19 @@ index 4ddaf66..6292f4e 100644 return -EPERM; } diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c -index ac0631d..ff7cb62 100644 +index 3a8185c..3c042ee 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c -@@ -18,7 +18,7 @@ - #include <asm/mce.h> - #include <asm/hw_irq.h> +@@ -21,7 +21,7 @@ + #define CREATE_TRACE_POINTS + #include <asm/trace/irq_vectors.h> -atomic_t irq_err_count; +atomic_unchecked_t irq_err_count; /* Function pointer for generic interrupt vector handling */ void (*x86_platform_ipi_callback)(void) = NULL; -@@ -122,9 +122,9 @@ int arch_show_interrupts(struct seq_file *p, int prec) +@@ -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"); #endif @@ -23761,7 +23379,7 @@ index ac0631d..ff7cb62 100644 #endif return 0; } -@@ -164,7 +164,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu) +@@ -167,7 +167,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu) u64 arch_irq_stat(void) { @@ -23771,7 +23389,7 @@ index ac0631d..ff7cb62 100644 } diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c -index 344faf8..355f60d 100644 +index 4186755..784efa0 100644 --- a/arch/x86/kernel/irq_32.c +++ b/arch/x86/kernel/irq_32.c @@ -39,7 +39,7 @@ static int check_stack_overflow(void) @@ -23843,7 +23461,7 @@ index 344faf8..355f60d 100644 @@ -121,29 +125,14 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq) */ - void __cpuinit irq_ctx_init(int cpu) + void irq_ctx_init(int cpu) { - union irq_ctx *irqctx; - @@ -23857,7 +23475,9 @@ index 344faf8..355f60d 100644 - irqctx->tinfo.cpu = cpu; - irqctx->tinfo.preempt_count = HARDIRQ_OFFSET; - irqctx->tinfo.addr_limit = MAKE_MM_SEG(0); -- ++ 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)); + - per_cpu(hardirq_ctx, cpu) = irqctx; - - irqctx = page_address(alloc_pages_node(cpu_to_node(cpu), @@ -23868,15 +23488,12 @@ index 344faf8..355f60d 100644 - irqctx->tinfo.addr_limit = MAKE_MM_SEG(0); - - per_cpu(softirq_ctx, cpu) = irqctx; -+ 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)); -+ -+ printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n", -+ cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu)); ++ printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n", ++ cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu)); printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n", cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu)); -@@ -152,7 +141,6 @@ void __cpuinit irq_ctx_init(int cpu) +@@ -152,7 +141,6 @@ void irq_ctx_init(int cpu) asmlinkage void do_softirq(void) { unsigned long flags; @@ -24225,19 +23842,6 @@ index 76dc6f0..66bdfc3 100644 if (!reenter) reset_current_kprobe(); preempt_enable_no_resched(); -diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c -index cd6d9a5..16245a4 100644 ---- a/arch/x86/kernel/kvm.c -+++ b/arch/x86/kernel/kvm.c -@@ -455,7 +455,7 @@ static int __cpuinit kvm_cpu_notify(struct notifier_block *self, - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata kvm_cpu_notifier = { -+static struct notifier_block kvm_cpu_notifier = { - .notifier_call = kvm_cpu_notify, - }; - #endif diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c index ebc9873..1b9724b 100644 --- a/arch/x86/kernel/ldt.c @@ -24338,7 +23942,7 @@ index 5b19e4d..6476a76 100644 relocate_kernel_ptr = control_page; page_list[PA_CONTROL_PAGE] = __pa(control_page); diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c -index 22db92b..d546bec 100644 +index 15c9876..0a43909 100644 --- a/arch/x86/kernel/microcode_core.c +++ b/arch/x86/kernel/microcode_core.c @@ -513,7 +513,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu) @@ -24508,10 +24112,10 @@ index 216a4d7..228255a 100644 if ((s64)val != *(s32 *)loc) goto overflow; diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c -index ce13049..e2e9c3c 100644 +index 88458fa..349f7a4 100644 --- a/arch/x86/kernel/msr.c +++ b/arch/x86/kernel/msr.c -@@ -233,7 +233,7 @@ static int __cpuinit msr_class_cpu_callback(struct notifier_block *nfb, +@@ -233,7 +233,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb, return notifier_from_errno(err); } @@ -24521,10 +24125,10 @@ index ce13049..e2e9c3c 100644 }; diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c -index 6030805..2d33f21 100644 +index ba77ebc..65da999 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c -@@ -105,7 +105,7 @@ static int __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2 +@@ -138,7 +138,7 @@ static int __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2 return handled; } @@ -24533,7 +24137,7 @@ index 6030805..2d33f21 100644 { struct nmi_desc *desc = nmi_to_desc(type); unsigned long flags; -@@ -129,9 +129,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action) +@@ -162,9 +162,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) @@ -24545,7 +24149,7 @@ index 6030805..2d33f21 100644 spin_unlock_irqrestore(&desc->lock, flags); return 0; -@@ -154,7 +154,7 @@ void unregister_nmi_handler(unsigned int type, const char *name) +@@ -187,7 +187,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); @@ -24554,7 +24158,7 @@ index 6030805..2d33f21 100644 break; } } -@@ -479,6 +479,17 @@ static inline void nmi_nesting_postprocess(void) +@@ -512,6 +512,17 @@ static inline void nmi_nesting_postprocess(void) dotraplinkage notrace __kprobes void do_nmi(struct pt_regs *regs, long error_code) { @@ -24782,7 +24386,7 @@ index 6c483ba..d10ce2f 100644 static struct dma_map_ops swiotlb_dma_ops = { diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c -index 81a5f5e..20f8b58 100644 +index 83369e5..52b93f0 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -36,7 +36,8 @@ @@ -24890,7 +24494,7 @@ index 81a5f5e..20f8b58 100644 +} +#endif diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c -index 7305f7d..22f73d6 100644 +index f8adefc..4bce3d6 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c @@ -65,6 +65,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread"); @@ -24924,7 +24528,7 @@ index 7305f7d..22f73d6 100644 print_symbol("EIP is at %s\n", regs->ip); printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n", -@@ -128,20 +128,21 @@ void release_thread(struct task_struct *dead_task) +@@ -133,20 +133,21 @@ 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) { @@ -24950,7 +24554,7 @@ index 7305f7d..22f73d6 100644 childregs->fs = __KERNEL_PERCPU; childregs->bx = sp; /* function */ childregs->bp = arg; -@@ -248,7 +249,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) +@@ -253,7 +254,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(); @@ -24959,7 +24563,7 @@ index 7305f7d..22f73d6 100644 fpu_switch_t fpu; /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */ -@@ -272,6 +273,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) +@@ -277,6 +278,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) */ lazy_save_gs(prev->gs); @@ -24970,7 +24574,7 @@ index 7305f7d..22f73d6 100644 /* * Load the per-thread Thread-Local Storage descriptor. */ -@@ -302,6 +307,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) +@@ -307,6 +312,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) */ arch_end_context_switch(next_p); @@ -24980,7 +24584,7 @@ index 7305f7d..22f73d6 100644 /* * Restore %gs if needed (which is common) */ -@@ -310,8 +318,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) +@@ -315,8 +323,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) switch_fpu_finish(next_p, fpu); @@ -24989,16 +24593,16 @@ index 7305f7d..22f73d6 100644 return prev_p; } -@@ -341,4 +347,3 @@ unsigned long get_wchan(struct task_struct *p) +@@ -346,4 +352,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 355ae06..560fbbe 100644 +index 05646ba..0c2906d 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c -@@ -151,10 +151,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, +@@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, struct pt_regs *childregs; struct task_struct *me = current; @@ -25011,7 +24615,7 @@ index 355ae06..560fbbe 100644 set_tsk_thread_flag(p, TIF_FORK); p->fpu_counter = 0; p->thread.io_bitmap_ptr = NULL; -@@ -165,6 +166,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, +@@ -172,6 +173,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); @@ -25020,7 +24624,7 @@ index 355ae06..560fbbe 100644 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps)); if (unlikely(p->flags & PF_KTHREAD)) { -@@ -273,7 +276,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) +@@ -280,7 +283,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(); @@ -25029,7 +24633,7 @@ index 355ae06..560fbbe 100644 unsigned fsindex, gsindex; fpu_switch_t fpu; -@@ -296,6 +299,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) +@@ -303,6 +306,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) if (unlikely(next->ds | prev->ds)) loadsegment(ds, next->ds); @@ -25039,7 +24643,7 @@ index 355ae06..560fbbe 100644 /* We must save %fs and %gs before load_TLS() because * %fs and %gs may be cleared by load_TLS(). -@@ -355,10 +361,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) +@@ -362,10 +368,9 @@ __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); @@ -25052,7 +24656,7 @@ index 355ae06..560fbbe 100644 /* * Now maybe reload the debug registers and handle I/O bitmaps -@@ -427,12 +432,11 @@ unsigned long get_wchan(struct task_struct *p) +@@ -434,12 +439,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); @@ -25068,7 +24672,7 @@ index 355ae06..560fbbe 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 29a8120..a50b5ee 100644 +index 7461f50..1334029 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) @@ -25099,7 +24703,7 @@ index 29a8120..a50b5ee 100644 struct arch_hw_breakpoint *info; for (i = 0; i < HBP_NUM; i++) { -@@ -856,7 +855,7 @@ long arch_ptrace(struct task_struct *child, long request, +@@ -822,7 +821,7 @@ long arch_ptrace(struct task_struct *child, long request, unsigned long addr, unsigned long data) { int ret; @@ -25108,7 +24712,7 @@ index 29a8120..a50b5ee 100644 switch (request) { /* read the word at location addr in the USER area. */ -@@ -941,14 +940,14 @@ long arch_ptrace(struct task_struct *child, long request, +@@ -907,14 +906,14 @@ long arch_ptrace(struct task_struct *child, long request, if ((int) addr < 0) return -EIO; ret = do_get_thread_area(child, addr, @@ -25125,7 +24729,7 @@ index 29a8120..a50b5ee 100644 break; #endif -@@ -1326,7 +1325,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, +@@ -1292,7 +1291,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, #ifdef CONFIG_X86_64 @@ -25134,7 +24738,7 @@ index 29a8120..a50b5ee 100644 [REGSET_GENERAL] = { .core_note_type = NT_PRSTATUS, .n = sizeof(struct user_regs_struct) / sizeof(long), -@@ -1367,7 +1366,7 @@ static const struct user_regset_view user_x86_64_view = { +@@ -1333,7 +1332,7 @@ static const struct user_regset_view user_x86_64_view = { #endif /* CONFIG_X86_64 */ #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION @@ -25143,7 +24747,7 @@ index 29a8120..a50b5ee 100644 [REGSET_GENERAL] = { .core_note_type = NT_PRSTATUS, .n = sizeof(struct user_regs_struct32) / sizeof(u32), -@@ -1420,7 +1419,7 @@ static const struct user_regset_view user_x86_32_view = { +@@ -1386,7 +1385,7 @@ static const struct user_regset_view user_x86_32_view = { */ u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS]; @@ -25152,7 +24756,7 @@ index 29a8120..a50b5ee 100644 { #ifdef CONFIG_X86_64 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64); -@@ -1455,7 +1454,7 @@ static void fill_sigtrap_info(struct task_struct *tsk, +@@ -1421,7 +1420,7 @@ static void fill_sigtrap_info(struct task_struct *tsk, memset(info, 0, sizeof(*info)); info->si_signo = SIGTRAP; info->si_code = si_code; @@ -25161,7 +24765,7 @@ index 29a8120..a50b5ee 100644 } void user_single_step_siginfo(struct task_struct *tsk, -@@ -1484,6 +1483,10 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, +@@ -1450,6 +1449,10 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, # define IS_IA32 0 #endif @@ -25172,7 +24776,7 @@ index 29a8120..a50b5ee 100644 /* * We must return the syscall number to actually look up in the table. * This can be -1L to skip running any syscall at all. -@@ -1494,6 +1497,11 @@ long syscall_trace_enter(struct pt_regs *regs) +@@ -1460,6 +1463,11 @@ long syscall_trace_enter(struct pt_regs *regs) user_exit(); @@ -25184,7 +24788,7 @@ index 29a8120..a50b5ee 100644 /* * If we stepped into a sysenter/syscall insn, it trapped in * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP. -@@ -1549,6 +1557,11 @@ void syscall_trace_leave(struct pt_regs *regs) +@@ -1515,6 +1523,11 @@ void syscall_trace_leave(struct pt_regs *regs) */ user_exit(); @@ -25229,19 +24833,10 @@ index 2cb9470..ff1fd80 100644 return ret; diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c -index 76fa1e9..abf09ea 100644 +index 563ed91..b9c3313 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c -@@ -36,7 +36,7 @@ void (*pm_power_off)(void); - EXPORT_SYMBOL(pm_power_off); - - static const struct desc_ptr no_idt = {}; --static int reboot_mode; -+static unsigned short reboot_mode; - enum reboot_type reboot_type = BOOT_ACPI; - int reboot_force; - -@@ -157,6 +157,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d) +@@ -68,6 +68,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d) void __noreturn machine_real_restart(unsigned int type) { @@ -25253,7 +24848,7 @@ index 76fa1e9..abf09ea 100644 local_irq_disable(); /* -@@ -184,7 +189,29 @@ void __noreturn machine_real_restart(unsigned int type) +@@ -95,7 +100,29 @@ void __noreturn machine_real_restart(unsigned int type) /* Jump to the identity-mapped low memory code */ #ifdef CONFIG_X86_32 @@ -25284,7 +24879,7 @@ index 76fa1e9..abf09ea 100644 "rm" (real_mode_header->machine_real_restart_asm), "a" (type)); #else -@@ -531,7 +558,7 @@ void __attribute__((weak)) mach_reboot_fixups(void) +@@ -442,7 +469,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 */ @@ -25293,7 +24888,7 @@ index 76fa1e9..abf09ea 100644 { int i; int attempt = 0; -@@ -654,13 +681,13 @@ void native_machine_shutdown(void) +@@ -551,13 +578,13 @@ void native_machine_shutdown(void) #endif } @@ -25309,7 +24904,7 @@ index 76fa1e9..abf09ea 100644 { pr_notice("machine restart\n"); -@@ -669,7 +696,7 @@ static void native_machine_restart(char *__unused) +@@ -566,7 +593,7 @@ static void native_machine_restart(char *__unused) __machine_emergency_restart(0); } @@ -25318,7 +24913,7 @@ index 76fa1e9..abf09ea 100644 { /* Stop other cpus and apics */ machine_shutdown(); -@@ -679,7 +706,7 @@ static void native_machine_halt(void) +@@ -576,7 +603,7 @@ static void native_machine_halt(void) stop_this_cpu(NULL); } @@ -25327,7 +24922,7 @@ index 76fa1e9..abf09ea 100644 { if (pm_power_off) { if (!reboot_force) -@@ -688,9 +715,10 @@ static void native_machine_power_off(void) +@@ -585,9 +612,10 @@ static void native_machine_power_off(void) } /* A fallback in case there is no PM info available */ tboot_shutdown(TB_SHUTDOWN_HALT); @@ -25353,7 +24948,7 @@ index c8e41e9..64049ef 100644 /* * PCI ids solely used for fixups_table go here diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S -index f2bb9c9..bed145d7 100644 +index 3fd2c69..16ef367 100644 --- a/arch/x86/kernel/relocate_kernel_64.S +++ b/arch/x86/kernel/relocate_kernel_64.S @@ -11,6 +11,7 @@ @@ -25364,16 +24959,26 @@ index f2bb9c9..bed145d7 100644 /* * Must be relocatable PIC code callable as a C function -@@ -167,6 +168,7 @@ identity_mapped: - xorq %r14, %r14 - xorq %r15, %r15 +@@ -96,8 +97,7 @@ relocate_kernel: + + /* jump to identity mapped page */ + addq $(identity_mapped - relocate_kernel), %r8 +- pushq %r8 +- ret ++ jmp *%r8 + + identity_mapped: + /* set return address to 0 if not preserving context */ +@@ -167,6 +167,7 @@ identity_mapped: + xorl %r14d, %r14d + xorl %r15d, %r15d + pax_force_retaddr 0, 1 ret 1: diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index 56f7fcf..2cfe4f1 100644 +index f8ec578..0cc110a 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -110,6 +110,7 @@ @@ -25575,10 +25180,10 @@ 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 6956299..18126ec4 100644 +index cf91358..a7081ea 100644 --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c -@@ -196,7 +196,7 @@ static unsigned long align_sigframe(unsigned long sp) +@@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp) * Align the stack pointer according to the i386 ABI, * i.e. so that on function entry ((sp + 4) & 15) == 0. */ @@ -25587,7 +25192,7 @@ index 6956299..18126ec4 100644 #else /* !CONFIG_X86_32 */ sp = round_down(sp, 16) - 8; #endif -@@ -304,9 +304,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set, +@@ -298,9 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set, } if (current->mm->context.vdso) @@ -25599,7 +25204,7 @@ index 6956299..18126ec4 100644 if (ksig->ka.sa.sa_flags & SA_RESTORER) restorer = ksig->ka.sa.sa_restorer; -@@ -320,7 +320,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set, +@@ -314,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. */ @@ -25608,7 +25213,7 @@ index 6956299..18126ec4 100644 if (err) return -EFAULT; -@@ -364,10 +364,13 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig, +@@ -358,10 +358,13 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig, else put_user_ex(0, &frame->uc.uc_flags); put_user_ex(0, &frame->uc.uc_link); @@ -25624,7 +25229,7 @@ index 6956299..18126ec4 100644 if (ksig->ka.sa.sa_flags & SA_RESTORER) restorer = ksig->ka.sa.sa_restorer; put_user_ex(restorer, &frame->pretcode); -@@ -379,7 +382,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig, +@@ -373,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. */ @@ -25633,7 +25238,7 @@ index 6956299..18126ec4 100644 } put_user_catch(err); err |= copy_siginfo_to_user(&frame->info, &ksig->info); -@@ -429,7 +432,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig, +@@ -423,7 +426,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig, else put_user_ex(0, &frame->uc.uc_flags); put_user_ex(0, &frame->uc.uc_link); @@ -25642,7 +25247,7 @@ index 6956299..18126ec4 100644 /* Set up to return from userspace. If provided, use a stub already in userspace. */ -@@ -615,7 +618,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs) +@@ -609,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(); @@ -25656,7 +25261,7 @@ index 6956299..18126ec4 100644 /* Set up the stack frame */ if (is_ia32_frame()) { -@@ -626,7 +634,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs) +@@ -620,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 { @@ -25666,10 +25271,10 @@ index 6956299..18126ec4 100644 } diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c -index 48d2b7d..90d328a 100644 +index cdaa347..f5af55d 100644 --- a/arch/x86/kernel/smp.c +++ b/arch/x86/kernel/smp.c -@@ -285,7 +285,7 @@ static int __init nonmi_ipi_setup(char *str) +@@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str) __setup("nonmi_ipi", nonmi_ipi_setup); @@ -25679,10 +25284,10 @@ index 48d2b7d..90d328a 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 bfd348e..914f323 100644 +index aecc98a..0244a53 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c -@@ -251,14 +251,18 @@ notrace static void __cpuinit start_secondary(void *unused) +@@ -251,14 +251,18 @@ static void notrace start_secondary(void *unused) enable_start_cpu0 = 0; @@ -25707,7 +25312,7 @@ index bfd348e..914f323 100644 /* * Check TSC synchronization with the BP: */ -@@ -748,6 +752,7 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu, struct task_struct *idle) +@@ -748,6 +752,7 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle) idle->thread.sp = (unsigned long) (((struct pt_regs *) (THREAD_SIZE + task_stack_page(idle))) - 1); per_cpu(current_task, cpu) = idle; @@ -25715,7 +25320,7 @@ index bfd348e..914f323 100644 #ifdef CONFIG_X86_32 /* Stack for startup_32 can be just as for start_secondary onwards */ -@@ -755,11 +760,13 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu, struct task_struct *idle) +@@ -755,11 +760,13 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle) #else clear_tsk_thread_flag(idle, TIF_FORK); initial_gs = per_cpu_offset(cpu); @@ -25732,7 +25337,7 @@ index bfd348e..914f323 100644 initial_code = (unsigned long)start_secondary; stack_start = idle->thread.sp; -@@ -908,6 +915,15 @@ int __cpuinit native_cpu_up(unsigned int cpu, struct task_struct *tidle) +@@ -908,6 +915,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); @@ -26075,10 +25680,10 @@ index 30277e2..5664a29 100644 if (!(addr & ~PAGE_MASK)) return addr; diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c -index f84fe00..f41d9f1 100644 +index addf7b5..f960685 100644 --- a/arch/x86/kernel/tboot.c +++ b/arch/x86/kernel/tboot.c -@@ -220,7 +220,7 @@ static int tboot_setup_sleep(void) +@@ -221,7 +221,7 @@ static int tboot_setup_sleep(void) void tboot_shutdown(u32 shutdown_type) { @@ -26087,7 +25692,7 @@ index f84fe00..f41d9f1 100644 if (!tboot_enabled()) return; -@@ -242,7 +242,7 @@ void tboot_shutdown(u32 shutdown_type) +@@ -243,7 +243,7 @@ void tboot_shutdown(u32 shutdown_type) switch_to_tboot_pt(); @@ -26096,7 +25701,7 @@ index f84fe00..f41d9f1 100644 shutdown(); /* should not reach here */ -@@ -300,7 +300,7 @@ static int tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control) +@@ -301,7 +301,7 @@ static int tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control) return 0; } @@ -26105,7 +25710,7 @@ index f84fe00..f41d9f1 100644 static int tboot_wait_for_aps(int num_aps) { -@@ -324,16 +324,16 @@ static int __cpuinit tboot_cpu_callback(struct notifier_block *nfb, +@@ -325,9 +325,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action, { switch (action) { case CPU_DYING: @@ -26117,15 +25722,7 @@ index f84fe00..f41d9f1 100644 return NOTIFY_BAD; break; } - return NOTIFY_OK; - } - --static struct notifier_block tboot_cpu_notifier __cpuinitdata = -+static struct notifier_block tboot_cpu_notifier = - { - .notifier_call = tboot_cpu_callback, - }; -@@ -345,7 +345,7 @@ static __init int tboot_late_init(void) +@@ -413,7 +413,7 @@ static __init int tboot_late_init(void) tboot_create_trampoline(); @@ -26133,7 +25730,7 @@ index f84fe00..f41d9f1 100644 + atomic_set_unchecked(&ap_wfs_count, 0); register_hotcpu_notifier(&tboot_cpu_notifier); - acpi_os_set_prepare_sleep(&tboot_sleep); + #ifdef CONFIG_DEBUG_FS diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c index 24d3c91..d06b473 100644 --- a/arch/x86/kernel/time.c @@ -26193,24 +25790,47 @@ index f7fec09..9991981 100644 return -EFAULT; else info = infobuf; +diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c +index 1c113db..287b42e 100644 +--- a/arch/x86/kernel/tracepoint.c ++++ b/arch/x86/kernel/tracepoint.c +@@ -9,11 +9,11 @@ + #include <linux/atomic.h> + + atomic_t trace_idt_ctr = ATOMIC_INIT(0); +-struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1, ++const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1, + (unsigned long) trace_idt_table }; + + /* No need to be aligned, but done to keep all IDTs defined the same way. */ +-gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss; ++gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata; + + 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 772e2a8..bad5bf6 100644 +index 1b23a1c..910de0d 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c -@@ -68,12 +68,6 @@ - #include <asm/setup.h> +@@ -65,7 +65,7 @@ + #include <asm/proto.h> - asmlinkage int system_call(void); -- --/* -- * The IDT has to be page-aligned to simplify the Pentium -- * F0 0F bug workaround. -- */ --gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, }; + /* No need to be aligned, but done to keep all IDTs defined the same way. */ +-gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss; ++gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata; + #else + #include <asm/processor-flags.h> + #include <asm/setup.h> +@@ -74,7 +74,7 @@ asmlinkage int system_call(void); #endif + /* Must be page-aligned because the real IDT is used in a fixmap. */ +-gate_desc idt_table[NR_VECTORS] __page_aligned_bss; ++gate_desc idt_table[NR_VECTORS] __page_aligned_rodata; + DECLARE_BITMAP(used_vectors, NR_VECTORS); -@@ -106,11 +100,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs) + EXPORT_SYMBOL_GPL(used_vectors); +@@ -106,11 +106,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs) } static int __kprobes @@ -26224,7 +25844,7 @@ index 772e2a8..bad5bf6 100644 /* * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86. * On nmi (interrupt 2), do_trap should not be called. -@@ -123,12 +117,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str, +@@ -123,12 +123,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str, return -1; } #endif @@ -26250,7 +25870,7 @@ index 772e2a8..bad5bf6 100644 return 0; } -@@ -136,7 +142,7 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str, +@@ -136,7 +148,7 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str, } static void __kprobes @@ -26259,7 +25879,7 @@ index 772e2a8..bad5bf6 100644 long error_code, siginfo_t *info) { struct task_struct *tsk = current; -@@ -160,7 +166,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs, +@@ -160,7 +172,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", @@ -26268,7 +25888,7 @@ index 772e2a8..bad5bf6 100644 regs->ip, regs->sp, error_code); print_vma_addr(" in ", regs->ip); pr_cont("\n"); -@@ -273,7 +279,7 @@ do_general_protection(struct pt_regs *regs, long error_code) +@@ -276,7 +288,7 @@ do_general_protection(struct pt_regs *regs, long error_code) conditional_sti(regs); #ifdef CONFIG_X86_32 @@ -26277,7 +25897,7 @@ index 772e2a8..bad5bf6 100644 local_irq_enable(); handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code); goto exit; -@@ -281,18 +287,42 @@ do_general_protection(struct pt_regs *regs, long error_code) +@@ -284,18 +296,42 @@ do_general_protection(struct pt_regs *regs, long error_code) #endif tsk = current; @@ -26322,7 +25942,7 @@ index 772e2a8..bad5bf6 100644 tsk->thread.error_code = error_code; tsk->thread.trap_nr = X86_TRAP_GP; -@@ -450,7 +480,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code) +@@ -453,7 +489,7 @@ dotraplinkage void __kprobes 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); @@ -26331,7 +25951,7 @@ index 772e2a8..bad5bf6 100644 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code, X86_TRAP_DB); preempt_conditional_cli(regs); -@@ -465,7 +495,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code) +@@ -468,7 +504,7 @@ dotraplinkage void __kprobes 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. */ @@ -26340,7 +25960,7 @@ index 772e2a8..bad5bf6 100644 tsk->thread.debugreg6 &= ~DR_STEP; set_tsk_thread_flag(tsk, TIF_SINGLESTEP); regs->flags &= ~X86_EFLAGS_TF; -@@ -497,7 +527,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr) +@@ -500,7 +536,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr) return; conditional_sti(regs); @@ -26452,7 +26072,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 10c4f30..57377c2 100644 +index 10c4f30..65408b9 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -26,6 +26,13 @@ @@ -26521,7 +26141,7 @@ index 10c4f30..57377c2 100644 HEAD_TEXT . = ALIGN(8); _stext = .; -@@ -104,13 +124,48 @@ SECTIONS +@@ -104,13 +124,47 @@ SECTIONS IRQENTRY_TEXT *(.fixup) *(.gnu.warning) @@ -26557,7 +26177,6 @@ index 10c4f30..57377c2 100644 +#ifdef CONFIG_X86_32 + . = ALIGN(PAGE_SIZE); + .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) { -+ *(.idt) + . = ALIGN(PAGE_SIZE); + *(.empty_zero_page) + *(.initial_pg_fixmap) @@ -26574,7 +26193,7 @@ index 10c4f30..57377c2 100644 #if defined(CONFIG_DEBUG_RODATA) /* .text should occupy whole number of pages */ -@@ -122,16 +177,20 @@ SECTIONS +@@ -122,16 +176,20 @@ SECTIONS /* Data */ .data : AT(ADDR(.data) - LOAD_OFFSET) { @@ -26598,7 +26217,7 @@ index 10c4f30..57377c2 100644 PAGE_ALIGNED_DATA(PAGE_SIZE) -@@ -172,12 +231,19 @@ SECTIONS +@@ -172,12 +230,19 @@ SECTIONS #endif /* CONFIG_X86_64 */ /* Init code and data - will be freed after init */ @@ -26621,7 +26240,7 @@ index 10c4f30..57377c2 100644 /* * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the * output PHDR, so the next output section - .init.text - should -@@ -186,12 +252,27 @@ SECTIONS +@@ -186,12 +251,27 @@ SECTIONS PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu) #endif @@ -26654,7 +26273,7 @@ index 10c4f30..57377c2 100644 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) { __x86_cpu_dev_start = .; -@@ -253,19 +334,12 @@ SECTIONS +@@ -253,19 +333,12 @@ SECTIONS } . = ALIGN(8); @@ -26675,7 +26294,7 @@ index 10c4f30..57377c2 100644 PERCPU_SECTION(INTERNODE_CACHE_BYTES) #endif -@@ -284,16 +358,10 @@ SECTIONS +@@ -284,16 +357,10 @@ SECTIONS .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) { __smp_locks = .; *(.smp_locks) @@ -26693,7 +26312,7 @@ index 10c4f30..57377c2 100644 /* BSS */ . = ALIGN(PAGE_SIZE); .bss : AT(ADDR(.bss) - LOAD_OFFSET) { -@@ -309,6 +377,7 @@ SECTIONS +@@ -309,6 +376,7 @@ SECTIONS __brk_base = .; . += 64 * 1024; /* 64k alignment slop space */ *(.brk_reservation) /* areas brk users have reserved */ @@ -26701,7 +26320,7 @@ index 10c4f30..57377c2 100644 __brk_limit = .; } -@@ -335,13 +404,12 @@ SECTIONS +@@ -335,13 +403,12 @@ SECTIONS * for the boot processor. */ #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load @@ -26717,7 +26336,7 @@ index 10c4f30..57377c2 100644 #ifdef CONFIG_SMP diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c -index 9a907a6..f83f921 100644 +index 1f96f93..d5c8f7a 100644 --- a/arch/x86/kernel/vsyscall_64.c +++ b/arch/x86/kernel/vsyscall_64.c @@ -56,15 +56,13 @@ @@ -26781,19 +26400,10 @@ index b014d94..e775258 100644 +EXPORT_SYMBOL(cpu_pgd); +#endif diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c -index 45a14db..075bb9b 100644 +index 5f24c71..1dadf09 100644 --- a/arch/x86/kernel/x86_init.c +++ b/arch/x86/kernel/x86_init.c -@@ -85,7 +85,7 @@ struct x86_init_ops x86_init __initdata = { - }, - }; - --struct x86_cpuinit_ops x86_cpuinit __cpuinitdata = { -+struct x86_cpuinit_ops x86_cpuinit __cpuinitconst = { - .early_percpu_clock_init = x86_init_noop, - .setup_percpu_clockev = setup_secondary_APIC_clock, - }; -@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit __cpuinitdata = { +@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = { static void default_nmi_init(void) { }; static int default_i8042_detect(void) { return 1; }; @@ -26821,7 +26431,7 @@ index 45a14db..075bb9b 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 ada87a3..afea76d 100644 +index 422fd82..c3687ca 100644 --- a/arch/x86/kernel/xsave.c +++ b/arch/x86/kernel/xsave.c @@ -199,6 +199,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf) @@ -26891,37 +26501,8 @@ index a20ecb5..d0e2194 100644 return 0; out: -diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c -index 5953dce..f11a7d2 100644 ---- a/arch/x86/kvm/emulate.c -+++ b/arch/x86/kvm/emulate.c -@@ -329,6 +329,7 @@ static void invalidate_registers(struct x86_emulate_ctxt *ctxt) - - #define ____emulate_2op(ctxt, _op, _x, _y, _suffix, _dsttype) \ - do { \ -+ unsigned long _tmp; \ - __asm__ __volatile__ ( \ - _PRE_EFLAGS("0", "4", "2") \ - _op _suffix " %"_x"3,%1; " \ -@@ -343,8 +344,6 @@ static void invalidate_registers(struct x86_emulate_ctxt *ctxt) - /* Raw emulation: instruction has two explicit operands. */ - #define __emulate_2op_nobyte(ctxt,_op,_wx,_wy,_lx,_ly,_qx,_qy) \ - do { \ -- unsigned long _tmp; \ -- \ - switch ((ctxt)->dst.bytes) { \ - case 2: \ - ____emulate_2op(ctxt,_op,_wx,_wy,"w",u16); \ -@@ -360,7 +359,6 @@ static void invalidate_registers(struct x86_emulate_ctxt *ctxt) - - #define __emulate_2op(ctxt,_op,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \ - do { \ -- unsigned long _tmp; \ - switch ((ctxt)->dst.bytes) { \ - case 1: \ - ____emulate_2op(ctxt,_op,_bx,_by,"b",u8); \ diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c -index 0eee2c8..94a32c3 100644 +index afc1124..3e431f2 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -55,7 +55,7 @@ @@ -26934,7 +26515,7 @@ index 0eee2c8..94a32c3 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 da20860..d19fdf5 100644 +index 7769699..c8aca4a7f 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h @@ -208,7 +208,7 @@ retry_walk: @@ -26947,10 +26528,10 @@ index da20860..d19fdf5 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 a14a6ea..dc86cf0 100644 +index c0bc803..6837a50 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c -@@ -3493,7 +3493,11 @@ static void reload_tss(struct kvm_vcpu *vcpu) +@@ -3501,7 +3501,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); @@ -26962,7 +26543,7 @@ index a14a6ea..dc86cf0 100644 load_TR_desc(); } -@@ -3894,6 +3898,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu) +@@ -3902,6 +3906,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu) #endif #endif @@ -26974,7 +26555,7 @@ index a14a6ea..dc86cf0 100644 local_irq_disable(); diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c -index 5402c94..c3bdeee 100644 +index 064d0be..f5f758e 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -1311,12 +1311,12 @@ static void vmcs_write64(unsigned long field, u64 value) @@ -27015,7 +26596,7 @@ index 5402c94..c3bdeee 100644 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp); vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */ vmx->loaded_vmcs->cpu = cpu; -@@ -2935,8 +2943,11 @@ static __init int hardware_setup(void) +@@ -2940,8 +2948,11 @@ static __init int hardware_setup(void) if (!cpu_has_vmx_flexpriority()) flexpriority_enabled = 0; @@ -27029,7 +26610,7 @@ index 5402c94..c3bdeee 100644 if (enable_ept && !cpu_has_vmx_ept_2m_page()) kvm_disable_largepages(); -@@ -2947,13 +2958,15 @@ static __init int hardware_setup(void) +@@ -2952,13 +2963,15 @@ static __init int hardware_setup(void) if (!cpu_has_vmx_apicv()) enable_apicv = 0; @@ -27049,7 +26630,7 @@ index 5402c94..c3bdeee 100644 if (nested) nested_vmx_setup_ctls_msrs(); -@@ -4076,7 +4089,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx) +@@ -4081,7 +4094,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx) vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */ vmcs_writel(HOST_CR4, read_cr4()); /* 22.2.3, 22.2.5 */ @@ -27060,7 +26641,7 @@ index 5402c94..c3bdeee 100644 vmcs_write16(HOST_CS_SELECTOR, __KERNEL_CS); /* 22.2.4 */ #ifdef CONFIG_X86_64 -@@ -4098,7 +4114,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx) +@@ -4103,7 +4119,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; @@ -27069,7 +26650,7 @@ index 5402c94..c3bdeee 100644 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32); vmcs_write32(HOST_IA32_SYSENTER_CS, low32); -@@ -7030,6 +7046,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu) +@@ -7039,6 +7055,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu) "jmp 2f \n\t" "1: " __ex(ASM_VMX_VMRESUME) "\n\t" "2: " @@ -27082,7 +26663,7 @@ index 5402c94..c3bdeee 100644 /* Save guest registers, load host registers, keep flags */ "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t" "pop %0 \n\t" -@@ -7082,6 +7104,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu) +@@ -7091,6 +7113,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)) @@ -27094,7 +26675,7 @@ index 5402c94..c3bdeee 100644 : "cc", "memory" #ifdef CONFIG_X86_64 , "rax", "rbx", "rdi", "rsi" -@@ -7095,7 +7122,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu) +@@ -7104,7 +7131,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu) if (debugctlmsr) update_debugctlmsr(debugctlmsr); @@ -27103,7 +26684,7 @@ index 5402c94..c3bdeee 100644 /* * The sysexit path does not restore ds/es, so we must set them to * a reasonable value ourselves. -@@ -7104,8 +7131,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu) +@@ -7113,8 +7140,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. */ @@ -27125,10 +26706,10 @@ index 5402c94..c3bdeee 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 e8ba99c..ee9d7d9 100644 +index d21bce5..fdae9f1 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c -@@ -1725,8 +1725,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data) +@@ -1766,8 +1766,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data) { struct kvm *kvm = vcpu->kvm; int lm = is_long_mode(vcpu); @@ -27139,7 +26720,7 @@ index e8ba99c..ee9d7d9 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; -@@ -2609,6 +2609,8 @@ long kvm_arch_dev_ioctl(struct file *filp, +@@ -2650,6 +2650,8 @@ long kvm_arch_dev_ioctl(struct file *filp, if (n < msr_list.nmsrs) goto out; r = -EFAULT; @@ -27148,7 +26729,7 @@ index e8ba99c..ee9d7d9 100644 if (copy_to_user(user_msr_list->indices, &msrs_to_save, num_msrs_to_save * sizeof(u32))) goto out; -@@ -5297,7 +5299,7 @@ static struct notifier_block pvclock_gtod_notifier = { +@@ -5344,7 +5346,7 @@ static struct notifier_block pvclock_gtod_notifier = { }; #endif @@ -27158,7 +26739,7 @@ index e8ba99c..ee9d7d9 100644 int r; struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque; diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c -index 7114c63..a1018fc 100644 +index 6a22c19..1763f04 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c @@ -1201,9 +1201,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count) @@ -30991,10 +30572,10 @@ index dd74e46..7d26398 100644 return 0; diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c -index 252b8f5..4dcfdc1 100644 +index 4500142..53a363c 100644 --- a/arch/x86/mm/highmem_32.c +++ b/arch/x86/mm/highmem_32.c -@@ -44,7 +44,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot) +@@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot) idx = type + KM_TYPE_NR*smp_processor_id(); vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); BUG_ON(!pte_none(*(kmap_pte-idx))); @@ -31007,10 +30588,10 @@ index 252b8f5..4dcfdc1 100644 return (void *)vaddr; diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c -index ae1aa71..d9bea75 100644 +index 7e73e8c..11d3b86 100644 --- a/arch/x86/mm/hugetlbpage.c +++ b/arch/x86/mm/hugetlbpage.c -@@ -271,23 +271,30 @@ follow_huge_pud(struct mm_struct *mm, unsigned long address, +@@ -84,23 +84,30 @@ int pud_huge(pud_t pud) #ifdef HAVE_ARCH_HUGETLB_UNMAPPED_AREA static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file, unsigned long addr, unsigned long len, @@ -31044,7 +30625,7 @@ index ae1aa71..d9bea75 100644 { struct hstate *h = hstate_file(file); struct vm_unmapped_area_info info; -@@ -299,6 +306,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file, +@@ -112,6 +119,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file, info.high_limit = current->mm->mmap_base; info.align_mask = PAGE_MASK & ~huge_page_mask(h); info.align_offset = 0; @@ -31052,7 +30633,7 @@ index ae1aa71..d9bea75 100644 addr = vm_unmapped_area(&info); /* -@@ -311,6 +319,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file, +@@ -124,6 +132,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file, VM_BUG_ON(addr != -ENOMEM); info.flags = 0; info.low_limit = TASK_UNMAPPED_BASE; @@ -31065,7 +30646,7 @@ index ae1aa71..d9bea75 100644 info.high_limit = TASK_SIZE; addr = vm_unmapped_area(&info); } -@@ -325,10 +339,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, +@@ -138,10 +152,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, struct hstate *h = hstate_file(file); struct mm_struct *mm = current->mm; struct vm_area_struct *vma; @@ -31087,7 +30668,7 @@ index ae1aa71..d9bea75 100644 return -ENOMEM; if (flags & MAP_FIXED) { -@@ -337,19 +361,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, +@@ -150,19 +174,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, return addr; } @@ -31115,7 +30696,7 @@ index ae1aa71..d9bea75 100644 #endif /*HAVE_ARCH_HUGETLB_UNMAPPED_AREA*/ diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c -index 7a5bf1b..c96ab0d 100644 +index 04664cd..dae6e5d 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -4,6 +4,7 @@ @@ -31196,7 +30777,7 @@ index 7a5bf1b..c96ab0d 100644 if (iomem_is_exclusive(pagenr << PAGE_SHIFT)) return 0; if (!page_is_ram(pagenr)) -@@ -538,8 +582,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end) +@@ -530,8 +574,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end) #endif } @@ -31272,7 +30853,7 @@ index 7a5bf1b..c96ab0d 100644 + pgd = pgd_offset_k(addr); + pud = pud_offset(pgd, addr); + pmd = pmd_offset(pud, addr); -+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask))); ++ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask))); + } +*/ +#endif @@ -31298,7 +30879,7 @@ index 7a5bf1b..c96ab0d 100644 + addr = (unsigned long)__va(__pa(__START_KERNEL_map)); + end = addr + KERNEL_IMAGE_SIZE; + for (; addr < end; addr += PMD_SIZE) { -+ pgd = pgd_offset_k(addr); ++ pgd = pgd_offset_k(addr); + pud = pud_offset(pgd, addr); + pmd = pmd_offset(pud, addr); + if (!pmd_present(*pmd)) @@ -31311,11 +30892,11 @@ index 7a5bf1b..c96ab0d 100644 + flush_tlb_all(); +#endif + - free_init_pages("unused kernel memory", + free_init_pages("unused kernel", (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 3ac7e31..89611b7 100644 +index 4287f1f..3b99c71 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); @@ -31529,16 +31110,7 @@ index 3ac7e31..89611b7 100644 EXPORT_SYMBOL_GPL(__supported_pte_mask); /* user-defined highmem size */ -@@ -772,7 +774,7 @@ void __init mem_init(void) - after_bootmem = 1; - - codesize = (unsigned long) &_etext - (unsigned long) &_text; -- datasize = (unsigned long) &_edata - (unsigned long) &_etext; -+ datasize = (unsigned long) &_edata - (unsigned long) &_sdata; - initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; - - printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, " -@@ -813,10 +815,10 @@ void __init mem_init(void) +@@ -787,10 +789,10 @@ void __init mem_init(void) ((unsigned long)&__init_end - (unsigned long)&__init_begin) >> 10, @@ -31552,7 +31124,7 @@ index 3ac7e31..89611b7 100644 ((unsigned long)&_etext - (unsigned long)&_text) >> 10); /* -@@ -906,6 +908,7 @@ void set_kernel_text_rw(void) +@@ -880,6 +882,7 @@ void set_kernel_text_rw(void) if (!kernel_set_to_readonly) return; @@ -31560,7 +31132,7 @@ index 3ac7e31..89611b7 100644 pr_debug("Set kernel text: %lx - %lx for read write\n", start, start+size); -@@ -920,6 +923,7 @@ void set_kernel_text_ro(void) +@@ -894,6 +897,7 @@ void set_kernel_text_ro(void) if (!kernel_set_to_readonly) return; @@ -31568,7 +31140,7 @@ index 3ac7e31..89611b7 100644 pr_debug("Set kernel text: %lx - %lx for read only\n", start, start+size); -@@ -948,6 +952,7 @@ void mark_rodata_ro(void) +@@ -922,6 +926,7 @@ void mark_rodata_ro(void) unsigned long start = PFN_ALIGN(_text); unsigned long size = PFN_ALIGN(_etext) - start; @@ -31577,7 +31149,7 @@ index 3ac7e31..89611b7 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 bb00c46..bf91a67 100644 +index 104d56a..62ba13f 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); @@ -31701,7 +31273,7 @@ index bb00c46..bf91a67 100644 spin_unlock(&init_mm.page_table_lock); pgd_changed = true; } -@@ -1221,8 +1242,8 @@ int kern_addr_valid(unsigned long addr) +@@ -1188,8 +1209,8 @@ int kern_addr_valid(unsigned long addr) static struct vm_area_struct gate_vma = { .vm_start = VSYSCALL_START, .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE), @@ -31712,7 +31284,7 @@ index bb00c46..bf91a67 100644 }; struct vm_area_struct *get_gate_vma(struct mm_struct *mm) -@@ -1256,7 +1277,7 @@ int in_gate_area_no_mm(unsigned long addr) +@@ -1223,7 +1244,7 @@ int in_gate_area_no_mm(unsigned long addr) const char *arch_vma_name(struct vm_area_struct *vma) { @@ -31738,7 +31310,7 @@ index 7b179b4..6bd17777 100644 return (void *)vaddr; diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c -index 9a1e658..da003f3 100644 +index 0215e2c..1c62dab 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr, @@ -31815,7 +31387,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 5c1ae28..45f4ac9 100644 +index 25e7e13..1964579 100644 --- a/arch/x86/mm/mmap.c +++ b/arch/x86/mm/mmap.c @@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void) @@ -31892,7 +31464,7 @@ index 5c1ae28..45f4ac9 100644 if (mmap_is_legacy()) { mm->mmap_base = mm->mmap_legacy_base; diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c -index dc0b727..f612039 100644 +index 0057a7a..95c7edd 100644 --- a/arch/x86/mm/mmio-mod.c +++ b/arch/x86/mm/mmio-mod.c @@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs, @@ -31941,7 +31513,7 @@ index dc0b727..f612039 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 a71c4e2..301ae44 100644 +index 8bf93ba..dbcd670 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -474,7 +474,7 @@ static bool __init numa_meminfo_cover_memory(const struct numa_meminfo *mi) @@ -32168,7 +31740,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 17fda6a..f7d54a0 100644 +index dfa537a..fd45c64 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -91,10 +91,67 @@ static inline void pgd_list_del(pgd_t *pgd) @@ -32317,7 +31889,7 @@ index 17fda6a..f7d54a0 100644 return -ENOMEM; } -@@ -219,51 +279,55 @@ static int preallocate_pmds(pmd_t *pmds[]) +@@ -219,49 +279,52 @@ static int preallocate_pmds(pmd_t *pmds[]) * preallocate which never got a corresponding vma will need to be * freed manually. */ @@ -32350,7 +31922,6 @@ index 17fda6a..f7d54a0 100644 { - pud_t *pud; + pyd_t *pyd; - unsigned long addr; int i; - if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */ @@ -32358,19 +31929,17 @@ index 17fda6a..f7d54a0 100644 return; - pud = pud_offset(pgd, 0); +- +- for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) { +- pmd_t *pmd = pmds[i]; +#ifdef CONFIG_X86_64 + pyd = pyd_offset(mm, 0L); +#else + pyd = pyd_offset(pgd, 0L); +#endif -- for (addr = i = 0; i < PREALLOCATED_PMDS; -- i++, pud++, addr += PUD_SIZE) { -- pmd_t *pmd = pmds[i]; -+ for (addr = i = 0; i < PREALLOCATED_PXDS; -+ i++, pyd++, addr += PYD_SIZE) { ++ for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) { + pxd_t *pxd = pxds[i]; - if (i >= KERNEL_PGD_BOUNDARY) - memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]), - sizeof(pmd_t) * PTRS_PER_PMD); @@ -32390,7 +31959,7 @@ index 17fda6a..f7d54a0 100644 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP); -@@ -272,11 +336,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm) +@@ -270,11 +333,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm) mm->pgd = pgd; @@ -32404,7 +31973,7 @@ index 17fda6a..f7d54a0 100644 /* * Make sure that pre-populating the pmds is atomic with -@@ -286,14 +350,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm) +@@ -284,14 +347,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm) spin_lock(&pgd_lock); pgd_ctor(mm, pgd); @@ -32422,7 +31991,7 @@ index 17fda6a..f7d54a0 100644 out_free_pgd: free_page((unsigned long)pgd); out: -@@ -302,7 +366,7 @@ out: +@@ -300,7 +363,7 @@ out: void pgd_free(struct mm_struct *mm, pgd_t *pgd) { @@ -32472,7 +32041,7 @@ index e666cbb..61788c45 100644 unsigned long phys_addr = x - PAGE_OFFSET; /* VMALLOC_* aren't constants */ diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c -index 410531d..0f16030 100644 +index 90555bf..f5f1828 100644 --- a/arch/x86/mm/setup_nx.c +++ b/arch/x86/mm/setup_nx.c @@ -5,8 +5,10 @@ @@ -32480,7 +32049,7 @@ index 410531d..0f16030 100644 #include <asm/proto.h> +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) - static int disable_nx __cpuinitdata; + static int disable_nx; +#ifndef CONFIG_PAX_PAGEEXEC /* @@ -32494,7 +32063,7 @@ index 410531d..0f16030 100644 + +#endif - void __cpuinit x86_configure_nx(void) + void x86_configure_nx(void) { +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) if (cpu_has_nx && !disable_nx) @@ -32677,18 +32246,10 @@ index 877b9a1..a8ecf42 100644 + pax_force_retaddr ret diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c -index f66b540..3e88dfb 100644 +index 79c216a..08d39cc 100644 --- a/arch/x86/net/bpf_jit_comp.c +++ b/arch/x86/net/bpf_jit_comp.c -@@ -12,6 +12,7 @@ - #include <linux/netdevice.h> - #include <linux/filter.h> - #include <linux/if_vlan.h> -+#include <linux/random.h> - - /* - * Conventions : -@@ -49,13 +50,90 @@ static inline u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len) +@@ -50,13 +50,90 @@ static inline u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len) return ptr + len; } @@ -32779,7 +32340,7 @@ index f66b540..3e88dfb 100644 #define CLEAR_A() EMIT2(0x31, 0xc0) /* xor %eax,%eax */ #define CLEAR_X() EMIT2(0x31, 0xdb) /* xor %ebx,%ebx */ -@@ -90,6 +168,24 @@ do { \ +@@ -91,6 +168,24 @@ do { \ #define X86_JBE 0x76 #define X86_JA 0x77 @@ -32804,7 +32365,7 @@ index f66b540..3e88dfb 100644 #define EMIT_COND_JMP(op, offset) \ do { \ if (is_near(offset)) \ -@@ -97,6 +193,7 @@ do { \ +@@ -98,6 +193,7 @@ do { \ else { \ EMIT2(0x0f, op + 0x10); \ EMIT(offset, 4); /* jxx .+off32 */ \ @@ -32812,19 +32373,53 @@ index f66b540..3e88dfb 100644 } \ } while (0) -@@ -121,6 +218,11 @@ static inline void bpf_flush_icache(void *start, void *end) - set_fs(old_fs); +@@ -145,55 +241,54 @@ static int pkt_type_offset(void) + return -1; } -+struct bpf_jit_work { -+ struct work_struct work; -+ void *image; -+}; -+ - #define CHOOSE_LOAD_FUNC(K, func) \ - ((int)K < 0 ? ((int)K >= SKF_LL_OFF ? func##_negative_offset : func) : func##_positive_offset) +-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) + { + unsigned int sz, hole; +- struct bpf_binary_header *header; ++ u8 *header; -@@ -146,7 +248,7 @@ static int pkt_type_offset(void) + /* 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; + ++ pax_open_kernel(); + memset(header, 0xcc, sz); /* fill whole space with int3 instructions */ ++ pax_close_kernel(); + +- header->pages = sz / PAGE_SIZE; +- hole = sz - (proglen + 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) { @@ -32833,7 +32428,14 @@ index f66b540..3e88dfb 100644 u8 *prog; unsigned int proglen, oldproglen = 0; int ilen, i; -@@ -159,6 +261,9 @@ void bpf_jit_compile(struct sk_filter *fp) + 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; @@ -32843,14 +32445,10 @@ index f66b540..3e88dfb 100644 if (!bpf_jit_enable) return; -@@ -167,11 +272,19 @@ void bpf_jit_compile(struct sk_filter *fp) +@@ -202,11 +297,15 @@ void bpf_jit_compile(struct sk_filter *fp) if (addrs == NULL) return; -+ fp->work = kmalloc(sizeof(*fp->work), GFP_KERNEL); -+ if (!fp->work) -+ goto out; -+ +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN + randkey = get_random_int(); +#endif @@ -32865,7 +32463,7 @@ index f66b540..3e88dfb 100644 addrs[i] = proglen; } cleanup_addr = proglen; /* epilogue address */ -@@ -282,10 +395,8 @@ void bpf_jit_compile(struct sk_filter *fp) +@@ -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 */ @@ -32878,7 +32476,7 @@ index f66b540..3e88dfb 100644 break; case BPF_S_ALU_DIV_X: /* A /= X; */ seen |= SEEN_XREG; -@@ -325,13 +436,23 @@ void bpf_jit_compile(struct sk_filter *fp) +@@ -360,13 +457,23 @@ void bpf_jit_compile(struct sk_filter *fp) break; case BPF_S_ALU_MOD_K: /* A %= K; */ EMIT2(0x31, 0xd2); /* xor %edx,%edx */ @@ -32902,7 +32500,7 @@ index f66b540..3e88dfb 100644 EMIT4(0x48, 0xc1, 0xe8, 0x20); /* shr $0x20,%rax */ break; case BPF_S_ALU_AND_X: -@@ -602,8 +723,7 @@ common_load_ind: seen |= SEEN_DATAREF | SEEN_XREG; +@@ -637,8 +744,7 @@ common_load_ind: seen |= SEEN_DATAREF | SEEN_XREG; if (is_imm8(K)) { EMIT3(0x8d, 0x73, K); /* lea imm8(%rbx), %esi */ } else { @@ -32912,22 +32510,13 @@ index f66b540..3e88dfb 100644 } } else { EMIT2(0x89,0xde); /* mov %ebx,%esi */ -@@ -686,17 +806,18 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i]; - break; - default: - /* hmm, too complex filter, give up with jit compiler */ -- goto out; -+ goto error; - } - ilen = prog - temp; - if (image) { +@@ -728,10 +834,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, image); -- return; + kfree(addrs); +- module_free(NULL, header); + module_free_exec(NULL, image); -+ goto error; + return; } + pax_open_kernel(); memcpy(image + proglen, temp, ilen); @@ -32935,54 +32524,24 @@ index f66b540..3e88dfb 100644 } proglen += ilen; addrs[i] = proglen; -@@ -717,11 +838,9 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i]; - break; - } - if (proglen == oldproglen) { -- image = module_alloc(max_t(unsigned int, -- proglen, -- sizeof(struct work_struct))); -+ image = module_alloc_exec(proglen); - if (!image) -- goto out; -+ goto error; - } - oldproglen = proglen; - } -@@ -732,7 +851,10 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i]; +@@ -764,7 +872,6 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i]; + if (image) { - bpf_flush_icache(image, image + proglen); + bpf_flush_icache(header, image + proglen); +- set_memory_ro((unsigned long)header, header->pages); fp->bpf_func = (void *)image; -- } -+ } else -+error: -+ kfree(fp->work); -+ + } out: - kfree(addrs); - return; -@@ -740,18 +862,20 @@ out: - - static void jit_free_defer(struct work_struct *arg) - { -- module_free(NULL, arg); -+ module_free_exec(NULL, ((struct bpf_jit_work *)arg)->image); -+ kfree(arg); - } - - /* run from softirq, we must use a work_struct to call -- * module_free() from process context -+ * module_free_exec() from process context - */ - void bpf_jit_free(struct sk_filter *fp) +@@ -776,9 +883,7 @@ void bpf_jit_free(struct sk_filter *fp) { if (fp->bpf_func != sk_run_filter) { -- struct work_struct *work = (struct work_struct *)fp->bpf_func; -+ struct work_struct *work = &fp->work->work; - - INIT_WORK(work, jit_free_defer); -+ fp->work->image = fp->bpf_func; - schedule_work(work); + unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK; +- struct bpf_binary_header *header = (void *)addr; +- +- set_memory_rw(addr, header->pages); +- module_free(NULL, header); ++ set_memory_rw(addr, 1); ++ module_free_exec(NULL, (void *)addr); } } diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c @@ -33104,19 +32663,6 @@ index 71e8a67..6a313bb 100644 struct op_counter_config; -diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c -index e9e6ed5..e47ae67 100644 ---- a/arch/x86/pci/amd_bus.c -+++ b/arch/x86/pci/amd_bus.c -@@ -337,7 +337,7 @@ static int __cpuinit amd_cpu_notify(struct notifier_block *self, - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata amd_cpu_notifier = { -+static struct notifier_block amd_cpu_notifier = { - .notifier_call = amd_cpu_notify, - }; - diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index 372e9b8..e775a6c 100644 --- a/arch/x86/pci/irq.c @@ -33751,7 +33297,7 @@ index 4c07cca..2c8427d 100644 ret ENDPROC(efi_call6) diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c -index a0a0a43..a48e233 100644 +index 47fe66f..6206449 100644 --- a/arch/x86/platform/mrst/mrst.c +++ b/arch/x86/platform/mrst/mrst.c @@ -78,13 +78,15 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX]; @@ -34190,7 +33736,7 @@ index fd14be1..e3c79c0 100644 # diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c -index 0faad64..39ef157 100644 +index d6bfb87..876ee18 100644 --- a/arch/x86/vdso/vdso32-setup.c +++ b/arch/x86/vdso/vdso32-setup.c @@ -25,6 +25,7 @@ @@ -34349,7 +33895,7 @@ index 431e875..cbb23f3 100644 -} -__setup("vdso=", vdso_setup); diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c -index a492be2..08678da 100644 +index 193097e..7590269 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -123,8 +123,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); @@ -34470,15 +34016,6 @@ index a492be2..08678da 100644 xen_smp_init(); #ifdef CONFIG_ACPI_NUMA -@@ -1700,7 +1699,7 @@ static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self, - return NOTIFY_OK; - } - --static struct notifier_block xen_hvm_cpu_notifier __cpuinitdata = { -+static struct notifier_block xen_hvm_cpu_notifier = { - .notifier_call = xen_hvm_cpu_notify, - }; - diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index fdc3ba2..3daee39 100644 --- a/arch/x86/xen/mmu.c @@ -34523,10 +34060,10 @@ index fdc3ba2..3daee39 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 a1e58e1..9392ad8 100644 +index b81c88e..2cbe7b8 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c -@@ -240,11 +240,6 @@ static void __init xen_smp_prepare_boot_cpu(void) +@@ -272,11 +272,6 @@ static void __init xen_smp_prepare_boot_cpu(void) { BUG_ON(smp_processor_id() != 0); native_smp_prepare_boot_cpu(); @@ -34538,7 +34075,7 @@ index a1e58e1..9392ad8 100644 xen_filter_cpu_maps(); xen_setup_vcpu_info_placement(); } -@@ -314,7 +309,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) +@@ -346,7 +341,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) ctxt->user_regs.ss = __KERNEL_DS; #ifdef CONFIG_X86_32 ctxt->user_regs.fs = __KERNEL_PERCPU; @@ -34547,7 +34084,7 @@ index a1e58e1..9392ad8 100644 #else ctxt->gs_base_kernel = per_cpu_offset(cpu); #endif -@@ -324,8 +319,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) +@@ -356,8 +351,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) { ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */ @@ -34558,7 +34095,7 @@ index a1e58e1..9392ad8 100644 xen_copy_trap_info(ctxt->trap_ctxt); -@@ -370,13 +365,12 @@ static int __cpuinit xen_cpu_up(unsigned int cpu, struct task_struct *idle) +@@ -402,13 +397,12 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle) int rc; per_cpu(current_task, cpu) = idle; @@ -34574,7 +34111,7 @@ index a1e58e1..9392ad8 100644 #endif xen_setup_runstate_info(cpu); xen_setup_timer(cpu); -@@ -651,7 +645,7 @@ static const struct smp_ops xen_smp_ops __initconst = { +@@ -678,7 +672,7 @@ static const struct smp_ops xen_smp_ops __initconst = { void __init xen_smp_init(void) { @@ -34631,7 +34168,7 @@ index 7faed58..ba4427c 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 a95b417..b6dbd0b 100644 +index 86782c5..fa272c8 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h @@ -10,8 +10,6 @@ @@ -34705,10 +34242,10 @@ 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 e8918ff..b3ffc51 100644 +index 290792a..416f287 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c -@@ -825,7 +825,7 @@ static void blkcg_css_free(struct cgroup *cgroup) +@@ -808,7 +808,7 @@ static void blkcg_css_free(struct cgroup *cgroup) static struct cgroup_subsys_state *blkcg_css_alloc(struct cgroup *cgroup) { @@ -34717,7 +34254,7 @@ index e8918ff..b3ffc51 100644 struct blkcg *blkcg; struct cgroup *parent = cgroup->parent; -@@ -840,7 +840,7 @@ static struct cgroup_subsys_state *blkcg_css_alloc(struct cgroup *cgroup) +@@ -823,7 +823,7 @@ static struct cgroup_subsys_state *blkcg_css_alloc(struct cgroup *cgroup) blkcg->cfq_weight = CFQ_WEIGHT_DEFAULT; blkcg->cfq_leaf_weight = CFQ_WEIGHT_DEFAULT; @@ -34727,7 +34264,7 @@ index e8918ff..b3ffc51 100644 spin_lock_init(&blkcg->lock); INIT_RADIX_TREE(&blkcg->blkg_tree, GFP_ATOMIC); diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c -index 58916af..eb9dbcf6 100644 +index 4b8d9b54..ff76220 100644 --- a/block/blk-iopoll.c +++ b/block/blk-iopoll.c @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll) @@ -34739,15 +34276,6 @@ index 58916af..eb9dbcf6 100644 { struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); int rearm = 0, budget = blk_iopoll_budget; -@@ -209,7 +209,7 @@ static int __cpuinit blk_iopoll_cpu_notify(struct notifier_block *self, - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata blk_iopoll_cpu_notifier = { -+static struct notifier_block blk_iopoll_cpu_notifier = { - .notifier_call = blk_iopoll_cpu_notify, - }; - diff --git a/block/blk-map.c b/block/blk-map.c index 623e1cd..ca1e109 100644 --- a/block/blk-map.c @@ -34762,7 +34290,7 @@ index 623e1cd..ca1e109 100644 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); else diff --git a/block/blk-softirq.c b/block/blk-softirq.c -index 467c8de..f3628c5 100644 +index ec9e606..2244d4e 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); @@ -34774,15 +34302,6 @@ index 467c8de..f3628c5 100644 { struct list_head *cpu_list, local_list; -@@ -98,7 +98,7 @@ static int __cpuinit blk_cpu_notify(struct notifier_block *self, - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata blk_cpu_notifier = { -+static struct notifier_block blk_cpu_notifier = { - .notifier_call = blk_cpu_notify, - }; - diff --git a/block/bsg.c b/block/bsg.c index 420a5a9..23834aa 100644 --- a/block/bsg.c @@ -34815,10 +34334,10 @@ 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 7c668c8..db3521c 100644 +index 7e5d474..0cf0017 100644 --- a/block/compat_ioctl.c +++ b/block/compat_ioctl.c -@@ -340,7 +340,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode, +@@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode, err |= __get_user(f->spec1, &uf->spec1); err |= __get_user(f->fmt_gap, &uf->fmt_gap); err |= __get_user(name, &uf->name); @@ -34828,7 +34347,7 @@ index 7c668c8..db3521c 100644 err = -EFAULT; goto out; diff --git a/block/genhd.c b/block/genhd.c -index cdeb527..10aa34db 100644 +index dadf42b..48dc887 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -467,21 +467,24 @@ static char *bdevt_str(dev_t devt, char *buf) @@ -34939,6 +34458,32 @@ index a5ffcc9..3cedc9c 100644 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len)) goto error; +diff --git a/crypto/api.c b/crypto/api.c +index 3b61803..37c4c72 100644 +--- a/crypto/api.c ++++ b/crypto/api.c +@@ -34,6 +34,8 @@ EXPORT_SYMBOL_GPL(crypto_alg_sem); + BLOCKING_NOTIFIER_HEAD(crypto_chain); + EXPORT_SYMBOL_GPL(crypto_chain); + ++static struct crypto_alg *crypto_larval_wait(struct crypto_alg *alg); ++ + struct crypto_alg *crypto_mod_get(struct crypto_alg *alg) + { + return try_module_get(alg->cra_module) ? crypto_alg_get(alg) : NULL; +@@ -144,8 +146,11 @@ static struct crypto_alg *crypto_larval_add(const char *name, u32 type, + } + up_write(&crypto_alg_sem); + +- if (alg != &larval->alg) ++ if (alg != &larval->alg) { + kfree(larval); ++ if (crypto_is_larval(alg)) ++ alg = crypto_larval_wait(alg); ++ } + + return alg; + } diff --git a/crypto/cryptd.c b/crypto/cryptd.c index 7bdd61b..afec999 100644 --- a/crypto/cryptd.c @@ -34962,7 +34507,7 @@ index 7bdd61b..afec999 100644 static void cryptd_queue_worker(struct work_struct *work); diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c -index b2c99dc..476c9fb 100644 +index f8c920c..ab2cb5a 100644 --- a/crypto/pcrypt.c +++ b/crypto/pcrypt.c @@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name) @@ -34974,17 +34519,6 @@ index b2c99dc..476c9fb 100644 if (!ret) kobject_uevent(&pinst->kobj, KOBJ_ADD); -@@ -455,8 +455,8 @@ static int pcrypt_init_padata(struct padata_pcrypt *pcrypt, - - get_online_cpus(); - -- pcrypt->wq = alloc_workqueue(name, -- WQ_MEM_RECLAIM | WQ_CPU_INTENSIVE, 1); -+ pcrypt->wq = alloc_workqueue("%s", -+ WQ_MEM_RECLAIM | WQ_CPU_INTENSIVE, 1, name); - if (!pcrypt->wq) - goto err; - diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h index f220d64..d359ad6 100644 --- a/drivers/acpi/apei/apei-internal.h @@ -35020,10 +34554,10 @@ index 33dc6a0..4b24b47 100644 EXPORT_SYMBOL_GPL(cper_next_record_id); diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c -index fcd7d91..6b2f1a3 100644 +index ec9b57d..9682b3a 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c -@@ -468,7 +468,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_hest_generic_status *estatus) { @@ -35032,7 +34566,7 @@ index fcd7d91..6b2f1a3 100644 unsigned int curr_seqno; char pfx_seq[64]; -@@ -479,7 +479,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; } @@ -35080,64 +34614,11 @@ index cb96296..b81293b 100644 { .callback = dmi_disable_osi_vista, .ident = "Fujitsu Siemens", -diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c -index 7586544..636a2f0 100644 ---- a/drivers/acpi/ec_sys.c -+++ b/drivers/acpi/ec_sys.c -@@ -12,6 +12,7 @@ - #include <linux/acpi.h> - #include <linux/debugfs.h> - #include <linux/module.h> -+#include <linux/uaccess.h> - #include "internal.h" - - MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>"); -@@ -34,7 +35,7 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf, - * struct acpi_ec *ec = ((struct seq_file *)f->private_data)->private; - */ - unsigned int size = EC_SPACE_SIZE; -- u8 *data = (u8 *) buf; -+ u8 data; - loff_t init_off = *off; - int err = 0; - -@@ -47,9 +48,11 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf, - size = count; - - while (size) { -- err = ec_read(*off, &data[*off - init_off]); -+ err = ec_read(*off, &data); - if (err) - return err; -+ if (put_user(data, &buf[*off - init_off])) -+ return -EFAULT; - *off += 1; - size--; - } -@@ -65,7 +68,6 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf, - - unsigned int size = count; - loff_t init_off = *off; -- u8 *data = (u8 *) buf; - int err = 0; - - if (*off >= EC_SPACE_SIZE) -@@ -76,7 +78,9 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf, - } - - while (size) { -- u8 byte_write = data[*off - init_off]; -+ u8 byte_write; -+ if (get_user(byte_write, &buf[*off - init_off])) -+ return -EFAULT; - err = ec_write(*off, byte_write); - if (err) - return err; diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c -index eb133c7..f571552 100644 +index f98dd00..7b69865 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c -@@ -994,7 +994,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr) +@@ -992,7 +992,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr) { int i, count = CPUIDLE_DRIVER_STATE_START; struct acpi_processor_cx *cx; @@ -35147,7 +34628,7 @@ index eb133c7..f571552 100644 if (!pr->flags.power_setup_done) diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c -index fcae5fa..e9f71ea 100644 +index 05306a5..733d1f0 100644 --- a/drivers/acpi/sysfs.c +++ b/drivers/acpi/sysfs.c @@ -423,11 +423,11 @@ static u32 num_counters; @@ -35165,10 +34646,10 @@ index fcae5fa..e9f71ea 100644 static void delete_gpe_attr_array(void) { diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c -index 7b9bdd8..37638ca 100644 +index acfd0f7..e5acb08 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c -@@ -1230,7 +1230,7 @@ int ahci_kick_engine(struct ata_port *ap) +@@ -1231,7 +1231,7 @@ int ahci_kick_engine(struct ata_port *ap) } EXPORT_SYMBOL_GPL(ahci_kick_engine); @@ -35178,7 +34659,7 @@ index 7b9bdd8..37638ca 100644 unsigned long timeout_msec) { diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c -index adf002a..06c46a7 100644 +index c24354d..335c975 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); @@ -35208,7 +34689,7 @@ index adf002a..06c46a7 100644 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE)); ap = qc->ap; link = qc->dev->link; -@@ -5926,6 +5926,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops) +@@ -5927,6 +5927,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops) return; spin_lock(&lock); @@ -35216,7 +34697,7 @@ index adf002a..06c46a7 100644 for (cur = ops->inherits; cur; cur = cur->inherits) { void **inherit = (void **)cur; -@@ -5939,8 +5940,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops) +@@ -5940,8 +5941,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops) if (IS_ERR(*pp)) *pp = NULL; @@ -35227,20 +34708,20 @@ index adf002a..06c46a7 100644 spin_unlock(&lock); } -@@ -6133,7 +6135,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) +@@ -6134,7 +6136,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++) + for (i = 0; i < host->n_ports; i++) { - host->ports[i]->print_id = atomic_inc_return(&ata_print_id); + host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id); + host->ports[i]->local_port_no = i + 1; + } - - /* Create associated sysfs transport objects */ diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c -index 0101af5..c70c325 100644 +index b1e880a..8cf82e1 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c -@@ -4105,7 +4105,7 @@ int ata_sas_port_init(struct ata_port *ap) +@@ -4104,7 +4104,7 @@ int ata_sas_port_init(struct ata_port *ap) if (rc) return rc; @@ -35263,7 +34744,7 @@ index 577d902b..cb4781e 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 7638121..357a965 100644 +index 848ed32..132f39d 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) @@ -35291,7 +34772,7 @@ index f9b983a..887b9d8 100644 return 0; } diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c -index 77a7480d..05cde58 100644 +index 62a7607..cc4be104 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) { @@ -36273,19 +35754,6 @@ index 969c3c2..9b72956 100644 wake_up(&zatm_vcc->tx_wait); } -diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c -index d78b204..ecc1929 100644 ---- a/drivers/base/attribute_container.c -+++ b/drivers/base/attribute_container.c -@@ -167,7 +167,7 @@ attribute_container_add_device(struct device *dev, - ic->classdev.parent = get_device(dev); - ic->classdev.class = cont->class; - cont->class->dev_release = attribute_container_release; -- dev_set_name(&ic->classdev, dev_name(dev)); -+ dev_set_name(&ic->classdev, "%s", dev_name(dev)); - if (fn) - fn(cont, dev, &ic->classdev); - else diff --git a/drivers/base/bus.c b/drivers/base/bus.c index d414331..b4dd4ba 100644 --- a/drivers/base/bus.c @@ -36350,7 +35818,7 @@ index 7616a77c..8f57f51 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 7072404..76dcebd 100644 +index bfb8955..42c9b9a 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1850,7 +1850,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state) @@ -36385,7 +35853,7 @@ index a53ebd2..8f73eeb 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 79715e7..df06b3b 100644 +index 2d56f41..8830f19 100644 --- a/drivers/base/power/wakeup.c +++ b/drivers/base/power/wakeup.c @@ -29,14 +29,14 @@ bool events_check_enabled __read_mostly; @@ -36727,7 +36195,7 @@ index be73e9d..7fbf140 100644 cmdlist_t *reqQ; cmdlist_t *cmpQ; diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h -index f943aac..99bfd19 100644 +index 2d7f608..11245fe 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -582,7 +582,7 @@ struct drbd_epoch { @@ -36739,7 +36207,7 @@ index f943aac..99bfd19 100644 atomic_t active; /* increased on every req. added, and dec on every finished. */ unsigned long flags; }; -@@ -1021,7 +1021,7 @@ struct drbd_conf { +@@ -1022,7 +1022,7 @@ struct drbd_conf { unsigned int al_tr_number; int al_tr_cycle; wait_queue_head_t seq_wait; @@ -36748,7 +36216,7 @@ index f943aac..99bfd19 100644 unsigned int peer_seq; spinlock_t peer_seq_lock; unsigned int minor; -@@ -1562,7 +1562,7 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname, +@@ -1572,7 +1572,7 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname, char __user *uoptval; int err; @@ -36758,7 +36226,7 @@ index f943aac..99bfd19 100644 set_fs(KERNEL_DS); if (level == SOL_SOCKET) diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c -index a5dca6a..bb27967 100644 +index 55635ed..40e837c 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, @@ -36791,10 +36259,10 @@ index a5dca6a..bb27967 100644 idr_destroy(&tconn->volumes); diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c -index 9e3f441..4044d47 100644 +index 8cc1e64..ba7ffa9 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c -@@ -3339,7 +3339,7 @@ out: +@@ -3440,7 +3440,7 @@ out: void drbd_bcast_event(struct drbd_conf *mdev, const struct sib_info *sib) { @@ -36803,7 +36271,7 @@ index 9e3f441..4044d47 100644 struct sk_buff *msg; struct drbd_genlmsghdr *d_out; unsigned seq; -@@ -3352,7 +3352,7 @@ void drbd_bcast_event(struct drbd_conf *mdev, const struct sib_info *sib) +@@ -3453,7 +3453,7 @@ void drbd_bcast_event(struct drbd_conf *mdev, const struct sib_info *sib) return; } @@ -36813,7 +36281,7 @@ index 9e3f441..4044d47 100644 if (!msg) goto failed; diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c -index 4222aff..1f79506 100644 +index cc29cd3..d4b058b 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) @@ -36912,7 +36380,7 @@ index 4222aff..1f79506 100644 static struct asender_cmd asender_tbl[] = { [P_PING] = { 0, got_Ping }, diff --git a/drivers/block/loop.c b/drivers/block/loop.c -index d92d50f..a7e9d97 100644 +index 40e7155..df5c79a 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -232,7 +232,7 @@ static int __do_lo_send_write(struct file *file, @@ -36990,7 +36458,7 @@ index 8a3aff7..d7538c2 100644 return 1; diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c -index 4afcb65..a68a32d 100644 +index 5980cb9..6d7bd7e 100644 --- a/drivers/cdrom/gdrom.c +++ b/drivers/cdrom/gdrom.c @@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = { @@ -37002,7 +36470,7 @@ index 4afcb65..a68a32d 100644 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode) diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig -index 3bb6fa3..34013fb 100644 +index 1421997..33f5d6d 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -8,7 +8,8 @@ source "drivers/tty/Kconfig" @@ -37015,7 +36483,7 @@ index 3bb6fa3..34013fb 100644 help Say Y here if you want to support the /dev/kmem device. The /dev/kmem device is rarely used, but can be used for certain -@@ -582,6 +583,7 @@ config DEVPORT +@@ -570,6 +571,7 @@ config DEVPORT bool depends on !M68K depends on ISA || PCI @@ -37037,10 +36505,10 @@ index a48e05b..6bac831 100644 kfree(usegment); kfree(ksegment); diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c -index 2e04433..771f2cc 100644 +index 1b19239..b87b143 100644 --- a/drivers/char/agp/frontend.c +++ b/drivers/char/agp/frontend.c -@@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg) +@@ -819,7 +819,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; @@ -37049,7 +36517,7 @@ index 2e04433..771f2cc 100644 return -EFAULT; client = agp_find_client_by_pid(reserve.pid); -@@ -847,7 +847,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg) +@@ -849,7 +849,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg) if (segment == NULL) return -ENOMEM; @@ -37071,7 +36539,7 @@ index 4f94375..413694e 100644 return -EINVAL; else diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c -index d784650..e8bfd69 100644 +index 448ce5e..3a76625 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c @@ -559,7 +559,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets, @@ -37165,7 +36633,7 @@ index af4b23f..79806fc 100644 new_smi->interrupt_disabled = 1; atomic_set(&new_smi->stop_operation, 0); diff --git a/drivers/char/mem.c b/drivers/char/mem.c -index 1ccbe94..6ad651a 100644 +index f895a8c..2bc9147 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -18,6 +18,7 @@ @@ -37176,7 +36644,7 @@ index 1ccbe94..6ad651a 100644 #include <linux/ptrace.h> #include <linux/device.h> #include <linux/highmem.h> -@@ -38,6 +39,10 @@ +@@ -37,6 +38,10 @@ #define DEVPORT_MINOR 4 @@ -37187,7 +36655,7 @@ index 1ccbe94..6ad651a 100644 static inline unsigned long size_inside_page(unsigned long start, unsigned long size) { -@@ -69,9 +74,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size) +@@ -68,9 +73,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size) while (cursor < to) { if (!devmem_is_allowed(pfn)) { @@ -37201,7 +36669,7 @@ index 1ccbe94..6ad651a 100644 return 0; } cursor += PAGE_SIZE; -@@ -79,6 +88,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size) +@@ -78,6 +87,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size) } return 1; } @@ -37213,7 +36681,7 @@ index 1ccbe94..6ad651a 100644 #else static inline int range_is_allowed(unsigned long pfn, unsigned long size) { -@@ -121,6 +135,7 @@ static ssize_t read_mem(struct file *file, char __user *buf, +@@ -120,6 +134,7 @@ static ssize_t read_mem(struct file *file, char __user *buf, while (count > 0) { unsigned long remaining; @@ -37221,7 +36689,7 @@ index 1ccbe94..6ad651a 100644 sz = size_inside_page(p, count); -@@ -136,7 +151,23 @@ static ssize_t read_mem(struct file *file, char __user *buf, +@@ -135,7 +150,23 @@ static ssize_t read_mem(struct file *file, char __user *buf, if (!ptr) return -EFAULT; @@ -37246,16 +36714,7 @@ index 1ccbe94..6ad651a 100644 unxlate_dev_mem_ptr(p, ptr); if (remaining) return -EFAULT; -@@ -379,7 +410,7 @@ static ssize_t read_oldmem(struct file *file, char __user *buf, - else - csize = count; - -- rc = copy_oldmem_page(pfn, buf, csize, offset, 1); -+ rc = copy_oldmem_page(pfn, (char __force_kernel *)buf, csize, offset, 1); - if (rc < 0) - return rc; - buf += csize; -@@ -399,9 +430,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf, +@@ -364,9 +395,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf, size_t count, loff_t *ppos) { unsigned long p = *ppos; @@ -37266,7 +36725,7 @@ index 1ccbe94..6ad651a 100644 read = 0; if (p < (unsigned long) high_memory) { -@@ -423,6 +453,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf, +@@ -388,6 +418,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf, } #endif while (low_count > 0) { @@ -37275,7 +36734,7 @@ index 1ccbe94..6ad651a 100644 sz = size_inside_page(p, low_count); /* -@@ -432,7 +464,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf, +@@ -397,7 +429,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf, */ kbuf = xlate_dev_kmem_ptr((char *)p); @@ -37299,9 +36758,9 @@ index 1ccbe94..6ad651a 100644 return -EFAULT; buf += sz; p += sz; -@@ -869,6 +916,9 @@ static const struct memdev { - #ifdef CONFIG_CRASH_DUMP - [12] = { "oldmem", 0, &oldmem_fops, NULL }, +@@ -822,6 +869,9 @@ static const struct memdev { + #ifdef CONFIG_PRINTK + [11] = { "kmsg", 0644, &kmsg_fops, NULL }, #endif +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC) + [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL }, @@ -37309,7 +36768,7 @@ index 1ccbe94..6ad651a 100644 }; static int memory_open(struct inode *inode, struct file *filp) -@@ -940,7 +990,7 @@ static int __init chr_dev_init(void) +@@ -893,7 +943,7 @@ static int __init chr_dev_init(void) continue; device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor), @@ -37318,18 +36777,6 @@ index 1ccbe94..6ad651a 100644 } return tty_init(); -diff --git a/drivers/char/mwave/tp3780i.c b/drivers/char/mwave/tp3780i.c -index c689697..04e6d6a2 100644 ---- a/drivers/char/mwave/tp3780i.c -+++ b/drivers/char/mwave/tp3780i.c -@@ -479,6 +479,7 @@ int tp3780I_QueryAbilities(THINKPAD_BD_DATA * pBDData, MW_ABILITIES * pAbilities - PRINTK_2(TRACE_TP3780I, - "tp3780i::tp3780I_QueryAbilities entry pBDData %p\n", pBDData); - -+ memset(pAbilities, 0, sizeof(*pAbilities)); - /* fill out standard constant fields */ - pAbilities->instr_per_sec = pBDData->rDspSettings.uIps; - pAbilities->data_size = pBDData->rDspSettings.uDStoreSize; diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c index 9df78e2..01ba9ae 100644 --- a/drivers/char/nvram.c @@ -37419,7 +36866,7 @@ index 5c5cc00..ac9edb7 100644 if (cmd != SIOCWANDEV) diff --git a/drivers/char/random.c b/drivers/char/random.c -index 35487e8..dac8bd1 100644 +index 0d91fe5..f8e37b0 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -272,8 +272,13 @@ @@ -37484,10 +36931,10 @@ index 35487e8..dac8bd1 100644 static char sysctl_bootid[16]; @@ -1384,7 +1396,7 @@ static char sysctl_bootid[16]; - static int proc_do_uuid(ctl_table *table, int write, + static int proc_do_uuid(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; unsigned char buf[64], tmp_uuid[16], *uuid; @@ -37620,7 +37067,7 @@ index a33f46f..a720eed 100644 composite = kzalloc(sizeof(*composite), GFP_KERNEL); if (!composite) { diff --git a/drivers/clk/socfpga/clk.c b/drivers/clk/socfpga/clk.c -index bd11315..7f87098 100644 +index 5bb848c..f00ff83 100644 --- a/drivers/clk/socfpga/clk.c +++ b/drivers/clk/socfpga/clk.c @@ -22,6 +22,7 @@ @@ -37630,10 +37077,10 @@ index bd11315..7f87098 100644 +#include <asm/pgtable.h> /* Clock Manager offsets */ - #define CLKMGR_CTRL 0x0 -@@ -135,8 +136,10 @@ static __init struct clk *socfpga_clk_init(struct device_node *node, - if (strcmp(clk_name, "main_pll") || strcmp(clk_name, "periph_pll") || - strcmp(clk_name, "sdram_pll")) { + #define CLKMGR_CTRL 0x0 +@@ -152,8 +153,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; @@ -37644,50 +37091,11 @@ index bd11315..7f87098 100644 } clk = clk_register(NULL, &socfpga_clk->hw.hw); -diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c -index a2b2541..bc1e7ff 100644 ---- a/drivers/clocksource/arm_arch_timer.c -+++ b/drivers/clocksource/arm_arch_timer.c -@@ -264,7 +264,7 @@ static int __cpuinit arch_timer_cpu_notify(struct notifier_block *self, - return NOTIFY_OK; - } - --static struct notifier_block arch_timer_cpu_nb __cpuinitdata = { -+static struct notifier_block arch_timer_cpu_nb = { - .notifier_call = arch_timer_cpu_notify, - }; - -diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c -index 350f493..489479e 100644 ---- a/drivers/clocksource/bcm_kona_timer.c -+++ b/drivers/clocksource/bcm_kona_timer.c -@@ -199,7 +199,7 @@ static struct irqaction kona_timer_irq = { - .handler = kona_timer_interrupt, - }; - --static void __init kona_timer_init(void) -+static void __init kona_timer_init(struct device_node *np) - { - kona_timers_init(); - kona_timer_clockevents_init(); -diff --git a/drivers/clocksource/metag_generic.c b/drivers/clocksource/metag_generic.c -index ade7513..069445f 100644 ---- a/drivers/clocksource/metag_generic.c -+++ b/drivers/clocksource/metag_generic.c -@@ -169,7 +169,7 @@ static int __cpuinit arch_timer_cpu_notify(struct notifier_block *self, - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata arch_timer_cpu_nb = { -+static struct notifier_block arch_timer_cpu_nb = { - .notifier_call = arch_timer_cpu_notify, - }; - diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c -index edc089e..bc7c0bc 100644 +index 3926402..37b580d 100644 --- a/drivers/cpufreq/acpi-cpufreq.c +++ b/drivers/cpufreq/acpi-cpufreq.c -@@ -172,7 +172,7 @@ static ssize_t show_global_boost(struct kobject *kobj, +@@ -173,7 +173,7 @@ static ssize_t show_global_boost(struct kobject *kobj, return sprintf(buf, "%u\n", boost_enabled); } @@ -37696,7 +37104,7 @@ index edc089e..bc7c0bc 100644 show_global_boost, store_global_boost); -@@ -705,8 +705,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) +@@ -722,8 +722,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; @@ -37710,7 +37118,7 @@ index edc089e..bc7c0bc 100644 result = acpi_processor_register_performance(data->acpi_data, cpu); if (result) -@@ -832,7 +835,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) +@@ -851,7 +854,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: @@ -37721,7 +37129,7 @@ index edc089e..bc7c0bc 100644 policy->cur = get_cur_freq_on_cpu(cpu); break; default: -@@ -843,8 +848,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) +@@ -862,8 +867,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) acpi_processor_notify_smm(THIS_MODULE); /* Check for APERF/MPERF support in hardware */ @@ -37736,19 +37144,19 @@ index edc089e..bc7c0bc 100644 pr_debug("CPU%u - ACPI performance management activated.\n", cpu); for (i = 0; i < perf->state_count; i++) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c -index 6485547..477033e 100644 +index f0a5e2b..0a7ee46 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c -@@ -1854,7 +1854,7 @@ static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb, +@@ -1959,7 +1959,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb, return NOTIFY_OK; } -static struct notifier_block __refdata cpufreq_cpu_notifier = { +static struct notifier_block cpufreq_cpu_notifier = { - .notifier_call = cpufreq_cpu_callback, + .notifier_call = cpufreq_cpu_callback, }; -@@ -1886,8 +1886,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data) +@@ -1991,8 +1991,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data) pr_debug("trying to register driver %s\n", driver_data->name); @@ -37763,10 +37171,10 @@ index 6485547..477033e 100644 write_lock_irqsave(&cpufreq_driver_lock, flags); if (cpufreq_driver) { diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c -index a86ff72..aad2b03 100644 +index e59afaa..a53a3ff 100644 --- a/drivers/cpufreq/cpufreq_governor.c +++ b/drivers/cpufreq/cpufreq_governor.c -@@ -235,7 +235,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy, +@@ -191,7 +191,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; @@ -37775,7 +37183,7 @@ index a86ff72..aad2b03 100644 struct od_dbs_tuners *od_tuners = NULL; struct cs_dbs_tuners *cs_tuners = NULL; struct cpu_dbs_common_info *cpu_cdbs; -@@ -298,7 +298,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy, +@@ -257,7 +257,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy, if ((cdata->governor == GOV_CONSERVATIVE) && (!policy->governor->initialized)) { @@ -37784,7 +37192,7 @@ index a86ff72..aad2b03 100644 cpufreq_register_notifier(cs_ops->notifier_block, CPUFREQ_TRANSITION_NOTIFIER); -@@ -315,7 +315,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy, +@@ -277,7 +277,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy, if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) && (policy->governor->initialized == 1)) { @@ -37794,7 +37202,7 @@ index a86ff72..aad2b03 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 0d9e6be..461fd3b 100644 +index d5f12b4..421daae 100644 --- a/drivers/cpufreq/cpufreq_governor.h +++ b/drivers/cpufreq/cpufreq_governor.h @@ -204,7 +204,7 @@ struct common_dbs_data { @@ -37832,10 +37240,10 @@ index c087347..dad6268 100644 } EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler); diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c -index bfd6273..e39dd63 100644 +index d37568c..fbb19a1 100644 --- a/drivers/cpufreq/cpufreq_stats.c +++ b/drivers/cpufreq/cpufreq_stats.c -@@ -365,7 +365,7 @@ static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb, +@@ -365,7 +365,7 @@ static int cpufreq_stat_cpu_callback(struct notifier_block *nfb, } /* priority=1 so this will get called before cpufreq_remove_dev */ @@ -37845,7 +37253,7 @@ index bfd6273..e39dd63 100644 .priority = 1, }; diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c -index 421ef37..e708530c 100644 +index 9ee7817..17b658e 100644 --- a/drivers/cpufreq/p4-clockmod.c +++ b/drivers/cpufreq/p4-clockmod.c @@ -160,10 +160,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c) @@ -37877,7 +37285,7 @@ index 421ef37..e708530c 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 c71ee14..7c2e183 100644 +index 880ee29..2445bc6 100644 --- a/drivers/cpufreq/sparc-us3-cpufreq.c +++ b/drivers/cpufreq/sparc-us3-cpufreq.c @@ -18,14 +18,12 @@ @@ -37986,7 +37394,7 @@ index c71ee14..7c2e183 100644 MODULE_AUTHOR("David S. Miller <davem@redhat.com>"); diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c -index 618e6f4..e89d915 100644 +index 0915e71..53376ed 100644 --- a/drivers/cpufreq/speedstep-centrino.c +++ b/drivers/cpufreq/speedstep-centrino.c @@ -353,8 +353,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy) @@ -38004,7 +37412,7 @@ index 618e6f4..e89d915 100644 if (policy->cpu != 0) return -ENODEV; diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c -index c3a93fe..e808f24 100644 +index fdc432f..98e64e2 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -254,7 +254,7 @@ static int poll_idle(struct cpuidle_device *dev, @@ -38052,7 +37460,7 @@ index 428754a..8bdf9cc 100644 .name = "cpuidle", }; diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c -index ebf130e..e32d8a9 100644 +index 12fea3e..1e28f47 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); @@ -38074,19 +37482,10 @@ index ebf130e..e32d8a9 100644 err = pci_request_regions(pdev, name); if (err) diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c -index 3b36797..db0b0c0 100644 +index e94e619..f7e249c 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c -@@ -477,7 +477,7 @@ struct devfreq *devfreq_add_device(struct device *dev, - GFP_KERNEL); - devfreq->last_stat_updated = jiffies; - -- dev_set_name(&devfreq->dev, dev_name(dev)); -+ dev_set_name(&devfreq->dev, "%s", dev_name(dev)); - err = device_register(&devfreq->dev); - if (err) { - put_device(&devfreq->dev); -@@ -588,7 +588,7 @@ int devfreq_add_governor(struct devfreq_governor *governor) +@@ -607,7 +607,7 @@ int devfreq_add_governor(struct devfreq_governor *governor) goto err_out; } @@ -38095,7 +37494,7 @@ index 3b36797..db0b0c0 100644 list_for_each_entry(devfreq, &devfreq_list, node) { int ret = 0; -@@ -676,7 +676,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor) +@@ -695,7 +695,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor) } } @@ -38105,10 +37504,10 @@ index 3b36797..db0b0c0 100644 mutex_unlock(&devfreq_list_lock); diff --git a/drivers/dma/sh/shdma.c b/drivers/dma/sh/shdma.c -index b70709b..1d8d02a 100644 +index 5039fbc..841169f 100644 --- a/drivers/dma/sh/shdma.c +++ b/drivers/dma/sh/shdma.c -@@ -476,7 +476,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self, +@@ -488,7 +488,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self, return ret; } @@ -38134,7 +37533,7 @@ index 211021d..201d47f 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 c4d700a..0b57abd 100644 +index e7c32c4..6397af1 100644 --- a/drivers/edac/edac_mc_sysfs.c +++ b/drivers/edac/edac_mc_sysfs.c @@ -148,7 +148,7 @@ static const char * const edac_caps[] = { @@ -38324,10 +37723,10 @@ index 57ea7f4..af06b76 100644 card->driver->update_phy_reg(card, 4, PHY_LINK_ACTIVE | PHY_CONTENDER, 0); diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c -index 664a6ff..af13580 100644 +index de4aa40..49ab1f2 100644 --- a/drivers/firewire/core-device.c +++ b/drivers/firewire/core-device.c -@@ -232,7 +232,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma); +@@ -253,7 +253,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma); struct config_rom_attribute { struct device_attribute attr; u32 key; @@ -38374,10 +37773,10 @@ index 94a58a0..f5eba42 100644 container_of(_dev_attr, struct dmi_device_attribute, dev_attr) diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c -index b95159b..841ae55 100644 +index 232fa8f..386c255 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c -@@ -497,11 +497,6 @@ void __init dmi_scan_machine(void) +@@ -504,11 +504,6 @@ void __init dmi_scan_machine(void) } } else { @@ -38389,7 +37788,7 @@ index b95159b..841ae55 100644 p = dmi_ioremap(0xF0000, 0x10000); if (p == NULL) goto error; -@@ -786,7 +781,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *), +@@ -806,7 +801,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *), if (buf == NULL) return -1; @@ -38425,7 +37824,7 @@ index 5145fa3..0d3babd 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 8bd1bb6..c48b0c6 100644 +index 8a7432a..28fb839 100644 --- a/drivers/firmware/efi/efivars.c +++ b/drivers/firmware/efi/efivars.c @@ -452,7 +452,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var) @@ -38453,10 +37852,10 @@ index 2a90ba6..07f3733 100644 ret = sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr); diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c -index e16d932..f0206ef 100644 +index 2729e3d..f9deca1 100644 --- a/drivers/gpio/gpio-ich.c +++ b/drivers/gpio/gpio-ich.c -@@ -69,7 +69,7 @@ struct ichx_desc { +@@ -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); @@ -38479,10 +37878,10 @@ index 9902732..64b62dd 100644 return -EINVAL; } diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c -index ed1334e..ee0dd42 100644 +index 6a64749..0767a9f 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c -@@ -321,7 +321,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder, +@@ -322,7 +322,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder, struct drm_crtc *tmp; int crtc_mask = 1; @@ -38492,10 +37891,10 @@ index ed1334e..ee0dd42 100644 dev = crtc->dev; diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c -index 9cc247f..36aa285 100644 +index 99fcd7c..13cf6c5 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c -@@ -306,7 +306,7 @@ module_exit(drm_core_exit); +@@ -307,7 +307,7 @@ module_exit(drm_core_exit); /** * Copy and IOCTL return string to user space */ @@ -38504,7 +37903,7 @@ index 9cc247f..36aa285 100644 { int len; -@@ -376,7 +376,7 @@ long drm_ioctl(struct file *filp, +@@ -377,7 +377,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; @@ -38513,7 +37912,7 @@ index 9cc247f..36aa285 100644 unsigned int nr = DRM_IOCTL_NR(cmd); int retcode = -EINVAL; char stack_kdata[128]; -@@ -389,7 +389,7 @@ long drm_ioctl(struct file *filp, +@@ -390,7 +390,7 @@ long drm_ioctl(struct file *filp, return -ENODEV; atomic_inc(&dev->ioctl_count); @@ -38523,7 +37922,7 @@ index 9cc247f..36aa285 100644 if ((nr >= DRM_CORE_IOCTL_COUNT) && diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c -index 429e07d..e681a2c 100644 +index 3a24385..4e426e0 100644 --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c @@ -71,7 +71,7 @@ static int drm_setup(struct drm_device * dev) @@ -38562,7 +37961,7 @@ index 429e07d..e681a2c 100644 return retcode; } EXPORT_SYMBOL(drm_open); -@@ -441,7 +441,7 @@ int drm_release(struct inode *inode, struct file *filp) +@@ -456,7 +456,7 @@ int drm_release(struct inode *inode, struct file *filp) mutex_lock(&drm_global_mutex); @@ -38571,7 +37970,7 @@ index 429e07d..e681a2c 100644 if (dev->driver->preclose) dev->driver->preclose(dev, file_priv); -@@ -450,10 +450,10 @@ int drm_release(struct inode *inode, struct file *filp) +@@ -465,10 +465,10 @@ int drm_release(struct inode *inode, struct file *filp) * Begin inline drm_release */ @@ -38584,7 +37983,7 @@ index 429e07d..e681a2c 100644 /* Release any auth tokens that might point to this file_priv, (do that under the drm_global_mutex) */ -@@ -550,8 +550,8 @@ int drm_release(struct inode *inode, struct file *filp) +@@ -565,8 +565,8 @@ int drm_release(struct inode *inode, struct file *filp) * End inline drm_release */ @@ -38753,10 +38152,10 @@ index 2f4c434..dd12cd2 100644 ret = drm_ioctl(filp, cmd, arg); diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c -index e77bd8b..1571b85 100644 +index ffd7a7b..a64643e 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c -@@ -252,7 +252,7 @@ int drm_getstats(struct drm_device *dev, void *data, +@@ -265,7 +265,7 @@ int drm_getstats(struct drm_device *dev, void *data, stats->data[i].value = (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0); else @@ -38788,10 +38187,10 @@ index d752c96..fe08455 100644 if (drm_lock_free(&master->lock, lock->context)) { /* FIXME: Should really bail out here. */ diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c -index 16f3ec5..b28f9ca 100644 +index 327ca19..684d3c0 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c -@@ -501,7 +501,7 @@ void drm_unplug_dev(struct drm_device *dev) +@@ -495,7 +495,7 @@ void drm_unplug_dev(struct drm_device *dev) drm_device_set_unplugged(dev); @@ -38801,10 +38200,10 @@ index 16f3ec5..b28f9ca 100644 } mutex_unlock(&drm_global_mutex); diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c -index 0229665..f61329c 100644 +index 2290b3b..22056a1 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c -@@ -499,7 +499,7 @@ EXPORT_SYMBOL(drm_sysfs_hotplug_event); +@@ -524,7 +524,7 @@ EXPORT_SYMBOL(drm_sysfs_hotplug_event); int drm_sysfs_device_add(struct drm_minor *minor) { int err; @@ -38814,7 +38213,7 @@ index 0229665..f61329c 100644 minor->kdev.parent = minor->dev->dev; diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c -index 004ecdf..db1f6e0 100644 +index ada49ed..29275a0 100644 --- a/drivers/gpu/drm/i810/i810_dma.c +++ b/drivers/gpu/drm/i810/i810_dma.c @@ -945,8 +945,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data, @@ -38855,10 +38254,10 @@ index 6e0acad..93c8289 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 e913d32..4d9b351 100644 +index 47d6c74..279123f 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c -@@ -499,7 +499,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) +@@ -541,7 +541,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) I915_READ(GTIMR)); } seq_printf(m, "Interrupts received: %d\n", @@ -38868,10 +38267,10 @@ index e913d32..4d9b351 100644 if (IS_GEN6(dev) || IS_GEN7(dev)) { seq_printf(m, diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c -index 17d9b0b..860e6d9 100644 +index f466980..8f2883f 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c -@@ -1259,7 +1259,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev) +@@ -1260,7 +1260,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev) bool can_switch; spin_lock(&dev->count_lock); @@ -38881,10 +38280,10 @@ index 17d9b0b..860e6d9 100644 return can_switch; } diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h -index 47d8b68..52f5d8d 100644 +index 1929bff..dab130d 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -916,7 +916,7 @@ typedef struct drm_i915_private { +@@ -1028,7 +1028,7 @@ typedef struct drm_i915_private { drm_dma_handle_t *status_page_dmah; struct resource mch_res; @@ -38893,17 +38292,8 @@ index 47d8b68..52f5d8d 100644 /* protects the irq masks */ spinlock_t irq_lock; -@@ -1813,7 +1813,7 @@ extern struct i2c_adapter *intel_gmbus_get_adapter( - struct drm_i915_private *dev_priv, unsigned port); - extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed); - extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit); --extern inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter) -+static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter) - { - return container_of(adapter, struct intel_gmbus, adapter)->force_bit; - } diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c -index 117ce38..eefd237 100644 +index 87a3227..cd13d8f 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -727,9 +727,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec) @@ -38954,10 +38344,10 @@ index 3c59584..500f2e9 100644 return ret; diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c -index e5e32869..1678f36 100644 +index 3d92a7c..9a9cfd7 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c -@@ -670,7 +670,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) +@@ -970,7 +970,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) int pipe; u32 pipe_stats[I915_MAX_PIPES]; @@ -38966,16 +38356,16 @@ index e5e32869..1678f36 100644 while (true) { iir = I915_READ(VLV_IIR); -@@ -835,7 +835,7 @@ static irqreturn_t ivybridge_irq_handler(int irq, void *arg) +@@ -1187,7 +1187,7 @@ static irqreturn_t ivybridge_irq_handler(int irq, void *arg) irqreturn_t ret = IRQ_NONE; int i; - atomic_inc(&dev_priv->irq_received); + atomic_inc_unchecked(&dev_priv->irq_received); - /* disable master interrupt before clearing iir */ - de_ier = I915_READ(DEIER); -@@ -925,7 +925,7 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) + /* We get interrupts on unclaimed registers, so check for this before we + * do any I915_{READ,WRITE}. */ +@@ -1307,7 +1307,7 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) int ret = IRQ_NONE; u32 de_iir, gt_iir, de_ier, pm_iir, sde_ier; @@ -38984,7 +38374,7 @@ index e5e32869..1678f36 100644 /* disable master interrupt before clearing iir */ de_ier = I915_READ(DEIER); -@@ -2089,7 +2089,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev) +@@ -2566,7 +2566,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev) { drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; @@ -38993,7 +38383,16 @@ index e5e32869..1678f36 100644 I915_WRITE(HWSTAM, 0xeffe); -@@ -2124,7 +2124,7 @@ static void valleyview_irq_preinstall(struct drm_device *dev) +@@ -2588,7 +2588,7 @@ static void ivybridge_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); + +@@ -2616,7 +2616,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; @@ -39002,7 +38401,7 @@ index e5e32869..1678f36 100644 /* VLV magic */ I915_WRITE(VLV_IMR, 0); -@@ -2411,7 +2411,7 @@ static void i8xx_irq_preinstall(struct drm_device * dev) +@@ -2928,7 +2928,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; @@ -39011,7 +38410,7 @@ index e5e32869..1678f36 100644 for_each_pipe(pipe) I915_WRITE(PIPESTAT(pipe), 0); -@@ -2490,7 +2490,7 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg) +@@ -3007,7 +3007,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; @@ -39020,7 +38419,7 @@ index e5e32869..1678f36 100644 iir = I915_READ16(IIR); if (iir == 0) -@@ -2565,7 +2565,7 @@ static void i915_irq_preinstall(struct drm_device * dev) +@@ -3082,7 +3082,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; @@ -39029,7 +38428,7 @@ index e5e32869..1678f36 100644 if (I915_HAS_HOTPLUG(dev)) { I915_WRITE(PORT_HOTPLUG_EN, 0); -@@ -2664,7 +2664,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg) +@@ -3181,7 +3181,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg) I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT; int pipe, ret = IRQ_NONE; @@ -39038,7 +38437,7 @@ index e5e32869..1678f36 100644 iir = I915_READ(IIR); do { -@@ -2791,7 +2791,7 @@ static void i965_irq_preinstall(struct drm_device * dev) +@@ -3305,7 +3305,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; @@ -39047,7 +38446,7 @@ index e5e32869..1678f36 100644 I915_WRITE(PORT_HOTPLUG_EN, 0); I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT)); -@@ -2898,7 +2898,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg) +@@ -3414,7 +3414,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; @@ -39057,10 +38456,10 @@ index e5e32869..1678f36 100644 iir = I915_READ(IIR); diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c -index eea5982..eeef407 100644 +index be79f47..95e150b 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c -@@ -8935,13 +8935,13 @@ struct intel_quirk { +@@ -9418,13 +9418,13 @@ struct intel_quirk { int subsystem_vendor; int subsystem_device; void (*hook)(struct drm_device *dev); @@ -39076,7 +38475,7 @@ index eea5982..eeef407 100644 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id) { -@@ -8949,18 +8949,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id) +@@ -9432,18 +9432,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id) return 1; } @@ -39199,7 +38598,7 @@ index 598c281..60d590e 100644 *sequence = cur_fence; diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c -index 6aa2137..fe8dc55 100644 +index 3e72876..d1c15ad 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, @@ -39212,40 +38611,17 @@ index 6aa2137..fe8dc55 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 f2b30f8..d0f9a95 100644 +index 41ff7e0..fa854ef 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.h +++ b/drivers/gpu/drm/nouveau/nouveau_drm.h -@@ -92,7 +92,7 @@ struct nouveau_drm { +@@ -92,7 +92,6 @@ struct nouveau_drm { struct drm_global_reference mem_global_ref; struct ttm_bo_global_ref bo_global_ref; struct ttm_bo_device bdev; - atomic_t validate_sequence; -+ atomic_unchecked_t validate_sequence; int (*move)(struct nouveau_channel *, struct ttm_buffer_object *, struct ttm_mem_reg *, struct ttm_mem_reg *); -diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c -index b4b4d0c..b7edc15 100644 ---- a/drivers/gpu/drm/nouveau/nouveau_gem.c -+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c -@@ -322,7 +322,7 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv, - int ret, i; - struct nouveau_bo *res_bo = NULL; - -- sequence = atomic_add_return(1, &drm->ttm.validate_sequence); -+ sequence = atomic_add_return_unchecked(1, &drm->ttm.validate_sequence); - retry: - if (++trycnt > 100000) { - NV_ERROR(cli, "%s failed and gave up.\n", __func__); -@@ -359,7 +359,7 @@ retry: - if (ret) { - validate_fini(op, NULL); - if (unlikely(ret == -EAGAIN)) { -- sequence = atomic_add_return(1, &drm->ttm.validate_sequence); -+ sequence = atomic_add_return_unchecked(1, &drm->ttm.validate_sequence); - ret = ttm_bo_reserve_slowpath(&nvbo->bo, true, - sequence); - if (!ret) diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c index 08214bc..9208577 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c @@ -39273,7 +38649,7 @@ index 25d3495..d81aaf6 100644 return can_switch; } diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c -index 489cb8c..0b8d0d3 100644 +index 1dfd84c..104896c 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) @@ -39446,10 +38822,10 @@ index 19bb7e6..de7e2a2 100644 #endif diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c -index 5a82b6b..9e69c73 100644 +index af85299..ed9ac8d 100644 --- a/drivers/gpu/drm/radeon/mkregtable.c +++ b/drivers/gpu/drm/radeon/mkregtable.c -@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, const char *filename) +@@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename) regex_t mask_rex; regmatch_t match[4]; char buf[1024]; @@ -39467,10 +38843,10 @@ index 5a82b6b..9e69c73 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 b0dc0b6..a9bfe9c 100644 +index 63398ae..669e045 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c -@@ -1014,7 +1014,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev) +@@ -1105,7 +1105,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev) bool can_switch; spin_lock(&dev->count_lock); @@ -39670,13 +39046,13 @@ index 6c0ce89..57a2529 100644 return radeon_debugfs_add_files(rdev, radeon_mem_types_list, i); diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c -index 55880d5..9e95342 100644 +index d8ddfb3..609de1d 100644 --- a/drivers/gpu/drm/radeon/rs690.c +++ b/drivers/gpu/drm/radeon/rs690.c -@@ -327,9 +327,11 @@ static void rs690_crtc_bandwidth_compute(struct radeon_device *rdev, - if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full && +@@ -345,9 +345,11 @@ static void rs690_crtc_bandwidth_compute(struct radeon_device *rdev, + if (max_bandwidth.full > rdev->pm.sideport_bandwidth.full && rdev->pm.sideport_bandwidth.full) - rdev->pm.max_bandwidth = rdev->pm.sideport_bandwidth; + max_bandwidth = rdev->pm.sideport_bandwidth; - read_delay_latency.full = dfixed_const(370 * 800 * 1000); + read_delay_latency.full = dfixed_const(800 * 1000); read_delay_latency.full = dfixed_div(read_delay_latency, @@ -39684,7 +39060,7 @@ index 55880d5..9e95342 100644 + a.full = dfixed_const(370); + read_delay_latency.full = dfixed_mul(read_delay_latency, a); } else { - if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full && + if (max_bandwidth.full > rdev->pm.k8_bandwidth.full && rdev->pm.k8_bandwidth.full) diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c index dbc2def..0a9f710 100644 @@ -39725,7 +39101,7 @@ index bd2a3b4..122d9ad 100644 int shrink_pages = sc->nr_to_scan; diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c -index dc0c065..58a0782 100644 +index 97e9d61..bf23c461 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) @@ -39943,10 +39319,10 @@ index 8a8725c2..afed796 100644 marker = list_first_entry(&queue->head, struct vmw_marker, head); diff --git a/drivers/gpu/host1x/drm/dc.c b/drivers/gpu/host1x/drm/dc.c -index 8c04943..4370ed9 100644 +index 5360e5a..c2c0d26 100644 --- a/drivers/gpu/host1x/drm/dc.c +++ b/drivers/gpu/host1x/drm/dc.c -@@ -999,7 +999,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor) +@@ -1004,7 +1004,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor) } for (i = 0; i < ARRAY_SIZE(debugfs_files); i++) @@ -39956,7 +39332,7 @@ index 8c04943..4370ed9 100644 err = drm_debugfs_create_files(dc->debugfs_files, ARRAY_SIZE(debugfs_files), diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c -index 402f486..5340852 100644 +index 36668d1..9f4ccb0 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -63,6 +63,8 @@ struct hid_report *hid_register_report(struct hid_device *device, unsigned type, @@ -40061,7 +39437,7 @@ index 402f486..5340852 100644 hid_dump_input(field->report->device, field->usage + offset, value); -@@ -2275,7 +2334,7 @@ EXPORT_SYMBOL_GPL(hid_ignore); +@@ -2285,7 +2344,7 @@ EXPORT_SYMBOL_GPL(hid_ignore); int hid_add_device(struct hid_device *hdev) { @@ -40070,7 +39446,7 @@ index 402f486..5340852 100644 int ret; if (WARN_ON(hdev->status & HID_STAT_ADDED)) -@@ -2309,7 +2368,7 @@ int hid_add_device(struct hid_device *hdev) +@@ -2319,7 +2378,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, @@ -40258,10 +39634,10 @@ index d7ea8c8..a84fb40 100644 for (i = 0; i < ARRAY_SIZE(devices); i++) { if (dev->id.vendor == devices[i].idVendor && diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c -index 5207591a..6c9197f 100644 +index cd33084..7b99c2a 100644 --- a/drivers/hid/hid-logitech-dj.c +++ b/drivers/hid/hid-logitech-dj.c -@@ -421,7 +421,7 @@ static int logi_dj_recv_send_report(struct dj_receiver_dev *djrcv_dev, +@@ -461,7 +461,7 @@ static int logi_dj_recv_send_report(struct dj_receiver_dev *djrcv_dev, struct hid_report *report; struct hid_report_enum *output_report_enum; u8 *data = (u8 *)(&dj_report->device_index); @@ -40270,7 +39646,7 @@ index 5207591a..6c9197f 100644 output_report_enum = &hdev->report_enum[HID_OUTPUT_REPORT]; report = output_report_enum->report_id_hash[REPORT_ID_DJ_SHORT]; -@@ -431,7 +431,9 @@ static int logi_dj_recv_send_report(struct dj_receiver_dev *djrcv_dev, +@@ -471,7 +471,9 @@ static int logi_dj_recv_send_report(struct dj_receiver_dev *djrcv_dev, return -ENODEV; } @@ -40281,7 +39657,7 @@ index 5207591a..6c9197f 100644 report->field[0]->value[i] = data[i]; hid_hw_request(hdev, report, HID_REQ_SET_REPORT); -@@ -738,6 +740,12 @@ static int logi_dj_probe(struct hid_device *hdev, +@@ -783,6 +785,12 @@ static int logi_dj_probe(struct hid_device *hdev, goto hid_parse_fail; } @@ -40295,7 +39671,7 @@ index 5207591a..6c9197f 100644 * hidraw */ retval = hid_hw_start(hdev, HID_CONNECT_DEFAULT); diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c -index d39a5ce..4892dfc 100644 +index cb0e361..2aa275e 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -330,9 +330,18 @@ static void mt_feature_mapping(struct hid_device *hdev, @@ -40423,7 +39799,7 @@ index d164911..ef42e86 100644 if (ret) { hid_err(hdev, "hw start failed\n"); diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c -index 90124ff..3761764 100644 +index c13fb5b..55a3802 100644 --- a/drivers/hid/hid-wiimote-debug.c +++ b/drivers/hid/hid-wiimote-debug.c @@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s, @@ -40496,10 +39872,10 @@ index fc307e0..2b255e8 100644 if (atomic_read(&uhid->report_done)) goto unlock; diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c -index 0b122f8..b1d8160 100644 +index 6de6c98..18319e9 100644 --- a/drivers/hv/channel.c +++ b/drivers/hv/channel.c -@@ -394,8 +394,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer, +@@ -406,8 +406,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer, int ret = 0; int t; @@ -40511,7 +39887,7 @@ index 0b122f8..b1d8160 100644 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount); if (ret) diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c -index ae49237..380d4c9 100644 +index 88f4096..e50452e 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) @@ -40609,10 +39985,10 @@ index deb5c25..ed2d4fd 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 12f2f9e..679603c 100644 +index d84918f..7f38f9f 100644 --- a/drivers/hv/hyperv_vmbus.h +++ b/drivers/hv/hyperv_vmbus.h -@@ -591,7 +591,7 @@ enum vmbus_connect_state { +@@ -595,7 +595,7 @@ enum vmbus_connect_state { struct vmbus_connection { enum vmbus_connect_state conn_state; @@ -40622,10 +39998,10 @@ index 12f2f9e..679603c 100644 /* * Represents channel interrupts. Each bit position represents a diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c -index 4004e54..c2de226 100644 +index e8e071f..5b4b245 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c -@@ -668,10 +668,10 @@ int vmbus_device_register(struct hv_device *child_device_obj) +@@ -672,10 +672,10 @@ int vmbus_device_register(struct hv_device *child_device_obj) { int ret = 0; @@ -40702,10 +40078,10 @@ index b25c643..a13460d 100644 { sysfs_attr_init(&attr->attr); diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c -index 658ce3a..0d0c2f3 100644 +index 2e5e2dc..5208b31 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c -@@ -790,7 +790,7 @@ static int __cpuinit coretemp_cpu_callback(struct notifier_block *nfb, +@@ -785,7 +785,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb, return NOTIFY_OK; } @@ -40728,7 +40104,7 @@ index 1429f6e..ee03d59 100644 /* Set up read-only sensors */ diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c -index 52b77af..aed1ddf 100644 +index 708081b..fe2d4ab 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) @@ -40842,10 +40218,10 @@ index 2507f90..1645765 100644 } diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c -index 76f157b..9c0db1b 100644 +index 38944e9..ae9e5ed 100644 --- a/drivers/hwmon/via-cputemp.c +++ b/drivers/hwmon/via-cputemp.c -@@ -296,7 +296,7 @@ static int __cpuinit via_cputemp_cpu_callback(struct notifier_block *nfb, +@@ -296,7 +296,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb, return NOTIFY_OK; } @@ -40894,7 +40270,7 @@ index c3ccdea..5b3dc1a 100644 if (IS_ERR(rdwr_pa[i].buf)) { res = PTR_ERR(rdwr_pa[i].buf); diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c -index 2ff6204..218c16e 100644 +index 0b510ba..4fbb5085 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c @@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq) @@ -41210,7 +40586,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 4d599ce..697b17f 100644 +index f2a3f48..673ec79 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) @@ -41222,6 +40598,19 @@ index 4d599ce..697b17f 100644 cpu_to_be64(0xff00000000000000LL); } +diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c +index 25b2cdf..099ff97 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) + { + char name[20]; + +- atomic_set(&ctx->tid, 0); ++ atomic_set_unchecked(&ctx->tid, 0); + sprintf(name, "mlx4_ib_mcg%d", ctx->port); + 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 f61ec26..ebf72cf 100644 --- a/drivers/infiniband/hw/mlx4/mlx4_ib.h @@ -41640,7 +41029,7 @@ index 49eb511..a774366 100644 /** diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c -index 8f67fe2..8960859 100644 +index 5b53ca5..443da3c 100644 --- a/drivers/infiniband/hw/nes/nes_verbs.c +++ b/drivers/infiniband/hw/nes/nes_verbs.c @@ -46,9 +46,9 @@ @@ -41665,7 +41054,7 @@ index 8f67fe2..8960859 100644 switch (init_attr->qp_type) { case IB_QPT_RC: if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) { -@@ -1465,7 +1465,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp) +@@ -1466,7 +1466,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp) struct iw_cm_event cm_event; int ret = 0; @@ -41675,13 +41064,13 @@ index 8f67fe2..8960859 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 4d11575..3e890e5 100644 +index 4a9af79..b993f75 100644 --- a/drivers/infiniband/hw/qib/qib.h +++ b/drivers/infiniband/hw/qib/qib.h -@@ -51,6 +51,7 @@ - #include <linux/completion.h> +@@ -52,6 +52,7 @@ #include <linux/kref.h> #include <linux/sched.h> + #include <linux/kthread.h> +#include <linux/slab.h> #include "qib_common.h" @@ -41742,10 +41131,10 @@ index 04c69af..5f92d00 100644 #include <linux/input.h> #include <linux/gameport.h> diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c -index fa061d4..4a6957c 100644 +index 75e3b10..fb390fd 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c -@@ -735,7 +735,7 @@ static void xpad_led_set(struct led_classdev *led_cdev, +@@ -736,7 +736,7 @@ static void xpad_led_set(struct led_classdev *led_cdev, static int xpad_led_probe(struct usb_xpad *xpad) { @@ -41754,7 +41143,7 @@ index fa061d4..4a6957c 100644 long led_no; struct xpad_led *led; struct led_classdev *led_cdev; -@@ -748,7 +748,7 @@ static int xpad_led_probe(struct usb_xpad *xpad) +@@ -749,7 +749,7 @@ static int xpad_led_probe(struct usb_xpad *xpad) if (!led) return -ENOMEM; @@ -41856,7 +41245,7 @@ index 59df2e7..8f1cafb 100644 INIT_LIST_HEAD(&serio_raw->client_list); init_waitqueue_head(&serio_raw->wait); diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index d8f98b1..f62a640 100644 +index fbe9ca7..dbee61d 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -583,7 +583,7 @@ static struct notifier_block iommu_bus_nb = { @@ -41869,10 +41258,10 @@ index d8f98b1..f62a640 100644 /** diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c -index dcfea4e..f4226b2 100644 +index 39f81ae..2660096 100644 --- a/drivers/iommu/irq_remapping.c +++ b/drivers/iommu/irq_remapping.c -@@ -354,7 +354,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id) +@@ -356,7 +356,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id) void panic_if_irq_remap(const char *msg) { if (irq_remapping_enabled) @@ -41881,7 +41270,7 @@ index dcfea4e..f4226b2 100644 } static void ir_ack_apic_edge(struct irq_data *data) -@@ -375,10 +375,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p) +@@ -377,10 +377,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p) void irq_remap_modify_chip_defaults(struct irq_chip *chip) { @@ -41899,7 +41288,7 @@ index dcfea4e..f4226b2 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 19ceaa6..3625818 100644 +index ee7c503..5d4ce08 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly; @@ -42024,6 +41413,611 @@ index 4d9b195..455075c 100644 return -EFAULT; } else { memcpy(buf, dp, left); +diff --git a/drivers/isdn/hisax/amd7930_fn.c b/drivers/isdn/hisax/amd7930_fn.c +index 1063bab..36817e0 100644 +--- a/drivers/isdn/hisax/amd7930_fn.c ++++ b/drivers/isdn/hisax/amd7930_fn.c +@@ -314,7 +314,7 @@ Amd7930_empty_Dfifo(struct IsdnCardState *cs, int flag) + + t += sprintf(t, "Amd7930: empty_Dfifo cnt: %d |", cs->rcvidx); + QuickHex(t, cs->rcvbuf, cs->rcvidx); +- debugl1(cs, cs->dlog); ++ debugl1(cs, "%s", cs->dlog); + } + /* moves received data in sk-buffer */ + memcpy(skb_put(skb, cs->rcvidx), cs->rcvbuf, cs->rcvidx); +@@ -406,7 +406,7 @@ Amd7930_fill_Dfifo(struct IsdnCardState *cs) + + t += sprintf(t, "Amd7930: fill_Dfifo cnt: %d |", count); + QuickHex(t, deb_ptr, count); +- debugl1(cs, cs->dlog); ++ debugl1(cs, "%s", cs->dlog); + } + /* AMD interrupts on */ + AmdIrqOn(cs); +diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c +index ee9b9a0..d1427bd 100644 +--- a/drivers/isdn/hisax/avm_pci.c ++++ b/drivers/isdn/hisax/avm_pci.c +@@ -285,7 +285,7 @@ hdlc_empty_fifo(struct BCState *bcs, int count) + t += sprintf(t, "hdlc_empty_fifo %c cnt %d", + bcs->channel ? 'B' : 'A', count); + QuickHex(t, p, count); +- debugl1(cs, bcs->blog); ++ debugl1(cs, "%s", bcs->blog); + } + } + +@@ -345,7 +345,7 @@ hdlc_fill_fifo(struct BCState *bcs) + t += sprintf(t, "hdlc_fill_fifo %c cnt %d", + bcs->channel ? 'B' : 'A', count); + QuickHex(t, p, count); +- debugl1(cs, bcs->blog); ++ debugl1(cs, "%s", bcs->blog); + } + } + +diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c +index bf04d2a..b33f53b 100644 +--- a/drivers/isdn/hisax/config.c ++++ b/drivers/isdn/hisax/config.c +@@ -1896,7 +1896,7 @@ static void EChannel_proc_rcv(struct hisax_d_if *d_if) + ptr--; + *ptr++ = '\n'; + *ptr = 0; +- HiSax_putstatus(cs, NULL, cs->dlog); ++ HiSax_putstatus(cs, NULL, "%s", cs->dlog); + } else + HiSax_putstatus(cs, "LogEcho: ", + "warning Frame too big (%d)", +diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c +index 8d0cf6e..4fc90de 100644 +--- a/drivers/isdn/hisax/diva.c ++++ b/drivers/isdn/hisax/diva.c +@@ -427,7 +427,7 @@ Memhscx_empty_fifo(struct BCState *bcs, int count) + t += sprintf(t, "hscx_empty_fifo %c cnt %d", + bcs->hw.hscx.hscx ? 'B' : 'A', count); + QuickHex(t, ptr, count); +- debugl1(cs, bcs->blog); ++ debugl1(cs, "%s", bcs->blog); + } + } + +@@ -469,7 +469,7 @@ Memhscx_fill_fifo(struct BCState *bcs) + t += sprintf(t, "hscx_fill_fifo %c cnt %d", + bcs->hw.hscx.hscx ? 'B' : 'A', count); + QuickHex(t, ptr, count); +- debugl1(cs, bcs->blog); ++ debugl1(cs, "%s", bcs->blog); + } + } + +diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c +index 1df6f9a..2be1c8a 100644 +--- a/drivers/isdn/hisax/elsa.c ++++ b/drivers/isdn/hisax/elsa.c +@@ -535,7 +535,7 @@ check_arcofi(struct IsdnCardState *cs) + t = tmp; + t += sprintf(tmp, "Arcofi data"); + QuickHex(t, p, cs->dc.isac.mon_rxp); +- debugl1(cs, tmp); ++ debugl1(cs, "%s", tmp); + if ((cs->dc.isac.mon_rxp == 2) && (cs->dc.isac.mon_rx[0] == 0xa0)) { + switch (cs->dc.isac.mon_rx[1]) { + case 0x80: +diff --git a/drivers/isdn/hisax/elsa_ser.c b/drivers/isdn/hisax/elsa_ser.c +index d4c98d3..3f84dd8 100644 +--- a/drivers/isdn/hisax/elsa_ser.c ++++ b/drivers/isdn/hisax/elsa_ser.c +@@ -344,7 +344,7 @@ static inline void receive_chars(struct IsdnCardState *cs, + + t += sprintf(t, "modem read cnt %d", cs->hw.elsa.rcvcnt); + QuickHex(t, cs->hw.elsa.rcvbuf, cs->hw.elsa.rcvcnt); +- debugl1(cs, tmp); ++ debugl1(cs, "%s", tmp); + } + cs->hw.elsa.rcvcnt = 0; + } +diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c +index 3ccd724..497bd02 100644 +--- a/drivers/isdn/hisax/hfc_pci.c ++++ b/drivers/isdn/hisax/hfc_pci.c +@@ -901,7 +901,7 @@ Begin: + ptr--; + *ptr++ = '\n'; + *ptr = 0; +- HiSax_putstatus(cs, NULL, cs->dlog); ++ HiSax_putstatus(cs, NULL, "%s", cs->dlog); + } else + HiSax_putstatus(cs, "LogEcho: ", "warning Frame too big (%d)", total - 3); + } +diff --git a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c +index dc4574f..fa1fefd 100644 +--- a/drivers/isdn/hisax/hfc_sx.c ++++ b/drivers/isdn/hisax/hfc_sx.c +@@ -674,7 +674,7 @@ receive_emsg(struct IsdnCardState *cs) + ptr--; + *ptr++ = '\n'; + *ptr = 0; +- HiSax_putstatus(cs, NULL, cs->dlog); ++ HiSax_putstatus(cs, NULL, "%s", cs->dlog); + } else + HiSax_putstatus(cs, "LogEcho: ", "warning Frame too big (%d)", skb->len); + } +diff --git a/drivers/isdn/hisax/hscx_irq.c b/drivers/isdn/hisax/hscx_irq.c +index f398d48..a8d6188 100644 +--- a/drivers/isdn/hisax/hscx_irq.c ++++ b/drivers/isdn/hisax/hscx_irq.c +@@ -75,7 +75,7 @@ hscx_empty_fifo(struct BCState *bcs, int count) + t += sprintf(t, "hscx_empty_fifo %c cnt %d", + bcs->hw.hscx.hscx ? 'B' : 'A', count); + QuickHex(t, ptr, count); +- debugl1(cs, bcs->blog); ++ debugl1(cs, "%s", bcs->blog); + } + } + +@@ -115,7 +115,7 @@ hscx_fill_fifo(struct BCState *bcs) + t += sprintf(t, "hscx_fill_fifo %c cnt %d", + bcs->hw.hscx.hscx ? 'B' : 'A', count); + QuickHex(t, ptr, count); +- debugl1(cs, bcs->blog); ++ debugl1(cs, "%s", bcs->blog); + } + } + +diff --git a/drivers/isdn/hisax/icc.c b/drivers/isdn/hisax/icc.c +index db5321f..51dae91 100644 +--- a/drivers/isdn/hisax/icc.c ++++ b/drivers/isdn/hisax/icc.c +@@ -134,7 +134,7 @@ icc_empty_fifo(struct IsdnCardState *cs, int count) + + t += sprintf(t, "icc_empty_fifo cnt %d", count); + QuickHex(t, ptr, count); +- debugl1(cs, cs->dlog); ++ debugl1(cs, "%s", cs->dlog); + } + } + +@@ -176,7 +176,7 @@ icc_fill_fifo(struct IsdnCardState *cs) + + t += sprintf(t, "icc_fill_fifo cnt %d", count); + QuickHex(t, ptr, count); +- debugl1(cs, cs->dlog); ++ debugl1(cs, "%s", cs->dlog); + } + } + +diff --git a/drivers/isdn/hisax/ipacx.c b/drivers/isdn/hisax/ipacx.c +index 74feb5c..5faa5de 100644 +--- a/drivers/isdn/hisax/ipacx.c ++++ b/drivers/isdn/hisax/ipacx.c +@@ -260,7 +260,7 @@ dch_empty_fifo(struct IsdnCardState *cs, int count) + + t += sprintf(t, "dch_empty_fifo() cnt %d", count); + QuickHex(t, ptr, count); +- debugl1(cs, cs->dlog); ++ debugl1(cs, "%s", cs->dlog); + } + } + +@@ -307,7 +307,7 @@ dch_fill_fifo(struct IsdnCardState *cs) + + t += sprintf(t, "dch_fill_fifo() cnt %d", count); + QuickHex(t, ptr, count); +- debugl1(cs, cs->dlog); ++ debugl1(cs, "%s", cs->dlog); + } + } + +@@ -539,7 +539,7 @@ bch_empty_fifo(struct BCState *bcs, int count) + + t += sprintf(t, "bch_empty_fifo() B-%d cnt %d", hscx, count); + QuickHex(t, ptr, count); +- debugl1(cs, bcs->blog); ++ debugl1(cs, "%s", bcs->blog); + } + } + +@@ -582,7 +582,7 @@ bch_fill_fifo(struct BCState *bcs) + + t += sprintf(t, "chb_fill_fifo() B-%d cnt %d", hscx, count); + QuickHex(t, ptr, count); +- debugl1(cs, bcs->blog); ++ debugl1(cs, "%s", bcs->blog); + } + } + +diff --git a/drivers/isdn/hisax/isac.c b/drivers/isdn/hisax/isac.c +index a365ccc..7fdf78f 100644 +--- a/drivers/isdn/hisax/isac.c ++++ b/drivers/isdn/hisax/isac.c +@@ -137,7 +137,7 @@ isac_empty_fifo(struct IsdnCardState *cs, int count) + + t += sprintf(t, "isac_empty_fifo cnt %d", count); + QuickHex(t, ptr, count); +- debugl1(cs, cs->dlog); ++ debugl1(cs, "%s", cs->dlog); + } + } + +@@ -179,7 +179,7 @@ isac_fill_fifo(struct IsdnCardState *cs) + + t += sprintf(t, "isac_fill_fifo cnt %d", count); + QuickHex(t, ptr, count); +- debugl1(cs, cs->dlog); ++ debugl1(cs, "%s", cs->dlog); + } + } + +diff --git a/drivers/isdn/hisax/isar.c b/drivers/isdn/hisax/isar.c +index 7fdf347..f4956c7 100644 +--- a/drivers/isdn/hisax/isar.c ++++ b/drivers/isdn/hisax/isar.c +@@ -74,7 +74,7 @@ sendmsg(struct IsdnCardState *cs, u_char his, u_char creg, u_char len, + t = tmp; + t += sprintf(t, "sendmbox cnt %d", len); + QuickHex(t, &msg[len-i], (i > 64) ? 64 : i); +- debugl1(cs, tmp); ++ debugl1(cs, "%s", tmp); + i -= 64; + } + } +@@ -105,7 +105,7 @@ rcv_mbox(struct IsdnCardState *cs, struct isar_reg *ireg, u_char *msg) + t = tmp; + t += sprintf(t, "rcv_mbox cnt %d", ireg->clsb); + QuickHex(t, &msg[ireg->clsb - i], (i > 64) ? 64 : i); +- debugl1(cs, tmp); ++ debugl1(cs, "%s", tmp); + i -= 64; + } + } +@@ -1248,7 +1248,7 @@ isar_int_main(struct IsdnCardState *cs) + tp += sprintf(debbuf, "msg iis(%x) msb(%x)", + ireg->iis, ireg->cmsb); + QuickHex(tp, (u_char *)ireg->par, ireg->clsb); +- debugl1(cs, debbuf); ++ debugl1(cs, "%s", debbuf); + } + break; + case ISAR_IIS_INVMSG: +diff --git a/drivers/isdn/hisax/jade.c b/drivers/isdn/hisax/jade.c +index f946c58..e2ae787 100644 +--- a/drivers/isdn/hisax/jade.c ++++ b/drivers/isdn/hisax/jade.c +@@ -81,10 +81,7 @@ modejade(struct BCState *bcs, int mode, int bc) + int jade = bcs->hw.hscx.hscx; + + if (cs->debug & L1_DEB_HSCX) { +- char tmp[40]; +- sprintf(tmp, "jade %c mode %d ichan %d", +- 'A' + jade, mode, bc); +- debugl1(cs, tmp); ++ debugl1(cs, "jade %c mode %d ichan %d", 'A' + jade, mode, bc); + } + bcs->mode = mode; + bcs->channel = bc; +@@ -257,23 +254,18 @@ void + clear_pending_jade_ints(struct IsdnCardState *cs) + { + int val; +- char tmp[64]; + + cs->BC_Write_Reg(cs, 0, jade_HDLC_IMR, 0x00); + cs->BC_Write_Reg(cs, 1, jade_HDLC_IMR, 0x00); + + val = cs->BC_Read_Reg(cs, 1, jade_HDLC_ISR); +- sprintf(tmp, "jade B ISTA %x", val); +- debugl1(cs, tmp); ++ debugl1(cs, "jade B ISTA %x", val); + val = cs->BC_Read_Reg(cs, 0, jade_HDLC_ISR); +- sprintf(tmp, "jade A ISTA %x", val); +- debugl1(cs, tmp); ++ debugl1(cs, "jade A ISTA %x", val); + val = cs->BC_Read_Reg(cs, 1, jade_HDLC_STAR); +- sprintf(tmp, "jade B STAR %x", val); +- debugl1(cs, tmp); ++ debugl1(cs, "jade B STAR %x", val); + val = cs->BC_Read_Reg(cs, 0, jade_HDLC_STAR); +- sprintf(tmp, "jade A STAR %x", val); +- debugl1(cs, tmp); ++ debugl1(cs, "jade A STAR %x", val); + /* Unmask ints */ + cs->BC_Write_Reg(cs, 0, jade_HDLC_IMR, 0xF8); + cs->BC_Write_Reg(cs, 1, jade_HDLC_IMR, 0xF8); +diff --git a/drivers/isdn/hisax/jade_irq.c b/drivers/isdn/hisax/jade_irq.c +index f521fc8..b930da9 100644 +--- a/drivers/isdn/hisax/jade_irq.c ++++ b/drivers/isdn/hisax/jade_irq.c +@@ -65,7 +65,7 @@ jade_empty_fifo(struct BCState *bcs, int count) + t += sprintf(t, "jade_empty_fifo %c cnt %d", + bcs->hw.hscx.hscx ? 'B' : 'A', count); + QuickHex(t, ptr, count); +- debugl1(cs, bcs->blog); ++ debugl1(cs, "%s", bcs->blog); + } + } + +@@ -105,7 +105,7 @@ jade_fill_fifo(struct BCState *bcs) + t += sprintf(t, "jade_fill_fifo %c cnt %d", + bcs->hw.hscx.hscx ? 'B' : 'A', count); + QuickHex(t, ptr, count); +- debugl1(cs, bcs->blog); ++ debugl1(cs, "%s", bcs->blog); + } + } + +diff --git a/drivers/isdn/hisax/l3_1tr6.c b/drivers/isdn/hisax/l3_1tr6.c +index 4c1bca5..875402e 100644 +--- a/drivers/isdn/hisax/l3_1tr6.c ++++ b/drivers/isdn/hisax/l3_1tr6.c +@@ -63,7 +63,7 @@ l3_1tr6_error(struct l3_process *pc, u_char *msg, struct sk_buff *skb) + { + dev_kfree_skb(skb); + if (pc->st->l3.debug & L3_DEB_WARN) +- l3_debug(pc->st, msg); ++ l3_debug(pc->st, "%s", msg); + l3_1tr6_release_req(pc, 0, NULL); + } + +@@ -161,7 +161,6 @@ l3_1tr6_setup(struct l3_process *pc, u_char pr, void *arg) + { + u_char *p; + int bcfound = 0; +- char tmp[80]; + struct sk_buff *skb = arg; + + /* Channel Identification */ +@@ -214,10 +213,9 @@ l3_1tr6_setup(struct l3_process *pc, u_char pr, void *arg) + /* Signal all services, linklevel takes care of Service-Indicator */ + if (bcfound) { + if ((pc->para.setup.si1 != 7) && (pc->st->l3.debug & L3_DEB_WARN)) { +- sprintf(tmp, "non-digital call: %s -> %s", ++ l3_debug(pc->st, "non-digital call: %s -> %s", + pc->para.setup.phone, + pc->para.setup.eazmsn); +- l3_debug(pc->st, tmp); + } + newl3state(pc, 6); + pc->st->l3.l3l4(pc->st, CC_SETUP | INDICATION, pc); +@@ -301,7 +299,7 @@ l3_1tr6_info(struct l3_process *pc, u_char pr, void *arg) + { + u_char *p; + int i, tmpcharge = 0; +- char a_charge[8], tmp[32]; ++ char a_charge[8]; + struct sk_buff *skb = arg; + + p = skb->data; +@@ -316,8 +314,8 @@ l3_1tr6_info(struct l3_process *pc, u_char pr, void *arg) + pc->st->l3.l3l4(pc->st, CC_CHARGE | INDICATION, pc); + } + if (pc->st->l3.debug & L3_DEB_CHARGE) { +- sprintf(tmp, "charging info %d", pc->para.chargeinfo); +- l3_debug(pc->st, tmp); ++ l3_debug(pc->st, "charging info %d", ++ pc->para.chargeinfo); + } + } else if (pc->st->l3.debug & L3_DEB_CHARGE) + l3_debug(pc->st, "charging info not found"); +@@ -399,7 +397,7 @@ l3_1tr6_disc(struct l3_process *pc, u_char pr, void *arg) + struct sk_buff *skb = arg; + u_char *p; + int i, tmpcharge = 0; +- char a_charge[8], tmp[32]; ++ char a_charge[8]; + + StopAllL3Timer(pc); + p = skb->data; +@@ -414,8 +412,8 @@ l3_1tr6_disc(struct l3_process *pc, u_char pr, void *arg) + pc->st->l3.l3l4(pc->st, CC_CHARGE | INDICATION, pc); + } + if (pc->st->l3.debug & L3_DEB_CHARGE) { +- sprintf(tmp, "charging info %d", pc->para.chargeinfo); +- l3_debug(pc->st, tmp); ++ l3_debug(pc->st, "charging info %d", ++ pc->para.chargeinfo); + } + } else if (pc->st->l3.debug & L3_DEB_CHARGE) + l3_debug(pc->st, "charging info not found"); +@@ -746,7 +744,6 @@ up1tr6(struct PStack *st, int pr, void *arg) + int i, mt, cr; + struct l3_process *proc; + struct sk_buff *skb = arg; +- char tmp[80]; + + switch (pr) { + case (DL_DATA | INDICATION): +@@ -762,26 +759,23 @@ up1tr6(struct PStack *st, int pr, void *arg) + } + if (skb->len < 4) { + if (st->l3.debug & L3_DEB_PROTERR) { +- sprintf(tmp, "up1tr6 len only %d", skb->len); +- l3_debug(st, tmp); ++ l3_debug(st, "up1tr6 len only %d", skb->len); + } + dev_kfree_skb(skb); + return; + } + if ((skb->data[0] & 0xfe) != PROTO_DIS_N0) { + if (st->l3.debug & L3_DEB_PROTERR) { +- sprintf(tmp, "up1tr6%sunexpected discriminator %x message len %d", ++ l3_debug(st, "up1tr6%sunexpected discriminator %x message len %d", + (pr == (DL_DATA | INDICATION)) ? " " : "(broadcast) ", + skb->data[0], skb->len); +- l3_debug(st, tmp); + } + dev_kfree_skb(skb); + return; + } + if (skb->data[1] != 1) { + if (st->l3.debug & L3_DEB_PROTERR) { +- sprintf(tmp, "up1tr6 CR len not 1"); +- l3_debug(st, tmp); ++ l3_debug(st, "up1tr6 CR len not 1"); + } + dev_kfree_skb(skb); + return; +@@ -791,9 +785,8 @@ up1tr6(struct PStack *st, int pr, void *arg) + if (skb->data[0] == PROTO_DIS_N0) { + dev_kfree_skb(skb); + if (st->l3.debug & L3_DEB_STATE) { +- sprintf(tmp, "up1tr6%s N0 mt %x unhandled", ++ l3_debug(st, "up1tr6%s N0 mt %x unhandled", + (pr == (DL_DATA | INDICATION)) ? " " : "(broadcast) ", mt); +- l3_debug(st, tmp); + } + } else if (skb->data[0] == PROTO_DIS_N1) { + if (!(proc = getl3proc(st, cr))) { +@@ -801,8 +794,7 @@ up1tr6(struct PStack *st, int pr, void *arg) + if (cr < 128) { + if (!(proc = new_l3_process(st, cr))) { + if (st->l3.debug & L3_DEB_PROTERR) { +- sprintf(tmp, "up1tr6 no roc mem"); +- l3_debug(st, tmp); ++ l3_debug(st, "up1tr6 no roc mem"); + } + dev_kfree_skb(skb); + return; +@@ -821,8 +813,7 @@ up1tr6(struct PStack *st, int pr, void *arg) + } else { + if (!(proc = new_l3_process(st, cr))) { + if (st->l3.debug & L3_DEB_PROTERR) { +- sprintf(tmp, "up1tr6 no roc mem"); +- l3_debug(st, tmp); ++ l3_debug(st, "up1tr6 no roc mem"); + } + dev_kfree_skb(skb); + return; +@@ -837,18 +828,16 @@ up1tr6(struct PStack *st, int pr, void *arg) + if (i == ARRAY_SIZE(datastln1)) { + dev_kfree_skb(skb); + if (st->l3.debug & L3_DEB_STATE) { +- sprintf(tmp, "up1tr6%sstate %d mt %x unhandled", ++ l3_debug(st, "up1tr6%sstate %d mt %x unhandled", + (pr == (DL_DATA | INDICATION)) ? " " : "(broadcast) ", + proc->state, mt); +- l3_debug(st, tmp); + } + return; + } else { + if (st->l3.debug & L3_DEB_STATE) { +- sprintf(tmp, "up1tr6%sstate %d mt %x", ++ l3_debug(st, "up1tr6%sstate %d mt %x", + (pr == (DL_DATA | INDICATION)) ? " " : "(broadcast) ", + proc->state, mt); +- l3_debug(st, tmp); + } + datastln1[i].rout(proc, pr, skb); + } +@@ -861,7 +850,6 @@ down1tr6(struct PStack *st, int pr, void *arg) + int i, cr; + struct l3_process *proc; + struct Channel *chan; +- char tmp[80]; + + if ((DL_ESTABLISH | REQUEST) == pr) { + l3_msg(st, pr, NULL); +@@ -888,15 +876,13 @@ down1tr6(struct PStack *st, int pr, void *arg) + break; + if (i == ARRAY_SIZE(downstl)) { + if (st->l3.debug & L3_DEB_STATE) { +- sprintf(tmp, "down1tr6 state %d prim %d unhandled", ++ l3_debug(st, "down1tr6 state %d prim %d unhandled", + proc->state, pr); +- l3_debug(st, tmp); + } + } else { + if (st->l3.debug & L3_DEB_STATE) { +- sprintf(tmp, "down1tr6 state %d prim %d", ++ l3_debug(st, "down1tr6 state %d prim %d", + proc->state, pr); +- l3_debug(st, tmp); + } + downstl[i].rout(proc, pr, arg); + } +diff --git a/drivers/isdn/hisax/netjet.c b/drivers/isdn/hisax/netjet.c +index b646eed..233e432 100644 +--- a/drivers/isdn/hisax/netjet.c ++++ b/drivers/isdn/hisax/netjet.c +@@ -176,7 +176,7 @@ static void printframe(struct IsdnCardState *cs, u_char *buf, int count, char *s + else + j = i; + QuickHex(t, p, j); +- debugl1(cs, tmp); ++ debugl1(cs, "%s", tmp); + p += j; + i -= j; + t = tmp; +diff --git a/drivers/isdn/hisax/q931.c b/drivers/isdn/hisax/q931.c +index 041bf52..af1b020 100644 +--- a/drivers/isdn/hisax/q931.c ++++ b/drivers/isdn/hisax/q931.c +@@ -1179,7 +1179,7 @@ LogFrame(struct IsdnCardState *cs, u_char *buf, int size) + dp--; + *dp++ = '\n'; + *dp = 0; +- HiSax_putstatus(cs, NULL, cs->dlog); ++ HiSax_putstatus(cs, NULL, "%s", cs->dlog); + } else + HiSax_putstatus(cs, "LogFrame: ", "warning Frame too big (%d)", size); + } +@@ -1246,7 +1246,7 @@ dlogframe(struct IsdnCardState *cs, struct sk_buff *skb, int dir) + } + if (finish) { + *dp = 0; +- HiSax_putstatus(cs, NULL, cs->dlog); ++ HiSax_putstatus(cs, NULL, "%s", cs->dlog); + return; + } + if ((0xfe & buf[0]) == PROTO_DIS_N0) { /* 1TR6 */ +@@ -1509,5 +1509,5 @@ dlogframe(struct IsdnCardState *cs, struct sk_buff *skb, int dir) + dp += sprintf(dp, "Unknown protocol %x!", buf[0]); + } + *dp = 0; +- HiSax_putstatus(cs, NULL, cs->dlog); ++ HiSax_putstatus(cs, NULL, "%s", cs->dlog); + } +diff --git a/drivers/isdn/hisax/w6692.c b/drivers/isdn/hisax/w6692.c +index d8cac69..a858955 100644 +--- a/drivers/isdn/hisax/w6692.c ++++ b/drivers/isdn/hisax/w6692.c +@@ -154,7 +154,7 @@ W6692_empty_fifo(struct IsdnCardState *cs, int count) + + t += sprintf(t, "W6692_empty_fifo cnt %d", count); + QuickHex(t, ptr, count); +- debugl1(cs, cs->dlog); ++ debugl1(cs, "%s", cs->dlog); + } + } + +@@ -196,7 +196,7 @@ W6692_fill_fifo(struct IsdnCardState *cs) + + t += sprintf(t, "W6692_fill_fifo cnt %d", count); + QuickHex(t, ptr, count); +- debugl1(cs, cs->dlog); ++ debugl1(cs, "%s", cs->dlog); + } + } + +@@ -226,7 +226,7 @@ W6692B_empty_fifo(struct BCState *bcs, int count) + t += sprintf(t, "W6692B_empty_fifo %c cnt %d", + bcs->channel + '1', count); + QuickHex(t, ptr, count); +- debugl1(cs, bcs->blog); ++ debugl1(cs, "%s", bcs->blog); + } + } + +@@ -264,7 +264,7 @@ W6692B_fill_fifo(struct BCState *bcs) + t += sprintf(t, "W6692B_fill_fifo %c cnt %d", + bcs->channel + '1', count); + QuickHex(t, ptr, count); +- debugl1(cs, bcs->blog); ++ debugl1(cs, "%s", bcs->blog); + } + } + diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index 9bb12ba..d4262f7 100644 --- a/drivers/isdn/i4l/isdn_common.c @@ -42115,22 +42109,6 @@ index e74df7c..03a03ba 100644 return -EFAULT; } else memcpy(msg, buf, count); -diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c -index 22b720e..77025f5 100644 ---- a/drivers/isdn/mISDN/dsp_core.c -+++ b/drivers/isdn/mISDN/dsp_core.c -@@ -288,8 +288,10 @@ dsp_control_req(struct dsp *dsp, struct mISDNhead *hh, struct sk_buff *skb) - u8 *data; - int len; - -- if (skb->len < sizeof(int)) -+ if (skb->len < sizeof(int)) { - printk(KERN_ERR "%s: PH_CONTROL message too short\n", __func__); -+ return -EINVAL; -+ } - cont = *((int *)skb->data); - len = skb->len - sizeof(int); - data = skb->data + sizeof(int); diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c index 6a8405d..0bd1c7e 100644 --- a/drivers/leds/leds-clevo-mail.c @@ -42189,7 +42167,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 5b9ac32..2ef4f26 100644 +index a35d8d1..59fb772 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) @@ -42202,7 +42180,7 @@ index 5b9ac32..2ef4f26 100644 /* If the entry's not present, there's nothing to release. */ if (pmd_flags(*spmd) & _PAGE_PRESENT) { diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c -index f0a3347..f6608b2 100644 +index 5169239..47cb4db 100644 --- a/drivers/lguest/x86/core.c +++ b/drivers/lguest/x86/core.c @@ -59,7 +59,7 @@ static struct { @@ -42322,10 +42300,10 @@ index 0003992..854bbce 100644 cl->fn = fn; cl->wq = wq; diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c -index b4713ce..b30139b 100644 +index 547c4c5..5be1de4 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c -@@ -1603,7 +1603,7 @@ err_unlock_gc: +@@ -1644,7 +1644,7 @@ err_unlock_gc: err: closure_sync(&op.cl); /* XXX: test this, it's broken */ @@ -42335,7 +42313,7 @@ index b4713ce..b30139b 100644 static bool can_attach_cache(struct cache *ca, struct cache_set *c) diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c -index 5a2c754..0fa55db 100644 +index a7fd821..9dcf6c3 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c @@ -1779,7 +1779,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap) @@ -42348,10 +42326,10 @@ index 5a2c754..0fa55db 100644 seq_printf(seq, "\n"); diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c -index 81a79b7..87a0f73 100644 +index f1b7586..a49c4bd 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c -@@ -1697,7 +1697,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param) +@@ -1739,7 +1739,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param) cmd == DM_LIST_VERSIONS_CMD) return 0; @@ -42479,10 +42457,10 @@ index d907ca6..cfb8384 100644 schedule_work(&sc->trigger_event); } diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c -index 1ff252a..ee384c1 100644 +index f221812..aca962b 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c -@@ -389,7 +389,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev, +@@ -354,7 +354,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev, if (!dev_size) return 0; @@ -42514,10 +42492,10 @@ index 60bce43..9b997d0 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 33f2010..23fb84c 100644 +index 9e39d2b..fb879a7 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c -@@ -169,9 +169,9 @@ struct mapped_device { +@@ -178,9 +178,9 @@ struct mapped_device { /* * Event handling. */ @@ -42529,8 +42507,8 @@ index 33f2010..23fb84c 100644 struct list_head uevent_list; spinlock_t uevent_lock; /* Protect access to uevent_list */ -@@ -1884,8 +1884,8 @@ static struct mapped_device *alloc_dev(int minor) - rwlock_init(&md->map_lock); +@@ -1916,8 +1916,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); - atomic_set(&md->event_nr, 0); @@ -42540,7 +42518,7 @@ index 33f2010..23fb84c 100644 INIT_LIST_HEAD(&md->uevent_list); spin_lock_init(&md->uevent_lock); -@@ -2033,7 +2033,7 @@ static void event_callback(void *context) +@@ -2068,7 +2068,7 @@ static void event_callback(void *context) dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj); @@ -42549,7 +42527,7 @@ index 33f2010..23fb84c 100644 wake_up(&md->eventq); } -@@ -2690,18 +2690,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action, +@@ -2716,18 +2716,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action, uint32_t dm_next_uevent_seq(struct mapped_device *md) { @@ -42572,7 +42550,7 @@ index 33f2010..23fb84c 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 51f0345..c77810e 100644 +index 9f13e13..411a5b8 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -234,10 +234,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio); @@ -42597,7 +42575,7 @@ index 51f0345..c77810e 100644 wake_up(&md_event_waiters); } -@@ -1501,7 +1501,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_ +@@ -1502,7 +1502,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); @@ -42606,7 +42584,7 @@ index 51f0345..c77810e 100644 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256; bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1; -@@ -1745,7 +1745,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev) +@@ -1746,7 +1746,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev) else sb->resync_offset = cpu_to_le64(0); @@ -42615,7 +42593,7 @@ index 51f0345..c77810e 100644 sb->raid_disks = cpu_to_le32(mddev->raid_disks); sb->size = cpu_to_le64(mddev->dev_sectors); -@@ -2750,7 +2750,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store); +@@ -2751,7 +2751,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store); static ssize_t errors_show(struct md_rdev *rdev, char *page) { @@ -42624,7 +42602,7 @@ index 51f0345..c77810e 100644 } static ssize_t -@@ -2759,7 +2759,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len) +@@ -2760,7 +2760,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')) { @@ -42633,7 +42611,7 @@ index 51f0345..c77810e 100644 return len; } return -EINVAL; -@@ -3207,8 +3207,8 @@ int md_rdev_init(struct md_rdev *rdev) +@@ -3208,8 +3208,8 @@ int md_rdev_init(struct md_rdev *rdev) rdev->sb_loaded = 0; rdev->bb_page = NULL; atomic_set(&rdev->nr_pending, 0); @@ -42644,7 +42622,7 @@ index 51f0345..c77810e 100644 INIT_LIST_HEAD(&rdev->same_set); init_waitqueue_head(&rdev->blocked_wait); -@@ -7009,7 +7009,7 @@ static int md_seq_show(struct seq_file *seq, void *v) +@@ -7024,7 +7024,7 @@ static int md_seq_show(struct seq_file *seq, void *v) spin_unlock(&pers_lock); seq_printf(seq, "\n"); @@ -42653,7 +42631,7 @@ index 51f0345..c77810e 100644 return 0; } if (v == (void*)2) { -@@ -7112,7 +7112,7 @@ static int md_seq_open(struct inode *inode, struct file *file) +@@ -7127,7 +7127,7 @@ static int md_seq_open(struct inode *inode, struct file *file) return error; seq = file->private_data; @@ -42662,7 +42640,7 @@ index 51f0345..c77810e 100644 return error; } -@@ -7126,7 +7126,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait) +@@ -7141,7 +7141,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait) /* always allow read */ mask = POLLIN | POLLRDNORM; @@ -42671,7 +42649,7 @@ index 51f0345..c77810e 100644 mask |= POLLERR | POLLPRI; return mask; } -@@ -7170,7 +7170,7 @@ static int is_mddev_idle(struct mddev *mddev, int init) +@@ -7185,7 +7185,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]) - @@ -42681,7 +42659,7 @@ index 51f0345..c77810e 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 653f992b6..6af6c40 100644 +index 20f02c0..fd8c821 100644 --- a/drivers/md/md.h +++ b/drivers/md/md.h @@ -94,13 +94,13 @@ struct md_rdev { @@ -42700,7 +42678,7 @@ index 653f992b6..6af6c40 100644 * for reporting to userspace and storing * in superblock. */ -@@ -434,7 +434,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev) +@@ -442,7 +442,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) { @@ -42722,10 +42700,10 @@ index 3e6d115..ffecdeb 100644 /*----------------------------------------------------------------*/ diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c -index 6f48244..7d29145 100644 +index d60412c..8d4c982 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c -@@ -1822,7 +1822,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio) +@@ -1823,7 +1823,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) @@ -42734,7 +42712,7 @@ index 6f48244..7d29145 100644 } sectors -= s; sect += s; -@@ -2049,7 +2049,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk, +@@ -2050,7 +2050,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk, test_bit(In_sync, &rdev->flags)) { if (r1_sync_page_io(rdev, sect, s, conf->tmppage, READ)) { @@ -42744,10 +42722,10 @@ index 6f48244..7d29145 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 081bb33..3c4b287 100644 +index df7b0a0..a257495 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c -@@ -1940,7 +1940,7 @@ static void end_sync_read(struct bio *bio, int error) +@@ -1962,7 +1962,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 */ @@ -42756,7 +42734,7 @@ index 081bb33..3c4b287 100644 &conf->mirrors[d].rdev->corrected_errors); /* for reconstruct, we always reschedule after a read. -@@ -2298,7 +2298,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev) +@@ -2320,7 +2320,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev) { struct timespec cur_time_mon; unsigned long hours_since_last; @@ -42765,7 +42743,7 @@ index 081bb33..3c4b287 100644 ktime_get_ts(&cur_time_mon); -@@ -2320,9 +2320,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev) +@@ -2342,9 +2342,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)) @@ -42777,7 +42755,7 @@ index 081bb33..3c4b287 100644 } static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector, -@@ -2376,8 +2376,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 +@@ -2398,8 +2398,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 return; check_decay_read_errors(mddev, rdev); @@ -42788,7 +42766,7 @@ index 081bb33..3c4b287 100644 char b[BDEVNAME_SIZE]; bdevname(rdev->bdev, b); -@@ -2385,7 +2385,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 +@@ -2407,7 +2407,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, @@ -42797,7 +42775,7 @@ index 081bb33..3c4b287 100644 printk(KERN_NOTICE "md/raid10:%s: %s: Failing raid device\n", mdname(mddev), b); -@@ -2540,7 +2540,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 +@@ -2562,7 +2562,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)); @@ -42807,7 +42785,7 @@ index 081bb33..3c4b287 100644 rdev_dec_pending(rdev, mddev); diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c -index a35b846..e295c6d 100644 +index 78ea443..7d57513 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -1764,21 +1764,21 @@ static void raid5_end_read_request(struct bio * bi, int error) @@ -42872,7 +42850,7 @@ 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/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c -index c7a9be1..683f6f8 100644 +index ecf21d9..b992428d 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); @@ -42889,10 +42867,10 @@ index c7a9be1..683f6f8 100644 module_param_array(video_nr, int, NULL, 0444); module_param_array(vbi_nr, int, NULL, 0444); diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c -index 07b8460..e6d7265 100644 +index c08ae3e..eb59af1 100644 --- a/drivers/media/pci/ivtv/ivtv-driver.c +++ b/drivers/media/pci/ivtv/ivtv-driver.c -@@ -84,7 +84,7 @@ static struct pci_device_id ivtv_pci_tbl[] = { +@@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = { MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl); /* ivtv instance counter */ @@ -42902,7 +42880,7 @@ index 07b8460..e6d7265 100644 /* Parameter declarations */ static int cardtype[IVTV_MAX_CARDS]; diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c -index d338b19..aae4f9e 100644 +index dfd0a21..6bbb465 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 { @@ -42913,7 +42891,7 @@ index d338b19..aae4f9e 100644 /* Variables configurable through module params*/ static u32 video1_numbuffers = 3; static u32 video2_numbuffers = 3; -@@ -1015,6 +1014,12 @@ static int omap_vout_open(struct file *file) +@@ -1014,6 +1013,12 @@ static int omap_vout_open(struct file *file) { struct videobuf_queue *q; struct omap_vout_device *vout = NULL; @@ -42926,7 +42904,7 @@ index d338b19..aae4f9e 100644 vout = video_drvdata(file); v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__); -@@ -1032,10 +1037,6 @@ static int omap_vout_open(struct file *file) +@@ -1031,10 +1036,6 @@ static int omap_vout_open(struct file *file) vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT; q = &vout->vbq; @@ -42977,10 +42955,10 @@ 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 ef0efdf..8c78eb6 100644 +index 641b1f0..49cff30 100644 --- a/drivers/media/platform/s5p-tv/mixer_video.c +++ b/drivers/media/platform/s5p-tv/mixer_video.c -@@ -209,7 +209,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer) +@@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer) layer->geo.src.height = layer->geo.src.full_height; mxr_geometry_dump(mdev, &layer->geo); @@ -42989,7 +42967,7 @@ index ef0efdf..8c78eb6 100644 mxr_geometry_dump(mdev, &layer->geo); } -@@ -227,7 +227,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer) +@@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer) layer->geo.dst.full_width = mbus_fmt.width; layer->geo.dst.full_height = mbus_fmt.height; layer->geo.dst.field = mbus_fmt.field; @@ -42998,7 +42976,7 @@ index ef0efdf..8c78eb6 100644 mxr_geometry_dump(mdev, &layer->geo); } -@@ -333,7 +333,7 @@ static int mxr_s_fmt(struct file *file, void *priv, +@@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv, /* set source size to highest accepted value */ geo->src.full_width = max(geo->dst.full_width, pix->width); geo->src.full_height = max(geo->dst.full_height, pix->height); @@ -43007,7 +42985,7 @@ index ef0efdf..8c78eb6 100644 mxr_geometry_dump(mdev, &layer->geo); /* set cropping to total visible screen */ geo->src.width = pix->width; -@@ -341,12 +341,12 @@ static int mxr_s_fmt(struct file *file, void *priv, +@@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv, geo->src.x_offset = 0; geo->src.y_offset = 0; /* assure consistency of geometry */ @@ -43022,7 +43000,7 @@ index ef0efdf..8c78eb6 100644 mxr_geometry_dump(mdev, &layer->geo); /* returning results */ -@@ -473,7 +473,7 @@ static int mxr_s_selection(struct file *file, void *fh, +@@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh, target->width = s->r.width; target->height = s->r.height; @@ -43031,7 +43009,7 @@ index ef0efdf..8c78eb6 100644 /* retrieve update selection rectangle */ res.left = target->x_offset; -@@ -954,13 +954,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count) +@@ -955,13 +955,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count) mxr_output_get(mdev); mxr_layer_update_output(layer); @@ -43047,7 +43025,7 @@ index ef0efdf..8c78eb6 100644 mxr_streamer_get(mdev); return 0; -@@ -1030,7 +1030,7 @@ static int stop_streaming(struct vb2_queue *vq) +@@ -1031,7 +1031,7 @@ static int stop_streaming(struct vb2_queue *vq) spin_unlock_irqrestore(&layer->enq_slock, flags); /* disabling layer in hardware */ @@ -43056,7 +43034,7 @@ index ef0efdf..8c78eb6 100644 /* remove one streamer */ mxr_streamer_put(mdev); /* allow changes in output configuration */ -@@ -1069,8 +1069,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer) +@@ -1070,8 +1070,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer) void mxr_layer_release(struct mxr_layer *layer) { @@ -43067,7 +43045,7 @@ index ef0efdf..8c78eb6 100644 } void mxr_base_layer_release(struct mxr_layer *layer) -@@ -1096,7 +1096,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev, +@@ -1097,7 +1097,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev, layer->mdev = mdev; layer->idx = idx; @@ -43151,10 +43129,10 @@ index 9fb6697..f167415 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 9dc8baf..796d52f 100644 +index 9c9084c..a9e8dfb 100644 --- a/drivers/media/radio/radio-si476x.c +++ b/drivers/media/radio/radio-si476x.c -@@ -1456,7 +1456,7 @@ static int si476x_radio_probe(struct platform_device *pdev) +@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev) struct si476x_radio *radio; struct v4l2_ctrl *ctrl; @@ -43212,7 +43190,7 @@ index 6e237b6..dc25556 100644 /* debug */ static int dvb_usb_dw2102_debug; diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c -index f129551..ecf6514 100644 +index 8f7a6a4..59502dd 100644 --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c @@ -326,7 +326,7 @@ struct v4l2_buffer32 { @@ -43243,10 +43221,10 @@ index f129551..ecf6514 100644 return 0; } diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c -index 8ed5da2..47fee46 100644 +index 02d1b63..5fd6b16 100644 --- a/drivers/media/v4l2-core/v4l2-device.c +++ b/drivers/media/v4l2-core/v4l2-device.c -@@ -74,9 +74,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev) +@@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev) EXPORT_SYMBOL_GPL(v4l2_device_put); int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename, @@ -43259,10 +43237,10 @@ index 8ed5da2..47fee46 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 7658586..1079260 100644 +index 68e6b5e..d8b923e 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c -@@ -1995,7 +1995,8 @@ struct v4l2_ioctl_info { +@@ -1939,7 +1939,8 @@ struct v4l2_ioctl_info { struct file *file, void *fh, void *p); } u; void (*debug)(const void *arg, bool write_only); @@ -43272,7 +43250,7 @@ index 7658586..1079260 100644 /* This control needs a priority check */ #define INFO_FL_PRIO (1 << 0) -@@ -2177,7 +2178,7 @@ static long __video_do_ioctl(struct file *file, +@@ -2120,7 +2121,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; @@ -43281,7 +43259,7 @@ index 7658586..1079260 100644 const struct v4l2_ioctl_info *info; void *fh = file->private_data; struct v4l2_fh *vfh = NULL; -@@ -2251,7 +2252,7 @@ done: +@@ -2194,7 +2195,7 @@ done: } static int check_array_args(unsigned int cmd, void *parg, size_t *array_size, @@ -43290,7 +43268,7 @@ index 7658586..1079260 100644 { int ret = 0; -@@ -2267,7 +2268,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size, +@@ -2210,7 +2211,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size, ret = -EINVAL; break; } @@ -43299,7 +43277,7 @@ index 7658586..1079260 100644 *kernel_ptr = (void *)&buf->m.planes; *array_size = sizeof(struct v4l2_plane) * buf->length; ret = 1; -@@ -2302,7 +2303,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size, +@@ -2245,7 +2246,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size, ret = -EINVAL; break; } @@ -43579,7 +43557,7 @@ index a8c08f3..155fe3d 100644 #endif diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c -index 45ece11..8efa218 100644 +index fcbb2e9..2635e11 100644 --- a/drivers/mfd/janz-cmodio.c +++ b/drivers/mfd/janz-cmodio.c @@ -13,6 +13,7 @@ @@ -43591,7 +43569,7 @@ index 45ece11..8efa218 100644 #include <linux/pci.h> #include <linux/interrupt.h> diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c -index a5f9888..1c0ed56 100644 +index 9aa6d1e..1631bfc 100644 --- a/drivers/mfd/twl4030-irq.c +++ b/drivers/mfd/twl4030-irq.c @@ -35,6 +35,7 @@ @@ -43602,7 +43580,7 @@ index a5f9888..1c0ed56 100644 #include "twl-core.h" -@@ -728,10 +729,12 @@ int twl4030_init_irq(struct device *dev, int irq_num) +@@ -726,10 +727,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 */ @@ -43677,7 +43655,7 @@ 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 4cd4a3d..b48cbc7 100644 +index 036effe..b3a6336 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) @@ -43745,7 +43723,7 @@ index 2f30bad..c4c13d0 100644 mcs_op_statistics[op].max = nsec; } diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c -index 797d796..ae8f01e 100644 +index 4f76359..cdfcb2e 100644 --- a/drivers/misc/sgi-gru/gruprocfs.c +++ b/drivers/misc/sgi-gru/gruprocfs.c @@ -32,9 +32,9 @@ @@ -43987,7 +43965,7 @@ index b94d5f7..7f494c5 100644 extern int xpc_disengage_timedout; extern int xpc_activate_IRQ_rcvd; diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c -index d971817..33bdca5 100644 +index 82dc574..8539ab2 100644 --- a/drivers/misc/sgi-xp/xpc_main.c +++ b/drivers/misc/sgi-xp/xpc_main.c @@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = { @@ -44009,10 +43987,10 @@ index d971817..33bdca5 100644 break; diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c -index 49f04bc..65660c2 100644 +index 837fc73..acb5862 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, +@@ -213,7 +213,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host, void *data_buf; int is_on_stack; @@ -44022,10 +44000,10 @@ index 49f04bc..65660c2 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 0b74189..818358f 100644 +index 81b2994..dce857e 100644 --- a/drivers/mmc/host/dw_mmc.h +++ b/drivers/mmc/host/dw_mmc.h -@@ -202,5 +202,5 @@ struct dw_mci_drv_data { +@@ -203,5 +203,5 @@ struct dw_mci_drv_data { void (*prepare_command)(struct dw_mci *host, u32 *cmdr); void (*set_ios)(struct dw_mci *host, struct mmc_ios *ios); int (*parse_dt)(struct dw_mci *host); @@ -44033,7 +44011,7 @@ index 0b74189..818358f 100644 +} __do_const; #endif /* _DW_MMC_H_ */ diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c -index c6f6246..60760a8 100644 +index 926aaf6..8e153e2 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c @@ -664,9 +664,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev) @@ -44089,10 +44067,10 @@ index f9d5615..99dd95f 100644 struct sm_sysfs_attribute *vendor_attribute; diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c -index f975696..4597e21 100644 +index e48cb33..72e73fc 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c -@@ -4870,7 +4870,7 @@ static unsigned int bond_get_num_tx_queues(void) +@@ -4832,7 +4832,7 @@ static unsigned int bond_get_num_tx_queues(void) return tx_queues; } @@ -44101,7 +44079,7 @@ index f975696..4597e21 100644 .kind = "bond", .priv_size = sizeof(struct bonding), .setup = bond_setup, -@@ -4995,8 +4995,8 @@ static void __exit bonding_exit(void) +@@ -4957,8 +4957,8 @@ static void __exit bonding_exit(void) bond_destroy_debugfs(); @@ -44129,10 +44107,10 @@ index e1d2643..7f4133b 100644 if (!request_mem_region(mem->start, mem_size, pdev->name)) { diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h -index 151675d..0139a9d 100644 +index c07a6d0..ca88c45 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h -@@ -1112,7 +1112,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp) +@@ -1137,7 +1137,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 */ @@ -44141,47 +44119,11 @@ index 151675d..0139a9d 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_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c -index ce1a916..10b52b0 100644 ---- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c -+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c -@@ -960,6 +960,9 @@ static int bnx2x_set_dump(struct net_device *dev, struct ethtool_dump *val) - struct bnx2x *bp = netdev_priv(dev); - - /* Use the ethtool_dump "flag" field as the dump preset index */ -+ if (val->flag < 1 || val->flag > DUMP_MAX_PRESETS) -+ return -EINVAL; -+ - bp->dump_preset_idx = val->flag; - return 0; - } -@@ -986,8 +989,6 @@ static int bnx2x_get_dump_data(struct net_device *dev, - struct bnx2x *bp = netdev_priv(dev); - struct dump_header dump_hdr = {0}; - -- memset(p, 0, dump->len); -- - /* Disable parity attentions as long as following dump may - * cause false alarms by reading never written registers. We - * will re-enable parity attentions right after the dump. -diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c -index b4c9dea..2a9927f 100644 ---- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c -+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c -@@ -11497,6 +11497,8 @@ static int bnx2x_init_bp(struct bnx2x *bp) - bp->min_msix_vec_cnt = 2; - BNX2X_DEV_INFO("bp->min_msix_vec_cnt %d", bp->min_msix_vec_cnt); - -+ bp->dump_preset_idx = 1; -+ - return rc; - } - diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c -index 32a9609..0b1c53a 100644 +index 8f03c98..dd0ef10 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c -@@ -2387,15 +2387,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp, +@@ -2345,15 +2345,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp, return rc; } @@ -44203,10 +44145,10 @@ index 32a9609..0b1c53a 100644 } diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h -index 43c00bc..dd1d03d 100644 +index 798dfe9..05d0a44 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, +@@ -1311,8 +1311,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp, /********************* RX MODE ****************/ @@ -44217,7 +44159,7 @@ index 43c00bc..dd1d03d 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 ff6e30e..87e8452 100644 +index cd63d11..b67dd78 100644 --- a/drivers/net/ethernet/broadcom/tg3.h +++ b/drivers/net/ethernet/broadcom/tg3.h @@ -147,6 +147,7 @@ @@ -44228,20 +44170,6 @@ index ff6e30e..87e8452 100644 #define CHIPREV_ID_5750_C2 0x4202 #define CHIPREV_ID_5752_A0_HW 0x5000 #define CHIPREV_ID_5752_A0 0x6000 -diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c -index 71497e8..b650951 100644 ---- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c -+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c -@@ -3037,7 +3037,9 @@ static void t3_io_resume(struct pci_dev *pdev) - CH_ALERT(adapter, "adapter recovering, PEX ERR 0x%x\n", - t3_read_reg(adapter, A_PCIE_PEX_ERR)); - -+ rtnl_lock(); - t3_resume_ports(adapter); -+ rtnl_unlock(); - } - - static const struct pci_error_handlers t3_err_handler = { 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 @@ -44278,7 +44206,7 @@ index 4c83003..2a2a5b9 100644 break; } diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c -index 6e43426..1bd8365 100644 +index 3d91a5e..1014702 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -469,7 +469,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val) @@ -44291,7 +44219,7 @@ index 6e43426..1bd8365 100644 void populate_erx_stats(struct be_adapter *adapter, diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c -index 21b85fb..b49e5fc 100644 +index 934e1ae..b262e6b 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -31,6 +31,8 @@ @@ -44304,7 +44232,7 @@ index 21b85fb..b49e5fc 100644 #include "ftgmac100.h" diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c -index a6eda8d..935d273 100644 +index 4658f4c..407d155 100644 --- a/drivers/net/ethernet/faraday/ftmac100.c +++ b/drivers/net/ethernet/faraday/ftmac100.c @@ -31,6 +31,8 @@ @@ -44355,10 +44283,10 @@ index fbe5363..266b4e3 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 5e7fb1d..f8d1810 100644 +index 345d987..af69721 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c -@@ -1948,7 +1948,9 @@ int qlcnic_83xx_config_default_opmode(struct qlcnic_adapter *adapter) +@@ -2011,7 +2011,9 @@ int qlcnic_83xx_config_default_opmode(struct qlcnic_adapter *adapter) op_mode = QLC_83XX_DEFAULT_OPMODE; if (op_mode == QLC_83XX_DEFAULT_OPMODE) { @@ -44370,82 +44298,41 @@ index 5e7fb1d..f8d1810 100644 } else { return -EIO; diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c -index b0c3de9..fc5857e 100644 +index 599d1fd..59868fe 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c -@@ -200,15 +200,21 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter) - if (priv_level == QLCNIC_NON_PRIV_FUNC) { +@@ -191,17 +191,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter) + case QLCNIC_NON_PRIV_FUNC: ahw->op_mode = QLCNIC_NON_PRIV_FUNC; ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry; - nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic; + pax_open_kernel(); + *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic; + pax_close_kernel(); - } else if (priv_level == QLCNIC_PRIV_FUNC) { + break; + case QLCNIC_PRIV_FUNC: ahw->op_mode = QLCNIC_PRIV_FUNC; ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry; - nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic; + pax_open_kernel(); + *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic; + pax_close_kernel(); - } else if (priv_level == QLCNIC_MGMT_FUNC) { + break; + case QLCNIC_MGMT_FUNC: ahw->op_mode = QLCNIC_MGMT_FUNC; ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry; - nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic; + pax_open_kernel(); + *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic; + pax_close_kernel(); - } else { - return -EIO; - } -diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c -index 6acf82b..14b097e 100644 ---- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c -+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c -@@ -206,10 +206,10 @@ int qlcnic_fw_cmd_set_drv_version(struct qlcnic_adapter *adapter) - if (err) { - dev_info(&adapter->pdev->dev, - "Failed to set driver version in firmware\n"); -- return -EIO; -+ err = -EIO; - } -- -- return 0; -+ qlcnic_free_mbx_args(&cmd); -+ return err; - } - - int -diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c -index d3f8797..82a03d3 100644 ---- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c -+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c -@@ -262,7 +262,7 @@ void qlcnic_82xx_change_filter(struct qlcnic_adapter *adapter, u64 *uaddr, - - mac_req = (struct qlcnic_mac_req *)&(req->words[0]); - mac_req->op = vlan_id ? QLCNIC_MAC_VLAN_ADD : QLCNIC_MAC_ADD; -- memcpy(mac_req->mac_addr, &uaddr, ETH_ALEN); -+ memcpy(mac_req->mac_addr, uaddr, ETH_ALEN); - - vlan_req = (struct qlcnic_vlan_req *)&req->words[1]; - vlan_req->vlan_id = cpu_to_le16(vlan_id); -diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c -index 887aebe..9095ff9 100644 ---- a/drivers/net/ethernet/realtek/8139cp.c -+++ b/drivers/net/ethernet/realtek/8139cp.c -@@ -524,6 +524,7 @@ rx_status_loop: - PCI_DMA_FROMDEVICE); - if (dma_mapping_error(&cp->pdev->dev, new_mapping)) { - dev->stats.rx_dropped++; -+ kfree_skb(new_skb); - goto rx_next; - } - + break; + default: + dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n"); diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c -index 393f961..d343034 100644 +index 85e5c97..76f97ec 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c -@@ -753,22 +753,22 @@ struct rtl8169_private { +@@ -759,22 +759,22 @@ struct rtl8169_private { struct mdio_ops { void (*write)(struct rtl8169_private *, int, int); int (*read)(struct rtl8169_private *, int); @@ -44473,7 +44360,7 @@ index 393f961..d343034 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 9a95abf..36df7f9 100644 +index b495394..0748c54 100644 --- a/drivers/net/ethernet/sfc/ptp.c +++ b/drivers/net/ethernet/sfc/ptp.c @@ -535,7 +535,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings) @@ -44549,10 +44436,10 @@ index bf0d55e..82bcfbd1 100644 priv = netdev_priv(dev); priv->phy = phy; diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c -index 6e91931..2b0ebe7 100644 +index 16b43bf..ead0c35 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c -@@ -905,13 +905,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = { +@@ -934,13 +934,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = { int macvlan_link_register(struct rtnl_link_ops *ops) { /* common fields */ @@ -44575,7 +44462,7 @@ index 6e91931..2b0ebe7 100644 return rtnl_link_register(ops); }; -@@ -967,7 +969,7 @@ static int macvlan_device_event(struct notifier_block *unused, +@@ -996,7 +998,7 @@ static int macvlan_device_event(struct notifier_block *unused, return NOTIFY_DONE; } @@ -44585,10 +44472,10 @@ index 6e91931..2b0ebe7 100644 }; diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c -index 523d6b2..5e16aa1 100644 +index ea53abb..2e4d087 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c -@@ -1110,7 +1110,7 @@ static int macvtap_device_event(struct notifier_block *unused, +@@ -1286,7 +1286,7 @@ static int macvtap_device_event(struct notifier_block *unused, return NOTIFY_DONE; } @@ -44645,10 +44532,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 b305105..8ead6df 100644 +index bff7e0b..7315137 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c -@@ -2682,7 +2682,7 @@ static int team_device_event(struct notifier_block *unused, +@@ -2702,7 +2702,7 @@ static int team_device_event(struct notifier_block *unused, return NOTIFY_DONE; } @@ -44658,32 +44545,38 @@ index b305105..8ead6df 100644 }; diff --git a/drivers/net/tun.c b/drivers/net/tun.c -index 2491eb2..1a453eb 100644 +index 71af122..b3c20f3 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c -@@ -1076,8 +1076,9 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, - u32 rxhash; - - if (!(tun->flags & TUN_NO_PI)) { -- if ((len -= sizeof(pi)) > total_len) -+ if (len < sizeof(pi)) - return -EINVAL; -+ len -= sizeof(pi); - - if (memcpy_fromiovecend((void *)&pi, iv, 0, sizeof(pi))) - return -EFAULT; -@@ -1085,8 +1086,9 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, - } - - if (tun->flags & TUN_VNET_HDR) { -- if ((len -= tun->vnet_hdr_sz) > total_len) -+ if (len < tun->vnet_hdr_sz) - return -EINVAL; -+ len -= tun->vnet_hdr_sz; +@@ -1691,11 +1691,11 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) + INIT_LIST_HEAD(&tun->disabled); + err = tun_attach(tun, file); + if (err < 0) +- goto err_free_dev; ++ goto err_free_flow; + + err = register_netdevice(tun->dev); + if (err < 0) +- goto err_free_dev; ++ goto err_detach; + + if (device_create_file(&tun->dev->dev, &dev_attr_tun_flags) || + device_create_file(&tun->dev->dev, &dev_attr_owner) || +@@ -1739,7 +1739,12 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) + strcpy(ifr->ifr_name, tun->dev->name); + return 0; - if (memcpy_fromiovecend((void *)&gso, iv, offset, sizeof(gso))) - return -EFAULT; -@@ -1869,7 +1871,7 @@ unlock: +- err_free_dev: ++err_detach: ++ tun_detach_all(dev); ++err_free_flow: ++ tun_flow_uninit(tun); ++ security_tun_dev_free_security(tun->security); ++err_free_dev: + free_netdev(dev); + return err; + } +@@ -1869,7 +1874,7 @@ unlock: } static long __tun_chr_ioctl(struct file *file, unsigned int cmd, @@ -44692,7 +44585,7 @@ index 2491eb2..1a453eb 100644 { struct tun_file *tfile = file->private_data; struct tun_struct *tun; -@@ -1881,6 +1883,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, +@@ -1881,6 +1886,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, int vnet_hdr_sz; int ret; @@ -44703,7 +44596,7 @@ index 2491eb2..1a453eb 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 cba1d46..f703766 100644 +index 86292e6..8d34433 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c @@ -71,7 +71,7 @@ @@ -44784,7 +44677,7 @@ index cba1d46..f703766 100644 /* Setup and send a ctrl req read on * port i */ if (!serial->rx_urb_filled[0]) { -@@ -3057,7 +3056,7 @@ static int hso_resume(struct usb_interface *iface) +@@ -3062,7 +3061,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)) { @@ -44816,10 +44709,10 @@ index a79e9d3..78cd4fa 100644 /* we will have to manufacture ethernet headers, prepare template */ diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c -index 57325f3..36b181f 100644 +index 767f7af..8162b9d 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c -@@ -1579,7 +1579,7 @@ nla_put_failure: +@@ -1868,7 +1868,7 @@ nla_put_failure: return -EMSGSIZE; } @@ -44828,6 +44721,19 @@ index 57325f3..36b181f 100644 .kind = "vxlan", .maxtype = IFLA_VXLAN_MAX, .policy = vxlan_policy, +diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c +index 0b60295..b8bfa5b 100644 +--- a/drivers/net/wimax/i2400m/rx.c ++++ b/drivers/net/wimax/i2400m/rx.c +@@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m) + if (i2400m->rx_roq == NULL) + goto error_roq_alloc; + +- rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log), ++ rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1, + GFP_KERNEL); + if (rd == NULL) { + result = -ENOMEM; diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c index 34c8a33..3261fdc 100644 --- a/drivers/net/wireless/at76c50x-usb.c @@ -44841,6 +44747,55 @@ index 34c8a33..3261fdc 100644 { return msecs_to_jiffies((s->poll_timeout[2] << 16) | (s->poll_timeout[1] << 8) +diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c +index 2b3426b..1f564be 100644 +--- a/drivers/net/wireless/ath/ath10k/core.c ++++ b/drivers/net/wireless/ath/ath10k/core.c +@@ -507,7 +507,9 @@ EXPORT_SYMBOL(ath10k_core_destroy); + + int ath10k_core_register(struct ath10k *ar) + { +- struct ath10k_htc_ops htc_ops; ++ static struct ath10k_htc_ops htc_ops = { ++ .target_send_suspend_complete = ath10k_send_suspend_complete, ++ }; + struct bmi_target_info target_info; + int status; + +@@ -536,8 +538,6 @@ int ath10k_core_register(struct ath10k *ar) + if (status) + goto err; + +- htc_ops.target_send_suspend_complete = ath10k_send_suspend_complete; +- + ar->htc = ath10k_htc_create(ar, &htc_ops); + if (IS_ERR(ar->htc)) { + status = PTR_ERR(ar->htc); +diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c +index 74363c9..237b926 100644 +--- a/drivers/net/wireless/ath/ath10k/htc.c ++++ b/drivers/net/wireless/ath/ath10k/htc.c +@@ -963,7 +963,10 @@ void ath10k_htc_stop(struct ath10k_htc *htc) + struct ath10k_htc *ath10k_htc_create(struct ath10k *ar, + struct ath10k_htc_ops *htc_ops) + { +- struct ath10k_hif_cb htc_callbacks; ++ static struct ath10k_hif_cb htc_callbacks = { ++ .rx_completion = ath10k_htc_rx_completion_handler, ++ .tx_completion = ath10k_htc_tx_completion_handler, ++ }; + struct ath10k_htc_ep *ep = NULL; + struct ath10k_htc *htc = NULL; + +@@ -979,8 +982,6 @@ struct ath10k_htc *ath10k_htc_create(struct ath10k *ar, + ath10k_htc_reset_endpoint_states(htc); + + /* setup HIF layer callbacks */ +- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler; +- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler; + htc->ar = ar; + + /* Get HIF default pipe for HTC message exchange */ diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c index 8d78253..bebbb68 100644 --- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c @@ -44925,7 +44880,7 @@ index 8d78253..bebbb68 100644 | set11nRateFlags(i->rates, 2) | set11nRateFlags(i->rates, 3) diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c -index 301bf72..3f5654f 100644 +index 5163abd..3ada4c2 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) @@ -45047,7 +45002,7 @@ index 301bf72..3f5654f 100644 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 ae30343..a117806 100644 +index cd74b3a..6a28d24 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h @@ -652,7 +652,7 @@ struct ath_hw_private_ops { @@ -45069,7 +45024,7 @@ index ae30343..a117806 100644 struct ath_nf_limits { s16 max; diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c -index b37a582..680835d 100644 +index 9581d07..84f6a76 100644 --- a/drivers/net/wireless/iwlegacy/3945-mac.c +++ b/drivers/net/wireless/iwlegacy/3945-mac.c @@ -3639,7 +3639,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) @@ -45220,10 +45175,10 @@ index d532948..e0d8bb1 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 a8afc7b..de058b2 100644 +index 1531a4f..21d2641 100644 --- a/drivers/net/wireless/iwlwifi/dvm/main.c +++ b/drivers/net/wireless/iwlwifi/dvm/main.c -@@ -1189,7 +1189,7 @@ static void iwl_option_config(struct iwl_priv *priv) +@@ -1180,7 +1180,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; @@ -45232,7 +45187,7 @@ index a8afc7b..de058b2 100644 if (data->sku_cap_11n_enable && !priv->cfg->ht_params) { -@@ -1203,7 +1203,6 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv) +@@ -1194,7 +1194,6 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv) return -EINVAL; } @@ -45241,10 +45196,10 @@ index a8afc7b..de058b2 100644 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 aeb70e1..d7b5bb5 100644 +index 390e2f0..75cfbaf 100644 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c -@@ -1329,7 +1329,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file, +@@ -1350,7 +1350,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file, struct isr_statistics *isr_stats = &trans_pcie->isr_stats; char buf[8]; @@ -45253,7 +45208,7 @@ index aeb70e1..d7b5bb5 100644 u32 reset_flag; memset(buf, 0, sizeof(buf)); -@@ -1350,7 +1350,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file, +@@ -1371,7 +1371,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file, { struct iwl_trans *trans = file->private_data; char buf[8]; @@ -45319,7 +45274,7 @@ index 8169a85..7fa3b47 100644 tmp = cpu_to_le32(rts_threshold); diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h -index 7510723..5ba37f5 100644 +index ee3fc57..ed5ddc9 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h @@ -386,7 +386,7 @@ struct rt2x00_intf { @@ -45332,7 +45287,7 @@ index 7510723..5ba37f5 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 d955741..8730748 100644 +index aa95c6c..a59dd67 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c @@ -252,9 +252,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev, @@ -45400,10 +45355,10 @@ index 1c627da..69f7d17 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 9fa692d..b31fee0 100644 +index 7aa0eb8..5a9ef38 100644 --- a/drivers/net/wireless/ti/wl18xx/main.c +++ b/drivers/net/wireless/ti/wl18xx/main.c -@@ -1687,8 +1687,10 @@ static int wl18xx_setup(struct wl1271 *wl) +@@ -1730,8 +1730,10 @@ static int wl18xx_setup(struct wl1271 *wl) } if (!checksum_param) { @@ -45563,10 +45518,10 @@ index 7c12d9c..558bf3bb 100644 return __oprofilefs_create_file(sb, root, name, &atomic_ro_fops, 0444, val); diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c -index 93404f7..4a313d8 100644 +index 61be1d9..dec05d7 100644 --- a/drivers/oprofile/timer_int.c +++ b/drivers/oprofile/timer_int.c -@@ -93,7 +93,7 @@ static int __cpuinit oprofile_cpu_notify(struct notifier_block *self, +@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self, return NOTIFY_OK; } @@ -45736,31 +45691,11 @@ index 7d72c5e..edce02c 100644 char name[SLOT_NAME_SIZE]; int retval = -ENOMEM; -diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c -index 5127f3f..b225573 100644 ---- a/drivers/pci/hotplug/pciehp_hpc.c -+++ b/drivers/pci/hotplug/pciehp_hpc.c -@@ -773,14 +773,12 @@ static void pcie_shutdown_notification(struct controller *ctrl) - static int pcie_init_slot(struct controller *ctrl) - { - struct slot *slot; -- char name[32]; - - slot = kzalloc(sizeof(*slot), GFP_KERNEL); - if (!slot) - return -ENOMEM; - -- snprintf(name, sizeof(name), "pciehp-%u", PSN(ctrl)); -- slot->wq = alloc_workqueue(name, 0, 0); -+ slot->wq = alloc_workqueue("pciehp-%u", 0, 0, PSN(ctrl)); - if (!slot->wq) - goto abort; - diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c -index 5b4a9d9..cd5ac1f 100644 +index c0dbe1f..94cf3d8 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c -@@ -1071,7 +1071,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine) +@@ -1073,7 +1073,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; @@ -45769,7 +45704,7 @@ index 5b4a9d9..cd5ac1f 100644 int retval; res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC); -@@ -1256,7 +1256,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor +@@ -1258,7 +1258,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; @@ -45778,7 +45713,7 @@ index 5b4a9d9..cd5ac1f 100644 /* If the device has VPD, try to expose it in sysfs. */ if (dev->vpd) { -@@ -1303,7 +1303,7 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev) +@@ -1305,7 +1305,7 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev) { int retval; int rom_size = 0; @@ -45801,7 +45736,7 @@ index d1182c4..2a138ec 100644 int pci_vpd_pci22_init(struct pci_dev *dev); diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c -index d320df6..ca9a8f6 100644 +index 403a443..034e050 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -27,9 +27,9 @@ @@ -45818,11 +45753,11 @@ index d320df6..ca9a8f6 100644 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c -index ea37072..10e58e56 100644 +index 46ada5c..20da716 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -173,7 +173,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, - struct pci_bus_region region; + struct pci_bus_region region, inverted_region; bool bar_too_big = false, bar_disabled = false; - mask = type ? PCI_ROM_ADDRESS_MASK : ~0; @@ -45831,10 +45766,10 @@ index ea37072..10e58e56 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 0812608..b04018c4 100644 +index cdc7836..528635c 100644 --- a/drivers/pci/proc.c +++ b/drivers/pci/proc.c -@@ -453,7 +453,16 @@ static const struct file_operations proc_bus_pci_dev_operations = { +@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = { static int __init pci_proc_init(void) { struct pci_dev *dev = NULL; @@ -45865,7 +45800,7 @@ index 3e5b4497..dcdfb70 100644 .ident = "Samsung Series 5 550 - Touchpad", .matches = { diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c -index 6b22938..bc9700e 100644 +index 62f8030..c7f2a45 100644 --- a/drivers/platform/x86/msi-laptop.c +++ b/drivers/platform/x86/msi-laptop.c @@ -1000,12 +1000,14 @@ static int __init load_scm_model_init(struct platform_device *sdev) @@ -45890,10 +45825,10 @@ index 6b22938..bc9700e 100644 /* disable hardware control by fn key */ diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c -index 2ac045f..39c443d 100644 +index 3a1b6bf..b453930 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c -@@ -2483,7 +2483,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd) +@@ -2486,7 +2486,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd) } /* High speed charging function */ @@ -46034,19 +45969,6 @@ index 54d31c0..3f896d3 100644 /* * Polling driver -diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c -index e4ac38a..b13344c 100644 ---- a/drivers/platform/x86/wmi.c -+++ b/drivers/platform/x86/wmi.c -@@ -743,7 +743,7 @@ static int wmi_create_device(const struct guid_block *gblock, - wblock->dev.class = &wmi_class; - - wmi_gtoa(gblock->guid, guid_string); -- dev_set_name(&wblock->dev, guid_string); -+ dev_set_name(&wblock->dev, "%s", guid_string); - - dev_set_drvdata(&wblock->dev, wblock); - diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c index 769d265..a3a05ca 100644 --- a/drivers/pnp/pnpbios/bioscalls.c @@ -46108,7 +46030,7 @@ index 769d265..a3a05ca 100644 + pax_close_kernel(); } diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c -index 3e6db1c..1fbbdae 100644 +index d95e101..67f0c3f 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) @@ -46174,7 +46096,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 1c517c3..ffa2f17 100644 +index 3b2d5df..3207114 100644 --- a/drivers/power/power_supply_core.c +++ b/drivers/power/power_supply_core.c @@ -24,7 +24,10 @@ @@ -46189,7 +46111,7 @@ index 1c517c3..ffa2f17 100644 static bool __power_supply_is_supplied_by(struct power_supply *supplier, struct power_supply *supply) -@@ -554,7 +557,7 @@ static int __init power_supply_class_init(void) +@@ -558,7 +561,7 @@ static int __init power_supply_class_init(void) return PTR_ERR(power_supply_class); power_supply_class->dev_uevent = power_supply_uevent; @@ -46223,10 +46145,10 @@ index 29178f7..c65f324 100644 __power_supply_attrs[i] = &power_supply_attrs[i].attr; } diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c -index 815d6df..811633a 100644 +index 288c75a..065bc84 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c -@@ -3529,7 +3529,7 @@ regulator_register(const struct regulator_desc *regulator_desc, +@@ -3544,7 +3544,7 @@ regulator_register(const struct regulator_desc *regulator_desc, { const struct regulation_constraints *constraints = NULL; const struct regulator_init_data *init_data; @@ -46235,7 +46157,7 @@ index 815d6df..811633a 100644 struct regulator_dev *rdev; struct device *dev; int ret, i; -@@ -3599,7 +3599,7 @@ regulator_register(const struct regulator_desc *regulator_desc, +@@ -3614,7 +3614,7 @@ regulator_register(const struct regulator_desc *regulator_desc, rdev->dev.of_node = config->of_node; rdev->dev.parent = dev; dev_set_name(&rdev->dev, "regulator.%d", @@ -46262,26 +46184,26 @@ index d428ef9..fdc0357 100644 /* diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c -index adb1414..c13e0ce 100644 +index 0c5195a..637a453d 100644 --- a/drivers/regulator/max8973-regulator.c +++ b/drivers/regulator/max8973-regulator.c -@@ -401,9 +401,11 @@ static int max8973_probe(struct i2c_client *client, - if (!pdata->enable_ext_control) { +@@ -406,9 +406,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; -- max8973_dcdc_ops.enable = regulator_enable_regmap; -- max8973_dcdc_ops.disable = regulator_disable_regmap; -- max8973_dcdc_ops.is_enabled = regulator_is_enabled_regmap; +- max->ops.enable = regulator_enable_regmap; +- max->ops.disable = regulator_disable_regmap; +- max->ops.is_enabled = regulator_is_enabled_regmap; + pax_open_kernel(); -+ *(void **)&max8973_dcdc_ops.enable = regulator_enable_regmap; -+ *(void **)&max8973_dcdc_ops.disable = regulator_disable_regmap; -+ *(void **)&max8973_dcdc_ops.is_enabled = regulator_is_enabled_regmap; ++ *(void **)&max->ops.enable = regulator_enable_regmap; ++ *(void **)&max->ops.disable = regulator_disable_regmap; ++ *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap; + pax_close_kernel(); } - max->enable_external_control = pdata->enable_ext_control; + if (pdata) { diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c -index b716283..3cc4349 100644 +index 1037e07..e64dea1 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) @@ -46300,10 +46222,10 @@ index b716283..3cc4349 100644 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 f1cb706..4c7832a 100644 +index be06d71..264aee9 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c -@@ -724,7 +724,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) +@@ -731,7 +731,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 */ @@ -46336,7 +46258,7 @@ index d049393..bb20be0 100644 case RTC_PIE_ON: diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c -index b53992a..776df84 100644 +index ca18fd1..055e42d 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c @@ -107,7 +107,7 @@ struct ds1307 { @@ -46349,12 +46271,12 @@ index b53992a..776df84 100644 unsigned long flags; #define HAS_NVRAM 0 /* bit 0 == sysfs file active */ diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c -index 130f29a..6179d03 100644 +index fcb0329..d77b7f2 100644 --- a/drivers/rtc/rtc-m48t59.c +++ b/drivers/rtc/rtc-m48t59.c -@@ -482,7 +482,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev) - goto out; - } +@@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev) + if (IS_ERR(m48t59->rtc)) + return PTR_ERR(m48t59->rtc); - m48t59_nvram_attr.size = pdata->offset; + pax_open_kernel(); @@ -46362,7 +46284,7 @@ index 130f29a..6179d03 100644 + pax_close_kernel(); ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr); - if (ret) { + if (ret) 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 @@ -46377,7 +46299,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_ioc.h b/drivers/scsi/bfa/bfa_ioc.h -index 23a90e7..9cf04ee 100644 +index 90814fe..4384138 100644 --- a/drivers/scsi/bfa/bfa_ioc.h +++ b/drivers/scsi/bfa/bfa_ioc.h @@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s { @@ -46389,17 +46311,17 @@ index 23a90e7..9cf04ee 100644 /* * IOC event notification mechanism. -@@ -346,7 +346,7 @@ struct bfa_ioc_hwif_s { - void (*ioc_sync_ack) (struct bfa_ioc_s *ioc); - bfa_boolean_t (*ioc_sync_complete) (struct bfa_ioc_s *ioc); - bfa_boolean_t (*ioc_lpu_read_stat) (struct bfa_ioc_s *ioc); +@@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s { + void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc, + enum bfi_ioc_state fwstate); + enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc); -}; +} __no_const; /* * Queue element to wait for room in request queue. FIFO order is diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c -index 8c05ae01..b2cf224 100644 +index c9382d6..6619864 100644 --- a/drivers/scsi/fcoe/fcoe_sysfs.c +++ b/drivers/scsi/fcoe/fcoe_sysfs.c @@ -33,8 +33,8 @@ @@ -46605,7 +46527,7 @@ index 9816479..c5d4e97 100644 /* queue and queue Info */ struct list_head reqQ; diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c -index 8b928c6..9c76300 100644 +index 5879929..32b241d 100644 --- a/drivers/scsi/libfc/fc_exch.c +++ b/drivers/scsi/libfc/fc_exch.c @@ -100,12 +100,12 @@ struct fc_exch_mgr { @@ -46763,7 +46685,7 @@ index 161c98e..6d563b3 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 bcc56ca..6f4174a 100644 +index 93f222d..73e977b 100644 --- a/drivers/scsi/lpfc/lpfc.h +++ b/drivers/scsi/lpfc/lpfc.h @@ -431,7 +431,7 @@ struct lpfc_vport { @@ -46796,7 +46718,7 @@ index bcc56ca..6f4174a 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 f525ecb..32549a4 100644 +index 60084e6..0e2e700 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, @@ -46860,7 +46782,7 @@ index f525ecb..32549a4 100644 dtp->jif = jiffies; #endif return; -@@ -4182,7 +4182,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport) +@@ -4168,7 +4168,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport) "slow_ring buffer\n"); goto debug_failed; } @@ -46869,7 +46791,7 @@ index f525ecb..32549a4 100644 memset(phba->slow_ring_trc, 0, (sizeof(struct lpfc_debugfs_trc) * lpfc_debugfs_max_slow_ring_trc)); -@@ -4228,7 +4228,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport) +@@ -4214,7 +4214,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport) "buffer\n"); goto debug_failed; } @@ -46879,10 +46801,10 @@ index f525ecb..32549a4 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 cb465b2..2e7b25f 100644 +index e0b20fa..30c2c0d 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c -@@ -10950,8 +10950,10 @@ lpfc_init(void) +@@ -10936,8 +10936,10 @@ lpfc_init(void) "misc_register returned with status %d", error); if (lpfc_enable_npiv) { @@ -46896,10 +46818,10 @@ index cb465b2..2e7b25f 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 8523b278e..ce1d812 100644 +index 243de1d..f40e3e5 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c -@@ -331,7 +331,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba) +@@ -353,7 +353,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba) uint32_t evt_posted; spin_lock_irqsave(&phba->hbalock, flags); @@ -46908,7 +46830,7 @@ index 8523b278e..ce1d812 100644 phba->last_rsrc_error_time = jiffies; if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) { -@@ -372,7 +372,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport *vport, +@@ -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; @@ -46917,7 +46839,7 @@ index 8523b278e..ce1d812 100644 if (vport->cfg_lun_queue_depth <= queue_depth) return; -@@ -416,8 +416,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba) +@@ -438,8 +438,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba) unsigned long num_rsrc_err, num_cmd_success; int i; @@ -46928,7 +46850,7 @@ index 8523b278e..ce1d812 100644 /* * The error and success command counters are global per -@@ -445,8 +445,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba) +@@ -467,8 +467,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba) } } lpfc_destroy_vport_work_array(phba, vports); @@ -46939,7 +46861,7 @@ index 8523b278e..ce1d812 100644 } /** -@@ -480,8 +480,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba) +@@ -502,8 +502,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba) } } lpfc_destroy_vport_work_array(phba, vports); @@ -46951,7 +46873,7 @@ index 8523b278e..ce1d812 100644 /** diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c -index 8e1b737..50ff510 100644 +index 1eb7b028..b2a6080 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) @@ -47058,10 +46980,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 bf60c63..74d4dce 100644 +index d7a99ae..801df70 100644 --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c -@@ -2001,7 +2001,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable) +@@ -2004,7 +2004,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable) return 0; } @@ -47070,7 +46992,7 @@ index bf60c63..74d4dce 100644 .show_host_node_name = 1, .show_host_port_name = 1, -@@ -2048,7 +2048,7 @@ struct fc_function_template qla2xxx_transport_functions = { +@@ -2051,7 +2051,7 @@ struct fc_function_template qla2xxx_transport_functions = { .bsg_timeout = qla24xx_bsg_timeout, }; @@ -47080,7 +47002,7 @@ index bf60c63..74d4dce 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 026bfde..90c4018 100644 +index 2d98232..a84298e 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h @@ -528,8 +528,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *); @@ -47095,10 +47017,10 @@ index 026bfde..90c4018 100644 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *); 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 ad72c1d..afc9a98 100644 +index 3e21e9f..426ba79 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c -@@ -1571,8 +1571,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha) +@@ -1570,8 +1570,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; @@ -47125,7 +47047,7 @@ index ddf16a8..80f4dd0 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 4d231c1..2892c37 100644 +index b246b3c..897004d 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c @@ -2971,12 +2971,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess) @@ -47166,10 +47088,10 @@ index eaa808e..95f8841 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 86d5220..f22c51a 100644 +index 124392f..75eb43e 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c -@@ -1458,7 +1458,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q) +@@ -1474,7 +1474,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; @@ -47178,7 +47100,7 @@ index 86d5220..f22c51a 100644 /* * SCSI request completion path will do scsi_device_unbusy(), -@@ -1484,9 +1484,9 @@ static void scsi_softirq_done(struct request *rq) +@@ -1500,9 +1500,9 @@ static void scsi_softirq_done(struct request *rq) INIT_LIST_HEAD(&cmd->eh_entry); @@ -47191,10 +47113,10 @@ index 86d5220..f22c51a 100644 disposition = scsi_decide_disposition(cmd); if (disposition != SUCCESS && diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c -index 931a7d9..0c2a754 100644 +index 7e50061..71db7a6 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c -@@ -658,7 +658,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \ +@@ -687,7 +687,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \ char *buf) \ { \ struct scsi_device *sdev = to_scsi_device(dev); \ @@ -47217,7 +47139,7 @@ index 84a1fdf..693b0d6 100644 /* * 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 e106c27..11a380e 100644 +index 4628fd5..a94a1c2 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, @@ -47257,7 +47179,7 @@ index e106c27..11a380e 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 133926b..903000d 100644 +index abf7c40..c3240ed 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c @@ -80,7 +80,7 @@ struct iscsi_internal { @@ -47278,7 +47200,7 @@ index 133926b..903000d 100644 if (target_id == ISCSI_MAX_TARGET) { id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL); -@@ -3944,7 +3944,7 @@ static __init int iscsi_transport_init(void) +@@ -3956,7 +3956,7 @@ static __init int iscsi_transport_init(void) printk(KERN_INFO "Loading iSCSI transport class v%s.\n", ISCSI_TRANSPORT_VERSION); @@ -47319,10 +47241,10 @@ index f379c7f..e8fc69c 100644 transport_setup_device(&rport->dev); diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index 610417e..167c46c 100644 +index 86fcf2c..26d8594 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c -@@ -2928,7 +2928,7 @@ static int sd_probe(struct device *dev) +@@ -2938,7 +2938,7 @@ static int sd_probe(struct device *dev) sdkp->disk = gd; sdkp->index = index; atomic_set(&sdkp->openers, 0); @@ -47331,15 +47253,6 @@ index 610417e..167c46c 100644 if (!sdp->request_queue->rq_timeout) { if (sdp->type != TYPE_MOD) -@@ -2941,7 +2941,7 @@ static int sd_probe(struct device *dev) - device_initialize(&sdkp->dev); - sdkp->dev.parent = dev; - sdkp->dev.class = &sd_disk_class; -- dev_set_name(&sdkp->dev, dev_name(dev)); -+ dev_set_name(&sdkp->dev, "%s", dev_name(dev)); - - if (device_add(&sdkp->dev)) - goto out_free_index; diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index df5e961..df6b97f 100644 --- a/drivers/scsi/sg.c @@ -47354,7 +47267,7 @@ index df5e961..df6b97f 100644 return blk_trace_startstop(sdp->device->request_queue, 1); case BLKTRACESTOP: diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c -index 32b7bb1..2f1c4bd 100644 +index 978dda2..cb19aa0 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1631,7 +1631,7 @@ int spi_bus_unlock(struct spi_master *master) @@ -47367,7 +47280,7 @@ index 32b7bb1..2f1c4bd 100644 static u8 *buf; diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c -index ec9e2ae..cd15d67 100644 +index ee3a57f..18368c1 100644 --- a/drivers/staging/android/timed_output.c +++ b/drivers/staging/android/timed_output.c @@ -25,7 +25,7 @@ @@ -47395,7 +47308,7 @@ index ec9e2ae..cd15d67 100644 - tdev->index = atomic_inc_return(&device_count); + tdev->index = atomic_inc_return_unchecked(&device_count); tdev->dev = device_create(timed_output_class, NULL, - MKDEV(0, tdev->index), NULL, tdev->name); + MKDEV(0, tdev->index), NULL, "%s", tdev->name); if (IS_ERR(tdev->dev)) diff --git a/drivers/staging/media/solo6x10/solo6x10-core.c b/drivers/staging/media/solo6x10/solo6x10-core.c index 3675020..e80d92c 100644 @@ -47572,7 +47485,7 @@ index d07fcb5..358e1e1 100644 return; } diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c -index 8417c2f..ef5ebd6 100644 +index 57a08c5..5b4bb7c 100644 --- a/drivers/staging/vt6655/hostap.c +++ b/drivers/staging/vt6655/hostap.c @@ -69,14 +69,13 @@ static int msglevel = MSG_LEVEL_INFO; @@ -47654,7 +47567,7 @@ index d128ce2..fc1f9a1 100644 /* core tmem accessor functions */ diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c -index d3536f5..a0c2ce9 100644 +index e51b09a..5ebac31 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[] = { @@ -47676,7 +47589,7 @@ index d3536f5..a0c2ce9 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 4630481..c26782a 100644 +index 8f4142f..b127f7d 100644 --- a/drivers/target/target_core_device.c +++ b/drivers/target/target_core_device.c @@ -1400,7 +1400,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name) @@ -47689,7 +47602,7 @@ index 4630481..c26782a 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 21e3158..43c6004 100644 +index d8e49d7..6fcfdec 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c @@ -1080,7 +1080,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd) @@ -48124,10 +48037,10 @@ index 6422390..49003ac8 100644 dlci_get(dlci->gsm->dlci[0]); mux_get(dlci->gsm); diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c -index 6c7fe90..9241dab 100644 +index 4bf0fc0..433bd58 100644 --- a/drivers/tty/n_tty.c +++ b/drivers/tty/n_tty.c -@@ -2203,6 +2203,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops) +@@ -2217,6 +2217,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops) { *ops = tty_ldisc_N_TTY; ops->owner = NULL; @@ -48321,7 +48234,7 @@ index 1002054..dd644a8 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 b11e997..6d25a3b 100644 +index 2c6cfb3..048274e 100644 --- a/drivers/tty/serial/msm_serial.c +++ b/drivers/tty/serial/msm_serial.c @@ -857,7 +857,7 @@ static struct uart_driver msm_uart_driver = { @@ -48343,7 +48256,7 @@ index b11e997..6d25a3b 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 0c8a9fa..234a95f 100644 +index 376079b..d8de7aa 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c @@ -453,11 +453,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port) @@ -48375,10 +48288,10 @@ index 0c8a9fa..234a95f 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 f87dbfd..42ad4b1 100644 +index 28cdd28..56f1d60 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c -@@ -1454,7 +1454,7 @@ static void uart_hangup(struct tty_struct *tty) +@@ -1448,7 +1448,7 @@ static void uart_hangup(struct tty_struct *tty) uart_flush_buffer(tty); uart_shutdown(tty, state); spin_lock_irqsave(&port->lock, flags); @@ -48387,7 +48300,7 @@ index f87dbfd..42ad4b1 100644 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags); spin_unlock_irqrestore(&port->lock, flags); tty_port_tty_set(port, NULL); -@@ -1550,7 +1550,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp) +@@ -1544,7 +1544,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp) goto end; } @@ -48396,7 +48309,7 @@ index f87dbfd..42ad4b1 100644 if (!state->uart_port || state->uart_port->flags & UPF_DEAD) { retval = -ENXIO; goto err_dec_count; -@@ -1578,7 +1578,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp) +@@ -1572,7 +1572,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp) /* * Make sure the device is in D0 state. */ @@ -48405,7 +48318,7 @@ index f87dbfd..42ad4b1 100644 uart_change_pm(state, UART_PM_STATE_ON); /* -@@ -1596,7 +1596,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp) +@@ -1590,7 +1590,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp) end: return retval; err_dec_count: @@ -48665,7 +48578,7 @@ index 1abf946..1ee34fc 100644 if (!retval) diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c -index ff17138..e38b41e 100644 +index dc6e969..5dc8786 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) @@ -48804,10 +48717,10 @@ index ff17138..e38b41e 100644 if (!retval) port->flags |= ASYNC_NORMAL_ACTIVE; diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c -index b51c154..17d55d1 100644 +index d5cc3ac..3263411 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c -@@ -1022,7 +1022,7 @@ EXPORT_SYMBOL(unregister_sysrq_key); +@@ -1033,7 +1033,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) { @@ -48817,10 +48730,10 @@ index b51c154..17d55d1 100644 if (get_user(c, buf)) diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c -index 4476682..d77e748 100644 +index 366af83..6db51c3 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c -@@ -3466,7 +3466,7 @@ EXPORT_SYMBOL_GPL(get_current_tty); +@@ -3467,7 +3467,7 @@ EXPORT_SYMBOL_GPL(get_current_tty); void tty_default_fops(struct file_operations *fops) { @@ -49007,7 +48920,7 @@ index a9af1b9a..1e08e7f 100644 ret = -EPERM; goto reterr; diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c -index b645c47..a55c182 100644 +index 3b96f18..026a9bf 100644 --- a/drivers/uio/uio.c +++ b/drivers/uio/uio.c @@ -25,6 +25,7 @@ @@ -49115,7 +49028,7 @@ index 8a7eb77..c00402f 100644 pos += tmp; diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c -index d3527dd..26effa2 100644 +index 5e0d33a..cc10579 100644 --- a/drivers/usb/atm/usbatm.c +++ b/drivers/usb/atm/usbatm.c @@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char @@ -49229,10 +49142,10 @@ index 2a3bbdf..91d72cf 100644 file->f_version = event_count; return POLLIN | POLLRDNORM; diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c -index d53547d..6a22d02 100644 +index 014dc99..4d25fd7 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c -@@ -1526,7 +1526,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); @@ -49241,7 +49154,7 @@ index d53547d..6a22d02 100644 usbmon_urb_submit(&hcd->self, urb); /* NOTE requirements on root-hub callers (usbfs and the hub -@@ -1553,7 +1553,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); @@ -49251,7 +49164,7 @@ index d53547d..6a22d02 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 da2905a..834a569 100644 +index 558313d..8cadfa5 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -27,6 +27,7 @@ @@ -49262,7 +49175,7 @@ index da2905a..834a569 100644 #include <asm/uaccess.h> #include <asm/byteorder.h> -@@ -4424,6 +4425,10 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, +@@ -4426,6 +4427,10 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, goto done; return; } @@ -49274,7 +49187,7 @@ index da2905a..834a569 100644 unit_load = 150; else diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c -index 444d30e..f15c850 100644 +index e7ee1e4..1dfc9ea4 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c @@ -129,7 +129,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev, @@ -49287,7 +49200,7 @@ index 444d30e..f15c850 100644 __u16 size, int timeout) { diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c -index aa38db4..0a08682 100644 +index d9284b9..17023c7 100644 --- a/drivers/usb/core/sysfs.c +++ b/drivers/usb/core/sysfs.c @@ -239,7 +239,7 @@ show_urbnum(struct device *dev, struct device_attribute *attr, char *buf) @@ -49300,10 +49213,10 @@ index aa38db4..0a08682 100644 static DEVICE_ATTR(urbnum, S_IRUGO, show_urbnum, NULL); diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c -index b10da72..43aa0b2 100644 +index 7dad603..350f7a9 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c -@@ -389,7 +389,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent, +@@ -422,7 +422,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent, set_dev_node(&dev->dev, dev_to_node(bus->controller)); dev->state = USB_STATE_ATTACHED; dev->lpm_disable_count = 1; @@ -49474,7 +49387,7 @@ index ba6a5d6..f88f7f3 100644 props.type = BACKLIGHT_RAW; props.max_brightness = 0xff; diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c -index 5f3bcd3..bfca43f 100644 +index afb50ea..7b0b1cf 100644 --- a/drivers/usb/serial/console.c +++ b/drivers/usb/serial/console.c @@ -124,7 +124,7 @@ static int usb_console_setup(struct console *co, char *options) @@ -49540,10 +49453,10 @@ index d6bea3e..60b250e 100644 /** diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c -index 028fc83..65bb105 100644 +index d3493ca..0c33b7e 100644 --- a/drivers/usb/wusbcore/wa-xfer.c +++ b/drivers/usb/wusbcore/wa-xfer.c -@@ -296,7 +296,7 @@ out: +@@ -297,7 +297,7 @@ out: */ static void wa_xfer_id_init(struct wa_xfer *xfer) { @@ -49553,10 +49466,10 @@ index 028fc83..65bb105 100644 /* diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c -index 6d78736..65be90e 100644 +index 842f450..d1d7409 100644 --- a/drivers/vfio/vfio.c +++ b/drivers/vfio/vfio.c -@@ -486,7 +486,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev) +@@ -488,7 +488,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev) return 0; /* TODO Prevent device auto probing */ @@ -49565,15 +49478,6 @@ index 6d78736..65be90e 100644 iommu_group_id(group->iommu_group)); return 0; -@@ -506,7 +506,7 @@ static int vfio_group_nb_del_dev(struct vfio_group *group, struct device *dev) - if (likely(!device)) - return 0; - -- WARN("Device %s removed from live group %d!\n", dev_name(dev), -+ WARN(1, "Device %s removed from live group %d!\n", dev_name(dev), - iommu_group_id(group->iommu_group)); - - vfio_device_put(device); diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c index 5174eba..86e764a 100644 --- a/drivers/vhost/vringh.c @@ -49588,7 +49492,7 @@ index 5174eba..86e764a 100644 } diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c -index 8c55011..eed4ae1a 100644 +index a4dfe8c..297ddd9 100644 --- a/drivers/video/aty/aty128fb.c +++ b/drivers/video/aty/aty128fb.c @@ -149,7 +149,7 @@ enum { @@ -49601,10 +49505,10 @@ index 8c55011..eed4ae1a 100644 "PCI", "PRO AGP", diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c -index 4f27fdc..d3537e6 100644 +index 9b0f12c..024673d 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c -@@ -1325,10 +1325,14 @@ static int atyfb_set_par(struct fb_info *info) +@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info) par->accel_flags = var->accel_flags; /* hack */ if (var->accel_flags) { @@ -49644,19 +49548,6 @@ index 95ec042..e6affdd 100644 return 0; } -diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c -index c74e7aa..e3c2790 100644 ---- a/drivers/video/backlight/backlight.c -+++ b/drivers/video/backlight/backlight.c -@@ -304,7 +304,7 @@ struct backlight_device *backlight_device_register(const char *name, - new_bd->dev.class = backlight_class; - new_bd->dev.parent = parent; - new_bd->dev.release = bl_device_release; -- dev_set_name(&new_bd->dev, name); -+ dev_set_name(&new_bd->dev, "%s", name); - dev_set_drvdata(&new_bd->dev, devdata); - - /* Set default properties */ diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c index bca6ccc..252107e 100644 --- a/drivers/video/backlight/kb3886_bl.c @@ -49670,19 +49561,6 @@ index bca6ccc..252107e 100644 { .ident = "Sahara Touch-iT", .matches = { -diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c -index 34fb6bd..3649fd9 100644 ---- a/drivers/video/backlight/lcd.c -+++ b/drivers/video/backlight/lcd.c -@@ -219,7 +219,7 @@ struct lcd_device *lcd_device_register(const char *name, struct device *parent, - new_ld->dev.class = lcd_class; - new_ld->dev.parent = parent; - new_ld->dev.release = lcd_device_release; -- dev_set_name(&new_ld->dev, name); -+ dev_set_name(&new_ld->dev, "%s", name); - dev_set_drvdata(&new_ld->dev, devdata); - - rc = device_register(&new_ld->dev); diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c index 900aa4e..6d49418 100644 --- a/drivers/video/fb_defio.c @@ -49722,7 +49600,7 @@ index 5c3960d..15cf8fc 100644 goto out1; } diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c -index 098bfc6..796841d 100644 +index 36e1fe2..c744820 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image, @@ -49787,1614 +49665,893 @@ index 7672d2e..b56437f 100644 par->dev_flags |= LOCKUP; info->pixmap.scan_align = 1; diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm -index 3c14e43..eafa544 100644 +index 285d552..eafa544 100644 --- a/drivers/video/logo/logo_linux_clut224.ppm +++ b/drivers/video/logo/logo_linux_clut224.ppm -@@ -1,1604 +1,1123 @@ +@@ -1,883 +1,1123 @@ P3 --# Standard 224-color Linux logo 80 80 255 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 6 6 6 6 6 6 10 10 10 10 10 10 -- 10 10 10 6 6 6 6 6 6 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 6 6 6 10 10 10 14 14 14 -- 22 22 22 26 26 26 30 30 30 34 34 34 -- 30 30 30 30 30 30 26 26 26 18 18 18 -- 14 14 14 10 10 10 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 1 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 6 6 6 14 14 14 26 26 26 42 42 42 -- 54 54 54 66 66 66 78 78 78 78 78 78 -- 78 78 78 74 74 74 66 66 66 54 54 54 -- 42 42 42 26 26 26 18 18 18 10 10 10 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 1 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 22 22 22 42 42 42 66 66 66 86 86 86 -- 66 66 66 38 38 38 38 38 38 22 22 22 -- 26 26 26 34 34 34 54 54 54 66 66 66 -- 86 86 86 70 70 70 46 46 46 26 26 26 -- 14 14 14 6 6 6 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 1 0 0 1 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 10 10 10 26 26 26 -- 50 50 50 82 82 82 58 58 58 6 6 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 6 6 6 54 54 54 86 86 86 66 66 66 -- 38 38 38 18 18 18 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 6 6 6 22 22 22 50 50 50 -- 78 78 78 34 34 34 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 6 6 6 70 70 70 -- 78 78 78 46 46 46 22 22 22 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 1 0 0 1 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 6 6 6 18 18 18 42 42 42 82 82 82 -- 26 26 26 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 14 14 14 -- 46 46 46 34 34 34 6 6 6 2 2 6 -- 42 42 42 78 78 78 42 42 42 18 18 18 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 1 0 0 0 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 10 10 10 30 30 30 66 66 66 58 58 58 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 26 26 26 -- 86 86 86 101 101 101 46 46 46 10 10 10 -- 2 2 6 58 58 58 70 70 70 34 34 34 -- 10 10 10 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 1 0 0 1 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 14 14 14 42 42 42 86 86 86 10 10 10 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 30 30 30 -- 94 94 94 94 94 94 58 58 58 26 26 26 -- 2 2 6 6 6 6 78 78 78 54 54 54 -- 22 22 22 6 6 6 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 22 22 22 62 62 62 62 62 62 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 26 26 26 -- 54 54 54 38 38 38 18 18 18 10 10 10 -- 2 2 6 2 2 6 34 34 34 82 82 82 -- 38 38 38 14 14 14 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 1 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 30 30 30 78 78 78 30 30 30 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 10 10 10 -- 10 10 10 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 78 78 78 -- 50 50 50 18 18 18 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 1 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 38 38 38 86 86 86 14 14 14 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 54 54 54 -- 66 66 66 26 26 26 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 1 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 42 42 42 82 82 82 2 2 6 2 2 6 -- 2 2 6 6 6 6 10 10 10 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 6 6 6 -- 14 14 14 10 10 10 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 18 18 18 -- 82 82 82 34 34 34 10 10 10 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 1 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 46 46 46 86 86 86 2 2 6 2 2 6 -- 6 6 6 6 6 6 22 22 22 34 34 34 -- 6 6 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 18 18 18 34 34 34 -- 10 10 10 50 50 50 22 22 22 2 2 6 -- 2 2 6 2 2 6 2 2 6 10 10 10 -- 86 86 86 42 42 42 14 14 14 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 1 0 0 1 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 46 46 46 86 86 86 2 2 6 2 2 6 -- 38 38 38 116 116 116 94 94 94 22 22 22 -- 22 22 22 2 2 6 2 2 6 2 2 6 -- 14 14 14 86 86 86 138 138 138 162 162 162 --154 154 154 38 38 38 26 26 26 6 6 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 86 86 86 46 46 46 14 14 14 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 46 46 46 86 86 86 2 2 6 14 14 14 --134 134 134 198 198 198 195 195 195 116 116 116 -- 10 10 10 2 2 6 2 2 6 6 6 6 --101 98 89 187 187 187 210 210 210 218 218 218 --214 214 214 134 134 134 14 14 14 6 6 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 86 86 86 50 50 50 18 18 18 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 1 0 0 0 -- 0 0 1 0 0 1 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 46 46 46 86 86 86 2 2 6 54 54 54 --218 218 218 195 195 195 226 226 226 246 246 246 -- 58 58 58 2 2 6 2 2 6 30 30 30 --210 210 210 253 253 253 174 174 174 123 123 123 --221 221 221 234 234 234 74 74 74 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 70 70 70 58 58 58 22 22 22 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 46 46 46 82 82 82 2 2 6 106 106 106 --170 170 170 26 26 26 86 86 86 226 226 226 --123 123 123 10 10 10 14 14 14 46 46 46 --231 231 231 190 190 190 6 6 6 70 70 70 -- 90 90 90 238 238 238 158 158 158 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 70 70 70 58 58 58 22 22 22 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 1 0 0 0 -- 0 0 1 0 0 1 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 42 42 42 86 86 86 6 6 6 116 116 116 --106 106 106 6 6 6 70 70 70 149 149 149 --128 128 128 18 18 18 38 38 38 54 54 54 --221 221 221 106 106 106 2 2 6 14 14 14 -- 46 46 46 190 190 190 198 198 198 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 74 74 74 62 62 62 22 22 22 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 1 0 0 0 -- 0 0 1 0 0 0 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 42 42 42 94 94 94 14 14 14 101 101 101 --128 128 128 2 2 6 18 18 18 116 116 116 --118 98 46 121 92 8 121 92 8 98 78 10 --162 162 162 106 106 106 2 2 6 2 2 6 -- 2 2 6 195 195 195 195 195 195 6 6 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 74 74 74 62 62 62 22 22 22 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 1 0 0 1 -- 0 0 1 0 0 0 0 0 1 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 38 38 38 90 90 90 14 14 14 58 58 58 --210 210 210 26 26 26 54 38 6 154 114 10 --226 170 11 236 186 11 225 175 15 184 144 12 --215 174 15 175 146 61 37 26 9 2 2 6 -- 70 70 70 246 246 246 138 138 138 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 70 70 70 66 66 66 26 26 26 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 38 38 38 86 86 86 14 14 14 10 10 10 --195 195 195 188 164 115 192 133 9 225 175 15 --239 182 13 234 190 10 232 195 16 232 200 30 --245 207 45 241 208 19 232 195 16 184 144 12 --218 194 134 211 206 186 42 42 42 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 50 50 50 74 74 74 30 30 30 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 34 34 34 86 86 86 14 14 14 2 2 6 --121 87 25 192 133 9 219 162 10 239 182 13 --236 186 11 232 195 16 241 208 19 244 214 54 --246 218 60 246 218 38 246 215 20 241 208 19 --241 208 19 226 184 13 121 87 25 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 50 50 50 82 82 82 34 34 34 10 10 10 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 34 34 34 82 82 82 30 30 30 61 42 6 --180 123 7 206 145 10 230 174 11 239 182 13 --234 190 10 238 202 15 241 208 19 246 218 74 --246 218 38 246 215 20 246 215 20 246 215 20 --226 184 13 215 174 15 184 144 12 6 6 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 26 26 26 94 94 94 42 42 42 14 14 14 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 30 30 30 78 78 78 50 50 50 104 69 6 --192 133 9 216 158 10 236 178 12 236 186 11 --232 195 16 241 208 19 244 214 54 245 215 43 --246 215 20 246 215 20 241 208 19 198 155 10 --200 144 11 216 158 10 156 118 10 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 6 6 6 90 90 90 54 54 54 18 18 18 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 30 30 30 78 78 78 46 46 46 22 22 22 --137 92 6 210 162 10 239 182 13 238 190 10 --238 202 15 241 208 19 246 215 20 246 215 20 --241 208 19 203 166 17 185 133 11 210 150 10 --216 158 10 210 150 10 102 78 10 2 2 6 -- 6 6 6 54 54 54 14 14 14 2 2 6 -- 2 2 6 62 62 62 74 74 74 30 30 30 -- 10 10 10 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 34 34 34 78 78 78 50 50 50 6 6 6 -- 94 70 30 139 102 15 190 146 13 226 184 13 --232 200 30 232 195 16 215 174 15 190 146 13 --168 122 10 192 133 9 210 150 10 213 154 11 --202 150 34 182 157 106 101 98 89 2 2 6 -- 2 2 6 78 78 78 116 116 116 58 58 58 -- 2 2 6 22 22 22 90 90 90 46 46 46 -- 18 18 18 6 6 6 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 38 38 38 86 86 86 50 50 50 6 6 6 --128 128 128 174 154 114 156 107 11 168 122 10 --198 155 10 184 144 12 197 138 11 200 144 11 --206 145 10 206 145 10 197 138 11 188 164 115 --195 195 195 198 198 198 174 174 174 14 14 14 -- 2 2 6 22 22 22 116 116 116 116 116 116 -- 22 22 22 2 2 6 74 74 74 70 70 70 -- 30 30 30 10 10 10 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 6 6 6 18 18 18 -- 50 50 50 101 101 101 26 26 26 10 10 10 --138 138 138 190 190 190 174 154 114 156 107 11 --197 138 11 200 144 11 197 138 11 192 133 9 --180 123 7 190 142 34 190 178 144 187 187 187 --202 202 202 221 221 221 214 214 214 66 66 66 -- 2 2 6 2 2 6 50 50 50 62 62 62 -- 6 6 6 2 2 6 10 10 10 90 90 90 -- 50 50 50 18 18 18 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 10 10 10 34 34 34 -- 74 74 74 74 74 74 2 2 6 6 6 6 --144 144 144 198 198 198 190 190 190 178 166 146 --154 121 60 156 107 11 156 107 11 168 124 44 --174 154 114 187 187 187 190 190 190 210 210 210 --246 246 246 253 253 253 253 253 253 182 182 182 -- 6 6 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 62 62 62 -- 74 74 74 34 34 34 14 14 14 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 10 10 10 22 22 22 54 54 54 -- 94 94 94 18 18 18 2 2 6 46 46 46 --234 234 234 221 221 221 190 190 190 190 190 190 --190 190 190 187 187 187 187 187 187 190 190 190 --190 190 190 195 195 195 214 214 214 242 242 242 --253 253 253 253 253 253 253 253 253 253 253 253 -- 82 82 82 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 14 14 14 -- 86 86 86 54 54 54 22 22 22 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 6 6 6 18 18 18 46 46 46 90 90 90 -- 46 46 46 18 18 18 6 6 6 182 182 182 --253 253 253 246 246 246 206 206 206 190 190 190 --190 190 190 190 190 190 190 190 190 190 190 190 --206 206 206 231 231 231 250 250 250 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --202 202 202 14 14 14 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 42 42 42 86 86 86 42 42 42 18 18 18 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 14 14 14 38 38 38 74 74 74 66 66 66 -- 2 2 6 6 6 6 90 90 90 250 250 250 --253 253 253 253 253 253 238 238 238 198 198 198 --190 190 190 190 190 190 195 195 195 221 221 221 --246 246 246 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 82 82 82 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 78 78 78 70 70 70 34 34 34 -- 14 14 14 6 6 6 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 34 34 34 66 66 66 78 78 78 6 6 6 -- 2 2 6 18 18 18 218 218 218 253 253 253 --253 253 253 253 253 253 253 253 253 246 246 246 --226 226 226 231 231 231 246 246 246 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 178 178 178 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 18 18 18 90 90 90 62 62 62 -- 30 30 30 10 10 10 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 10 10 10 26 26 26 -- 58 58 58 90 90 90 18 18 18 2 2 6 -- 2 2 6 110 110 110 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --250 250 250 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 231 231 231 18 18 18 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 18 18 18 94 94 94 -- 54 54 54 26 26 26 10 10 10 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 6 6 6 22 22 22 50 50 50 -- 90 90 90 26 26 26 2 2 6 2 2 6 -- 14 14 14 195 195 195 250 250 250 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --250 250 250 242 242 242 54 54 54 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 38 38 38 -- 86 86 86 50 50 50 22 22 22 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 6 6 6 14 14 14 38 38 38 82 82 82 -- 34 34 34 2 2 6 2 2 6 2 2 6 -- 42 42 42 195 195 195 246 246 246 253 253 253 --253 253 253 253 253 253 253 253 253 250 250 250 --242 242 242 242 242 242 250 250 250 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 250 250 250 246 246 246 238 238 238 --226 226 226 231 231 231 101 101 101 6 6 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 38 38 38 82 82 82 42 42 42 14 14 14 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 10 10 10 26 26 26 62 62 62 66 66 66 -- 2 2 6 2 2 6 2 2 6 6 6 6 -- 70 70 70 170 170 170 206 206 206 234 234 234 --246 246 246 250 250 250 250 250 250 238 238 238 --226 226 226 231 231 231 238 238 238 250 250 250 --250 250 250 250 250 250 246 246 246 231 231 231 --214 214 214 206 206 206 202 202 202 202 202 202 --198 198 198 202 202 202 182 182 182 18 18 18 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 62 62 62 66 66 66 30 30 30 -- 10 10 10 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 14 14 14 42 42 42 82 82 82 18 18 18 -- 2 2 6 2 2 6 2 2 6 10 10 10 -- 94 94 94 182 182 182 218 218 218 242 242 242 --250 250 250 253 253 253 253 253 253 250 250 250 --234 234 234 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 246 246 246 --238 238 238 226 226 226 210 210 210 202 202 202 --195 195 195 195 195 195 210 210 210 158 158 158 -- 6 6 6 14 14 14 50 50 50 14 14 14 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 6 6 6 86 86 86 46 46 46 -- 18 18 18 6 6 6 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 22 22 22 54 54 54 70 70 70 2 2 6 -- 2 2 6 10 10 10 2 2 6 22 22 22 --166 166 166 231 231 231 250 250 250 253 253 253 --253 253 253 253 253 253 253 253 253 250 250 250 --242 242 242 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 246 246 246 --231 231 231 206 206 206 198 198 198 226 226 226 -- 94 94 94 2 2 6 6 6 6 38 38 38 -- 30 30 30 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 62 62 62 66 66 66 -- 26 26 26 10 10 10 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 30 30 30 74 74 74 50 50 50 2 2 6 -- 26 26 26 26 26 26 2 2 6 106 106 106 --238 238 238 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 246 246 246 218 218 218 202 202 202 --210 210 210 14 14 14 2 2 6 2 2 6 -- 30 30 30 22 22 22 2 2 6 2 2 6 -- 2 2 6 2 2 6 18 18 18 86 86 86 -- 42 42 42 14 14 14 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 42 42 42 90 90 90 22 22 22 2 2 6 -- 42 42 42 2 2 6 18 18 18 218 218 218 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 250 250 250 221 221 221 --218 218 218 101 101 101 2 2 6 14 14 14 -- 18 18 18 38 38 38 10 10 10 2 2 6 -- 2 2 6 2 2 6 2 2 6 78 78 78 -- 58 58 58 22 22 22 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 6 6 6 18 18 18 -- 54 54 54 82 82 82 2 2 6 26 26 26 -- 22 22 22 2 2 6 123 123 123 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 250 250 250 --238 238 238 198 198 198 6 6 6 38 38 38 -- 58 58 58 26 26 26 38 38 38 2 2 6 -- 2 2 6 2 2 6 2 2 6 46 46 46 -- 78 78 78 30 30 30 10 10 10 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 10 10 10 30 30 30 -- 74 74 74 58 58 58 2 2 6 42 42 42 -- 2 2 6 22 22 22 231 231 231 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 250 250 250 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 246 246 246 46 46 46 38 38 38 -- 42 42 42 14 14 14 38 38 38 14 14 14 -- 2 2 6 2 2 6 2 2 6 6 6 6 -- 86 86 86 46 46 46 14 14 14 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 6 6 6 14 14 14 42 42 42 -- 90 90 90 18 18 18 18 18 18 26 26 26 -- 2 2 6 116 116 116 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 250 250 250 238 238 238 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 94 94 94 6 6 6 -- 2 2 6 2 2 6 10 10 10 34 34 34 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 74 74 74 58 58 58 22 22 22 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 10 10 10 26 26 26 66 66 66 -- 82 82 82 2 2 6 38 38 38 6 6 6 -- 14 14 14 210 210 210 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 246 246 246 242 242 242 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 144 144 144 2 2 6 -- 2 2 6 2 2 6 2 2 6 46 46 46 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 42 42 42 74 74 74 30 30 30 10 10 10 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 6 6 6 14 14 14 42 42 42 90 90 90 -- 26 26 26 6 6 6 42 42 42 2 2 6 -- 74 74 74 250 250 250 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 242 242 242 242 242 242 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 182 182 182 2 2 6 -- 2 2 6 2 2 6 2 2 6 46 46 46 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 10 10 10 86 86 86 38 38 38 10 10 10 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 10 10 10 26 26 26 66 66 66 82 82 82 -- 2 2 6 22 22 22 18 18 18 2 2 6 --149 149 149 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 234 234 234 242 242 242 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 206 206 206 2 2 6 -- 2 2 6 2 2 6 2 2 6 38 38 38 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 6 6 6 86 86 86 46 46 46 14 14 14 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 18 18 18 46 46 46 86 86 86 18 18 18 -- 2 2 6 34 34 34 10 10 10 6 6 6 --210 210 210 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 234 234 234 242 242 242 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 221 221 221 6 6 6 -- 2 2 6 2 2 6 6 6 6 30 30 30 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 82 82 82 54 54 54 18 18 18 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 26 26 26 66 66 66 62 62 62 2 2 6 -- 2 2 6 38 38 38 10 10 10 26 26 26 --238 238 238 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 238 238 238 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 6 6 6 -- 2 2 6 2 2 6 10 10 10 30 30 30 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 66 66 66 58 58 58 22 22 22 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 38 38 38 78 78 78 6 6 6 2 2 6 -- 2 2 6 46 46 46 14 14 14 42 42 42 --246 246 246 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 242 242 242 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 234 234 234 10 10 10 -- 2 2 6 2 2 6 22 22 22 14 14 14 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 66 66 66 62 62 62 22 22 22 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 6 6 6 18 18 18 -- 50 50 50 74 74 74 2 2 6 2 2 6 -- 14 14 14 70 70 70 34 34 34 62 62 62 --250 250 250 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 246 246 246 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 234 234 234 14 14 14 -- 2 2 6 2 2 6 30 30 30 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 66 66 66 62 62 62 22 22 22 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 6 6 6 18 18 18 -- 54 54 54 62 62 62 2 2 6 2 2 6 -- 2 2 6 30 30 30 46 46 46 70 70 70 --250 250 250 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 246 246 246 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 226 226 226 10 10 10 -- 2 2 6 6 6 6 30 30 30 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 66 66 66 58 58 58 22 22 22 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 6 6 6 22 22 22 -- 58 58 58 62 62 62 2 2 6 2 2 6 -- 2 2 6 2 2 6 30 30 30 78 78 78 --250 250 250 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 246 246 246 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 206 206 206 2 2 6 -- 22 22 22 34 34 34 18 14 6 22 22 22 -- 26 26 26 18 18 18 6 6 6 2 2 6 -- 2 2 6 82 82 82 54 54 54 18 18 18 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 6 6 6 26 26 26 -- 62 62 62 106 106 106 74 54 14 185 133 11 --210 162 10 121 92 8 6 6 6 62 62 62 --238 238 238 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 246 246 246 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 158 158 158 18 18 18 -- 14 14 14 2 2 6 2 2 6 2 2 6 -- 6 6 6 18 18 18 66 66 66 38 38 38 -- 6 6 6 94 94 94 50 50 50 18 18 18 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 10 10 10 10 10 10 18 18 18 38 38 38 -- 78 78 78 142 134 106 216 158 10 242 186 14 --246 190 14 246 190 14 156 118 10 10 10 10 -- 90 90 90 238 238 238 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 250 250 250 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 246 230 190 --238 204 91 238 204 91 181 142 44 37 26 9 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 38 38 38 46 46 46 -- 26 26 26 106 106 106 54 54 54 18 18 18 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 6 6 6 14 14 14 22 22 22 -- 30 30 30 38 38 38 50 50 50 70 70 70 --106 106 106 190 142 34 226 170 11 242 186 14 --246 190 14 246 190 14 246 190 14 154 114 10 -- 6 6 6 74 74 74 226 226 226 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 250 250 250 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 228 184 62 --241 196 14 241 208 19 232 195 16 38 30 10 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 6 6 6 30 30 30 26 26 26 --203 166 17 154 142 90 66 66 66 26 26 26 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 6 6 6 18 18 18 38 38 38 58 58 58 -- 78 78 78 86 86 86 101 101 101 123 123 123 --175 146 61 210 150 10 234 174 13 246 186 14 --246 190 14 246 190 14 246 190 14 238 190 10 --102 78 10 2 2 6 46 46 46 198 198 198 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 234 234 234 242 242 242 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 224 178 62 --242 186 14 241 196 14 210 166 10 22 18 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 6 6 6 121 92 8 --238 202 15 232 195 16 82 82 82 34 34 34 -- 10 10 10 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 14 14 14 38 38 38 70 70 70 154 122 46 --190 142 34 200 144 11 197 138 11 197 138 11 --213 154 11 226 170 11 242 186 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --225 175 15 46 32 6 2 2 6 22 22 22 --158 158 158 250 250 250 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 250 250 250 242 242 242 224 178 62 --239 182 13 236 186 11 213 154 11 46 32 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 61 42 6 225 175 15 --238 190 10 236 186 11 112 100 78 42 42 42 -- 14 14 14 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 22 22 22 54 54 54 154 122 46 213 154 11 --226 170 11 230 174 11 226 170 11 226 170 11 --236 178 12 242 186 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --241 196 14 184 144 12 10 10 10 2 2 6 -- 6 6 6 116 116 116 242 242 242 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 231 231 231 198 198 198 214 170 54 --236 178 12 236 178 12 210 150 10 137 92 6 -- 18 14 6 2 2 6 2 2 6 2 2 6 -- 6 6 6 70 47 6 200 144 11 236 178 12 --239 182 13 239 182 13 124 112 88 58 58 58 -- 22 22 22 6 6 6 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 30 30 30 70 70 70 180 133 36 226 170 11 --239 182 13 242 186 14 242 186 14 246 186 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 232 195 16 98 70 6 2 2 6 -- 2 2 6 2 2 6 66 66 66 221 221 221 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 206 206 206 198 198 198 214 166 58 --230 174 11 230 174 11 216 158 10 192 133 9 --163 110 8 116 81 8 102 78 10 116 81 8 --167 114 7 197 138 11 226 170 11 239 182 13 --242 186 14 242 186 14 162 146 94 78 78 78 -- 34 34 34 14 14 14 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 30 30 30 78 78 78 190 142 34 226 170 11 --239 182 13 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 241 196 14 203 166 17 22 18 6 -- 2 2 6 2 2 6 2 2 6 38 38 38 --218 218 218 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --250 250 250 206 206 206 198 198 198 202 162 69 --226 170 11 236 178 12 224 166 10 210 150 10 --200 144 11 197 138 11 192 133 9 197 138 11 --210 150 10 226 170 11 242 186 14 246 190 14 --246 190 14 246 186 14 225 175 15 124 112 88 -- 62 62 62 30 30 30 14 14 14 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 30 30 30 78 78 78 174 135 50 224 166 10 --239 182 13 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 241 196 14 139 102 15 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 78 78 78 250 250 250 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --250 250 250 214 214 214 198 198 198 190 150 46 --219 162 10 236 178 12 234 174 13 224 166 10 --216 158 10 213 154 11 213 154 11 216 158 10 --226 170 11 239 182 13 246 190 14 246 190 14 --246 190 14 246 190 14 242 186 14 206 162 42 --101 101 101 58 58 58 30 30 30 14 14 14 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 30 30 30 74 74 74 174 135 50 216 158 10 --236 178 12 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 241 196 14 226 184 13 -- 61 42 6 2 2 6 2 2 6 2 2 6 -- 22 22 22 238 238 238 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 226 226 226 187 187 187 180 133 36 --216 158 10 236 178 12 239 182 13 236 178 12 --230 174 11 226 170 11 226 170 11 230 174 11 --236 178 12 242 186 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 186 14 239 182 13 --206 162 42 106 106 106 66 66 66 34 34 34 -- 14 14 14 6 6 6 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 26 26 26 70 70 70 163 133 67 213 154 11 --236 178 12 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 241 196 14 --190 146 13 18 14 6 2 2 6 2 2 6 -- 46 46 46 246 246 246 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 221 221 221 86 86 86 156 107 11 --216 158 10 236 178 12 242 186 14 246 186 14 --242 186 14 239 182 13 239 182 13 242 186 14 --242 186 14 246 186 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --242 186 14 225 175 15 142 122 72 66 66 66 -- 30 30 30 10 10 10 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 26 26 26 70 70 70 163 133 67 210 150 10 --236 178 12 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --232 195 16 121 92 8 34 34 34 106 106 106 --221 221 221 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --242 242 242 82 82 82 18 14 6 163 110 8 --216 158 10 236 178 12 242 186 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 242 186 14 163 133 67 -- 46 46 46 18 18 18 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 10 10 10 -- 30 30 30 78 78 78 163 133 67 210 150 10 --236 178 12 246 186 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --241 196 14 215 174 15 190 178 144 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 218 218 218 -- 58 58 58 2 2 6 22 18 6 167 114 7 --216 158 10 236 178 12 246 186 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 186 14 242 186 14 190 150 46 -- 54 54 54 22 22 22 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 38 38 38 86 86 86 180 133 36 213 154 11 --236 178 12 246 186 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 232 195 16 190 146 13 214 214 214 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 250 250 250 170 170 170 26 26 26 -- 2 2 6 2 2 6 37 26 9 163 110 8 --219 162 10 239 182 13 246 186 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 186 14 236 178 12 224 166 10 142 122 72 -- 46 46 46 18 18 18 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 6 6 6 18 18 18 -- 50 50 50 109 106 95 192 133 9 224 166 10 --242 186 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --242 186 14 226 184 13 210 162 10 142 110 46 --226 226 226 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 --198 198 198 66 66 66 2 2 6 2 2 6 -- 2 2 6 2 2 6 50 34 6 156 107 11 --219 162 10 239 182 13 246 186 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 242 186 14 --234 174 13 213 154 11 154 122 46 66 66 66 -- 30 30 30 10 10 10 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 6 6 6 22 22 22 -- 58 58 58 154 121 60 206 145 10 234 174 13 --242 186 14 246 186 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 186 14 236 178 12 210 162 10 163 110 8 -- 61 42 6 138 138 138 218 218 218 250 250 250 --253 253 253 253 253 253 253 253 253 250 250 250 --242 242 242 210 210 210 144 144 144 66 66 66 -- 6 6 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 61 42 6 163 110 8 --216 158 10 236 178 12 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 239 182 13 230 174 11 216 158 10 --190 142 34 124 112 88 70 70 70 38 38 38 -- 18 18 18 6 6 6 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 6 6 6 22 22 22 -- 62 62 62 168 124 44 206 145 10 224 166 10 --236 178 12 239 182 13 242 186 14 242 186 14 --246 186 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 236 178 12 216 158 10 175 118 6 -- 80 54 7 2 2 6 6 6 6 30 30 30 -- 54 54 54 62 62 62 50 50 50 38 38 38 -- 14 14 14 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 6 6 6 80 54 7 167 114 7 --213 154 11 236 178 12 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 242 186 14 239 182 13 239 182 13 --230 174 11 210 150 10 174 135 50 124 112 88 -- 82 82 82 54 54 54 34 34 34 18 18 18 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 6 6 6 18 18 18 -- 50 50 50 158 118 36 192 133 9 200 144 11 --216 158 10 219 162 10 224 166 10 226 170 11 --230 174 11 236 178 12 239 182 13 239 182 13 --242 186 14 246 186 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 --246 186 14 230 174 11 210 150 10 163 110 8 --104 69 6 10 10 10 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 6 6 6 91 60 6 167 114 7 --206 145 10 230 174 11 242 186 14 246 190 14 --246 190 14 246 190 14 246 186 14 242 186 14 --239 182 13 230 174 11 224 166 10 213 154 11 --180 133 36 124 112 88 86 86 86 58 58 58 -- 38 38 38 22 22 22 10 10 10 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 14 14 14 -- 34 34 34 70 70 70 138 110 50 158 118 36 --167 114 7 180 123 7 192 133 9 197 138 11 --200 144 11 206 145 10 213 154 11 219 162 10 --224 166 10 230 174 11 239 182 13 242 186 14 --246 186 14 246 186 14 246 186 14 246 186 14 --239 182 13 216 158 10 185 133 11 152 99 6 --104 69 6 18 14 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 2 2 6 2 2 6 2 2 6 -- 2 2 6 6 6 6 80 54 7 152 99 6 --192 133 9 219 162 10 236 178 12 239 182 13 --246 186 14 242 186 14 239 182 13 236 178 12 --224 166 10 206 145 10 192 133 9 154 121 60 -- 94 94 94 62 62 62 42 42 42 22 22 22 -- 14 14 14 6 6 6 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 18 18 18 34 34 34 58 58 58 78 78 78 --101 98 89 124 112 88 142 110 46 156 107 11 --163 110 8 167 114 7 175 118 6 180 123 7 --185 133 11 197 138 11 210 150 10 219 162 10 --226 170 11 236 178 12 236 178 12 234 174 13 --219 162 10 197 138 11 163 110 8 130 83 6 -- 91 60 6 10 10 10 2 2 6 2 2 6 -- 18 18 18 38 38 38 38 38 38 38 38 38 -- 38 38 38 38 38 38 38 38 38 38 38 38 -- 38 38 38 38 38 38 26 26 26 2 2 6 -- 2 2 6 6 6 6 70 47 6 137 92 6 --175 118 6 200 144 11 219 162 10 230 174 11 --234 174 13 230 174 11 219 162 10 210 150 10 --192 133 9 163 110 8 124 112 88 82 82 82 -- 50 50 50 30 30 30 14 14 14 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 6 6 6 14 14 14 22 22 22 34 34 34 -- 42 42 42 58 58 58 74 74 74 86 86 86 --101 98 89 122 102 70 130 98 46 121 87 25 --137 92 6 152 99 6 163 110 8 180 123 7 --185 133 11 197 138 11 206 145 10 200 144 11 --180 123 7 156 107 11 130 83 6 104 69 6 -- 50 34 6 54 54 54 110 110 110 101 98 89 -- 86 86 86 82 82 82 78 78 78 78 78 78 -- 78 78 78 78 78 78 78 78 78 78 78 78 -- 78 78 78 82 82 82 86 86 86 94 94 94 --106 106 106 101 101 101 86 66 34 124 80 6 --156 107 11 180 123 7 192 133 9 200 144 11 --206 145 10 200 144 11 192 133 9 175 118 6 --139 102 15 109 106 95 70 70 70 42 42 42 -- 22 22 22 10 10 10 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 6 6 6 10 10 10 -- 14 14 14 22 22 22 30 30 30 38 38 38 -- 50 50 50 62 62 62 74 74 74 90 90 90 --101 98 89 112 100 78 121 87 25 124 80 6 --137 92 6 152 99 6 152 99 6 152 99 6 --138 86 6 124 80 6 98 70 6 86 66 30 --101 98 89 82 82 82 58 58 58 46 46 46 -- 38 38 38 34 34 34 34 34 34 34 34 34 -- 34 34 34 34 34 34 34 34 34 34 34 34 -- 34 34 34 34 34 34 38 38 38 42 42 42 -- 54 54 54 82 82 82 94 86 76 91 60 6 --134 86 6 156 107 11 167 114 7 175 118 6 --175 118 6 167 114 7 152 99 6 121 87 25 --101 98 89 62 62 62 34 34 34 18 18 18 -- 6 6 6 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 6 6 6 6 6 6 10 10 10 -- 18 18 18 22 22 22 30 30 30 42 42 42 -- 50 50 50 66 66 66 86 86 86 101 98 89 --106 86 58 98 70 6 104 69 6 104 69 6 --104 69 6 91 60 6 82 62 34 90 90 90 -- 62 62 62 38 38 38 22 22 22 14 14 14 -- 10 10 10 10 10 10 10 10 10 10 10 10 -- 10 10 10 10 10 10 6 6 6 10 10 10 -- 10 10 10 10 10 10 10 10 10 14 14 14 -- 22 22 22 42 42 42 70 70 70 89 81 66 -- 80 54 7 104 69 6 124 80 6 137 92 6 --134 86 6 116 81 8 100 82 52 86 86 86 -- 58 58 58 30 30 30 14 14 14 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 6 6 6 10 10 10 14 14 14 -- 18 18 18 26 26 26 38 38 38 54 54 54 -- 70 70 70 86 86 86 94 86 76 89 81 66 -- 89 81 66 86 86 86 74 74 74 50 50 50 -- 30 30 30 14 14 14 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 6 6 6 18 18 18 34 34 34 58 58 58 -- 82 82 82 89 81 66 89 81 66 89 81 66 -- 94 86 66 94 86 76 74 74 74 50 50 50 -- 26 26 26 14 14 14 6 6 6 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 6 6 6 6 6 6 14 14 14 18 18 18 -- 30 30 30 38 38 38 46 46 46 54 54 54 -- 50 50 50 42 42 42 30 30 30 18 18 18 -- 10 10 10 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 6 6 6 14 14 14 26 26 26 -- 38 38 38 50 50 50 58 58 58 58 58 58 -- 54 54 54 42 42 42 30 30 30 18 18 18 -- 10 10 10 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 6 6 6 10 10 10 14 14 14 18 18 18 -- 18 18 18 14 14 14 10 10 10 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 6 6 6 -- 14 14 14 18 18 18 22 22 22 22 22 22 -- 18 18 18 14 14 14 10 10 10 6 6 6 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 -- 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 11 15 17 33 49 54 59 85 92 73 97 106 +-83 116 129 105 131 142 115 114 122 74 88 93 20 29 31 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 6 6 6 10 10 10 10 10 10 +-10 10 10 6 6 6 6 6 6 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 2 3 3 17 23 26 50 67 72 73 97 106 59 85 92 73 97 106 +-105 131 142 124 127 131 105 131 142 105 131 142 53 75 83 6 8 8 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 6 6 6 10 10 10 14 14 14 22 22 22 26 26 26 30 30 30 34 34 34 +-30 30 30 30 30 30 26 26 26 18 18 18 14 14 14 10 10 10 6 6 6 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 +-0 0 0 1 1 1 26 35 39 59 85 92 59 85 92 59 85 92 29 43 47 53 75 83 +-108 122 132 132 98 104 108 122 132 105 131 142 101 101 101 43 45 48 6 8 8 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-6 6 6 14 14 14 26 26 26 42 42 42 54 54 54 66 66 66 78 78 78 78 78 78 +-78 78 78 74 74 74 66 66 66 54 54 54 42 42 42 26 26 26 18 18 18 10 10 10 +-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 +-11 15 17 27 40 45 59 85 92 59 85 92 27 40 45 31 45 49 73 97 106 93 121 133 +-108 122 132 108 122 132 105 131 142 108 122 132 105 131 142 73 97 106 26 35 39 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 +-22 22 22 42 42 42 66 66 66 86 86 86 66 66 66 38 38 38 38 38 38 22 22 22 +-26 26 26 34 34 34 54 54 54 66 66 66 86 86 86 70 70 70 46 46 46 26 26 26 +-14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 7 12 13 21 31 35 42 59 64 +-53 75 83 53 75 83 50 67 72 42 59 64 32 40 45 42 59 64 73 97 106 116 116 116 +-132 98 104 116 116 116 108 122 132 117 104 110 105 131 142 83 116 129 50 67 72 7 12 13 +-1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 26 26 26 +-50 50 50 82 82 82 58 58 58 6 6 6 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 54 54 54 86 86 86 66 66 66 +-38 38 38 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 1 1 1 6 8 8 15 22 25 26 35 39 36 54 60 53 75 83 59 85 92 +-59 85 92 48 63 69 15 22 25 12 17 20 52 67 79 94 94 94 132 98 104 132 98 104 +-117 104 110 108 122 132 108 122 132 115 114 122 105 131 142 77 105 114 59 85 92 36 54 60 +-7 12 13 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 50 50 50 +-78 78 78 34 34 34 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 70 70 70 +-78 78 78 46 46 46 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 15 22 25 29 43 47 36 54 60 42 59 64 42 59 64 48 63 69 21 31 35 +-6 8 8 29 43 47 36 50 56 43 45 48 79 78 84 132 98 104 165 78 79 132 98 104 +-108 122 132 117 104 110 117 104 110 108 122 132 77 105 114 73 97 106 95 131 149 78 102 129 +-36 50 56 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 42 42 42 82 82 82 +-26 26 26 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 2 2 6 2 2 6 14 14 14 46 46 46 34 34 34 6 6 6 2 2 6 +-42 42 42 78 78 78 42 42 42 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-27 40 45 53 75 83 48 63 69 24 31 37 6 8 12 0 0 0 18 25 28 26 35 39 +-12 17 20 26 35 39 65 78 84 112 81 86 152 81 83 137 83 86 132 98 104 117 104 110 +-117 104 110 132 98 104 132 98 104 115 114 122 73 97 106 53 75 83 95 131 149 93 124 152 +-68 78 128 15 22 25 0 0 0 0 0 0 10 10 10 30 30 30 66 66 66 58 58 58 +-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 2 2 6 2 2 6 26 26 26 86 86 86 101 101 101 46 46 46 10 10 10 +-2 2 6 58 58 58 70 70 70 34 34 34 10 10 10 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-36 50 56 21 30 33 4 7 7 0 0 0 1 1 1 17 12 12 69 31 31 68 59 64 +-57 59 63 21 31 35 32 40 45 86 73 69 152 81 83 152 81 83 117 104 110 132 98 104 +-152 81 83 132 98 104 108 122 132 77 105 114 77 105 114 93 121 133 95 131 149 93 124 152 +-95 131 149 53 75 83 11 15 17 0 0 0 14 14 14 42 42 42 86 86 86 10 10 10 +-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 2 2 6 2 2 6 30 30 30 94 94 94 94 94 94 58 58 58 26 26 26 +-2 2 6 6 6 6 78 78 78 54 54 54 22 22 22 6 6 6 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-17 23 26 2 3 3 0 0 0 17 12 12 69 31 31 123 55 55 123 55 55 152 81 83 +-86 73 69 17 23 26 7 12 13 45 54 57 101 101 101 137 83 86 132 98 104 132 98 104 +-137 83 86 117 104 110 77 105 114 42 59 64 50 67 72 78 102 129 91 117 157 91 117 157 +-95 131 149 83 116 129 40 48 73 6 6 6 22 22 22 62 62 62 62 62 62 2 2 6 +-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 2 2 6 2 2 6 26 26 26 54 54 54 38 38 38 18 18 18 10 10 10 +-2 2 6 2 2 6 34 34 34 82 82 82 38 38 38 14 14 14 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-1 1 1 1 2 2 2 3 3 28 12 12 123 55 55 174 79 79 174 79 79 174 79 79 +-152 81 83 68 59 64 26 35 39 27 40 45 79 78 84 137 83 86 165 78 79 137 83 86 +-94 94 94 48 63 69 36 50 56 50 67 72 73 97 106 93 121 133 93 124 152 93 124 152 +-95 131 149 91 118 149 78 102 129 27 40 45 30 30 30 78 78 78 30 30 30 2 2 6 +-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 2 2 6 2 2 6 10 10 10 10 10 10 2 2 6 2 2 6 2 2 6 +-2 2 6 2 2 6 2 2 6 78 78 78 50 50 50 18 18 18 6 6 6 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-4 5 3 24 53 24 19 31 15 8 7 3 90 61 47 165 78 79 174 79 79 174 79 79 +-174 79 79 137 83 86 60 52 57 7 12 13 17 23 26 70 70 70 132 98 104 112 81 86 +-79 78 84 31 45 49 15 22 25 53 75 83 91 118 149 86 106 160 91 117 157 93 124 152 +-91 117 157 93 124 152 95 131 149 53 75 83 50 50 50 86 86 86 14 14 14 2 2 6 +-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 2 2 6 2 2 6 54 54 54 66 66 66 26 26 26 6 6 6 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-19 31 15 34 76 34 34 76 34 19 31 15 28 12 12 123 55 55 174 79 79 174 79 79 +-174 79 79 165 78 79 112 81 86 32 40 45 15 22 25 38 53 58 65 78 84 29 31 32 +-21 30 33 42 59 64 60 80 103 78 102 129 87 112 149 84 96 162 91 117 157 93 124 152 +-91 117 157 93 124 152 93 121 133 59 85 92 57 68 71 82 85 86 2 2 6 2 2 6 +-2 2 6 6 6 6 10 10 10 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 2 2 6 2 2 6 6 6 6 14 14 14 10 10 10 2 2 6 2 2 6 +-2 2 6 2 2 6 2 2 6 18 18 18 82 82 82 34 34 34 10 10 10 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-34 76 34 40 89 40 40 89 40 34 76 34 8 15 6 48 26 18 123 55 55 174 79 79 +-174 79 79 174 79 79 137 83 86 68 59 64 32 40 45 21 30 33 31 45 49 21 31 35 +-12 17 20 48 63 69 78 102 129 81 88 166 84 96 162 91 117 157 93 124 152 91 117 157 +-93 124 152 95 131 149 83 116 129 59 85 92 57 68 71 86 86 86 2 2 6 2 2 6 +-6 6 6 6 6 6 22 22 22 34 34 34 6 6 6 2 2 6 2 2 6 2 2 6 +-2 2 6 2 2 6 18 18 18 34 34 34 10 10 10 50 50 50 22 22 22 2 2 6 +-2 2 6 2 2 6 2 2 6 10 10 10 86 86 86 42 42 42 14 14 14 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-40 89 40 40 89 40 40 89 40 40 89 40 24 53 24 6 6 6 69 31 31 123 55 55 +-123 55 55 90 61 47 69 31 31 36 32 33 21 31 35 7 12 13 18 25 28 48 63 69 +-60 80 103 68 78 128 84 101 153 84 96 162 84 96 162 91 117 157 91 117 157 84 96 162 +-91 117 157 73 97 106 48 63 69 50 67 72 57 59 63 86 86 86 2 2 6 2 2 6 +-38 38 38 116 116 116 94 94 94 22 22 22 22 22 22 2 2 6 2 2 6 2 2 6 +-14 14 14 86 86 86 124 131 137 170 170 170 151 151 151 38 38 38 26 26 26 6 6 6 +-2 2 6 2 2 6 2 2 6 2 2 6 86 86 86 46 46 46 14 14 14 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-34 76 34 40 89 40 40 89 40 40 89 40 34 76 34 19 31 15 17 12 12 48 26 18 +-48 26 18 8 7 3 10 10 22 23 29 47 51 61 92 42 59 64 21 30 33 34 45 54 +-68 78 128 81 88 166 81 82 173 86 106 160 86 106 160 84 96 162 86 106 160 87 112 149 +-91 118 149 77 105 114 52 67 79 32 40 45 50 50 50 86 86 86 2 2 6 14 14 14 +-124 131 137 198 198 198 195 195 195 116 116 116 10 10 10 2 2 6 2 2 6 6 6 6 +-101 98 89 187 187 187 210 210 210 218 218 218 214 214 214 124 131 137 14 14 14 6 6 6 +-2 2 6 2 2 6 2 2 6 2 2 6 86 86 86 50 50 50 18 18 18 6 6 6 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-19 31 15 34 76 34 40 89 40 40 89 40 40 89 40 24 53 24 8 7 3 0 0 0 +-6 8 12 28 32 52 51 61 92 54 54 122 74 77 160 68 78 128 26 35 39 6 8 8 +-34 45 54 68 78 128 84 96 162 86 106 160 86 106 160 81 88 166 84 96 162 87 112 149 +-73 97 106 36 50 56 33 49 54 18 18 18 46 46 46 86 86 86 2 2 6 54 54 54 +-218 218 218 195 195 195 226 226 226 246 246 246 58 58 58 2 2 6 2 2 6 30 30 30 +-210 210 210 253 253 253 170 170 170 124 127 131 221 221 221 234 234 234 74 74 74 2 2 6 +-2 2 6 2 2 6 2 2 6 2 2 6 70 70 70 58 58 58 22 22 22 6 6 6 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-4 5 3 24 53 24 40 89 40 40 89 40 34 76 34 12 22 15 4 5 3 4 5 3 +-13 17 26 54 54 122 78 78 174 78 78 174 78 78 174 74 77 160 51 61 92 21 31 35 +-26 35 39 53 75 83 84 101 153 81 82 173 81 88 166 84 101 153 60 80 103 60 80 103 +-53 75 83 38 53 58 42 59 64 22 22 22 46 46 46 82 82 82 2 2 6 106 106 106 +-170 170 170 26 26 26 86 86 86 226 226 226 124 127 131 10 10 10 14 14 14 46 46 46 +-231 231 231 190 190 190 6 6 6 70 70 70 90 90 90 238 238 238 151 151 151 2 2 6 +-2 2 6 2 2 6 2 2 6 2 2 6 70 70 70 58 58 58 22 22 22 6 6 6 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-1 2 2 8 15 6 24 53 24 34 76 34 19 31 15 8 15 6 63 55 20 63 55 20 +-18 18 18 40 48 73 74 77 160 78 78 174 78 78 174 81 82 173 74 77 160 52 67 79 +-17 23 26 21 31 35 60 80 103 81 88 166 74 77 160 78 102 129 36 54 60 12 17 20 +-42 59 64 48 63 69 21 31 35 18 18 18 42 42 42 86 86 86 6 6 6 116 116 116 +-106 106 106 6 6 6 70 70 70 151 151 151 124 127 131 18 18 18 38 38 38 54 54 54 +-221 221 221 106 106 106 2 2 6 14 14 14 46 46 46 190 190 190 198 198 198 2 2 6 +-2 2 6 2 2 6 2 2 6 2 2 6 74 74 74 62 62 62 22 22 22 6 6 6 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-11 15 17 0 0 0 12 22 15 19 31 15 8 15 6 63 55 20 149 139 69 149 139 69 +-63 55 20 10 10 22 54 54 122 78 78 174 78 78 174 78 78 174 81 82 173 68 78 128 +-24 31 37 6 6 6 36 50 56 60 80 103 51 61 92 42 59 64 36 50 56 31 45 49 +-29 43 47 27 40 45 6 8 8 14 14 14 42 42 42 94 94 94 14 14 14 101 101 101 +-124 127 131 2 2 6 18 18 18 116 116 116 106 107 48 121 92 8 121 92 8 98 70 6 +-170 170 170 106 106 106 2 2 6 2 2 6 2 2 6 195 195 195 195 195 195 6 6 6 +-2 2 6 2 2 6 2 2 6 2 2 6 74 74 74 62 62 62 22 22 22 6 6 6 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-26 35 39 3 5 6 1 1 1 2 3 3 35 31 12 133 118 54 175 176 80 175 176 80 +-133 118 54 35 31 12 23 29 47 54 54 122 78 78 174 78 78 174 74 77 160 68 78 128 +-51 61 92 31 45 49 26 35 39 36 50 56 29 43 47 7 12 13 21 30 33 42 59 64 +-18 25 28 7 12 13 1 1 1 10 10 10 38 38 38 90 90 90 14 14 14 58 58 58 +-210 210 210 26 26 26 62 42 6 154 114 10 226 170 11 237 188 10 220 174 15 184 138 11 +-220 174 15 174 140 55 35 31 12 2 2 6 70 70 70 246 246 246 124 131 137 2 2 6 +-2 2 6 2 2 6 2 2 6 2 2 6 70 70 70 66 66 66 26 26 26 6 6 6 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-27 40 45 17 23 26 2 3 3 1 1 1 56 77 35 165 152 80 175 176 80 175 176 80 +-175 176 80 106 107 48 22 22 22 28 32 52 54 54 122 54 54 122 51 61 92 28 32 52 +-20 27 34 31 45 49 11 15 17 7 12 13 36 50 56 31 45 49 29 43 47 36 50 56 +-6 8 8 0 0 0 0 0 0 10 10 10 38 38 38 86 86 86 14 14 14 10 10 10 +-195 195 195 198 179 130 192 133 9 220 174 15 239 182 13 237 188 10 232 195 16 239 207 25 +-237 201 50 241 208 19 232 195 16 184 138 11 198 179 130 208 206 196 42 42 42 2 2 6 +-2 2 6 2 2 6 2 2 6 2 2 6 50 50 50 74 74 74 30 30 30 6 6 6 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-15 22 25 26 35 39 15 22 25 0 0 0 35 31 12 133 118 54 175 176 80 175 176 80 +-175 176 80 165 152 80 56 77 35 6 8 12 23 29 47 13 17 26 2 2 6 0 0 0 +-1 2 2 26 35 39 26 35 39 26 35 39 42 59 64 42 59 64 20 29 31 6 8 8 +-0 0 0 0 0 0 0 0 0 10 10 10 34 34 34 86 86 86 14 14 14 2 2 6 +-121 92 8 192 133 9 219 162 10 239 182 13 237 188 10 232 195 16 241 208 19 237 201 50 +-237 201 50 239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 121 92 8 2 2 6 +-2 2 6 2 2 6 2 2 6 2 2 6 50 50 50 82 82 82 34 34 34 10 10 10 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-1 2 2 15 22 25 31 45 49 6 8 12 4 5 3 63 55 20 149 139 69 175 176 80 +-175 176 80 175 176 80 106 107 48 20 16 6 1 1 1 0 0 0 2 3 3 11 15 17 +-21 30 33 36 50 56 36 50 56 24 31 37 15 22 25 6 8 8 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 10 10 10 34 34 34 82 82 82 30 30 30 62 42 6 +-180 123 7 206 145 10 230 174 11 239 182 13 237 188 10 238 202 15 241 208 19 237 201 50 +-239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 220 174 15 184 138 11 6 6 6 +-2 2 6 2 2 6 2 2 6 2 2 6 26 26 26 94 94 94 42 42 42 14 14 14 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 1 2 2 29 43 47 26 35 39 3 5 6 8 7 3 106 107 48 165 152 80 +-175 176 80 149 139 69 63 55 20 4 5 3 2 3 3 12 17 20 26 35 39 26 35 39 +-17 23 26 7 12 13 6 8 8 3 5 6 1 2 2 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 10 10 10 30 30 30 78 78 78 50 50 50 104 69 6 +-192 133 9 216 158 10 236 178 12 237 188 10 232 195 16 241 208 19 237 201 50 237 201 50 +-241 208 19 241 208 19 241 208 19 204 160 10 200 144 11 216 158 10 156 118 10 2 2 6 +-2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 90 90 90 54 54 54 18 18 18 +-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 12 17 20 27 40 45 18 25 28 1 1 1 35 31 12 106 107 48 +-149 139 69 56 77 35 8 7 3 1 2 2 12 17 20 26 35 39 21 31 35 11 15 17 +-3 5 6 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 10 10 10 30 30 30 78 78 78 46 46 46 22 22 22 +-137 92 6 204 160 10 239 182 13 237 188 10 238 202 15 241 208 19 241 208 19 241 208 19 +-241 208 19 204 160 10 184 138 11 210 150 10 216 158 10 210 150 10 98 70 6 2 2 6 +-6 6 6 54 54 54 14 14 14 2 2 6 2 2 6 62 62 62 74 74 74 30 30 30 +-10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 1 1 1 15 22 25 33 49 54 12 17 20 2 3 3 35 31 12 +-56 77 35 20 16 6 1 1 1 18 25 28 21 31 35 11 15 17 1 1 1 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 10 10 10 34 34 34 78 78 78 50 50 50 6 6 6 +-88 55 22 139 102 15 190 146 13 230 187 11 239 207 25 232 195 16 220 174 15 190 146 13 +-171 120 8 192 133 9 210 150 10 213 154 11 185 146 40 165 152 80 101 98 89 2 2 6 +-2 2 6 78 78 78 116 116 116 58 58 58 2 2 6 22 22 22 90 90 90 46 46 46 +-18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 1 1 1 27 40 45 29 43 47 3 5 6 2 3 3 +-8 7 3 1 1 1 17 23 26 31 45 49 15 22 25 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 10 10 10 38 38 38 86 86 86 50 50 50 6 6 6 +-124 127 131 168 158 138 156 107 11 171 120 8 204 160 10 184 138 11 197 138 11 200 144 11 +-206 145 10 206 145 10 197 138 11 198 179 130 195 195 195 198 198 198 170 170 170 14 14 14 +-2 2 6 22 22 22 116 116 116 116 116 116 22 22 22 2 2 6 74 74 74 70 70 70 +-30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 11 15 17 31 45 49 26 35 39 3 5 6 +-0 0 0 7 12 13 27 40 45 18 25 28 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 6 6 6 18 18 18 50 50 50 101 101 101 26 26 26 10 10 10 +-124 131 137 190 190 190 168 158 138 156 107 11 197 138 11 200 144 11 197 138 11 192 133 9 +-180 123 7 185 146 40 198 179 130 187 187 187 202 202 202 221 221 221 214 214 214 66 66 66 +-2 2 6 2 2 6 50 50 50 62 62 62 6 6 6 2 2 6 10 10 10 90 90 90 +-50 50 50 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 15 22 25 36 54 60 18 25 28 +-0 0 0 21 30 33 27 40 45 2 3 3 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 10 10 10 34 34 34 74 74 74 74 74 74 2 2 6 6 6 6 +-151 151 151 198 198 198 190 190 190 168 158 138 148 132 55 156 107 11 156 107 11 169 125 40 +-168 158 138 187 187 187 190 190 190 210 210 210 246 246 246 253 253 253 253 253 253 180 180 180 +-6 6 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 62 62 +-74 74 74 34 34 34 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 27 40 45 35 52 58 +-18 25 28 35 52 58 17 23 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 10 10 10 22 22 22 54 54 54 94 94 94 18 18 18 2 2 6 46 46 46 +-234 234 234 221 221 221 190 190 190 190 190 190 190 190 190 187 187 187 187 187 187 190 190 190 +-190 190 190 195 195 195 214 214 214 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 +-82 82 82 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 14 14 14 +-86 86 86 54 54 54 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 12 13 33 49 54 +-52 72 81 36 54 60 6 8 8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-6 6 6 18 18 18 46 46 46 90 90 90 46 46 46 18 18 18 6 6 6 180 180 180 +-253 253 253 246 246 246 202 202 202 190 190 190 190 190 190 190 190 190 190 190 190 190 190 190 +-202 202 202 231 231 231 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-202 202 202 14 14 14 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 +-42 42 42 86 86 86 42 42 42 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 12 17 20 +-36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 +-14 14 14 38 38 38 74 74 74 66 66 66 2 2 6 6 6 6 90 90 90 250 250 250 +-253 253 253 253 253 253 238 238 238 198 198 198 190 190 190 190 190 190 195 195 195 221 221 221 +-246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 82 82 82 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 78 78 78 70 70 70 34 34 34 14 14 14 6 6 6 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 +-34 34 34 66 66 66 78 78 78 6 6 6 2 2 6 18 18 18 218 218 218 253 253 253 +-253 253 253 253 253 253 253 253 253 246 246 246 226 226 226 231 231 231 246 246 246 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 180 180 180 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 18 18 18 90 90 90 62 62 62 30 30 30 10 10 10 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 26 26 26 +-58 58 58 90 90 90 18 18 18 2 2 6 2 2 6 106 106 106 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 250 250 250 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 231 231 231 18 18 18 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 2 2 6 18 18 18 94 94 94 54 54 54 26 26 26 10 10 10 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 50 50 50 +-90 90 90 26 26 26 2 2 6 2 2 6 14 14 14 195 195 195 250 250 250 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-250 250 250 242 242 242 54 54 54 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 2 2 6 2 2 6 38 38 38 86 86 86 50 50 50 22 22 22 6 6 6 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 14 14 14 38 38 38 82 82 82 +-34 34 34 2 2 6 2 2 6 2 2 6 42 42 42 195 195 195 246 246 246 253 253 253 +-253 253 253 253 253 253 253 253 253 250 250 250 242 242 242 242 242 242 250 250 250 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 250 250 250 246 246 246 238 238 238 +-226 226 226 231 231 231 101 101 101 6 6 6 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 2 2 6 2 2 6 2 2 6 38 38 38 82 82 82 42 42 42 14 14 14 +-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 26 26 26 62 62 62 66 66 66 +-2 2 6 2 2 6 2 2 6 6 6 6 70 70 70 170 170 170 202 202 202 234 234 234 +-246 246 246 250 250 250 250 250 250 238 238 238 226 226 226 231 231 231 238 238 238 250 250 250 +-250 250 250 250 250 250 246 246 246 231 231 231 214 214 214 202 202 202 202 202 202 202 202 202 +-198 198 198 202 202 202 180 180 180 18 18 18 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 62 62 66 66 66 30 30 30 +-10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 42 42 42 82 82 82 18 18 18 +-2 2 6 2 2 6 2 2 6 10 10 10 94 94 94 180 180 180 218 218 218 242 242 242 +-250 250 250 253 253 253 253 253 253 250 250 250 234 234 234 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 246 246 246 238 238 238 226 226 226 210 210 210 202 202 202 +-195 195 195 195 195 195 210 210 210 151 151 151 6 6 6 14 14 14 50 50 50 14 14 14 +-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 86 86 86 46 46 46 +-18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 21 30 33 35 52 58 6 8 12 0 0 0 +-0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 54 54 54 70 70 70 2 2 6 +-2 2 6 10 10 10 2 2 6 22 22 22 170 170 170 231 231 231 250 250 250 253 253 253 +-253 253 253 253 253 253 253 253 253 250 250 250 242 242 242 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 246 246 246 +-231 231 231 202 202 202 198 198 198 226 226 226 94 94 94 2 2 6 6 6 6 38 38 38 +-30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 62 62 66 66 66 +-26 26 26 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 6 8 8 33 49 54 29 43 47 6 8 12 +-0 0 0 0 0 0 0 0 0 10 10 10 30 30 30 74 74 74 50 50 50 2 2 6 +-26 26 26 26 26 26 2 2 6 106 106 106 238 238 238 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 246 246 246 218 218 218 202 202 202 210 210 210 14 14 14 2 2 6 2 2 6 +-30 30 30 22 22 22 2 2 6 2 2 6 2 2 6 2 2 6 18 18 18 86 86 86 +-42 42 42 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 12 17 20 33 49 54 17 23 26 +-0 0 0 0 0 0 0 0 0 14 14 14 42 42 42 90 90 90 22 22 22 2 2 6 +-42 42 42 2 2 6 18 18 18 218 218 218 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 250 250 250 221 221 221 218 218 218 101 101 101 2 2 6 14 14 14 +-18 18 18 38 38 38 10 10 10 2 2 6 2 2 6 2 2 6 2 2 6 78 78 78 +-58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 15 22 25 36 54 60 +-0 0 0 0 0 0 0 0 0 18 18 18 54 54 54 82 82 82 2 2 6 26 26 26 +-22 22 22 2 2 6 124 127 131 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 250 250 250 238 238 238 198 198 198 6 6 6 38 38 38 +-58 58 58 26 26 26 38 38 38 2 2 6 2 2 6 2 2 6 2 2 6 46 46 46 +-78 78 78 30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 21 30 33 +-36 54 60 0 0 0 0 0 0 30 30 30 74 74 74 58 58 58 2 2 6 42 42 42 +-2 2 6 22 22 22 231 231 231 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 246 246 246 46 46 46 38 38 38 +-42 42 42 14 14 14 38 38 38 14 14 14 2 2 6 2 2 6 2 2 6 6 6 6 +-86 86 86 46 46 46 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-36 54 60 0 0 0 0 0 0 42 42 42 90 90 90 18 18 18 18 18 18 26 26 26 +-2 2 6 116 116 116 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 250 250 250 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 94 94 94 6 6 6 +-2 2 6 2 2 6 10 10 10 34 34 34 2 2 6 2 2 6 2 2 6 2 2 6 +-74 74 74 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 36 54 60 26 26 26 66 66 66 82 82 82 2 2 6 38 38 38 6 6 6 +-14 14 14 210 210 210 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 246 246 246 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 151 151 151 2 2 6 +-2 2 6 2 2 6 2 2 6 46 46 46 2 2 6 2 2 6 2 2 6 2 2 6 +-42 42 42 74 74 74 30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-6 6 6 36 54 60 21 30 33 90 90 90 26 26 26 6 6 6 42 42 42 2 2 6 +-74 74 74 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 242 242 242 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 180 180 180 2 2 6 +-2 2 6 2 2 6 2 2 6 46 46 46 2 2 6 2 2 6 2 2 6 2 2 6 +-10 10 10 86 86 86 38 38 38 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-10 10 10 26 26 26 36 54 60 82 82 82 2 2 6 22 22 22 18 18 18 2 2 6 +-151 151 151 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 234 234 234 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 202 202 202 2 2 6 +-2 2 6 2 2 6 2 2 6 38 38 38 2 2 6 2 2 6 2 2 6 2 2 6 +-6 6 6 86 86 86 46 46 46 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 +-18 18 18 46 46 46 86 86 86 36 54 60 2 2 6 34 34 34 10 10 10 6 6 6 +-210 210 210 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 234 234 234 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 221 221 221 6 6 6 +-2 2 6 2 2 6 6 6 6 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 82 82 82 54 54 54 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 +-26 26 26 66 66 66 62 62 62 2 2 6 2 2 6 38 38 38 10 10 10 26 26 26 +-238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 231 231 231 6 6 6 +-2 2 6 2 2 6 10 10 10 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 66 66 66 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 +-38 38 38 78 78 78 6 6 6 2 2 6 2 2 6 46 46 46 14 14 14 42 42 42 +-246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 234 234 234 10 10 10 +-2 2 6 2 2 6 22 22 22 14 14 14 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 66 66 66 62 62 62 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 +-50 50 50 74 74 74 2 2 6 2 2 6 14 14 14 70 70 70 34 34 34 62 62 62 +-250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 234 234 234 14 14 14 +-2 2 6 2 2 6 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 66 66 66 62 62 62 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 +-54 54 54 62 62 62 2 2 6 2 2 6 2 2 6 30 30 30 46 46 46 70 70 70 +-250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 226 226 226 10 10 10 +-2 2 6 6 6 6 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 66 66 66 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 +-58 58 58 62 62 62 2 2 6 2 2 6 2 2 6 2 2 6 30 30 30 78 78 78 +-250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 202 202 202 2 2 6 +-22 22 22 34 34 34 20 16 6 22 22 22 26 26 26 18 18 18 6 6 6 2 2 6 +-2 2 6 82 82 82 54 54 54 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 26 26 26 +-62 62 62 106 106 106 63 55 20 184 138 11 204 160 10 121 92 8 6 6 6 62 62 62 +-238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 151 151 151 18 18 18 +-14 14 14 2 2 6 2 2 6 2 2 6 6 6 6 18 18 18 66 66 66 38 38 38 +-6 6 6 94 94 94 50 50 50 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 6 6 6 10 10 10 10 10 10 18 18 18 38 38 38 +-78 78 78 138 132 106 216 158 10 242 186 14 246 190 14 246 190 14 156 118 10 10 10 10 +-90 90 90 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 246 230 190 214 187 87 214 187 87 185 146 40 35 31 12 +-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 38 38 38 46 46 46 +-26 26 26 106 106 106 54 54 54 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 6 6 6 14 14 14 22 22 22 30 30 30 38 38 38 50 50 50 70 70 70 +-106 106 106 185 146 40 226 170 11 242 186 14 246 190 14 246 190 14 246 190 14 154 114 10 +-6 6 6 74 74 74 226 226 226 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 237 201 50 241 196 14 241 208 19 232 195 16 35 31 12 +-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 30 30 30 26 26 26 +-204 160 10 165 152 80 66 66 66 26 26 26 6 6 6 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-6 6 6 18 18 18 38 38 38 58 58 58 78 78 78 86 86 86 101 101 101 124 127 131 +-174 140 55 210 150 10 234 174 13 246 186 14 246 190 14 246 190 14 246 190 14 237 188 10 +-98 70 6 2 2 6 46 46 46 198 198 198 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 234 234 234 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 214 187 87 242 186 14 241 196 14 204 160 10 20 16 6 +-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 121 92 8 +-238 202 15 232 195 16 82 82 82 34 34 34 10 10 10 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-14 14 14 38 38 38 70 70 70 148 132 55 185 146 40 200 144 11 197 138 11 197 138 11 +-213 154 11 226 170 11 242 186 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 +-220 174 15 35 31 12 2 2 6 22 22 22 151 151 151 250 250 250 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 250 250 250 242 242 242 214 187 87 239 182 13 237 188 10 213 154 11 35 31 12 +-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 42 6 220 174 15 +-237 188 10 237 188 10 113 101 86 42 42 42 14 14 14 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 +-22 22 22 54 54 54 148 132 55 213 154 11 226 170 11 230 174 11 226 170 11 226 170 11 +-236 178 12 242 186 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 +-241 196 14 184 138 11 10 10 10 2 2 6 6 6 6 116 116 116 242 242 242 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 231 231 231 198 198 198 213 164 39 236 178 12 236 178 12 210 150 10 137 92 6 +-20 16 6 2 2 6 2 2 6 2 2 6 6 6 6 62 42 6 200 144 11 236 178 12 +-239 182 13 239 182 13 124 112 88 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 +-30 30 30 70 70 70 169 125 40 226 170 11 239 182 13 242 186 14 242 186 14 246 186 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 232 195 16 98 70 6 2 2 6 2 2 6 2 2 6 66 66 66 221 221 221 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 202 202 202 198 198 198 213 164 39 230 174 11 230 174 11 216 158 10 192 133 9 +-163 110 8 120 80 7 98 70 6 120 80 7 167 114 7 197 138 11 226 170 11 239 182 13 +-242 186 14 242 186 14 165 152 80 78 78 78 34 34 34 14 14 14 6 6 6 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 +-30 30 30 78 78 78 185 146 40 226 170 11 239 182 13 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 241 196 14 204 160 10 20 16 6 2 2 6 2 2 6 2 2 6 38 38 38 +-218 218 218 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-250 250 250 202 202 202 198 198 198 213 164 39 226 170 11 236 178 12 224 166 10 210 150 10 +-200 144 11 197 138 11 192 133 9 197 138 11 210 150 10 226 170 11 242 186 14 246 190 14 +-246 190 14 246 186 14 220 174 15 124 112 88 62 62 62 30 30 30 14 14 14 6 6 6 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 +-30 30 30 78 78 78 174 140 55 224 166 10 239 182 13 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 241 196 14 139 102 15 2 2 6 2 2 6 2 2 6 2 2 6 +-78 78 78 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-250 250 250 214 214 214 198 198 198 185 146 40 219 162 10 236 178 12 234 174 13 224 166 10 +-216 158 10 213 154 11 213 154 11 216 158 10 226 170 11 239 182 13 246 190 14 246 190 14 +-246 190 14 246 190 14 242 186 14 213 164 39 101 101 101 58 58 58 30 30 30 14 14 14 +-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 +-30 30 30 74 74 74 174 140 55 216 158 10 236 178 12 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 241 196 14 230 187 11 62 42 6 2 2 6 2 2 6 2 2 6 +-22 22 22 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 226 226 226 187 187 187 169 125 40 216 158 10 236 178 12 239 182 13 236 178 12 +-230 174 11 226 170 11 226 170 11 230 174 11 236 178 12 242 186 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 186 14 239 182 13 213 164 39 106 106 106 66 66 66 34 34 34 +-14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 +-26 26 26 70 70 70 149 139 69 213 154 11 236 178 12 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 241 196 14 190 146 13 20 16 6 2 2 6 2 2 6 +-46 46 46 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 221 221 221 86 86 86 156 107 11 216 158 10 236 178 12 242 186 14 246 186 14 +-242 186 14 239 182 13 239 182 13 242 186 14 242 186 14 246 186 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 220 174 15 149 139 69 66 66 66 +-30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 +-26 26 26 70 70 70 149 139 69 210 150 10 236 178 12 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 232 195 16 121 92 8 34 34 34 106 106 106 +-221 221 221 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-242 242 242 82 82 82 20 16 6 163 110 8 216 158 10 236 178 12 242 186 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 149 139 69 +-46 46 46 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 +-30 30 30 78 78 78 149 139 69 210 150 10 236 178 12 246 186 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 241 196 14 220 174 15 198 179 130 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 218 218 218 +-58 58 58 2 2 6 20 16 6 167 114 7 216 158 10 236 178 12 246 186 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 242 186 14 185 146 40 +-54 54 54 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 +-38 38 38 86 86 86 169 125 40 213 154 11 236 178 12 246 186 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 232 195 16 190 146 13 214 214 214 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 250 250 250 170 170 170 26 26 26 +-2 2 6 2 2 6 35 31 12 163 110 8 219 162 10 239 182 13 246 186 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 236 178 12 224 166 10 149 139 69 +-46 46 46 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 +-50 50 50 113 101 86 192 133 9 224 166 10 242 186 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 230 187 11 204 160 10 133 118 54 +-226 226 226 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 198 198 198 66 66 66 2 2 6 2 2 6 +-2 2 6 2 2 6 62 42 6 156 107 11 219 162 10 239 182 13 246 186 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 242 186 14 234 174 13 213 154 11 148 132 55 66 66 66 +-30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 +-58 58 58 148 132 55 206 145 10 234 174 13 242 186 14 246 186 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 236 178 12 204 160 10 163 110 8 +-62 42 6 124 131 137 218 218 218 250 250 250 253 253 253 253 253 253 253 253 253 250 250 250 +-242 242 242 210 210 210 151 151 151 66 66 66 6 6 6 2 2 6 2 2 6 2 2 6 +-2 2 6 2 2 6 62 42 6 163 110 8 216 158 10 236 178 12 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 239 182 13 230 174 11 216 158 10 185 146 40 124 112 88 70 70 70 38 38 38 +-18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 +-62 62 62 169 125 40 206 145 10 224 166 10 236 178 12 239 182 13 242 186 14 242 186 14 +-246 186 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 236 178 12 216 158 10 171 120 8 +-85 57 6 2 2 6 6 6 6 30 30 30 54 54 54 62 62 62 50 50 50 38 38 38 +-14 14 14 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 6 6 6 85 57 6 167 114 7 213 154 11 236 178 12 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 239 182 13 239 182 13 +-230 174 11 210 150 10 174 140 55 124 112 88 82 82 82 54 54 54 34 34 34 18 18 18 +-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 +-50 50 50 169 125 40 192 133 9 200 144 11 216 158 10 219 162 10 224 166 10 226 170 11 +-230 174 11 236 178 12 239 182 13 239 182 13 242 186 14 246 186 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 230 174 11 210 150 10 163 110 8 +-104 69 6 10 10 10 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 6 6 6 85 57 6 167 114 7 206 145 10 230 174 11 242 186 14 246 190 14 +-246 190 14 246 190 14 246 186 14 242 186 14 239 182 13 230 174 11 224 166 10 213 154 11 +-169 125 40 124 112 88 86 86 86 58 58 58 38 38 38 22 22 22 10 10 10 6 6 6 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 +-34 34 34 70 70 70 133 118 54 169 125 40 167 114 7 180 123 7 192 133 9 197 138 11 +-200 144 11 206 145 10 213 154 11 219 162 10 224 166 10 230 174 11 239 182 13 242 186 14 +-246 186 14 246 186 14 246 186 14 246 186 14 239 182 13 216 158 10 184 138 11 152 99 6 +-104 69 6 20 16 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 +-2 2 6 6 6 6 85 57 6 152 99 6 192 133 9 219 162 10 236 178 12 239 182 13 +-246 186 14 242 186 14 239 182 13 236 178 12 224 166 10 206 145 10 192 133 9 148 132 55 +-94 94 94 62 62 62 42 42 42 22 22 22 14 14 14 6 6 6 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 +-18 18 18 34 34 34 58 58 58 78 78 78 101 98 89 124 112 88 133 118 54 156 107 11 +-163 110 8 167 114 7 171 120 8 180 123 7 184 138 11 197 138 11 210 150 10 219 162 10 +-226 170 11 236 178 12 236 178 12 234 174 13 219 162 10 197 138 11 163 110 8 134 84 6 +-85 57 6 10 10 10 2 2 6 2 2 6 18 18 18 38 38 38 38 38 38 38 38 38 +-38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 26 26 26 2 2 6 +-2 2 6 6 6 6 62 42 6 137 92 6 171 120 8 200 144 11 219 162 10 230 174 11 +-234 174 13 230 174 11 219 162 10 210 150 10 192 133 9 163 110 8 124 112 88 82 82 82 +-50 50 50 30 30 30 14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-6 6 6 14 14 14 22 22 22 34 34 34 42 42 42 58 58 58 74 74 74 86 86 86 +-101 98 89 113 101 86 133 118 54 121 92 8 137 92 6 152 99 6 163 110 8 180 123 7 +-184 138 11 197 138 11 206 145 10 200 144 11 180 123 7 156 107 11 134 84 6 104 69 6 +-62 42 6 54 54 54 106 106 106 101 98 89 86 86 86 82 82 82 78 78 78 78 78 78 +-78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 82 82 82 86 86 86 94 94 94 +-106 106 106 101 101 101 90 61 47 120 80 7 156 107 11 180 123 7 192 133 9 200 144 11 +-206 145 10 200 144 11 192 133 9 171 120 8 139 102 15 113 101 86 70 70 70 42 42 42 +-22 22 22 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 6 6 6 10 10 10 14 14 14 22 22 22 30 30 30 38 38 38 +-50 50 50 62 62 62 74 74 74 90 90 90 101 98 89 113 101 86 121 92 8 120 80 7 +-137 92 6 152 99 6 152 99 6 152 99 6 134 84 6 120 80 7 98 70 6 88 55 22 +-101 98 89 82 82 82 58 58 58 46 46 46 38 38 38 34 34 34 34 34 34 34 34 34 +-34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 38 38 38 42 42 42 +-54 54 54 82 82 82 94 86 71 85 57 6 134 84 6 156 107 11 167 114 7 171 120 8 +-171 120 8 167 114 7 152 99 6 121 92 8 101 98 89 62 62 62 34 34 34 18 18 18 +-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 6 6 6 10 10 10 +-18 18 18 22 22 22 30 30 30 42 42 42 50 50 50 66 66 66 86 86 86 101 98 89 +-94 86 71 98 70 6 104 69 6 104 69 6 104 69 6 85 57 6 88 55 22 90 90 90 +-62 62 62 38 38 38 22 22 22 14 14 14 10 10 10 10 10 10 10 10 10 10 10 10 +-10 10 10 10 10 10 6 6 6 10 10 10 10 10 10 10 10 10 10 10 10 14 14 14 +-22 22 22 42 42 42 70 70 70 94 86 71 85 57 6 104 69 6 120 80 7 137 92 6 +-134 84 6 120 80 7 94 86 71 86 86 86 58 58 58 30 30 30 14 14 14 6 6 6 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 6 6 6 10 10 10 14 14 14 18 18 18 26 26 26 38 38 38 54 54 54 +-70 70 70 86 86 86 94 86 71 94 86 71 94 86 71 86 86 86 74 74 74 50 50 50 +-30 30 30 14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-6 6 6 18 18 18 34 34 34 58 58 58 82 82 82 94 86 71 94 86 71 94 86 71 +-94 86 71 94 86 71 74 74 74 50 50 50 26 26 26 14 14 14 6 6 6 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 6 6 6 14 14 14 18 18 18 +-30 30 30 38 38 38 46 46 46 54 54 54 50 50 50 42 42 42 30 30 30 18 18 18 +-10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 6 6 6 14 14 14 26 26 26 38 38 38 50 50 50 58 58 58 58 58 58 +-54 54 54 42 42 42 30 30 30 18 18 18 10 10 10 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 +-6 6 6 10 10 10 14 14 14 18 18 18 18 18 18 14 14 14 10 10 10 6 6 6 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 6 6 6 14 14 14 18 18 18 22 22 22 22 22 22 +-18 18 18 14 14 14 10 10 10 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +- +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 4 4 4 4 4 4 4 4 4 4 4 4 @@ -52594,19 +51751,6 @@ index ff22871..b129bed 100644 info->var.accel_flags = (!noaccel); -diff --git a/drivers/video/output.c b/drivers/video/output.c -index 0d6f2cd..6285b97 100644 ---- a/drivers/video/output.c -+++ b/drivers/video/output.c -@@ -97,7 +97,7 @@ struct output_device *video_output_register(const char *name, - new_dev->props = op; - new_dev->dev.class = &video_output_class; - new_dev->dev.parent = dev; -- dev_set_name(&new_dev->dev, name); -+ dev_set_name(&new_dev->dev, "%s", name); - dev_set_drvdata(&new_dev->dev, devdata); - ret_code = device_register(&new_dev->dev); - if (ret_code) { diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c index 05c2dc3..ea1f391 100644 --- a/drivers/video/s1d13xxxfb.c @@ -52625,7 +51769,7 @@ index 05c2dc3..ea1f391 100644 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA; break; diff --git a/drivers/video/smscufx.c b/drivers/video/smscufx.c -index b2b33fc..f9f4658 100644 +index e188ada..aac63c8 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) @@ -52640,10 +51784,10 @@ index b2b33fc..f9f4658 100644 pr_debug("released /dev/fb%d user=%d count=%d", diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c -index ec03e72..f578436 100644 +index d2e5bc3..4cb05d1 100644 --- a/drivers/video/udlfb.c +++ b/drivers/video/udlfb.c -@@ -623,11 +623,11 @@ int dlfb_handle_damage(struct dlfb_data *dev, int x, int y, +@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y, dlfb_urb_completion(urb); error: @@ -52738,7 +51882,7 @@ index ec03e72..f578436 100644 return count; } diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c -index e328a61..1b08ecb 100644 +index 7aec6f3..e3b2d55 100644 --- a/drivers/video/uvesafb.c +++ b/drivers/video/uvesafb.c @@ -19,6 +19,7 @@ @@ -52749,7 +51893,7 @@ index e328a61..1b08ecb 100644 #include <video/edid.h> #include <video/uvesafb.h> #ifdef CONFIG_X86 -@@ -569,10 +570,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task, +@@ -566,10 +567,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 { @@ -52782,15 +51926,15 @@ index e328a61..1b08ecb 100644 printk(KERN_INFO "uvesafb: protected mode interface info at " "%04x:%04x\n", (u16)task->t.regs.es, (u16)task->t.regs.edi); -@@ -817,13 +840,14 @@ static int uvesafb_vbe_init(struct fb_info *info) +@@ -814,13 +837,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 actively." - "We have better not to use the PMI.\n"); + printk(KERN_WARNING "uvesafb: NX protection is active, " + "better not use the PMI.\n"); - } else { + } else +#endif @@ -52799,7 +51943,7 @@ index e328a61..1b08ecb 100644 } #else /* The protected mode interface is not available on non-x86. */ -@@ -1457,8 +1481,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode) +@@ -1454,8 +1478,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. */ @@ -52813,7 +51957,7 @@ index e328a61..1b08ecb 100644 /* * Find out how much IO memory is required for the mode with -@@ -1534,8 +1561,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode) +@@ -1531,8 +1558,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); @@ -52827,7 +51971,7 @@ index e328a61..1b08ecb 100644 } static void uvesafb_init_mtrr(struct fb_info *info) -@@ -1836,6 +1866,11 @@ out: +@@ -1796,6 +1826,11 @@ out: if (par->vbe_modes) kfree(par->vbe_modes); @@ -52839,7 +51983,7 @@ index e328a61..1b08ecb 100644 framebuffer_release(info); return err; } -@@ -1862,6 +1897,12 @@ static int uvesafb_remove(struct platform_device *dev) +@@ -1823,6 +1858,12 @@ static int uvesafb_remove(struct platform_device *dev) kfree(par->vbe_state_orig); if (par->vbe_state_saved) kfree(par->vbe_state_saved); @@ -53003,10 +52147,10 @@ index fef20db..d28b1ab 100644 return -ENOMEM; return 0; diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c -index 055562c..fdfb10d 100644 +index 9ff073f..05cef23 100644 --- a/fs/9p/vfs_addr.c +++ b/fs/9p/vfs_addr.c -@@ -186,7 +186,7 @@ static int v9fs_vfs_writepage_locked(struct page *page) +@@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page) retval = v9fs_file_write_internal(inode, v9inode->writeback_fid, @@ -53016,10 +52160,10 @@ index 055562c..fdfb10d 100644 if (retval > 0) retval = 0; diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c -index d86edc8..40ff2fb 100644 +index 25b018e..b941525 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c -@@ -1314,7 +1314,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd) +@@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd) void v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) { @@ -53064,10 +52208,10 @@ index 789bc25..fafaeea 100644 &data); if (!inode) { diff --git a/fs/aio.c b/fs/aio.c -index 2bbcacf..8614116 100644 +index 9b5ca11..c530886 100644 --- a/fs/aio.c +++ b/fs/aio.c -@@ -160,7 +160,7 @@ static int aio_setup_ring(struct kioctx *ctx) +@@ -162,7 +162,7 @@ static int aio_setup_ring(struct kioctx *ctx) size += sizeof(struct io_event) * nr_events; nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; @@ -53076,7 +52220,7 @@ index 2bbcacf..8614116 100644 return -EINVAL; nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); -@@ -950,6 +950,7 @@ static ssize_t aio_rw_vect_retry(struct kiocb *iocb, int rw, aio_rw_op *rw_op) +@@ -952,6 +952,7 @@ static ssize_t aio_rw_vect_retry(struct kiocb *iocb, int rw, aio_rw_op *rw_op) static ssize_t aio_setup_vectored_rw(int rw, struct kiocb *kiocb, bool compat) { ssize_t ret; @@ -53084,7 +52228,7 @@ index 2bbcacf..8614116 100644 kiocb->ki_nr_segs = kiocb->ki_nbytes; -@@ -957,17 +958,22 @@ static ssize_t aio_setup_vectored_rw(int rw, struct kiocb *kiocb, bool compat) +@@ -959,17 +960,22 @@ static ssize_t aio_setup_vectored_rw(int rw, struct kiocb *kiocb, bool compat) if (compat) ret = compat_rw_copy_check_uvector(rw, (struct compat_iovec __user *)kiocb->ki_buf, @@ -53181,10 +52325,10 @@ index 2722387..c8dd2a7 100644 { if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE) diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c -index f95dddc..b1e2c1c 100644 +index e9c75e2..1baece1 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c -@@ -510,7 +510,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) +@@ -514,7 +514,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) { befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); if (befs_ino->i_flags & BEFS_LONG_SYMLINK) { @@ -53194,7 +52338,7 @@ index f95dddc..b1e2c1c 100644 kfree(link); } diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c -index bce8769..7fc7544 100644 +index 89dec7f..361b0d75 100644 --- a/fs/binfmt_aout.c +++ b/fs/binfmt_aout.c @@ -16,6 +16,7 @@ @@ -53236,7 +52380,7 @@ index bce8769..7fc7544 100644 if (ex.a_data + ex.a_bss > rlim) return -ENOMEM; -@@ -267,6 +274,27 @@ static int load_aout_binary(struct linux_binprm * bprm) +@@ -265,6 +272,27 @@ static int load_aout_binary(struct linux_binprm * bprm) install_exec_creds(bprm); @@ -53264,7 +52408,7 @@ index bce8769..7fc7544 100644 if (N_MAGIC(ex) == OMAGIC) { unsigned long text_addr, map_size; loff_t pos; -@@ -324,7 +352,7 @@ static int load_aout_binary(struct linux_binprm * bprm) +@@ -322,7 +350,7 @@ static int load_aout_binary(struct linux_binprm * bprm) } error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data, @@ -53274,7 +52418,7 @@ index bce8769..7fc7544 100644 fd_offset + ex.a_text); if (error != N_DATADDR(ex)) { diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c -index f8a0b0e..6f036ed 100644 +index 100edcc..ed95731 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -34,6 +34,7 @@ @@ -53862,7 +53006,7 @@ index f8a0b0e..6f036ed 100644 if (elf_read_implies_exec(loc->elf_ex, executable_stack)) current->personality |= READ_IMPLIES_EXEC; -@@ -819,6 +1232,20 @@ static int load_elf_binary(struct linux_binprm *bprm) +@@ -817,6 +1230,20 @@ static int load_elf_binary(struct linux_binprm *bprm) #else load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr); #endif @@ -53883,7 +53027,7 @@ index f8a0b0e..6f036ed 100644 } error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, -@@ -851,9 +1278,9 @@ static int load_elf_binary(struct linux_binprm *bprm) +@@ -849,9 +1276,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. */ @@ -53896,7 +53040,7 @@ index f8a0b0e..6f036ed 100644 /* set_brk can never work. Avoid overflows. */ send_sig(SIGKILL, current, 0); retval = -EINVAL; -@@ -892,17 +1319,45 @@ static int load_elf_binary(struct linux_binprm *bprm) +@@ -890,17 +1317,45 @@ static int load_elf_binary(struct linux_binprm *bprm) goto out_free_dentry; } if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) { @@ -53948,7 +53092,7 @@ index f8a0b0e..6f036ed 100644 load_bias); if (!IS_ERR((void *)elf_entry)) { /* -@@ -1124,7 +1579,7 @@ static bool always_dump_vma(struct vm_area_struct *vma) +@@ -1122,7 +1577,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, @@ -53957,7 +53101,7 @@ index f8a0b0e..6f036ed 100644 { #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type)) -@@ -1162,7 +1617,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma, +@@ -1160,7 +1615,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma, if (vma->vm_file == NULL) return 0; @@ -53966,7 +53110,7 @@ index f8a0b0e..6f036ed 100644 goto whole; /* -@@ -1387,9 +1842,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm) +@@ -1385,9 +1840,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; @@ -53978,7 +53122,7 @@ index f8a0b0e..6f036ed 100644 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv); } -@@ -1398,7 +1853,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata, +@@ -1396,7 +1851,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata, { mm_segment_t old_fs = get_fs(); set_fs(KERNEL_DS); @@ -53987,7 +53131,7 @@ index f8a0b0e..6f036ed 100644 set_fs(old_fs); fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata); } -@@ -2019,14 +2474,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum, +@@ -2017,14 +2472,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, @@ -54004,7 +53148,7 @@ index f8a0b0e..6f036ed 100644 return size; } -@@ -2119,7 +2574,7 @@ static int elf_core_dump(struct coredump_params *cprm) +@@ -2117,7 +2572,7 @@ static int elf_core_dump(struct coredump_params *cprm) dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE); @@ -54013,7 +53157,7 @@ index f8a0b0e..6f036ed 100644 offset += elf_core_extra_data_size(); e_shoff = offset; -@@ -2133,10 +2588,12 @@ static int elf_core_dump(struct coredump_params *cprm) +@@ -2131,10 +2586,12 @@ static int elf_core_dump(struct coredump_params *cprm) offset = dataoff; size += sizeof(*elf); @@ -54026,7 +53170,7 @@ index f8a0b0e..6f036ed 100644 if (size > cprm->limit || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note))) goto end_coredump; -@@ -2150,7 +2607,7 @@ static int elf_core_dump(struct coredump_params *cprm) +@@ -2148,7 +2605,7 @@ static int elf_core_dump(struct coredump_params *cprm) phdr.p_offset = offset; phdr.p_vaddr = vma->vm_start; phdr.p_paddr = 0; @@ -54035,7 +53179,7 @@ index f8a0b0e..6f036ed 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; -@@ -2161,6 +2618,7 @@ static int elf_core_dump(struct coredump_params *cprm) +@@ -2159,6 +2616,7 @@ static int elf_core_dump(struct coredump_params *cprm) phdr.p_align = ELF_EXEC_PAGESIZE; size += sizeof(phdr); @@ -54043,7 +53187,7 @@ index f8a0b0e..6f036ed 100644 if (size > cprm->limit || !dump_write(cprm->file, &phdr, sizeof(phdr))) goto end_coredump; -@@ -2185,7 +2643,7 @@ static int elf_core_dump(struct coredump_params *cprm) +@@ -2183,7 +2641,7 @@ static int elf_core_dump(struct coredump_params *cprm) unsigned long addr; unsigned long end; @@ -54052,7 +53196,7 @@ index f8a0b0e..6f036ed 100644 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) { struct page *page; -@@ -2194,6 +2652,7 @@ static int elf_core_dump(struct coredump_params *cprm) +@@ -2192,6 +2650,7 @@ static int elf_core_dump(struct coredump_params *cprm) page = get_dump_page(addr); if (page) { void *kaddr = kmap(page); @@ -54060,7 +53204,7 @@ index f8a0b0e..6f036ed 100644 stop = ((size += PAGE_SIZE) > cprm->limit) || !dump_write(cprm->file, kaddr, PAGE_SIZE); -@@ -2211,6 +2670,7 @@ static int elf_core_dump(struct coredump_params *cprm) +@@ -2209,6 +2668,7 @@ static int elf_core_dump(struct coredump_params *cprm) if (e_phnum == PN_XNUM) { size += sizeof(*shdr4extnum); @@ -54068,7 +53212,7 @@ index f8a0b0e..6f036ed 100644 if (size > cprm->limit || !dump_write(cprm->file, shdr4extnum, sizeof(*shdr4extnum))) -@@ -2231,6 +2691,167 @@ out: +@@ -2229,6 +2689,167 @@ out: #endif /* CONFIG_ELF_CORE */ @@ -54304,10 +53448,10 @@ index c5eae72..599e3cf 100644 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 85f5c85..d6f0b1a 100644 +index c7bda5c..2121e94 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c -@@ -658,7 +658,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole, +@@ -637,7 +637,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 */ @@ -54317,7 +53461,7 @@ index 85f5c85..d6f0b1a 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 7fb054b..ad36c67 100644 +index ed50460..fe84385 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -1076,9 +1076,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans, @@ -54337,7 +53481,7 @@ index 7fb054b..ad36c67 100644 WARN_ON(trans->transid != btrfs_header_generation(parent)); diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c -index f26f38c..3d0f149 100644 +index 3755109..e3d457f 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c @@ -458,7 +458,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node, @@ -54349,7 +53493,7 @@ index f26f38c..3d0f149 100644 if ((atomic_dec_return(&delayed_root->items) < BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) && waitqueue_active(&delayed_root->wait)) -@@ -1391,7 +1391,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root) +@@ -1377,7 +1377,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root) static int refs_newer(struct btrfs_delayed_root *delayed_root, int seq, int count) { @@ -54358,7 +53502,7 @@ index f26f38c..3d0f149 100644 if (val < seq || val >= seq + count) return 1; -@@ -1408,7 +1408,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root) +@@ -1394,7 +1394,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root) if (atomic_read(&delayed_root->items) < BTRFS_DELAYED_BACKGROUND) return; @@ -54368,7 +53512,7 @@ index f26f38c..3d0f149 100644 if (atomic_read(&delayed_root->items) >= BTRFS_DELAYED_WRITEBACK) { int ret; diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h -index 1d5c5f7..0ba0afc 100644 +index a4b38f9..f86a509 100644 --- a/fs/btrfs/delayed-inode.h +++ b/fs/btrfs/delayed-inode.h @@ -43,7 +43,7 @@ struct btrfs_delayed_root { @@ -54390,10 +53534,10 @@ index 1d5c5f7..0ba0afc 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 0f81d67..0ad55fe 100644 +index 238a055..1e33cd5 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c -@@ -3084,9 +3084,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg) +@@ -3097,9 +3097,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; @@ -54406,7 +53550,7 @@ index 0f81d67..0ad55fe 100644 info = NULL; rcu_read_lock(); list_for_each_entry_rcu(tmp, &root->fs_info->space_info, -@@ -3108,10 +3111,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg) +@@ -3121,10 +3124,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg) memcpy(dest, &space, sizeof(space)); dest++; space_args.total_spaces++; @@ -54418,23 +53562,23 @@ index 0f81d67..0ad55fe 100644 up_read(&info->groups_sem); } diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c -index f0857e0..e7023c5 100644 +index 8eb6191..eda91e2 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c -@@ -265,7 +265,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans, +@@ -264,7 +264,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans, function, line, errstr); return; } - ACCESS_ONCE(trans->transaction->aborted) = errno; + ACCESS_ONCE_RW(trans->transaction->aborted) = errno; - __btrfs_std_error(root->fs_info, function, line, errno, NULL); - } - /* + /* Wake up anybody who may be waiting on this transaction */ + wake_up(&root->fs_info->transaction_wait); + wake_up(&root->fs_info->transaction_blocked_wait); diff --git a/fs/buffer.c b/fs/buffer.c -index d2a4d1b..df798ca 100644 +index 4d74335..b0df7f9 100644 --- a/fs/buffer.c +++ b/fs/buffer.c -@@ -3367,7 +3367,7 @@ void __init buffer_init(void) +@@ -3416,7 +3416,7 @@ void __init buffer_init(void) bh_cachep = kmem_cache_create("buffer_head", sizeof(struct buffer_head), 0, (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC| @@ -54542,7 +53686,7 @@ index 4938251..7e01445 100644 #else diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c -index 8c01c5fc..15f982e 100644 +index 25badd1..d70d918 100644 --- a/fs/cachefiles/namei.c +++ b/fs/cachefiles/namei.c @@ -317,7 +317,7 @@ try_again: @@ -54585,10 +53729,10 @@ index eccd339..4c1d995 100644 return 0; diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c -index 317f9ee..3d24511 100644 +index ebaff36..7e3ea26 100644 --- a/fs/cachefiles/rdwr.c +++ b/fs/cachefiles/rdwr.c -@@ -966,7 +966,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page) +@@ -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( @@ -54598,20 +53742,20 @@ index 317f9ee..3d24511 100644 kunmap(page); file_end_write(file); diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c -index f02d82b..2632cf86 100644 +index a40ceda..f43d17c 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c -@@ -243,7 +243,7 @@ static int ceph_readdir(struct file *filp, void *dirent, filldir_t filldir) +@@ -240,7 +240,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(filp->f_pos); -- int off = fpos_off(filp->f_pos); -+ unsigned int off = fpos_off(filp->f_pos); + unsigned frag = fpos_frag(ctx->pos); +- int off = fpos_off(ctx->pos); ++ unsigned int off = fpos_off(ctx->pos); int err; u32 ftype; struct ceph_mds_reply_info_parsed *rinfo; diff --git a/fs/ceph/super.c b/fs/ceph/super.c -index 7d377c9..3fb6559 100644 +index 6627b26..634ec4b 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c @@ -839,7 +839,7 @@ static int ceph_compare_super(struct super_block *sb, void *data) @@ -54633,10 +53777,10 @@ index 7d377c9..3fb6559 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 d597483..747901b 100644 +index f3ac415..3d2420c 100644 --- a/fs/cifs/cifs_debug.c +++ b/fs/cifs/cifs_debug.c -@@ -284,8 +284,8 @@ static ssize_t cifs_stats_proc_write(struct file *file, +@@ -286,8 +286,8 @@ static ssize_t cifs_stats_proc_write(struct file *file, if (c == '1' || c == 'y' || c == 'Y' || c == '0') { #ifdef CONFIG_CIFS_STATS2 @@ -54647,7 +53791,7 @@ index d597483..747901b 100644 #endif /* CONFIG_CIFS_STATS2 */ spin_lock(&cifs_tcp_ses_lock); list_for_each(tmp1, &cifs_tcp_ses_list) { -@@ -298,7 +298,7 @@ static ssize_t cifs_stats_proc_write(struct file *file, +@@ -300,7 +300,7 @@ static ssize_t cifs_stats_proc_write(struct file *file, tcon = list_entry(tmp3, struct cifs_tcon, tcon_list); @@ -54656,7 +53800,7 @@ index d597483..747901b 100644 if (server->ops->clear_stats) server->ops->clear_stats(tcon); } -@@ -330,8 +330,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v) +@@ -332,8 +332,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v) smBufAllocCount.counter, cifs_min_small); #ifdef CONFIG_CIFS_STATS2 seq_printf(m, "Total Large %d Small %d Allocations\n", @@ -54667,7 +53811,7 @@ index d597483..747901b 100644 #endif /* CONFIG_CIFS_STATS2 */ seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount)); -@@ -360,7 +360,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v) +@@ -362,7 +362,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v) if (tcon->need_reconnect) seq_puts(m, "\tDISCONNECTED "); seq_printf(m, "\nSMBs: %d", @@ -54677,10 +53821,10 @@ index d597483..747901b 100644 server->ops->print_stats(m, tcon); } diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c -index 3752b9f..8db5569 100644 +index 85ea98d..b3ed4d6 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c -@@ -1035,7 +1035,7 @@ cifs_init_request_bufs(void) +@@ -1037,7 +1037,7 @@ cifs_init_request_bufs(void) */ cifs_req_cachep = kmem_cache_create("cifs_request", CIFSMaxBufSize + max_hdr_size, 0, @@ -54689,7 +53833,7 @@ index 3752b9f..8db5569 100644 if (cifs_req_cachep == NULL) return -ENOMEM; -@@ -1062,7 +1062,7 @@ cifs_init_request_bufs(void) +@@ -1064,7 +1064,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", @@ -54698,7 +53842,7 @@ index 3752b9f..8db5569 100644 NULL); if (cifs_sm_req_cachep == NULL) { mempool_destroy(cifs_req_poolp); -@@ -1147,8 +1147,8 @@ init_cifs(void) +@@ -1149,8 +1149,8 @@ init_cifs(void) atomic_set(&bufAllocCount, 0); atomic_set(&smBufAllocCount, 0); #ifdef CONFIG_CIFS_STATS2 @@ -54710,10 +53854,10 @@ index 3752b9f..8db5569 100644 atomic_set(&midCount, 0); diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h -index ea3a0b3..0194e39 100644 +index 52ca861..47f309c 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h -@@ -752,35 +752,35 @@ struct cifs_tcon { +@@ -756,35 +756,35 @@ struct cifs_tcon { __u16 Flags; /* optional support bits */ enum statusEnum tidStatus; #ifdef CONFIG_CIFS_STATS @@ -54773,7 +53917,7 @@ index ea3a0b3..0194e39 100644 } smb2_stats; #endif /* CONFIG_CIFS_SMB2 */ } stats; -@@ -1081,7 +1081,7 @@ convert_delimiter(char *path, char delim) +@@ -1096,7 +1096,7 @@ convert_delimiter(char *path, char delim) } #ifdef CONFIG_CIFS_STATS @@ -54782,7 +53926,7 @@ index ea3a0b3..0194e39 100644 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon, unsigned int bytes) -@@ -1446,8 +1446,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount; +@@ -1461,8 +1461,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount; /* Various Debug counters */ GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */ #ifdef CONFIG_CIFS_STATS2 @@ -54794,10 +53938,10 @@ index ea3a0b3..0194e39 100644 GLOBAL_EXTERN atomic_t smBufAllocCount; GLOBAL_EXTERN atomic_t midCount; diff --git a/fs/cifs/link.c b/fs/cifs/link.c -index b83c3f5..6437caa 100644 +index 562044f..4af6a17 100644 --- a/fs/cifs/link.c +++ b/fs/cifs/link.c -@@ -616,7 +616,7 @@ symlink_exit: +@@ -638,7 +638,7 @@ symlink_exit: void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) { @@ -54807,7 +53951,7 @@ index b83c3f5..6437caa 100644 kfree(p); } diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c -index 1bec014..f329411 100644 +index f7d4b22..1254377 100644 --- a/fs/cifs/misc.c +++ b/fs/cifs/misc.c @@ -169,7 +169,7 @@ cifs_buf_get(void) @@ -54829,10 +53973,10 @@ index 1bec014..f329411 100644 } diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c -index 3efdb9d..e845a5e 100644 +index 6094397..51e576f 100644 --- a/fs/cifs/smb1ops.c +++ b/fs/cifs/smb1ops.c -@@ -591,27 +591,27 @@ static void +@@ -590,27 +590,27 @@ static void cifs_clear_stats(struct cifs_tcon *tcon) { #ifdef CONFIG_CIFS_STATS @@ -54881,7 +54025,7 @@ index 3efdb9d..e845a5e 100644 #endif } -@@ -620,36 +620,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon) +@@ -619,36 +619,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon) { #ifdef CONFIG_CIFS_STATS seq_printf(m, " Oplocks breaks: %d", @@ -54938,10 +54082,10 @@ index 3efdb9d..e845a5e 100644 } diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c -index f2e76f3..c44fac7 100644 +index f259e6c..ca948ff 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c -@@ -274,8 +274,8 @@ smb2_clear_stats(struct cifs_tcon *tcon) +@@ -281,8 +281,8 @@ smb2_clear_stats(struct cifs_tcon *tcon) #ifdef CONFIG_CIFS_STATS int i; for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) { @@ -54952,7 +54096,7 @@ index f2e76f3..c44fac7 100644 } #endif } -@@ -284,66 +284,66 @@ static void +@@ -310,65 +310,65 @@ static void smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon) { #ifdef CONFIG_CIFS_STATS @@ -54970,7 +54114,6 @@ index f2e76f3..c44fac7 100644 - atomic_read(&failed[SMB2_SESSION_SETUP_HE])); + atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]), + atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE])); - #define SMB2LOGOFF 0x0002 /* trivial request/resp */ seq_printf(m, "\nLogoffs: %d sent %d failed", - atomic_read(&sent[SMB2_LOGOFF_HE]), - atomic_read(&failed[SMB2_LOGOFF_HE])); @@ -55060,10 +54203,10 @@ index f2e76f3..c44fac7 100644 } diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c -index 2b95ce2..d079d75 100644 +index abc9c28..3fdae28 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c -@@ -1760,8 +1760,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon, +@@ -1946,8 +1946,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); @@ -55122,7 +54265,7 @@ index 1da168c..8bc7ff6 100644 return hit; diff --git a/fs/compat.c b/fs/compat.c -index fc3b55d..7b568ae 100644 +index 6af20de..fec3fbb 100644 --- a/fs/compat.c +++ b/fs/compat.c @@ -54,7 +54,7 @@ @@ -55152,15 +54295,15 @@ index fc3b55d..7b568ae 100644 goto out; if (nr_segs > fast_segs) { ret = -ENOMEM; -@@ -833,6 +833,7 @@ struct compat_old_linux_dirent { - +@@ -834,6 +834,7 @@ struct compat_old_linux_dirent { struct compat_readdir_callback { + struct dir_context ctx; struct compat_old_linux_dirent __user *dirent; + struct file * file; int result; }; -@@ -850,6 +851,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen, +@@ -851,6 +852,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen, buf->result = -EOVERFLOW; return -EOVERFLOW; } @@ -55171,23 +54314,23 @@ index fc3b55d..7b568ae 100644 buf->result++; dirent = buf->dirent; if (!access_ok(VERIFY_WRITE, dirent, -@@ -880,6 +885,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd, +@@ -882,6 +887,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd, + if (!f.file) + return -EBADF; - buf.result = 0; - buf.dirent = dirent; + buf.file = f.file; - - error = vfs_readdir(f.file, compat_fillonedir, &buf); + error = iterate_dir(f.file, &buf.ctx); if (buf.result) -@@ -899,6 +905,7 @@ struct compat_linux_dirent { - struct compat_getdents_callback { + error = buf.result; +@@ -901,6 +907,7 @@ struct compat_getdents_callback { + struct dir_context ctx; struct compat_linux_dirent __user *current_dir; struct compat_linux_dirent __user *previous; + struct file * file; int count; int error; }; -@@ -920,6 +927,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen, +@@ -922,6 +929,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen, buf->error = -EOVERFLOW; return -EOVERFLOW; } @@ -55198,23 +54341,23 @@ index fc3b55d..7b568ae 100644 dirent = buf->previous; if (dirent) { if (__put_user(offset, &dirent->d_off)) -@@ -965,6 +976,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd, - buf.previous = NULL; - buf.count = count; - buf.error = 0; -+ buf.file = f.file; +@@ -967,6 +978,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd, + if (!f.file) + return -EBADF; - error = vfs_readdir(f.file, compat_filldir, &buf); ++ buf.file = f.file; + error = iterate_dir(f.file, &buf.ctx); if (error >= 0) -@@ -985,6 +997,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd, - struct compat_getdents_callback64 { + error = buf.error; +@@ -987,6 +999,7 @@ struct compat_getdents_callback64 { + struct dir_context ctx; struct linux_dirent64 __user *current_dir; struct linux_dirent64 __user *previous; + struct file * file; int count; int error; }; -@@ -1001,6 +1014,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t +@@ -1003,6 +1016,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; @@ -55225,22 +54368,14 @@ index fc3b55d..7b568ae 100644 dirent = buf->previous; if (dirent) { -@@ -1050,13 +1067,14 @@ asmlinkage long compat_sys_getdents64(unsigned int fd, - buf.previous = NULL; - buf.count = count; - buf.error = 0; -+ buf.file = f.file; +@@ -1052,6 +1069,7 @@ asmlinkage long compat_sys_getdents64(unsigned int fd, + if (!f.file) + return -EBADF; - error = vfs_readdir(f.file, compat_filldir64, &buf); ++ buf.file = f.file; + error = iterate_dir(f.file, &buf.ctx); if (error >= 0) error = buf.error; - lastdirent = buf.previous; - if (lastdirent) { -- typeof(lastdirent->d_off) d_off = f.file->f_pos; -+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = f.file->f_pos; - if (__put_user_unaligned(d_off, &lastdirent->d_off)) - error = -EFAULT; - else diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c index a81147e..20bf2b5 100644 --- a/fs/compat_binfmt_elf.c @@ -55260,10 +54395,10 @@ index a81147e..20bf2b5 100644 /* diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c -index 996cdc5..15e2f33 100644 +index 5d19acf..9ab093b 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c -@@ -622,7 +622,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd, +@@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd, return -EFAULT; if (__get_user(udata, &ss32->iomem_base)) return -EFAULT; @@ -55272,7 +54407,7 @@ index 996cdc5..15e2f33 100644 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) || __get_user(ss.port_high, &ss32->port_high)) return -EFAULT; -@@ -703,8 +703,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd, +@@ -702,8 +702,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd, for (i = 0; i < nmsgs; i++) { if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16))) return -EFAULT; @@ -55283,7 +54418,7 @@ index 996cdc5..15e2f33 100644 return -EFAULT; } return sys_ioctl(fd, cmd, (unsigned long)tdata); -@@ -797,7 +797,7 @@ static int compat_ioctl_preallocate(struct file *file, +@@ -796,7 +796,7 @@ static int compat_ioctl_preallocate(struct file *file, copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) || copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) || copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) || @@ -55292,7 +54427,7 @@ index 996cdc5..15e2f33 100644 return -EFAULT; return ioctl_preallocate(file, p); -@@ -1619,8 +1619,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd, +@@ -1616,8 +1616,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd, static int __init init_sys32_ioctl_cmp(const void *p, const void *q) { unsigned int a, b; @@ -55304,65 +54439,38 @@ index 996cdc5..15e2f33 100644 return 1; if (a < b) diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c -index 7aabc6a..34c1197 100644 +index 277bd1b..f312c9e 100644 --- a/fs/configfs/dir.c +++ b/fs/configfs/dir.c -@@ -1565,7 +1565,8 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir - } - for (p=q->next; p!= &parent_sd->s_children; p=p->next) { - struct configfs_dirent *next; -- const char * name; -+ const unsigned char * name; -+ char d_name[sizeof(next->s_dentry->d_iname)]; - int len; - struct inode *inode = NULL; - -@@ -1575,7 +1576,12 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir - continue; - - name = configfs_get_name(next); -- len = strlen(name); -+ if (next->s_dentry && name == next->s_dentry->d_iname) { -+ len = next->s_dentry->d_name.len; -+ memcpy(d_name, name, len); -+ name = d_name; -+ } else -+ len = strlen(name); +@@ -1546,7 +1546,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx) + } + for (p = q->next; p != &parent_sd->s_children; p = p->next) { + struct configfs_dirent *next; +- const char *name; ++ const unsigned char * name; ++ char d_name[sizeof(next->s_dentry->d_iname)]; + int len; + struct inode *inode = NULL; - /* - * We'll have a dentry and an inode for +@@ -1555,7 +1556,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx) + continue; + + name = configfs_get_name(next); +- len = strlen(name); ++ if (next->s_dentry && name == next->s_dentry->d_iname) { ++ len = next->s_dentry->d_name.len; ++ memcpy(d_name, name, len); ++ name = d_name; ++ } else ++ len = strlen(name); + + /* + * We'll have a dentry and an inode for diff --git a/fs/coredump.c b/fs/coredump.c -index dafafba..10b3b27 100644 +index 72f816d..1ba8eff 100644 --- a/fs/coredump.c +++ b/fs/coredump.c -@@ -52,7 +52,7 @@ struct core_name { - char *corename; - int used, size; - }; --static atomic_t call_count = ATOMIC_INIT(1); -+static atomic_unchecked_t call_count = ATOMIC_INIT(1); - - /* The maximal length of core_pattern is also specified in sysctl.c */ - -@@ -60,7 +60,7 @@ static int expand_corename(struct core_name *cn) - { - char *old_corename = cn->corename; - -- cn->size = CORENAME_MAX_SIZE * atomic_inc_return(&call_count); -+ cn->size = CORENAME_MAX_SIZE * atomic_inc_return_unchecked(&call_count); - cn->corename = krealloc(old_corename, cn->size, GFP_KERNEL); - - if (!cn->corename) { -@@ -157,7 +157,7 @@ static int format_corename(struct core_name *cn, struct coredump_params *cprm) - int pid_in_pattern = 0; - int err = 0; - -- cn->size = CORENAME_MAX_SIZE * atomic_read(&call_count); -+ cn->size = CORENAME_MAX_SIZE * atomic_read_unchecked(&call_count); - cn->corename = kmalloc(cn->size, GFP_KERNEL); - cn->used = 0; - -@@ -435,8 +435,8 @@ static void wait_for_dump_helpers(struct file *file) +@@ -433,8 +433,8 @@ static void wait_for_dump_helpers(struct file *file) struct pipe_inode_info *pipe = file->private_data; pipe_lock(pipe); @@ -55373,7 +54481,7 @@ index dafafba..10b3b27 100644 wake_up_interruptible_sync(&pipe->wait); kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN); pipe_unlock(pipe); -@@ -445,11 +445,11 @@ static void wait_for_dump_helpers(struct file *file) +@@ -443,11 +443,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(). */ @@ -55388,7 +54496,7 @@ index dafafba..10b3b27 100644 pipe_unlock(pipe); } -@@ -496,7 +496,8 @@ void do_coredump(siginfo_t *siginfo) +@@ -494,7 +494,8 @@ void do_coredump(siginfo_t *siginfo) struct files_struct *displaced; bool need_nonrelative = false; bool core_dumped = false; @@ -55398,7 +54506,7 @@ index dafafba..10b3b27 100644 struct coredump_params cprm = { .siginfo = siginfo, .regs = signal_pt_regs(), -@@ -509,7 +510,10 @@ void do_coredump(siginfo_t *siginfo) +@@ -507,7 +508,10 @@ void do_coredump(siginfo_t *siginfo) .mm_flags = mm->flags, }; @@ -55410,7 +54518,7 @@ index dafafba..10b3b27 100644 binfmt = mm->binfmt; if (!binfmt || !binfmt->core_dump) -@@ -533,7 +537,7 @@ void do_coredump(siginfo_t *siginfo) +@@ -531,7 +535,7 @@ void do_coredump(siginfo_t *siginfo) need_nonrelative = true; } @@ -55419,7 +54527,7 @@ index dafafba..10b3b27 100644 if (retval < 0) goto fail_creds; -@@ -576,7 +580,7 @@ void do_coredump(siginfo_t *siginfo) +@@ -574,7 +578,7 @@ void do_coredump(siginfo_t *siginfo) } cprm.limit = RLIM_INFINITY; @@ -55428,7 +54536,7 @@ index dafafba..10b3b27 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); -@@ -608,6 +612,8 @@ void do_coredump(siginfo_t *siginfo) +@@ -606,6 +610,8 @@ void do_coredump(siginfo_t *siginfo) } else { struct inode *inode; @@ -55437,7 +54545,7 @@ index dafafba..10b3b27 100644 if (cprm.limit < binfmt->min_coredump) goto fail_unlock; -@@ -666,7 +672,7 @@ close_fail: +@@ -664,7 +670,7 @@ close_fail: filp_close(cprm.file, NULL); fail_dropcount: if (ispipe) @@ -55445,8 +54553,8 @@ index dafafba..10b3b27 100644 + atomic_dec_unchecked(&core_dump_count); fail_unlock: kfree(cn.corename); - fail_corename: -@@ -687,7 +693,7 @@ int dump_write(struct file *file, const void *addr, int nr) + coredump_finish(mm, core_dumped); +@@ -684,7 +690,7 @@ int dump_write(struct file *file, const void *addr, int nr) { return !dump_interrupted() && access_ok(VERIFY_READ, addr, nr) && @@ -55456,10 +54564,10 @@ index dafafba..10b3b27 100644 EXPORT_SYMBOL(dump_write); diff --git a/fs/dcache.c b/fs/dcache.c -index f09b908..04b9690 100644 +index b949af8..5978926 100644 --- a/fs/dcache.c +++ b/fs/dcache.c -@@ -3086,7 +3086,8 @@ void __init vfs_caches_init(unsigned long mempages) +@@ -3073,7 +3073,8 @@ void __init vfs_caches_init(unsigned long mempages) mempages -= reserve; names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0, @@ -55486,7 +54594,7 @@ index c7c83ff..bda9461 100644 } EXPORT_SYMBOL_GPL(debugfs_create_dir); diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c -index 5eab400..810a3f5 100644 +index 67e9b63..a9adb68 100644 --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c @@ -674,7 +674,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf, @@ -55521,7 +54629,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 1f44670..3c84660 100644 +index fd774c7..1c6a7bf 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -55,8 +55,20 @@ @@ -55589,7 +54697,7 @@ index 1f44670..3c84660 100644 write_unlock(&binfmt_lock); } -@@ -180,18 +207,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos, +@@ -181,18 +208,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos, int write) { struct page *page; @@ -55611,7 +54719,7 @@ index 1f44670..3c84660 100644 return NULL; if (write) { -@@ -207,6 +226,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos, +@@ -208,6 +227,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos, if (size <= ARG_MAX) return page; @@ -55629,7 +54737,7 @@ index 1f44670..3c84660 100644 /* * Limit to 1/4-th the stack size for the argv+env strings. * This ensures that: -@@ -266,6 +296,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm) +@@ -267,6 +297,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_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP; @@ -55641,7 +54749,7 @@ index 1f44670..3c84660 100644 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); INIT_LIST_HEAD(&vma->anon_vma_chain); -@@ -276,6 +311,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm) +@@ -277,6 +312,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 *); @@ -55654,7 +54762,7 @@ index 1f44670..3c84660 100644 return 0; err: up_write(&mm->mmap_sem); -@@ -396,7 +437,7 @@ struct user_arg_ptr { +@@ -397,7 +438,7 @@ struct user_arg_ptr { } ptr; }; @@ -55663,7 +54771,7 @@ index 1f44670..3c84660 100644 { const char __user *native; -@@ -405,14 +446,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr) +@@ -406,14 +447,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)) @@ -55680,7 +54788,7 @@ index 1f44670..3c84660 100644 return native; } -@@ -431,7 +472,7 @@ static int count(struct user_arg_ptr argv, int max) +@@ -432,7 +473,7 @@ static int count(struct user_arg_ptr argv, int max) if (!p) break; @@ -55689,7 +54797,7 @@ index 1f44670..3c84660 100644 return -EFAULT; if (i >= max) -@@ -466,7 +507,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv, +@@ -467,7 +508,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv, ret = -EFAULT; str = get_user_arg_ptr(argv, argc); @@ -55698,7 +54806,7 @@ index 1f44670..3c84660 100644 goto out; len = strnlen_user(str, MAX_ARG_STRLEN); -@@ -548,7 +589,7 @@ int copy_strings_kernel(int argc, const char *const *__argv, +@@ -549,7 +590,7 @@ int copy_strings_kernel(int argc, const char *const *__argv, int r; mm_segment_t oldfs = get_fs(); struct user_arg_ptr argv = { @@ -55707,7 +54815,7 @@ index 1f44670..3c84660 100644 }; set_fs(KERNEL_DS); -@@ -583,7 +624,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) +@@ -584,7 +625,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; @@ -55717,7 +54825,7 @@ index 1f44670..3c84660 100644 /* * ensure there are no vmas between where we want to go -@@ -592,6 +634,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) +@@ -593,6 +635,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) if (vma != find_vma(mm, new_start)) return -EFAULT; @@ -55728,7 +54836,7 @@ index 1f44670..3c84660 100644 /* * cover the whole range: [new_start, old_end) */ -@@ -672,10 +718,6 @@ int setup_arg_pages(struct linux_binprm *bprm, +@@ -673,10 +719,6 @@ int setup_arg_pages(struct linux_binprm *bprm, stack_top = arch_align_stack(stack_top); stack_top = PAGE_ALIGN(stack_top); @@ -55739,7 +54847,7 @@ index 1f44670..3c84660 100644 stack_shift = vma->vm_end - stack_top; bprm->p -= stack_shift; -@@ -687,8 +729,28 @@ int setup_arg_pages(struct linux_binprm *bprm, +@@ -688,8 +730,28 @@ int setup_arg_pages(struct linux_binprm *bprm, bprm->exec -= stack_shift; down_write(&mm->mmap_sem); @@ -55768,7 +54876,7 @@ index 1f44670..3c84660 100644 /* * Adjust stack execute permissions; explicitly enable for * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone -@@ -707,13 +769,6 @@ int setup_arg_pages(struct linux_binprm *bprm, +@@ -708,13 +770,6 @@ int setup_arg_pages(struct linux_binprm *bprm, goto out_unlock; BUG_ON(prev != vma); @@ -55782,7 +54890,7 @@ index 1f44670..3c84660 100644 /* mprotect_fixup is overkill to remove the temporary stack flags */ vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP; -@@ -737,6 +792,27 @@ int setup_arg_pages(struct linux_binprm *bprm, +@@ -738,6 +793,27 @@ int setup_arg_pages(struct linux_binprm *bprm, #endif current->mm->start_stack = bprm->p; ret = expand_stack(vma, stack_base); @@ -55810,7 +54918,7 @@ index 1f44670..3c84660 100644 if (ret) ret = -EFAULT; -@@ -772,6 +848,8 @@ struct file *open_exec(const char *name) +@@ -774,6 +850,8 @@ struct file *open_exec(const char *name) fsnotify_open(file); @@ -55819,7 +54927,7 @@ index 1f44670..3c84660 100644 err = deny_write_access(file); if (err) goto exit; -@@ -795,7 +873,7 @@ int kernel_read(struct file *file, loff_t offset, +@@ -797,7 +875,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() */ @@ -55828,7 +54936,7 @@ index 1f44670..3c84660 100644 set_fs(old_fs); return result; } -@@ -1251,7 +1329,7 @@ static int check_unsafe_exec(struct linux_binprm *bprm) +@@ -1253,7 +1331,7 @@ static int check_unsafe_exec(struct linux_binprm *bprm) } rcu_read_unlock(); @@ -55837,7 +54945,7 @@ index 1f44670..3c84660 100644 bprm->unsafe |= LSM_UNSAFE_SHARE; } else { res = -EAGAIN; -@@ -1451,6 +1529,31 @@ int search_binary_handler(struct linux_binprm *bprm) +@@ -1453,6 +1531,31 @@ int search_binary_handler(struct linux_binprm *bprm) EXPORT_SYMBOL(search_binary_handler); @@ -55869,7 +54977,7 @@ index 1f44670..3c84660 100644 /* * sys_execve() executes a new program. */ -@@ -1458,6 +1561,11 @@ static int do_execve_common(const char *filename, +@@ -1460,12 +1563,19 @@ static int do_execve_common(const char *filename, struct user_arg_ptr argv, struct user_arg_ptr envp) { @@ -55881,16 +54989,15 @@ index 1f44670..3c84660 100644 struct linux_binprm *bprm; struct file *file; struct files_struct *displaced; -@@ -1465,6 +1573,8 @@ static int do_execve_common(const char *filename, + bool clear_in_exec; int retval; - const struct cred *cred = current_cred(); -+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&cred->user->processes), 1); ++ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(¤t_user()->processes), 1); + /* * We move the actual failure in case of RLIMIT_NPROC excess from * set*uid() to execve() because too many poorly written programs -@@ -1505,12 +1615,22 @@ static int do_execve_common(const char *filename, +@@ -1506,12 +1616,22 @@ static int do_execve_common(const char *filename, if (IS_ERR(file)) goto out_unmark; @@ -55913,7 +55020,7 @@ index 1f44670..3c84660 100644 retval = bprm_mm_init(bprm); if (retval) goto out_file; -@@ -1527,24 +1647,70 @@ static int do_execve_common(const char *filename, +@@ -1528,24 +1648,70 @@ static int do_execve_common(const char *filename, if (retval < 0) goto out; @@ -55988,7 +55095,7 @@ index 1f44670..3c84660 100644 current->fs->in_exec = 0; current->in_execve = 0; acct_update_integrals(current); -@@ -1553,6 +1719,14 @@ static int do_execve_common(const char *filename, +@@ -1554,6 +1720,14 @@ static int do_execve_common(const char *filename, put_files_struct(displaced); return retval; @@ -56003,7 +55110,7 @@ index 1f44670..3c84660 100644 out: if (bprm->mm) { acct_arg_size(bprm, 0); -@@ -1701,3 +1875,287 @@ asmlinkage long compat_sys_execve(const char __user * filename, +@@ -1702,3 +1876,287 @@ asmlinkage long compat_sys_execve(const char __user * filename, return error; } #endif @@ -56326,7 +55433,7 @@ index 22548f5..41521d8 100644 } return 1; diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c -index 3742e4c..69a797f 100644 +index ddd715e..c772f88 100644 --- a/fs/ext4/balloc.c +++ b/fs/ext4/balloc.c @@ -528,8 +528,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi, @@ -56341,10 +55448,10 @@ index 3742e4c..69a797f 100644 if (free_clusters >= (nclusters + dirty_clusters + resv_clusters)) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h -index 5aae3d1..b5da7f8 100644 +index 0ab26fb..b6ecb39 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h -@@ -1252,19 +1252,19 @@ struct ext4_sb_info { +@@ -1247,19 +1247,19 @@ struct ext4_sb_info { unsigned long s_mb_last_start; /* stats for buddy allocator */ @@ -56375,7 +55482,7 @@ index 5aae3d1..b5da7f8 100644 /* locality groups */ diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c -index 59c6750..a549154 100644 +index 4bbbf13b..dcceaeb 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -1865,7 +1865,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac, @@ -56387,7 +55494,7 @@ index 59c6750..a549154 100644 break; } -@@ -2170,7 +2170,7 @@ repeat: +@@ -2171,7 +2171,7 @@ repeat: ac->ac_status = AC_STATUS_CONTINUE; ac->ac_flags |= EXT4_MB_HINT_FIRST; cr = 3; @@ -56396,7 +55503,7 @@ index 59c6750..a549154 100644 goto repeat; } } -@@ -2678,25 +2678,25 @@ int ext4_mb_release(struct super_block *sb) +@@ -2679,25 +2679,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)", @@ -56432,7 +55539,7 @@ index 59c6750..a549154 100644 } free_percpu(sbi->s_locality_groups); -@@ -3150,16 +3150,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac) +@@ -3151,16 +3151,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) { @@ -56455,7 +55562,7 @@ index 59c6750..a549154 100644 } if (ac->ac_op == EXT4_MB_HISTORY_ALLOC) -@@ -3559,7 +3559,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) +@@ -3560,7 +3560,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); @@ -56464,7 +55571,7 @@ index 59c6750..a549154 100644 ei = EXT4_I(ac->ac_inode); grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group); -@@ -3619,7 +3619,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac) +@@ -3620,7 +3620,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); @@ -56473,7 +55580,7 @@ index 59c6750..a549154 100644 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group); lg = ac->ac_lg; -@@ -3708,7 +3708,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh, +@@ -3709,7 +3709,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh, * from the bitmap and continue. */ } @@ -56482,7 +55589,7 @@ index 59c6750..a549154 100644 return err; } -@@ -3726,7 +3726,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b, +@@ -3727,7 +3727,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); @@ -56504,50 +55611,11 @@ index 214461e..3614c89 100644 __ext4_warning(sb, function, line, "MMP failure info: last update time: %llu, last update " "node: %s, last update device: %s\n", -diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c -index 49d3c01..9579efd 100644 ---- a/fs/ext4/resize.c -+++ b/fs/ext4/resize.c -@@ -79,12 +79,20 @@ static int verify_group_input(struct super_block *sb, - ext4_fsblk_t end = start + input->blocks_count; - ext4_group_t group = input->group; - ext4_fsblk_t itend = input->inode_table + sbi->s_itb_per_group; -- unsigned overhead = ext4_group_overhead_blocks(sb, group); -- ext4_fsblk_t metaend = start + overhead; -+ unsigned overhead; -+ ext4_fsblk_t metaend; - struct buffer_head *bh = NULL; - ext4_grpblk_t free_blocks_count, offset; - int err = -EINVAL; - -+ if (group != sbi->s_groups_count) { -+ ext4_warning(sb, "Cannot add at group %u (only %u groups)", -+ input->group, sbi->s_groups_count); -+ return -EINVAL; -+ } -+ -+ overhead = ext4_group_overhead_blocks(sb, group); -+ metaend = start + overhead; - input->free_blocks_count = free_blocks_count = - input->blocks_count - 2 - overhead - sbi->s_itb_per_group; - -@@ -96,10 +104,7 @@ static int verify_group_input(struct super_block *sb, - free_blocks_count, input->reserved_blocks); - - ext4_get_group_no_and_offset(sb, start, NULL, &offset); -- if (group != sbi->s_groups_count) -- ext4_warning(sb, "Cannot add at group %u (only %u groups)", -- input->group, sbi->s_groups_count); -- else if (offset != 0) -+ if (offset != 0) - ext4_warning(sb, "Last group not full"); - else if (input->reserved_blocks > input->blocks_count / 5) - ext4_warning(sb, "Reserved blocks too high (%u)", diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index 3f7c39e..227f24f 100644 +index b59373b..f41c2b5 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c -@@ -1236,7 +1236,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)) @@ -56556,17 +55624,17 @@ index 3f7c39e..227f24f 100644 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n"; #ifdef CONFIG_QUOTA -@@ -2372,7 +2372,7 @@ struct ext4_attr { - ssize_t (*store)(struct ext4_attr *, struct ext4_sb_info *, - const char *, size_t); - int offset; +@@ -2394,7 +2394,7 @@ struct ext4_attr { + int offset; + int deprecated_val; + } u; -}; +} __do_const; static int parse_strtoull(const char *buf, unsigned long long max, unsigned long long *value) diff --git a/fs/fcntl.c b/fs/fcntl.c -index 6599222..e7bf0de 100644 +index 65343c3..9969dcf 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c @@ -107,6 +107,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type, @@ -56735,7 +55803,7 @@ index d8ac61d..79a36f0 100644 .seq = SEQCNT_ZERO, .umask = 0022, diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c -index e2cba1f..20319c5 100644 +index 0e91a3c..6c6d2e0 100644 --- a/fs/fscache/cookie.c +++ b/fs/fscache/cookie.c @@ -19,7 +19,7 @@ @@ -56770,7 +55838,7 @@ index e2cba1f..20319c5 100644 _leave(" [ENOMEM]"); return NULL; } -@@ -109,13 +109,13 @@ struct fscache_cookie *__fscache_acquire_cookie( +@@ -114,13 +114,13 @@ struct fscache_cookie *__fscache_acquire_cookie( switch (cookie->def->type) { case FSCACHE_COOKIE_TYPE_INDEX: @@ -56787,7 +55855,7 @@ index e2cba1f..20319c5 100644 break; } -@@ -126,13 +126,13 @@ struct fscache_cookie *__fscache_acquire_cookie( +@@ -131,13 +131,13 @@ struct fscache_cookie *__fscache_acquire_cookie( if (fscache_acquire_non_index_cookie(cookie) < 0) { atomic_dec(&parent->n_children); __fscache_cookie_put(cookie); @@ -56803,7 +55871,7 @@ index e2cba1f..20319c5 100644 _leave(" = %p", cookie); return cookie; } -@@ -168,7 +168,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie) +@@ -173,7 +173,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie) cache = fscache_select_cache_for_object(cookie->parent); if (!cache) { up_read(&fscache_addremove_sem); @@ -56812,7 +55880,7 @@ index e2cba1f..20319c5 100644 _leave(" = -ENOMEDIUM [no cache]"); return -ENOMEDIUM; } -@@ -255,14 +255,14 @@ static int fscache_alloc_object(struct fscache_cache *cache, +@@ -259,14 +259,14 @@ static int fscache_alloc_object(struct fscache_cache *cache, object = cache->ops->alloc_object(cache, cookie); fscache_stat_d(&fscache_n_cop_alloc_object); if (IS_ERR(object)) { @@ -56830,7 +55898,7 @@ index e2cba1f..20319c5 100644 _debug("ALLOC OBJ%x: %s {%lx}", object->debug_id, cookie->def->name, object->events); -@@ -376,7 +376,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie) +@@ -380,7 +380,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie) _enter("{%s}", cookie->def->name); @@ -56839,7 +55907,7 @@ index e2cba1f..20319c5 100644 /* Only permit invalidation of data files. Invalidating an index will * require the caller to release all its attachments to the tree rooted -@@ -434,10 +434,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie) +@@ -438,10 +438,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie) { struct fscache_object *object; @@ -56852,9 +55920,9 @@ index e2cba1f..20319c5 100644 _leave(" [no cookie]"); return; } -@@ -471,12 +471,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire) +@@ -473,12 +473,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire) + { struct fscache_object *object; - unsigned long event; - fscache_stat(&fscache_n_relinquishes); + fscache_stat_unchecked(&fscache_n_relinquishes); @@ -56868,20 +55936,11 @@ index e2cba1f..20319c5 100644 _leave(" [no cookie]"); return; } -@@ -492,7 +492,7 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire) - - /* wait for the cookie to finish being instantiated (or to fail) */ - if (test_bit(FSCACHE_COOKIE_CREATING, &cookie->flags)) { -- fscache_stat(&fscache_n_relinquishes_waitcrt); -+ fscache_stat_unchecked(&fscache_n_relinquishes_waitcrt); - wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING, - fscache_wait_bit, TASK_UNINTERRUPTIBLE); - } diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h -index ee38fef..0a326d4 100644 +index 12d505b..86473a3 100644 --- a/fs/fscache/internal.h +++ b/fs/fscache/internal.h -@@ -148,101 +148,101 @@ extern void fscache_proc_cleanup(void); +@@ -147,101 +147,101 @@ extern void fscache_proc_cleanup(void); * stats.c */ #ifdef CONFIG_FSCACHE_STATS @@ -57064,7 +56123,7 @@ index ee38fef..0a326d4 100644 extern atomic_t fscache_n_cop_alloc_object; extern atomic_t fscache_n_cop_lookup_object; -@@ -267,6 +267,11 @@ static inline void fscache_stat(atomic_t *stat) +@@ -266,6 +266,11 @@ static inline void fscache_stat(atomic_t *stat) atomic_inc(stat); } @@ -57076,7 +56135,7 @@ index ee38fef..0a326d4 100644 static inline void fscache_stat_d(atomic_t *stat) { atomic_dec(stat); -@@ -279,6 +284,7 @@ extern const struct file_operations fscache_stats_fops; +@@ -278,6 +283,7 @@ extern const struct file_operations fscache_stats_fops; #define __fscache_stat(stat) (NULL) #define fscache_stat(stat) do {} while (0) @@ -57085,100 +56144,73 @@ index ee38fef..0a326d4 100644 #endif diff --git a/fs/fscache/object.c b/fs/fscache/object.c -index 50d41c1..10ee117 100644 +index 86d75a6..5f3d7a0 100644 --- a/fs/fscache/object.c +++ b/fs/fscache/object.c -@@ -143,7 +143,7 @@ static void fscache_object_state_machine(struct fscache_object *object) - /* Invalidate an object on disk */ - case FSCACHE_OBJECT_INVALIDATING: - clear_bit(FSCACHE_OBJECT_EV_INVALIDATE, &object->events); -- fscache_stat(&fscache_n_invalidates_run); -+ fscache_stat_unchecked(&fscache_n_invalidates_run); - fscache_stat(&fscache_n_cop_invalidate_object); - fscache_invalidate_object(object); - fscache_stat_d(&fscache_n_cop_invalidate_object); -@@ -153,7 +153,7 @@ static void fscache_object_state_machine(struct fscache_object *object) - /* update the object metadata on disk */ - case FSCACHE_OBJECT_UPDATING: - clear_bit(FSCACHE_OBJECT_EV_UPDATE, &object->events); -- fscache_stat(&fscache_n_updates_run); -+ fscache_stat_unchecked(&fscache_n_updates_run); - fscache_stat(&fscache_n_cop_update_object); - object->cache->ops->update_object(object); - fscache_stat_d(&fscache_n_cop_update_object); -@@ -242,7 +242,7 @@ static void fscache_object_state_machine(struct fscache_object *object) - spin_lock(&object->lock); - object->state = FSCACHE_OBJECT_DEAD; - spin_unlock(&object->lock); -- fscache_stat(&fscache_n_object_dead); -+ fscache_stat_unchecked(&fscache_n_object_dead); - goto terminal_transit; - - /* handle the parent cache of this object being withdrawn from -@@ -257,7 +257,7 @@ static void fscache_object_state_machine(struct fscache_object *object) - spin_lock(&object->lock); - object->state = FSCACHE_OBJECT_DEAD; - spin_unlock(&object->lock); -- fscache_stat(&fscache_n_object_dead); -+ fscache_stat_unchecked(&fscache_n_object_dead); - goto terminal_transit; - - /* complain about the object being woken up once it is -@@ -495,7 +495,7 @@ static void fscache_lookup_object(struct fscache_object *object) - parent->cookie->def->name, cookie->def->name, - object->cache->tag->name); +@@ -451,7 +451,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object + _debug("LOOKUP \"%s\" in \"%s\"", + cookie->def->name, object->cache->tag->name); - fscache_stat(&fscache_n_object_lookups); + fscache_stat_unchecked(&fscache_n_object_lookups); fscache_stat(&fscache_n_cop_lookup_object); ret = object->cache->ops->lookup_object(object); fscache_stat_d(&fscache_n_cop_lookup_object); -@@ -506,7 +506,7 @@ static void fscache_lookup_object(struct fscache_object *object) +@@ -461,7 +461,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object if (ret == -ETIMEDOUT) { /* probably stuck behind another object, so move this one to * the back of the queue */ - fscache_stat(&fscache_n_object_lookups_timed_out); + fscache_stat_unchecked(&fscache_n_object_lookups_timed_out); - set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events); + _leave(" [timeout]"); + return NO_TRANSIT; } +@@ -489,7 +489,7 @@ void fscache_object_lookup_negative(struct fscache_object *object) + _enter("{OBJ%x,%s}", object->debug_id, object->state->name); -@@ -529,7 +529,7 @@ void fscache_object_lookup_negative(struct fscache_object *object) - - spin_lock(&object->lock); - if (object->state == FSCACHE_OBJECT_LOOKING_UP) { + if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) { - fscache_stat(&fscache_n_object_lookups_negative); + fscache_stat_unchecked(&fscache_n_object_lookups_negative); - /* transit here to allow write requests to begin stacking up - * and read requests to begin returning ENODATA */ -@@ -575,7 +575,7 @@ void fscache_obtained_object(struct fscache_object *object) + /* Allow write requests to begin stacking up and read requests to begin + * returning ENODATA. +@@ -523,7 +523,7 @@ void fscache_obtained_object(struct fscache_object *object) + /* if we were still looking up, then we must have a positive lookup * result, in which case there may be data available */ - spin_lock(&object->lock); - if (object->state == FSCACHE_OBJECT_LOOKING_UP) { + if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) { - fscache_stat(&fscache_n_object_lookups_positive); + fscache_stat_unchecked(&fscache_n_object_lookups_positive); - clear_bit(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags); - -@@ -589,7 +589,7 @@ void fscache_obtained_object(struct fscache_object *object) - set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events); + /* We do (presumably) have data */ + clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags); +@@ -534,7 +534,7 @@ void fscache_obtained_object(struct fscache_object *object) + clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags); + wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP); } else { - ASSERTCMP(object->state, ==, FSCACHE_OBJECT_CREATING); - fscache_stat(&fscache_n_object_created); + fscache_stat_unchecked(&fscache_n_object_created); + } - object->state = FSCACHE_OBJECT_AVAILABLE; - spin_unlock(&object->lock); -@@ -634,7 +634,7 @@ static void fscache_object_available(struct fscache_object *object) - fscache_enqueue_dependents(object); + set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags); +@@ -570,7 +570,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec + fscache_stat_d(&fscache_n_cop_lookup_complete); fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif); - fscache_stat(&fscache_n_object_avail); + fscache_stat_unchecked(&fscache_n_object_avail); _leave(""); - } -@@ -894,7 +894,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object, + return transit_to(JUMPSTART_DEPS); +@@ -716,7 +716,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob + + /* this just shifts the object release to the work processor */ + fscache_put_object(object); +- fscache_stat(&fscache_n_object_dead); ++ fscache_stat_unchecked(&fscache_n_object_dead); + + _leave(""); + return transit_to(OBJECT_DEAD); +@@ -881,7 +881,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object, enum fscache_checkaux result; if (!object->cookie->def->check_aux) { @@ -57187,7 +56219,7 @@ index 50d41c1..10ee117 100644 return FSCACHE_CHECKAUX_OKAY; } -@@ -903,17 +903,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object, +@@ -890,17 +890,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object, switch (result) { /* entry okay as is */ case FSCACHE_CHECKAUX_OKAY: @@ -57208,8 +56240,26 @@ index 50d41c1..10ee117 100644 break; default: +@@ -986,7 +986,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje + { + const struct fscache_state *s; + +- fscache_stat(&fscache_n_invalidates_run); ++ fscache_stat_unchecked(&fscache_n_invalidates_run); + fscache_stat(&fscache_n_cop_invalidate_object); + s = _fscache_invalidate_object(object, event); + fscache_stat_d(&fscache_n_cop_invalidate_object); +@@ -1001,7 +1001,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object * + { + _enter("{OBJ%x},%d", object->debug_id, event); + +- fscache_stat(&fscache_n_updates_run); ++ fscache_stat_unchecked(&fscache_n_updates_run); + fscache_stat(&fscache_n_cop_update_object); + 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 762a9ec..2023284 100644 +index 318071a..379938b 100644 --- a/fs/fscache/operation.c +++ b/fs/fscache/operation.c @@ -17,7 +17,7 @@ @@ -57262,7 +56312,7 @@ index 762a9ec..2023284 100644 ret = 0; } else { /* If we're in any other state, there must have been an I/O -@@ -215,11 +215,11 @@ int fscache_submit_op(struct fscache_object *object, +@@ -212,11 +212,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); @@ -57276,22 +56326,20 @@ index 762a9ec..2023284 100644 fscache_start_operations(object); } else { ASSERTCMP(object->n_exclusive, ==, 0); -@@ -231,12 +231,12 @@ int fscache_submit_op(struct fscache_object *object, +@@ -228,10 +228,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); - fscache_stat(&fscache_n_op_pend); + fscache_stat_unchecked(&fscache_n_op_pend); ret = 0; - } else if (object->state == FSCACHE_OBJECT_DYING || - object->state == FSCACHE_OBJECT_LC_DYING || - object->state == FSCACHE_OBJECT_WITHDRAWING) { + } else if (fscache_object_is_dying(object)) { - fscache_stat(&fscache_n_op_rejected); + fscache_stat_unchecked(&fscache_n_op_rejected); op->state = FSCACHE_OP_ST_CANCELLED; ret = -ENOBUFS; } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) { -@@ -315,7 +315,7 @@ int fscache_cancel_op(struct fscache_operation *op, +@@ -310,7 +310,7 @@ int fscache_cancel_op(struct fscache_operation *op, ret = -EBUSY; if (op->state == FSCACHE_OP_ST_PENDING) { ASSERT(!list_empty(&op->pend_link)); @@ -57300,7 +56348,7 @@ index 762a9ec..2023284 100644 list_del_init(&op->pend_link); if (do_cancel) do_cancel(op); -@@ -347,7 +347,7 @@ void fscache_cancel_all_ops(struct fscache_object *object) +@@ -342,7 +342,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); @@ -57309,7 +56357,7 @@ index 762a9ec..2023284 100644 list_del_init(&op->pend_link); ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING); -@@ -419,7 +419,7 @@ void fscache_put_operation(struct fscache_operation *op) +@@ -414,7 +414,7 @@ void fscache_put_operation(struct fscache_operation *op) op->state, ==, FSCACHE_OP_ST_CANCELLED); op->state = FSCACHE_OP_ST_DEAD; @@ -57318,7 +56366,7 @@ index 762a9ec..2023284 100644 if (op->release) { op->release(op); -@@ -442,7 +442,7 @@ void fscache_put_operation(struct fscache_operation *op) +@@ -433,7 +433,7 @@ void fscache_put_operation(struct fscache_operation *op) * lock, and defer it otherwise */ if (!spin_trylock(&object->lock)) { _debug("defer put"); @@ -57327,7 +56375,7 @@ index 762a9ec..2023284 100644 cache = object->cache; spin_lock(&cache->op_gc_list_lock); -@@ -495,7 +495,7 @@ void fscache_operation_gc(struct work_struct *work) +@@ -486,7 +486,7 @@ void fscache_operation_gc(struct work_struct *work) _debug("GC DEFERRED REL OBJ%x OP%x", object->debug_id, op->debug_id); @@ -57337,7 +56385,7 @@ index 762a9ec..2023284 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 ff000e5..c44ec6d 100644 +index d479ab3..727a7f2 100644 --- a/fs/fscache/page.c +++ b/fs/fscache/page.c @@ -61,7 +61,7 @@ try_again: @@ -57367,7 +56415,7 @@ index ff000e5..c44ec6d 100644 @@ -110,11 +110,11 @@ page_busy: * sleeping on memory allocation, so we may need to impose a timeout * too. */ - if (!(gfp & __GFP_WAIT)) { + if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) { - fscache_stat(&fscache_n_store_vmscan_busy); + fscache_stat_unchecked(&fscache_n_store_vmscan_busy); return false; @@ -57394,9 +56442,9 @@ index ff000e5..c44ec6d 100644 - fscache_stat(&fscache_n_attr_changed_calls); + fscache_stat_unchecked(&fscache_n_attr_changed_calls); - if (fscache_object_is_active(object)) { - fscache_stat(&fscache_n_cop_attr_changed); -@@ -187,11 +187,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie) + if (fscache_object_is_active(object) && + fscache_use_cookie(object)) { +@@ -189,11 +189,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie) ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX); @@ -57410,7 +56458,7 @@ index ff000e5..c44ec6d 100644 _leave(" = -ENOMEM"); return -ENOMEM; } -@@ -209,7 +209,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie) +@@ -211,7 +211,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie) if (fscache_submit_exclusive_op(object, op) < 0) goto nobufs; spin_unlock(&cookie->lock); @@ -57419,7 +56467,7 @@ index ff000e5..c44ec6d 100644 fscache_put_operation(op); _leave(" = 0"); return 0; -@@ -217,7 +217,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie) +@@ -219,7 +219,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie) nobufs: spin_unlock(&cookie->lock); kfree(op); @@ -57428,7 +56476,7 @@ index ff000e5..c44ec6d 100644 _leave(" = %d", -ENOBUFS); return -ENOBUFS; } -@@ -255,7 +255,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval( +@@ -258,7 +258,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) { @@ -57437,7 +56485,7 @@ index ff000e5..c44ec6d 100644 return NULL; } -@@ -283,13 +283,13 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie) +@@ -289,13 +289,13 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie) return 0; } @@ -57453,7 +56501,7 @@ index ff000e5..c44ec6d 100644 _leave(" = -ERESTARTSYS"); return -ERESTARTSYS; } -@@ -318,8 +318,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op) +@@ -324,8 +324,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op) */ static int fscache_wait_for_retrieval_activation(struct fscache_object *object, struct fscache_retrieval *op, @@ -57464,7 +56512,7 @@ index ff000e5..c44ec6d 100644 { int ret; -@@ -327,7 +327,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object, +@@ -333,7 +333,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object, goto check_if_dead; _debug(">>> WT"); @@ -57473,7 +56521,7 @@ index ff000e5..c44ec6d 100644 if (wait_on_bit(&op->op.flags, FSCACHE_OP_WAITING, fscache_wait_bit_interruptible, TASK_INTERRUPTIBLE) != 0) { -@@ -344,14 +344,14 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object, +@@ -350,14 +350,14 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object, check_if_dead: if (op->op.state == FSCACHE_OP_ST_CANCELLED) { @@ -57490,7 +56538,7 @@ index ff000e5..c44ec6d 100644 return -ENOBUFS; } return 0; -@@ -378,7 +378,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie, +@@ -384,7 +384,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie, _enter("%p,%p,,,", cookie, page); @@ -57499,7 +56547,7 @@ index ff000e5..c44ec6d 100644 if (hlist_empty(&cookie->backing_objects)) goto nobufs; -@@ -417,7 +417,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie, +@@ -424,7 +424,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie, goto nobufs_unlock_dec; spin_unlock(&cookie->lock); @@ -57508,7 +56556,7 @@ index ff000e5..c44ec6d 100644 /* pin the netfs read context in case we need to do the actual netfs * read because we've encountered a cache read failure */ -@@ -447,15 +447,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie, +@@ -454,15 +454,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie, error: if (ret == -ENOMEM) @@ -57529,8 +56577,8 @@ index ff000e5..c44ec6d 100644 fscache_put_retrieval(op); _leave(" = %d", ret); -@@ -467,7 +467,7 @@ nobufs_unlock: - spin_unlock(&cookie->lock); +@@ -475,7 +475,7 @@ nobufs_unlock: + atomic_dec(&cookie->n_active); kfree(op); nobufs: - fscache_stat(&fscache_n_retrievals_nobufs); @@ -57538,7 +56586,7 @@ index ff000e5..c44ec6d 100644 _leave(" = -ENOBUFS"); return -ENOBUFS; } -@@ -505,7 +505,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie, +@@ -513,7 +513,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie, _enter("%p,,%d,,,", cookie, *nr_pages); @@ -57547,7 +56595,7 @@ index ff000e5..c44ec6d 100644 if (hlist_empty(&cookie->backing_objects)) goto nobufs; -@@ -541,7 +541,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie, +@@ -549,7 +549,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie, goto nobufs_unlock_dec; spin_unlock(&cookie->lock); @@ -57556,7 +56604,7 @@ index ff000e5..c44ec6d 100644 /* pin the netfs read context in case we need to do the actual netfs * read because we've encountered a cache read failure */ -@@ -571,15 +571,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie, +@@ -579,15 +579,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie, error: if (ret == -ENOMEM) @@ -57577,8 +56625,8 @@ index ff000e5..c44ec6d 100644 fscache_put_retrieval(op); _leave(" = %d", ret); -@@ -591,7 +591,7 @@ nobufs_unlock: - spin_unlock(&cookie->lock); +@@ -600,7 +600,7 @@ nobufs_unlock: + atomic_dec(&cookie->n_active); kfree(op); nobufs: - fscache_stat(&fscache_n_retrievals_nobufs); @@ -57586,7 +56634,7 @@ index ff000e5..c44ec6d 100644 _leave(" = -ENOBUFS"); return -ENOBUFS; } -@@ -615,7 +615,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie, +@@ -624,7 +624,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie, _enter("%p,%p,,,", cookie, page); @@ -57595,7 +56643,7 @@ index ff000e5..c44ec6d 100644 if (hlist_empty(&cookie->backing_objects)) goto nobufs; -@@ -647,7 +647,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie, +@@ -656,7 +656,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie, goto nobufs_unlock; spin_unlock(&cookie->lock); @@ -57604,7 +56652,7 @@ index ff000e5..c44ec6d 100644 ret = fscache_wait_for_retrieval_activation( object, op, -@@ -663,11 +663,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie, +@@ -672,11 +672,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie, error: if (ret == -ERESTARTSYS) @@ -57619,8 +56667,8 @@ index ff000e5..c44ec6d 100644 fscache_put_retrieval(op); _leave(" = %d", ret); -@@ -677,7 +677,7 @@ nobufs_unlock: - spin_unlock(&cookie->lock); +@@ -687,7 +687,7 @@ nobufs_unlock: + atomic_dec(&cookie->n_active); kfree(op); nobufs: - fscache_stat(&fscache_n_allocs_nobufs); @@ -57628,7 +56676,7 @@ index ff000e5..c44ec6d 100644 _leave(" = -ENOBUFS"); return -ENOBUFS; } -@@ -736,7 +736,7 @@ static void fscache_write_op(struct fscache_operation *_op) +@@ -747,7 +747,7 @@ static void fscache_write_op(struct fscache_operation *_op) spin_lock(&cookie->stores_lock); @@ -57637,7 +56685,7 @@ index ff000e5..c44ec6d 100644 /* find a page to store */ page = NULL; -@@ -747,7 +747,7 @@ static void fscache_write_op(struct fscache_operation *_op) +@@ -758,7 +758,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) { @@ -57646,7 +56694,7 @@ index ff000e5..c44ec6d 100644 goto superseded; } -@@ -759,7 +759,7 @@ static void fscache_write_op(struct fscache_operation *_op) +@@ -770,7 +770,7 @@ static void fscache_write_op(struct fscache_operation *_op) spin_unlock(&cookie->stores_lock); spin_unlock(&object->lock); @@ -57655,7 +56703,7 @@ index ff000e5..c44ec6d 100644 fscache_stat(&fscache_n_cop_write_page); ret = object->cache->ops->write_page(op, page); fscache_stat_d(&fscache_n_cop_write_page); -@@ -860,7 +860,7 @@ int __fscache_write_page(struct fscache_cookie *cookie, +@@ -873,7 +873,7 @@ int __fscache_write_page(struct fscache_cookie *cookie, ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX); ASSERT(PageFsCache(page)); @@ -57664,7 +56712,7 @@ index ff000e5..c44ec6d 100644 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) { _leave(" = -ENOBUFS [invalidating]"); -@@ -916,7 +916,7 @@ int __fscache_write_page(struct fscache_cookie *cookie, +@@ -931,7 +931,7 @@ int __fscache_write_page(struct fscache_cookie *cookie, spin_unlock(&cookie->stores_lock); spin_unlock(&object->lock); @@ -57672,8 +56720,8 @@ index ff000e5..c44ec6d 100644 + op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id); op->store_limit = object->store_limit; - if (fscache_submit_op(object, &op->op) < 0) -@@ -924,8 +924,8 @@ int __fscache_write_page(struct fscache_cookie *cookie, + atomic_inc(&cookie->n_active); +@@ -940,8 +940,8 @@ int __fscache_write_page(struct fscache_cookie *cookie, spin_unlock(&cookie->lock); radix_tree_preload_end(); @@ -57684,7 +56732,7 @@ index ff000e5..c44ec6d 100644 /* the work queue now carries its own ref on the object */ fscache_put_operation(&op->op); -@@ -933,14 +933,14 @@ int __fscache_write_page(struct fscache_cookie *cookie, +@@ -949,14 +949,14 @@ int __fscache_write_page(struct fscache_cookie *cookie, return 0; already_queued: @@ -57701,7 +56749,7 @@ index ff000e5..c44ec6d 100644 _leave(" = 0"); return 0; -@@ -959,14 +959,14 @@ nobufs: +@@ -976,14 +976,14 @@ nobufs: spin_unlock(&cookie->lock); radix_tree_preload_end(); kfree(op); @@ -57718,7 +56766,7 @@ index ff000e5..c44ec6d 100644 _leave(" = -ENOMEM"); return -ENOMEM; } -@@ -984,7 +984,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page) +@@ -1001,7 +1001,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page) ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX); ASSERTCMP(page, !=, NULL); @@ -57727,7 +56775,7 @@ index ff000e5..c44ec6d 100644 /* cache withdrawal may beat us to it */ if (!PageFsCache(page)) -@@ -1035,7 +1035,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page) +@@ -1052,7 +1052,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 @@ -58162,10 +57210,10 @@ index 1d55f94..088da65 100644 } diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c -index 5b12746..b481b03 100644 +index 72a5d5b..c991011 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c -@@ -1437,7 +1437,7 @@ static char *read_link(struct dentry *dentry) +@@ -1433,7 +1433,7 @@ static char *read_link(struct dentry *dentry) return link; } @@ -58175,10 +57223,10 @@ index 5b12746..b481b03 100644 if (!IS_ERR(link)) free_page((unsigned long) link); diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c -index 62b484e..0f9a140 100644 +index 64915ee..6bed500 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c -@@ -1441,7 +1441,7 @@ out: +@@ -1506,7 +1506,7 @@ out: static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p) { @@ -58188,7 +57236,7 @@ index 62b484e..0f9a140 100644 kfree(s); } diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c -index a3f868a..bb308ae 100644 +index d19b30a..ef89c36 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, @@ -58228,7 +57276,7 @@ index a3f868a..bb308ae 100644 info.high_limit = TASK_SIZE; info.align_mask = PAGE_MASK & ~huge_page_mask(h); info.align_offset = 0; -@@ -898,7 +908,7 @@ static struct file_system_type hugetlbfs_fs_type = { +@@ -908,7 +918,7 @@ static struct file_system_type hugetlbfs_fs_type = { }; MODULE_ALIAS_FS("hugetlbfs"); @@ -58238,10 +57286,10 @@ index a3f868a..bb308ae 100644 static int can_do_hugetlb_shm(void) { diff --git a/fs/inode.c b/fs/inode.c -index 00d5fc3..98ce7d7 100644 +index d6dfb09..602e77e 100644 --- a/fs/inode.c +++ b/fs/inode.c -@@ -878,8 +878,8 @@ unsigned int get_next_ino(void) +@@ -880,8 +880,8 @@ unsigned int get_next_ino(void) #ifdef CONFIG_SMP if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) { @@ -58281,10 +57329,10 @@ index a6597d6..41b30ec 100644 /* diff --git a/fs/jfs/super.c b/fs/jfs/super.c -index 788e0a9..8433098 100644 +index 6669aa2..36b033d 100644 --- a/fs/jfs/super.c +++ b/fs/jfs/super.c -@@ -878,7 +878,7 @@ static int __init init_jfs_fs(void) +@@ -882,7 +882,7 @@ static int __init init_jfs_fs(void) jfs_inode_cachep = kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0, @@ -58294,33 +57342,33 @@ index 788e0a9..8433098 100644 if (jfs_inode_cachep == NULL) return -ENOMEM; diff --git a/fs/libfs.c b/fs/libfs.c -index 916da8c..1588998 100644 +index 3a3a9b5..3a9b074 100644 --- a/fs/libfs.c +++ b/fs/libfs.c -@@ -165,6 +165,9 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir) - - for (p=q->next; p != &dentry->d_subdirs; p=p->next) { - struct dentry *next; -+ char d_name[sizeof(next->d_iname)]; -+ const unsigned char *name; -+ - next = list_entry(p, struct dentry, d_u.d_child); - spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED); - if (!simple_positive(next)) { -@@ -174,7 +177,12 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir) - - spin_unlock(&next->d_lock); - spin_unlock(&dentry->d_lock); -- if (filldir(dirent, next->d_name.name, -+ name = next->d_name.name; -+ if (name == next->d_iname) { -+ memcpy(d_name, name, next->d_name.len); -+ name = d_name; -+ } -+ if (filldir(dirent, name, - next->d_name.len, filp->f_pos, - next->d_inode->i_ino, - dt_type(next->d_inode)) < 0) +@@ -150,6 +150,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); ++ 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); +@@ -158,7 +161,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx) + + spin_unlock(&next->d_lock); + spin_unlock(&dentry->d_lock); +- if (!dir_emit(ctx, next->d_name.name, next->d_name.len, ++ name = next->d_name.name; ++ if (name == next->d_iname) { ++ memcpy(d_name, name, next->d_name.len); ++ name = d_name; ++ } ++ if (!dir_emit(ctx, name, next->d_name.len, + next->d_inode->i_ino, dt_type(next->d_inode))) + return 0; + spin_lock(&dentry->d_lock); diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c index acd3947..1f896e2 100644 --- a/fs/lockd/clntproc.c @@ -58339,24 +57387,11 @@ index acd3947..1f896e2 100644 memcpy(c->data, &cookie, 4); c->len=4; -diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c -index a2aa97d..10d6c41 100644 ---- a/fs/lockd/svc.c -+++ b/fs/lockd/svc.c -@@ -305,7 +305,7 @@ static int lockd_start_svc(struct svc_serv *serv) - svc_sock_update_bufs(serv); - serv->sv_maxconn = nlm_max_connections; - -- nlmsvc_task = kthread_run(lockd, nlmsvc_rqst, serv->sv_name); -+ nlmsvc_task = kthread_run(lockd, nlmsvc_rqst, "%s", serv->sv_name); - if (IS_ERR(nlmsvc_task)) { - error = PTR_ERR(nlmsvc_task); - printk(KERN_WARNING diff --git a/fs/locks.c b/fs/locks.c -index cb424a4..850e4dd 100644 +index b27a300..4156d0b 100644 --- a/fs/locks.c +++ b/fs/locks.c -@@ -2064,16 +2064,16 @@ void locks_remove_flock(struct file *filp) +@@ -2183,16 +2183,16 @@ void locks_remove_flock(struct file *filp) return; if (filp->f_op && filp->f_op->flock) { @@ -58376,9 +57411,9 @@ index cb424a4..850e4dd 100644 + flock.fl_ops->fl_release_private(&flock); } - lock_flocks(); + spin_lock(&inode->i_lock); diff --git a/fs/namei.c b/fs/namei.c -index 9ed9361..2b72db1 100644 +index 7720fbd..7934bb2 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -319,16 +319,32 @@ int generic_permission(struct inode *inode, int mask) @@ -58472,7 +57507,7 @@ index 9ed9361..2b72db1 100644 hash = a = 0; len = -sizeof(unsigned long); -@@ -1968,6 +1984,8 @@ static int path_lookupat(int dfd, const char *name, +@@ -1967,6 +1983,8 @@ static int path_lookupat(int dfd, const char *name, if (err) break; err = lookup_last(nd, &path); @@ -58481,7 +57516,7 @@ index 9ed9361..2b72db1 100644 put_link(nd, &link, cookie); } } -@@ -1975,6 +1993,13 @@ static int path_lookupat(int dfd, const char *name, +@@ -1974,6 +1992,13 @@ static int path_lookupat(int dfd, const char *name, if (!err) err = complete_walk(nd); @@ -58495,7 +57530,7 @@ index 9ed9361..2b72db1 100644 if (!err && nd->flags & LOOKUP_DIRECTORY) { if (!can_lookup(nd->inode)) { path_put(&nd->path); -@@ -2002,8 +2027,15 @@ static int filename_lookup(int dfd, struct filename *name, +@@ -2001,8 +2026,15 @@ static int filename_lookup(int dfd, struct filename *name, retval = path_lookupat(dfd, name->name, flags | LOOKUP_REVAL, nd); @@ -58512,7 +57547,7 @@ index 9ed9361..2b72db1 100644 return retval; } -@@ -2381,6 +2413,13 @@ static int may_open(struct path *path, int acc_mode, int flag) +@@ -2380,6 +2412,13 @@ static int may_open(struct path *path, int acc_mode, int flag) if (flag & O_NOATIME && !inode_owner_or_capable(inode)) return -EPERM; @@ -58526,7 +57561,7 @@ index 9ed9361..2b72db1 100644 return 0; } -@@ -2602,7 +2641,7 @@ looked_up: +@@ -2601,7 +2640,7 @@ looked_up: * cleared otherwise prior to returning. */ static int lookup_open(struct nameidata *nd, struct path *path, @@ -58535,7 +57570,7 @@ index 9ed9361..2b72db1 100644 const struct open_flags *op, bool got_write, int *opened) { -@@ -2637,6 +2676,17 @@ static int lookup_open(struct nameidata *nd, struct path *path, +@@ -2636,6 +2675,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; @@ -58553,7 +57588,7 @@ index 9ed9361..2b72db1 100644 if (!IS_POSIXACL(dir->d_inode)) mode &= ~current_umask(); /* -@@ -2658,6 +2708,8 @@ static int lookup_open(struct nameidata *nd, struct path *path, +@@ -2657,6 +2707,8 @@ static int lookup_open(struct nameidata *nd, struct path *path, nd->flags & LOOKUP_EXCL); if (error) goto out_dput; @@ -58562,7 +57597,7 @@ index 9ed9361..2b72db1 100644 } out_no_open: path->dentry = dentry; -@@ -2672,7 +2724,7 @@ out_dput: +@@ -2671,7 +2723,7 @@ out_dput: /* * Handle the last step of open() */ @@ -58571,28 +57606,10 @@ index 9ed9361..2b72db1 100644 struct file *file, const struct open_flags *op, int *opened, struct filename *name) { -@@ -2701,16 +2753,32 @@ static int do_last(struct nameidata *nd, struct path *path, - error = complete_walk(nd); - if (error) - return error; -+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) { -+ error = -ENOENT; -+ goto out; -+ } - audit_inode(name, nd->path.dentry, 0); - if (open_flag & O_CREAT) { - error = -EISDIR; - goto out; - } -+ if (link && gr_handle_symlink_owner(link, nd->inode)) { -+ error = -EACCES; -+ goto out; -+ } - goto finish_open; - case LAST_BIND: - error = complete_walk(nd); +@@ -2721,6 +2773,15 @@ static int do_last(struct nameidata *nd, struct path *path, if (error) return error; + + if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) { + error = -ENOENT; + goto out; @@ -58601,10 +57618,11 @@ index 9ed9361..2b72db1 100644 + error = -EACCES; + goto out; + } - audit_inode(name, dir, 0); - goto finish_open; - } -@@ -2759,7 +2827,7 @@ retry_lookup: ++ + audit_inode(name, dir, LOOKUP_PARENT); + error = -EISDIR; + /* trailing slashes? */ +@@ -2740,7 +2801,7 @@ retry_lookup: */ } mutex_lock(&dir->d_inode->i_mutex); @@ -58613,7 +57631,7 @@ index 9ed9361..2b72db1 100644 mutex_unlock(&dir->d_inode->i_mutex); if (error <= 0) { -@@ -2783,11 +2851,28 @@ retry_lookup: +@@ -2764,11 +2825,28 @@ retry_lookup: goto finish_open_created; } @@ -58643,7 +57661,7 @@ index 9ed9361..2b72db1 100644 /* * If atomic_open() acquired write access it is dropped now due to -@@ -2828,6 +2913,11 @@ finish_lookup: +@@ -2809,6 +2887,11 @@ finish_lookup: } } BUG_ON(inode != path->dentry->d_inode); @@ -58655,7 +57673,7 @@ index 9ed9361..2b72db1 100644 return 1; } -@@ -2837,7 +2927,6 @@ finish_lookup: +@@ -2818,7 +2901,6 @@ finish_lookup: save_parent.dentry = nd->path.dentry; save_parent.mnt = mntget(path->mnt); nd->path.dentry = path->dentry; @@ -58663,7 +57681,7 @@ index 9ed9361..2b72db1 100644 } nd->inode = inode; /* Why this, you ask? _Now_ we might have grown LOOKUP_JUMPED... */ -@@ -2846,6 +2935,16 @@ finish_lookup: +@@ -2828,7 +2910,18 @@ finish_open: path_put(&save_parent); return error; } @@ -58677,10 +57695,12 @@ index 9ed9361..2b72db1 100644 + goto out; + } + + audit_inode(name, nd->path.dentry, 0); ++ error = -EISDIR; if ((open_flag & O_CREAT) && S_ISDIR(nd->inode->i_mode)) goto out; -@@ -2944,7 +3043,7 @@ static struct file *path_openat(int dfd, struct filename *pathname, +@@ -2991,7 +3084,7 @@ static struct file *path_openat(int dfd, struct filename *pathname, if (unlikely(error)) goto out; @@ -58689,7 +57709,7 @@ index 9ed9361..2b72db1 100644 while (unlikely(error > 0)) { /* trailing symlink */ struct path link = path; void *cookie; -@@ -2962,7 +3061,7 @@ static struct file *path_openat(int dfd, struct filename *pathname, +@@ -3009,7 +3102,7 @@ static struct file *path_openat(int dfd, struct filename *pathname, error = follow_link(&link, nd, &cookie); if (unlikely(error)) break; @@ -58698,7 +57718,7 @@ index 9ed9361..2b72db1 100644 put_link(nd, &link, cookie); } out: -@@ -3062,8 +3161,12 @@ struct dentry *kern_path_create(int dfd, const char *pathname, +@@ -3109,8 +3202,12 @@ struct dentry *kern_path_create(int dfd, const char *pathname, goto unlock; error = -EEXIST; @@ -58712,7 +57732,7 @@ index 9ed9361..2b72db1 100644 /* * Special case - lookup gave negative, but... we had foo/bar/ * From the vfs_mknod() POV we just have a negative dentry - -@@ -3115,6 +3218,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname, +@@ -3162,6 +3259,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname, } EXPORT_SYMBOL(user_path_create); @@ -58733,7 +57753,7 @@ index 9ed9361..2b72db1 100644 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev) { int error = may_create(dir, dentry); -@@ -3177,6 +3294,17 @@ retry: +@@ -3224,6 +3335,17 @@ retry: if (!IS_POSIXACL(path.dentry->d_inode)) mode &= ~current_umask(); @@ -58751,7 +57771,7 @@ index 9ed9361..2b72db1 100644 error = security_path_mknod(&path, dentry, mode, dev); if (error) goto out; -@@ -3193,6 +3321,8 @@ retry: +@@ -3240,6 +3362,8 @@ retry: break; } out: @@ -58760,7 +57780,7 @@ index 9ed9361..2b72db1 100644 done_path_create(&path, dentry); if (retry_estale(error, lookup_flags)) { lookup_flags |= LOOKUP_REVAL; -@@ -3245,9 +3375,16 @@ retry: +@@ -3292,9 +3416,16 @@ retry: if (!IS_POSIXACL(path.dentry->d_inode)) mode &= ~current_umask(); @@ -58777,7 +57797,7 @@ index 9ed9361..2b72db1 100644 done_path_create(&path, dentry); if (retry_estale(error, lookup_flags)) { lookup_flags |= LOOKUP_REVAL; -@@ -3328,6 +3465,8 @@ static long do_rmdir(int dfd, const char __user *pathname) +@@ -3375,6 +3506,8 @@ static long do_rmdir(int dfd, const char __user *pathname) struct filename *name; struct dentry *dentry; struct nameidata nd; @@ -58786,7 +57806,7 @@ index 9ed9361..2b72db1 100644 unsigned int lookup_flags = 0; retry: name = user_path_parent(dfd, pathname, &nd, lookup_flags); -@@ -3360,10 +3499,21 @@ retry: +@@ -3407,10 +3540,21 @@ retry: error = -ENOENT; goto exit3; } @@ -58808,7 +57828,7 @@ index 9ed9361..2b72db1 100644 exit3: dput(dentry); exit2: -@@ -3429,6 +3579,8 @@ static long do_unlinkat(int dfd, const char __user *pathname) +@@ -3476,6 +3620,8 @@ static long do_unlinkat(int dfd, const char __user *pathname) struct dentry *dentry; struct nameidata nd; struct inode *inode = NULL; @@ -58817,7 +57837,7 @@ index 9ed9361..2b72db1 100644 unsigned int lookup_flags = 0; retry: name = user_path_parent(dfd, pathname, &nd, lookup_flags); -@@ -3455,10 +3607,22 @@ retry: +@@ -3502,10 +3648,22 @@ retry: if (!inode) goto slashes; ihold(inode); @@ -58840,7 +57860,7 @@ index 9ed9361..2b72db1 100644 exit2: dput(dentry); } -@@ -3536,9 +3700,17 @@ retry: +@@ -3583,9 +3741,17 @@ retry: if (IS_ERR(dentry)) goto out_putname; @@ -58858,7 +57878,7 @@ index 9ed9361..2b72db1 100644 done_path_create(&path, dentry); if (retry_estale(error, lookup_flags)) { lookup_flags |= LOOKUP_REVAL; -@@ -3612,6 +3784,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname, +@@ -3665,6 +3831,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname, { struct dentry *new_dentry; struct path old_path, new_path; @@ -58866,7 +57886,7 @@ index 9ed9361..2b72db1 100644 int how = 0; int error; -@@ -3635,7 +3808,7 @@ retry: +@@ -3688,7 +3855,7 @@ retry: if (error) return error; @@ -58875,7 +57895,7 @@ index 9ed9361..2b72db1 100644 (how & LOOKUP_REVAL)); error = PTR_ERR(new_dentry); if (IS_ERR(new_dentry)) -@@ -3647,11 +3820,28 @@ retry: +@@ -3700,11 +3867,28 @@ retry: error = may_linkat(&old_path); if (unlikely(error)) goto out_dput; @@ -58904,7 +57924,7 @@ index 9ed9361..2b72db1 100644 done_path_create(&new_path, new_dentry); if (retry_estale(error, how)) { how |= LOOKUP_REVAL; -@@ -3897,12 +4087,21 @@ retry: +@@ -3950,12 +4134,21 @@ retry: if (new_dentry == trap) goto exit5; @@ -58926,7 +57946,7 @@ index 9ed9361..2b72db1 100644 exit5: dput(new_dentry); exit4: -@@ -3934,6 +4133,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna +@@ -3987,6 +4180,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link) { @@ -58935,7 +57955,7 @@ index 9ed9361..2b72db1 100644 int len; len = PTR_ERR(link); -@@ -3943,7 +4144,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c +@@ -3996,7 +4191,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c len = strlen(link); if (len > (unsigned) buflen) len = buflen; @@ -58952,7 +57972,7 @@ index 9ed9361..2b72db1 100644 out: return len; diff --git a/fs/namespace.c b/fs/namespace.c -index a45ba4f..44cfe66 100644 +index a45ba4f..b4c7d07 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1265,6 +1265,9 @@ static int do_umount(struct mount *mnt, int flags) @@ -59038,6 +58058,15 @@ index a45ba4f..44cfe66 100644 atomic_set(&new_ns->count, 1); new_ns->root = NULL; INIT_LIST_HEAD(&new_ns->list); +@@ -2373,7 +2392,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns) + * Allocate a new namespace structure and populate it with contents + * copied from the namespace of the passed in task structure. + */ +-static struct mnt_namespace *dup_mnt_ns(struct mnt_namespace *mnt_ns, ++static __latent_entropy struct mnt_namespace *dup_mnt_ns(struct mnt_namespace *mnt_ns, + struct user_namespace *user_ns, struct fs_struct *fs) + { + struct mnt_namespace *new_ns; @@ -2500,8 +2519,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name) } EXPORT_SYMBOL(mount_subtree); @@ -59070,32 +58099,8 @@ index a45ba4f..44cfe66 100644 return -EINVAL; get_mnt_ns(mnt_ns); -diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c -index cff089a..4c3d57a 100644 ---- a/fs/nfs/callback.c -+++ b/fs/nfs/callback.c -@@ -211,7 +211,6 @@ static int nfs_callback_start_svc(int minorversion, struct rpc_xprt *xprt, - struct svc_rqst *rqstp; - int (*callback_svc)(void *vrqstp); - struct nfs_callback_data *cb_info = &nfs_callback_info[minorversion]; -- char svc_name[12]; - int ret; - - nfs_callback_bc_serv(minorversion, xprt, serv); -@@ -235,10 +234,9 @@ static int nfs_callback_start_svc(int minorversion, struct rpc_xprt *xprt, - - svc_sock_update_bufs(serv); - -- sprintf(svc_name, "nfsv4.%u-svc", minorversion); - cb_info->serv = serv; - cb_info->rqst = rqstp; -- cb_info->task = kthread_run(callback_svc, cb_info->rqst, svc_name); -+ cb_info->task = kthread_run(callback_svc, cb_info->rqst, "nfsv4.%u-svc", minorversion); - if (IS_ERR(cb_info->task)) { - ret = PTR_ERR(cb_info->task); - svc_exit_thread(cb_info->rqst); diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c -index a35582c..ebbdcd5 100644 +index f4ccfe6..a5cf064 100644 --- a/fs/nfs/callback_xdr.c +++ b/fs/nfs/callback_xdr.c @@ -51,7 +51,7 @@ struct callback_op { @@ -59108,10 +58113,10 @@ index a35582c..ebbdcd5 100644 static struct callback_op callback_ops[]; diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c -index c1c7a9d..7afa0b8 100644 +index 941246f..17d8724 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c -@@ -1043,16 +1043,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt +@@ -1138,16 +1138,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); } @@ -59131,24 +58136,11 @@ index c1c7a9d..7afa0b8 100644 } void nfs_fattr_init(struct nfs_fattr *fattr) -diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c -index 2c37442..9b9538b 100644 ---- a/fs/nfs/nfs4state.c -+++ b/fs/nfs/nfs4state.c -@@ -1193,7 +1193,7 @@ void nfs4_schedule_state_manager(struct nfs_client *clp) - snprintf(buf, sizeof(buf), "%s-manager", - rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_ADDR)); - rcu_read_unlock(); -- task = kthread_run(nfs4_run_state_manager, clp, buf); -+ task = kthread_run(nfs4_run_state_manager, clp, "%s", buf); - if (IS_ERR(task)) { - printk(KERN_ERR "%s: kthread_run: %ld\n", - __func__, PTR_ERR(task)); diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c -index 27d74a2..c4c2a73 100644 +index 419572f..5414a23 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c -@@ -1126,7 +1126,7 @@ struct nfsd4_operation { +@@ -1168,7 +1168,7 @@ struct nfsd4_operation { nfsd4op_rsize op_rsize_bop; stateid_getter op_get_currentstateid; stateid_setter op_set_currentstateid; @@ -59158,10 +58150,10 @@ index 27d74a2..c4c2a73 100644 static struct nfsd4_operation nfsd4_ops[]; diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c -index 582321a..0224663 100644 +index c2a4701..fd80e29 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c -@@ -1458,7 +1458,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p) +@@ -1498,7 +1498,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p) typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *); @@ -59170,7 +58162,7 @@ index 582321a..0224663 100644 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access, [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close, [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit, -@@ -1498,7 +1498,7 @@ static nfsd4_dec nfsd4_dec_ops[] = { +@@ -1538,7 +1538,7 @@ static nfsd4_dec nfsd4_dec_ops[] = { [OP_RELEASE_LOCKOWNER] = (nfsd4_dec)nfsd4_decode_release_lockowner, }; @@ -59179,7 +58171,7 @@ index 582321a..0224663 100644 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access, [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close, [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit, -@@ -1560,7 +1560,7 @@ static nfsd4_dec nfsd41_dec_ops[] = { +@@ -1600,7 +1600,7 @@ static nfsd4_dec nfsd41_dec_ops[] = { }; struct nfsd4_minorversion_ops { @@ -59214,10 +58206,10 @@ index e76244e..9fe8f2f1 100644 /* Don't cache excessive amounts of data and XDR failures */ if (!statp || len > (256 >> 2)) { diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c -index baf149a..76b86ad 100644 +index c827acb..b253b77 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c -@@ -940,7 +940,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, +@@ -968,7 +968,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, } else { oldfs = get_fs(); set_fs(KERNEL_DS); @@ -59226,7 +58218,7 @@ index baf149a..76b86ad 100644 set_fs(oldfs); } -@@ -1027,7 +1027,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, +@@ -1055,7 +1055,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); @@ -59235,7 +58227,7 @@ index baf149a..76b86ad 100644 set_fs(oldfs); if (host_err < 0) goto out_nfserr; -@@ -1573,7 +1573,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp) +@@ -1601,7 +1601,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp) */ oldfs = get_fs(); set_fs(KERNEL_DS); @@ -59328,7 +58320,7 @@ index e7bc1d7..06bd4bb 100644 } diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c -index 77cc85d..a1e6299 100644 +index e44cb64..4807084 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -253,8 +253,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group, @@ -59365,10 +58357,10 @@ index 7b51b05..5ea5ef6 100644 EXPORT_SYMBOL_GPL(fsnotify_get_cookie); diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c -index aa411c3..c260a84 100644 +index 9e38daf..5727cae 100644 --- a/fs/ntfs/dir.c +++ b/fs/ntfs/dir.c -@@ -1329,7 +1329,7 @@ find_next_index_buffer: +@@ -1310,7 +1310,7 @@ find_next_index_buffer: ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK & ~(s64)(ndir->itype.index.block_size - 1))); /* Bounds checks. */ @@ -59430,50 +58422,6 @@ index 82650d5..db37dcf 100644 /* We failed. Cleanup and return. */ if (bh_primary) brelse(bh_primary); -diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c -index 20dfec7..e238cb7 100644 ---- a/fs/ocfs2/aops.c -+++ b/fs/ocfs2/aops.c -@@ -1756,7 +1756,7 @@ try_again: - goto out; - } else if (ret == 1) { - clusters_need = wc->w_clen; -- ret = ocfs2_refcount_cow(inode, filp, di_bh, -+ ret = ocfs2_refcount_cow(inode, di_bh, - wc->w_cpos, wc->w_clen, UINT_MAX); - if (ret) { - mlog_errno(ret); -diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c -index ff54014..ff125fd 100644 ---- a/fs/ocfs2/file.c -+++ b/fs/ocfs2/file.c -@@ -370,7 +370,7 @@ static int ocfs2_cow_file_pos(struct inode *inode, - if (!(ext_flags & OCFS2_EXT_REFCOUNTED)) - goto out; - -- return ocfs2_refcount_cow(inode, NULL, fe_bh, cpos, 1, cpos+1); -+ return ocfs2_refcount_cow(inode, fe_bh, cpos, 1, cpos+1); - - out: - return status; -@@ -899,7 +899,7 @@ static int ocfs2_zero_extend_get_range(struct inode *inode, - zero_clusters = last_cpos - zero_cpos; - - if (needs_cow) { -- rc = ocfs2_refcount_cow(inode, NULL, di_bh, zero_cpos, -+ rc = ocfs2_refcount_cow(inode, di_bh, zero_cpos, - zero_clusters, UINT_MAX); - if (rc) { - mlog_errno(rc); -@@ -2078,7 +2078,7 @@ static int ocfs2_prepare_inode_for_refcount(struct inode *inode, - - *meta_level = 1; - -- ret = ocfs2_refcount_cow(inode, file, di_bh, cpos, clusters, UINT_MAX); -+ ret = ocfs2_refcount_cow(inode, di_bh, cpos, clusters, UINT_MAX); - if (ret) - mlog_errno(ret); - out: diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c index aebeacd..0dcdd26 100644 --- a/fs/ocfs2/localalloc.c @@ -59487,21 +58435,8 @@ index aebeacd..0dcdd26 100644 bail: if (handle) -diff --git a/fs/ocfs2/move_extents.c b/fs/ocfs2/move_extents.c -index f1fc172..452068b 100644 ---- a/fs/ocfs2/move_extents.c -+++ b/fs/ocfs2/move_extents.c -@@ -69,7 +69,7 @@ static int __ocfs2_move_extent(handle_t *handle, - u64 ino = ocfs2_metadata_cache_owner(context->et.et_ci); - u64 old_blkno = ocfs2_clusters_to_blocks(inode->i_sb, p_cpos); - -- ret = ocfs2_duplicate_clusters_by_page(handle, context->file, cpos, -+ ret = ocfs2_duplicate_clusters_by_page(handle, inode, cpos, - p_cpos, new_p_cpos, len); - if (ret) { - mlog_errno(ret); diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h -index d355e6e..578d905 100644 +index 3a90347..c40bef8 100644 --- a/fs/ocfs2/ocfs2.h +++ b/fs/ocfs2/ocfs2.h @@ -235,11 +235,11 @@ enum ocfs2_vol_state @@ -59521,190 +58456,8 @@ index d355e6e..578d905 100644 }; enum ocfs2_local_alloc_state -diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c -index 998b17e..aefe414 100644 ---- a/fs/ocfs2/refcounttree.c -+++ b/fs/ocfs2/refcounttree.c -@@ -49,7 +49,6 @@ - - struct ocfs2_cow_context { - struct inode *inode; -- struct file *file; - u32 cow_start; - u32 cow_len; - struct ocfs2_extent_tree data_et; -@@ -66,7 +65,7 @@ struct ocfs2_cow_context { - u32 *num_clusters, - unsigned int *extent_flags); - int (*cow_duplicate_clusters)(handle_t *handle, -- struct file *file, -+ struct inode *inode, - u32 cpos, u32 old_cluster, - u32 new_cluster, u32 new_len); - }; -@@ -2922,14 +2921,12 @@ static int ocfs2_clear_cow_buffer(handle_t *handle, struct buffer_head *bh) - } - - int ocfs2_duplicate_clusters_by_page(handle_t *handle, -- struct file *file, -+ struct inode *inode, - u32 cpos, u32 old_cluster, - u32 new_cluster, u32 new_len) - { - int ret = 0, partial; -- struct inode *inode = file_inode(file); -- struct ocfs2_caching_info *ci = INODE_CACHE(inode); -- struct super_block *sb = ocfs2_metadata_cache_get_super(ci); -+ struct super_block *sb = inode->i_sb; - u64 new_block = ocfs2_clusters_to_blocks(sb, new_cluster); - struct page *page; - pgoff_t page_index; -@@ -2973,13 +2970,6 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle, - if (PAGE_CACHE_SIZE <= OCFS2_SB(sb)->s_clustersize) - BUG_ON(PageDirty(page)); - -- if (PageReadahead(page)) { -- page_cache_async_readahead(mapping, -- &file->f_ra, file, -- page, page_index, -- readahead_pages); -- } -- - if (!PageUptodate(page)) { - ret = block_read_full_page(page, ocfs2_get_block); - if (ret) { -@@ -2999,7 +2989,8 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle, - } - } - -- ocfs2_map_and_dirty_page(inode, handle, from, to, -+ ocfs2_map_and_dirty_page(inode, -+ handle, from, to, - page, 0, &new_block); - mark_page_accessed(page); - unlock: -@@ -3015,12 +3006,11 @@ unlock: - } - - int ocfs2_duplicate_clusters_by_jbd(handle_t *handle, -- struct file *file, -+ struct inode *inode, - u32 cpos, u32 old_cluster, - u32 new_cluster, u32 new_len) - { - int ret = 0; -- struct inode *inode = file_inode(file); - struct super_block *sb = inode->i_sb; - struct ocfs2_caching_info *ci = INODE_CACHE(inode); - int i, blocks = ocfs2_clusters_to_blocks(sb, new_len); -@@ -3145,7 +3135,7 @@ static int ocfs2_replace_clusters(handle_t *handle, - - /*If the old clusters is unwritten, no need to duplicate. */ - if (!(ext_flags & OCFS2_EXT_UNWRITTEN)) { -- ret = context->cow_duplicate_clusters(handle, context->file, -+ ret = context->cow_duplicate_clusters(handle, context->inode, - cpos, old, new, len); - if (ret) { - mlog_errno(ret); -@@ -3423,35 +3413,12 @@ static int ocfs2_replace_cow(struct ocfs2_cow_context *context) - return ret; - } - --static void ocfs2_readahead_for_cow(struct inode *inode, -- struct file *file, -- u32 start, u32 len) --{ -- struct address_space *mapping; -- pgoff_t index; -- unsigned long num_pages; -- int cs_bits = OCFS2_SB(inode->i_sb)->s_clustersize_bits; -- -- if (!file) -- return; -- -- mapping = file->f_mapping; -- num_pages = (len << cs_bits) >> PAGE_CACHE_SHIFT; -- if (!num_pages) -- num_pages = 1; -- -- index = ((loff_t)start << cs_bits) >> PAGE_CACHE_SHIFT; -- page_cache_sync_readahead(mapping, &file->f_ra, file, -- index, num_pages); --} -- - /* - * Starting at cpos, try to CoW write_len clusters. Don't CoW - * past max_cpos. This will stop when it runs into a hole or an - * unrefcounted extent. - */ - static int ocfs2_refcount_cow_hunk(struct inode *inode, -- struct file *file, - struct buffer_head *di_bh, - u32 cpos, u32 write_len, u32 max_cpos) - { -@@ -3480,8 +3447,6 @@ static int ocfs2_refcount_cow_hunk(struct inode *inode, - - BUG_ON(cow_len == 0); - -- ocfs2_readahead_for_cow(inode, file, cow_start, cow_len); -- - context = kzalloc(sizeof(struct ocfs2_cow_context), GFP_NOFS); - if (!context) { - ret = -ENOMEM; -@@ -3503,7 +3468,6 @@ static int ocfs2_refcount_cow_hunk(struct inode *inode, - context->ref_root_bh = ref_root_bh; - context->cow_duplicate_clusters = ocfs2_duplicate_clusters_by_page; - context->get_clusters = ocfs2_di_get_clusters; -- context->file = file; - - ocfs2_init_dinode_extent_tree(&context->data_et, - INODE_CACHE(inode), di_bh); -@@ -3532,7 +3496,6 @@ out: - * clusters between cpos and cpos+write_len are safe to modify. - */ - int ocfs2_refcount_cow(struct inode *inode, -- struct file *file, - struct buffer_head *di_bh, - u32 cpos, u32 write_len, u32 max_cpos) - { -@@ -3552,7 +3515,7 @@ int ocfs2_refcount_cow(struct inode *inode, - num_clusters = write_len; - - if (ext_flags & OCFS2_EXT_REFCOUNTED) { -- ret = ocfs2_refcount_cow_hunk(inode, file, di_bh, cpos, -+ ret = ocfs2_refcount_cow_hunk(inode, di_bh, cpos, - num_clusters, max_cpos); - if (ret) { - mlog_errno(ret); -diff --git a/fs/ocfs2/refcounttree.h b/fs/ocfs2/refcounttree.h -index 7754608..6422bbcdb 100644 ---- a/fs/ocfs2/refcounttree.h -+++ b/fs/ocfs2/refcounttree.h -@@ -53,7 +53,7 @@ int ocfs2_prepare_refcount_change_for_del(struct inode *inode, - int *credits, - int *ref_blocks); - int ocfs2_refcount_cow(struct inode *inode, -- struct file *filep, struct buffer_head *di_bh, -+ struct buffer_head *di_bh, - u32 cpos, u32 write_len, u32 max_cpos); - - typedef int (ocfs2_post_refcount_func)(struct inode *inode, -@@ -85,11 +85,11 @@ int ocfs2_refcount_cow_xattr(struct inode *inode, - u32 cpos, u32 write_len, - struct ocfs2_post_refcount *post); - int ocfs2_duplicate_clusters_by_page(handle_t *handle, -- struct file *file, -+ struct inode *inode, - u32 cpos, u32 old_cluster, - u32 new_cluster, u32 new_len); - int ocfs2_duplicate_clusters_by_jbd(handle_t *handle, -- struct file *file, -+ struct inode *inode, - u32 cpos, u32 old_cluster, - u32 new_cluster, u32 new_len); - int ocfs2_cow_sync_writeback(struct super_block *sb, diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c -index b7e74b5..19c6536 100644 +index 5397c07..54afc55 100644 --- a/fs/ocfs2/suballoc.c +++ b/fs/ocfs2/suballoc.c @@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb, @@ -59716,7 +58469,7 @@ index b7e74b5..19c6536 100644 /* You should never ask for this much metadata */ BUG_ON(bits_wanted > -@@ -2007,7 +2007,7 @@ int ocfs2_claim_metadata(handle_t *handle, +@@ -2000,7 +2000,7 @@ int ocfs2_claim_metadata(handle_t *handle, mlog_errno(status); goto bail; } @@ -59725,7 +58478,7 @@ index b7e74b5..19c6536 100644 *suballoc_loc = res.sr_bg_blkno; *suballoc_bit_start = res.sr_bit_offset; -@@ -2171,7 +2171,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle, +@@ -2164,7 +2164,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); @@ -59734,7 +58487,7 @@ index b7e74b5..19c6536 100644 BUG_ON(res->sr_bits != 1); -@@ -2213,7 +2213,7 @@ int ocfs2_claim_new_inode(handle_t *handle, +@@ -2206,7 +2206,7 @@ int ocfs2_claim_new_inode(handle_t *handle, mlog_errno(status); goto bail; } @@ -59743,7 +58496,7 @@ index b7e74b5..19c6536 100644 BUG_ON(res.sr_bits != 1); -@@ -2317,7 +2317,7 @@ int __ocfs2_claim_clusters(handle_t *handle, +@@ -2310,7 +2310,7 @@ int __ocfs2_claim_clusters(handle_t *handle, cluster_start, num_clusters); if (!status) @@ -59752,7 +58505,7 @@ index b7e74b5..19c6536 100644 } else { if (min_clusters > (osb->bitmap_cpg - 1)) { /* The only paths asking for contiguousness -@@ -2343,7 +2343,7 @@ int __ocfs2_claim_clusters(handle_t *handle, +@@ -2336,7 +2336,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); @@ -59762,10 +58515,10 @@ index b7e74b5..19c6536 100644 } } diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c -index 01b8516..579c4df 100644 +index 121da2d..a0232bc 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c -@@ -301,11 +301,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len) +@@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len) "%10s => GlobalAllocs: %d LocalAllocs: %d " "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", "Stats", @@ -59782,7 +58535,7 @@ index 01b8516..579c4df 100644 out += snprintf(buf + out, len - out, "%10s => State: %u Descriptor: %llu Size: %u bits " -@@ -2122,11 +2122,11 @@ static int ocfs2_initialize_super(struct super_block *sb, +@@ -2121,11 +2121,11 @@ static int ocfs2_initialize_super(struct super_block *sb, spin_lock_init(&osb->osb_xattr_lock); ocfs2_init_steal_slots(osb); @@ -59800,7 +58553,7 @@ index 01b8516..579c4df 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 8c74100..4239c48 100644 +index 7931f76..7b03f3b 100644 --- a/fs/open.c +++ b/fs/open.c @@ -32,6 +32,8 @@ @@ -59904,14 +58657,14 @@ index 8c74100..4239c48 100644 newattrs.ia_valid = ATTR_CTIME; if (user != (uid_t) -1) { if (!uid_valid(uid)) -@@ -946,6 +983,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode) - } else { - fsnotify_open(f); - fd_install(fd, f); -+ trace_do_sys_open(tmp->name, flags, mode); - } +@@ -960,6 +997,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode) + } else { + fsnotify_open(f); + fd_install(fd, f); ++ trace_do_sys_open(tmp->name, flags, mode); } - putname(tmp); + } + putname(tmp); diff --git a/fs/pipe.c b/fs/pipe.c index d2c45e1..009fe1c 100644 --- a/fs/pipe.c @@ -60313,7 +59066,7 @@ index cbd0f1b..adec3f0 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 c3834da..b402b2b 100644 +index 1485e38..8ad4236 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -113,6 +113,14 @@ struct pid_entry { @@ -60622,7 +59375,7 @@ index c3834da..b402b2b 100644 rcu_read_unlock(); } else { inode->i_uid = GLOBAL_ROOT_UID; -@@ -2196,6 +2314,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir, +@@ -2166,6 +2284,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir, if (!task) goto out_no_task; @@ -60632,17 +59385,17 @@ index c3834da..b402b2b 100644 /* * Yes, it does not scale. And it should not. Don't add * new entries into /proc/<tgid>/ without very good reasons. -@@ -2240,6 +2361,9 @@ static int proc_pident_readdir(struct file *filp, +@@ -2196,6 +2317,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx, if (!task) - goto out_no_task; + return -ENOENT; + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task)) + goto out; + - ret = 0; - i = filp->f_pos; - switch (i) { -@@ -2653,7 +2777,7 @@ static const struct pid_entry tgid_base_stuff[] = { + if (!dir_emit_dots(file, ctx)) + goto out; + +@@ -2585,7 +2709,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), @@ -60651,7 +59404,7 @@ index c3834da..b402b2b 100644 INF("syscall", S_IRUGO, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -2678,10 +2802,10 @@ static const struct pid_entry tgid_base_stuff[] = { +@@ -2610,10 +2734,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 @@ -60664,7 +59417,7 @@ index c3834da..b402b2b 100644 ONE("stack", S_IRUGO, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -@@ -2715,6 +2839,9 @@ static const struct pid_entry tgid_base_stuff[] = { +@@ -2647,6 +2771,9 @@ static const struct pid_entry tgid_base_stuff[] = { #ifdef CONFIG_HARDWALL INF("hardwall", S_IRUGO, proc_pid_hardwall), #endif @@ -60674,7 +59427,7 @@ index c3834da..b402b2b 100644 #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), -@@ -2847,7 +2974,14 @@ static struct dentry *proc_pid_instantiate(struct inode *dir, +@@ -2777,7 +2904,14 @@ static int proc_pid_instantiate(struct inode *dir, if (!inode) goto out; @@ -60689,7 +59442,7 @@ index c3834da..b402b2b 100644 inode->i_op = &proc_tgid_base_inode_operations; inode->i_fop = &proc_tgid_base_operations; inode->i_flags|=S_IMMUTABLE; -@@ -2885,7 +3019,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign +@@ -2815,7 +2949,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign if (!task) goto out; @@ -60700,17 +59453,8 @@ index c3834da..b402b2b 100644 +out_put_task: put_task_struct(task); out: - return result; -@@ -2948,6 +3086,8 @@ static int proc_pid_fill_cache(struct file *filp, void *dirent, filldir_t filldi - static int fake_filldir(void *buf, const char *name, int namelen, - loff_t offset, u64 ino, unsigned d_type) - { -+ struct getdents_callback * __buf = (struct getdents_callback *) buf; -+ __buf->error = -EINVAL; - return 0; - } - -@@ -3007,7 +3147,7 @@ static const struct pid_entry tid_base_stuff[] = { + return ERR_PTR(result); +@@ -2921,7 +3059,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), @@ -60719,7 +59463,7 @@ index c3834da..b402b2b 100644 INF("syscall", S_IRUGO, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -3034,10 +3174,10 @@ static const struct pid_entry tid_base_stuff[] = { +@@ -2948,10 +3086,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 @@ -60765,7 +59509,7 @@ index b143471..bb105e5 100644 } module_init(proc_devices_init); diff --git a/fs/proc/fd.c b/fs/proc/fd.c -index d7a4a28..0201742 100644 +index 0ff80f9..a1d7500 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) @@ -60778,7 +59522,7 @@ index d7a4a28..0201742 100644 put_task_struct(task); if (files) { -@@ -302,11 +303,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry, +@@ -283,11 +284,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry, */ int proc_fd_permission(struct inode *inode, int mask) { @@ -60851,7 +59595,7 @@ index 073aea6..0630370 100644 if (de->size) inode->i_size = de->size; diff --git a/fs/proc/internal.h b/fs/proc/internal.h -index d600fb0..3b495fe 100644 +index 651d09a..60c73ae 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h @@ -155,6 +155,9 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *, @@ -60865,7 +59609,7 @@ index d600fb0..3b495fe 100644 /* * base.c diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c -index 0a22194..a9fc8c1 100644 +index 06ea155..9a798c7 100644 --- a/fs/proc/kcore.c +++ b/fs/proc/kcore.c @@ -484,9 +484,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos) @@ -60953,7 +59697,7 @@ index ccfd99b..1b7e255 100644 seq_putc(m, '\n'); diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c -index 986e832..6e8e859 100644 +index 4677bb7..408e936 100644 --- a/fs/proc/proc_net.c +++ b/fs/proc/proc_net.c @@ -23,6 +23,7 @@ @@ -60983,7 +59727,7 @@ index 986e832..6e8e859 100644 rcu_read_lock(); task = pid_task(proc_pid(dir), PIDTYPE_PID); diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c -index ac05f33..1e6dc7e 100644 +index 7129046..f2779c6 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -13,11 +13,15 @@ @@ -61054,8 +59798,8 @@ index ac05f33..1e6dc7e 100644 /* careful: calling conventions are nasty here */ res = count; error = table->proc_handler(table, write, buf, &res, ppos); -@@ -598,6 +622,9 @@ static int proc_sys_fill_cache(struct file *filp, void *dirent, - return -ENOMEM; +@@ -598,6 +622,9 @@ static bool proc_sys_fill_cache(struct file *file, + return false; } else { d_set_d_op(child, &proc_sys_dentry_operations); + @@ -61065,16 +59809,16 @@ index ac05f33..1e6dc7e 100644 } } else { @@ -641,6 +668,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table, - if ((*pos)++ < file->f_pos) - return 0; + if ((*pos)++ < ctx->pos) + return true; + if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt)) + return 0; + if (unlikely(S_ISLNK(table->mode))) - res = proc_sys_link_fill_cache(file, dirent, filldir, head, table); + res = proc_sys_link_fill_cache(file, ctx, head, table); else -@@ -751,6 +781,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct +@@ -734,6 +764,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct if (IS_ERR(head)) return PTR_ERR(head); @@ -61084,7 +59828,7 @@ index ac05f33..1e6dc7e 100644 generic_fillattr(inode, stat); if (table) stat->mode = (stat->mode & S_IFMT) | table->mode; -@@ -773,13 +806,13 @@ static const struct file_operations proc_sys_dir_file_operations = { +@@ -756,13 +789,13 @@ static const struct file_operations proc_sys_dir_file_operations = { .llseek = generic_file_llseek, }; @@ -61100,7 +59844,7 @@ index ac05f33..1e6dc7e 100644 .lookup = proc_sys_lookup, .permission = proc_sys_permission, .setattr = proc_sys_setattr, -@@ -855,7 +888,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir, +@@ -839,7 +872,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir, static struct ctl_dir *new_dir(struct ctl_table_set *set, const char *name, int namelen) { @@ -61109,7 +59853,7 @@ index ac05f33..1e6dc7e 100644 struct ctl_dir *new; struct ctl_node *node; char *new_name; -@@ -867,7 +900,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set, +@@ -851,7 +884,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set, return NULL; node = (struct ctl_node *)(new + 1); @@ -61118,7 +59862,7 @@ index ac05f33..1e6dc7e 100644 new_name = (char *)(table + 2); memcpy(new_name, name, namelen); new_name[namelen] = '\0'; -@@ -1036,7 +1069,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table) +@@ -1020,7 +1053,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table) static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table, struct ctl_table_root *link_root) { @@ -61128,7 +59872,7 @@ index ac05f33..1e6dc7e 100644 struct ctl_table_header *links; struct ctl_node *node; char *link_name; -@@ -1059,7 +1093,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table +@@ -1043,7 +1077,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table return NULL; node = (struct ctl_node *)(links + 1); @@ -61137,7 +59881,7 @@ index ac05f33..1e6dc7e 100644 link_name = (char *)&link_table[nr_entries + 1]; for (link = link_table, entry = table; entry->procname; link++, entry++) { -@@ -1307,8 +1341,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos, +@@ -1291,8 +1325,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos, struct ctl_table_header ***subheader, struct ctl_table_set *set, struct ctl_table *table) { @@ -61148,7 +59892,7 @@ index ac05f33..1e6dc7e 100644 int nr_files = 0; int nr_dirs = 0; int err = -ENOMEM; -@@ -1320,10 +1354,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos, +@@ -1304,10 +1338,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos, nr_files++; } @@ -61160,7 +59904,7 @@ index ac05f33..1e6dc7e 100644 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1), GFP_KERNEL); if (!files) -@@ -1341,7 +1374,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos, +@@ -1325,7 +1358,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos, /* Register everything except a directory full of subdirectories */ if (nr_files || !nr_dirs) { struct ctl_table_header *header; @@ -61170,7 +59914,7 @@ index ac05f33..1e6dc7e 100644 kfree(ctl_table_arg); goto out; diff --git a/fs/proc/root.c b/fs/proc/root.c -index 41a6ea9..23eaa92 100644 +index e0a790d..21e095e 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -182,7 +182,15 @@ void __init proc_root_init(void) @@ -61203,13 +59947,13 @@ index 6b6a993..807cccc 100644 kfree(s); } diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c -index 65fc60a..350cc48 100644 +index 107d026..c715aeb 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c -@@ -11,12 +11,19 @@ - #include <linux/rmap.h> +@@ -12,12 +12,19 @@ #include <linux/swap.h> #include <linux/swapops.h> + #include <linux/mmu_notifier.h> +#include <linux/grsecurity.h> #include <asm/elf.h> @@ -61226,7 +59970,7 @@ index 65fc60a..350cc48 100644 void task_mem(struct seq_file *m, struct mm_struct *mm) { unsigned long data, text, lib, swap; -@@ -52,8 +59,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm) +@@ -53,8 +60,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm) "VmExe:\t%8lu kB\n" "VmLib:\t%8lu kB\n" "VmPTE:\t%8lu kB\n" @@ -61242,7 +59986,7 @@ index 65fc60a..350cc48 100644 total_vm << (PAGE_SHIFT-10), mm->locked_vm << (PAGE_SHIFT-10), mm->pinned_vm << (PAGE_SHIFT-10), -@@ -62,7 +74,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm) +@@ -63,7 +75,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm) data << (PAGE_SHIFT-10), mm->stack_vm << (PAGE_SHIFT-10), text, lib, (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10, @@ -61263,7 +60007,7 @@ index 65fc60a..350cc48 100644 } unsigned long task_vsize(struct mm_struct *mm) -@@ -277,13 +301,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid) +@@ -278,13 +302,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid) pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT; } @@ -61282,7 +60026,7 @@ index 65fc60a..350cc48 100644 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n", start, -@@ -292,7 +316,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid) +@@ -293,7 +317,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', @@ -61294,7 +60038,7 @@ index 65fc60a..350cc48 100644 MAJOR(dev), MINOR(dev), ino, &len); /* -@@ -301,7 +329,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid) +@@ -302,7 +330,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid) */ if (file) { pad_len_spaces(m, len); @@ -61303,7 +60047,7 @@ index 65fc60a..350cc48 100644 goto done; } -@@ -327,8 +355,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid) +@@ -328,8 +356,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. */ @@ -61315,7 +60059,7 @@ index 65fc60a..350cc48 100644 name = "[stack]"; } else { /* Thread stack in /proc/PID/maps */ -@@ -352,6 +381,13 @@ static int show_map(struct seq_file *m, void *v, int is_pid) +@@ -353,6 +382,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; @@ -61329,7 +60073,7 @@ index 65fc60a..350cc48 100644 show_map_vma(m, vma, is_pid); if (m->count < m->size) /* vma is copied successfully */ -@@ -589,12 +625,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid) +@@ -590,12 +626,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid) .private = &mss, }; @@ -61358,7 +60102,7 @@ index 65fc60a..350cc48 100644 show_map_vma(m, vma, is_pid); seq_printf(m, -@@ -612,7 +659,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid) +@@ -613,7 +660,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", @@ -61370,7 +60114,7 @@ index 65fc60a..350cc48 100644 mss.resident >> 10, (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), mss.shared_clean >> 10, -@@ -1264,6 +1315,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid) +@@ -1362,6 +1413,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid) int n; char buffer[50]; @@ -61384,7 +60128,7 @@ index 65fc60a..350cc48 100644 if (!mm) return 0; -@@ -1281,11 +1339,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid) +@@ -1379,11 +1437,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); @@ -61424,10 +60168,10 @@ index 56123a6..5a2f6ec 100644 pid_t tid = vm_is_stack(priv->task, vma, is_pid); diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c -index 17f7e08..e4b1529 100644 +index a1a16eb..6be46ed 100644 --- a/fs/proc/vmcore.c +++ b/fs/proc/vmcore.c -@@ -99,9 +99,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count, +@@ -104,9 +104,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count, nr_bytes = count; /* If pfn is not ram, return zeros for sparse dump files */ @@ -61444,15 +60188,15 @@ index 17f7e08..e4b1529 100644 tmp = copy_oldmem_page(pfn, buf, nr_bytes, offset, userbuf); if (tmp < 0) -@@ -186,7 +190,7 @@ static ssize_t read_vmcore(struct file *file, char __user *buffer, - if (tsz > nr_bytes) - tsz = nr_bytes; - -- tmp = read_from_oldmem(buffer, tsz, &start, 1); -+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, 1); - if (tmp < 0) - return tmp; - buflen -= tsz; +@@ -178,7 +182,7 @@ static ssize_t read_vmcore(struct file *file, char __user *buffer, + if (*fpos < m->offset + m->size) { + tsz = min_t(size_t, m->offset + m->size - *fpos, buflen); + start = m->paddr + *fpos - m->offset; +- tmp = read_from_oldmem(buffer, tsz, &start, 1); ++ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, 1); + if (tmp < 0) + return tmp; + buflen -= tsz; diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h index b00fcc9..e0c6381 100644 --- a/fs/qnx6/qnx6.h @@ -61498,10 +60242,10 @@ index 16e8abb..2dcf914 100644 if (!msg_head) { printk(KERN_ERR diff --git a/fs/read_write.c b/fs/read_write.c -index 2cefa41..c7e2fe0 100644 +index 122a384..0b7ecf2 100644 --- a/fs/read_write.c +++ b/fs/read_write.c -@@ -411,7 +411,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t +@@ -440,7 +440,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t old_fs = get_fs(); set_fs(get_ds()); @@ -61511,7 +60255,7 @@ index 2cefa41..c7e2fe0 100644 count = MAX_RW_COUNT; if (file->f_op->write) diff --git a/fs/readdir.c b/fs/readdir.c -index fee38e0..12fdf47 100644 +index 93d71e5..6a14be8 100644 --- a/fs/readdir.c +++ b/fs/readdir.c @@ -17,6 +17,7 @@ @@ -61522,15 +60266,15 @@ index fee38e0..12fdf47 100644 #include <asm/uaccess.h> -@@ -67,6 +68,7 @@ struct old_linux_dirent { - +@@ -69,6 +70,7 @@ struct old_linux_dirent { struct readdir_callback { + struct dir_context ctx; struct old_linux_dirent __user * dirent; + struct file * file; int result; }; -@@ -84,6 +86,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset +@@ -86,6 +88,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset buf->result = -EOVERFLOW; return -EOVERFLOW; } @@ -61541,23 +60285,23 @@ index fee38e0..12fdf47 100644 buf->result++; dirent = buf->dirent; if (!access_ok(VERIFY_WRITE, dirent, -@@ -114,6 +120,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd, +@@ -117,6 +123,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd, + if (!f.file) + return -EBADF; - buf.result = 0; - buf.dirent = dirent; + buf.file = f.file; - - error = vfs_readdir(f.file, fillonedir, &buf); + error = iterate_dir(f.file, &buf.ctx); if (buf.result) -@@ -139,6 +146,7 @@ struct linux_dirent { - struct getdents_callback { + error = buf.result; +@@ -142,6 +149,7 @@ struct getdents_callback { + struct dir_context ctx; struct linux_dirent __user * current_dir; struct linux_dirent __user * previous; + struct file * file; int count; int error; }; -@@ -160,6 +168,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset, +@@ -163,6 +171,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset, buf->error = -EOVERFLOW; return -EOVERFLOW; } @@ -61568,23 +60312,23 @@ index fee38e0..12fdf47 100644 dirent = buf->previous; if (dirent) { if (__put_user(offset, &dirent->d_off)) -@@ -205,6 +217,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd, - buf.previous = NULL; - buf.count = count; - buf.error = 0; -+ buf.file = f.file; +@@ -208,6 +220,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd, + if (!f.file) + return -EBADF; - error = vfs_readdir(f.file, filldir, &buf); ++ buf.file = f.file; + error = iterate_dir(f.file, &buf.ctx); if (error >= 0) -@@ -223,6 +236,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd, - struct getdents_callback64 { + error = buf.error; +@@ -226,6 +239,7 @@ struct getdents_callback64 { + struct dir_context ctx; struct linux_dirent64 __user * current_dir; struct linux_dirent64 __user * previous; + struct file *file; int count; int error; }; -@@ -238,6 +252,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset, +@@ -241,6 +255,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; @@ -61595,23 +60339,14 @@ index fee38e0..12fdf47 100644 dirent = buf->previous; if (dirent) { if (__put_user(offset, &dirent->d_off)) -@@ -283,6 +301,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd, +@@ -288,6 +306,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd, + if (!f.file) + return -EBADF; - buf.current_dir = dirent; - buf.previous = NULL; + buf.file = f.file; - buf.count = count; - buf.error = 0; - -@@ -291,7 +310,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd, + error = iterate_dir(f.file, &buf.ctx); + if (error >= 0) error = buf.error; - lastdirent = buf.previous; - if (lastdirent) { -- typeof(lastdirent->d_off) d_off = f.file->f_pos; -+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = f.file->f_pos; - if (__put_user(d_off, &lastdirent->d_off)) - error = -EFAULT; - else diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c index 2b7882b..1c5ef48 100644 --- a/fs/reiserfs/do_balan.c @@ -61626,7 +60361,7 @@ index 2b7882b..1c5ef48 100644 /* balance leaf returns 0 except if combining L R and S into diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c -index 1d48974..2f8f4e0 100644 +index a958444..42b2323 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) @@ -61639,7 +60374,7 @@ index 1d48974..2f8f4e0 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 157e474..65a6114 100644 +index 3df5ce6..8c0f4b0 100644 --- a/fs/reiserfs/reiserfs.h +++ b/fs/reiserfs/reiserfs.h @@ -453,7 +453,7 @@ struct reiserfs_sb_info { @@ -61661,7 +60396,7 @@ index 157e474..65a6114 100644 #define __fs_changed(gen,s) (gen != get_generation (s)) #define fs_changed(gen,s) \ diff --git a/fs/select.c b/fs/select.c -index 8c1c96c..a0f9b6d 100644 +index 35d4adc7..d6c60db 100644 --- a/fs/select.c +++ b/fs/select.c @@ -20,6 +20,7 @@ @@ -61672,7 +60407,7 @@ index 8c1c96c..a0f9b6d 100644 #include <linux/personality.h> /* for STICKY_TIMEOUTS */ #include <linux/file.h> #include <linux/fdtable.h> -@@ -827,6 +828,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds, +@@ -881,6 +882,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds, struct poll_list *walk = head; unsigned long todo = nfds; @@ -61681,7 +60416,7 @@ index 8c1c96c..a0f9b6d 100644 return -EINVAL; diff --git a/fs/seq_file.c b/fs/seq_file.c -index 774c1eb..b67582a 100644 +index 3135c25..d0395dd 100644 --- a/fs/seq_file.c +++ b/fs/seq_file.c @@ -10,6 +10,7 @@ @@ -61748,7 +60483,7 @@ index 774c1eb..b67582a 100644 if (op) { diff --git a/fs/splice.c b/fs/splice.c -index d37431d..09241b4 100644 +index 3b7ee65..87fc2e4 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -196,7 +196,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe, @@ -61830,7 +60565,7 @@ index d37431d..09241b4 100644 return 0; if (sd->flags & SPLICE_F_NONBLOCK) -@@ -1193,7 +1193,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd, +@@ -1179,7 +1179,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. */ @@ -61839,7 +60574,7 @@ index d37431d..09241b4 100644 current->splice_pipe = pipe; } -@@ -1467,6 +1467,7 @@ static int get_iovec_page_array(const struct iovec __user *iov, +@@ -1475,6 +1475,7 @@ static int get_iovec_page_array(const struct iovec __user *iov, partial[buffers].offset = off; partial[buffers].len = plen; @@ -61847,7 +60582,7 @@ index d37431d..09241b4 100644 off = 0; len -= plen; -@@ -1769,9 +1770,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags) +@@ -1777,9 +1778,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags) ret = -ERESTARTSYS; break; } @@ -61859,7 +60594,7 @@ index d37431d..09241b4 100644 if (flags & SPLICE_F_NONBLOCK) { ret = -EAGAIN; break; -@@ -1803,7 +1804,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags) +@@ -1811,7 +1812,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags) pipe_lock(pipe); while (pipe->nrbufs >= pipe->buffers) { @@ -61868,7 +60603,7 @@ index d37431d..09241b4 100644 send_sig(SIGPIPE, current, 0); ret = -EPIPE; break; -@@ -1816,9 +1817,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags) +@@ -1824,9 +1825,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags) ret = -ERESTARTSYS; break; } @@ -61880,7 +60615,7 @@ index d37431d..09241b4 100644 } pipe_unlock(pipe); -@@ -1854,14 +1855,14 @@ retry: +@@ -1862,14 +1863,14 @@ retry: pipe_double_lock(ipipe, opipe); do { @@ -61897,7 +60632,7 @@ index d37431d..09241b4 100644 break; /* -@@ -1958,7 +1959,7 @@ static int link_pipe(struct pipe_inode_info *ipipe, +@@ -1966,7 +1967,7 @@ static int link_pipe(struct pipe_inode_info *ipipe, pipe_double_lock(ipipe, opipe); do { @@ -61906,7 +60641,7 @@ index d37431d..09241b4 100644 send_sig(SIGPIPE, current, 0); if (!ret) ret = -EPIPE; -@@ -2003,7 +2004,7 @@ static int link_pipe(struct pipe_inode_info *ipipe, +@@ -2011,7 +2012,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 */ @@ -61974,7 +60709,7 @@ index 15c68f9..36a8b3e 100644 if (!bb->vm_ops) return -EINVAL; diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c -index e8e0e71..79c28ac5 100644 +index e068e74..92edeb8 100644 --- a/fs/sysfs/dir.c +++ b/fs/sysfs/dir.c @@ -40,7 +40,7 @@ static DEFINE_IDA(sysfs_ino_ida); @@ -62006,7 +60741,7 @@ index e8e0e71..79c28ac5 100644 sd = sysfs_new_dirent(name, mode, SYSFS_DIR); if (!sd) diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c -index 602f56d..6853db8 100644 +index d2bb7ed..fe8c331 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c @@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent_lock); @@ -62045,15 +60780,15 @@ index 602f56d..6853db8 100644 goto trigger; return DEFAULT_POLLMASK; -@@ -451,7 +451,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd) - - od = sd->s_attr.open; - if (od) { -- atomic_inc(&od->event); -+ atomic_inc_unchecked(&od->event); - wake_up_interruptible(&od->poll); +@@ -452,7 +452,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd) + if (!WARN_ON(sysfs_type(sd) != SYSFS_KOBJ_ATTR)) { + od = sd->s_attr.open; + if (od) { +- atomic_inc(&od->event); ++ atomic_inc_unchecked(&od->event); + wake_up_interruptible(&od->poll); + } } - diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c index 8c940df..25b733e 100644 --- a/fs/sysfs/symlink.c @@ -62261,7 +60996,7 @@ index 9fbea87..6b19972 100644 struct posix_acl *acl; struct posix_acl_entry *acl_e; diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c -index 8904284..ee0e14b 100644 +index 05c698c..6b918af 100644 --- a/fs/xfs/xfs_bmap.c +++ b/fs/xfs/xfs_bmap.c @@ -765,7 +765,7 @@ xfs_bmap_validate_ret( @@ -62274,28 +61009,25 @@ index 8904284..ee0e14b 100644 /* diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c -index 6157424..ac98f6d 100644 +index 97676a3..399a75d 100644 --- a/fs/xfs/xfs_dir2_sf.c +++ b/fs/xfs/xfs_dir2_sf.c -@@ -851,7 +851,15 @@ xfs_dir2_sf_getdents( - } +@@ -848,7 +848,12 @@ xfs_dir2_sf_getdents( ino = xfs_dir2_sfe_get_ino(sfp, sfep); -- if (filldir(dirent, (char *)sfep->name, sfep->namelen, + ctx->pos = off & 0x7fffffff; +- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, + 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 (filldir(dirent, name, sfep->namelen, -+ off & 0x7fffffff, ino, DT_UNKNOWN)) { -+ *offset = off & 0x7fffffff; ++ if (!dir_emit(ctx, name, sfep->namelen, ino, DT_UNKNOWN)) + return 0; -+ } -+ } else if (filldir(dirent, (char *)sfep->name, sfep->namelen, - off & 0x7fffffff, ino, DT_UNKNOWN)) { - *offset = off & 0x7fffffff; ++ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, + ino, DT_UNKNOWN)) return 0; + sfep = xfs_dir2_sf_nextentry(sfp, sfep); diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c -index 5e99968..45bd327 100644 +index 6e2bca5..6ce80d3 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -127,7 +127,7 @@ xfs_find_handle( @@ -62308,7 +61040,7 @@ index 5e99968..45bd327 100644 goto out_put; diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c -index ca9ecaa..60100c7 100644 +index 96dda62..d6c6a52 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -395,7 +395,7 @@ xfs_vn_put_link( @@ -62322,10 +61054,10 @@ index ca9ecaa..60100c7 100644 kfree(s); diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig new file mode 100644 -index 0000000..6fb5192 +index 0000000..0fd7c82 --- /dev/null +++ b/grsecurity/Kconfig -@@ -0,0 +1,1079 @@ +@@ -0,0 +1,1080 @@ +# +# grecurity configuration +# @@ -63305,6 +62037,7 @@ index 0000000..6fb5192 +config GRKERNSEC_DENYUSB + bool "Deny new USB connections after toggle" + default y if GRKERNSEC_CONFIG_AUTO ++ depends on SYSCTL && USB_SUPPORT + help + If you say Y here, a new sysctl option with name "deny_new_usb" + will be created. Setting its value to 1 will prevent any new @@ -63320,7 +62053,7 @@ index 0000000..6fb5192 +config GRKERNSEC_DENYUSB_FORCE + bool "Reject all USB devices not connected at boot" + select USB -+ depends on SYSCTL && GRKERNSEC_DENYUSB ++ depends on GRKERNSEC_DENYUSB + help + If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled + that doesn't involve a sysctl entry. This option should only be @@ -73344,46 +72077,62 @@ 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 a59ff51..2594a70 100644 +index 0807ddf..cd67747 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h -@@ -688,6 +688,14 @@ static inline pmd_t pmd_mknuma(pmd_t pmd) +@@ -741,6 +741,22 @@ static inline pmd_t pmd_mknuma(pmd_t pmd) } #endif /* CONFIG_NUMA_BALANCING */ +#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL ++#ifdef CONFIG_PAX_KERNEXEC ++#error KERNEXEC requires pax_open_kernel ++#else +static inline unsigned long pax_open_kernel(void) { return 0; } +#endif ++#endif + +#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL ++#ifdef CONFIG_PAX_KERNEXEC ++#error KERNEXEC requires pax_close_kernel ++#else +static inline unsigned long pax_close_kernel(void) { return 0; } +#endif ++#endif + #endif /* CONFIG_MMU */ #endif /* !__ASSEMBLY__ */ diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h -index c184aa8..d049942 100644 +index dc1269c..48a4f51 100644 --- a/include/asm-generic/uaccess.h +++ b/include/asm-generic/uaccess.h -@@ -343,4 +343,12 @@ clear_user(void __user *to, unsigned long n) +@@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n) return __clear_user(to, n); } +#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND -+//static inline unsigned long pax_open_userland(void) { return 0; } ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++#error UDEREF requires pax_open_userland ++#else ++static inline unsigned long pax_open_userland(void) { return 0; } ++#endif +#endif + +#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND -+//static inline unsigned long pax_close_userland(void) { return 0; } ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++#error UDEREF requires pax_close_userland ++#else ++static inline unsigned long pax_close_userland(void) { return 0; } ++#endif +#endif + #endif /* __ASM_GENERIC_UACCESS_H */ diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h -index eb58d2d..df131bf 100644 +index 69732d2..cbe16d9 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h -@@ -239,6 +239,7 @@ +@@ -227,6 +227,7 @@ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start_rodata) = .; \ *(.rodata) *(.rodata.*) \ @@ -73391,7 +72140,7 @@ index eb58d2d..df131bf 100644 *(__vermagic) /* Kernel version magic */ \ . = ALIGN(8); \ VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \ -@@ -749,17 +750,18 @@ +@@ -710,17 +711,18 @@ * section in the linker script will go there too. @phdr should have * a leading colon. * @@ -73428,10 +72177,10 @@ index 418d270..bfd2794 100644 struct crypto_instance { struct crypto_alg alg; diff --git a/include/drm/drmP.h b/include/drm/drmP.h -index 63d17ee..716de2b 100644 +index 12083dc..39740ec 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h -@@ -72,6 +72,7 @@ +@@ -69,6 +69,7 @@ #include <linux/workqueue.h> #include <linux/poll.h> #include <asm/pgalloc.h> @@ -73439,7 +72188,7 @@ index 63d17ee..716de2b 100644 #include <drm/drm.h> #include <drm/drm_sarea.h> -@@ -296,10 +297,12 @@ do { \ +@@ -293,10 +294,12 @@ do { \ * \param cmd command. * \param arg argument. */ @@ -73454,7 +72203,7 @@ index 63d17ee..716de2b 100644 unsigned long arg); #define DRM_IOCTL_NR(n) _IOC_NR(n) -@@ -314,10 +317,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd, +@@ -311,10 +314,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd, struct drm_ioctl_desc { unsigned int cmd; int flags; @@ -73656,7 +72405,7 @@ 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 1186098..f87e53d 100644 +index 1ec14a7..d0654a2 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -132,6 +132,7 @@ struct clk_ops { @@ -73861,7 +72610,7 @@ index 92669cd..1771a15 100644 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */ #ifdef CONFIG_KPROBES diff --git a/include/linux/completion.h b/include/linux/completion.h -index 33f0280..35c6568 100644 +index 3cd574d..adce5fa 100644 --- a/include/linux/completion.h +++ b/include/linux/completion.h @@ -79,15 +79,15 @@ static inline void init_completion(struct completion *x) @@ -73896,24 +72645,11 @@ index 34025df..d94bbbc 100644 /* * Users often need to create attribute structures for their configurable -diff --git a/include/linux/cpu.h b/include/linux/cpu.h -index 9f3c7e8..a18c7b6 100644 ---- a/include/linux/cpu.h -+++ b/include/linux/cpu.h -@@ -115,7 +115,7 @@ enum { - /* Need to know about CPUs going up/down? */ - #if defined(CONFIG_HOTPLUG_CPU) || !defined(MODULE) - #define cpu_notifier(fn, pri) { \ -- static struct notifier_block fn##_nb __cpuinitdata = \ -+ static struct notifier_block fn##_nb = \ - { .notifier_call = fn, .priority = pri }; \ - register_cpu_notifier(&fn##_nb); \ - } diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h -index 037d36a..ca5fe6e 100644 +index 90d5a15..950cb80 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h -@@ -262,7 +262,7 @@ struct cpufreq_driver { +@@ -266,7 +266,7 @@ struct cpufreq_driver { int (*suspend) (struct cpufreq_policy *policy); int (*resume) (struct cpufreq_policy *policy); struct freq_attr **attr; @@ -73922,7 +72658,7 @@ index 037d36a..ca5fe6e 100644 /* flags */ -@@ -321,6 +321,7 @@ struct global_attr { +@@ -325,6 +325,7 @@ struct global_attr { ssize_t (*store)(struct kobject *a, struct attribute *b, const char *c, size_t count); }; @@ -73931,7 +72667,7 @@ index 037d36a..ca5fe6e 100644 #define define_one_global_ro(_name) \ static struct global_attr _name = \ diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h -index 8f04062..900239a 100644 +index 0bc4b74..973b368 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -52,7 +52,8 @@ struct cpuidle_state { @@ -74075,7 +72811,7 @@ index 7925bf0..d5143d2 100644 #define large_malloc(a) vmalloc(a) diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h -index fe8c447..bdc1f33 100644 +index 5f1ab92..39c35ae 100644 --- a/include/linux/devfreq.h +++ b/include/linux/devfreq.h @@ -114,7 +114,7 @@ struct devfreq_governor { @@ -74088,10 +72824,10 @@ index fe8c447..bdc1f33 100644 /** * struct devfreq - Device devfreq structure diff --git a/include/linux/device.h b/include/linux/device.h -index c0a1261..dba7569 100644 +index 22b546a..a573dc9 100644 --- a/include/linux/device.h +++ b/include/linux/device.h -@@ -290,7 +290,7 @@ struct subsys_interface { +@@ -305,7 +305,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); @@ -74100,7 +72836,7 @@ index c0a1261..dba7569 100644 int subsys_interface_register(struct subsys_interface *sif); void subsys_interface_unregister(struct subsys_interface *sif); -@@ -473,7 +473,7 @@ struct device_type { +@@ -493,7 +493,7 @@ struct device_type { void (*release)(struct device *dev); const struct dev_pm_ops *pm; @@ -74109,7 +72845,7 @@ index c0a1261..dba7569 100644 /* interface for exporting device attributes */ struct device_attribute { -@@ -483,11 +483,12 @@ struct device_attribute { +@@ -503,11 +503,12 @@ struct device_attribute { ssize_t (*store)(struct device *dev, struct device_attribute *attr, const char *buf, size_t count); }; @@ -74137,10 +72873,10 @@ index 94af418..b1ca7a2 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 96d3e4a..dc36433 100644 +index cb286b1..923d066 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h -@@ -1035,9 +1035,9 @@ struct dma_pinned_list { +@@ -1030,9 +1030,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); @@ -74153,7 +72889,7 @@ index 96d3e4a..dc36433 100644 unsigned int offset, size_t len); diff --git a/include/linux/efi.h b/include/linux/efi.h -index 2bc0ad7..3f7b006 100644 +index 5f8f176..62a0556 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -745,6 +745,7 @@ struct efivar_operations { @@ -74185,7 +72921,7 @@ index 40a3c0e..4c45a38 100644 #endif diff --git a/include/linux/err.h b/include/linux/err.h -index f2edce2..cc2082c 100644 +index 221fcfb..f29e5e2 100644 --- a/include/linux/err.h +++ b/include/linux/err.h @@ -19,12 +19,12 @@ @@ -74198,8 +72934,8 @@ index f2edce2..cc2082c 100644 return (void *) error; } --static inline long __must_check PTR_ERR(const void *ptr) -+static inline long __must_check __intentional_overflow(-1) PTR_ERR(const void *ptr) +-static inline long __must_check PTR_ERR(__force const void *ptr) ++static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr) { return (long) ptr; } @@ -74217,7 +72953,7 @@ index fcb51c8..bdafcf6 100644 /** diff --git a/include/linux/fb.h b/include/linux/fb.h -index d49c60f..2834fbe 100644 +index ffac70a..ca3e711 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -304,7 +304,7 @@ struct fb_ops { @@ -74229,8 +72965,21 @@ index d49c60f..2834fbe 100644 #ifdef CONFIG_FB_TILEBLITTING #define FB_TILE_CURSOR_NONE 0 +diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h +index 085197b..0fa6f0b 100644 +--- a/include/linux/fdtable.h ++++ b/include/linux/fdtable.h +@@ -95,7 +95,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 **); +-struct files_struct *dup_fd(struct files_struct *, int *); ++struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy; + void do_close_on_exec(struct files_struct *); + int iterate_fd(struct files_struct *, unsigned, + int (*)(const void *, struct file *, unsigned), diff --git a/include/linux/filter.h b/include/linux/filter.h -index f65f5a6..2f4f93a 100644 +index a6ac848..a104a76 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -20,6 +20,7 @@ struct compat_sock_fprog { @@ -74265,10 +73014,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 65c2be2..4c53f6e 100644 +index 9818747..788bfbd 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1543,7 +1543,8 @@ struct file_operations { +@@ -1554,7 +1554,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); @@ -74278,8 +73027,8 @@ index 65c2be2..4c53f6e 100644 struct inode_operations { struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int); -@@ -2688,4 +2689,14 @@ static inline void inode_has_no_xattr(struct inode *inode) - inode->i_flags |= S_NOSEC; +@@ -2740,4 +2741,14 @@ static inline bool dir_relax(struct inode *inode) + return !IS_DEADDIR(inode); } +static inline bool is_sidechannel_device(const struct inode *inode) @@ -74307,10 +73056,10 @@ index 2b93a9a..855d94a 100644 seqcount_t seq; int umask; diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h -index 5dfa0aa..6acf322 100644 +index a9ff9a3..1ba1788 100644 --- a/include/linux/fscache-cache.h +++ b/include/linux/fscache-cache.h -@@ -112,7 +112,7 @@ struct fscache_operation { +@@ -113,7 +113,7 @@ struct fscache_operation { fscache_operation_release_t release; }; @@ -74319,7 +73068,7 @@ index 5dfa0aa..6acf322 100644 extern void fscache_op_work_func(struct work_struct *work); extern void fscache_enqueue_operation(struct fscache_operation *); -@@ -134,7 +134,7 @@ static inline void fscache_operation_init(struct fscache_operation *op, +@@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op, INIT_WORK(&op->work, fscache_op_work_func); atomic_set(&op->usage, 1); op->state = FSCACHE_OP_ST_INITIALISED; @@ -74342,11 +73091,11 @@ index 7a08623..4c07b0f 100644 /* * fscache cached network filesystem type diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h -index a78680a..87bd73e 100644 +index 1c804b0..1432c2b 100644 --- a/include/linux/fsnotify.h +++ b/include/linux/fsnotify.h @@ -195,6 +195,9 @@ static inline void fsnotify_access(struct file *file) - struct inode *inode = path->dentry->d_inode; + struct inode *inode = file_inode(file); __u32 mask = FS_ACCESS; + if (is_sidechannel_device(inode)) @@ -74356,7 +73105,7 @@ index a78680a..87bd73e 100644 mask |= FS_ISDIR; @@ -213,6 +216,9 @@ static inline void fsnotify_modify(struct file *file) - struct inode *inode = path->dentry->d_inode; + struct inode *inode = file_inode(file); __u32 mask = FS_MODIFY; + if (is_sidechannel_device(inode)) @@ -74401,7 +73150,7 @@ index 023bc34..b02b46a 100644 }; diff --git a/include/linux/gfp.h b/include/linux/gfp.h -index 0f615eb..5c3832f 100644 +index 9b4dd49..61fd41d 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -35,6 +35,13 @@ struct vm_area_struct; @@ -75835,33 +74584,19 @@ 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 8618147..0821126 100644 +index e73f2b7..3a5082b 100644 --- a/include/linux/init.h +++ b/include/linux/init.h -@@ -39,9 +39,36 @@ +@@ -39,9 +39,22 @@ * Also note, that this data cannot be "const". */ +#ifdef MODULE +#define add_init_latent_entropy -+#define add_devinit_latent_entropy -+#define add_cpuinit_latent_entropy +#define add_meminit_latent_entropy +#else +#define add_init_latent_entropy __latent_entropy + -+#ifdef CONFIG_HOTPLUG -+#define add_devinit_latent_entropy -+#else -+#define add_devinit_latent_entropy __latent_entropy -+#endif -+ -+#ifdef CONFIG_HOTPLUG_CPU -+#define add_cpuinit_latent_entropy -+#else -+#define add_cpuinit_latent_entropy __latent_entropy -+#endif -+ +#ifdef CONFIG_MEMORY_HOTPLUG +#define add_meminit_latent_entropy +#else @@ -75876,17 +74611,8 @@ index 8618147..0821126 100644 #define __initdata __section(.init.data) #define __initconst __constsection(.init.rodata) #define __exitdata __section(.exit.data) -@@ -94,7 +121,7 @@ - #define __exit __section(.exit.text) __exitused __cold notrace - - /* Used for HOTPLUG_CPU */ --#define __cpuinit __section(.cpuinit.text) __cold notrace -+#define __cpuinit __section(.cpuinit.text) __cold notrace add_cpuinit_latent_entropy - #define __cpuinitdata __section(.cpuinit.data) - #define __cpuinitconst __constsection(.cpuinit.rodata) - #define __cpuexit __section(.cpuexit.text) __exitused __cold notrace -@@ -102,7 +129,7 @@ - #define __cpuexitconst __constsection(.cpuexit.rodata) +@@ -102,7 +115,7 @@ + #define __cpuexitconst /* Used for MEMORY_HOTPLUG */ -#define __meminit __section(.meminit.text) __cold notrace @@ -75975,10 +74701,10 @@ index 89b7c24..382af74 100644 return res->end - res->start + 1; } diff --git a/include/linux/irq.h b/include/linux/irq.h -index bc4e066..50468a9 100644 +index f04d3ba..bcf2cfb 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h -@@ -328,7 +328,8 @@ struct irq_chip { +@@ -333,7 +333,8 @@ struct irq_chip { void (*irq_print_chip)(struct irq_data *data, struct seq_file *p); unsigned long flags; @@ -76146,10 +74872,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 8db53cf..c21121d 100644 +index a63d83e..77fd685 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h -@@ -444,7 +444,7 @@ static inline void kvm_irqfd_exit(void) +@@ -446,7 +446,7 @@ static inline void kvm_irqfd_exit(void) { } #endif @@ -76158,7 +74884,7 @@ index 8db53cf..c21121d 100644 struct module *module); void kvm_exit(void); -@@ -616,7 +616,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, +@@ -618,7 +618,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); @@ -76168,10 +74894,10 @@ index 8db53cf..c21121d 100644 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); diff --git a/include/linux/libata.h b/include/linux/libata.h -index eae7a05..2cdd875 100644 +index 4ea55bb..dcd2601 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h -@@ -919,7 +919,7 @@ struct ata_port_operations { +@@ -924,7 +924,7 @@ struct ata_port_operations { * fields must be pointers. */ const struct ata_port_operations *inherits; @@ -76180,8 +74906,20 @@ index eae7a05..2cdd875 100644 struct ata_port_info { unsigned long flags; +diff --git a/include/linux/linkage.h b/include/linux/linkage.h +index d3e8ad2..a949f68 100644 +--- a/include/linux/linkage.h ++++ b/include/linux/linkage.h +@@ -31,6 +31,7 @@ + #endif + + #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE) ++#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE) + #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE) + + /* diff --git a/include/linux/list.h b/include/linux/list.h -index b83e565..baa6c1d 100644 +index f4d8a2f..38e6e46 100644 --- a/include/linux/list.h +++ b/include/linux/list.h @@ -112,6 +112,19 @@ extern void __list_del_entry(struct list_head *entry); @@ -76254,10 +74992,10 @@ index 2913b86..8dcbb1e 100644 u32 remainder; return div_u64_rem(dividend, divisor, &remainder); diff --git a/include/linux/mm.h b/include/linux/mm.h -index e0c8528..bcf0c29 100644 +index f022460..6ecf4f9 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -104,6 +104,11 @@ extern unsigned int kobjsize(const void *objp); +@@ -113,6 +113,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 */ @@ -76269,7 +75007,7 @@ index e0c8528..bcf0c29 100644 #define VM_DONTDUMP 0x04000000 /* Do not include in the core dump */ #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */ -@@ -205,8 +210,8 @@ struct vm_operations_struct { +@@ -208,8 +213,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 */ @@ -76280,7 +75018,7 @@ index e0c8528..bcf0c29 100644 #ifdef CONFIG_NUMA /* * set_policy() op must add a reference to any non-NULL @new mempolicy -@@ -236,6 +241,7 @@ struct vm_operations_struct { +@@ -239,6 +244,7 @@ struct vm_operations_struct { int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr, unsigned long size, pgoff_t pgoff); }; @@ -76288,7 +75026,7 @@ index e0c8528..bcf0c29 100644 struct mmu_gather; struct inode; -@@ -980,8 +986,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address, +@@ -983,8 +989,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); @@ -76299,7 +75037,7 @@ index e0c8528..bcf0c29 100644 static inline void unmap_shared_mapping_range(struct address_space *mapping, loff_t const holebegin, loff_t const holelen) -@@ -1020,9 +1026,9 @@ static inline int fixup_user_fault(struct task_struct *tsk, +@@ -1023,9 +1029,9 @@ static inline int fixup_user_fault(struct task_struct *tsk, } #endif @@ -76312,7 +75050,7 @@ index e0c8528..bcf0c29 100644 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, unsigned long start, unsigned long nr_pages, -@@ -1053,34 +1059,6 @@ int set_page_dirty(struct page *page); +@@ -1057,34 +1063,6 @@ int set_page_dirty(struct page *page); int set_page_dirty_lock(struct page *page); int clear_page_dirty_for_io(struct page *page); @@ -76347,7 +75085,7 @@ index e0c8528..bcf0c29 100644 extern pid_t vm_is_stack(struct task_struct *task, struct vm_area_struct *vma, int in_group); -@@ -1180,6 +1158,15 @@ static inline void sync_mm_rss(struct mm_struct *mm) +@@ -1184,6 +1162,15 @@ static inline void sync_mm_rss(struct mm_struct *mm) } #endif @@ -76363,7 +75101,7 @@ index e0c8528..bcf0c29 100644 int vma_wants_writenotify(struct vm_area_struct *vma); extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr, -@@ -1198,8 +1185,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, +@@ -1202,8 +1189,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, { return 0; } @@ -76379,7 +75117,7 @@ index e0c8528..bcf0c29 100644 #endif #ifdef __PAGETABLE_PMD_FOLDED -@@ -1208,8 +1202,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud, +@@ -1212,8 +1206,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud, { return 0; } @@ -76395,7 +75133,7 @@ index e0c8528..bcf0c29 100644 #endif int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma, -@@ -1227,11 +1228,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a +@@ -1231,11 +1232,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a NULL: pud_offset(pgd, address); } @@ -76419,7 +75157,7 @@ index e0c8528..bcf0c29 100644 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */ #if USE_SPLIT_PTLOCKS -@@ -1517,6 +1530,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, +@@ -1531,6 +1544,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); @@ -76427,7 +75165,7 @@ index e0c8528..bcf0c29 100644 #ifdef CONFIG_MMU extern int __mm_populate(unsigned long addr, unsigned long len, -@@ -1545,10 +1559,11 @@ struct vm_unmapped_area_info { +@@ -1559,10 +1573,11 @@ struct vm_unmapped_area_info { unsigned long high_limit; unsigned long align_mask; unsigned long align_offset; @@ -76441,7 +75179,7 @@ index e0c8528..bcf0c29 100644 /* * Search for an unmapped address range. -@@ -1560,7 +1575,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info); +@@ -1574,7 +1589,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 @@ -76450,7 +75188,7 @@ index e0c8528..bcf0c29 100644 { if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN)) return unmapped_area(info); -@@ -1623,6 +1638,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add +@@ -1637,6 +1652,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); @@ -76461,7 +75199,7 @@ index e0c8528..bcf0c29 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) -@@ -1651,15 +1670,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm, +@@ -1665,15 +1684,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm, return vma; } @@ -76477,7 +75215,7 @@ index e0c8528..bcf0c29 100644 #ifdef CONFIG_ARCH_USES_NUMA_PROT_NONE unsigned long change_prot_numa(struct vm_area_struct *vma, unsigned long start, unsigned long end); -@@ -1711,6 +1721,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long); +@@ -1725,6 +1735,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) { @@ -76489,7 +75227,7 @@ index e0c8528..bcf0c29 100644 mm->total_vm += pages; } #endif /* CONFIG_PROC_FS */ -@@ -1791,7 +1806,7 @@ extern int unpoison_memory(unsigned long pfn); +@@ -1805,7 +1820,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); @@ -76498,7 +75236,7 @@ index e0c8528..bcf0c29 100644 extern int soft_offline_page(struct page *page, int flags); extern void dump_page(struct page *page); -@@ -1828,5 +1843,11 @@ void __init setup_nr_node_ids(void); +@@ -1842,5 +1857,11 @@ void __init setup_nr_node_ids(void); static inline void setup_nr_node_ids(void) {} #endif @@ -76511,7 +75249,7 @@ index e0c8528..bcf0c29 100644 #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h -index 4a189ba..04101d6 100644 +index faf4b7c..1e70c6e 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -289,6 +289,8 @@ struct vm_area_struct { @@ -76523,7 +75261,7 @@ index 4a189ba..04101d6 100644 }; struct core_thread { -@@ -438,6 +440,24 @@ struct mm_struct { +@@ -435,6 +437,24 @@ struct mm_struct { int first_nid; #endif struct uprobes_state uprobes_state; @@ -76571,7 +75309,7 @@ index c5d5278..f0b68c8 100644 } diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h -index 5c76737..61f518e 100644 +index af4a3b7..9ad8889 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -396,7 +396,7 @@ struct zone { @@ -76584,7 +75322,7 @@ index 5c76737..61f518e 100644 /* * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h -index b508016..237cfe5 100644 +index 45e9214..a7227d6 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -13,7 +13,7 @@ @@ -76605,7 +75343,7 @@ index b508016..237cfe5 100644 #define HID_BUS_ANY 0xffff #define HID_GROUP_ANY 0x0000 -@@ -465,7 +465,7 @@ struct dmi_system_id { +@@ -467,7 +467,7 @@ struct dmi_system_id { const char *ident; struct dmi_strmatch matches[4]; void *driver_data; @@ -76787,7 +75525,7 @@ index 560ca53..ef621ef 100644 } #endif diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h -index 137b419..fe663ec 100644 +index 27d9da3..5d94aa3 100644 --- a/include/linux/moduleparam.h +++ b/include/linux/moduleparam.h @@ -284,7 +284,7 @@ static inline void __kernel_param_unlock(void) @@ -76837,7 +75575,7 @@ index 5a5ff57..5ae5070 100644 return nd->saved_names[nd->depth]; } diff --git a/include/linux/net.h b/include/linux/net.h -index 99c9f0c..e1cf296 100644 +index 4f27575..fc8a65f 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -183,7 +183,7 @@ struct net_proto_family { @@ -76850,10 +75588,10 @@ index 99c9f0c..e1cf296 100644 struct iovec; struct kvec; diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h -index 96e4c21..9cc8278 100644 +index 9a41568..203d903 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1026,6 +1026,7 @@ struct net_device_ops { +@@ -1061,6 +1061,7 @@ struct net_device_ops { int (*ndo_change_carrier)(struct net_device *dev, bool new_carrier); }; @@ -76861,7 +75599,7 @@ index 96e4c21..9cc8278 100644 /* * The DEVICE structure. -@@ -1094,7 +1095,7 @@ struct net_device { +@@ -1131,7 +1132,7 @@ struct net_device { int iflink; struct net_device_stats stats; @@ -76871,7 +75609,7 @@ index 96e4c21..9cc8278 100644 */ diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h -index 0060fde..481c6ae 100644 +index de70f7b..2675e91 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h @@ -82,7 +82,7 @@ struct nf_sockopt_ops { @@ -76982,10 +75720,10 @@ index 8db71dc..a76bf2c 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 c5b6dbf..b124155 100644 +index c43f6ea..2d4416f 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h -@@ -318,8 +318,8 @@ struct perf_event { +@@ -328,8 +328,8 @@ struct perf_event { enum perf_event_active_state state; unsigned int attach_state; @@ -76996,7 +75734,7 @@ index c5b6dbf..b124155 100644 /* * These are the total time in nanoseconds that the event -@@ -370,8 +370,8 @@ struct perf_event { +@@ -380,8 +380,8 @@ struct perf_event { * These accumulate total time (in nanoseconds) that children * events have been enabled and running, respectively. */ @@ -77007,7 +75745,7 @@ index c5b6dbf..b124155 100644 /* * Protect attach/detach and child_list: -@@ -692,7 +692,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64 +@@ -703,7 +703,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64 entry->ip[entry->nr++] = ip; } @@ -77015,11 +75753,11 @@ index c5b6dbf..b124155 100644 +extern int sysctl_perf_event_legitimately_concerned; extern int sysctl_perf_event_mlock; extern int sysctl_perf_event_sample_rate; - -@@ -700,19 +700,24 @@ extern int perf_proc_update_handler(struct ctl_table *table, int write, - void __user *buffer, size_t *lenp, + extern int sysctl_perf_cpu_time_max_percent; +@@ -718,19 +718,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write, loff_t *ppos); + +static inline bool perf_paranoid_any(void) +{ + return sysctl_perf_event_legitimately_concerned > 2; @@ -77044,16 +75782,7 @@ index c5b6dbf..b124155 100644 } extern void perf_event_init(void); -@@ -806,7 +811,7 @@ static inline void perf_restore_debug_store(void) { } - */ - #define perf_cpu_notifier(fn) \ - do { \ -- static struct notifier_block fn##_nb __cpuinitdata = \ -+ static struct notifier_block fn##_nb = \ - { .notifier_call = fn, .priority = CPU_PRI_PERF }; \ - unsigned long cpu = smp_processor_id(); \ - unsigned long flags; \ -@@ -826,7 +831,7 @@ struct perf_pmu_events_attr { +@@ -846,7 +851,7 @@ struct perf_pmu_events_attr { struct device_attribute attr; u64 id; const char *event_str; @@ -77121,10 +75850,10 @@ index 7c1d252..c5c773e 100644 struct generic_pm_domain { diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h -index 7d7e09e..8671ef8 100644 +index 6fa7cea..7bf6415 100644 --- a/include/linux/pm_runtime.h +++ b/include/linux/pm_runtime.h -@@ -104,7 +104,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev) +@@ -103,7 +103,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev) static inline void pm_runtime_mark_last_busy(struct device *dev) { @@ -77162,7 +75891,7 @@ index 2110a81..13a11bb 100644 /********** include/linux/timer.h **********/ /* diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h -index c0f44c2..1572583 100644 +index d8b187c3..9a9257a 100644 --- a/include/linux/power/smartreflex.h +++ b/include/linux/power/smartreflex.h @@ -238,7 +238,7 @@ struct omap_sr_class_data { @@ -77301,10 +76030,27 @@ index 34a1e10..03a6d03 100644 struct proc_ns { void *ns; diff --git a/include/linux/random.h b/include/linux/random.h -index 3b9377d..61b506a 100644 +index 3b9377d..943ad4a 100644 --- a/include/linux/random.h +++ b/include/linux/random.h -@@ -32,6 +32,11 @@ void prandom_seed(u32 seed); +@@ -10,6 +10,16 @@ + + + extern void add_device_randomness(const void *, unsigned int); ++ ++static inline void add_latent_entropy(void) ++{ ++ ++#ifdef LATENT_ENTROPY_PLUGIN ++ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy)); ++#endif ++ ++} ++ + extern void add_input_randomness(unsigned int type, unsigned int code, + unsigned int value); + extern void add_interrupt_randomness(int irq, int irq_flags); +@@ -32,6 +42,11 @@ void prandom_seed(u32 seed); u32 prandom_u32_state(struct rnd_state *); void prandom_bytes_state(struct rnd_state *state, void *buf, int nbytes); @@ -77365,10 +76111,10 @@ index f4b1001..8ddb2b6 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/reboot.h b/include/linux/reboot.h -index 23b3630..e1bc12b 100644 +index 8e00f9f..9449b55 100644 --- a/include/linux/reboot.h +++ b/include/linux/reboot.h -@@ -18,9 +18,9 @@ extern int unregister_reboot_notifier(struct notifier_block *); +@@ -43,9 +43,9 @@ extern int unregister_reboot_notifier(struct notifier_block *); * Architecture-specific implementations of sys_reboot commands. */ @@ -77381,7 +76127,7 @@ index 23b3630..e1bc12b 100644 extern void machine_shutdown(void); struct pt_regs; -@@ -31,9 +31,9 @@ extern void machine_crash_shutdown(struct pt_regs *); +@@ -56,9 +56,9 @@ extern void machine_crash_shutdown(struct pt_regs *); */ extern void kernel_restart_prepare(char *cmd); @@ -77394,7 +76140,7 @@ index 23b3630..e1bc12b 100644 extern int C_A_D; /* for sysctl */ void ctrl_alt_del(void); -@@ -47,7 +47,7 @@ extern int orderly_poweroff(bool force); +@@ -72,7 +72,7 @@ extern int orderly_poweroff(bool force); * Emergency restart, callable from an interrupt handler. */ @@ -77431,10 +76177,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 18e0993..8ab5b21 100644 +index b71d573..2f940bd 100644 --- a/include/linux/rio.h +++ b/include/linux/rio.h -@@ -345,7 +345,7 @@ struct rio_ops { +@@ -355,7 +355,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); @@ -77459,7 +76205,7 @@ index 6dacb93..6174423 100644 static inline void anon_vma_merge(struct vm_area_struct *vma, struct vm_area_struct *next) diff --git a/include/linux/sched.h b/include/linux/sched.h -index 178a8d9..918ea01 100644 +index 078066d..4090b3b 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -62,6 +62,7 @@ struct bio_list; @@ -77479,7 +76225,7 @@ index 178a8d9..918ea01 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); -@@ -314,6 +315,18 @@ struct nsproxy; +@@ -314,6 +315,19 @@ struct nsproxy; struct user_namespace; #ifdef CONFIG_MMU @@ -77495,10 +76241,11 @@ index 178a8d9..918ea01 100644 + +extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset); +extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset); ++ extern void arch_pick_mmap_layout(struct mm_struct *mm); extern unsigned long arch_get_unmapped_area(struct file *, unsigned long, unsigned long, -@@ -591,6 +604,17 @@ struct signal_struct { +@@ -589,6 +603,17 @@ struct signal_struct { #ifdef CONFIG_TASKSTATS struct taskstats *stats; #endif @@ -77516,7 +76263,7 @@ index 178a8d9..918ea01 100644 #ifdef CONFIG_AUDIT unsigned audit_tty; unsigned audit_tty_log_passwd; -@@ -671,6 +695,14 @@ struct user_struct { +@@ -669,6 +694,14 @@ struct user_struct { struct key *session_keyring; /* UID's default session keyring */ #endif @@ -77531,7 +76278,7 @@ index 178a8d9..918ea01 100644 /* Hash table maintenance information */ struct hlist_node uidhash_node; kuid_t uid; -@@ -1158,8 +1190,8 @@ struct task_struct { +@@ -1151,8 +1184,8 @@ struct task_struct { struct list_head thread_group; struct completion *vfork_done; /* for vfork() */ @@ -77542,7 +76289,7 @@ index 178a8d9..918ea01 100644 cputime_t utime, stime, utimescaled, stimescaled; cputime_t gtime; -@@ -1184,11 +1216,6 @@ struct task_struct { +@@ -1177,11 +1210,6 @@ struct task_struct { struct task_cputime cputime_expires; struct list_head cpu_timers[3]; @@ -77554,7 +76301,7 @@ index 178a8d9..918ea01 100644 char comm[TASK_COMM_LEN]; /* executable name excluding path - access with [gs]et_task_comm (which lock it with task_lock()) -@@ -1205,6 +1232,10 @@ struct task_struct { +@@ -1198,6 +1226,10 @@ struct task_struct { #endif /* CPU-specific state of this task */ struct thread_struct thread; @@ -77565,7 +76312,7 @@ index 178a8d9..918ea01 100644 /* filesystem information */ struct fs_struct *fs; /* open file information */ -@@ -1278,6 +1309,10 @@ struct task_struct { +@@ -1271,6 +1303,10 @@ struct task_struct { gfp_t lockdep_reclaim_gfp; #endif @@ -77576,7 +76323,7 @@ index 178a8d9..918ea01 100644 /* journalling filesystem info */ void *journal_info; -@@ -1316,6 +1351,10 @@ struct task_struct { +@@ -1309,6 +1345,10 @@ struct task_struct { /* cg_list protected by css_set_lock and tsk->alloc_lock */ struct list_head cg_list; #endif @@ -77587,7 +76334,7 @@ index 178a8d9..918ea01 100644 #ifdef CONFIG_FUTEX struct robust_list_head __user *robust_list; #ifdef CONFIG_COMPAT -@@ -1416,8 +1455,76 @@ struct task_struct { +@@ -1406,8 +1446,76 @@ struct task_struct { unsigned int sequential_io; unsigned int sequential_io_avg; #endif @@ -77664,7 +76411,7 @@ index 178a8d9..918ea01 100644 /* Future-safe accessor for struct task_struct's cpus_allowed. */ #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed) -@@ -1476,7 +1583,7 @@ struct pid_namespace; +@@ -1466,7 +1574,7 @@ struct pid_namespace; pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type, struct pid_namespace *ns); @@ -77673,7 +76420,7 @@ index 178a8d9..918ea01 100644 { return tsk->pid; } -@@ -1919,7 +2026,9 @@ void yield(void); +@@ -1916,7 +2024,9 @@ void yield(void); extern struct exec_domain default_exec_domain; union thread_union { @@ -77683,7 +76430,7 @@ index 178a8d9..918ea01 100644 unsigned long stack[THREAD_SIZE/sizeof(long)]; }; -@@ -1952,6 +2061,7 @@ extern struct pid_namespace init_pid_ns; +@@ -1949,6 +2059,7 @@ extern struct pid_namespace init_pid_ns; */ extern struct task_struct *find_task_by_vpid(pid_t nr); @@ -77691,7 +76438,7 @@ index 178a8d9..918ea01 100644 extern struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns); -@@ -2118,7 +2228,7 @@ extern void __cleanup_sighand(struct sighand_struct *); +@@ -2113,7 +2224,7 @@ extern void __cleanup_sighand(struct sighand_struct *); extern void exit_itimers(struct signal_struct *); extern void flush_itimer_signals(void); @@ -77700,7 +76447,7 @@ index 178a8d9..918ea01 100644 extern int allow_signal(int); extern int disallow_signal(int); -@@ -2309,9 +2419,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p) +@@ -2304,9 +2415,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p) #endif @@ -77725,19 +76472,28 @@ index bf8086b..962b035 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 4686491..2bd210e 100644 +index 7ce53ae..8ee24a5 100644 --- a/include/linux/security.h +++ b/include/linux/security.h -@@ -26,6 +26,7 @@ - #include <linux/capability.h> +@@ -27,6 +27,7 @@ #include <linux/slab.h> #include <linux/err.h> + #include <linux/string.h> +#include <linux/grsecurity.h> struct linux_binprm; struct cred; +@@ -116,8 +117,6 @@ struct seq_file; + + extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb); + +-void reset_security_ops(void); +- + #ifdef CONFIG_MMU + extern unsigned long mmap_min_addr; + extern unsigned long dac_mmap_min_addr; diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h -index 2da29ac..aac448ec 100644 +index 4e32edc..f8f2d18 100644 --- a/include/linux/seq_file.h +++ b/include/linux/seq_file.h @@ -26,6 +26,9 @@ struct seq_file { @@ -77786,10 +76542,10 @@ index d897484..323ba98 100644 #ifdef CONFIG_PROC_FS struct seq_file; diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h -index dec1748..112c1f9 100644 +index 3b71a4e..5c9f309 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -640,7 +640,7 @@ extern bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from, +@@ -648,7 +648,7 @@ extern bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from, extern struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags, int node); extern struct sk_buff *build_skb(void *data, unsigned int frag_size); @@ -77798,7 +76554,7 @@ index dec1748..112c1f9 100644 gfp_t priority) { return __alloc_skb(size, priority, 0, NUMA_NO_NODE); -@@ -756,7 +756,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb) +@@ -764,7 +764,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb) */ static inline int skb_queue_empty(const struct sk_buff_head *list) { @@ -77807,7 +76563,7 @@ index dec1748..112c1f9 100644 } /** -@@ -769,7 +769,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list) +@@ -777,7 +777,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list) static inline bool skb_queue_is_last(const struct sk_buff_head *list, const struct sk_buff *skb) { @@ -77816,7 +76572,7 @@ index dec1748..112c1f9 100644 } /** -@@ -782,7 +782,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list, +@@ -790,7 +790,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list, static inline bool skb_queue_is_first(const struct sk_buff_head *list, const struct sk_buff *skb) { @@ -77825,7 +76581,7 @@ index dec1748..112c1f9 100644 } /** -@@ -1848,7 +1848,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len) +@@ -1750,7 +1750,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 @@ -77834,7 +76590,7 @@ index dec1748..112c1f9 100644 #endif extern int ___pskb_trim(struct sk_buff *skb, unsigned int len); -@@ -2443,7 +2443,7 @@ extern struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, +@@ -2345,7 +2345,7 @@ extern struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock, int *err); extern unsigned int datagram_poll(struct file *file, struct socket *sock, struct poll_table_struct *wait); @@ -77843,7 +76599,7 @@ index dec1748..112c1f9 100644 int offset, struct iovec *to, int size); extern int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, -@@ -2733,6 +2733,9 @@ static inline void nf_reset(struct sk_buff *skb) +@@ -2636,6 +2636,9 @@ static inline void nf_reset(struct sk_buff *skb) nf_bridge_put(skb->nf_bridge); skb->nf_bridge = NULL; #endif @@ -77854,7 +76610,7 @@ index dec1748..112c1f9 100644 static inline void nf_reset_trace(struct sk_buff *skb) diff --git a/include/linux/slab.h b/include/linux/slab.h -index 0c62175..f016ac1 100644 +index 6c5cc0e..9ca0fd6 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -12,15 +12,29 @@ @@ -77923,7 +76679,7 @@ index 0c62175..f016ac1 100644 void (*ctor)(void *); /* Called on object slot creation */ struct list_head list; /* List of all slab caches on the system */ }; -@@ -226,6 +245,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1]; +@@ -238,6 +257,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1]; extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1]; #endif @@ -77934,7 +76690,7 @@ index 0c62175..f016ac1 100644 /* * Figure out which kmalloc slab an allocation of a certain size * belongs to. -@@ -234,7 +257,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1]; +@@ -246,7 +269,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1]; * 2 = 120 .. 192 bytes * n = 2^(n-1) .. 2^n -1 */ @@ -77943,15 +76699,7 @@ index 0c62175..f016ac1 100644 { if (!size) return 0; -@@ -406,6 +429,7 @@ void print_slabinfo_header(struct seq_file *m); - * for general use, and so are not documented here. For a full list of - * potential flags, always refer to linux/gfp.h. - */ -+ - static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags) - { - if (size != 0 && n > SIZE_MAX / size) -@@ -465,7 +489,7 @@ static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep, +@@ -492,7 +515,7 @@ static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep, #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \ (defined(CONFIG_SLAB) && defined(CONFIG_TRACING)) || \ (defined(CONFIG_SLOB) && defined(CONFIG_TRACING)) @@ -77960,7 +76708,7 @@ index 0c62175..f016ac1 100644 #define kmalloc_track_caller(size, flags) \ __kmalloc_track_caller(size, flags, _RET_IP_) #else -@@ -485,7 +509,7 @@ extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long); +@@ -512,7 +535,7 @@ extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long); #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \ (defined(CONFIG_SLAB) && defined(CONFIG_TRACING)) || \ (defined(CONFIG_SLOB) && defined(CONFIG_TRACING)) @@ -78048,7 +76796,7 @@ index cd40158..4e2f7af 100644 return kmem_cache_alloc_node_trace(cachep, flags, node, size); diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h -index f28e14a..7831211 100644 +index 095a5a4..4b82027 100644 --- a/include/linux/slob_def.h +++ b/include/linux/slob_def.h @@ -11,7 +11,7 @@ static __always_inline void *kmem_cache_alloc(struct kmem_cache *cachep, @@ -78060,7 +76808,7 @@ index f28e14a..7831211 100644 static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) { -@@ -31,7 +31,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags) +@@ -23,7 +23,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags) return __kmalloc_node(size, flags, NUMA_NO_NODE); } @@ -78110,10 +76858,10 @@ index 027276f..092bfe8 100644 #ifdef CONFIG_TRACING diff --git a/include/linux/smp.h b/include/linux/smp.h -index c848876..11e8a84 100644 +index c181399..09d7b92 100644 --- a/include/linux/smp.h +++ b/include/linux/smp.h -@@ -221,7 +221,9 @@ static inline void kick_all_cpus_sync(void) { } +@@ -217,7 +217,9 @@ static inline void kick_all_cpus_sync(void) { } #endif #define get_cpu() ({ preempt_disable(); smp_processor_id(); }) @@ -78239,10 +76987,10 @@ index 0b8e3e6..33e0a01 100644 #define RPCRDMA_VERSION 1 diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h -index ff374ab..7fd2ecb 100644 +index 8d71d65..f79586e 100644 --- a/include/linux/sunrpc/svcauth.h +++ b/include/linux/sunrpc/svcauth.h -@@ -109,7 +109,7 @@ struct auth_ops { +@@ -120,7 +120,7 @@ struct auth_ops { int (*release)(struct svc_rqst *rq); void (*domain_release)(struct auth_domain *); int (*set_client)(struct svc_rqst *rq); @@ -78355,10 +77103,10 @@ index 14a8ff2..af52bad 100644 struct ctl_node { struct rb_node node; diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h -index e2cee22..3ddb921 100644 +index 9e8a9b5..753de68 100644 --- a/include/linux/sysfs.h +++ b/include/linux/sysfs.h -@@ -31,7 +31,8 @@ struct attribute { +@@ -33,7 +33,8 @@ struct attribute { struct lock_class_key *key; struct lock_class_key skey; #endif @@ -78368,18 +77116,17 @@ index e2cee22..3ddb921 100644 /** * sysfs_attr_init - initialize a dynamically allocated sysfs attribute -@@ -59,8 +60,8 @@ struct attribute_group { - umode_t (*is_visible)(struct kobject *, +@@ -62,7 +63,8 @@ struct attribute_group { struct attribute *, int); struct attribute **attrs; + struct bin_attribute **bin_attrs; -}; -- +} __do_const; +typedef struct attribute_group __no_const attribute_group_no_const; - /** -@@ -107,7 +108,8 @@ struct bin_attribute { + * Use these macros to make defining attributes easier. See include/linux/device.h +@@ -123,7 +125,8 @@ struct bin_attribute { char *, loff_t, size_t); int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr, struct vm_area_struct *vma); @@ -78431,7 +77178,7 @@ index e7e0473..7989295 100644 #endif /* _LINUX_THREAD_INFO_H */ diff --git a/include/linux/tty.h b/include/linux/tty.h -index 8780bd2..d1ae08b 100644 +index 01ac30e..bf18a71 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -194,7 +194,7 @@ struct tty_port { @@ -78443,7 +77190,7 @@ index 8780bd2..d1ae08b 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 */ -@@ -550,7 +550,7 @@ extern int tty_port_open(struct tty_port *port, +@@ -547,7 +547,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) { @@ -78466,10 +77213,10 @@ index 756a609..b302dd6 100644 struct tty_driver { int magic; /* magic number for this structure */ diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h -index 58390c7..95e214c 100644 +index a1b0489..f02e17c 100644 --- a/include/linux/tty_ldisc.h +++ b/include/linux/tty_ldisc.h -@@ -146,7 +146,7 @@ struct tty_ldisc_ops { +@@ -198,7 +198,7 @@ struct tty_ldisc_ops { struct module *owner; @@ -78594,10 +77341,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 a0bee5a..5533a52 100644 +index 0eec268..4496526 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h -@@ -552,7 +552,7 @@ struct usb_device { +@@ -560,7 +560,7 @@ struct usb_device { int maxchild; u32 quirks; @@ -78606,7 +77353,7 @@ index a0bee5a..5533a52 100644 unsigned long active_duration; -@@ -1607,7 +1607,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in, +@@ -1617,7 +1617,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, @@ -78670,16 +77417,16 @@ index 6f8fbcf..8259001 100644 + MODULE_GRSEC diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h -index 7d5773a..541c01c 100644 +index 4b8a891..c20e936 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 */ - #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ - #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */ - #define VM_UNLIST 0x00000020 /* vm_struct is not listed in vmlist */ + #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ + #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */ + #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */ + +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC) -+#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */ ++#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */ +#endif + /* bits [20..32] reserved for arch specific ioremap internals */ @@ -78694,7 +77441,7 @@ index 7d5773a..541c01c 100644 extern void vfree(const void *addr); extern void *vmap(struct page **pages, unsigned int count, -@@ -137,8 +142,8 @@ extern struct vm_struct *alloc_vm_area(size_t size, pte_t **ptes); +@@ -141,8 +146,8 @@ extern struct vm_struct *alloc_vm_area(size_t size, pte_t **ptes); extern void free_vm_area(struct vm_struct *area); /* for /dev/kmem */ @@ -78772,25 +77519,6 @@ index c586679..f06b389 100644 } static inline void __dec_zone_page_state(struct page *page, -diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h -index 623488f..44b5742 100644 ---- a/include/linux/workqueue.h -+++ b/include/linux/workqueue.h -@@ -410,11 +410,11 @@ __alloc_workqueue_key(const char *fmt, unsigned int flags, int max_active, - alloc_workqueue(fmt, WQ_UNBOUND | __WQ_ORDERED | (flags), 1, ##args) - - #define create_workqueue(name) \ -- alloc_workqueue((name), WQ_MEM_RECLAIM, 1) -+ alloc_workqueue("%s", WQ_MEM_RECLAIM, 1, (name)) - #define create_freezable_workqueue(name) \ -- alloc_workqueue((name), WQ_FREEZABLE | WQ_UNBOUND | WQ_MEM_RECLAIM, 1) -+ alloc_workqueue("%s", WQ_FREEZABLE | WQ_UNBOUND | WQ_MEM_RECLAIM, 1, (name)) - #define create_singlethread_workqueue(name) \ -- alloc_workqueue((name), WQ_UNBOUND | WQ_MEM_RECLAIM, 1) -+ alloc_workqueue("%s", WQ_UNBOUND | WQ_MEM_RECLAIM, 1, (name)) - - extern void destroy_workqueue(struct workqueue_struct *wq); - diff --git a/include/linux/xattr.h b/include/linux/xattr.h index fdbafc6..49dfe4f 100644 --- a/include/linux/xattr.h @@ -78836,7 +77564,7 @@ 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 95d1c91..6798cca 100644 +index c768c9f..bdcaa5a 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h @@ -76,7 +76,7 @@ struct v4l2_file_operations { @@ -78862,11 +77590,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 adcbb20..62c2559 100644 +index d9fa68f..45c88d1 100644 --- a/include/net/9p/transport.h +++ b/include/net/9p/transport.h -@@ -57,7 +57,7 @@ struct p9_trans_module { - int (*cancel) (struct p9_client *, struct p9_req_t *req); +@@ -63,7 +63,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); -}; @@ -78875,7 +77603,7 @@ index adcbb20..62c2559 100644 void v9fs_register_trans(struct p9_trans_module *m); void v9fs_unregister_trans(struct p9_trans_module *m); diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h -index fb94cf1..7c0c987 100644 +index 1a966af..2767cf6 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -551,7 +551,7 @@ struct l2cap_ops { @@ -78924,18 +77652,18 @@ index 628e11b..4c475df 100644 #endif diff --git a/include/net/genetlink.h b/include/net/genetlink.h -index 93024a4..eeb6b6e 100644 +index 8e0b6c8..73cf605 100644 --- a/include/net/genetlink.h +++ b/include/net/genetlink.h -@@ -119,7 +119,7 @@ struct genl_ops { +@@ -120,7 +120,7 @@ struct genl_ops { struct netlink_callback *cb); int (*done)(struct netlink_callback *cb); struct list_head ops_list; -}; +} __do_const; - extern int genl_register_family(struct genl_family *family); - extern int genl_register_family_with_ops(struct genl_family *family, + extern int __genl_register_family(struct genl_family *family); + diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h index 734d9b5..48a9a4b 100644 --- a/include/net/gro_cells.h @@ -79013,10 +77741,10 @@ index a68f838..74518ab 100644 { return test_bit(port, sysctl_local_reserved_ports); diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h -index e49db91..76a81de 100644 +index cbf2be3..3683f6d 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h -@@ -167,7 +167,7 @@ extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh); +@@ -169,7 +169,7 @@ extern __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 == \ @@ -79026,10 +77754,10 @@ index e49db91..76a81de 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 4c062cc..3562c31 100644 +index f0d70f0..185f15b 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h -@@ -612,7 +612,7 @@ struct ip_vs_conn { +@@ -588,7 +588,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 */ @@ -79038,7 +77766,7 @@ index 4c062cc..3562c31 100644 /* packet transmitter for different forwarding methods. If it mangles the packet, it must return NF_DROP or better NF_STOLEN, -@@ -761,7 +761,7 @@ struct ip_vs_dest { +@@ -737,7 +737,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 */ @@ -79047,7 +77775,7 @@ index 4c062cc..3562c31 100644 atomic_t weight; /* server weight */ atomic_t refcnt; /* reference counter */ -@@ -1013,11 +1013,11 @@ struct netns_ipvs { +@@ -993,11 +993,11 @@ struct netns_ipvs { /* ip_vs_lblc */ int sysctl_lblc_expiration; struct ctl_table_header *lblc_ctl_header; @@ -79154,10 +77882,10 @@ index 567c681..cd73ac0 100644 struct llc_sap_state { u8 curr_state; diff --git a/include/net/mac80211.h b/include/net/mac80211.h -index 4e50d36..c7585a7 100644 +index 551ba6a..11c99c1 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -4206,7 +4206,7 @@ struct rate_control_ops { +@@ -4221,7 +4221,7 @@ struct rate_control_ops { void (*add_sta_debugfs)(void *priv, void *priv_sta, struct dentry *dir); void (*remove_sta_debugfs)(void *priv, void *priv_sta); @@ -79180,19 +77908,21 @@ index 7e748ad..5c6229b 100644 struct pneigh_entry { struct pneigh_entry *next; diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h -index b176978..ea169f4 100644 +index 84e37b1..8eba19a 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h -@@ -117,7 +117,7 @@ struct net { - #endif +@@ -119,8 +119,8 @@ struct net { struct netns_ipvs *ipvs; + #endif struct sock *diag_nlsk; - atomic_t rt_genid; +- atomic_t fnhe_genid; + atomic_unchecked_t rt_genid; ++ atomic_unchecked_t fnhe_genid; }; /* -@@ -274,7 +274,11 @@ static inline struct net *read_pnet(struct net * const *pnet) +@@ -277,7 +277,11 @@ static inline struct net *read_pnet(struct net * const *pnet) #define __net_init __init #define __net_exit __exit_refok #define __net_initdata __initdata @@ -79204,7 +77934,7 @@ index b176978..ea169f4 100644 #endif struct pernet_operations { -@@ -284,7 +288,7 @@ struct pernet_operations { +@@ -287,7 +291,7 @@ struct pernet_operations { void (*exit_batch)(struct list_head *net_exit_list); int *id; size_t size; @@ -79213,7 +77943,7 @@ index b176978..ea169f4 100644 /* * Use these carefully. If you implement a network device and it -@@ -332,12 +336,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header) +@@ -335,22 +339,22 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header) static inline int rt_genid(struct net *net) { @@ -79227,6 +77957,18 @@ index b176978..ea169f4 100644 + atomic_inc_unchecked(&net->rt_genid); } + static inline int fnhe_genid(struct net *net) + { +- return atomic_read(&net->fnhe_genid); ++ return atomic_read_unchecked(&net->fnhe_genid); + } + + static inline void fnhe_genid_bump(struct net *net) + { +- atomic_inc(&net->fnhe_genid); ++ atomic_inc_unchecked(&net->fnhe_genid); + } + #endif /* __NET_NET_NAMESPACE_H */ diff --git a/include/net/netdma.h b/include/net/netdma.h index 8ba8ce2..99b7fff 100644 @@ -79306,6 +78048,19 @@ index 005e2c2..023d340 100644 }; #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6) +diff --git a/include/net/ping.h b/include/net/ping.h +index 5db0224..0d65365 100644 +--- a/include/net/ping.h ++++ b/include/net/ping.h +@@ -55,7 +55,7 @@ struct ping_iter_state { + extern struct proto ping_prot; + extern struct ping_table ping_table; + #if IS_ENABLED(CONFIG_IPV6) +-extern struct pingv6_ops pingv6_ops; ++extern struct pingv6_ops *pingv6_ops; + #endif + + struct pingfakehdr { diff --git a/include/net/protocol.h b/include/net/protocol.h index 047c047..b9dad15 100644 --- a/include/net/protocol.h @@ -79341,23 +78096,6 @@ index 7026648..584cc8c 100644 extern int __rtnl_link_register(struct rtnl_link_ops *ops); extern void __rtnl_link_unregister(struct rtnl_link_ops *ops); -diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h -index cd89510..d67810f 100644 ---- a/include/net/sctp/sctp.h -+++ b/include/net/sctp/sctp.h -@@ -330,9 +330,9 @@ do { \ - - #else /* SCTP_DEBUG */ - --#define SCTP_DEBUG_PRINTK(whatever...) --#define SCTP_DEBUG_PRINTK_CONT(fmt, args...) --#define SCTP_DEBUG_PRINTK_IPADDR(whatever...) -+#define SCTP_DEBUG_PRINTK(whatever...) do {} while (0) -+#define SCTP_DEBUG_PRINTK_CONT(fmt, args...) do {} while (0) -+#define SCTP_DEBUG_PRINTK_IPADDR(whatever...) do {} while (0) - #define SCTP_ENABLE_DEBUG - #define SCTP_DISABLE_DEBUG - #define SCTP_ASSERT(expr, str, func) diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h index 2a82d13..62a31c2 100644 --- a/include/net/sctp/sm.h @@ -79381,7 +78119,7 @@ index 2a82d13..62a31c2 100644 /* Get the size of a DATA chunk payload. */ diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h -index 1bd4c41..9250b5b 100644 +index e745c92..3641448 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h @@ -516,7 +516,7 @@ struct sctp_pf { @@ -79394,19 +78132,19 @@ index 1bd4c41..9250b5b 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 66772cf..25bc45b 100644 +index 31d5cfb..9ee0602 100644 --- a/include/net/sock.h +++ b/include/net/sock.h -@@ -325,7 +325,7 @@ struct sock { - #ifdef CONFIG_RPS - __u32 sk_rxhash; +@@ -331,7 +331,7 @@ struct sock { + unsigned int sk_napi_id; + unsigned int sk_ll_usec; #endif - atomic_t sk_drops; + atomic_unchecked_t sk_drops; int sk_rcvbuf; struct sk_filter __rcu *sk_filter; -@@ -1797,7 +1797,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags) +@@ -1803,7 +1803,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, @@ -79415,7 +78153,7 @@ index 66772cf..25bc45b 100644 int copy, int offset) { if (skb->ip_summed == CHECKSUM_NONE) { -@@ -2056,7 +2056,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk) +@@ -2065,7 +2065,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk) } } @@ -79425,10 +78163,10 @@ index 66772cf..25bc45b 100644 /** * sk_page_frag - return an appropriate page_frag diff --git a/include/net/tcp.h b/include/net/tcp.h -index 5bba80f..8520a82 100644 +index d198005..c974a393 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h -@@ -524,7 +524,7 @@ extern void tcp_retransmit_timer(struct sock *sk); +@@ -521,7 +521,7 @@ extern void tcp_retransmit_timer(struct sock *sk); extern void tcp_xmit_retransmit_queue(struct sock *); extern void tcp_simple_retransmit(struct sock *); extern int tcp_trim_head(struct sock *, struct sk_buff *, u32); @@ -79437,7 +78175,7 @@ index 5bba80f..8520a82 100644 extern void tcp_send_probe0(struct sock *); extern void tcp_send_partial(struct sock *); -@@ -697,8 +697,8 @@ struct tcp_skb_cb { +@@ -694,8 +694,8 @@ struct tcp_skb_cb { struct inet6_skb_parm h6; #endif } header; /* For incoming frames */ @@ -79448,7 +78186,7 @@ index 5bba80f..8520a82 100644 __u32 when; /* used to compute rtt's */ __u8 tcp_flags; /* TCP header flags. (tcp[13]) */ -@@ -712,7 +712,7 @@ struct tcp_skb_cb { +@@ -709,7 +709,7 @@ struct tcp_skb_cb { __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */ /* 1 byte hole */ @@ -79458,7 +78196,7 @@ index 5bba80f..8520a82 100644 #define TCP_SKB_CB(__skb) ((struct tcp_skb_cb *)&((__skb)->cb[0])) diff --git a/include/net/xfrm.h b/include/net/xfrm.h -index 94ce082..62b278d 100644 +index e823786..55bf641 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -305,7 +305,7 @@ struct xfrm_policy_afinfo { @@ -79470,16 +78208,16 @@ index 94ce082..62b278d 100644 extern int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo); extern int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo); -@@ -341,7 +341,7 @@ struct xfrm_state_afinfo { - struct sk_buff *skb); +@@ -342,7 +342,7 @@ struct xfrm_state_afinfo { int (*transport_finish)(struct sk_buff *skb, int async); + void (*local_error)(struct sk_buff *skb, u32 mtu); -}; +} __do_const; extern int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo); extern int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo); -@@ -424,7 +424,7 @@ struct xfrm_mode { +@@ -427,7 +427,7 @@ struct xfrm_mode { struct module *owner; unsigned int encap; int flags; @@ -79488,7 +78226,7 @@ index 94ce082..62b278d 100644 /* Flags for xfrm_mode. */ enum { -@@ -521,7 +521,7 @@ struct xfrm_policy { +@@ -524,7 +524,7 @@ struct xfrm_policy { struct timer_list timer; struct flow_cache_object flo; @@ -79532,10 +78270,10 @@ index e1379b4..67eafbe 100644 u8 qfull; enum fc_lport_state state; diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h -index cc64587..608f523 100644 +index a44954c..5da04b2 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h -@@ -171,9 +171,9 @@ struct scsi_device { +@@ -172,9 +172,9 @@ struct scsi_device { unsigned int max_device_blocked; /* what device_blocked counts down from */ #define SCSI_DEFAULT_DEVICE_BLOCKED 3 @@ -79576,10 +78314,10 @@ index 9031a26..750d592 100644 /** * struct snd_compr: Compressed device diff --git a/include/sound/soc.h b/include/sound/soc.h -index 85c1522..f44bad1 100644 +index 6eabee7..58afb50 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h -@@ -781,7 +781,7 @@ struct snd_soc_codec_driver { +@@ -783,7 +783,7 @@ struct snd_soc_codec_driver { /* probe ordering - for components with runtime dependencies */ int probe_order; int remove_order; @@ -79588,7 +78326,7 @@ index 85c1522..f44bad1 100644 /* SoC platform interface */ struct snd_soc_platform_driver { -@@ -827,7 +827,7 @@ struct snd_soc_platform_driver { +@@ -829,7 +829,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); int (*bespoke_trigger)(struct snd_pcm_substream *, int); @@ -79598,10 +78336,10 @@ index 85c1522..f44bad1 100644 struct snd_soc_platform { const char *name; diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h -index 4ea4f98..a63629b 100644 +index e34fc90..ecefa2c 100644 --- a/include/target/target_core_base.h +++ b/include/target/target_core_base.h -@@ -653,7 +653,7 @@ struct se_device { +@@ -643,7 +643,7 @@ struct se_device { spinlock_t stats_lock; /* Active commands on this virtual SE device */ atomic_t simple_cmds; @@ -79948,7 +78686,7 @@ index f9466fa..f4e2b81 100644 #define NR_USB_REQUEST_I2C_SUB_IO 0x02 diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h -index 1a91850..28573f8 100644 +index 30f5362..8ed8ac9 100644 --- a/include/video/uvesafb.h +++ b/include/video/uvesafb.h @@ -122,6 +122,7 @@ struct uvesafb_par { @@ -79960,10 +78698,10 @@ index 1a91850..28573f8 100644 void *pmi_pal; u8 *vbe_state_orig; /* diff --git a/init/Kconfig b/init/Kconfig -index 2d9b831..ae4c8ac 100644 +index fed81b5..0d3b964 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1029,6 +1029,7 @@ endif # CGROUPS +@@ -1069,6 +1069,7 @@ endif # CGROUPS config CHECKPOINT_RESTORE bool "Checkpoint/restore support" if EXPERT @@ -79971,7 +78709,7 @@ index 2d9b831..ae4c8ac 100644 default n help Enables additional kernel features in a sake of checkpoint/restore. -@@ -1516,7 +1517,7 @@ config SLUB_DEBUG +@@ -1553,7 +1554,7 @@ config SLUB_DEBUG config COMPAT_BRK bool "Disable heap randomization" @@ -79980,7 +78718,7 @@ index 2d9b831..ae4c8ac 100644 help Randomizing heap placement makes heap exploits harder, but it also breaks ancient binaries (including anything libc5 based). -@@ -1779,7 +1780,7 @@ config INIT_ALL_POSSIBLE +@@ -1827,7 +1828,7 @@ config INIT_ALL_POSSIBLE config STOP_MACHINE bool default y @@ -80004,7 +78742,7 @@ 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 a2b49f2..03a0e17c 100644 +index 816014c..c2054db 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -355,11 +355,11 @@ static void __init get_fs_names(char *page) @@ -80337,10 +79075,10 @@ index a67ef9d..2d17ed9 100644 #ifdef CONFIG_BLK_DEV_RAM int fd; diff --git a/init/main.c b/init/main.c -index 9484f4b..0eac7c3 100644 +index d03d2ec..665fac3 100644 --- a/init/main.c +++ b/init/main.c -@@ -100,6 +100,8 @@ static inline void mark_rodata_ro(void) { } +@@ -101,6 +101,8 @@ static inline void mark_rodata_ro(void) { } extern void tc_init(void); #endif @@ -80349,7 +79087,7 @@ index 9484f4b..0eac7c3 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 -@@ -153,6 +155,74 @@ static int __init set_reset_devices(char *str) +@@ -154,6 +156,74 @@ static int __init set_reset_devices(char *str) __setup("reset_devices", set_reset_devices); @@ -80424,19 +79162,11 @@ index 9484f4b..0eac7c3 100644 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; -@@ -655,8 +725,6 @@ static void __init do_ctors(void) - bool initcall_debug; - core_param(initcall_debug, initcall_debug, bool, 0644); - --static char msgbuf[64]; -- - static int __init_or_module do_one_initcall_debug(initcall_t fn) - { - ktime_t calltime, delta, rettime; -@@ -679,23 +747,22 @@ int __init_or_module do_one_initcall(initcall_t fn) +@@ -679,24 +749,22 @@ 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) @@ -80461,39 +79191,31 @@ index 9484f4b..0eac7c3 100644 return ret; } -@@ -748,8 +815,14 @@ static void __init do_initcall_level(int level) +@@ -749,8 +817,10 @@ static void __init do_initcall_level(int level) level, level, &repair_env_string); - for (fn = initcall_levels[level]; fn < initcall_levels[level+1]; fn++) + for (fn = initcall_levels[level]; fn < initcall_levels[level+1]; fn++) { do_one_initcall(*fn); -+ -+#ifdef LATENT_ENTROPY_PLUGIN -+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy)); -+#endif -+ ++ add_latent_entropy(); + } } static void __init do_initcalls(void) -@@ -783,8 +856,14 @@ static void __init do_pre_smp_initcalls(void) +@@ -784,8 +854,10 @@ static void __init do_pre_smp_initcalls(void) { initcall_t *fn; - for (fn = __initcall_start; fn < __initcall0_start; fn++) + for (fn = __initcall_start; fn < __initcall0_start; fn++) { do_one_initcall(*fn); -+ -+#ifdef LATENT_ENTROPY_PLUGIN -+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy)); -+#endif -+ ++ add_latent_entropy(); + } } /* -@@ -802,8 +881,8 @@ static int run_init_process(const char *init_filename) +@@ -803,8 +875,8 @@ static int run_init_process(const char *init_filename) { argv_init[0] = init_filename; return do_execve(init_filename, @@ -80504,7 +79226,7 @@ index 9484f4b..0eac7c3 100644 } static noinline void __init kernel_init_freeable(void); -@@ -880,7 +959,7 @@ static noinline void __init kernel_init_freeable(void) +@@ -881,7 +953,7 @@ static noinline void __init kernel_init_freeable(void) do_basic_setup(); /* Open the /dev/console on the rootfs, this should never fail */ @@ -80513,7 +79235,7 @@ index 9484f4b..0eac7c3 100644 pr_err("Warning: unable to open an initial console.\n"); (void) sys_dup(0); -@@ -893,11 +972,13 @@ static noinline void __init kernel_init_freeable(void) +@@ -894,11 +966,13 @@ static noinline void __init kernel_init_freeable(void) if (!ramdisk_execute_command) ramdisk_execute_command = "/init"; @@ -80591,7 +79313,7 @@ index 383d638..943fdbb 100644 mq_table.data = get_mq(table); diff --git a/ipc/mqueue.c b/ipc/mqueue.c -index e4e47f6..a85e0ad 100644 +index ae1996d..a35f2cc 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c @@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb, @@ -80603,10 +79325,10 @@ index e4e47f6..a85e0ad 100644 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 f8fbe2c..074649e 100644 +index 9f29d9e..8f284e0 100644 --- a/ipc/msg.c +++ b/ipc/msg.c -@@ -296,18 +296,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg) +@@ -291,18 +291,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg) return security_msg_queue_associate(msq, msgflg); } @@ -80632,10 +79354,10 @@ index f8fbe2c..074649e 100644 msg_params.flg = msgflg; diff --git a/ipc/sem.c b/ipc/sem.c -index 70480a3..f4e8262 100644 +index 4108889..511ada1 100644 --- a/ipc/sem.c +++ b/ipc/sem.c -@@ -460,10 +460,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp, +@@ -517,10 +517,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp, return 0; } @@ -80652,7 +79374,7 @@ index 70480a3..f4e8262 100644 struct ipc_params sem_params; ns = current->nsproxy->ipc_ns; -@@ -471,10 +476,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg) +@@ -528,10 +533,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg) if (nsems < 0 || nsems > ns->sc_semmsl) return -EINVAL; @@ -80664,7 +79386,7 @@ index 70480a3..f4e8262 100644 sem_params.flg = semflg; sem_params.u.nsems = nsems; diff --git a/ipc/shm.c b/ipc/shm.c -index 7e199fa..180a1ca 100644 +index c6b4ad5..3ec3254 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp); @@ -80697,7 +79419,7 @@ index 7e199fa..180a1ca 100644 shp->shm_segsz = size; shp->shm_nattch = 0; shp->shm_file = file; -@@ -582,18 +598,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp, +@@ -585,18 +601,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp, return 0; } @@ -80722,7 +79444,7 @@ index 7e199fa..180a1ca 100644 shm_params.key = key; shm_params.flg = shmflg; shm_params.u.size = size; -@@ -1014,6 +1031,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr, +@@ -1028,6 +1045,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr, f_mode = FMODE_READ | FMODE_WRITE; } if (shmflg & SHM_EXEC) { @@ -80735,7 +79457,7 @@ index 7e199fa..180a1ca 100644 prot |= PROT_EXEC; acc_mode |= S_IXUGO; } -@@ -1037,9 +1060,21 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr, +@@ -1051,9 +1074,21 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr, if (err) goto out_unlock; @@ -80810,24 +79532,11 @@ index 91e53d0..d9e3ec4 100644 status_set.backlog = skb_queue_len(&audit_skb_queue); audit_send_reply(NETLINK_CB(skb).portid, seq, AUDIT_GET, 0, 0, &status_set, sizeof(status_set)); -diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c -index 6bd4a90..0ee9eff 100644 ---- a/kernel/auditfilter.c -+++ b/kernel/auditfilter.c -@@ -423,7 +423,7 @@ static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data, - f->lsm_rule = NULL; - - /* Support legacy tests for a valid loginuid */ -- if ((f->type == AUDIT_LOGINUID) && (f->val == 4294967295)) { -+ if ((f->type == AUDIT_LOGINUID) && (f->val == 4294967295U)) { - f->type = AUDIT_LOGINUID_SET; - f->val = 0; - } diff --git a/kernel/auditsc.c b/kernel/auditsc.c -index 3c8a601..3a416f6 100644 +index 9845cb3..3ec9369 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c -@@ -1956,7 +1956,7 @@ int auditsc_get_stamp(struct audit_context *ctx, +@@ -1962,7 +1962,7 @@ int auditsc_get_stamp(struct audit_context *ctx, } /* global counter which is incremented every time something logs in */ @@ -80836,7 +79545,7 @@ index 3c8a601..3a416f6 100644 /** * audit_set_loginuid - set current task's audit_context loginuid -@@ -1980,7 +1980,7 @@ int audit_set_loginuid(kuid_t loginuid) +@@ -1986,7 +1986,7 @@ int audit_set_loginuid(kuid_t loginuid) return -EPERM; #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */ @@ -80942,16 +79651,16 @@ index f6c2ce5..982c0f9 100644 + return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid); +} diff --git a/kernel/cgroup.c b/kernel/cgroup.c -index 2e9b387..61817b1 100644 +index e919633..f46b08f 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c -@@ -5398,7 +5398,7 @@ static int cgroup_css_links_read(struct cgroup *cont, - struct css_set *cg = link->cg; +@@ -5623,7 +5623,7 @@ static int cgroup_css_links_read(struct cgroup *cgrp, + struct css_set *cset = link->cset; struct task_struct *task; int count = 0; -- seq_printf(seq, "css_set %p\n", cg); -+ seq_printf(seq, "css_set %pK\n", cg); - list_for_each_entry(task, &cg->tasks, cg_list) { +- 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"); diff --git a/kernel/compat.c b/kernel/compat.c @@ -81356,7 +80065,7 @@ index 00eb8f7..d7e3244 100644 #ifdef CONFIG_MODULE_UNLOAD { diff --git a/kernel/events/core.c b/kernel/events/core.c -index e76e495..cbfe63a 100644 +index f86599e..b18b180 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -156,8 +156,15 @@ static struct srcu_struct pmus_srcu; @@ -81376,8 +80085,8 @@ index e76e495..cbfe63a 100644 /* Minimum for 512 kiB + 1 user control page */ int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */ -@@ -184,7 +191,7 @@ int perf_proc_update_handler(struct ctl_table *table, int write, - return 0; +@@ -270,7 +277,7 @@ void perf_sample_event_took(u64 sample_len_ns) + update_perf_cpu_limits(); } -static atomic64_t perf_event_id; @@ -81385,7 +80094,7 @@ index e76e495..cbfe63a 100644 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx, enum event_type_t event_type); -@@ -2747,7 +2754,7 @@ static void __perf_event_read(void *info) +@@ -2936,7 +2943,7 @@ static void __perf_event_read(void *info) static inline u64 perf_event_count(struct perf_event *event) { @@ -81394,7 +80103,7 @@ index e76e495..cbfe63a 100644 } static u64 perf_event_read(struct perf_event *event) -@@ -3093,9 +3100,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running) +@@ -3282,9 +3289,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 + @@ -81406,7 +80115,7 @@ index e76e495..cbfe63a 100644 list_for_each_entry(child, &event->child_list, child_list) { total += perf_event_read(child); -@@ -3481,10 +3488,10 @@ void perf_event_update_userpage(struct perf_event *event) +@@ -3670,10 +3677,10 @@ void perf_event_update_userpage(struct perf_event *event) userpg->offset -= local64_read(&event->hw.prev_count); userpg->time_enabled = enabled + @@ -81419,7 +80128,7 @@ index e76e495..cbfe63a 100644 arch_perf_update_userpage(userpg, now); -@@ -4034,7 +4041,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size, +@@ -4223,7 +4230,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size, /* Data. */ sp = perf_user_stack_pointer(regs); @@ -81428,7 +80137,7 @@ index e76e495..cbfe63a 100644 dyn_size = dump_size - rem; perf_output_skip(handle, rem); -@@ -4122,11 +4129,11 @@ static void perf_output_read_one(struct perf_output_handle *handle, +@@ -4311,11 +4318,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 + @@ -81442,7 +80151,7 @@ index e76e495..cbfe63a 100644 } if (read_format & PERF_FORMAT_ID) values[n++] = primary_event_id(event); -@@ -4835,12 +4842,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event) +@@ -5024,12 +5031,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event) * need to add enough zero bytes after the string to handle * the 64bit alignment we do later. */ @@ -81457,7 +80166,7 @@ index e76e495..cbfe63a 100644 if (IS_ERR(name)) { name = strncpy(tmp, "//toolong", sizeof(tmp)); goto got_name; -@@ -6262,7 +6269,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu, +@@ -6498,7 +6505,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)); @@ -81466,7 +80175,7 @@ index e76e495..cbfe63a 100644 event->state = PERF_EVENT_STATE_INACTIVE; -@@ -6572,6 +6579,11 @@ SYSCALL_DEFINE5(perf_event_open, +@@ -6807,6 +6814,11 @@ SYSCALL_DEFINE5(perf_event_open, if (flags & ~PERF_FLAG_ALL) return -EINVAL; @@ -81478,7 +80187,7 @@ index e76e495..cbfe63a 100644 err = perf_copy_attr(attr_uptr, &attr); if (err) return err; -@@ -6904,10 +6916,10 @@ static void sync_child_event(struct perf_event *child_event, +@@ -7139,10 +7151,10 @@ static void sync_child_event(struct perf_event *child_event, /* * Add back the child's count to the parent's count: */ @@ -81545,7 +80254,7 @@ index f356974..cb8c570 100644 pagefault_disable(); result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr, diff --git a/kernel/exit.c b/kernel/exit.c -index 7bb73f9..d7978ed 100644 +index a949819..a5f127d 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -172,6 +172,10 @@ void release_task(struct task_struct * p) @@ -81559,7 +80268,7 @@ index 7bb73f9..d7978ed 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(); -@@ -340,7 +344,7 @@ int allow_signal(int sig) +@@ -329,7 +333,7 @@ int allow_signal(int sig) * know it'll be handled, so that they don't get converted to * SIGKILL or just silently dropped. */ @@ -81568,7 +80277,7 @@ index 7bb73f9..d7978ed 100644 recalc_sigpending(); spin_unlock_irq(¤t->sighand->siglock); return 0; -@@ -709,6 +713,8 @@ void do_exit(long code) +@@ -698,6 +702,8 @@ void do_exit(long code) struct task_struct *tsk = current; int group_dead; @@ -81577,7 +80286,7 @@ index 7bb73f9..d7978ed 100644 profile_task_exit(tsk); WARN_ON(blk_needs_flush_plug(tsk)); -@@ -725,7 +731,6 @@ void do_exit(long code) +@@ -714,7 +720,6 @@ void do_exit(long code) * mm_release()->clear_child_tid() from writing to a user-controlled * kernel address. */ @@ -81585,7 +80294,7 @@ index 7bb73f9..d7978ed 100644 ptrace_event(PTRACE_EVENT_EXIT, code); -@@ -784,6 +789,9 @@ void do_exit(long code) +@@ -773,6 +778,9 @@ void do_exit(long code) tsk->exit_code = code; taskstats_exit(tsk, group_dead); @@ -81595,7 +80304,7 @@ index 7bb73f9..d7978ed 100644 exit_mm(tsk); if (group_dead) -@@ -905,7 +913,7 @@ SYSCALL_DEFINE1(exit, int, error_code) +@@ -894,7 +902,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). */ @@ -81605,7 +80314,7 @@ index 7bb73f9..d7978ed 100644 { struct signal_struct *sig = current->signal; diff --git a/kernel/fork.c b/kernel/fork.c -index ffbc090..08ceeee 100644 +index bf46287..2af185d 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -319,7 +319,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig) @@ -81621,11 +80330,15 @@ index ffbc090..08ceeee 100644 } #ifdef CONFIG_MMU +-static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) +static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt) -+{ + { +- struct vm_area_struct *mpnt, *tmp, *prev, **pprev; +- struct rb_node **rb_link, *rb_parent; +- int retval; + struct vm_area_struct *tmp; -+ unsigned long charge; -+ struct mempolicy *pol; + unsigned long charge; + struct mempolicy *pol; + struct file *file; + + charge = 0; @@ -81691,28 +80404,15 @@ index ffbc090..08ceeee 100644 + return NULL; +} + - static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) - { - struct vm_area_struct *mpnt, *tmp, *prev, **pprev; - struct rb_node **rb_link, *rb_parent; - int retval; -- unsigned long charge; -- struct mempolicy *pol; ++static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) ++{ ++ struct vm_area_struct *mpnt, *tmp, *prev, **pprev; ++ struct rb_node **rb_link, *rb_parent; ++ int retval; uprobe_start_dup_mmap(); down_write(&oldmm->mmap_sem); -@@ -365,8 +433,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) - mm->locked_vm = 0; - mm->mmap = NULL; - mm->mmap_cache = NULL; -- mm->free_area_cache = oldmm->mmap_base; -- mm->cached_hole_size = ~0UL; -+ mm->free_area_cache = oldmm->free_area_cache; -+ mm->cached_hole_size = oldmm->cached_hole_size; - mm->map_count = 0; - cpumask_clear(mm_cpumask(mm)); - mm->mm_rb = RB_ROOT; -@@ -382,57 +450,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) +@@ -380,57 +448,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) prev = NULL; for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) { @@ -81774,7 +80474,7 @@ index ffbc090..08ceeee 100644 } /* -@@ -464,6 +490,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) +@@ -462,6 +488,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) if (retval) goto out; } @@ -81806,7 +80506,7 @@ index ffbc090..08ceeee 100644 /* a new mm has just been created */ arch_dup_mmap(oldmm, mm); retval = 0; -@@ -473,14 +524,6 @@ out: +@@ -471,14 +522,6 @@ out: up_write(&oldmm->mmap_sem); uprobe_end_dup_mmap(); return retval; @@ -81821,7 +80521,7 @@ index ffbc090..08ceeee 100644 } static inline int mm_alloc_pgd(struct mm_struct *mm) -@@ -695,8 +738,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode) +@@ -691,8 +734,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode) return ERR_PTR(err); mm = get_task_mm(task); @@ -81832,7 +80532,7 @@ index ffbc090..08ceeee 100644 mmput(mm); mm = ERR_PTR(-EACCES); } -@@ -918,13 +961,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk) +@@ -914,13 +957,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk) spin_unlock(&fs->lock); return -EAGAIN; } @@ -81854,7 +80554,16 @@ index ffbc090..08ceeee 100644 return 0; } -@@ -1197,10 +1247,13 @@ static struct task_struct *copy_process(unsigned long clone_flags, +@@ -1131,7 +1181,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. + */ +-static struct task_struct *copy_process(unsigned long clone_flags, ++static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags, + unsigned long stack_start, + unsigned long stack_size, + int __user *child_tidptr, +@@ -1200,6 +1250,9 @@ static struct task_struct *copy_process(unsigned long clone_flags, DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled); #endif retval = -EAGAIN; @@ -81863,14 +80572,8 @@ index ffbc090..08ceeee 100644 + if (atomic_read(&p->real_cred->user->processes) >= task_rlimit(p, RLIMIT_NPROC)) { -- if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) && -- p->real_cred->user != INIT_USER) -+ if (p->real_cred->user != INIT_USER && -+ !capable(CAP_SYS_RESOURCE) && !capable(CAP_SYS_ADMIN)) - goto bad_fork_free; - } - current->flags &= ~PF_NPROC_EXCEEDED; -@@ -1446,6 +1499,11 @@ static struct task_struct *copy_process(unsigned long clone_flags, + if (p->real_cred->user != INIT_USER && +@@ -1449,6 +1502,11 @@ static struct task_struct *copy_process(unsigned long clone_flags, goto bad_fork_free_pid; } @@ -81879,10 +80582,10 @@ index ffbc090..08ceeee 100644 + */ + gr_copy_label(p); + - if (clone_flags & CLONE_THREAD) { - current->signal->nr_threads++; - atomic_inc(¤t->signal->live); -@@ -1529,6 +1587,8 @@ bad_fork_cleanup_count: + if (likely(p->pid)) { + ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace); + +@@ -1534,6 +1592,8 @@ bad_fork_cleanup_count: bad_fork_free: free_task(p); fork_out: @@ -81891,7 +80594,15 @@ index ffbc090..08ceeee 100644 return ERR_PTR(retval); } -@@ -1613,6 +1673,8 @@ long do_fork(unsigned long clone_flags, +@@ -1604,6 +1664,7 @@ long do_fork(unsigned long clone_flags, + + p = copy_process(clone_flags, stack_start, stack_size, + child_tidptr, NULL, trace); ++ add_latent_entropy(); + /* + * Do this prior waking up the new thread - the thread pointer + * might get invalid after that point, if the thread exits quickly. +@@ -1618,6 +1679,8 @@ long do_fork(unsigned long clone_flags, if (clone_flags & CLONE_PARENT_SETTID) put_user(nr, parent_tidptr); @@ -81900,7 +80611,7 @@ index ffbc090..08ceeee 100644 if (clone_flags & CLONE_VFORK) { p->vfork_done = &vfork; init_completion(&vfork); -@@ -1729,7 +1791,7 @@ void __init proc_caches_init(void) +@@ -1734,7 +1797,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); @@ -81909,7 +80620,7 @@ index ffbc090..08ceeee 100644 mmap_init(); nsproxy_cache_init(); } -@@ -1769,7 +1831,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp) +@@ -1774,7 +1837,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 */ @@ -81918,7 +80629,7 @@ index ffbc090..08ceeee 100644 return 0; *new_fsp = copy_fs_struct(fs); -@@ -1881,7 +1943,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags) +@@ -1886,7 +1949,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags) fs = current->fs; spin_lock(&fs->lock); current->fs = new_fs; @@ -81929,7 +80640,7 @@ index ffbc090..08ceeee 100644 else new_fs = fs; diff --git a/kernel/futex.c b/kernel/futex.c -index 49dacfb..2ac4526 100644 +index c3a1a55..e32b4a98 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -54,6 +54,7 @@ @@ -81940,7 +80651,7 @@ index 49dacfb..2ac4526 100644 #include <linux/signal.h> #include <linux/export.h> #include <linux/magic.h> -@@ -242,6 +243,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw) +@@ -243,6 +244,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw) struct page *page, *page_head; int err, ro = 0; @@ -81952,7 +80663,7 @@ index 49dacfb..2ac4526 100644 /* * The futex address must be "naturally" aligned. */ -@@ -440,7 +446,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr, +@@ -441,7 +447,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr, static int get_futex_value_locked(u32 *dest, u32 __user *from) { @@ -81961,7 +80672,7 @@ index 49dacfb..2ac4526 100644 pagefault_disable(); ret = __copy_from_user_inatomic(dest, from, sizeof(u32)); -@@ -2733,6 +2739,7 @@ static int __init futex_init(void) +@@ -2734,6 +2740,7 @@ static int __init futex_init(void) { u32 curval; int i; @@ -81969,7 +80680,7 @@ index 49dacfb..2ac4526 100644 /* * This will fail and we want it. Some arch implementations do -@@ -2744,8 +2751,11 @@ static int __init futex_init(void) +@@ -2745,8 +2752,11 @@ static int __init futex_init(void) * implementation, the non-functional ones will return * -ENOSYS. */ @@ -82020,10 +80731,10 @@ index 9b22d03..6295b62 100644 prev->next = info->next; else diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c -index 2288fbd..0f3941f 100644 +index 383319b..cd2b391 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c -@@ -1435,7 +1435,7 @@ void hrtimer_peek_ahead_timers(void) +@@ -1438,7 +1438,7 @@ void hrtimer_peek_ahead_timers(void) local_irq_restore(flags); } @@ -82032,15 +80743,6 @@ index 2288fbd..0f3941f 100644 { hrtimer_peek_ahead_timers(); } -@@ -1770,7 +1770,7 @@ static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self, - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata hrtimers_nb = { -+static struct notifier_block hrtimers_nb = { - .notifier_call = hrtimer_cpu_notify, - }; - diff --git a/kernel/irq_work.c b/kernel/irq_work.c index 55fcce6..0e4cf34 100644 --- a/kernel/irq_work.c @@ -82241,7 +80943,7 @@ index 59f7b55..4022f65 100644 /* Don't allow clients that don't understand the native diff --git a/kernel/kmod.c b/kernel/kmod.c -index 8241906..d625f2c 100644 +index fb32636..2fe8775 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c @@ -75,7 +75,7 @@ static void free_modprobe_argv(struct subprocess_info *info) @@ -82283,9 +80985,9 @@ index 8241906..d625f2c 100644 char module_name[MODULE_NAME_LEN]; unsigned int max_modprobes; int ret; -@@ -147,9 +147,7 @@ int __request_module(bool wait, const char *fmt, ...) - */ - WARN_ON_ONCE(wait && current_is_async()); +@@ -150,9 +150,7 @@ int __request_module(bool wait, const char *fmt, ...) + if (!modprobe_path[0]) + return 0; - va_start(args, fmt); - ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args); @@ -82294,7 +80996,7 @@ index 8241906..d625f2c 100644 if (ret >= MODULE_NAME_LEN) return -ENAMETOOLONG; -@@ -157,6 +155,20 @@ int __request_module(bool wait, const char *fmt, ...) +@@ -160,6 +158,20 @@ int __request_module(bool wait, const char *fmt, ...) if (ret) return ret; @@ -82315,7 +81017,7 @@ index 8241906..d625f2c 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 -@@ -185,11 +197,52 @@ int __request_module(bool wait, const char *fmt, ...) +@@ -188,11 +200,52 @@ int __request_module(bool wait, const char *fmt, ...) trace_module_request(module_name, wait, _RET_IP_); @@ -82369,7 +81071,7 @@ index 8241906..d625f2c 100644 EXPORT_SYMBOL(__request_module); #endif /* CONFIG_MODULES */ -@@ -300,7 +353,7 @@ static int wait_for_helper(void *data) +@@ -303,7 +356,7 @@ static int wait_for_helper(void *data) * * Thus the __user pointer cast is valid here. */ @@ -82378,7 +81080,7 @@ index 8241906..d625f2c 100644 /* * If ret is 0, either ____call_usermodehelper failed and the -@@ -651,7 +704,7 @@ EXPORT_SYMBOL(call_usermodehelper); +@@ -646,7 +699,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) { @@ -82388,7 +81090,7 @@ index 8241906..d625f2c 100644 kernel_cap_t new_cap; int err, i; diff --git a/kernel/kprobes.c b/kernel/kprobes.c -index bddf3b2..233bf40 100644 +index 6e33498..3133bd3 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -31,6 +31,9 @@ @@ -82474,7 +81176,7 @@ index 6ada93c..dce7d5d 100644 .name = "notes", .mode = S_IRUGO, diff --git a/kernel/lockdep.c b/kernel/lockdep.c -index 1f3186b..bb7dbc6 100644 +index e16c45b..6f49c48 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c @@ -596,6 +596,10 @@ static int static_obj(void *obj) @@ -82555,7 +81257,7 @@ index b2c71c5..7b88d63 100644 seq_printf(m, "%40s %14lu %29s %pS\n", name, stats->contending_point[i], diff --git a/kernel/module.c b/kernel/module.c -index fa53db8..6f17200 100644 +index 2069158..71101bb 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -61,6 +61,7 @@ @@ -82594,16 +81296,16 @@ index fa53db8..6f17200 100644 return true; } return false; -@@ -485,7 +487,7 @@ static inline void __percpu *mod_percpu(struct module *mod) - static int percpu_modalloc(struct module *mod, - unsigned long size, unsigned long align) - { +@@ -490,7 +492,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info) + if (!pcpusec->sh_size) + return 0; + - if (align > PAGE_SIZE) { + if (align-1 >= PAGE_SIZE) { printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n", mod->name, align, PAGE_SIZE); align = PAGE_SIZE; -@@ -1089,7 +1091,7 @@ struct module_attribute module_uevent = +@@ -1096,7 +1098,7 @@ struct module_attribute module_uevent = static ssize_t show_coresize(struct module_attribute *mattr, struct module_kobject *mk, char *buffer) { @@ -82612,7 +81314,7 @@ index fa53db8..6f17200 100644 } static struct module_attribute modinfo_coresize = -@@ -1098,7 +1100,7 @@ static struct module_attribute modinfo_coresize = +@@ -1105,7 +1107,7 @@ static struct module_attribute modinfo_coresize = static ssize_t show_initsize(struct module_attribute *mattr, struct module_kobject *mk, char *buffer) { @@ -82621,7 +81323,7 @@ index fa53db8..6f17200 100644 } static struct module_attribute modinfo_initsize = -@@ -1313,7 +1315,7 @@ resolve_symbol_wait(struct module *mod, +@@ -1320,7 +1322,7 @@ resolve_symbol_wait(struct module *mod, */ #ifdef CONFIG_SYSFS @@ -82630,7 +81332,7 @@ index fa53db8..6f17200 100644 static inline bool sect_empty(const Elf_Shdr *sect) { return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0; -@@ -1453,7 +1455,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info) +@@ -1460,7 +1462,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; @@ -82639,7 +81341,7 @@ index fa53db8..6f17200 100644 /* failed to create section attributes, so can't create notes */ if (!mod->sect_attrs) -@@ -1565,7 +1567,7 @@ static void del_usage_links(struct module *mod) +@@ -1572,7 +1574,7 @@ static void del_usage_links(struct module *mod) static int module_add_modinfo_attrs(struct module *mod) { struct module_attribute *attr; @@ -82648,7 +81350,7 @@ index fa53db8..6f17200 100644 int error = 0; int i; -@@ -1779,21 +1781,21 @@ static void set_section_ro_nx(void *base, +@@ -1786,21 +1788,21 @@ static void set_section_ro_nx(void *base, static void unset_module_core_ro_nx(struct module *mod) { @@ -82678,7 +81380,7 @@ index fa53db8..6f17200 100644 set_memory_rw); } -@@ -1806,14 +1808,14 @@ void set_all_modules_text_rw(void) +@@ -1813,14 +1815,14 @@ void set_all_modules_text_rw(void) list_for_each_entry_rcu(mod, &modules, list) { if (mod->state == MODULE_STATE_UNFORMED) continue; @@ -82699,7 +81401,7 @@ index fa53db8..6f17200 100644 set_memory_rw); } } -@@ -1829,14 +1831,14 @@ void set_all_modules_text_ro(void) +@@ -1836,14 +1838,14 @@ void set_all_modules_text_ro(void) list_for_each_entry_rcu(mod, &modules, list) { if (mod->state == MODULE_STATE_UNFORMED) continue; @@ -82720,7 +81422,7 @@ index fa53db8..6f17200 100644 set_memory_ro); } } -@@ -1887,16 +1889,19 @@ static void free_module(struct module *mod) +@@ -1894,16 +1896,19 @@ static void free_module(struct module *mod) /* This may be NULL, but that's OK */ unset_module_init_ro_nx(mod); @@ -82743,7 +81445,7 @@ index fa53db8..6f17200 100644 #ifdef CONFIG_MPU update_protections(current->mm); -@@ -1966,9 +1971,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info) +@@ -1973,9 +1978,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info) int ret = 0; const struct kernel_symbol *ksym; @@ -82775,7 +81477,7 @@ index fa53db8..6f17200 100644 switch (sym[i].st_shndx) { case SHN_COMMON: /* We compiled with -fno-common. These are not -@@ -1989,7 +2016,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info) +@@ -1996,7 +2023,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)) { @@ -82785,7 +81487,7 @@ index fa53db8..6f17200 100644 break; } -@@ -2008,11 +2037,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info) +@@ -2015,11 +2044,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; @@ -82806,7 +81508,7 @@ index fa53db8..6f17200 100644 return ret; } -@@ -2096,22 +2134,12 @@ static void layout_sections(struct module *mod, struct load_info *info) +@@ -2103,22 +2141,12 @@ static void layout_sections(struct module *mod, struct load_info *info) || s->sh_entsize != ~0UL || strstarts(sname, ".init")) continue; @@ -82833,7 +81535,7 @@ index fa53db8..6f17200 100644 } pr_debug("Init section allocation order:\n"); -@@ -2125,23 +2153,13 @@ static void layout_sections(struct module *mod, struct load_info *info) +@@ -2132,23 +2160,13 @@ static void layout_sections(struct module *mod, struct load_info *info) || s->sh_entsize != ~0UL || !strstarts(sname, ".init")) continue; @@ -82862,7 +81564,7 @@ index fa53db8..6f17200 100644 } } -@@ -2314,7 +2332,7 @@ static void layout_symtab(struct module *mod, struct load_info *info) +@@ -2321,7 +2339,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; @@ -82871,7 +81573,7 @@ index fa53db8..6f17200 100644 info->index.sym) | INIT_OFFSET_MASK; pr_debug("\t%s\n", info->secstrings + symsect->sh_name); -@@ -2331,13 +2349,13 @@ static void layout_symtab(struct module *mod, struct load_info *info) +@@ -2338,13 +2356,13 @@ static void layout_symtab(struct module *mod, struct load_info *info) } /* Append room for core symbols at end of core part. */ @@ -82889,7 +81591,7 @@ index fa53db8..6f17200 100644 info->index.str) | INIT_OFFSET_MASK; pr_debug("\t%s\n", info->secstrings + strsect->sh_name); } -@@ -2355,12 +2373,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info) +@@ -2362,12 +2380,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; @@ -82906,7 +81608,7 @@ index fa53db8..6f17200 100644 src = mod->symtab; for (ndst = i = 0; i < mod->num_symtab; i++) { if (i == 0 || -@@ -2372,6 +2392,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info) +@@ -2379,6 +2399,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info) } } mod->core_num_syms = ndst; @@ -82915,7 +81617,7 @@ index fa53db8..6f17200 100644 } #else static inline void layout_symtab(struct module *mod, struct load_info *info) -@@ -2405,17 +2427,33 @@ void * __weak module_alloc(unsigned long size) +@@ -2412,17 +2434,33 @@ void * __weak module_alloc(unsigned long size) return vmalloc_exec(size); } @@ -82954,7 +81656,7 @@ index fa53db8..6f17200 100644 mutex_unlock(&module_mutex); } return ret; -@@ -2691,8 +2729,14 @@ static struct module *setup_load_info(struct load_info *info, int flags) +@@ -2698,8 +2736,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"); @@ -82969,7 +81671,7 @@ index fa53db8..6f17200 100644 if (flags & MODULE_INIT_IGNORE_VERMAGIC) modmagic = NULL; -@@ -2718,7 +2762,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags) +@@ -2725,7 +2769,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags) } /* Set up license info based on the info section */ @@ -82978,7 +81680,7 @@ index fa53db8..6f17200 100644 return 0; } -@@ -2799,7 +2843,7 @@ static int move_module(struct module *mod, struct load_info *info) +@@ -2806,7 +2850,7 @@ static int move_module(struct module *mod, struct load_info *info) void *ptr; /* Do the allocs. */ @@ -82987,7 +81689,7 @@ index fa53db8..6f17200 100644 /* * The pointer to this block is stored in the module structure * which is inside the block. Just mark it as not being a -@@ -2809,11 +2853,11 @@ static int move_module(struct module *mod, struct load_info *info) +@@ -2816,11 +2860,11 @@ static int move_module(struct module *mod, struct load_info *info) if (!ptr) return -ENOMEM; @@ -83003,7 +81705,7 @@ index fa53db8..6f17200 100644 /* * The pointer to this block is stored in the module structure * which is inside the block. This block doesn't need to be -@@ -2822,13 +2866,45 @@ static int move_module(struct module *mod, struct load_info *info) +@@ -2829,13 +2873,45 @@ static int move_module(struct module *mod, struct load_info *info) */ kmemleak_ignore(ptr); if (!ptr) { @@ -83053,7 +81755,7 @@ index fa53db8..6f17200 100644 /* Transfer each section which specifies SHF_ALLOC */ pr_debug("final section addresses:\n"); -@@ -2839,16 +2915,45 @@ static int move_module(struct module *mod, struct load_info *info) +@@ -2846,16 +2922,45 @@ static int move_module(struct module *mod, struct load_info *info) if (!(shdr->sh_flags & SHF_ALLOC)) continue; @@ -83106,7 +81808,7 @@ index fa53db8..6f17200 100644 pr_debug("\t0x%lx %s\n", (long)shdr->sh_addr, info->secstrings + shdr->sh_name); } -@@ -2905,12 +3010,12 @@ static void flush_module_icache(const struct module *mod) +@@ -2912,12 +3017,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. */ @@ -83125,7 +81827,7 @@ index fa53db8..6f17200 100644 set_fs(old_fs); } -@@ -2977,8 +3082,10 @@ static int alloc_module_percpu(struct module *mod, struct load_info *info) +@@ -2974,8 +3079,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); @@ -83138,7 +81840,7 @@ index fa53db8..6f17200 100644 } int __weak module_finalize(const Elf_Ehdr *hdr, -@@ -2991,7 +3098,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr, +@@ -2988,7 +3095,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. */ @@ -83148,7 +81850,7 @@ index fa53db8..6f17200 100644 /* Copy relocated percpu area over. */ percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr, -@@ -3045,16 +3154,16 @@ static int do_init_module(struct module *mod) +@@ -3042,16 +3151,16 @@ static int do_init_module(struct module *mod) MODULE_STATE_COMING, mod); /* Set RO and NX regions for core */ @@ -83173,7 +81875,7 @@ index fa53db8..6f17200 100644 do_mod_ctors(mod); /* Start the module */ -@@ -3116,11 +3225,12 @@ static int do_init_module(struct module *mod) +@@ -3113,11 +3222,12 @@ static int do_init_module(struct module *mod) mod->strtab = mod->core_strtab; #endif unset_module_init_ro_nx(mod); @@ -83191,7 +81893,7 @@ index fa53db8..6f17200 100644 mutex_unlock(&module_mutex); wake_up_all(&module_wq); -@@ -3252,9 +3362,38 @@ static int load_module(struct load_info *info, const char __user *uargs, +@@ -3261,9 +3371,38 @@ static int load_module(struct load_info *info, const char __user *uargs, if (err) goto free_unload; @@ -83230,7 +81932,7 @@ index fa53db8..6f17200 100644 /* Fix up syms, so that st_value is a pointer to location. */ err = simplify_symbols(mod, info); if (err < 0) -@@ -3270,13 +3409,6 @@ static int load_module(struct load_info *info, const char __user *uargs, +@@ -3279,13 +3418,6 @@ static int load_module(struct load_info *info, const char __user *uargs, flush_module_icache(mod); @@ -83244,7 +81946,7 @@ index fa53db8..6f17200 100644 dynamic_debug_setup(info->debug, info->num_debug); /* Finally it's fully formed, ready to start executing. */ -@@ -3311,11 +3443,10 @@ static int load_module(struct load_info *info, const char __user *uargs, +@@ -3320,11 +3452,10 @@ static int load_module(struct load_info *info, const char __user *uargs, ddebug_cleanup: dynamic_debug_remove(info->debug); synchronize_sched(); @@ -83257,7 +81959,7 @@ index fa53db8..6f17200 100644 free_unload: module_unload_free(mod); unlink_mod: -@@ -3398,10 +3529,16 @@ static const char *get_ksymbol(struct module *mod, +@@ -3407,10 +3538,16 @@ static const char *get_ksymbol(struct module *mod, unsigned long nextval; /* At worse, next value is at end of module */ @@ -83277,7 +81979,7 @@ index fa53db8..6f17200 100644 /* Scan for closest preceding symbol, and next symbol. (ELF starts real symbols at 1). */ -@@ -3654,7 +3791,7 @@ static int m_show(struct seq_file *m, void *p) +@@ -3661,7 +3798,7 @@ static int m_show(struct seq_file *m, void *p) return 0; seq_printf(m, "%s %u", @@ -83286,7 +81988,7 @@ index fa53db8..6f17200 100644 print_unload_info(m, mod); /* Informative for users. */ -@@ -3663,7 +3800,7 @@ static int m_show(struct seq_file *m, void *p) +@@ -3670,7 +3807,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. */ @@ -83295,7 +81997,7 @@ index fa53db8..6f17200 100644 /* Taints info */ if (mod->taints) -@@ -3699,7 +3836,17 @@ static const struct file_operations proc_modules_operations = { +@@ -3706,7 +3843,17 @@ static const struct file_operations proc_modules_operations = { static int __init proc_modules_init(void) { @@ -83313,7 +82015,7 @@ index fa53db8..6f17200 100644 return 0; } module_init(proc_modules_init); -@@ -3760,14 +3907,14 @@ struct module *__module_address(unsigned long addr) +@@ -3767,14 +3914,14 @@ struct module *__module_address(unsigned long addr) { struct module *mod; @@ -83331,7 +82033,7 @@ index fa53db8..6f17200 100644 return mod; } return NULL; -@@ -3802,11 +3949,20 @@ bool is_module_text_address(unsigned long addr) +@@ -3809,11 +3956,20 @@ bool is_module_text_address(unsigned long addr) */ struct module *__module_text_address(unsigned long addr) { @@ -83404,10 +82106,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/mutex.c b/kernel/mutex.c -index ad53a66..f1bf8bc 100644 +index a52ee7bb..f361f16 100644 --- a/kernel/mutex.c +++ b/kernel/mutex.c -@@ -134,7 +134,7 @@ void mspin_lock(struct mspin_node **lock, struct mspin_node *node) +@@ -135,7 +135,7 @@ void mspin_lock(struct mspin_node **lock, struct mspin_node *node) node->locked = 1; return; } @@ -83416,7 +82118,7 @@ index ad53a66..f1bf8bc 100644 smp_wmb(); /* Wait until the lock holder passes the lock down */ while (!ACCESS_ONCE(node->locked)) -@@ -155,7 +155,7 @@ static void mspin_unlock(struct mspin_node **lock, struct mspin_node *node) +@@ -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(); } @@ -83425,7 +82127,7 @@ index ad53a66..f1bf8bc 100644 smp_wmb(); } -@@ -341,7 +341,7 @@ slowpath: +@@ -514,7 +514,7 @@ slowpath: spin_lock_mutex(&lock->wait_lock, flags); debug_mutex_lock_common(lock, &waiter); @@ -83434,17 +82136,7 @@ index ad53a66..f1bf8bc 100644 /* add waiting tasks to the end of the waitqueue (FIFO): */ list_add_tail(&waiter.list, &lock->wait_list); -@@ -371,8 +371,7 @@ slowpath: - * TASK_UNINTERRUPTIBLE case.) - */ - if (unlikely(signal_pending_state(state, task))) { -- mutex_remove_waiter(lock, &waiter, -- task_thread_info(task)); -+ mutex_remove_waiter(lock, &waiter, task); - mutex_release(&lock->dep_map, 1, ip); - spin_unlock_mutex(&lock->wait_lock, flags); - -@@ -391,7 +390,7 @@ slowpath: +@@ -565,7 +565,7 @@ slowpath: done: lock_acquired(&lock->dep_map, ip); /* got the lock - rejoice! */ @@ -83452,7 +82144,16 @@ index ad53a66..f1bf8bc 100644 + mutex_remove_waiter(lock, &waiter, task); mutex_set_owner(lock); - /* set it to 0 if there are no waiters left: */ + if (!__builtin_constant_p(ww_ctx == NULL)) { +@@ -604,7 +604,7 @@ done: + return 0; + + err: +- mutex_remove_waiter(lock, &waiter, task_thread_info(task)); ++ mutex_remove_waiter(lock, &waiter, task); + spin_unlock_mutex(&lock->wait_lock, flags); + debug_mutex_free_waiter(&waiter); + mutex_release(&lock->dep_map, 1, ip); diff --git a/kernel/notifier.c b/kernel/notifier.c index 2d5cc4c..d9ea600 100644 --- a/kernel/notifier.c @@ -83510,19 +82211,19 @@ index 2d5cc4c..d9ea600 100644 return -ENOENT; } diff --git a/kernel/panic.c b/kernel/panic.c -index 167ec09..0dda5f9 100644 +index 8018646..b6a5b4f 100644 --- a/kernel/panic.c +++ b/kernel/panic.c -@@ -400,7 +400,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller, - unsigned taint, struct slowpath_args *args) - { - printk(KERN_WARNING "------------[ cut here ]------------\n"); -- printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller); -+ printk(KERN_WARNING "WARNING: at %s:%d %pA()\n", file, line, caller); +@@ -403,7 +403,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller, + disable_trace_on_warning(); + + pr_warn("------------[ cut here ]------------\n"); +- pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n", ++ pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n", + raw_smp_processor_id(), current->pid, file, line, caller); if (args) - vprintk(args->fmt, args->args); -@@ -453,7 +453,8 @@ EXPORT_SYMBOL(warn_slowpath_null); +@@ -457,7 +457,8 @@ EXPORT_SYMBOL(warn_slowpath_null); */ void __stack_chk_fail(void) { @@ -83533,7 +82234,7 @@ index 167ec09..0dda5f9 100644 } EXPORT_SYMBOL(__stack_chk_fail); diff --git a/kernel/pid.c b/kernel/pid.c -index 0db3e79..95b9dc2 100644 +index 66505c1..87af12c 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -33,6 +33,7 @@ @@ -83553,7 +82254,7 @@ index 0db3e79..95b9dc2 100644 int pid_max_min = RESERVED_PIDS + 1; int pid_max_max = PID_MAX_LIMIT; -@@ -442,10 +443,18 @@ EXPORT_SYMBOL(pid_task); +@@ -439,10 +440,18 @@ EXPORT_SYMBOL(pid_task); */ struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns) { @@ -83573,7 +82274,7 @@ index 0db3e79..95b9dc2 100644 } struct task_struct *find_task_by_vpid(pid_t vnr) -@@ -453,6 +462,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr) +@@ -450,6 +459,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr) return find_task_by_pid_ns(vnr, task_active_pid_ns(current)); } @@ -83589,7 +82290,7 @@ index 0db3e79..95b9dc2 100644 { struct pid *pid; diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c -index 6917e8e..9909aeb 100644 +index 601bb36..f7e6f34 100644 --- a/kernel/pid_namespace.c +++ b/kernel/pid_namespace.c @@ -247,7 +247,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write, @@ -83602,10 +82303,10 @@ index 6917e8e..9909aeb 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 42670e9..8719c2f 100644 +index c7f31aa..2b44977 100644 --- a/kernel/posix-cpu-timers.c +++ b/kernel/posix-cpu-timers.c -@@ -1636,14 +1636,14 @@ struct k_clock clock_posix_cpu = { +@@ -1521,14 +1521,14 @@ struct k_clock clock_posix_cpu = { static __init int init_posix_cpu_timers(void) { @@ -83739,18 +82440,18 @@ index 424c2d4..679242f 100644 } diff --git a/kernel/power/process.c b/kernel/power/process.c -index 98088e0..aaf95c0 100644 +index 06ec886..9dba35e 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c -@@ -33,6 +33,7 @@ static int try_to_freeze_tasks(bool user_only) - u64 elapsed_csecs64; - unsigned int elapsed_csecs; +@@ -34,6 +34,7 @@ static int try_to_freeze_tasks(bool user_only) + unsigned int elapsed_msecs; bool wakeup = false; + int sleep_usecs = USEC_PER_MSEC; + bool timedout = false; do_gettimeofday(&start); -@@ -43,13 +44,20 @@ static int try_to_freeze_tasks(bool user_only) +@@ -44,13 +45,20 @@ static int try_to_freeze_tasks(bool user_only) while (true) { todo = 0; @@ -83772,7 +82473,7 @@ index 98088e0..aaf95c0 100644 } while_each_thread(g, p); read_unlock(&tasklist_lock); -@@ -58,7 +66,7 @@ static int try_to_freeze_tasks(bool user_only) +@@ -59,7 +67,7 @@ static int try_to_freeze_tasks(bool user_only) todo += wq_busy; } @@ -83781,11 +82482,11 @@ index 98088e0..aaf95c0 100644 break; if (pm_wakeup_pending()) { -diff --git a/kernel/printk.c b/kernel/printk.c -index d37d45c..ab918b3 100644 ---- a/kernel/printk.c -+++ b/kernel/printk.c -@@ -390,6 +390,11 @@ static int check_syslog_permissions(int type, bool from_file) +diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c +index 5b5a708..ec7637e 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) if (from_file && type != SYSLOG_ACTION_OPEN) return 0; @@ -83798,7 +82499,7 @@ index d37d45c..ab918b3 100644 if (capable(CAP_SYSLOG)) return 0; diff --git a/kernel/profile.c b/kernel/profile.c -index 0bf4007..6234708 100644 +index 6631e1e..310c266 100644 --- a/kernel/profile.c +++ b/kernel/profile.c @@ -37,7 +37,7 @@ struct profile_hit { @@ -83859,7 +82560,7 @@ index 0bf4007..6234708 100644 } diff --git a/kernel/ptrace.c b/kernel/ptrace.c -index 335a7ae..3bbbceb 100644 +index a146ee3..ffed4c3 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -326,7 +326,7 @@ static int ptrace_attach(struct task_struct *task, long request, @@ -83889,7 +82590,7 @@ index 335a7ae..3bbbceb 100644 unsigned long __user *datalp = datavp; unsigned long flags; -@@ -1011,14 +1011,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr, +@@ -1051,14 +1051,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr, goto out; } @@ -83912,7 +82613,7 @@ index 335a7ae..3bbbceb 100644 goto out_put_task_struct; } -@@ -1046,7 +1053,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr, +@@ -1086,7 +1093,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; @@ -83921,7 +82622,7 @@ index 335a7ae..3bbbceb 100644 } int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr, -@@ -1140,7 +1147,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request, +@@ -1180,7 +1187,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, @@ -83930,7 +82631,7 @@ index 335a7ae..3bbbceb 100644 { struct task_struct *child; long ret; -@@ -1156,14 +1163,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid, +@@ -1196,14 +1203,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid, goto out; } @@ -83954,10 +82655,10 @@ index 335a7ae..3bbbceb 100644 } diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c -index 48ab703..07561d4 100644 +index cce6ba8..7c758b1f 100644 --- a/kernel/rcupdate.c +++ b/kernel/rcupdate.c -@@ -439,10 +439,10 @@ int rcu_jiffies_till_stall_check(void) +@@ -412,10 +412,10 @@ int rcu_jiffies_till_stall_check(void) * for CONFIG_RCU_CPU_STALL_TIMEOUT. */ if (till_stall_check < 3) { @@ -83971,20 +82672,20 @@ index 48ab703..07561d4 100644 } return till_stall_check * HZ + RCU_STALL_DELAY_DELTA; diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c -index a0714a5..2ab5e34 100644 +index aa34411..78e5ccb 100644 --- a/kernel/rcutiny.c +++ b/kernel/rcutiny.c -@@ -46,7 +46,7 @@ +@@ -45,7 +45,7 @@ + /* Forward declarations for rcutiny_plugin.h. */ struct rcu_ctrlblk; - static void invoke_rcu_callbacks(void); 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) - rcu_is_callbacks_kthread())); +@@ -309,7 +309,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp) + false)); } -static void rcu_process_callbacks(struct softirq_action *unused) @@ -83992,21 +82693,8 @@ index a0714a5..2ab5e34 100644 { __rcu_process_callbacks(&rcu_sched_ctrlblk); __rcu_process_callbacks(&rcu_bh_ctrlblk); -diff --git a/kernel/rcutiny_plugin.h b/kernel/rcutiny_plugin.h -index 8a23300..4255818 100644 ---- a/kernel/rcutiny_plugin.h -+++ b/kernel/rcutiny_plugin.h -@@ -945,7 +945,7 @@ static int rcu_kthread(void *arg) - have_rcu_kthread_work = morework; - local_irq_restore(flags); - if (work) -- rcu_process_callbacks(NULL); -+ rcu_process_callbacks(); - schedule_timeout_interruptible(1); /* Leave CPU for others. */ - } - diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c -index e1f3a8c..42c94a2 100644 +index f4871e5..8ef5741 100644 --- a/kernel/rcutorture.c +++ b/kernel/rcutorture.c @@ -164,12 +164,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) = @@ -84069,7 +82757,7 @@ index e1f3a8c..42c94a2 100644 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) { rp->rtort_mbtest = 0; list_del(&rp->rtort_free); -@@ -990,7 +990,7 @@ rcu_torture_writer(void *arg) +@@ -952,7 +952,7 @@ rcu_torture_writer(void *arg) i = old_rp->rtort_pipe_count; if (i > RCU_TORTURE_PIPE_LEN) i = RCU_TORTURE_PIPE_LEN; @@ -84078,7 +82766,7 @@ index e1f3a8c..42c94a2 100644 old_rp->rtort_pipe_count++; cur_ops->deferred_free(old_rp); } -@@ -1076,7 +1076,7 @@ static void rcu_torture_timer(unsigned long unused) +@@ -1038,7 +1038,7 @@ static void rcu_torture_timer(unsigned long unused) return; } if (p->rtort_mbtest == 0) @@ -84087,7 +82775,7 @@ index e1f3a8c..42c94a2 100644 spin_lock(&rand_lock); cur_ops->read_delay(&rand); n_rcu_torture_timers++; -@@ -1146,7 +1146,7 @@ rcu_torture_reader(void *arg) +@@ -1108,7 +1108,7 @@ rcu_torture_reader(void *arg) continue; } if (p->rtort_mbtest == 0) @@ -84096,7 +82784,7 @@ index e1f3a8c..42c94a2 100644 cur_ops->read_delay(&rand); preempt_disable(); pipe_count = p->rtort_pipe_count; -@@ -1209,11 +1209,11 @@ rcu_torture_printk(char *page) +@@ -1171,11 +1171,11 @@ rcu_torture_printk(char *page) rcu_torture_current, rcu_torture_current_version, list_empty(&rcu_torture_freelist), @@ -84112,7 +82800,7 @@ index e1f3a8c..42c94a2 100644 n_rcu_torture_boost_ktrerror, n_rcu_torture_boost_rterror); cnt += sprintf(&page[cnt], "rtbf: %ld rtb: %ld nt: %ld ", -@@ -1232,14 +1232,14 @@ rcu_torture_printk(char *page) +@@ -1194,14 +1194,14 @@ rcu_torture_printk(char *page) n_barrier_attempts, n_rcu_torture_barrier_error); cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG); @@ -84129,7 +82817,7 @@ index e1f3a8c..42c94a2 100644 WARN_ON_ONCE(1); } cnt += sprintf(&page[cnt], "Reader Pipe: "); -@@ -1253,7 +1253,7 @@ rcu_torture_printk(char *page) +@@ -1215,7 +1215,7 @@ rcu_torture_printk(char *page) cnt += sprintf(&page[cnt], "Free-Block Circulation: "); for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) { cnt += sprintf(&page[cnt], " %d", @@ -84138,7 +82826,7 @@ index e1f3a8c..42c94a2 100644 } cnt += sprintf(&page[cnt], "\n"); if (cur_ops->stats) -@@ -1962,7 +1962,7 @@ rcu_torture_cleanup(void) +@@ -1924,7 +1924,7 @@ rcu_torture_cleanup(void) rcu_torture_stats_print(); /* -After- the stats thread is stopped! */ @@ -84147,7 +82835,7 @@ index e1f3a8c..42c94a2 100644 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) -@@ -2031,18 +2031,18 @@ rcu_torture_init(void) +@@ -1992,18 +1992,18 @@ rcu_torture_init(void) rcu_torture_current = NULL; rcu_torture_current_version = 0; @@ -84173,7 +82861,7 @@ index e1f3a8c..42c94a2 100644 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) { per_cpu(rcu_torture_count, cpu)[i] = 0; diff --git a/kernel/rcutree.c b/kernel/rcutree.c -index 3538001..e379e0b 100644 +index 068de3a..df7da65 100644 --- a/kernel/rcutree.c +++ b/kernel/rcutree.c @@ -358,9 +358,9 @@ static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval, @@ -84258,7 +82946,7 @@ index 3538001..e379e0b 100644 snap = (unsigned int)rdp->dynticks_snap; /* -@@ -1440,9 +1440,9 @@ static int rcu_gp_init(struct rcu_state *rsp) +@@ -1351,9 +1351,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; @@ -84268,9 +82956,9 @@ index 3538001..e379e0b 100644 - ACCESS_ONCE(rnp->completed) = rsp->completed; + ACCESS_ONCE_RW(rnp->completed) = rsp->completed; if (rnp == rdp->mynode) - rcu_start_gp_per_cpu(rsp, rnp, rdp); + __note_gp_changes(rsp, rnp, rdp); rcu_preempt_boost_start_gp(rnp); -@@ -1524,7 +1524,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp) +@@ -1435,7 +1435,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp) */ rcu_for_each_node_breadth_first(rsp, rnp) { raw_spin_lock_irq(&rnp->lock); @@ -84278,8 +82966,8 @@ index 3538001..e379e0b 100644 + ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum; rdp = this_cpu_ptr(rsp->rda); if (rnp == rdp->mynode) - __rcu_process_gp_end(rsp, rnp, rdp); -@@ -1855,7 +1855,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp, + __note_gp_changes(rsp, rnp, rdp); +@@ -1765,7 +1765,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; @@ -84288,7 +82976,7 @@ index 3538001..e379e0b 100644 } /* -@@ -2101,7 +2101,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp) +@@ -2011,7 +2011,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; @@ -84297,7 +82985,7 @@ index 3538001..e379e0b 100644 rdp->n_cbs_invoked += count; /* Reinstate batch limit if we have worked down the excess. */ -@@ -2295,7 +2295,7 @@ __rcu_process_callbacks(struct rcu_state *rsp) +@@ -2202,7 +2202,7 @@ __rcu_process_callbacks(struct rcu_state *rsp) /* * Do RCU core processing for the current CPU. */ @@ -84306,7 +82994,7 @@ index 3538001..e379e0b 100644 { struct rcu_state *rsp; -@@ -2419,7 +2419,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu), +@@ -2325,7 +2325,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu), local_irq_restore(flags); return; } @@ -84315,7 +83003,7 @@ index 3538001..e379e0b 100644 if (lazy) rdp->qlen_lazy++; else -@@ -2628,11 +2628,11 @@ void synchronize_sched_expedited(void) +@@ -2534,11 +2534,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. */ @@ -84329,7 +83017,7 @@ index 3538001..e379e0b 100644 return; } -@@ -2640,7 +2640,7 @@ void synchronize_sched_expedited(void) +@@ -2546,7 +2546,7 @@ void synchronize_sched_expedited(void) * Take a ticket. Note that atomic_inc_return() implies a * full memory barrier. */ @@ -84338,7 +83026,7 @@ index 3538001..e379e0b 100644 firstsnap = snap; get_online_cpus(); WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id())); -@@ -2653,14 +2653,14 @@ void synchronize_sched_expedited(void) +@@ -2559,14 +2559,14 @@ void synchronize_sched_expedited(void) synchronize_sched_expedited_cpu_stop, NULL) == -EAGAIN) { put_online_cpus(); @@ -84355,7 +83043,7 @@ index 3538001..e379e0b 100644 return; } -@@ -2669,7 +2669,7 @@ void synchronize_sched_expedited(void) +@@ -2575,7 +2575,7 @@ void synchronize_sched_expedited(void) udelay(trycount * num_online_cpus()); } else { wait_rcu_gp(call_rcu_sched); @@ -84364,7 +83052,7 @@ index 3538001..e379e0b 100644 return; } -@@ -2678,7 +2678,7 @@ void synchronize_sched_expedited(void) +@@ -2584,7 +2584,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(); /* ^^^ */ @@ -84373,7 +83061,7 @@ index 3538001..e379e0b 100644 return; } -@@ -2690,10 +2690,10 @@ void synchronize_sched_expedited(void) +@@ -2596,10 +2596,10 @@ void synchronize_sched_expedited(void) * period works for us. */ get_online_cpus(); @@ -84386,7 +83074,7 @@ index 3538001..e379e0b 100644 /* * Everyone up to our most recent fetch is covered by our grace -@@ -2702,16 +2702,16 @@ void synchronize_sched_expedited(void) +@@ -2608,16 +2608,16 @@ void synchronize_sched_expedited(void) * than we did already did their update. */ do { @@ -84406,7 +83094,7 @@ index 3538001..e379e0b 100644 put_online_cpus(); } -@@ -2893,7 +2893,7 @@ static void _rcu_barrier(struct rcu_state *rsp) +@@ -2799,7 +2799,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. */ @@ -84415,7 +83103,7 @@ index 3538001..e379e0b 100644 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. */ -@@ -2943,7 +2943,7 @@ static void _rcu_barrier(struct rcu_state *rsp) +@@ -2849,7 +2849,7 @@ static void _rcu_barrier(struct rcu_state *rsp) /* Increment ->n_barrier_done to prevent duplicate work. */ smp_mb(); /* Keep increment after above mechanism. */ @@ -84424,7 +83112,7 @@ index 3538001..e379e0b 100644 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. */ -@@ -2988,10 +2988,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp) +@@ -2894,10 +2894,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; @@ -84437,7 +83125,7 @@ index 3538001..e379e0b 100644 rdp->cpu = cpu; rdp->rsp = rsp; rcu_boot_init_nocb_percpu_data(rdp); -@@ -3024,8 +3024,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible) +@@ -2930,8 +2930,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible) rdp->blimit = blimit; init_callback_list(rdp); /* Re-enable callbacks on this CPU. */ rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE; @@ -84448,17 +83136,8 @@ index 3538001..e379e0b 100644 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */ /* Add CPU to rcu_node bitmasks. */ -@@ -3120,7 +3120,7 @@ static int __init rcu_spawn_gp_kthread(void) - struct task_struct *t; - - for_each_rcu_flavor(rsp) { -- t = kthread_run(rcu_gp_kthread, rsp, rsp->name); -+ t = kthread_run(rcu_gp_kthread, rsp, "%s", rsp->name); - BUG_ON(IS_ERR(t)); - rnp = rcu_get_root(rsp); - raw_spin_lock_irqsave(&rnp->lock, flags); diff --git a/kernel/rcutree.h b/kernel/rcutree.h -index 4df5034..5ee93f2 100644 +index b383258..2440c1e 100644 --- a/kernel/rcutree.h +++ b/kernel/rcutree.h @@ -87,7 +87,7 @@ struct rcu_dynticks { @@ -84470,7 +83149,7 @@ index 4df5034..5ee93f2 100644 #ifdef CONFIG_RCU_FAST_NO_HZ bool all_lazy; /* Are all CPU's CBs lazy? */ unsigned long nonlazy_posted; -@@ -414,17 +414,17 @@ struct rcu_state { +@@ -419,17 +419,17 @@ struct rcu_state { /* _rcu_barrier(). */ /* End of fields guarded by barrier_mutex. */ @@ -84500,10 +83179,10 @@ index 4df5034..5ee93f2 100644 unsigned long jiffies_force_qs; /* Time at which to invoke */ /* force_quiescent_state(). */ diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h -index 3db5a37..b395fb35 100644 +index 769e12e..7b2139b 100644 --- a/kernel/rcutree_plugin.h +++ b/kernel/rcutree_plugin.h -@@ -903,7 +903,7 @@ void synchronize_rcu_expedited(void) +@@ -902,7 +902,7 @@ void synchronize_rcu_expedited(void) /* Clean up and exit. */ smp_mb(); /* ensure expedited GP seen before counter increment. */ @@ -84512,7 +83191,7 @@ index 3db5a37..b395fb35 100644 unlock_mb_ret: mutex_unlock(&sync_rcu_preempt_exp_mutex); mb_ret: -@@ -1451,7 +1451,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu) +@@ -1476,7 +1476,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu) free_cpumask_var(cm); } @@ -84521,16 +83200,16 @@ index 3db5a37..b395fb35 100644 .store = &rcu_cpu_kthread_task, .thread_should_run = rcu_cpu_kthread_should_run, .thread_fn = rcu_cpu_kthread, -@@ -1916,7 +1916,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu) +@@ -1941,7 +1941,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu) print_cpu_stall_fast_no_hz(fast_no_hz, cpu); - printk(KERN_ERR "\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u %s\n", + pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u %s\n", cpu, ticks_value, ticks_title, - atomic_read(&rdtp->dynticks) & 0xfff, + atomic_read_unchecked(&rdtp->dynticks) & 0xfff, rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting, rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu), fast_no_hz); -@@ -2079,7 +2079,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp, +@@ -2104,7 +2104,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); @@ -84539,7 +83218,7 @@ index 3db5a37..b395fb35 100644 atomic_long_add(rhcount, &rdp->nocb_q_count); atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy); -@@ -2219,12 +2219,12 @@ static int rcu_nocb_kthread(void *arg) +@@ -2244,12 +2244,12 @@ static int rcu_nocb_kthread(void *arg) * Extract queued callbacks, update counts, and wait * for a grace period to elapse. */ @@ -84555,7 +83234,7 @@ index 3db5a37..b395fb35 100644 rcu_nocb_wait_gp(rdp); /* Each pass through the following loop invokes a callback. */ -@@ -2246,8 +2246,8 @@ static int rcu_nocb_kthread(void *arg) +@@ -2271,8 +2271,8 @@ static int rcu_nocb_kthread(void *arg) list = next; } trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1); @@ -84566,7 +83245,7 @@ index 3db5a37..b395fb35 100644 rdp->n_nocbs_invoked += c; } return 0; -@@ -2274,7 +2274,7 @@ static void __init rcu_spawn_nocb_kthreads(struct rcu_state *rsp) +@@ -2299,7 +2299,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)); @@ -84617,7 +83296,7 @@ index cf6c174..a8f4b50 100644 } diff --git a/kernel/resource.c b/kernel/resource.c -index d738698..5f8e60a 100644 +index 3f285dc..5755f62 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -152,8 +152,18 @@ static const struct file_operations proc_iomem_operations = { @@ -84734,7 +83413,7 @@ index 1d96dd0..994ff19 100644 default: diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c -index 64de5f8..7735e12 100644 +index 4a07353..66b5291 100644 --- a/kernel/sched/auto_group.c +++ b/kernel/sched/auto_group.c @@ -11,7 +11,7 @@ @@ -84746,7 +83425,7 @@ index 64de5f8..7735e12 100644 void __init autogroup_init(struct task_struct *init_task) { -@@ -81,7 +81,7 @@ static inline struct autogroup *autogroup_create(void) +@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void) kref_init(&ag->kref); init_rwsem(&ag->lock); @@ -84756,37 +83435,37 @@ index 64de5f8..7735e12 100644 #ifdef CONFIG_RT_GROUP_SCHED /* diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index e8b3350..d83d44e 100644 +index 05c39f0..442e6fe 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -3440,7 +3440,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible); - * The return value is -ERESTARTSYS if interrupted, 0 if timed out, - * positive (at least 1, or number of jiffies left till timeout) if completed. +@@ -2885,7 +2885,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible); + * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1, + * or number of jiffies left till timeout) if completed. */ -long __sched +long __sched __intentional_overflow(-1) wait_for_completion_interruptible_timeout(struct completion *x, unsigned long timeout) { -@@ -3457,7 +3457,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout); +@@ -2902,7 +2902,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout); * - * The return value is -ERESTARTSYS if interrupted, 0 if completed. + * Return: -ERESTARTSYS if interrupted, 0 if completed. */ -int __sched wait_for_completion_killable(struct completion *x) +int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x) { long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE); if (t == -ERESTARTSYS) -@@ -3478,7 +3478,7 @@ EXPORT_SYMBOL(wait_for_completion_killable); - * The return value is -ERESTARTSYS if interrupted, 0 if timed out, - * positive (at least 1, or number of jiffies left till timeout) if completed. +@@ -2923,7 +2923,7 @@ EXPORT_SYMBOL(wait_for_completion_killable); + * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1, + * or number of jiffies left till timeout) if completed. */ -long __sched +long __sched __intentional_overflow(-1) wait_for_completion_killable_timeout(struct completion *x, unsigned long timeout) { -@@ -3704,6 +3704,8 @@ int can_nice(const struct task_struct *p, const int nice) +@@ -3149,6 +3149,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; @@ -84795,7 +83474,7 @@ index e8b3350..d83d44e 100644 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || capable(CAP_SYS_NICE)); } -@@ -3737,7 +3739,8 @@ SYSCALL_DEFINE1(nice, int, increment) +@@ -3182,7 +3184,8 @@ SYSCALL_DEFINE1(nice, int, increment) if (nice > 19) nice = 19; @@ -84805,7 +83484,7 @@ index e8b3350..d83d44e 100644 return -EPERM; retval = security_task_setnice(current, nice); -@@ -3891,6 +3894,7 @@ recheck: +@@ -3344,6 +3347,7 @@ recheck: unsigned long rlim_rtprio = task_rlimit(p, RLIMIT_RTPRIO); @@ -84813,7 +83492,7 @@ index e8b3350..d83d44e 100644 /* can't set/change the rt policy */ if (policy != p->policy && !rlim_rtprio) return -EPERM; -@@ -4988,7 +4992,7 @@ static void migrate_tasks(unsigned int dead_cpu) +@@ -4473,7 +4477,7 @@ static void migrate_tasks(unsigned int dead_cpu) #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL) @@ -84822,7 +83501,7 @@ index e8b3350..d83d44e 100644 { .procname = "sched_domain", .mode = 0555, -@@ -5005,17 +5009,17 @@ static struct ctl_table sd_ctl_root[] = { +@@ -4490,17 +4494,17 @@ static struct ctl_table sd_ctl_root[] = { {} }; @@ -84844,7 +83523,7 @@ index e8b3350..d83d44e 100644 /* * In the intermediate directories, both the child directory and -@@ -5023,22 +5027,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep) +@@ -4508,22 +4512,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. */ @@ -84876,7 +83555,7 @@ index e8b3350..d83d44e 100644 const char *procname, void *data, int maxlen, umode_t mode, proc_handler *proc_handler, bool load_idx) -@@ -5058,7 +5065,7 @@ set_table_entry(struct ctl_table *entry, +@@ -4543,7 +4550,7 @@ set_table_entry(struct ctl_table *entry, static struct ctl_table * sd_alloc_ctl_domain_table(struct sched_domain *sd) { @@ -84885,11 +83564,11 @@ index e8b3350..d83d44e 100644 if (table == NULL) return NULL; -@@ -5093,9 +5100,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd) +@@ -4578,9 +4585,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd) return table; } --static ctl_table *sd_alloc_ctl_cpu_table(int cpu) +-static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu) +static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu) { - struct ctl_table *entry, *table; @@ -84897,7 +83576,7 @@ index e8b3350..d83d44e 100644 struct sched_domain *sd; int domain_num = 0, i; char buf[32]; -@@ -5122,11 +5129,13 @@ static struct ctl_table_header *sd_sysctl_header; +@@ -4607,11 +4614,13 @@ static struct ctl_table_header *sd_sysctl_header; static void register_sched_domain_sysctl(void) { int i, cpu_num = num_possible_cpus(); @@ -84912,7 +83591,7 @@ index e8b3350..d83d44e 100644 if (entry == NULL) return; -@@ -5149,8 +5158,12 @@ static void unregister_sched_domain_sysctl(void) +@@ -4634,8 +4643,12 @@ static void unregister_sched_domain_sysctl(void) if (sd_sysctl_header) unregister_sysctl_table(sd_sysctl_header); sd_sysctl_header = NULL; @@ -84927,20 +83606,11 @@ index e8b3350..d83d44e 100644 } #else static void register_sched_domain_sysctl(void) -@@ -5249,7 +5262,7 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) - * happens before everything else. This has to be lower priority than - * the notifier in the perf_event subsystem, though. - */ --static struct notifier_block __cpuinitdata migration_notifier = { -+static struct notifier_block migration_notifier = { - .notifier_call = migration_call, - .priority = CPU_PRI_MIGRATION, - }; diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 03b73be..9422b9f 100644 +index 68f1609..640ba13 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -831,7 +831,7 @@ void task_numa_fault(int node, int pages, bool migrated) +@@ -869,7 +869,7 @@ void task_numa_fault(int node, int pages, bool migrated) static void reset_ptenuma_scan(struct task_struct *p) { @@ -84949,7 +83619,7 @@ index 03b73be..9422b9f 100644 p->mm->numa_scan_offset = 0; } -@@ -5687,7 +5687,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { } +@@ -5727,7 +5727,7 @@ static void nohz_idle_balance(int this_cpu, 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). */ @@ -84959,10 +83629,10 @@ index 03b73be..9422b9f 100644 int this_cpu = smp_processor_id(); struct rq *this_rq = cpu_rq(this_cpu); diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h -index ce39224d..0e09343 100644 +index ef0a7b2..1b728c1 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h -@@ -1009,7 +1009,7 @@ struct sched_class { +@@ -1004,7 +1004,7 @@ struct sched_class { #ifdef CONFIG_FAIR_GROUP_SCHED void (*task_move_group) (struct task_struct *p, int on_rq); #endif @@ -84972,7 +83642,7 @@ index ce39224d..0e09343 100644 #define sched_class_highest (&stop_sched_class) #define for_each_class(class) \ diff --git a/kernel/signal.c b/kernel/signal.c -index 113411b..20d0a99 100644 +index 50e4107..08bcb94 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -51,12 +51,12 @@ static struct kmem_cache *sigqueue_cachep; @@ -85143,21 +83813,8 @@ index 113411b..20d0a99 100644 #endif #ifdef __ARCH_WANT_SYS_SIGPENDING -diff --git a/kernel/smp.c b/kernel/smp.c -index 4dba0f7..fe9f773 100644 ---- a/kernel/smp.c -+++ b/kernel/smp.c -@@ -73,7 +73,7 @@ hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu) - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata hotplug_cfd_notifier = { -+static struct notifier_block hotplug_cfd_notifier = { - .notifier_call = hotplug_cfd, - }; - diff --git a/kernel/smpboot.c b/kernel/smpboot.c -index 02fc5c9..e54c335 100644 +index eb89e18..a4e6792 100644 --- a/kernel/smpboot.c +++ b/kernel/smpboot.c @@ -288,7 +288,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread) @@ -85179,7 +83836,7 @@ index 02fc5c9..e54c335 100644 mutex_unlock(&smpboot_threads_lock); put_online_cpus(); diff --git a/kernel/softirq.c b/kernel/softirq.c -index 3d6833f..da6d93d 100644 +index be3d351..9e4d5f2 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -53,11 +53,11 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned; @@ -85196,7 +83853,7 @@ index 3d6833f..da6d93d 100644 "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL", "TASKLET", "SCHED", "HRTIMER", "RCU" }; -@@ -250,7 +250,7 @@ restart: +@@ -248,7 +248,7 @@ restart: kstat_incr_softirqs_this_cpu(vec_nr); trace_softirq_entry(vec_nr); @@ -85205,7 +83862,7 @@ index 3d6833f..da6d93d 100644 trace_softirq_exit(vec_nr); if (unlikely(prev_count != preempt_count())) { printk(KERN_ERR "huh, entered softirq %u %s %p" -@@ -405,7 +405,7 @@ void __raise_softirq_irqoff(unsigned int nr) +@@ -403,7 +403,7 @@ void __raise_softirq_irqoff(unsigned int nr) or_softirq_pending(1UL << nr); } @@ -85214,7 +83871,7 @@ index 3d6833f..da6d93d 100644 { softirq_vec[nr].action = action; } -@@ -461,7 +461,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t) +@@ -459,7 +459,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t) EXPORT_SYMBOL(__tasklet_hi_schedule_first); @@ -85223,7 +83880,7 @@ index 3d6833f..da6d93d 100644 { struct tasklet_struct *list; -@@ -496,7 +496,7 @@ static void tasklet_action(struct softirq_action *a) +@@ -494,7 +494,7 @@ static void tasklet_action(struct softirq_action *a) } } @@ -85232,21 +83889,7 @@ index 3d6833f..da6d93d 100644 { struct tasklet_struct *list; -@@ -730,7 +730,7 @@ static int __cpuinit remote_softirq_cpu_notify(struct notifier_block *self, - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata remote_softirq_cpu_notifier = { -+static struct notifier_block remote_softirq_cpu_notifier = { - .notifier_call = remote_softirq_cpu_notify, - }; - -@@ -847,11 +847,11 @@ static int __cpuinit cpu_callback(struct notifier_block *nfb, - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata cpu_nfb = { -+static struct notifier_block cpu_nfb = { +@@ -849,7 +849,7 @@ static struct notifier_block cpu_nfb = { .notifier_call = cpu_callback }; @@ -85272,10 +83915,10 @@ index 01d5ccb..cdcbee6 100644 return idx; } diff --git a/kernel/sys.c b/kernel/sys.c -index 2bbd9a7..0875671 100644 +index 771129b..dc0c7e3 100644 --- a/kernel/sys.c +++ b/kernel/sys.c -@@ -163,6 +163,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error) +@@ -149,6 +149,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error) error = -EACCES; goto out; } @@ -85288,7 +83931,7 @@ index 2bbd9a7..0875671 100644 no_nice = security_task_setnice(p, niceval); if (no_nice) { error = no_nice; -@@ -626,6 +632,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid) +@@ -352,6 +358,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid) goto error; } @@ -85298,7 +83941,7 @@ index 2bbd9a7..0875671 100644 if (rgid != (gid_t) -1 || (egid != (gid_t) -1 && !gid_eq(kegid, old->gid))) new->sgid = new->egid; -@@ -661,6 +670,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid) +@@ -387,6 +396,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid) old = current_cred(); retval = -EPERM; @@ -85309,7 +83952,7 @@ index 2bbd9a7..0875671 100644 if (nsown_capable(CAP_SETGID)) new->gid = new->egid = new->sgid = new->fsgid = kgid; else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid)) -@@ -678,7 +691,7 @@ error: +@@ -404,7 +417,7 @@ error: /* * change the user struct in a credentials set to match the new UID */ @@ -85318,7 +83961,7 @@ index 2bbd9a7..0875671 100644 { struct user_struct *new_user; -@@ -758,6 +771,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid) +@@ -484,6 +497,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid) goto error; } @@ -85328,7 +83971,7 @@ index 2bbd9a7..0875671 100644 if (!uid_eq(new->uid, old->uid)) { retval = set_user(new); if (retval < 0) -@@ -808,6 +824,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid) +@@ -534,6 +550,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid) old = current_cred(); retval = -EPERM; @@ -85341,7 +83984,7 @@ index 2bbd9a7..0875671 100644 if (nsown_capable(CAP_SETUID)) { new->suid = new->uid = kuid; if (!uid_eq(kuid, old->uid)) { -@@ -877,6 +899,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid) +@@ -603,6 +625,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid) goto error; } @@ -85351,7 +83994,7 @@ index 2bbd9a7..0875671 100644 if (ruid != (uid_t) -1) { new->uid = kruid; if (!uid_eq(kruid, old->uid)) { -@@ -959,6 +984,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid) +@@ -685,6 +710,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid) goto error; } @@ -85361,7 +84004,7 @@ index 2bbd9a7..0875671 100644 if (rgid != (gid_t) -1) new->gid = krgid; if (egid != (gid_t) -1) -@@ -1020,12 +1048,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid) +@@ -746,12 +774,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid) uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) || nsown_capable(CAP_SETUID)) { if (!uid_eq(kuid, old->fsuid)) { @@ -85378,7 +84021,7 @@ index 2bbd9a7..0875671 100644 abort_creds(new); return old_fsuid; -@@ -1058,12 +1090,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid) +@@ -784,12 +816,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) || nsown_capable(CAP_SETGID)) { @@ -85395,7 +84038,7 @@ index 2bbd9a7..0875671 100644 abort_creds(new); return old_fsgid; -@@ -1432,19 +1468,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name) +@@ -1169,19 +1205,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name) return -EFAULT; down_read(&uts_sem); @@ -85420,7 +84063,7 @@ index 2bbd9a7..0875671 100644 __OLD_UTS_LEN); error |= __put_user(0, name->machine + __OLD_UTS_LEN); up_read(&uts_sem); -@@ -1646,6 +1682,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource, +@@ -1383,6 +1419,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource, */ new_rlim->rlim_cur = 1; } @@ -85435,7 +84078,7 @@ index 2bbd9a7..0875671 100644 if (!retval) { if (old_rlim) diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index 9edcf45..713c960 100644 +index 07f6fc4..65fb3d4 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -93,7 +93,6 @@ @@ -85446,12 +84089,11 @@ index 9edcf45..713c960 100644 /* External variables not in a header file. */ extern int sysctl_overcommit_memory; extern int sysctl_overcommit_ratio; -@@ -119,18 +118,18 @@ extern int blk_iopoll_enabled; +@@ -119,17 +118,18 @@ extern int blk_iopoll_enabled; /* Constants used for minimum and maximum */ #ifdef CONFIG_LOCKUP_DETECTOR -static int sixty = 60; --static int neg_one = -1; +static int sixty __read_only = 60; #endif @@ -85474,7 +84116,7 @@ index 9edcf45..713c960 100644 #endif /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */ -@@ -177,10 +176,8 @@ static int proc_taint(struct ctl_table *table, int write, +@@ -176,10 +176,8 @@ static int proc_taint(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos); #endif @@ -85485,7 +84127,7 @@ index 9edcf45..713c960 100644 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos); -@@ -211,6 +208,8 @@ static int sysrq_sysctl_handler(ctl_table *table, int write, +@@ -210,6 +208,8 @@ static int sysrq_sysctl_handler(ctl_table *table, int write, #endif @@ -85494,7 +84136,7 @@ index 9edcf45..713c960 100644 static struct ctl_table kern_table[]; static struct ctl_table vm_table[]; static struct ctl_table fs_table[]; -@@ -225,6 +224,20 @@ extern struct ctl_table epoll_table[]; +@@ -224,6 +224,20 @@ extern struct ctl_table epoll_table[]; int sysctl_legacy_va_layout; #endif @@ -85515,7 +84157,7 @@ index 9edcf45..713c960 100644 /* The default sysctl tables: */ static struct ctl_table sysctl_base_table[] = { -@@ -273,6 +286,22 @@ static int max_extfrag_threshold = 1000; +@@ -272,6 +286,22 @@ static int max_extfrag_threshold = 1000; #endif static struct ctl_table kern_table[] = { @@ -85538,7 +84180,7 @@ index 9edcf45..713c960 100644 { .procname = "sched_child_runs_first", .data = &sysctl_sched_child_runs_first, -@@ -607,7 +636,7 @@ static struct ctl_table kern_table[] = { +@@ -613,7 +643,7 @@ static struct ctl_table kern_table[] = { .data = &modprobe_path, .maxlen = KMOD_PATH_LEN, .mode = 0644, @@ -85547,7 +84189,7 @@ index 9edcf45..713c960 100644 }, { .procname = "modules_disabled", -@@ -774,16 +803,20 @@ static struct ctl_table kern_table[] = { +@@ -780,16 +810,20 @@ static struct ctl_table kern_table[] = { .extra1 = &zero, .extra2 = &one, }, @@ -85569,7 +84211,7 @@ index 9edcf45..713c960 100644 { .procname = "ngroups_max", .data = &ngroups_max, -@@ -1025,10 +1058,17 @@ static struct ctl_table kern_table[] = { +@@ -1031,10 +1065,17 @@ static struct ctl_table kern_table[] = { */ { .procname = "perf_event_paranoid", @@ -85590,7 +84232,7 @@ index 9edcf45..713c960 100644 }, { .procname = "perf_event_mlock_kb", -@@ -1282,6 +1322,13 @@ static struct ctl_table vm_table[] = { +@@ -1297,6 +1338,13 @@ static struct ctl_table vm_table[] = { .proc_handler = proc_dointvec_minmax, .extra1 = &zero, }, @@ -85604,7 +84246,7 @@ index 9edcf45..713c960 100644 #else { .procname = "nr_trim_pages", -@@ -1746,6 +1793,16 @@ int proc_dostring(struct ctl_table *table, int write, +@@ -1761,6 +1809,16 @@ int proc_dostring(struct ctl_table *table, int write, buffer, lenp, ppos); } @@ -85621,7 +84263,7 @@ index 9edcf45..713c960 100644 static size_t proc_skip_spaces(char **buf) { size_t ret; -@@ -1851,6 +1908,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val, +@@ -1866,6 +1924,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val, len = strlen(tmp); if (len > *size) len = *size; @@ -85630,7 +84272,7 @@ index 9edcf45..713c960 100644 if (copy_to_user(*buf, tmp, len)) return -EFAULT; *size -= len; -@@ -2015,7 +2074,7 @@ int proc_dointvec(struct ctl_table *table, int write, +@@ -2030,7 +2090,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) { @@ -85639,7 +84281,7 @@ index 9edcf45..713c960 100644 unsigned long tmptaint = get_taint(); int err; -@@ -2043,7 +2102,6 @@ static int proc_taint(struct ctl_table *table, int write, +@@ -2058,7 +2118,6 @@ static int proc_taint(struct ctl_table *table, int write, return err; } @@ -85647,7 +84289,7 @@ index 9edcf45..713c960 100644 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos) { -@@ -2052,7 +2110,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write, +@@ -2067,7 +2126,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write, return proc_dointvec_minmax(table, write, buffer, lenp, ppos); } @@ -85655,7 +84297,7 @@ index 9edcf45..713c960 100644 struct do_proc_dointvec_minmax_conv_param { int *min; -@@ -2199,8 +2256,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int +@@ -2214,8 +2272,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int *i = val; } else { val = convdiv * (*i) / convmul; @@ -85668,7 +84310,7 @@ index 9edcf45..713c960 100644 err = proc_put_long(&buffer, &left, val, false); if (err) break; -@@ -2592,6 +2652,12 @@ int proc_dostring(struct ctl_table *table, int write, +@@ -2611,6 +2672,12 @@ int proc_dostring(struct ctl_table *table, int write, return -ENOSYS; } @@ -85681,7 +84323,7 @@ index 9edcf45..713c960 100644 int proc_dointvec(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos) { -@@ -2648,5 +2714,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax); +@@ -2667,5 +2734,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax); EXPORT_SYMBOL(proc_dointvec_userhz_jiffies); EXPORT_SYMBOL(proc_dointvec_ms_jiffies); EXPORT_SYMBOL(proc_dostring); @@ -85716,7 +84358,7 @@ index 145bb4d..b2aa969 100644 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 d3617db..c98bbe9 100644 +index 7c7964c..784a599 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) @@ -85741,10 +84383,10 @@ index d3617db..c98bbe9 100644 { unsigned long sec = value->tv_sec; diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c -index f11d83b..d016d91 100644 +index eec50fc..65e5df6 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c -@@ -750,7 +750,7 @@ static int __init alarmtimer_init(void) +@@ -795,7 +795,7 @@ static int __init alarmtimer_init(void) struct platform_device *pdev; int error = 0; int i; @@ -85754,7 +84396,7 @@ index f11d83b..d016d91 100644 .clock_get = alarm_clock_get, .timer_create = alarm_timer_create, diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c -index baeeb5c..c22704a 100644 +index 48b9fff..9e07e5f 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -15,6 +15,7 @@ @@ -85765,7 +84407,7 @@ index baeeb5c..c22704a 100644 #include <linux/syscore_ops.h> #include <linux/clocksource.h> #include <linux/jiffies.h> -@@ -495,6 +496,8 @@ int do_settimeofday(const struct timespec *tv) +@@ -500,6 +501,8 @@ int do_settimeofday(const struct timespec *tv) if (!timespec_valid_strict(tv)) return -EINVAL; @@ -85893,7 +84535,7 @@ index 0b537f2..40d6c20 100644 return -ENOMEM; return 0; diff --git a/kernel/timer.c b/kernel/timer.c -index 15bc1b4..32da49c 100644 +index 4296d13..8998609 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1366,7 +1366,7 @@ void update_process_times(int user_tick) @@ -85914,15 +84556,6 @@ index 15bc1b4..32da49c 100644 { struct timer_list timer; unsigned long expire; -@@ -1635,7 +1635,7 @@ static int __cpuinit timer_cpu_notify(struct notifier_block *self, - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata timers_nb = { -+static struct notifier_block timers_nb = { - .notifier_call = timer_cpu_notify, - }; - diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index b8b8560..75b1a09 100644 --- a/kernel/trace/blktrace.c @@ -85955,10 +84588,10 @@ index b8b8560..75b1a09 100644 ret = -EIO; bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt, diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c -index f23449d..b8cc3a1 100644 +index a6d098c..bb8cf65 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c -@@ -1925,12 +1925,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec) +@@ -1950,12 +1950,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec) if (unlikely(ftrace_disabled)) return 0; @@ -85978,7 +84611,7 @@ index f23449d..b8cc3a1 100644 } /* -@@ -3994,8 +3999,10 @@ static int ftrace_process_locs(struct module *mod, +@@ -4028,8 +4033,10 @@ static int ftrace_process_locs(struct module *mod, if (!count) return 0; @@ -85989,7 +84622,7 @@ index f23449d..b8cc3a1 100644 start_pg = ftrace_allocate_pages(count); if (!start_pg) -@@ -4718,8 +4725,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write, +@@ -4752,8 +4759,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write, #ifdef CONFIG_FUNCTION_GRAPH_TRACER static int ftrace_graph_active; @@ -85998,7 +84631,7 @@ index f23449d..b8cc3a1 100644 int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace) { return 0; -@@ -4863,6 +4868,10 @@ ftrace_suspend_notifier_call(struct notifier_block *bl, unsigned long state, +@@ -4897,6 +4902,10 @@ ftrace_suspend_notifier_call(struct notifier_block *bl, unsigned long state, return NOTIFY_DONE; } @@ -86009,7 +84642,7 @@ index f23449d..b8cc3a1 100644 int register_ftrace_graph(trace_func_graph_ret_t retfunc, trace_func_graph_ent_t entryfunc) { -@@ -4876,7 +4885,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc, +@@ -4910,7 +4919,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc, goto out; } @@ -86018,7 +84651,7 @@ index f23449d..b8cc3a1 100644 ftrace_graph_active++; diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c -index e444ff8..438b8f4 100644 +index cc2f66f..05edd54 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -352,9 +352,9 @@ struct buffer_data_page { @@ -86090,7 +84723,7 @@ index e444ff8..438b8f4 100644 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes); } -@@ -2063,7 +2063,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer, +@@ -2064,7 +2064,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer, * it is our responsibility to update * the counters. */ @@ -86099,7 +84732,7 @@ index e444ff8..438b8f4 100644 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes); /* -@@ -2213,7 +2213,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer, +@@ -2214,7 +2214,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer, if (tail == BUF_PAGE_SIZE) tail_page->real_end = 0; @@ -86108,7 +84741,7 @@ index e444ff8..438b8f4 100644 return; } -@@ -2248,7 +2248,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer, +@@ -2249,7 +2249,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer, rb_event_set_padding(event); /* Set the write back to the previous setting */ @@ -86117,7 +84750,7 @@ index e444ff8..438b8f4 100644 return; } -@@ -2260,7 +2260,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer, +@@ -2261,7 +2261,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer, /* Set write to end of buffer */ length = (tail + length) - BUF_PAGE_SIZE; @@ -86126,7 +84759,7 @@ index e444ff8..438b8f4 100644 } /* -@@ -2286,7 +2286,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer, +@@ -2287,7 +2287,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer, * about it. */ if (unlikely(next_page == commit_page)) { @@ -86135,7 +84768,7 @@ index e444ff8..438b8f4 100644 goto out_reset; } -@@ -2342,7 +2342,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer, +@@ -2343,7 +2343,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer, cpu_buffer->tail_page) && (cpu_buffer->commit_page == cpu_buffer->reader_page))) { @@ -86144,7 +84777,7 @@ index e444ff8..438b8f4 100644 goto out_reset; } } -@@ -2390,7 +2390,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer, +@@ -2391,7 +2391,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer, length += RB_LEN_TIME_EXTEND; tail_page = cpu_buffer->tail_page; @@ -86153,7 +84786,7 @@ index e444ff8..438b8f4 100644 /* set write to only the index of the write */ write &= RB_WRITE_MASK; -@@ -2407,7 +2407,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer, +@@ -2408,7 +2408,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); @@ -86162,7 +84795,7 @@ index e444ff8..438b8f4 100644 /* * If this is the first commit on the page, then update -@@ -2440,7 +2440,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer, +@@ -2441,7 +2441,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 = @@ -86171,7 +84804,7 @@ index e444ff8..438b8f4 100644 unsigned long event_length = rb_event_length(event); /* * This is on the tail page. It is possible that -@@ -2450,7 +2450,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer, +@@ -2451,7 +2451,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer, */ old_index += write_mask; new_index += write_mask; @@ -86180,7 +84813,7 @@ index e444ff8..438b8f4 100644 if (index == old_index) { /* update counters */ local_sub(event_length, &cpu_buffer->entries_bytes); -@@ -2842,7 +2842,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer, +@@ -2843,7 +2843,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer, /* Do the likely case first */ if (likely(bpage->page == (void *)addr)) { @@ -86189,7 +84822,7 @@ index e444ff8..438b8f4 100644 return; } -@@ -2854,7 +2854,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer, +@@ -2855,7 +2855,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer, start = bpage; do { if (bpage->page == (void *)addr) { @@ -86198,7 +84831,7 @@ index e444ff8..438b8f4 100644 return; } rb_inc_page(cpu_buffer, &bpage); -@@ -3138,7 +3138,7 @@ static inline unsigned long +@@ -3139,7 +3139,7 @@ static inline unsigned long rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer) { return local_read(&cpu_buffer->entries) - @@ -86207,7 +84840,7 @@ index e444ff8..438b8f4 100644 } /** -@@ -3227,7 +3227,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu) +@@ -3228,7 +3228,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu) return 0; cpu_buffer = buffer->buffers[cpu]; @@ -86216,7 +84849,7 @@ index e444ff8..438b8f4 100644 return ret; } -@@ -3250,7 +3250,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu) +@@ -3251,7 +3251,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu) return 0; cpu_buffer = buffer->buffers[cpu]; @@ -86225,7 +84858,7 @@ index e444ff8..438b8f4 100644 return ret; } -@@ -3335,7 +3335,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer) +@@ -3336,7 +3336,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]; @@ -86234,7 +84867,7 @@ index e444ff8..438b8f4 100644 } return overruns; -@@ -3511,8 +3511,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer) +@@ -3512,8 +3512,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer) /* * Reset the reader page to size zero. */ @@ -86245,7 +84878,7 @@ index e444ff8..438b8f4 100644 local_set(&cpu_buffer->reader_page->page->commit, 0); cpu_buffer->reader_page->real_end = 0; -@@ -3546,7 +3546,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer) +@@ -3547,7 +3547,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer) * want to compare with the last_overrun. */ smp_mb(); @@ -86254,7 +84887,7 @@ index e444ff8..438b8f4 100644 /* * Here's the tricky part. -@@ -4116,8 +4116,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer) +@@ -4117,8 +4117,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer) cpu_buffer->head_page = list_entry(cpu_buffer->pages, struct buffer_page, list); @@ -86265,7 +84898,7 @@ index e444ff8..438b8f4 100644 local_set(&cpu_buffer->head_page->page->commit, 0); cpu_buffer->head_page->read = 0; -@@ -4127,14 +4127,14 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer) +@@ -4128,14 +4128,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); @@ -86284,7 +84917,7 @@ index e444ff8..438b8f4 100644 local_set(&cpu_buffer->dropped_events, 0); local_set(&cpu_buffer->entries, 0); local_set(&cpu_buffer->committing, 0); -@@ -4538,8 +4538,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer, +@@ -4540,8 +4540,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer, rb_init_page(bpage); bpage = reader->page; reader->page = *data_page; @@ -86296,10 +84929,10 @@ index e444ff8..438b8f4 100644 *data_page = bpage; diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c -index 0582a01..310bed1 100644 +index 496f94d..754aeea 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c -@@ -3327,7 +3327,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set) +@@ -3335,7 +3335,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set) return 0; } @@ -86309,10 +84942,10 @@ index 0582a01..310bed1 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 51b4448..7be601f 100644 +index afaae41..64871f8 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h -@@ -1035,7 +1035,7 @@ extern const char *__stop___trace_bprintk_fmt[]; +@@ -1025,7 +1025,7 @@ extern const char *__stop___trace_bprintk_fmt[]; void trace_printk_init_buffers(void); void trace_printk_start_comm(void); int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set); @@ -86342,10 +84975,10 @@ index 26dc348..8708ca7 100644 + return atomic64_inc_return_unchecked(&trace_counter); } diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c -index 3d18aad..d1be0eb 100644 +index 29a7ebc..eb473cf 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c -@@ -1794,10 +1794,6 @@ static LIST_HEAD(ftrace_module_file_list); +@@ -1778,10 +1778,6 @@ static LIST_HEAD(ftrace_module_file_list); struct ftrace_module_file_ops { struct list_head list; struct module *mod; @@ -86356,7 +84989,7 @@ index 3d18aad..d1be0eb 100644 }; static struct ftrace_module_file_ops * -@@ -1838,17 +1834,12 @@ trace_create_file_ops(struct module *mod) +@@ -1822,17 +1818,12 @@ trace_create_file_ops(struct module *mod) file_ops->mod = mod; @@ -86380,7 +85013,7 @@ index 3d18aad..d1be0eb 100644 list_add(&file_ops->list, &ftrace_module_file_list); -@@ -1941,8 +1932,8 @@ __trace_add_new_mod_event(struct ftrace_event_call *call, +@@ -1925,8 +1916,8 @@ __trace_add_new_mod_event(struct ftrace_event_call *call, struct ftrace_module_file_ops *file_ops) { return __trace_add_new_event(call, tr, @@ -86392,7 +85025,7 @@ index 3d18aad..d1be0eb 100644 #else diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c -index a5e8f48..a9690d2 100644 +index b3dcfb2..ebee344 100644 --- a/kernel/trace/trace_mmiotrace.c +++ b/kernel/trace/trace_mmiotrace.c @@ -24,7 +24,7 @@ struct header_iter { @@ -86432,7 +85065,7 @@ index a5e8f48..a9690d2 100644 } entry = ring_buffer_event_data(event); diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c -index bb922d9..2a54a257 100644 +index 34e7cba..6f9a729 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) @@ -86527,12 +85160,12 @@ 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 05039e3..17490c7 100644 +index 1241d8c..d5cfc28 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c -@@ -531,7 +531,7 @@ int proc_dowatchdog(struct ctl_table *table, int write, - } - #endif /* CONFIG_SYSCTL */ +@@ -475,7 +475,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; } + static void watchdog_nmi_disable(unsigned int cpu) { return; } + #endif /* CONFIG_HARDLOCKUP_DETECTOR */ -static struct smp_hotplug_thread watchdog_threads = { +static struct smp_hotplug_thread watchdog_threads __read_only = { @@ -86540,10 +85173,10 @@ index 05039e3..17490c7 100644 .thread_should_run = watchdog_should_run, .thread_fn = watchdog, diff --git a/kernel/workqueue.c b/kernel/workqueue.c -index e52d002..576b367 100644 +index e93f7b9..989fcd7 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c -@@ -4605,7 +4605,7 @@ static void rebind_workers(struct worker_pool *pool) +@@ -4627,7 +4627,7 @@ static void rebind_workers(struct worker_pool *pool) WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND)); worker_flags |= WORKER_REBOUND; worker_flags &= ~WORKER_UNBOUND; @@ -86553,10 +85186,19 @@ index e52d002..576b367 100644 spin_unlock_irq(&pool->lock); diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug -index 74fdc5c..3310593 100644 +index 1501aa5..e771896 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug -@@ -549,7 +549,7 @@ config DEBUG_MUTEXES +@@ -836,7 +836,7 @@ config DEBUG_MUTEXES + + config DEBUG_WW_MUTEX_SLOWPATH + bool "Wait/wound mutex debugging: Slowpath testing" +- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT ++ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN + select DEBUG_LOCK_ALLOC + select DEBUG_SPINLOCK + select DEBUG_MUTEXES +@@ -849,7 +849,7 @@ config DEBUG_WW_MUTEX_SLOWPATH config DEBUG_LOCK_ALLOC bool "Lock debugging: detect incorrect freeing of live locks" @@ -86565,7 +85207,7 @@ index 74fdc5c..3310593 100644 select DEBUG_SPINLOCK select DEBUG_MUTEXES select LOCKDEP -@@ -563,7 +563,7 @@ config DEBUG_LOCK_ALLOC +@@ -863,7 +863,7 @@ config DEBUG_LOCK_ALLOC config PROVE_LOCKING bool "Lock debugging: prove locking correctness" @@ -86574,7 +85216,7 @@ index 74fdc5c..3310593 100644 select LOCKDEP select DEBUG_SPINLOCK select DEBUG_MUTEXES -@@ -614,7 +614,7 @@ config LOCKDEP +@@ -914,7 +914,7 @@ config LOCKDEP config LOCK_STAT bool "Lock usage statistics" @@ -86583,7 +85225,7 @@ index 74fdc5c..3310593 100644 select LOCKDEP select DEBUG_SPINLOCK select DEBUG_MUTEXES -@@ -1282,6 +1282,7 @@ config LATENCYTOP +@@ -1357,6 +1357,7 @@ config LATENCYTOP depends on DEBUG_KERNEL depends on STACKTRACE_SUPPORT depends on PROC_FS @@ -86591,7 +85233,7 @@ index 74fdc5c..3310593 100644 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND select KALLSYMS select KALLSYMS_ALL -@@ -1298,7 +1299,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS +@@ -1373,7 +1374,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 @@ -86600,7 +85242,7 @@ index 74fdc5c..3310593 100644 help Enabling this option turns a certain set of sanity checks for user copy operations into compile time failures. -@@ -1328,7 +1329,7 @@ config INTERVAL_TREE_TEST +@@ -1483,7 +1484,7 @@ endmenu # runtime tests config PROVIDE_OHCI1394_DMA_INIT bool "Remote debugging over FireWire early on boot" @@ -86609,7 +85251,7 @@ index 74fdc5c..3310593 100644 help 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 -@@ -1357,7 +1358,7 @@ config PROVIDE_OHCI1394_DMA_INIT +@@ -1512,7 +1513,7 @@ config PROVIDE_OHCI1394_DMA_INIT config FIREWIRE_OHCI_REMOTE_DMA bool "Remote debugging over FireWire with firewire-ohci" @@ -86619,7 +85261,7 @@ index 74fdc5c..3310593 100644 This option lets you use the FireWire bus for remote debugging with help of the firewire-ohci driver. It enables unfiltered diff --git a/lib/Makefile b/lib/Makefile -index c55a037..fb46e3b 100644 +index 7baccfd..3ceb95f 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -50,7 +50,7 @@ obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o @@ -86813,18 +85455,9 @@ index bd2bea9..6b3c95e 100644 return false; diff --git a/lib/kobject.c b/lib/kobject.c -index b7e29a6..2f3ca75 100644 +index 4a1f33d..2f3ca75 100644 --- a/lib/kobject.c +++ b/lib/kobject.c -@@ -805,7 +805,7 @@ static struct kset *kset_create(const char *name, - kset = kzalloc(sizeof(*kset), GFP_KERNEL); - if (!kset) - return NULL; -- retval = kobject_set_name(&kset->kobj, name); -+ retval = kobject_set_name(&kset->kobj, "%s", name); - if (retval) { - kfree(kset); - return NULL; @@ -859,9 +859,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add); @@ -87080,7 +85713,7 @@ index 4f5b1dd..7cab418 100644 +} +EXPORT_SYMBOL(copy_to_user_overflow); diff --git a/lib/vsprintf.c b/lib/vsprintf.c -index e149c64..24aa71a 100644 +index 739a363..aa668d7 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -16,6 +16,9 @@ @@ -87093,7 +85726,7 @@ index e149c64..24aa71a 100644 #include <stdarg.h> #include <linux/module.h> /* for KSYM_SYMBOL_LEN */ #include <linux/types.h> -@@ -981,7 +984,11 @@ char *netdev_feature_string(char *buf, char *end, const u8 *addr, +@@ -1078,7 +1081,11 @@ char *netdev_feature_string(char *buf, char *end, const u8 *addr, return number(buf, end, *(const netdev_features_t *)addr, spec); } @@ -87105,7 +85738,7 @@ index e149c64..24aa71a 100644 /* * Show a '%p' thing. A kernel extension is that the '%p' is followed -@@ -994,6 +1001,7 @@ int kptr_restrict __read_mostly; +@@ -1091,6 +1098,7 @@ int kptr_restrict __read_mostly; * - 'f' For simple symbolic function names without offset * - 'S' For symbolic direct pointers with offset * - 's' For symbolic direct pointers without offset @@ -87113,7 +85746,7 @@ index e149c64..24aa71a 100644 * - '[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] -@@ -1052,12 +1060,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, +@@ -1155,12 +1163,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, if (!ptr && *fmt != 'K') { /* @@ -87128,7 +85761,7 @@ index e149c64..24aa71a 100644 } switch (*fmt) { -@@ -1067,6 +1075,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, +@@ -1170,6 +1178,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, /* Fallthrough */ case 'S': case 's': @@ -87141,7 +85774,7 @@ index e149c64..24aa71a 100644 case 'B': return symbol_string(buf, end, ptr, spec, fmt); case 'R': -@@ -1107,6 +1121,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, +@@ -1225,6 +1239,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, va_end(va); return buf; } @@ -87150,7 +85783,7 @@ index e149c64..24aa71a 100644 case 'K': /* * %pK cannot be used in IRQ context because its test -@@ -1136,6 +1152,21 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, +@@ -1254,6 +1270,21 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, return number(buf, end, (unsigned long long) *((phys_addr_t *)ptr), spec); } @@ -87172,7 +85805,7 @@ index e149c64..24aa71a 100644 spec.flags |= SMALL; if (spec.field_width == -1) { spec.field_width = default_width; -@@ -1857,11 +1888,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf) +@@ -1977,11 +2008,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)); \ @@ -87187,7 +85820,7 @@ index e149c64..24aa71a 100644 } \ args += sizeof(type); \ value; \ -@@ -1924,7 +1955,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf) +@@ -2044,7 +2075,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; @@ -87204,7 +85837,7 @@ index 0000000..7cd6065 @@ -0,0 +1 @@ +-grsec diff --git a/mm/Kconfig b/mm/Kconfig -index e742d06..c56fdd8 100644 +index 8028dcc..9a2dbe7 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -317,10 +317,10 @@ config KSM @@ -87231,7 +85864,7 @@ index e742d06..c56fdd8 100644 config NOMMU_INITIAL_TRIM_EXCESS diff --git a/mm/backing-dev.c b/mm/backing-dev.c -index 5025174..9d67dcd 100644 +index e04454c..ca5be3e 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -12,7 +12,7 @@ @@ -87243,26 +85876,17 @@ index 5025174..9d67dcd 100644 struct backing_dev_info default_backing_dev_info = { .name = "default", -@@ -515,7 +515,6 @@ EXPORT_SYMBOL(bdi_destroy); - int bdi_setup_and_register(struct backing_dev_info *bdi, char *name, - unsigned int cap) - { -- char tmp[32]; - int err; - - bdi->name = name; -@@ -524,8 +523,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name, - if (err) +@@ -522,7 +522,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name, return err; -- sprintf(tmp, "%.28s%s", name, "-%d"); -- err = bdi_register(bdi, NULL, tmp, atomic_long_inc_return(&bdi_seq)); -+ err = bdi_register(bdi, NULL, "%.28s-%ld", name, atomic_long_inc_return_unchecked(&bdi_seq)); + err = bdi_register(bdi, NULL, "%.28s-%ld", name, +- atomic_long_inc_return(&bdi_seq)); ++ atomic_long_inc_return_unchecked(&bdi_seq)); if (err) { bdi_destroy(bdi); return err; diff --git a/mm/filemap.c b/mm/filemap.c -index 7905fe7..f59502b 100644 +index 4b51ac1..5aa90ff 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1766,7 +1766,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma) @@ -87319,10 +85943,10 @@ index 7905fe7..f59502b 100644 send_sig(SIGXFSZ, current, 0); return -EFBIG; diff --git a/mm/fremap.c b/mm/fremap.c -index 87da359..3f41cb1 100644 +index 5bff081..d8189a9 100644 --- a/mm/fremap.c +++ b/mm/fremap.c -@@ -158,6 +158,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, +@@ -163,6 +163,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, retry: vma = find_vma(mm, start); @@ -87363,7 +85987,7 @@ index b32b70c..e512eb0 100644 set_page_address(page, (void *)vaddr); diff --git a/mm/hugetlb.c b/mm/hugetlb.c -index 7c5eb85..5c01c2f 100644 +index b60f330..ee7de7e 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2022,15 +2022,17 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy, @@ -87498,10 +86122,10 @@ index 7c5eb85..5c01c2f 100644 if (!ptep) return VM_FAULT_OOM; diff --git a/mm/internal.h b/mm/internal.h -index 8562de0..92b2073 100644 +index 4390ac6..fc60373c 100644 --- a/mm/internal.h +++ b/mm/internal.h -@@ -100,6 +100,7 @@ extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address); +@@ -95,6 +95,7 @@ extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address); * in mm/page_alloc.c */ extern void __free_pages_bootmem(struct page *page, unsigned int order); @@ -87509,7 +86133,7 @@ index 8562de0..92b2073 100644 extern void prep_compound_page(struct page *page, unsigned long order); #ifdef CONFIG_MEMORY_FAILURE extern bool is_free_buddy_page(struct page *page); -@@ -355,7 +356,7 @@ extern u32 hwpoison_filter_enable; +@@ -350,7 +351,7 @@ extern u32 hwpoison_filter_enable; extern unsigned long vm_mmap_pgoff(struct file *, unsigned long, unsigned long, unsigned long, @@ -87643,7 +86267,7 @@ index 7055883..aafb1ed 100644 if (end == start) return error; diff --git a/mm/memory-failure.c b/mm/memory-failure.c -index ceb0c7f..b2b8e94 100644 +index 2c13aa7..64cbc3f 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0; @@ -87726,8 +86350,8 @@ index ceb0c7f..b2b8e94 100644 + atomic_long_add_unchecked(1 << compound_trans_order(hpage), &num_poisoned_pages); } - /* keep elevated page count for bad page */ -@@ -1552,11 +1552,11 @@ int soft_offline_page(struct page *page, int flags) + return ret; +@@ -1551,11 +1551,11 @@ int soft_offline_page(struct page *page, int flags) if (PageHuge(page)) { set_page_hwpoison_huge_page(hpage); dequeue_hwpoisoned_huge_page(hpage); @@ -87740,8 +86364,8 @@ index ceb0c7f..b2b8e94 100644 + atomic_long_inc_unchecked(&num_poisoned_pages); } } - /* keep elevated page count for bad page */ -@@ -1596,7 +1596,7 @@ static int __soft_offline_page(struct page *page, int flags) + unset_migratetype_isolate(page, MIGRATE_MOVABLE); +@@ -1595,7 +1595,7 @@ static int __soft_offline_page(struct page *page, int flags) put_page(page); pr_info("soft_offline: %#lx: invalidated\n", pfn); SetPageHWPoison(page); @@ -87750,20 +86374,20 @@ index ceb0c7f..b2b8e94 100644 return 0; } -@@ -1626,7 +1626,7 @@ static int __soft_offline_page(struct page *page, int flags) - ret = -EIO; - } else { - SetPageHWPoison(page); +@@ -1640,7 +1640,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); - atomic_long_inc(&num_poisoned_pages); + atomic_long_inc_unchecked(&num_poisoned_pages); } } else { pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n", diff --git a/mm/memory.c b/mm/memory.c -index 5a35443..7c0340f 100644 +index af84bc0..2ed0816 100644 --- a/mm/memory.c +++ b/mm/memory.c -@@ -428,6 +428,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud, +@@ -426,6 +426,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); @@ -87771,7 +86395,7 @@ index 5a35443..7c0340f 100644 start &= PUD_MASK; if (start < floor) return; -@@ -442,6 +443,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud, +@@ -440,6 +441,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); @@ -87780,7 +86404,7 @@ index 5a35443..7c0340f 100644 } static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd, -@@ -461,6 +464,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd, +@@ -459,6 +462,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); @@ -87788,7 +86412,7 @@ index 5a35443..7c0340f 100644 start &= PGDIR_MASK; if (start < floor) return; -@@ -475,6 +479,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd, +@@ -473,6 +477,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); @@ -87797,7 +86421,7 @@ index 5a35443..7c0340f 100644 } /* -@@ -1644,12 +1650,6 @@ no_page_table: +@@ -1645,12 +1651,6 @@ no_page_table: return page; } @@ -87810,7 +86434,7 @@ index 5a35443..7c0340f 100644 /** * __get_user_pages() - pin user pages in memory * @tsk: task_struct of target task -@@ -1736,10 +1736,10 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, +@@ -1737,10 +1737,10 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, i = 0; @@ -87823,7 +86447,7 @@ index 5a35443..7c0340f 100644 if (!vma && in_gate_area(mm, start)) { unsigned long pg = start & PAGE_MASK; pgd_t *pgd; -@@ -1788,7 +1788,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, +@@ -1789,7 +1789,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, goto next_page; } @@ -87832,7 +86456,7 @@ index 5a35443..7c0340f 100644 (vma->vm_flags & (VM_IO | VM_PFNMAP)) || !(vm_flags & vma->vm_flags)) return i ? : -EFAULT; -@@ -1817,11 +1817,6 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, +@@ -1818,11 +1818,6 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, int ret; unsigned int fault_flags = 0; @@ -87844,7 +86468,7 @@ index 5a35443..7c0340f 100644 if (foll_flags & FOLL_WRITE) fault_flags |= FAULT_FLAG_WRITE; if (nonblocking) -@@ -1901,7 +1896,7 @@ next_page: +@@ -1902,7 +1897,7 @@ next_page: start += page_increm * PAGE_SIZE; nr_pages -= page_increm; } while (nr_pages && start < vma->vm_end); @@ -87853,7 +86477,7 @@ index 5a35443..7c0340f 100644 return i; } EXPORT_SYMBOL(__get_user_pages); -@@ -2108,6 +2103,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr, +@@ -2109,6 +2104,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)); @@ -87864,7 +86488,7 @@ index 5a35443..7c0340f 100644 retval = 0; pte_unmap_unlock(pte, ptl); return retval; -@@ -2152,9 +2151,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr, +@@ -2153,9 +2152,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)) { @@ -87886,7 +86510,7 @@ index 5a35443..7c0340f 100644 } return insert_page(vma, addr, page, vma->vm_page_prot); } -@@ -2237,6 +2248,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr, +@@ -2238,6 +2249,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn) { BUG_ON(!(vma->vm_flags & VM_MIXEDMAP)); @@ -87894,7 +86518,7 @@ index 5a35443..7c0340f 100644 if (addr < vma->vm_start || addr >= vma->vm_end) return -EFAULT; -@@ -2484,7 +2496,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud, +@@ -2485,7 +2497,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud, BUG_ON(pud_huge(*pud)); @@ -87905,7 +86529,7 @@ index 5a35443..7c0340f 100644 if (!pmd) return -ENOMEM; do { -@@ -2504,7 +2518,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd, +@@ -2505,7 +2519,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd, unsigned long next; int err; @@ -87916,7 +86540,7 @@ index 5a35443..7c0340f 100644 if (!pud) return -ENOMEM; do { -@@ -2592,6 +2608,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo +@@ -2593,6 +2609,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo copy_user_highpage(dst, src, va, vma); } @@ -88103,7 +86727,7 @@ index 5a35443..7c0340f 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 -@@ -2808,6 +3004,12 @@ gotten: +@@ -2809,6 +3005,12 @@ gotten: */ page_table = pte_offset_map_lock(mm, pmd, address, &ptl); if (likely(pte_same(*page_table, orig_pte))) { @@ -88116,7 +86740,7 @@ index 5a35443..7c0340f 100644 if (old_page) { if (!PageAnon(old_page)) { dec_mm_counter_fast(mm, MM_FILEPAGES); -@@ -2859,6 +3061,10 @@ gotten: +@@ -2860,6 +3062,10 @@ gotten: page_remove_rmap(old_page); } @@ -88127,7 +86751,7 @@ index 5a35443..7c0340f 100644 /* Free the old page.. */ new_page = old_page; ret |= VM_FAULT_WRITE; -@@ -3134,6 +3340,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -3137,6 +3343,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); @@ -88139,7 +86763,7 @@ index 5a35443..7c0340f 100644 unlock_page(page); if (page != swapcache) { /* -@@ -3157,6 +3368,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -3160,6 +3371,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); @@ -88151,7 +86775,7 @@ index 5a35443..7c0340f 100644 unlock: pte_unmap_unlock(page_table, ptl); out: -@@ -3176,40 +3392,6 @@ out_release: +@@ -3179,40 +3395,6 @@ out_release: } /* @@ -88192,7 +86816,7 @@ index 5a35443..7c0340f 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. -@@ -3218,27 +3400,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -3221,27 +3403,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, unsigned int flags) { @@ -88225,7 +86849,7 @@ index 5a35443..7c0340f 100644 if (unlikely(anon_vma_prepare(vma))) goto oom; page = alloc_zeroed_user_highpage_movable(vma, address); -@@ -3262,6 +3440,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -3265,6 +3443,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma, if (!pte_none(*page_table)) goto release; @@ -88237,7 +86861,7 @@ index 5a35443..7c0340f 100644 inc_mm_counter_fast(mm, MM_ANONPAGES); page_add_new_anon_rmap(page, vma, address); setpte: -@@ -3269,6 +3452,12 @@ setpte: +@@ -3272,6 +3455,12 @@ setpte: /* No need to invalidate - it was non-present before */ update_mmu_cache(vma, address, page_table); @@ -88250,7 +86874,7 @@ index 5a35443..7c0340f 100644 unlock: pte_unmap_unlock(page_table, ptl); return 0; -@@ -3412,6 +3601,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -3415,6 +3604,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))) { @@ -88263,7 +86887,7 @@ index 5a35443..7c0340f 100644 flush_icache_page(vma, page); entry = mk_pte(page, vma->vm_page_prot); if (flags & FAULT_FLAG_WRITE) -@@ -3431,6 +3626,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -3436,6 +3631,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); @@ -88278,7 +86902,7 @@ index 5a35443..7c0340f 100644 } else { if (cow_page) mem_cgroup_uncharge_page(cow_page); -@@ -3752,6 +3955,12 @@ int handle_pte_fault(struct mm_struct *mm, +@@ -3757,6 +3960,12 @@ int handle_pte_fault(struct mm_struct *mm, if (flags & FAULT_FLAG_WRITE) flush_tlb_fix_spurious_fault(vma, address); } @@ -88291,7 +86915,7 @@ index 5a35443..7c0340f 100644 unlock: pte_unmap_unlock(pte, ptl); return 0; -@@ -3768,6 +3977,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -3773,6 +3982,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, pmd_t *pmd; pte_t *pte; @@ -88302,7 +86926,7 @@ index 5a35443..7c0340f 100644 __set_current_state(TASK_RUNNING); count_vm_event(PGFAULT); -@@ -3779,6 +3992,34 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -3784,6 +3997,34 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, if (unlikely(is_vm_hugetlb_page(vma))) return hugetlb_fault(mm, vma, address, flags); @@ -88337,7 +86961,7 @@ index 5a35443..7c0340f 100644 retry: pgd = pgd_offset(mm, address); pud = pud_alloc(mm, pgd, address); -@@ -3877,6 +4118,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address) +@@ -3882,6 +4123,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address) spin_unlock(&mm->page_table_lock); return 0; } @@ -88361,7 +86985,7 @@ index 5a35443..7c0340f 100644 #endif /* __PAGETABLE_PUD_FOLDED */ #ifndef __PAGETABLE_PMD_FOLDED -@@ -3907,6 +4165,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address) +@@ -3912,6 +4170,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address) spin_unlock(&mm->page_table_lock); return 0; } @@ -88392,7 +87016,7 @@ index 5a35443..7c0340f 100644 #endif /* __PAGETABLE_PMD_FOLDED */ #if !defined(__HAVE_ARCH_GATE_AREA) -@@ -3920,7 +4202,7 @@ static int __init gate_vma_init(void) +@@ -3925,7 +4207,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; @@ -88401,7 +87025,7 @@ index 5a35443..7c0340f 100644 return 0; } -@@ -4054,8 +4336,8 @@ out: +@@ -4059,8 +4341,8 @@ out: return ret; } @@ -88412,7 +87036,7 @@ index 5a35443..7c0340f 100644 { resource_size_t phys_addr; unsigned long prot = 0; -@@ -4080,8 +4362,8 @@ int generic_access_phys(struct vm_area_struct *vma, unsigned long addr, +@@ -4085,8 +4367,8 @@ int generic_access_phys(struct vm_area_struct *vma, unsigned long addr, * Access another process' address space as given in mm. If non-NULL, use the * given task for page fault accounting. */ @@ -88423,7 +87047,7 @@ index 5a35443..7c0340f 100644 { struct vm_area_struct *vma; void *old_buf = buf; -@@ -4089,7 +4371,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm, +@@ -4094,7 +4376,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) { @@ -88432,7 +87056,7 @@ index 5a35443..7c0340f 100644 void *maddr; struct page *page = NULL; -@@ -4148,8 +4430,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm, +@@ -4153,8 +4435,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm, * * The caller must hold a reference on @mm. */ @@ -88443,7 +87067,7 @@ index 5a35443..7c0340f 100644 { return __access_remote_vm(NULL, mm, addr, buf, len, write); } -@@ -4159,11 +4441,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr, +@@ -4164,11 +4446,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 */ @@ -88620,7 +87244,7 @@ index 79b7cf7..9944291 100644 capable(CAP_IPC_LOCK)) ret = do_mlockall(flags); diff --git a/mm/mmap.c b/mm/mmap.c -index 8d25fdc..bfb7626 100644 +index f9c97d1..3468d3b 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -36,6 +36,7 @@ @@ -88923,7 +87547,7 @@ index 8d25fdc..bfb7626 100644 addr = mmap_region(file, addr, len, vm_flags, pgoff); if (!IS_ERR_VALUE(addr) && ((vm_flags & VM_LOCKED) || -@@ -1432,7 +1556,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma) +@@ -1434,7 +1558,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 */ @@ -88932,7 +87556,7 @@ index 8d25fdc..bfb7626 100644 return 0; /* The backer wishes to know when pages are first written to? */ -@@ -1480,7 +1604,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr, +@@ -1482,7 +1606,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr, unsigned long charged = 0; struct inode *inode = file ? file_inode(file) : NULL; @@ -88955,7 +87579,7 @@ index 8d25fdc..bfb7626 100644 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) { unsigned long nr_pages; -@@ -1499,11 +1638,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr, +@@ -1501,11 +1640,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr, /* Clear old maps */ error = -ENOMEM; @@ -88968,7 +87592,7 @@ index 8d25fdc..bfb7626 100644 } /* -@@ -1534,6 +1672,16 @@ munmap_back: +@@ -1536,6 +1674,16 @@ munmap_back: goto unacct_error; } @@ -88985,7 +87609,7 @@ index 8d25fdc..bfb7626 100644 vma->vm_mm = mm; vma->vm_start = addr; vma->vm_end = addr + len; -@@ -1558,6 +1706,13 @@ munmap_back: +@@ -1560,6 +1708,13 @@ munmap_back: if (error) goto unmap_and_free_vma; @@ -88999,7 +87623,7 @@ index 8d25fdc..bfb7626 100644 /* Can addr have changed?? * * Answer: Yes, several device drivers can do it in their -@@ -1596,6 +1751,11 @@ munmap_back: +@@ -1598,6 +1753,11 @@ munmap_back: vma_link(mm, vma, prev, rb_link, rb_parent); file = vma->vm_file; @@ -89011,7 +87635,7 @@ index 8d25fdc..bfb7626 100644 /* Once vma denies write, undo our temporary denial count */ if (correct_wcount) atomic_inc(&inode->i_writecount); -@@ -1603,6 +1763,7 @@ out: +@@ -1605,6 +1765,7 @@ out: perf_event_mmap(vma); vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT); @@ -89019,7 +87643,7 @@ index 8d25fdc..bfb7626 100644 if (vm_flags & VM_LOCKED) { if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) || vma == get_gate_vma(current->mm))) -@@ -1626,6 +1787,12 @@ unmap_and_free_vma: +@@ -1628,6 +1789,12 @@ unmap_and_free_vma: unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end); charged = 0; free_vma: @@ -89032,7 +87656,7 @@ index 8d25fdc..bfb7626 100644 kmem_cache_free(vm_area_cachep, vma); unacct_error: if (charged) -@@ -1633,7 +1800,63 @@ unacct_error: +@@ -1635,7 +1802,63 @@ unacct_error: return error; } @@ -89097,7 +87721,7 @@ index 8d25fdc..bfb7626 100644 { /* * We implement the search by looking for an rbtree node that -@@ -1681,11 +1904,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info) +@@ -1683,11 +1906,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info) } } @@ -89128,7 +87752,7 @@ index 8d25fdc..bfb7626 100644 if (gap_end >= low_limit && gap_end - gap_start >= length) goto found; -@@ -1735,7 +1976,7 @@ found: +@@ -1737,7 +1978,7 @@ found: return gap_start; } @@ -89137,7 +87761,7 @@ index 8d25fdc..bfb7626 100644 { struct mm_struct *mm = current->mm; struct vm_area_struct *vma; -@@ -1789,6 +2030,24 @@ check_current: +@@ -1791,6 +2032,24 @@ check_current: gap_end = vma->vm_start; if (gap_end < low_limit) return -ENOMEM; @@ -89162,7 +87786,7 @@ index 8d25fdc..bfb7626 100644 if (gap_start <= high_limit && gap_end - gap_start >= length) goto found; -@@ -1852,6 +2111,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, +@@ -1854,6 +2113,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; @@ -89170,7 +87794,7 @@ index 8d25fdc..bfb7626 100644 if (len > TASK_SIZE) return -ENOMEM; -@@ -1859,29 +2119,45 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, +@@ -1861,19 +2121,29 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, if (flags & MAP_FIXED) return addr; @@ -89202,24 +87826,7 @@ index 8d25fdc..bfb7626 100644 return vm_unmapped_area(&info); } #endif - - void arch_unmap_area(struct mm_struct *mm, unsigned long addr) - { -+ -+#ifdef CONFIG_PAX_SEGMEXEC -+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr) -+ return; -+#endif -+ - /* - * Is this a new hole at the lowest possible address? - */ -- if (addr >= TASK_UNMAPPED_BASE && addr < mm->free_area_cache) -+ if (addr >= mm->mmap_base && addr < mm->free_area_cache) - mm->free_area_cache = addr; - } - -@@ -1899,6 +2175,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, +@@ -1892,6 +2162,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; @@ -89227,7 +87834,7 @@ index 8d25fdc..bfb7626 100644 /* requested length too big for entire address space */ if (len > TASK_SIZE) -@@ -1907,12 +2184,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, +@@ -1900,12 +2171,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, if (flags & MAP_FIXED) return addr; @@ -89245,7 +87852,7 @@ index 8d25fdc..bfb7626 100644 return addr; } -@@ -1921,6 +2201,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, +@@ -1914,6 +2188,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, info.low_limit = PAGE_SIZE; info.high_limit = mm->mmap_base; info.align_mask = 0; @@ -89253,7 +87860,7 @@ index 8d25fdc..bfb7626 100644 addr = vm_unmapped_area(&info); /* -@@ -1933,6 +2214,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, +@@ -1926,6 +2201,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; @@ -89266,32 +87873,7 @@ index 8d25fdc..bfb7626 100644 info.high_limit = TASK_SIZE; addr = vm_unmapped_area(&info); } -@@ -1943,6 +2230,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, - - void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr) - { -+ -+#ifdef CONFIG_PAX_SEGMEXEC -+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr) -+ return; -+#endif -+ - /* - * Is this a new hole at the highest possible address? - */ -@@ -1950,8 +2243,10 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr) - mm->free_area_cache = addr; - - /* dont allow allocations above current base */ -- if (mm->free_area_cache > mm->mmap_base) -+ if (mm->free_area_cache > mm->mmap_base) { - mm->free_area_cache = mm->mmap_base; -+ mm->cached_hole_size = ~0UL; -+ } - } - - unsigned long -@@ -2047,6 +2342,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr, +@@ -2027,6 +2308,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr, return vma; } @@ -89320,7 +87902,7 @@ index 8d25fdc..bfb7626 100644 /* * Verify that the stack growth is acceptable and * update accounting. This is shared with both the -@@ -2063,6 +2380,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns +@@ -2043,6 +2346,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns return -ENOMEM; /* Stack limit test */ @@ -89328,7 +87910,7 @@ index 8d25fdc..bfb7626 100644 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur)) return -ENOMEM; -@@ -2073,6 +2391,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns +@@ -2053,6 +2357,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; @@ -89336,7 +87918,7 @@ index 8d25fdc..bfb7626 100644 if (locked > limit && !capable(CAP_IPC_LOCK)) return -ENOMEM; } -@@ -2102,37 +2421,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns +@@ -2082,37 +2387,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. */ @@ -89394,7 +87976,7 @@ index 8d25fdc..bfb7626 100644 unsigned long size, grow; size = address - vma->vm_start; -@@ -2167,6 +2497,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address) +@@ -2147,6 +2463,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address) } } } @@ -89403,7 +87985,7 @@ index 8d25fdc..bfb7626 100644 vma_unlock_anon_vma(vma); khugepaged_enter_vma_merge(vma); validate_mm(vma->vm_mm); -@@ -2181,6 +2513,8 @@ int expand_downwards(struct vm_area_struct *vma, +@@ -2161,6 +2479,8 @@ int expand_downwards(struct vm_area_struct *vma, unsigned long address) { int error; @@ -89412,7 +87994,7 @@ index 8d25fdc..bfb7626 100644 /* * We must make sure the anon_vma is allocated -@@ -2194,6 +2528,15 @@ int expand_downwards(struct vm_area_struct *vma, +@@ -2174,6 +2494,15 @@ int expand_downwards(struct vm_area_struct *vma, if (error) return error; @@ -89428,7 +88010,7 @@ index 8d25fdc..bfb7626 100644 vma_lock_anon_vma(vma); /* -@@ -2203,9 +2546,17 @@ int expand_downwards(struct vm_area_struct *vma, +@@ -2183,9 +2512,17 @@ int expand_downwards(struct vm_area_struct *vma, */ /* Somebody else might have raced and expanded it already */ @@ -89447,7 +88029,7 @@ index 8d25fdc..bfb7626 100644 size = vma->vm_end - address; grow = (vma->vm_start - address) >> PAGE_SHIFT; -@@ -2230,13 +2581,27 @@ int expand_downwards(struct vm_area_struct *vma, +@@ -2210,13 +2547,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); @@ -89475,7 +88057,7 @@ index 8d25fdc..bfb7626 100644 khugepaged_enter_vma_merge(vma); validate_mm(vma->vm_mm); return error; -@@ -2334,6 +2699,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma) +@@ -2314,6 +2665,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma) do { long nrpages = vma_pages(vma); @@ -89489,7 +88071,7 @@ index 8d25fdc..bfb7626 100644 if (vma->vm_flags & VM_ACCOUNT) nr_accounted += nrpages; vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages); -@@ -2379,6 +2751,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -2358,6 +2716,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 { @@ -89506,7 +88088,7 @@ index 8d25fdc..bfb7626 100644 vma_rb_erase(vma, &mm->mm_rb); mm->map_count--; tail_vma = vma; -@@ -2410,14 +2792,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, +@@ -2384,14 +2752,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, struct vm_area_struct *new; int err = -ENOMEM; @@ -89540,7 +88122,7 @@ index 8d25fdc..bfb7626 100644 /* most fields are the same, copy all, and then fixup */ *new = *vma; -@@ -2430,6 +2831,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, +@@ -2404,6 +2791,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT); } @@ -89563,7 +88145,7 @@ index 8d25fdc..bfb7626 100644 pol = mpol_dup(vma_policy(vma)); if (IS_ERR(pol)) { err = PTR_ERR(pol); -@@ -2452,6 +2869,36 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, +@@ -2426,6 +2829,36 @@ 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); @@ -89600,7 +88182,7 @@ index 8d25fdc..bfb7626 100644 /* Success. */ if (!err) return 0; -@@ -2461,10 +2908,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, +@@ -2435,10 +2868,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); @@ -89620,7 +88202,7 @@ index 8d25fdc..bfb7626 100644 kmem_cache_free(vm_area_cachep, new); out_err: return err; -@@ -2477,6 +2932,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, +@@ -2451,6 +2892,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) { @@ -89636,7 +88218,7 @@ index 8d25fdc..bfb7626 100644 if (mm->map_count >= sysctl_max_map_count) return -ENOMEM; -@@ -2488,11 +2952,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -2462,11 +2912,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma, * work. This now handles partial unmappings. * Jeremy Fitzhardinge <jeremy@goop.org> */ @@ -89667,7 +88249,7 @@ index 8d25fdc..bfb7626 100644 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start) return -EINVAL; -@@ -2567,6 +3050,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) +@@ -2541,6 +3010,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); @@ -89676,7 +88258,7 @@ index 8d25fdc..bfb7626 100644 return 0; } -@@ -2575,6 +3060,13 @@ int vm_munmap(unsigned long start, size_t len) +@@ -2549,6 +3020,13 @@ int vm_munmap(unsigned long start, size_t len) int ret; struct mm_struct *mm = current->mm; @@ -89690,7 +88272,7 @@ index 8d25fdc..bfb7626 100644 down_write(&mm->mmap_sem); ret = do_munmap(mm, start, len); up_write(&mm->mmap_sem); -@@ -2588,16 +3080,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len) +@@ -2562,16 +3040,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len) return vm_munmap(addr, len); } @@ -89707,7 +88289,7 @@ index 8d25fdc..bfb7626 100644 /* * this is really a simplified "do_mmap". it only handles * anonymous maps. eventually we may be able to do some -@@ -2611,6 +3093,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len) +@@ -2585,6 +3053,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; @@ -89715,7 +88297,7 @@ index 8d25fdc..bfb7626 100644 len = PAGE_ALIGN(len); if (!len) -@@ -2618,16 +3101,30 @@ static unsigned long do_brk(unsigned long addr, unsigned long len) +@@ -2592,16 +3061,30 @@ static unsigned long do_brk(unsigned long addr, unsigned long len) flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags; @@ -89747,7 +88329,7 @@ index 8d25fdc..bfb7626 100644 locked += mm->locked_vm; lock_limit = rlimit(RLIMIT_MEMLOCK); lock_limit >>= PAGE_SHIFT; -@@ -2644,21 +3141,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len) +@@ -2618,21 +3101,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len) /* * Clear old maps. this also does some error checking for us */ @@ -89772,7 +88354,7 @@ index 8d25fdc..bfb7626 100644 return -ENOMEM; /* Can we just expand an old private anonymous mapping? */ -@@ -2672,7 +3168,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len) +@@ -2646,7 +3128,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len) */ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL); if (!vma) { @@ -89781,7 +88363,7 @@ index 8d25fdc..bfb7626 100644 return -ENOMEM; } -@@ -2686,9 +3182,10 @@ static unsigned long do_brk(unsigned long addr, unsigned long len) +@@ -2660,9 +3142,10 @@ 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); @@ -89794,7 +88376,7 @@ index 8d25fdc..bfb7626 100644 return addr; } -@@ -2750,6 +3247,7 @@ void exit_mmap(struct mm_struct *mm) +@@ -2724,6 +3207,7 @@ void exit_mmap(struct mm_struct *mm) while (vma) { if (vma->vm_flags & VM_ACCOUNT) nr_accounted += vma_pages(vma); @@ -89802,7 +88384,7 @@ index 8d25fdc..bfb7626 100644 vma = remove_vma(vma); } vm_unacct_memory(nr_accounted); -@@ -2766,6 +3264,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma) +@@ -2740,6 +3224,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; @@ -89816,7 +88398,7 @@ index 8d25fdc..bfb7626 100644 /* * The vm_pgoff of a purely anonymous vma should be irrelevant * until its first write fault, when page's anon_vma and index -@@ -2789,7 +3294,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma) +@@ -2763,7 +3254,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; @@ -89838,7 +88420,7 @@ index 8d25fdc..bfb7626 100644 return 0; } -@@ -2809,6 +3328,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, +@@ -2783,6 +3288,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, struct mempolicy *pol; bool faulted_in_anon_vma = true; @@ -89847,7 +88429,7 @@ index 8d25fdc..bfb7626 100644 /* * If anonymous vma has not yet been faulted, update new pgoff * to match new location, to increase its chance of merging. -@@ -2875,6 +3396,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, +@@ -2849,6 +3356,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, return NULL; } @@ -89887,7 +88469,7 @@ index 8d25fdc..bfb7626 100644 /* * Return true if the calling process may expand its vm space by the passed * number of pages -@@ -2886,6 +3440,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages) +@@ -2860,6 +3400,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages) lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT; @@ -89895,7 +88477,7 @@ index 8d25fdc..bfb7626 100644 if (cur + npages > lim) return 0; return 1; -@@ -2956,6 +3511,22 @@ int install_special_mapping(struct mm_struct *mm, +@@ -2930,6 +3471,22 @@ int install_special_mapping(struct mm_struct *mm, vma->vm_start = addr; vma->vm_end = addr + len; @@ -90151,23 +88733,43 @@ index 94722a4..e661e29 100644 if (nstart < prev->vm_end) diff --git a/mm/mremap.c b/mm/mremap.c -index 463a257..c0c7a92 100644 +index 0843feb..5607f47 100644 --- a/mm/mremap.c +++ b/mm/mremap.c -@@ -126,6 +126,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd, +@@ -25,6 +25,7 @@ + #include <asm/uaccess.h> + #include <asm/cacheflush.h> + #include <asm/tlbflush.h> ++#include <asm/pgalloc.h> + + #include "internal.h" + +@@ -62,8 +63,10 @@ static pmd_t *alloc_new_pmd(struct mm_struct *mm, struct vm_area_struct *vma, + return NULL; + + pmd = pmd_alloc(mm, pud, addr); +- if (!pmd) ++ if (!pmd) { ++ pud_free(mm, pud); + return NULL; ++ } + + VM_BUG_ON(pmd_trans_huge(*pmd)); + +@@ -144,6 +147,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd, continue; pte = ptep_get_and_clear(mm, old_addr, old_pte); pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr); + +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT -+ if (!(__supported_pte_mask & _PAGE_NX) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC) ++ if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC) + pte = pte_exprotect(pte); +#endif + + pte = move_soft_dirty_pte(pte); set_pte_at(mm, new_addr, new_pte, pte); } - -@@ -318,6 +324,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr, +@@ -337,6 +346,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr, if (is_vm_hugetlb_page(vma)) goto Einval; @@ -90179,7 +88781,7 @@ index 463a257..c0c7a92 100644 /* We can't remap across vm area boundaries */ if (old_len > vma->vm_end - addr) goto Efault; -@@ -373,20 +384,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len, +@@ -392,20 +406,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; @@ -90210,17 +88812,17 @@ index 463a257..c0c7a92 100644 goto out; ret = do_munmap(mm, new_addr, new_len); -@@ -455,6 +471,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, +@@ -474,6 +493,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, unsigned long ret = -EINVAL; unsigned long charged = 0; bool locked = false; + unsigned long pax_task_size = TASK_SIZE; - down_write(¤t->mm->mmap_sem); - -@@ -475,6 +492,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, + if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE)) + return ret; +@@ -495,6 +515,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, if (!new_len) - goto out; + return ret; +#ifdef CONFIG_PAX_SEGMEXEC + if (mm->pax_flags & MF_PAX_SEGMEXEC) @@ -90231,12 +88833,12 @@ index 463a257..c0c7a92 100644 + + if (new_len > pax_task_size || addr > pax_task_size-new_len || + old_len > pax_task_size || addr > pax_task_size-old_len) -+ goto out; ++ return ret; + + down_write(¤t->mm->mmap_sem); + if (flags & MREMAP_FIXED) { - if (flags & MREMAP_MAYMOVE) - ret = mremap_to(addr, old_len, new_addr, new_len, -@@ -524,6 +552,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, +@@ -545,6 +576,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, new_addr = addr; } ret = addr; @@ -90244,7 +88846,7 @@ index 463a257..c0c7a92 100644 goto out; } } -@@ -547,7 +576,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, +@@ -568,7 +600,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, goto out; } @@ -90258,10 +88860,10 @@ index 463a257..c0c7a92 100644 out: if (ret & ~PAGE_MASK) diff --git a/mm/nommu.c b/mm/nommu.c -index 298884d..5f74980 100644 +index ecd1f15..77039bd 100644 --- a/mm/nommu.c +++ b/mm/nommu.c -@@ -65,7 +65,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT; +@@ -64,7 +64,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 */ @@ -90269,7 +88871,7 @@ index 298884d..5f74980 100644 atomic_long_t mmap_pages_allocated; -@@ -842,15 +841,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr) +@@ -844,15 +843,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr) EXPORT_SYMBOL(find_vma); /* @@ -90285,7 +88887,7 @@ index 298884d..5f74980 100644 * expand a stack to a given address * - not supported under NOMMU conditions */ -@@ -1561,6 +1551,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -1563,6 +1553,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma, /* most fields are the same, copy all, and then fixup */ *new = *vma; @@ -90293,7 +88895,7 @@ index 298884d..5f74980 100644 *region = *vma->vm_region; new->vm_region = region; -@@ -1995,8 +1986,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr, +@@ -1993,8 +1984,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr, } EXPORT_SYMBOL(generic_file_remap_pages); @@ -90304,7 +88906,7 @@ index 298884d..5f74980 100644 { struct vm_area_struct *vma; -@@ -2037,8 +2028,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm, +@@ -2035,8 +2026,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm, * * The caller must hold a reference on @mm. */ @@ -90315,7 +88917,7 @@ index 298884d..5f74980 100644 { return __access_remote_vm(NULL, mm, addr, buf, len, write); } -@@ -2047,7 +2038,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr, +@@ -2045,7 +2036,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr, * Access another process' address space. * - source/target buffer must be kernel space */ @@ -90325,7 +88927,7 @@ index 298884d..5f74980 100644 struct mm_struct *mm; diff --git a/mm/page-writeback.c b/mm/page-writeback.c -index 4514ad7..92eaa1c 100644 +index 3f0c895..60cd104 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -659,7 +659,7 @@ unsigned long bdi_dirty_limit(struct backing_dev_info *bdi, unsigned long dirty) @@ -90337,17 +88939,8 @@ index 4514ad7..92eaa1c 100644 unsigned long thresh, unsigned long bg_thresh, unsigned long dirty, -@@ -1634,7 +1634,7 @@ ratelimit_handler(struct notifier_block *self, unsigned long action, - } - } - --static struct notifier_block __cpuinitdata ratelimit_nb = { -+static struct notifier_block ratelimit_nb = { - .notifier_call = ratelimit_handler, - .next = NULL, - }; diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 2ee0fd3..6e2edfb 100644 +index b100255..a59b444 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -60,6 +60,7 @@ @@ -90356,9 +88949,9 @@ index 2ee0fd3..6e2edfb 100644 #include <linux/sched/rt.h> +#include <linux/random.h> + #include <asm/sections.h> #include <asm/tlbflush.h> - #include <asm/div64.h> -@@ -345,7 +346,7 @@ out: +@@ -353,7 +354,7 @@ out: * This usage means that zero-order pages may not be compound. */ @@ -90367,7 +88960,7 @@ index 2ee0fd3..6e2edfb 100644 { __free_pages_ok(page, compound_order(page)); } -@@ -702,6 +703,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order) +@@ -710,6 +711,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order) int i; int bad = 0; @@ -90378,7 +88971,7 @@ index 2ee0fd3..6e2edfb 100644 trace_mm_page_free(page, order); kmemcheck_free_shadow(page, order); -@@ -717,6 +722,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order) +@@ -725,6 +730,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order) debug_check_no_obj_freed(page_address(page), PAGE_SIZE << order); } @@ -90391,7 +88984,7 @@ index 2ee0fd3..6e2edfb 100644 arch_free_page(page, order); kernel_map_pages(page, 1 << order, 0); -@@ -739,6 +750,19 @@ static void __free_pages_ok(struct page *page, unsigned int order) +@@ -747,6 +758,19 @@ static void __free_pages_ok(struct page *page, unsigned int order) local_irq_restore(flags); } @@ -90408,10 +89001,10 @@ index 2ee0fd3..6e2edfb 100644 +volatile u64 latent_entropy; +#endif + - /* - * Read access to zone->managed_pages is safe because it's unsigned long, - * but we still need to serialize writers. Currently all callers of -@@ -761,6 +785,19 @@ void __meminit __free_pages_bootmem(struct page *page, unsigned int order) + void __init __free_pages_bootmem(struct page *page, unsigned int order) + { + unsigned int nr_pages = 1 << order; +@@ -762,6 +786,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order) set_page_count(p, 0); } @@ -90431,7 +89024,7 @@ index 2ee0fd3..6e2edfb 100644 page_zone(page)->managed_pages += 1 << order; set_page_refcounted(page); __free_pages(page, order); -@@ -870,8 +907,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags) +@@ -867,8 +904,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags) arch_alloc_page(page, order); kernel_map_pages(page, 1 << order, 1); @@ -90443,10 +89036,10 @@ index 2ee0fd3..6e2edfb 100644 if (order && (gfp_flags & __GFP_COMP)) prep_compound_page(page, order); diff --git a/mm/page_io.c b/mm/page_io.c -index a8a3ef4..7260a60 100644 +index ba05b64..ef2f314 100644 --- a/mm/page_io.c +++ b/mm/page_io.c -@@ -214,7 +214,7 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc, +@@ -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 = { @@ -90520,7 +89113,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 6280da8..b5c090e 100644 +index b2e29ac..4168491 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -163,6 +163,10 @@ int anon_vma_prepare(struct vm_area_struct *vma) @@ -90623,7 +89216,7 @@ index 6280da8..b5c090e 100644 /* diff --git a/mm/shmem.c b/mm/shmem.c -index 5e6a842..b41916e 100644 +index e43dc55..930e3a2 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -33,7 +33,7 @@ @@ -90644,7 +89237,7 @@ index 5e6a842..b41916e 100644 /* * shmem_fallocate and shmem_writepage communicate via inode->i_private -@@ -2203,6 +2203,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = { +@@ -2232,6 +2232,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[] = { @@ -90656,7 +89249,7 @@ index 5e6a842..b41916e 100644 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN }, { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN } }; -@@ -2258,6 +2263,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name, +@@ -2287,6 +2292,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name, if (err) return err; @@ -90672,7 +89265,7 @@ index 5e6a842..b41916e 100644 return simple_xattr_set(&info->xattrs, name, value, size, flags); } -@@ -2570,8 +2584,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent) +@@ -2599,8 +2613,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 */ @@ -90683,7 +89276,7 @@ index 5e6a842..b41916e 100644 return -ENOMEM; diff --git a/mm/slab.c b/mm/slab.c -index bd88411..2d46fd6 100644 +index 2580db0..0523956 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -366,10 +366,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent) @@ -90721,16 +89314,7 @@ index bd88411..2d46fd6 100644 { u32 offset = (obj - slab->s_mem); return reciprocal_divide(offset, cache->reciprocal_buffer_size); -@@ -1384,7 +1388,7 @@ static int __cpuinit cpuup_callback(struct notifier_block *nfb, - return notifier_from_errno(err); - } - --static struct notifier_block __cpuinitdata cpucache_notifier = { -+static struct notifier_block cpucache_notifier = { - &cpuup_callback, NULL, 0 - }; - -@@ -1565,12 +1569,12 @@ void __init kmem_cache_init(void) +@@ -1571,12 +1575,12 @@ void __init kmem_cache_init(void) */ kmalloc_caches[INDEX_AC] = create_kmalloc_cache("kmalloc-ac", @@ -90745,7 +89329,7 @@ index bd88411..2d46fd6 100644 slab_early_init = 0; -@@ -3583,6 +3587,21 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp, +@@ -3577,6 +3581,21 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp, struct array_cache *ac = cpu_cache_get(cachep); check_irq_off(); @@ -90767,7 +89351,7 @@ index bd88411..2d46fd6 100644 kmemleak_free_recursive(objp, cachep->flags); objp = cache_free_debugcheck(cachep, objp, caller); -@@ -3800,6 +3819,7 @@ void kfree(const void *objp) +@@ -3805,6 +3824,7 @@ void kfree(const void *objp) if (unlikely(ZERO_OR_NULL_PTR(objp))) return; @@ -90775,7 +89359,7 @@ index bd88411..2d46fd6 100644 local_irq_save(flags); kfree_debugcheck(objp); c = virt_to_cache(objp); -@@ -4241,14 +4261,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep) +@@ -4246,14 +4266,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep) } /* cpu stats */ { @@ -90802,7 +89386,7 @@ index bd88411..2d46fd6 100644 #endif } -@@ -4476,13 +4504,71 @@ static const struct file_operations proc_slabstats_operations = { +@@ -4471,13 +4499,71 @@ static const struct file_operations proc_slabstats_operations = { static int __init slab_proc_init(void) { #ifdef CONFIG_DEBUG_SLAB_LEAK @@ -90876,7 +89460,7 @@ index bd88411..2d46fd6 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 4d6d836..3fb743a 100644 +index a535033..2f98fe5 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -32,6 +32,15 @@ extern struct list_head slab_caches; @@ -90916,7 +89500,7 @@ index 4d6d836..3fb743a 100644 if (slab_equal_or_root(cachep, s)) return cachep; diff --git a/mm/slab_common.c b/mm/slab_common.c -index 2d41450..4efe6ee 100644 +index 538bade..36fed99 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -22,11 +22,22 @@ @@ -91052,7 +89636,7 @@ index 2d41450..4efe6ee 100644 } #endif /* !CONFIG_SLOB */ -@@ -516,6 +555,9 @@ void print_slabinfo_header(struct seq_file *m) +@@ -523,6 +562,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>"); @@ -91063,7 +89647,7 @@ index 2d41450..4efe6ee 100644 seq_putc(m, '\n'); } diff --git a/mm/slob.c b/mm/slob.c -index eeed4a0..bb0e9ab 100644 +index 91bd3f2..e2f549e 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) @@ -91379,7 +89963,7 @@ index eeed4a0..bb0e9ab 100644 } +#endif - if (c->ctor) + if (b && c->ctor) c->ctor(b); @@ -564,10 +676,14 @@ EXPORT_SYMBOL(kmem_cache_alloc_node); @@ -91434,10 +90018,10 @@ index eeed4a0..bb0e9ab 100644 EXPORT_SYMBOL(kmem_cache_free); diff --git a/mm/slub.c b/mm/slub.c -index 57707f0..7857bd3 100644 +index e3ba1f2..bd45dac 100644 --- a/mm/slub.c +++ b/mm/slub.c -@@ -198,7 +198,7 @@ struct track { +@@ -207,7 +207,7 @@ struct track { enum track_item { TRACK_ALLOC, TRACK_FREE }; @@ -91446,7 +90030,7 @@ index 57707f0..7857bd3 100644 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 *); -@@ -519,7 +519,7 @@ static void print_track(const char *s, struct track *t) +@@ -528,7 +528,7 @@ static void print_track(const char *s, struct track *t) if (!t->addr) return; @@ -91455,7 +90039,7 @@ index 57707f0..7857bd3 100644 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid); #ifdef CONFIG_STACKTRACE { -@@ -2594,6 +2594,14 @@ static __always_inline void slab_free(struct kmem_cache *s, +@@ -2609,6 +2609,14 @@ static __always_inline void slab_free(struct kmem_cache *s, slab_free_hook(s, x); @@ -91470,7 +90054,7 @@ index 57707f0..7857bd3 100644 redo: /* * Determine the currently cpus per cpu slab. -@@ -2661,7 +2669,7 @@ static int slub_min_objects; +@@ -2676,7 +2684,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.) */ @@ -91479,7 +90063,7 @@ index 57707f0..7857bd3 100644 /* * Calculate the order of allocation given an slab object size. -@@ -2938,6 +2946,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order) +@@ -2953,6 +2961,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order) s->inuse = size; if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) || @@ -91489,7 +90073,7 @@ index 57707f0..7857bd3 100644 s->ctor)) { /* * Relocate free pointer after the object if it is not -@@ -3283,6 +3294,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node) +@@ -3298,6 +3309,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node) EXPORT_SYMBOL(__kmalloc_node); #endif @@ -91549,7 +90133,7 @@ index 57707f0..7857bd3 100644 size_t ksize(const void *object) { struct page *page; -@@ -3347,6 +3411,7 @@ void kfree(const void *x) +@@ -3362,6 +3426,7 @@ void kfree(const void *x) if (unlikely(ZERO_OR_NULL_PTR(x))) return; @@ -91557,7 +90141,7 @@ index 57707f0..7857bd3 100644 page = virt_to_head_page(x); if (unlikely(!PageSlab(page))) { BUG_ON(!PageCompound(page)); -@@ -3652,7 +3717,7 @@ static int slab_unmergeable(struct kmem_cache *s) +@@ -3667,7 +3732,7 @@ static int slab_unmergeable(struct kmem_cache *s) /* * We may have set a slab to be unmergeable during bootstrap. */ @@ -91566,7 +90150,7 @@ index 57707f0..7857bd3 100644 return 1; return 0; -@@ -3710,7 +3775,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size, +@@ -3725,7 +3790,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size, s = find_mergeable(memcg, size, align, flags, name, ctor); if (s) { @@ -91575,7 +90159,7 @@ index 57707f0..7857bd3 100644 /* * Adjust the object sizes so that we clear * the complete object on kzalloc. -@@ -3719,7 +3784,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size, +@@ -3734,7 +3799,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 *))); if (sysfs_slab_alias(s, name)) { @@ -91584,16 +90168,7 @@ index 57707f0..7857bd3 100644 s = NULL; } } -@@ -3781,7 +3846,7 @@ static int __cpuinit slab_cpuup_callback(struct notifier_block *nfb, - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata slab_notifier = { -+static struct notifier_block slab_notifier = { - .notifier_call = slab_cpuup_callback - }; - -@@ -3839,7 +3904,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags, +@@ -3854,7 +3919,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags, } #endif @@ -91602,7 +90177,7 @@ index 57707f0..7857bd3 100644 static int count_inuse(struct page *page) { return page->inuse; -@@ -4226,12 +4291,12 @@ static void resiliency_test(void) +@@ -4241,12 +4306,12 @@ static void resiliency_test(void) validate_slab_cache(kmalloc_caches[9]); } #else @@ -91617,7 +90192,7 @@ index 57707f0..7857bd3 100644 enum slab_stat_type { SL_ALL, /* All slabs */ SL_PARTIAL, /* Only partially allocated slabs */ -@@ -4475,7 +4540,7 @@ SLAB_ATTR_RO(ctor); +@@ -4490,7 +4555,7 @@ SLAB_ATTR_RO(ctor); static ssize_t aliases_show(struct kmem_cache *s, char *buf) { @@ -91626,7 +90201,7 @@ index 57707f0..7857bd3 100644 } SLAB_ATTR_RO(aliases); -@@ -4563,6 +4628,14 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf) +@@ -4578,6 +4643,14 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf) SLAB_ATTR_RO(cache_dma); #endif @@ -91641,7 +90216,7 @@ index 57707f0..7857bd3 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)); -@@ -4897,6 +4970,9 @@ static struct attribute *slab_attrs[] = { +@@ -4912,6 +4985,9 @@ static struct attribute *slab_attrs[] = { #ifdef CONFIG_ZONE_DMA &cache_dma_attr.attr, #endif @@ -91651,7 +90226,7 @@ index 57707f0..7857bd3 100644 #ifdef CONFIG_NUMA &remote_node_defrag_ratio_attr.attr, #endif -@@ -5128,6 +5204,7 @@ static char *create_unique_id(struct kmem_cache *s) +@@ -5143,6 +5219,7 @@ static char *create_unique_id(struct kmem_cache *s) return name; } @@ -91659,7 +90234,7 @@ index 57707f0..7857bd3 100644 static int sysfs_slab_add(struct kmem_cache *s) { int err; -@@ -5151,7 +5228,7 @@ static int sysfs_slab_add(struct kmem_cache *s) +@@ -5166,7 +5243,7 @@ static int sysfs_slab_add(struct kmem_cache *s) } s->kobj.kset = slab_kset; @@ -91668,7 +90243,7 @@ index 57707f0..7857bd3 100644 if (err) { kobject_put(&s->kobj); return err; -@@ -5185,6 +5262,7 @@ static void sysfs_slab_remove(struct kmem_cache *s) +@@ -5200,6 +5277,7 @@ static void sysfs_slab_remove(struct kmem_cache *s) kobject_del(&s->kobj); kobject_put(&s->kobj); } @@ -91676,7 +90251,7 @@ index 57707f0..7857bd3 100644 /* * Need to buffer aliases during bootup until sysfs becomes -@@ -5198,6 +5276,7 @@ struct saved_alias { +@@ -5213,6 +5291,7 @@ struct saved_alias { static struct saved_alias *alias_list; @@ -91684,7 +90259,7 @@ index 57707f0..7857bd3 100644 static int sysfs_slab_alias(struct kmem_cache *s, const char *name) { struct saved_alias *al; -@@ -5220,6 +5299,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name) +@@ -5235,6 +5314,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name) alias_list = al; return 0; } @@ -91715,10 +90290,10 @@ index 27eeab3..7c3f7f2 100644 return pgd; } diff --git a/mm/sparse.c b/mm/sparse.c -index 1c91f0d3..485470a 100644 +index 308d503..3dbbd04 100644 --- a/mm/sparse.c +++ b/mm/sparse.c -@@ -761,7 +761,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages) +@@ -764,7 +764,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages) for (i = 0; i < PAGES_PER_SECTION; i++) { if (PageHWPoison(&memmap[i])) { @@ -91728,7 +90303,7 @@ index 1c91f0d3..485470a 100644 } } diff --git a/mm/swap.c b/mm/swap.c -index dfd7d71..ccdf688 100644 +index 62b78a6..0bcf28f 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -31,6 +31,7 @@ @@ -91739,7 +90314,7 @@ index dfd7d71..ccdf688 100644 #include "internal.h" -@@ -73,6 +74,8 @@ static void __put_compound_page(struct page *page) +@@ -76,6 +77,8 @@ static void __put_compound_page(struct page *page) __page_cache_release(page); dtor = get_compound_page_dtor(page); @@ -91749,7 +90324,7 @@ index dfd7d71..ccdf688 100644 } diff --git a/mm/swapfile.c b/mm/swapfile.c -index 746af55b..7ac94ae 100644 +index 6cf2e60..d204b3e 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -66,7 +66,7 @@ static DEFINE_MUTEX(swapon_mutex); @@ -91761,7 +90336,7 @@ index 746af55b..7ac94ae 100644 static inline unsigned char swap_count(unsigned char ent) { -@@ -1684,7 +1684,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile) +@@ -1699,7 +1699,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile) } filp_close(swap_file, NULL); err = 0; @@ -91770,7 +90345,7 @@ index 746af55b..7ac94ae 100644 wake_up_interruptible(&proc_poll_wait); out_dput: -@@ -1701,8 +1701,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait) +@@ -1716,8 +1716,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait) poll_wait(file, &proc_poll_wait, wait); @@ -91781,7 +90356,7 @@ index 746af55b..7ac94ae 100644 return POLLIN | POLLRDNORM | POLLERR | POLLPRI; } -@@ -1800,7 +1800,7 @@ static int swaps_open(struct inode *inode, struct file *file) +@@ -1815,7 +1815,7 @@ static int swaps_open(struct inode *inode, struct file *file) return ret; seq = file->private_data; @@ -91790,7 +90365,7 @@ index 746af55b..7ac94ae 100644 return 0; } -@@ -2143,7 +2143,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) +@@ -2203,7 +2203,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) (frontswap_map) ? "FS" : ""); mutex_unlock(&swapon_mutex); @@ -91800,7 +90375,7 @@ index 746af55b..7ac94ae 100644 if (S_ISREG(inode->i_mode)) diff --git a/mm/util.c b/mm/util.c -index ab1424d..7c5bd5a 100644 +index 7441c41..c3de793 100644 --- a/mm/util.c +++ b/mm/util.c @@ -294,6 +294,12 @@ done: @@ -91814,10 +90389,10 @@ index ab1424d..7c5bd5a 100644 +#endif + mm->get_unmapped_area = arch_get_unmapped_area; - mm->unmap_area = arch_unmap_area; } + #endif diff --git a/mm/vmalloc.c b/mm/vmalloc.c -index d365724..6cae7c2 100644 +index 13a5495..6707d97 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -59,8 +59,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end) @@ -91929,7 +90504,7 @@ index d365724..6cae7c2 100644 unsigned long align, unsigned long vstart, unsigned long vend, int node, gfp_t gfp_mask) -@@ -1337,6 +1373,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size, +@@ -1308,6 +1344,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size, struct vm_struct *area; BUG_ON(in_interrupt()); @@ -91943,10 +90518,10 @@ index d365724..6cae7c2 100644 + } +#endif + - if (flags & VM_IOREMAP) { - int bit = fls(size); + if (flags & VM_IOREMAP) + align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER); -@@ -1581,6 +1627,11 @@ void *vmap(struct page **pages, unsigned int count, +@@ -1533,6 +1579,11 @@ void *vmap(struct page **pages, unsigned int count, if (count > totalram_pages) return NULL; @@ -91958,21 +90533,21 @@ index d365724..6cae7c2 100644 area = get_vm_area_caller((count << PAGE_SHIFT), flags, __builtin_return_address(0)); if (!area) -@@ -1682,6 +1733,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align, +@@ -1634,6 +1685,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align, if (!size || (size >> PAGE_SHIFT) > totalram_pages) goto fail; +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC) + if (!(pgprot_val(prot) & _PAGE_NX)) -+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST | VM_KERNEXEC, ++ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED | VM_KERNEXEC, + VMALLOC_START, VMALLOC_END, node, gfp_mask, caller); + else +#endif + - area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST, + area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED, start, end, node, gfp_mask, caller); if (!area) -@@ -1858,10 +1916,9 @@ EXPORT_SYMBOL(vzalloc_node); +@@ -1810,10 +1868,9 @@ EXPORT_SYMBOL(vzalloc_node); * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ @@ -91984,16 +90559,16 @@ index d365724..6cae7c2 100644 NUMA_NO_NODE, __builtin_return_address(0)); } -@@ -2168,6 +2225,8 @@ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr, - unsigned long uaddr = vma->vm_start; - unsigned long usize = vma->vm_end - vma->vm_start; +@@ -2120,6 +2177,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr, + { + struct vm_struct *area; + BUG_ON(vma->vm_mirror); + - if ((PAGE_SIZE-1) & (unsigned long)addr) - return -EINVAL; + size = PAGE_ALIGN(size); -@@ -2629,7 +2688,11 @@ static int s_show(struct seq_file *m, void *p) + if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr)) +@@ -2605,7 +2664,11 @@ static int s_show(struct seq_file *m, void *p) v->addr, v->addr + v->size, v->size); if (v->caller) @@ -92006,7 +90581,7 @@ index d365724..6cae7c2 100644 if (v->nr_pages) seq_printf(m, " pages=%d", v->nr_pages); diff --git a/mm/vmstat.c b/mm/vmstat.c -index f42745e..62f8346 100644 +index 20c2ef4..15e7ab7 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -76,7 +76,7 @@ void vm_events_fold_cpu(int cpu) @@ -92047,15 +90622,6 @@ index f42745e..62f8346 100644 } } #endif -@@ -1226,7 +1226,7 @@ static int __cpuinit vmstat_cpuup_callback(struct notifier_block *nfb, - return NOTIFY_OK; - } - --static struct notifier_block __cpuinitdata vmstat_notifier = -+static struct notifier_block vmstat_notifier = - { &vmstat_cpuup_callback, NULL, 0 }; - #endif - @@ -1241,10 +1241,20 @@ static int __init setup_vmstat(void) start_cpu_timer(cpu); #endif @@ -92082,7 +90648,7 @@ index f42745e..62f8346 100644 return 0; } diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c -index 9424f37..6aabf19 100644 +index 2fb2d88..8c06e40 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -469,7 +469,7 @@ out: @@ -92127,10 +90693,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 02efb25..41541a9 100644 +index 3ffda1b..fceac96 100644 --- a/net/9p/trans_fd.c +++ b/net/9p/trans_fd.c -@@ -425,7 +425,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len) +@@ -432,7 +432,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() */ @@ -92232,7 +90798,7 @@ index 0447d5d..3cf4728 100644 #undef __HANDLE_ITEM } diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c -index d5744b7..506bae3 100644 +index 919a5ce..cc6b444 100644 --- a/net/ax25/sysctl_net_ax25.c +++ b/net/ax25/sysctl_net_ax25.c @@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev) @@ -92245,10 +90811,10 @@ index d5744b7..506bae3 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 f680ee1..97e3542 100644 +index 62da527..aa27535 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c -@@ -79,7 +79,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface) +@@ -120,7 +120,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)); @@ -92257,7 +90823,7 @@ index f680ee1..97e3542 100644 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN; ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC); -@@ -627,9 +627,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) +@@ -701,9 +701,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) batadv_ogm_packet = (struct batadv_ogm_packet *)(*ogm_buff); /* change sequence number to network order */ @@ -92269,7 +90835,7 @@ index f680ee1..97e3542 100644 batadv_ogm_packet->ttvn = atomic_read(&bat_priv->tt.vn); batadv_ogm_packet->tt_crc = htons(bat_priv->tt.local_crc); -@@ -1037,7 +1037,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, +@@ -1109,7 +1109,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, return; /* could be changed by schedule_own_packet() */ @@ -92278,94 +90844,11 @@ index f680ee1..97e3542 100644 if (batadv_ogm_packet->flags & BATADV_DIRECTLINK) has_directlink_flag = 1; -diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c -index de27b31..7058bfe 100644 ---- a/net/batman-adv/bridge_loop_avoidance.c -+++ b/net/batman-adv/bridge_loop_avoidance.c -@@ -1522,6 +1522,8 @@ out: - * in these cases, the skb is further handled by this function and - * returns 1, otherwise it returns 0 and the caller shall further - * process the skb. -+ * -+ * This call might reallocate skb data. - */ - int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid) - { -diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c -index f105219..7614af3 100644 ---- a/net/batman-adv/gateway_client.c -+++ b/net/batman-adv/gateway_client.c -@@ -508,6 +508,7 @@ out: - return 0; - } - -+/* this call might reallocate skb data */ - static bool batadv_is_type_dhcprequest(struct sk_buff *skb, int header_len) - { - int ret = false; -@@ -568,6 +569,7 @@ out: - return ret; - } - -+/* this call might reallocate skb data */ - bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) - { - struct ethhdr *ethhdr; -@@ -619,6 +621,12 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) - - if (!pskb_may_pull(skb, *header_len + sizeof(*udphdr))) - return false; -+ -+ /* skb->data might have been reallocated by pskb_may_pull() */ -+ ethhdr = (struct ethhdr *)skb->data; -+ if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) -+ ethhdr = (struct ethhdr *)(skb->data + VLAN_HLEN); -+ - udphdr = (struct udphdr *)(skb->data + *header_len); - *header_len += sizeof(*udphdr); - -@@ -634,12 +642,14 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) - return true; - } - -+/* this call might reallocate skb data */ - bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, -- struct sk_buff *skb, struct ethhdr *ethhdr) -+ struct sk_buff *skb) - { - struct batadv_neigh_node *neigh_curr = NULL, *neigh_old = NULL; - struct batadv_orig_node *orig_dst_node = NULL; - struct batadv_gw_node *curr_gw = NULL; -+ struct ethhdr *ethhdr; - bool ret, out_of_range = false; - unsigned int header_len = 0; - uint8_t curr_tq_avg; -@@ -648,6 +658,7 @@ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, - if (!ret) - goto out; - -+ ethhdr = (struct ethhdr *)skb->data; - orig_dst_node = batadv_transtable_search(bat_priv, ethhdr->h_source, - ethhdr->h_dest); - if (!orig_dst_node) -diff --git a/net/batman-adv/gateway_client.h b/net/batman-adv/gateway_client.h -index 039902d..1037d75 100644 ---- a/net/batman-adv/gateway_client.h -+++ b/net/batman-adv/gateway_client.h -@@ -34,7 +34,6 @@ void batadv_gw_node_delete(struct batadv_priv *bat_priv, - void batadv_gw_node_purge(struct batadv_priv *bat_priv); - int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset); - bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len); --bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, -- struct sk_buff *skb, struct ethhdr *ethhdr); -+bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, struct sk_buff *skb); - - #endif /* _NET_BATMAN_ADV_GATEWAY_CLIENT_H_ */ diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c -index 522243a..b48c0ef 100644 +index c478e6b..469fd2f 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c -@@ -401,7 +401,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, +@@ -453,7 +453,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, hard_iface->batman_adv_ptype.dev = hard_iface->net_dev; dev_add_pack(&hard_iface->batman_adv_ptype); @@ -92374,41 +90857,11 @@ index 522243a..b48c0ef 100644 batadv_info(hard_iface->soft_iface, "Adding interface: %s\n", hard_iface->net_dev->name); -@@ -550,7 +550,7 @@ batadv_hardif_add_interface(struct net_device *net_dev) - /* This can't be called via a bat_priv callback because - * we have no bat_priv yet. - */ -- atomic_set(&hard_iface->bat_iv.ogm_seqno, 1); -+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, 1); - hard_iface->bat_iv.ogm_buff = NULL; - - return hard_iface; diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c -index 819dfb0..226bacd 100644 +index 0f04e1c..9c0ac11 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c -@@ -180,6 +180,9 @@ static int batadv_interface_tx(struct sk_buff *skb, - if (batadv_bla_tx(bat_priv, skb, vid)) - goto dropped; - -+ /* skb->data might have been reallocated by batadv_bla_tx() */ -+ ethhdr = (struct ethhdr *)skb->data; -+ - /* Register the client MAC in the transtable */ - if (!is_multicast_ether_addr(ethhdr->h_source)) - batadv_tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif); -@@ -220,6 +223,10 @@ static int batadv_interface_tx(struct sk_buff *skb, - default: - break; - } -+ -+ /* reminder: ethhdr might have become unusable from here on -+ * (batadv_gw_is_dhcp_target() might have reallocated skb data) -+ */ - } - - /* ethernet packet should be broadcasted */ -@@ -253,7 +260,7 @@ static int batadv_interface_tx(struct sk_buff *skb, +@@ -260,7 +260,7 @@ static int batadv_interface_tx(struct sk_buff *skb, primary_if->net_dev->dev_addr, ETH_ALEN); /* set broadcast sequence number */ @@ -92417,16 +90870,7 @@ index 819dfb0..226bacd 100644 bcast_packet->seqno = htonl(seqno); batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay); -@@ -266,7 +273,7 @@ static int batadv_interface_tx(struct sk_buff *skb, - /* unicast packet */ - } else { - if (atomic_read(&bat_priv->gw_mode) != BATADV_GW_MODE_OFF) { -- ret = batadv_gw_out_of_range(bat_priv, skb, ethhdr); -+ ret = batadv_gw_out_of_range(bat_priv, skb); - if (ret) - goto dropped; - } -@@ -472,7 +479,7 @@ static int batadv_softif_init_late(struct net_device *dev) +@@ -479,7 +479,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); @@ -92436,7 +90880,7 @@ index 819dfb0..226bacd 100644 atomic_set(&bat_priv->tt.local_changes, 0); atomic_set(&bat_priv->tt.ogm_append_cnt, 0); diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h -index aba8364..50fcbb8 100644 +index b2c94e1..3d47e07 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -51,7 +51,7 @@ @@ -92448,16 +90892,16 @@ index aba8364..50fcbb8 100644 }; /** -@@ -75,7 +75,7 @@ struct batadv_hard_iface { +@@ -76,7 +76,7 @@ struct batadv_hard_iface { int16_t if_num; char if_status; struct net_device *net_dev; - atomic_t frag_seqno; + atomic_unchecked_t frag_seqno; + uint8_t num_bcasts; struct kobject *hardif_obj; atomic_t refcount; - struct packet_type batman_adv_ptype; -@@ -558,7 +558,7 @@ struct batadv_priv { +@@ -560,7 +560,7 @@ struct batadv_priv { #ifdef CONFIG_BATMAN_ADV_DEBUG atomic_t log_level; #endif @@ -92467,7 +90911,7 @@ index aba8364..50fcbb8 100644 atomic_t batman_queue_left; char num_ifaces; diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c -index 0bb3b59..0e3052e 100644 +index 857e1b8..5ad07b2 100644 --- a/net/batman-adv/unicast.c +++ b/net/batman-adv/unicast.c @@ -270,7 +270,7 @@ int batadv_frag_send_skb(struct sk_buff *skb, struct batadv_priv *bat_priv, @@ -92479,83 +90923,6 @@ index 0bb3b59..0e3052e 100644 frag1->seqno = htons(seqno - 1); frag2->seqno = htons(seqno); -@@ -326,7 +326,9 @@ static bool batadv_unicast_push_and_fill_skb(struct sk_buff *skb, int hdr_size, - * @skb: the skb containing the payload to encapsulate - * @orig_node: the destination node - * -- * Returns false if the payload could not be encapsulated or true otherwise -+ * Returns false if the payload could not be encapsulated or true otherwise. -+ * -+ * This call might reallocate skb data. - */ - static bool batadv_unicast_prepare_skb(struct sk_buff *skb, - struct batadv_orig_node *orig_node) -@@ -343,7 +345,9 @@ static bool batadv_unicast_prepare_skb(struct sk_buff *skb, - * @orig_node: the destination node - * @packet_subtype: the batman 4addr packet subtype to use - * -- * Returns false if the payload could not be encapsulated or true otherwise -+ * Returns false if the payload could not be encapsulated or true otherwise. -+ * -+ * This call might reallocate skb data. - */ - bool batadv_unicast_4addr_prepare_skb(struct batadv_priv *bat_priv, - struct sk_buff *skb, -@@ -401,7 +405,7 @@ int batadv_unicast_generic_send_skb(struct batadv_priv *bat_priv, - struct batadv_neigh_node *neigh_node; - int data_len = skb->len; - int ret = NET_RX_DROP; -- unsigned int dev_mtu; -+ unsigned int dev_mtu, header_len; - - /* get routing information */ - if (is_multicast_ether_addr(ethhdr->h_dest)) { -@@ -429,10 +433,12 @@ find_router: - switch (packet_type) { - case BATADV_UNICAST: - batadv_unicast_prepare_skb(skb, orig_node); -+ header_len = sizeof(struct batadv_unicast_packet); - break; - case BATADV_UNICAST_4ADDR: - batadv_unicast_4addr_prepare_skb(bat_priv, skb, orig_node, - packet_subtype); -+ header_len = sizeof(struct batadv_unicast_4addr_packet); - break; - default: - /* this function supports UNICAST and UNICAST_4ADDR only. It -@@ -441,6 +447,7 @@ find_router: - goto out; - } - -+ ethhdr = (struct ethhdr *)(skb->data + header_len); - unicast_packet = (struct batadv_unicast_packet *)skb->data; - - /* inform the destination node that we are still missing a correct route -diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c -index ace5e55..a65a1c0 100644 ---- a/net/bluetooth/hci_core.c -+++ b/net/bluetooth/hci_core.c -@@ -2211,16 +2211,16 @@ int hci_register_dev(struct hci_dev *hdev) - list_add(&hdev->list, &hci_dev_list); - write_unlock(&hci_dev_list_lock); - -- hdev->workqueue = alloc_workqueue(hdev->name, WQ_HIGHPRI | WQ_UNBOUND | -- WQ_MEM_RECLAIM, 1); -+ hdev->workqueue = alloc_workqueue("%s", WQ_HIGHPRI | WQ_UNBOUND | -+ WQ_MEM_RECLAIM, 1, hdev->name); - if (!hdev->workqueue) { - error = -ENOMEM; - goto err; - } - -- hdev->req_workqueue = alloc_workqueue(hdev->name, -+ hdev->req_workqueue = alloc_workqueue("%s", - WQ_HIGHPRI | WQ_UNBOUND | -- WQ_MEM_RECLAIM, 1); -+ WQ_MEM_RECLAIM, 1, hdev->name); - if (!hdev->req_workqueue) { - destroy_workqueue(hdev->workqueue); - error = -ENOMEM; diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 9bd7d95..6c4884f 100644 --- a/net/bluetooth/hci_sock.c @@ -92570,10 +90937,10 @@ index 9bd7d95..6c4884f 100644 err = -EFAULT; break; diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c -index 68843a2..30e9342 100644 +index 8c3499b..2661c6a 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c -@@ -3507,8 +3507,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, +@@ -3510,8 +3510,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, break; case L2CAP_CONF_RFC: @@ -92587,7 +90954,7 @@ index 68843a2..30e9342 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 36fed40..be2eeb2 100644 +index 0098af8..fb5a31f 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -485,7 +485,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, @@ -92699,7 +91066,7 @@ index b6e44ad..5b0d514 100644 if (dev->tty_dev->parent) device_move(dev->tty_dev, NULL, DPM_ORDER_DEV_LAST); diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c -index 3d110c4..4e1b2eb 100644 +index ac78024..161a80c 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c @@ -1525,7 +1525,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) @@ -92773,7 +91140,7 @@ index 2bd4b58..0dc30a1 100644 list_del(&p->list); goto out; diff --git a/net/can/af_can.c b/net/can/af_can.c -index c4e5085..aa9efdf 100644 +index 3ab8dd2..b9aef13 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -862,7 +862,7 @@ static const struct net_proto_family can_family_ops = { @@ -92786,7 +91153,7 @@ index c4e5085..aa9efdf 100644 }; diff --git a/net/can/gw.c b/net/can/gw.c -index 3ee690e..00d581b 100644 +index 2f291f9..98c986a 100644 --- a/net/can/gw.c +++ b/net/can/gw.c @@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops, @@ -92979,10 +91346,10 @@ index f0a1ba6..0541331 100644 a0 = a[0]; a1 = a[1]; diff --git a/net/core/datagram.c b/net/core/datagram.c -index b71423d..0360434 100644 +index 8ab48cd..57b1a80 100644 --- a/net/core/datagram.c +++ b/net/core/datagram.c -@@ -295,7 +295,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags) +@@ -300,7 +300,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags) } kfree_skb(skb); @@ -92992,10 +91359,10 @@ index b71423d..0360434 100644 return err; diff --git a/net/core/dev.c b/net/core/dev.c -index 7ddbb31..3902452 100644 +index 26755dd..5020ced 100644 --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -1649,7 +1649,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb) +@@ -1680,14 +1680,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)) { @@ -93004,8 +91371,7 @@ index 7ddbb31..3902452 100644 kfree_skb(skb); return NET_RX_DROP; } -@@ -1658,7 +1658,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb) - skb_orphan(skb); + } if (unlikely(!is_skb_forwardable(dev, skb))) { - atomic_long_inc(&dev->rx_dropped); @@ -93013,7 +91379,7 @@ index 7ddbb31..3902452 100644 kfree_skb(skb); return NET_RX_DROP; } -@@ -2404,7 +2404,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb) +@@ -2431,7 +2431,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb) struct dev_gso_cb { void (*destructor)(struct sk_buff *skb); @@ -93022,7 +91388,7 @@ index 7ddbb31..3902452 100644 #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb) -@@ -3139,7 +3139,7 @@ enqueue: +@@ -3206,7 +3206,7 @@ enqueue: local_irq_restore(flags); @@ -93031,7 +91397,7 @@ index 7ddbb31..3902452 100644 kfree_skb(skb); return NET_RX_DROP; } -@@ -3211,7 +3211,7 @@ int netif_rx_ni(struct sk_buff *skb) +@@ -3278,7 +3278,7 @@ int netif_rx_ni(struct sk_buff *skb) } EXPORT_SYMBOL(netif_rx_ni); @@ -93040,7 +91406,7 @@ index 7ddbb31..3902452 100644 { struct softnet_data *sd = &__get_cpu_var(softnet_data); -@@ -3545,7 +3545,7 @@ ncls: +@@ -3612,7 +3612,7 @@ ncls: ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev); } else { drop: @@ -93049,7 +91415,7 @@ index 7ddbb31..3902452 100644 kfree_skb(skb); /* Jamal, now you will not able to escape explaining * me how you were going to use this. :-) -@@ -4153,7 +4153,7 @@ void netif_napi_del(struct napi_struct *napi) +@@ -4272,7 +4272,7 @@ void netif_napi_del(struct napi_struct *napi) } EXPORT_SYMBOL(netif_napi_del); @@ -93058,7 +91424,7 @@ index 7ddbb31..3902452 100644 { struct softnet_data *sd = &__get_cpu_var(softnet_data); unsigned long time_limit = jiffies + 2; -@@ -5590,7 +5590,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev, +@@ -5730,7 +5730,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev, } else { netdev_stats_to_stats64(storage, &dev->stats); } @@ -93085,50 +91451,8 @@ index 5b7d0e1..cb960fc 100644 } } EXPORT_SYMBOL(dev_load); -diff --git a/net/core/ethtool.c b/net/core/ethtool.c -index ce91766..3b71cdb 100644 ---- a/net/core/ethtool.c -+++ b/net/core/ethtool.c -@@ -1319,10 +1319,19 @@ static int ethtool_get_dump_data(struct net_device *dev, - if (ret) - return ret; - -- len = (tmp.len > dump.len) ? dump.len : tmp.len; -+ len = min(tmp.len, dump.len); - if (!len) - return -EFAULT; - -+ /* Don't ever let the driver think there's more space available -+ * than it requested with .get_dump_flag(). -+ */ -+ dump.len = len; -+ -+ /* Always allocate enough space to hold the whole thing so that the -+ * driver does not need to check the length and bother with partial -+ * dumping. -+ */ - data = vzalloc(tmp.len); - if (!data) - return -ENOMEM; -@@ -1330,6 +1339,16 @@ static int ethtool_get_dump_data(struct net_device *dev, - if (ret) - goto out; - -+ /* There are two sane possibilities: -+ * 1. The driver's .get_dump_data() does not touch dump.len. -+ * 2. Or it may set dump.len to how much it really writes, which -+ * should be tmp.len (or len if it can do a partial dump). -+ * In any case respond to userspace with the actual length of data -+ * it's receiving. -+ */ -+ WARN_ON(dump.len != len && dump.len != tmp.len); -+ dump.len = len; -+ - if (copy_to_user(useraddr, &dump, sizeof(dump))) { - ret = -EFAULT; - goto out; diff --git a/net/core/flow.c b/net/core/flow.c -index 7102f16..146b4bd 100644 +index dfa602c..3103d88 100644 --- a/net/core/flow.c +++ b/net/core/flow.c @@ -61,7 +61,7 @@ struct flow_cache { @@ -93190,23 +91514,23 @@ index de178e4..1dabd8b 100644 m->msg_iov = iov; diff --git a/net/core/neighbour.c b/net/core/neighbour.c -index ce90b02..8752627 100644 +index 60533db..14842cc 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c -@@ -2771,7 +2771,7 @@ static int proc_unres_qlen(ctl_table *ctl, int write, void __user *buffer, - size_t *lenp, loff_t *ppos) +@@ -2776,7 +2776,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write, + void __user *buffer, size_t *lenp, loff_t *ppos) { int size, ret; -- ctl_table tmp = *ctl; +- struct ctl_table tmp = *ctl; + ctl_table_no_const tmp = *ctl; tmp.extra1 = &zero; tmp.extra2 = &unres_qlen_max; diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c -index 569d355..79cf2d0 100644 +index 2bf8329..7960607 100644 --- a/net/core/net-procfs.c +++ b/net/core/net-procfs.c -@@ -271,8 +271,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v) +@@ -283,8 +283,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v) else seq_printf(seq, "%04x", ntohs(pt->type)); @@ -93274,7 +91598,7 @@ index f9765203..9feaef8 100644 return error; } diff --git a/net/core/netpoll.c b/net/core/netpoll.c -index cec074b..a53a938 100644 +index 2c637e9..68c9087 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -428,7 +428,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len) @@ -93296,7 +91620,7 @@ index cec074b..a53a938 100644 iph->ttl = 64; iph->protocol = IPPROTO_UDP; diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c -index a08bd2b..c59bd7c 100644 +index ca198c1d1..125372f 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -58,7 +58,7 @@ struct rtnl_link { @@ -93334,28 +91658,10 @@ index a08bd2b..c59bd7c 100644 } EXPORT_SYMBOL_GPL(__rtnl_link_unregister); -@@ -2374,7 +2377,7 @@ static int rtnl_bridge_getlink(struct sk_buff *skb, struct netlink_callback *cb) - struct nlattr *extfilt; - u32 filter_mask = 0; - -- extfilt = nlmsg_find_attr(cb->nlh, sizeof(struct rtgenmsg), -+ extfilt = nlmsg_find_attr(cb->nlh, sizeof(struct ifinfomsg), - IFLA_EXT_MASK); - if (extfilt) - filter_mask = nla_get_u32(extfilt); diff --git a/net/core/scm.c b/net/core/scm.c -index 03795d0..98d6bdb 100644 +index b4da80b..98d6bdb 100644 --- a/net/core/scm.c +++ b/net/core/scm.c -@@ -54,7 +54,7 @@ static __inline__ int scm_check_creds(struct ucred *creds) - return -EINVAL; - - if ((creds->pid == task_tgid_vnr(current) || -- ns_capable(current->nsproxy->pid_ns->user_ns, CAP_SYS_ADMIN)) && -+ ns_capable(task_active_pid_ns(current)->user_ns, CAP_SYS_ADMIN)) && - ((uid_eq(uid, cred->uid) || uid_eq(uid, cred->euid) || - uid_eq(uid, cred->suid)) || nsown_capable(CAP_SETUID)) && - ((gid_eq(gid, cred->gid) || gid_eq(gid, cred->egid) || @@ -210,7 +210,7 @@ EXPORT_SYMBOL(__scm_send); int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data) { @@ -93393,10 +91699,10 @@ index 03795d0..98d6bdb 100644 { struct socket *sock; diff --git a/net/core/skbuff.c b/net/core/skbuff.c -index 1c1738c..4cab7f0 100644 +index 2c3d0f5..f5a326f 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c -@@ -3087,13 +3087,15 @@ void __init skb_init(void) +@@ -3082,13 +3082,15 @@ void __init skb_init(void) skbuff_head_cache = kmem_cache_create("skbuff_head_cache", sizeof(struct sk_buff), 0, @@ -93415,10 +91721,10 @@ index 1c1738c..4cab7f0 100644 } diff --git a/net/core/sock.c b/net/core/sock.c -index d6d024c..6ea7ab4 100644 +index 2c097c5..bf72858 100644 --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -390,7 +390,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) +@@ -392,7 +392,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) { @@ -93427,7 +91733,7 @@ index d6d024c..6ea7ab4 100644 trace_sock_rcvqueue_full(sk, skb); return -ENOMEM; } -@@ -400,7 +400,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) +@@ -402,7 +402,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) return err; if (!sk_rmem_schedule(sk, skb, skb->truesize)) { @@ -93436,7 +91742,7 @@ index d6d024c..6ea7ab4 100644 return -ENOBUFS; } -@@ -420,7 +420,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) +@@ -422,7 +422,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) skb_dst_force(skb); spin_lock_irqsave(&list->lock, flags); @@ -93445,7 +91751,7 @@ index d6d024c..6ea7ab4 100644 __skb_queue_tail(list, skb); spin_unlock_irqrestore(&list->lock, flags); -@@ -440,7 +440,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested) +@@ -442,7 +442,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)) { @@ -93454,7 +91760,7 @@ index d6d024c..6ea7ab4 100644 goto discard_and_relse; } if (nested) -@@ -458,7 +458,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested) +@@ -460,7 +460,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); @@ -93463,7 +91769,7 @@ index d6d024c..6ea7ab4 100644 goto discard_and_relse; } -@@ -933,12 +933,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname, +@@ -948,12 +948,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname, struct timeval tm; } v; @@ -93479,7 +91785,7 @@ index d6d024c..6ea7ab4 100644 return -EINVAL; memset(&v, 0, sizeof(v)); -@@ -1090,11 +1090,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname, +@@ -1105,11 +1105,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname, case SO_PEERNAME: { @@ -93493,7 +91799,7 @@ index d6d024c..6ea7ab4 100644 return -EINVAL; if (copy_to_user(optval, address, len)) return -EFAULT; -@@ -1161,7 +1161,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname, +@@ -1182,7 +1182,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname, if (len > lv) len = lv; @@ -93502,7 +91808,7 @@ index d6d024c..6ea7ab4 100644 return -EFAULT; lenout: if (put_user(len, optlen)) -@@ -2277,7 +2277,7 @@ void sock_init_data(struct socket *sock, struct sock *sk) +@@ -2303,7 +2303,7 @@ void sock_init_data(struct socket *sock, struct sock *sk) */ smp_wmb(); atomic_set(&sk->sk_refcnt, 1); @@ -93574,19 +91880,19 @@ index a0e9cf6..ef7f9ed 100644 } EXPORT_SYMBOL_GPL(sock_diag_unregister); diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c -index cfdb46a..cef55e1 100644 +index 31107ab..ae03d5a 100644 --- a/net/core/sysctl_net_core.c +++ b/net/core/sysctl_net_core.c -@@ -28,7 +28,7 @@ static int rps_sock_flow_sysctl(ctl_table *table, int write, +@@ -31,7 +31,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write, { unsigned int orig_size, size; int ret, i; -- ctl_table tmp = { +- struct ctl_table tmp = { + ctl_table_no_const tmp = { .data = &size, .maxlen = sizeof(size), .mode = table->mode -@@ -211,13 +211,12 @@ static struct ctl_table netns_core_table[] = { +@@ -350,13 +350,12 @@ static struct ctl_table netns_core_table[] = { static __net_init int sysctl_core_net_init(struct net *net) { @@ -93602,7 +91908,7 @@ index cfdb46a..cef55e1 100644 if (tbl == NULL) goto err_dup; -@@ -227,17 +226,16 @@ static __net_init int sysctl_core_net_init(struct net *net) +@@ -366,17 +365,16 @@ static __net_init int sysctl_core_net_init(struct net *net) if (net->user_ns != &init_user_ns) { tbl[0].procname = NULL; } @@ -93624,7 +91930,7 @@ index cfdb46a..cef55e1 100644 err_dup: return -ENOMEM; } -@@ -252,7 +250,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net) +@@ -391,7 +389,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net) kfree(tbl); } @@ -93634,7 +91940,7 @@ index cfdb46a..cef55e1 100644 .exit = sysctl_core_net_exit, }; diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c -index c21f200..bc4565b 100644 +index dd4d506..fb2fb87 100644 --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c @@ -465,6 +465,7 @@ static struct proto dn_proto = { @@ -93646,10 +91952,10 @@ index c21f200..bc4565b 100644 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp) diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c -index a55eecc..dd8428c 100644 +index 5325b54..a0d4d69 100644 --- a/net/decnet/sysctl_net_decnet.c +++ b/net/decnet/sysctl_net_decnet.c -@@ -174,7 +174,7 @@ static int dn_node_address_handler(ctl_table *table, int write, +@@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write, if (len > *lenp) len = *lenp; @@ -93658,7 +91964,7 @@ index a55eecc..dd8428c 100644 return -EFAULT; *lenp = len; -@@ -237,7 +237,7 @@ static int dn_def_dev_handler(ctl_table *table, int write, +@@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write, if (len > *lenp) len = *lenp; @@ -93668,7 +91974,7 @@ index a55eecc..dd8428c 100644 *lenp = len; diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c -index 55e1fd5..fd602b8 100644 +index 3b9d5f2..d7015c6 100644 --- a/net/ieee802154/6lowpan.c +++ b/net/ieee802154/6lowpan.c @@ -459,7 +459,7 @@ static int lowpan_header_create(struct sk_buff *skb, @@ -93681,10 +91987,10 @@ index 55e1fd5..fd602b8 100644 *hc06_ptr = tmp; hc06_ptr += 4; diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c -index d01be2a..8976537 100644 +index b4d0be2..443d0f0 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c -@@ -1703,13 +1703,9 @@ static int __init inet_init(void) +@@ -1689,13 +1689,9 @@ static int __init inet_init(void) BUILD_BUG_ON(sizeof(struct inet_skb_parm) > FIELD_SIZEOF(struct sk_buff, cb)); @@ -93699,7 +92005,7 @@ index d01be2a..8976537 100644 rc = proto_register(&udp_prot, 1); if (rc) -@@ -1818,8 +1814,6 @@ out_unregister_udp_proto: +@@ -1804,8 +1800,6 @@ out_unregister_udp_proto: proto_unregister(&udp_prot); out_unregister_tcp_proto: proto_unregister(&tcp_prot); @@ -93708,42 +92014,11 @@ index d01be2a..8976537 100644 goto out; } -diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c -index 2e7f194..0fa4d6d 100644 ---- a/net/ipv4/ah4.c -+++ b/net/ipv4/ah4.c -@@ -420,7 +420,7 @@ static void ah4_err(struct sk_buff *skb, u32 info) - return; - - if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) { -- atomic_inc(&flow_cache_genid); -+ atomic_inc_unchecked(&flow_cache_genid); - rt_genid_bump(net); - - ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_AH, 0); diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c -index dfc39d4..0d4fa52 100644 +index 34ca6d5..b6421e8 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c -@@ -771,7 +771,7 @@ static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh, - ci = nla_data(tb[IFA_CACHEINFO]); - if (!ci->ifa_valid || ci->ifa_prefered > ci->ifa_valid) { - err = -EINVAL; -- goto errout; -+ goto errout_free; - } - *pvalid_lft = ci->ifa_valid; - *pprefered_lft = ci->ifa_prefered; -@@ -779,6 +779,8 @@ static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh, - - return ifa; - -+errout_free: -+ inet_free_ifa(ifa); - errout: - return ERR_PTR(err); - } -@@ -1529,7 +1531,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb) +@@ -1532,7 +1532,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(); @@ -93752,7 +92027,7 @@ index dfc39d4..0d4fa52 100644 net->dev_base_seq; hlist_for_each_entry_rcu(dev, head, index_hlist) { if (idx < s_idx) -@@ -1840,7 +1842,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb, +@@ -1843,7 +1843,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb, idx = 0; head = &net->dev_index_head[h]; rcu_read_lock(); @@ -93761,7 +92036,7 @@ index dfc39d4..0d4fa52 100644 net->dev_base_seq; hlist_for_each_entry_rcu(dev, head, index_hlist) { if (idx < s_idx) -@@ -2065,7 +2067,7 @@ static int ipv4_doint_and_flush(ctl_table *ctl, int write, +@@ -2068,7 +2068,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) @@ -93770,7 +92045,7 @@ index dfc39d4..0d4fa52 100644 struct ctl_table_header *sysctl_header; struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX]; } devinet_sysctl = { -@@ -2183,7 +2185,7 @@ static __net_init int devinet_init_net(struct net *net) +@@ -2186,7 +2186,7 @@ static __net_init int devinet_init_net(struct net *net) int err; struct ipv4_devconf *all, *dflt; #ifdef CONFIG_SYSCTL @@ -93779,7 +92054,7 @@ index dfc39d4..0d4fa52 100644 struct ctl_table_header *forw_hdr; #endif -@@ -2201,7 +2203,7 @@ static __net_init int devinet_init_net(struct net *net) +@@ -2204,7 +2204,7 @@ static __net_init int devinet_init_net(struct net *net) goto err_alloc_dflt; #ifdef CONFIG_SYSCTL @@ -93788,7 +92063,7 @@ index dfc39d4..0d4fa52 100644 if (tbl == NULL) goto err_alloc_ctl; -@@ -2221,7 +2223,10 @@ static __net_init int devinet_init_net(struct net *net) +@@ -2224,7 +2224,10 @@ static __net_init int devinet_init_net(struct net *net) goto err_reg_dflt; err = -ENOMEM; @@ -93800,7 +92075,7 @@ index dfc39d4..0d4fa52 100644 if (forw_hdr == NULL) goto err_reg_ctl; net->ipv4.forw_hdr = forw_hdr; -@@ -2237,8 +2242,7 @@ err_reg_ctl: +@@ -2240,8 +2243,7 @@ err_reg_ctl: err_reg_dflt: __devinet_sysctl_unregister(all); err_reg_all: @@ -93810,30 +92085,8 @@ index dfc39d4..0d4fa52 100644 err_alloc_ctl: #endif if (dflt != &ipv4_devconf_dflt) -diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c -index 4cfe34d..d2fac8a 100644 ---- a/net/ipv4/esp4.c -+++ b/net/ipv4/esp4.c -@@ -477,7 +477,7 @@ static u32 esp4_get_mtu(struct xfrm_state *x, int mtu) - } - - return ((mtu - x->props.header_len - crypto_aead_authsize(esp->aead) - -- net_adj) & ~(align - 1)) + (net_adj - 2); -+ net_adj) & ~(align - 1)) + net_adj - 2; - } - - static void esp4_err(struct sk_buff *skb, u32 info) -@@ -503,7 +503,7 @@ static void esp4_err(struct sk_buff *skb, u32 info) - return; - - if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) { -- atomic_inc(&flow_cache_genid); -+ atomic_inc_unchecked(&flow_cache_genid); - rt_genid_bump(net); - - ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_ESP, 0); diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c -index c7629a2..b62d139 100644 +index b3f627a..b0f3e99 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c @@ -1017,12 +1017,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event, @@ -93861,10 +92114,10 @@ index c7629a2..b62d139 100644 break; case NETDEV_DOWN: diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c -index 8f6cb7a..34507f9 100644 +index d5dbca5..6251d5f 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c -@@ -765,7 +765,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh) +@@ -766,7 +766,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); @@ -93873,30 +92126,6 @@ index 8f6cb7a..34507f9 100644 return nh->nh_saddr; } -diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c -index 49616fe..6e8a13d 100644 ---- a/net/ipv4/fib_trie.c -+++ b/net/ipv4/fib_trie.c -@@ -71,7 +71,6 @@ - #include <linux/init.h> - #include <linux/list.h> - #include <linux/slab.h> --#include <linux/prefetch.h> - #include <linux/export.h> - #include <net/net_namespace.h> - #include <net/ip.h> -@@ -1761,10 +1760,8 @@ static struct leaf *leaf_walk_rcu(struct tnode *p, struct rt_trie_node *c) - if (!c) - continue; - -- if (IS_LEAF(c)) { -- prefetch(rcu_dereference_rtnl(p->child[idx])); -+ if (IS_LEAF(c)) - return (struct leaf *) c; -- } - - /* Rescan start scanning in new node */ - p = (struct tnode *) c; diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 6acb541..9ea617d 100644 --- a/net/ipv4/inet_connection_sock.c @@ -93911,7 +92140,7 @@ index 6acb541..9ea617d 100644 void inet_get_local_port_range(int *low, int *high) diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c -index 6af375a..c493c74 100644 +index 7bd8983..3abdcf6 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c @@ -18,12 +18,15 @@ @@ -94006,7 +92235,7 @@ index b66910a..cfe416e 100644 return -ENOMEM; } diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c -index 855004f..9644112 100644 +index 8d6939e..19d0a95 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -115,7 +115,7 @@ static bool log_ecn_error = true; @@ -94018,16 +92247,7 @@ index 855004f..9644112 100644 static int ipgre_tunnel_init(struct net_device *dev); static int ipgre_net_id __read_mostly; -@@ -572,7 +572,7 @@ static int ipgre_header(struct sk_buff *skb, struct net_device *dev, - if (daddr) - memcpy(&iph->daddr, daddr, 4); - if (iph->daddr) -- return t->hlen; -+ return t->hlen + sizeof(*iph); - - return -(t->hlen + sizeof(*iph)); - } -@@ -919,7 +919,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = { +@@ -731,7 +731,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = { [IFLA_GRE_PMTUDISC] = { .type = NLA_U8 }, }; @@ -94036,7 +92256,7 @@ index 855004f..9644112 100644 .kind = "gre", .maxtype = IFLA_GRE_MAX, .policy = ipgre_policy, -@@ -933,7 +933,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = { +@@ -745,7 +745,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = { .fill_info = ipgre_fill_info, }; @@ -94090,19 +92310,6 @@ index 17cc0ff..63856c4 100644 .kind = "vti", .maxtype = IFLA_VTI_MAX, .policy = vti_policy, -diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c -index 59cb8c7..a72160c 100644 ---- a/net/ipv4/ipcomp.c -+++ b/net/ipv4/ipcomp.c -@@ -48,7 +48,7 @@ static void ipcomp4_err(struct sk_buff *skb, u32 info) - return; - - if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) { -- atomic_inc(&flow_cache_genid); -+ atomic_inc_unchecked(&flow_cache_genid); - rt_genid_bump(net); - - ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_COMP, 0); diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index efa1138..20dbba0 100644 --- a/net/ipv4/ipconfig.c @@ -94135,7 +92342,7 @@ index efa1138..20dbba0 100644 return res; } diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c -index 7cfc456..e726868 100644 +index b3ac3c3..ec6bd95 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"); @@ -94147,7 +92354,7 @@ index 7cfc456..e726868 100644 static int ipip_err(struct sk_buff *skb, u32 info) { -@@ -406,7 +406,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = { +@@ -409,7 +409,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = { [IFLA_IPTUN_PMTUDISC] = { .type = NLA_U8 }, }; @@ -94255,10 +92462,64 @@ index d23118d..6ad7277 100644 case IPT_SO_GET_ENTRIES: diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c -index 7d93d62..cbbf2a3 100644 +index 746427c..80eab72 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c -@@ -843,7 +843,7 @@ static void ping_format_sock(struct sock *sp, struct seq_file *f, +@@ -55,7 +55,7 @@ + + + struct ping_table ping_table; +-struct pingv6_ops pingv6_ops; ++struct pingv6_ops *pingv6_ops; + EXPORT_SYMBOL_GPL(pingv6_ops); + + static u16 ping_port_rover; +@@ -335,7 +335,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk, + return -ENODEV; + } + } +- has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev, ++ has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev, + scoped); + rcu_read_unlock(); + +@@ -541,7 +541,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info) + } + #if IS_ENABLED(CONFIG_IPV6) + } else if (skb->protocol == htons(ETH_P_IPV6)) { +- harderr = pingv6_ops.icmpv6_err_convert(type, code, &err); ++ harderr = pingv6_ops->icmpv6_err_convert(type, code, &err); + #endif + } + +@@ -559,7 +559,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info) + info, (u8 *)icmph); + #if IS_ENABLED(CONFIG_IPV6) + } else if (family == AF_INET6) { +- pingv6_ops.ipv6_icmp_error(sk, skb, err, 0, ++ pingv6_ops->ipv6_icmp_error(sk, skb, err, 0, + info, (u8 *)icmph); + #endif + } +@@ -850,7 +850,7 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, + return ip_recv_error(sk, msg, 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); + #endif + } + } +@@ -900,7 +900,7 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, + IP6CB(skb)->iif); + + if (inet6_sk(sk)->rxopt.all) +- pingv6_ops.ip6_datagram_recv_ctl(sk, msg, skb); ++ pingv6_ops->ip6_datagram_recv_ctl(sk, msg, skb); + #endif + } else { + BUG(); +@@ -1090,7 +1090,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, @@ -94266,9 +92527,9 @@ index 7d93d62..cbbf2a3 100644 + atomic_read_unchecked(&sp->sk_drops), len); } - static int ping_seq_show(struct seq_file *seq, void *v) + 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 dd44e0a..06dcca4 100644 +index 61e60d6..d6996cd 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -309,7 +309,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb) @@ -94280,7 +92541,7 @@ index dd44e0a..06dcca4 100644 kfree_skb(skb); return NET_RX_DROP; } -@@ -745,16 +745,20 @@ static int raw_init(struct sock *sk) +@@ -746,16 +746,20 @@ static int raw_init(struct sock *sk) static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen) { @@ -94302,7 +92563,7 @@ index dd44e0a..06dcca4 100644 if (get_user(len, optlen)) goto out; -@@ -764,8 +768,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o +@@ -765,8 +769,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; @@ -94313,7 +92574,7 @@ index dd44e0a..06dcca4 100644 goto out; ret = 0; out: return ret; -@@ -994,7 +998,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i) +@@ -995,7 +999,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), @@ -94323,10 +92584,10 @@ index dd44e0a..06dcca4 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 d35bbf0..faa3ab8 100644 +index a9a54a2..647316e 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -2558,34 +2558,34 @@ static struct ctl_table ipv4_route_flush_table[] = { +@@ -2615,34 +2615,34 @@ static struct ctl_table ipv4_route_flush_table[] = { .maxlen = sizeof(int), .mode = 0200, .proc_handler = ipv4_sysctl_rtcache_flush, @@ -94369,69 +92630,71 @@ index d35bbf0..faa3ab8 100644 err_dup: return -ENOMEM; } -@@ -2608,7 +2608,7 @@ static __net_initdata struct pernet_operations sysctl_route_ops = { +@@ -2665,8 +2665,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = { static __net_init int rt_genid_init(struct net *net) { - atomic_set(&net->rt_genid, 0); +- atomic_set(&net->fnhe_genid, 0); + atomic_set_unchecked(&net->rt_genid, 0); ++ atomic_set_unchecked(&net->fnhe_genid, 0); get_random_bytes(&net->ipv4.dev_addr_genid, sizeof(net->ipv4.dev_addr_genid)); return 0; diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c -index 3f25e75..3ae0f4d 100644 +index 610e324..fd42e75 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c -@@ -57,7 +57,7 @@ static int ipv4_local_port_range(ctl_table *table, int write, +@@ -57,7 +57,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write, { int ret; int range[2]; -- ctl_table tmp = { +- struct ctl_table tmp = { + ctl_table_no_const tmp = { .data = &range, .maxlen = sizeof(range), .mode = table->mode, -@@ -110,7 +110,7 @@ static int ipv4_ping_group_range(ctl_table *table, int write, +@@ -110,7 +110,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write, int ret; gid_t urange[2]; kgid_t low, high; -- ctl_table tmp = { +- struct ctl_table tmp = { + ctl_table_no_const tmp = { .data = &urange, .maxlen = sizeof(urange), .mode = table->mode, -@@ -141,7 +141,7 @@ static int proc_tcp_congestion_control(ctl_table *ctl, int write, +@@ -141,7 +141,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write, void __user *buffer, size_t *lenp, loff_t *ppos) { char val[TCP_CA_NAME_MAX]; -- ctl_table tbl = { +- struct ctl_table tbl = { + ctl_table_no_const tbl = { .data = val, .maxlen = TCP_CA_NAME_MAX, }; -@@ -160,7 +160,7 @@ static int proc_tcp_available_congestion_control(ctl_table *ctl, +@@ -160,7 +160,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl, void __user *buffer, size_t *lenp, loff_t *ppos) { -- ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, }; +- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, }; + ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, }; int ret; tbl.data = kmalloc(tbl.maxlen, GFP_USER); -@@ -177,7 +177,7 @@ static int proc_allowed_congestion_control(ctl_table *ctl, +@@ -177,7 +177,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl, void __user *buffer, size_t *lenp, loff_t *ppos) { -- ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX }; +- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX }; + ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX }; int ret; tbl.data = kmalloc(tbl.maxlen, GFP_USER); -@@ -203,15 +203,17 @@ static int ipv4_tcp_mem(ctl_table *ctl, int write, +@@ -203,15 +203,17 @@ static int ipv4_tcp_mem(struct ctl_table *ctl, int write, struct mem_cgroup *memcg; #endif -- ctl_table tmp = { +- struct ctl_table tmp = { + ctl_table_no_const tmp = { .data = &vec, .maxlen = sizeof(vec), @@ -94448,16 +92711,16 @@ index 3f25e75..3ae0f4d 100644 } ret = proc_doulongvec_minmax(&tmp, write, buffer, lenp, ppos); -@@ -238,7 +240,7 @@ static int ipv4_tcp_mem(ctl_table *ctl, int write, - static int proc_tcp_fastopen_key(ctl_table *ctl, int write, void __user *buffer, - size_t *lenp, loff_t *ppos) +@@ -239,7 +241,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write, + void __user *buffer, size_t *lenp, + loff_t *ppos) { -- ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) }; +- struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) }; + ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) }; struct tcp_fastopen_context *ctxt; int ret; u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */ -@@ -481,7 +483,7 @@ static struct ctl_table ipv4_table[] = { +@@ -482,7 +484,7 @@ static struct ctl_table ipv4_table[] = { }, { .procname = "ip_local_reserved_ports", @@ -94466,7 +92729,7 @@ index 3f25e75..3ae0f4d 100644 .maxlen = 65536, .mode = 0644, .proc_handler = proc_do_large_bitmap, -@@ -846,11 +848,10 @@ static struct ctl_table ipv4_net_table[] = { +@@ -847,11 +849,10 @@ static struct ctl_table ipv4_net_table[] = { static __net_init int ipv4_sysctl_init_net(struct net *net) { @@ -94480,7 +92743,7 @@ index 3f25e75..3ae0f4d 100644 if (table == NULL) goto err_alloc; -@@ -885,15 +886,17 @@ static __net_init int ipv4_sysctl_init_net(struct net *net) +@@ -886,15 +887,17 @@ static __net_init int ipv4_sysctl_init_net(struct net *net) tcp_init_mem(net); @@ -94501,7 +92764,7 @@ index 3f25e75..3ae0f4d 100644 err_alloc: return -ENOMEM; } -@@ -915,16 +918,6 @@ static __net_initdata struct pernet_operations ipv4_sysctl_ops = { +@@ -916,16 +919,6 @@ static __net_initdata struct pernet_operations ipv4_sysctl_ops = { static __init int sysctl_ipv4_init(void) { struct ctl_table_header *hdr; @@ -94519,10 +92782,10 @@ index 3f25e75..3ae0f4d 100644 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 9c62257..651cc27 100644 +index 3ca2139..c4cc060 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -4436,7 +4436,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb, +@@ -4379,7 +4379,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb, * simplifies code) */ static void @@ -94531,7 +92794,7 @@ index 9c62257..651cc27 100644 struct sk_buff *head, struct sk_buff *tail, u32 start, u32 end) { -@@ -5522,6 +5522,7 @@ discard: +@@ -5465,6 +5465,7 @@ discard: tcp_paws_reject(&tp->rx_opt, 0)) goto discard_and_undo; @@ -94539,7 +92802,7 @@ index 9c62257..651cc27 100644 if (th->syn) { /* We see SYN without ACK. It is attempt of * simultaneous connect with crossed SYNs. -@@ -5572,6 +5573,7 @@ discard: +@@ -5515,6 +5516,7 @@ discard: goto discard; #endif } @@ -94547,7 +92810,7 @@ index 9c62257..651cc27 100644 /* "fifth, if neither of the SYN or RST bits is set then * drop the segment and return." */ -@@ -5616,7 +5618,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb, +@@ -5560,7 +5562,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb, goto discard; if (th->syn) { @@ -94557,10 +92820,10 @@ index 9c62257..651cc27 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 7999fc5..c812f42 100644 +index b299da5..097db06 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c -@@ -90,6 +90,10 @@ int sysctl_tcp_low_latency __read_mostly; +@@ -91,6 +91,10 @@ int sysctl_tcp_low_latency __read_mostly; EXPORT_SYMBOL(sysctl_tcp_low_latency); @@ -94571,7 +92834,7 @@ index 7999fc5..c812f42 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); -@@ -1855,6 +1859,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb) +@@ -1830,6 +1834,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb) return 0; reset: @@ -94581,7 +92844,7 @@ index 7999fc5..c812f42 100644 tcp_v4_send_reset(rsk, skb); discard: kfree_skb(skb); -@@ -2000,12 +2007,19 @@ int tcp_v4_rcv(struct sk_buff *skb) +@@ -1975,12 +1982,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); @@ -94604,7 +92867,7 @@ index 7999fc5..c812f42 100644 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) { NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP); -@@ -2058,6 +2072,10 @@ csum_error: +@@ -2034,6 +2048,10 @@ csum_error: bad_packet: TCP_INC_STATS_BH(net, TCP_MIB_INERRS); } else { @@ -94616,7 +92879,7 @@ index 7999fc5..c812f42 100644 } diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c -index 0f01788..d52a859 100644 +index ab1c086..2a8d76b 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c @@ -27,6 +27,10 @@ @@ -94630,7 +92893,7 @@ index 0f01788..d52a859 100644 int sysctl_tcp_syncookies __read_mostly = 1; EXPORT_SYMBOL(sysctl_tcp_syncookies); -@@ -717,7 +721,10 @@ embryonic_reset: +@@ -715,7 +719,10 @@ embryonic_reset: * avoid becoming vulnerable to outside attack aiming at * resetting legit local connections. */ @@ -94685,7 +92948,7 @@ index 4b85e6f..22f9ac9 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 93b731d..5a2dd92 100644 +index 766e6ba..aff2f8d 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -87,6 +87,7 @@ @@ -94696,8 +92959,8 @@ index 93b731d..5a2dd92 100644 #include <linux/socket.h> #include <linux/sockios.h> #include <linux/igmp.h> -@@ -111,6 +112,10 @@ - #include <trace/events/skb.h> +@@ -112,6 +113,10 @@ + #include <net/busy_poll.h> #include "udp_impl.h" +#ifdef CONFIG_GRKERNSEC_BLACKHOLE @@ -94707,7 +92970,7 @@ index 93b731d..5a2dd92 100644 struct udp_table udp_table __read_mostly; EXPORT_SYMBOL(udp_table); -@@ -594,6 +599,9 @@ found: +@@ -595,6 +600,9 @@ found: return s; } @@ -94717,7 +92980,7 @@ index 93b731d..5a2dd92 100644 /* * This routine is called by the ICMP module when it gets some * sort of error condition. If err < 0 then the socket should -@@ -890,9 +898,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, +@@ -891,9 +899,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, dport = usin->sin_port; if (dport == 0) return -EINVAL; @@ -94736,7 +92999,7 @@ index 93b731d..5a2dd92 100644 daddr = inet->inet_daddr; dport = inet->inet_dport; /* Open fast path for connected socket. -@@ -1136,7 +1153,7 @@ static unsigned int first_packet_length(struct sock *sk) +@@ -1137,7 +1154,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)); @@ -94745,7 +93008,7 @@ index 93b731d..5a2dd92 100644 __skb_unlink(skb, rcvq); __skb_queue_tail(&list_kill, skb); } -@@ -1222,6 +1239,10 @@ try_again: +@@ -1223,6 +1240,10 @@ try_again: if (!skb) goto out; @@ -94756,7 +93019,7 @@ index 93b731d..5a2dd92 100644 ulen = skb->len - sizeof(struct udphdr); copied = len; if (copied > ulen) -@@ -1255,7 +1276,7 @@ try_again: +@@ -1256,7 +1277,7 @@ try_again: if (unlikely(err)) { trace_kfree_skb(skb, udp_recvmsg); if (!peeked) { @@ -94765,7 +93028,7 @@ index 93b731d..5a2dd92 100644 UDP_INC_STATS_USER(sock_net(sk), UDP_MIB_INERRORS, is_udplite); } -@@ -1542,7 +1563,7 @@ csum_error: +@@ -1543,7 +1564,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); @@ -94774,7 +93037,7 @@ index 93b731d..5a2dd92 100644 kfree_skb(skb); return -1; } -@@ -1561,7 +1582,7 @@ static void flush_stack(struct sock **stack, unsigned int count, +@@ -1562,7 +1583,7 @@ static void flush_stack(struct sock **stack, unsigned int count, skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC); if (!skb1) { @@ -94783,7 +93046,7 @@ index 93b731d..5a2dd92 100644 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS, IS_UDPLITE(sk)); UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, -@@ -1730,6 +1751,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, +@@ -1734,6 +1755,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); @@ -94793,7 +93056,7 @@ index 93b731d..5a2dd92 100644 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); /* -@@ -2160,7 +2184,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f, +@@ -2166,7 +2190,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, @@ -94842,10 +93105,10 @@ index 9a459be..086b866 100644 return -ENOMEM; } diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c -index fb8c94c..80a31d8 100644 +index 498ea99..42501bc 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c -@@ -621,7 +621,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb, +@@ -618,7 +618,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb, idx = 0; head = &net->dev_index_head[h]; rcu_read_lock(); @@ -94854,24 +93117,7 @@ index fb8c94c..80a31d8 100644 net->dev_base_seq; hlist_for_each_entry_rcu(dev, head, index_hlist) { if (idx < s_idx) -@@ -1124,12 +1124,10 @@ retry: - if (ifp->flags & IFA_F_OPTIMISTIC) - addr_flags |= IFA_F_OPTIMISTIC; - -- ift = !max_addresses || -- ipv6_count_addresses(idev) < max_addresses ? -- ipv6_add_addr(idev, &addr, tmp_plen, -- ipv6_addr_type(&addr)&IPV6_ADDR_SCOPE_MASK, -- addr_flags) : NULL; -- if (IS_ERR_OR_NULL(ift)) { -+ ift = ipv6_add_addr(idev, &addr, tmp_plen, -+ ipv6_addr_type(&addr)&IPV6_ADDR_SCOPE_MASK, -+ addr_flags); -+ if (IS_ERR(ift)) { - in6_ifa_put(ifp); - in6_dev_put(idev); - pr_info("%s: retry temporary address regeneration\n", __func__); -@@ -2380,7 +2378,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg) +@@ -2381,7 +2381,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg) p.iph.ihl = 5; p.iph.protocol = IPPROTO_IPV6; p.iph.ttl = 64; @@ -94880,7 +93126,7 @@ index fb8c94c..80a31d8 100644 if (ops->ndo_do_ioctl) { mm_segment_t oldfs = get_fs(); -@@ -4002,7 +4000,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb, +@@ -4030,7 +4030,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(); @@ -94889,7 +93135,7 @@ index fb8c94c..80a31d8 100644 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) { idx = 0; head = &net->dev_index_head[h]; -@@ -4587,7 +4585,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp) +@@ -4651,7 +4651,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp) dst_free(&ifp->rt->dst); break; } @@ -94898,42 +93144,40 @@ index fb8c94c..80a31d8 100644 } static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp) -@@ -4607,7 +4605,7 @@ int addrconf_sysctl_forward(ctl_table *ctl, int write, +@@ -4671,7 +4671,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write, int *valp = ctl->data; int val = *valp; loff_t pos = *ppos; -- ctl_table lctl; +- struct ctl_table lctl; + ctl_table_no_const lctl; int ret; /* -@@ -4689,7 +4687,7 @@ int addrconf_sysctl_disable(ctl_table *ctl, int write, +@@ -4756,7 +4756,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write, int *valp = ctl->data; int val = *valp; loff_t pos = *ppos; -- ctl_table lctl; +- struct ctl_table lctl; + ctl_table_no_const lctl; int ret; /* -diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c -index 40ffd72..aeac0dc 100644 ---- a/net/ipv6/esp6.c -+++ b/net/ipv6/esp6.c -@@ -425,7 +425,7 @@ static u32 esp6_get_mtu(struct xfrm_state *x, int mtu) - net_adj = 0; - - return ((mtu - x->props.header_len - crypto_aead_authsize(esp->aead) - -- net_adj) & ~(align - 1)) + (net_adj - 2); -+ net_adj) & ~(align - 1)) + net_adj - 2; +diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c +index 197e6f4..16d8396 100644 +--- a/net/ipv6/datagram.c ++++ b/net/ipv6/datagram.c +@@ -904,5 +904,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, +- atomic_read(&sp->sk_drops)); ++ atomic_read_unchecked(&sp->sk_drops)); } - - static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c -index b4ff0a4..db9b764 100644 +index 7cfc8d2..c5394b6 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c -@@ -980,7 +980,7 @@ ctl_table ipv6_icmp_table_template[] = { +@@ -989,7 +989,7 @@ struct ctl_table ipv6_icmp_table_template[] = { struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net) { @@ -94943,7 +93187,7 @@ index b4ff0a4..db9b764 100644 table = kmemdup(ipv6_icmp_table_template, sizeof(ipv6_icmp_table_template), diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c -index ecd6073..58162ae 100644 +index 90747f1..505320d 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -74,7 +74,7 @@ struct ip6gre_net { @@ -94955,7 +93199,7 @@ index ecd6073..58162ae 100644 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); -@@ -1283,7 +1283,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev) +@@ -1288,7 +1288,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev) } @@ -94964,7 +93208,7 @@ index ecd6073..58162ae 100644 .handler = ip6gre_rcv, .err_handler = ip6gre_err, .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL, -@@ -1617,7 +1617,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = { +@@ -1622,7 +1622,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = { [IFLA_GRE_FLAGS] = { .type = NLA_U32 }, }; @@ -94973,7 +93217,7 @@ index ecd6073..58162ae 100644 .kind = "ip6gre", .maxtype = IFLA_GRE_MAX, .policy = ip6gre_policy, -@@ -1630,7 +1630,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = { +@@ -1635,7 +1635,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = { .fill_info = ip6gre_fill_info, }; @@ -94983,7 +93227,7 @@ index ecd6073..58162ae 100644 .maxtype = IFLA_GRE_MAX, .policy = ip6gre_policy, diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c -index 1e55866..b398dab 100644 +index 46ba243..576f50e 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -88,7 +88,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2) @@ -94995,7 +93239,7 @@ index 1e55866..b398dab 100644 static int ip6_tnl_net_id __read_mostly; struct ip6_tnl_net { -@@ -1672,7 +1672,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = { +@@ -1678,7 +1678,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = { [IFLA_IPTUN_PROTO] = { .type = NLA_U8 }, }; @@ -95109,7 +93353,7 @@ index dffdc1a..ccc6678 100644 return -ENOMEM; } diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c -index c2e73e6..12cca6f 100644 +index ab92a36..bb4a528 100644 --- a/net/ipv6/output_core.c +++ b/net/ipv6/output_core.c @@ -8,8 +8,8 @@ @@ -95141,8 +93385,61 @@ index c2e73e6..12cca6f 100644 } EXPORT_SYMBOL(ipv6_select_ident); +diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c +index 18f19df..b46ada1 100644 +--- a/net/ipv6/ping.c ++++ b/net/ipv6/ping.c +@@ -245,6 +245,22 @@ static struct pernet_operations ping_v6_net_ops = { + }; + #endif + ++static struct pingv6_ops real_pingv6_ops = { ++ .ipv6_recv_error = ipv6_recv_error, ++ .ip6_datagram_recv_ctl = ip6_datagram_recv_ctl, ++ .icmpv6_err_convert = icmpv6_err_convert, ++ .ipv6_icmp_error = ipv6_icmp_error, ++ .ipv6_chk_addr = ipv6_chk_addr, ++}; ++ ++static struct pingv6_ops dummy_pingv6_ops = { ++ .ipv6_recv_error = dummy_ipv6_recv_error, ++ .ip6_datagram_recv_ctl = dummy_ip6_datagram_recv_ctl, ++ .icmpv6_err_convert = dummy_icmpv6_err_convert, ++ .ipv6_icmp_error = dummy_ipv6_icmp_error, ++ .ipv6_chk_addr = dummy_ipv6_chk_addr, ++}; ++ + int __init pingv6_init(void) + { + #ifdef CONFIG_PROC_FS +@@ -252,11 +268,7 @@ int __init pingv6_init(void) + if (ret) + return ret; + #endif +- pingv6_ops.ipv6_recv_error = ipv6_recv_error; +- pingv6_ops.ip6_datagram_recv_ctl = ip6_datagram_recv_ctl; +- pingv6_ops.icmpv6_err_convert = icmpv6_err_convert; +- pingv6_ops.ipv6_icmp_error = ipv6_icmp_error; +- pingv6_ops.ipv6_chk_addr = ipv6_chk_addr; ++ pingv6_ops = &real_pingv6_ops; + return inet6_register_protosw(&pingv6_protosw); + } + +@@ -265,11 +277,7 @@ int __init pingv6_init(void) + */ + void pingv6_exit(void) + { +- pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error; +- pingv6_ops.ip6_datagram_recv_ctl = dummy_ip6_datagram_recv_ctl; +- pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert; +- pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error; +- pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr; ++ pingv6_ops = &dummy_pingv6_ops; + #ifdef CONFIG_PROC_FS + unregister_pernet_subsys(&ping_v6_net_ops); + #endif diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c -index eedff8c..7d7e24a 100644 +index cdaed47..515edde9 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -108,7 +108,7 @@ found: @@ -95190,7 +93487,7 @@ index eedff8c..7d7e24a 100644 struct flowi6 *fl6, struct dst_entry **dstp, unsigned int flags) { -@@ -914,12 +914,15 @@ do_confirm: +@@ -915,12 +915,15 @@ do_confirm: static int rawv6_seticmpfilter(struct sock *sk, int level, int optname, char __user *optval, int optlen) { @@ -95207,7 +93504,7 @@ index eedff8c..7d7e24a 100644 return 0; default: return -ENOPROTOOPT; -@@ -932,6 +935,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname, +@@ -933,6 +936,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname, char __user *optval, int __user *optlen) { int len; @@ -95215,7 +93512,7 @@ index eedff8c..7d7e24a 100644 switch (optname) { case ICMPV6_FILTER: -@@ -943,7 +947,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname, +@@ -944,7 +948,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname, len = sizeof(struct icmp6_filter); if (put_user(len, optlen)) return -EFAULT; @@ -95225,20 +93522,11 @@ index eedff8c..7d7e24a 100644 return -EFAULT; return 0; default: -@@ -1251,7 +1256,7 @@ static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i) - from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)), - 0, - sock_i_ino(sp), -- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops)); -+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops)); - } - - static int raw6_seq_show(struct seq_file *seq, void *v) diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c -index 790d9f4..68ae078 100644 +index 1aeb473..bea761c 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c -@@ -621,12 +621,11 @@ static struct ctl_table ip6_frags_ctl_table[] = { +@@ -626,12 +626,11 @@ static struct ctl_table ip6_frags_ctl_table[] = { static int __net_init ip6_frags_ns_sysctl_register(struct net *net) { @@ -95253,7 +93541,7 @@ index 790d9f4..68ae078 100644 if (table == NULL) goto err_alloc; -@@ -637,9 +636,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net) +@@ -642,9 +641,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; @@ -95266,7 +93554,7 @@ index 790d9f4..68ae078 100644 if (hdr == NULL) goto err_reg; -@@ -647,8 +647,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net) +@@ -652,8 +652,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net) return 0; err_reg: @@ -95277,10 +93565,10 @@ index 790d9f4..68ae078 100644 return -ENOMEM; } diff --git a/net/ipv6/route.c b/net/ipv6/route.c -index bacce6c..9d1741a 100644 +index 8d9a93ed..cd89616 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c -@@ -2903,7 +2903,7 @@ ctl_table ipv6_route_table_template[] = { +@@ -2926,7 +2926,7 @@ struct ctl_table ipv6_route_table_template[] = { struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net) { @@ -95290,7 +93578,7 @@ index bacce6c..9d1741a 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 60df36d..f3ab7c8 100644 +index 21b25dd..9a43e37 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev); @@ -95302,7 +93590,7 @@ index 60df36d..f3ab7c8 100644 static int sit_net_id __read_mostly; struct sit_net { -@@ -1453,7 +1453,7 @@ static const struct nla_policy ipip6_policy[IFLA_IPTUN_MAX + 1] = { +@@ -1547,7 +1547,7 @@ static const struct nla_policy ipip6_policy[IFLA_IPTUN_MAX + 1] = { #endif }; @@ -95312,10 +93600,10 @@ index 60df36d..f3ab7c8 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 e85c48b..b8268d3 100644 +index 107b2f1..72741a9 100644 --- a/net/ipv6/sysctl_net_ipv6.c +++ b/net/ipv6/sysctl_net_ipv6.c -@@ -40,7 +40,7 @@ static ctl_table ipv6_rotable[] = { +@@ -40,7 +40,7 @@ static struct ctl_table ipv6_rotable[] = { static int __net_init ipv6_sysctl_net_init(struct net *net) { @@ -95325,10 +93613,10 @@ index e85c48b..b8268d3 100644 struct ctl_table *ipv6_icmp_table; int err; diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c -index 0a17ed9..5600868 100644 +index 6e1649d..75ddb4c 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c -@@ -103,6 +103,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb) +@@ -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; } @@ -95339,7 +93627,7 @@ index 0a17ed9..5600868 100644 static void tcp_v6_hash(struct sock *sk) { if (sk->sk_state != TCP_CLOSE) { -@@ -1398,6 +1402,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) +@@ -1399,6 +1403,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) return 0; reset: @@ -95349,7 +93637,7 @@ index 0a17ed9..5600868 100644 tcp_v6_send_reset(sk, skb); discard: if (opt_skb) -@@ -1426,7 +1433,7 @@ ipv6_pktoptions: +@@ -1427,7 +1434,7 @@ ipv6_pktoptions: if (np->rxopt.bits.rxhlim || np->rxopt.bits.rxohlim) np->mcast_hops = ipv6_hdr(opt_skb)->hop_limit; if (np->rxopt.bits.rxtclass) @@ -95358,7 +93646,7 @@ index 0a17ed9..5600868 100644 if (ipv6_opt_accepted(sk, opt_skb)) { skb_set_owner_r(opt_skb, sk); opt_skb = xchg(&np->pktoptions, opt_skb); -@@ -1480,12 +1487,20 @@ static int tcp_v6_rcv(struct sk_buff *skb) +@@ -1481,12 +1488,20 @@ static int tcp_v6_rcv(struct sk_buff *skb) TCP_SKB_CB(skb)->sacked = 0; sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest); @@ -95381,7 +93669,7 @@ index 0a17ed9..5600868 100644 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) { NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP); -@@ -1536,6 +1551,10 @@ csum_error: +@@ -1538,6 +1553,10 @@ csum_error: bad_packet: TCP_INC_STATS_BH(net, TCP_MIB_INERRS); } else { @@ -95393,10 +93681,10 @@ index 0a17ed9..5600868 100644 } diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c -index e7b28f9..d09c290 100644 +index f405815..45a68a6 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c -@@ -52,6 +52,10 @@ +@@ -53,6 +53,10 @@ #include <trace/events/skb.h> #include "udp_impl.h" @@ -95407,7 +93695,7 @@ index e7b28f9..d09c290 100644 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2) { const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr; -@@ -419,7 +423,7 @@ try_again: +@@ -420,7 +424,7 @@ try_again: if (unlikely(err)) { trace_kfree_skb(skb, udpv6_recvmsg); if (!peeked) { @@ -95416,7 +93704,7 @@ index e7b28f9..d09c290 100644 if (is_udp4) UDP_INC_STATS_USER(sock_net(sk), UDP_MIB_INERRORS, -@@ -665,7 +669,7 @@ csum_error: +@@ -666,7 +670,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); @@ -95425,7 +93713,7 @@ index e7b28f9..d09c290 100644 kfree_skb(skb); return -1; } -@@ -723,7 +727,7 @@ static void flush_stack(struct sock **stack, unsigned int count, +@@ -724,7 +728,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) { @@ -95434,7 +93722,7 @@ index e7b28f9..d09c290 100644 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS, IS_UDPLITE(sk)); UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, -@@ -860,6 +864,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, +@@ -864,6 +868,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); @@ -95444,15 +93732,6 @@ index e7b28f9..d09c290 100644 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0); kfree_skb(skb); -@@ -1392,7 +1399,7 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket - 0, - sock_i_ino(sp), - atomic_read(&sp->sk_refcnt), sp, -- atomic_read(&sp->sk_drops)); -+ atomic_read_unchecked(&sp->sk_drops)); - } - - int udp6_seq_show(struct seq_file *seq, void *v) diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index 23ed03d..465a71d 100644 --- a/net/ipv6/xfrm6_policy.c @@ -95568,7 +93847,7 @@ index 41ac7938..75e3bb1 100644 seq_printf(m, "Max header size: %d\n", self->max_header_size); diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c -index ae69165..c8b82d8 100644 +index 168aff5..9d43132 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) @@ -95585,10 +93864,10 @@ index ae69165..c8b82d8 100644 write_unlock_bh(&iucv_sk_list.lock); diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c -index 4fe76ff..426a904 100644 +index cd5b8ec..f205e6b 100644 --- a/net/iucv/iucv.c +++ b/net/iucv/iucv.c -@@ -690,7 +690,7 @@ static int __cpuinit iucv_cpu_notify(struct notifier_block *self, +@@ -690,7 +690,7 @@ static int iucv_cpu_notify(struct notifier_block *self, return NOTIFY_OK; } @@ -95615,10 +93894,10 @@ index ab8bd2c..cd2d641 100644 return res; } diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c -index ae36f8e..09d42ac 100644 +index 43dd752..63a23bc 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -806,7 +806,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy, +@@ -820,7 +820,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy, ret = ieee80211_vif_use_channel(sdata, chandef, IEEE80211_CHANCTX_EXCLUSIVE); } @@ -95627,7 +93906,7 @@ index ae36f8e..09d42ac 100644 local->_oper_chandef = *chandef; ieee80211_hw_config(local, 0); } -@@ -2922,7 +2922,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy, +@@ -2941,7 +2941,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy, else local->probe_req_reg--; @@ -95636,7 +93915,7 @@ index ae36f8e..09d42ac 100644 break; ieee80211_queue_work(&local->hw, &local->reconfig_filter); -@@ -3385,8 +3385,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy, +@@ -3404,8 +3404,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy, if (chanctx_conf) { *chandef = chanctx_conf->def; ret = 0; @@ -95648,7 +93927,7 @@ index ae36f8e..09d42ac 100644 if (local->use_chanctx) *chandef = local->monitor_chandef; diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h -index 9ca8e32..48e4a9b 100644 +index 8412a30..6e00181 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -28,6 +28,7 @@ @@ -95659,7 +93938,7 @@ index 9ca8e32..48e4a9b 100644 #include "key.h" #include "sta_info.h" #include "debug.h" -@@ -891,7 +892,7 @@ struct ieee80211_local { +@@ -907,7 +908,7 @@ struct ieee80211_local { /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ spinlock_t queue_stop_reason_lock; @@ -95669,10 +93948,10 @@ index 9ca8e32..48e4a9b 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 514e90f..56f22bf 100644 +index cc11759..11d5541 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -502,7 +502,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) +@@ -511,7 +511,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) break; } @@ -95681,16 +93960,16 @@ index 514e90f..56f22bf 100644 res = drv_start(local); if (res) goto err_del_bss; -@@ -545,7 +545,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) - break; - } - -- if (local->monitors == 0 && local->open_count == 0) { -+ if (local->monitors == 0 && local_read(&local->open_count) == 0) { +@@ -558,7 +558,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) + res = drv_add_interface(local, sdata); + if (res) + goto err_stop; +- } else if (local->monitors == 0 && local->open_count == 0) { ++ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) { res = ieee80211_add_virtual_monitor(local); if (res) goto err_stop; -@@ -653,7 +653,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) +@@ -666,7 +666,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) atomic_inc(&local->iff_promiscs); if (coming_up) @@ -95699,7 +93978,7 @@ index 514e90f..56f22bf 100644 if (hw_reconf_flags) ieee80211_hw_config(local, hw_reconf_flags); -@@ -691,7 +691,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) +@@ -704,7 +704,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) err_del_interface: drv_remove_interface(local, sdata); err_stop: @@ -95708,7 +93987,7 @@ index 514e90f..56f22bf 100644 drv_stop(local); err_del_bss: sdata->bss = NULL; -@@ -828,7 +828,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, +@@ -841,7 +841,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, } if (going_down) @@ -95717,7 +93996,7 @@ index 514e90f..56f22bf 100644 switch (sdata->vif.type) { case NL80211_IFTYPE_AP_VLAN: -@@ -895,7 +895,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, +@@ -908,7 +908,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, } spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags); @@ -95726,7 +94005,7 @@ index 514e90f..56f22bf 100644 ieee80211_clear_tx_pending(local); /* -@@ -931,7 +931,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, +@@ -948,7 +948,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, ieee80211_recalc_ps(local, -1); @@ -95735,7 +94014,7 @@ index 514e90f..56f22bf 100644 ieee80211_stop_device(local); /* no reconfiguring after stop! */ -@@ -942,7 +942,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, +@@ -959,7 +959,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, ieee80211_configure_filter(local); ieee80211_hw_config(local, hw_reconf_flags); @@ -95745,7 +94024,7 @@ index 514e90f..56f22bf 100644 } diff --git a/net/mac80211/main.c b/net/mac80211/main.c -index 8a7bfc4..be07e86 100644 +index 091088a..daf43c7 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -181,7 +181,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed) @@ -95757,15 +94036,6 @@ index 8a7bfc4..be07e86 100644 ret = drv_config(local, changed); /* * Goal: -@@ -921,7 +921,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) - hw->queues = IEEE80211_MAX_QUEUES; - - local->workqueue = -- alloc_ordered_workqueue(wiphy_name(local->hw.wiphy), 0); -+ alloc_ordered_workqueue("%s", 0, wiphy_name(local->hw.wiphy)); - if (!local->workqueue) { - result = -ENOMEM; - goto fail_workqueue; diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c index 3401262..d5cd68d 100644 --- a/net/mac80211/pm.c @@ -95798,10 +94068,10 @@ index 3401262..d5cd68d 100644 suspend: diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c -index a02bef3..f2f38dd 100644 +index 30d58d2..449ac8e 100644 --- a/net/mac80211/rate.c +++ b/net/mac80211/rate.c -@@ -712,7 +712,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local, +@@ -718,7 +718,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local, ASSERT_RTNL(); @@ -95824,10 +94094,10 @@ index c97a065..ff61928 100644 return p; diff --git a/net/mac80211/util.c b/net/mac80211/util.c -index 72e6292..e6319eb 100644 +index 2265445..ba14971 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c -@@ -1472,7 +1472,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) +@@ -1452,7 +1452,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) } #endif /* everything else happens only if HW was up & running */ @@ -95836,7 +94106,7 @@ index 72e6292..e6319eb 100644 goto wake_up; /* -@@ -1696,7 +1696,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) +@@ -1677,7 +1677,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) local->in_reconfig = false; barrier(); @@ -95892,7 +94162,7 @@ index f771390..145b765 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 a083bda..da661c3 100644 +index 4c8e5c0..5a79b4d 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) @@ -95913,7 +94183,7 @@ index a083bda..da661c3 100644 cp->packet_xmit = NULL; cp->app = NULL; -@@ -1190,7 +1190,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp) +@@ -1188,7 +1188,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] */ @@ -95923,7 +94193,7 @@ index a083bda..da661c3 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 23b8eb5..48a8959 100644 +index 4f69e83..da2d8bf 100644 --- a/net/netfilter/ipvs/ip_vs_core.c +++ b/net/netfilter/ipvs/ip_vs_core.c @@ -559,7 +559,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb, @@ -95945,7 +94215,7 @@ index 23b8eb5..48a8959 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 9e6c2a0..28552e2 100644 +index c8148e4..eff604f 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -789,7 +789,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest, @@ -95957,7 +94227,7 @@ index 9e6c2a0..28552e2 100644 /* bind the service */ if (!dest->svc) { -@@ -1657,7 +1657,7 @@ proc_do_sync_ports(ctl_table *table, int write, +@@ -1657,7 +1657,7 @@ proc_do_sync_ports(struct ctl_table *table, int write, * align with netns init in ip_vs_control_net_init() */ @@ -95966,7 +94236,7 @@ index 9e6c2a0..28552e2 100644 { .procname = "amemthresh", .maxlen = sizeof(int), -@@ -2060,7 +2060,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v) +@@ -2078,7 +2078,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), @@ -95975,7 +94245,7 @@ index 9e6c2a0..28552e2 100644 atomic_read(&dest->weight), atomic_read(&dest->activeconns), atomic_read(&dest->inactconns)); -@@ -2071,7 +2071,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v) +@@ -2089,7 +2089,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), @@ -95984,7 +94254,7 @@ index 9e6c2a0..28552e2 100644 atomic_read(&dest->weight), atomic_read(&dest->activeconns), atomic_read(&dest->inactconns)); -@@ -2549,7 +2549,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get, +@@ -2567,7 +2567,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; @@ -95993,7 +94263,7 @@ index 9e6c2a0..28552e2 100644 entry.weight = atomic_read(&dest->weight); entry.u_threshold = dest->u_threshold; entry.l_threshold = dest->l_threshold; -@@ -3092,7 +3092,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest) +@@ -3110,7 +3110,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, @@ -96002,7 +94272,7 @@ index 9e6c2a0..28552e2 100644 IP_VS_CONN_F_FWD_MASK)) || nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight)) || -@@ -3682,7 +3682,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net) +@@ -3700,7 +3700,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net) { int idx; struct netns_ipvs *ipvs = net_ipvs(net); @@ -96012,36 +94282,36 @@ index 9e6c2a0..28552e2 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 5ea26bd..c9bc65f 100644 +index 1383b0e..91f68ae 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 { * IPVS LBLC sysctl table */ #ifdef CONFIG_SYSCTL --static ctl_table vs_vars_table[] = { -+static ctl_table_no_const vs_vars_table[] __read_only = { +-static struct ctl_table vs_vars_table[] = { ++static struct ctl_table vs_vars_table[] __read_only = { { .procname = "lblc_expiration", .data = NULL, diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c -index 50123c2..067c773 100644 +index 3cd85b2..b45b17e 100644 --- a/net/netfilter/ipvs/ip_vs_lblcr.c +++ b/net/netfilter/ipvs/ip_vs_lblcr.c @@ -299,7 +299,7 @@ struct ip_vs_lblcr_table { * IPVS LBLCR sysctl table */ --static ctl_table vs_vars_table[] = { -+static ctl_table_no_const vs_vars_table[] __read_only = { +-static struct ctl_table vs_vars_table[] = { ++static struct ctl_table vs_vars_table[] __read_only = { { .procname = "lblcr_expiration", .data = NULL, diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c -index f6046d9..4f10cfd 100644 +index f448471..995f131 100644 --- a/net/netfilter/ipvs/ip_vs_sync.c +++ b/net/netfilter/ipvs/ip_vs_sync.c -@@ -596,7 +596,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp, +@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp, cp = cp->control; if (cp) { if (cp->flags & IP_VS_CONN_F_TEMPLATE) @@ -96050,7 +94320,7 @@ index f6046d9..4f10cfd 100644 else pkts = sysctl_sync_threshold(ipvs); ip_vs_sync_conn(net, cp->control, pkts); -@@ -758,7 +758,7 @@ control: +@@ -771,7 +771,7 @@ control: if (!cp) return; if (cp->flags & IP_VS_CONN_F_TEMPLATE) @@ -96059,7 +94329,7 @@ index f6046d9..4f10cfd 100644 else pkts = sysctl_sync_threshold(ipvs); goto sloop; -@@ -882,7 +882,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param, +@@ -895,7 +895,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)); @@ -96218,54 +94488,11 @@ index a99b6c3..cb372f9 100644 return -NF_ACCEPT; } -diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c -index 4d4d8f1..e0f9a32 100644 ---- a/net/netfilter/nf_conntrack_proto_tcp.c -+++ b/net/netfilter/nf_conntrack_proto_tcp.c -@@ -526,7 +526,7 @@ static bool tcp_in_window(const struct nf_conn *ct, - const struct nf_conntrack_tuple *tuple = &ct->tuplehash[dir].tuple; - __u32 seq, ack, sack, end, win, swin; - s16 receiver_offset; -- bool res; -+ bool res, in_recv_win; - - /* - * Get the required data from the packet. -@@ -649,14 +649,18 @@ static bool tcp_in_window(const struct nf_conn *ct, - receiver->td_end, receiver->td_maxend, receiver->td_maxwin, - receiver->td_scale); - -+ /* Is the ending sequence in the receive window (if available)? */ -+ in_recv_win = !receiver->td_maxwin || -+ after(end, sender->td_end - receiver->td_maxwin - 1); -+ - pr_debug("tcp_in_window: I=%i II=%i III=%i IV=%i\n", - before(seq, sender->td_maxend + 1), -- after(end, sender->td_end - receiver->td_maxwin - 1), -+ (in_recv_win ? 1 : 0), - before(sack, receiver->td_end + 1), - after(sack, receiver->td_end - MAXACKWINDOW(sender) - 1)); - - if (before(seq, sender->td_maxend + 1) && -- after(end, sender->td_end - receiver->td_maxwin - 1) && -+ in_recv_win && - before(sack, receiver->td_end + 1) && - after(sack, receiver->td_end - MAXACKWINDOW(sender) - 1)) { - /* -@@ -725,7 +729,7 @@ static bool tcp_in_window(const struct nf_conn *ct, - nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL, - "nf_ct_tcp: %s ", - before(seq, sender->td_maxend + 1) ? -- after(end, sender->td_end - receiver->td_maxwin - 1) ? -+ in_recv_win ? - before(sack, receiver->td_end + 1) ? - after(sack, receiver->td_end - MAXACKWINDOW(sender) - 1) ? "BUG" - : "ACK is under the lower bound (possible overly delayed ACK)" diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c -index bd700b4..4a3dc61 100644 +index f641751..d3c5b51 100644 --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c -@@ -471,7 +471,7 @@ static ctl_table nf_ct_netfilter_table[] = { +@@ -471,7 +471,7 @@ static struct ctl_table nf_ct_netfilter_table[] = { static int nf_conntrack_standalone_init_sysctl(struct net *net) { @@ -96288,7 +94515,7 @@ index 902fb0a..87f7fdb 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 3b18dd1..f79e0ca 100644 +index 85296d4..8becdec 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 = { @@ -96298,9 +94525,9 @@ index 3b18dd1..f79e0ca 100644 -static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1]; +static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only; - static int nf_log_proc_dostring(ctl_table *table, int write, + 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(ctl_table *table, int write, +@@ -274,14 +274,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 { @@ -96343,7 +94570,7 @@ index f042ae5..30ea486 100644 } EXPORT_SYMBOL(nf_unregister_sockopt); diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c -index 962e979..e46f350 100644 +index d92cc31..e46f350 100644 --- a/net/netfilter/nfnetlink_log.c +++ b/net/netfilter/nfnetlink_log.c @@ -82,7 +82,7 @@ static int nfnl_log_net_id __read_mostly; @@ -96355,27 +94582,7 @@ index 962e979..e46f350 100644 }; static struct nfnl_log_net *nfnl_log_pernet(struct net *net) -@@ -419,6 +419,7 @@ __build_packet_message(struct nfnl_log_net *log, - nfmsg->version = NFNETLINK_V0; - nfmsg->res_id = htons(inst->group_num); - -+ memset(&pmsg, 0, sizeof(pmsg)); - pmsg.hw_protocol = skb->protocol; - pmsg.hook = hooknum; - -@@ -498,7 +499,10 @@ __build_packet_message(struct nfnl_log_net *log, - if (indev && skb->dev && - skb->mac_header != skb->network_header) { - struct nfulnl_msg_packet_hw phw; -- int len = dev_parse_header(skb, phw.hw_addr); -+ int len; -+ -+ memset(&phw, 0, sizeof(phw)); -+ len = dev_parse_header(skb, phw.hw_addr); - if (len > 0) { - phw.hw_addrlen = htons(len); - if (nla_put(inst->skb, NFULA_HWADDR, sizeof(phw), &phw)) -@@ -559,7 +563,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, @@ -96384,130 +94591,6 @@ index 962e979..e46f350 100644 goto nla_put_failure; if (data_len) { -diff --git a/net/netfilter/nfnetlink_queue_core.c b/net/netfilter/nfnetlink_queue_core.c -index 5352b2d..e0083ce 100644 ---- a/net/netfilter/nfnetlink_queue_core.c -+++ b/net/netfilter/nfnetlink_queue_core.c -@@ -444,7 +444,10 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue, - if (indev && entskb->dev && - entskb->mac_header != entskb->network_header) { - struct nfqnl_msg_packet_hw phw; -- int len = dev_parse_header(entskb, phw.hw_addr); -+ int len; -+ -+ memset(&phw, 0, sizeof(phw)); -+ len = dev_parse_header(entskb, phw.hw_addr); - if (len) { - phw.hw_addrlen = htons(len); - if (nla_put(skb, NFQA_HWADDR, sizeof(phw), &phw)) -diff --git a/net/netfilter/xt_TCPMSS.c b/net/netfilter/xt_TCPMSS.c -index 7011c71..6113cc7 100644 ---- a/net/netfilter/xt_TCPMSS.c -+++ b/net/netfilter/xt_TCPMSS.c -@@ -52,7 +52,8 @@ tcpmss_mangle_packet(struct sk_buff *skb, - { - const struct xt_tcpmss_info *info = par->targinfo; - struct tcphdr *tcph; -- unsigned int tcplen, i; -+ int len, tcp_hdrlen; -+ unsigned int i; - __be16 oldval; - u16 newmss; - u8 *opt; -@@ -64,11 +65,14 @@ tcpmss_mangle_packet(struct sk_buff *skb, - if (!skb_make_writable(skb, skb->len)) - return -1; - -- tcplen = skb->len - tcphoff; -+ len = skb->len - tcphoff; -+ if (len < (int)sizeof(struct tcphdr)) -+ return -1; -+ - tcph = (struct tcphdr *)(skb_network_header(skb) + tcphoff); -+ tcp_hdrlen = tcph->doff * 4; - -- /* Header cannot be larger than the packet */ -- if (tcplen < tcph->doff*4) -+ if (len < tcp_hdrlen) - return -1; - - if (info->mss == XT_TCPMSS_CLAMP_PMTU) { -@@ -87,9 +91,8 @@ tcpmss_mangle_packet(struct sk_buff *skb, - newmss = info->mss; - - opt = (u_int8_t *)tcph; -- for (i = sizeof(struct tcphdr); i < tcph->doff*4; i += optlen(opt, i)) { -- if (opt[i] == TCPOPT_MSS && tcph->doff*4 - i >= TCPOLEN_MSS && -- opt[i+1] == TCPOLEN_MSS) { -+ for (i = sizeof(struct tcphdr); i <= tcp_hdrlen - TCPOLEN_MSS; i += optlen(opt, i)) { -+ if (opt[i] == TCPOPT_MSS && opt[i+1] == TCPOLEN_MSS) { - u_int16_t oldmss; - - oldmss = (opt[i+2] << 8) | opt[i+3]; -@@ -112,9 +115,10 @@ tcpmss_mangle_packet(struct sk_buff *skb, - } - - /* There is data after the header so the option can't be added -- without moving it, and doing so may make the SYN packet -- itself too large. Accept the packet unmodified instead. */ -- if (tcplen > tcph->doff*4) -+ * without moving it, and doing so may make the SYN packet -+ * itself too large. Accept the packet unmodified instead. -+ */ -+ if (len > tcp_hdrlen) - return 0; - - /* -@@ -143,10 +147,10 @@ tcpmss_mangle_packet(struct sk_buff *skb, - newmss = min(newmss, (u16)1220); - - opt = (u_int8_t *)tcph + sizeof(struct tcphdr); -- memmove(opt + TCPOLEN_MSS, opt, tcplen - sizeof(struct tcphdr)); -+ memmove(opt + TCPOLEN_MSS, opt, len - sizeof(struct tcphdr)); - - inet_proto_csum_replace2(&tcph->check, skb, -- htons(tcplen), htons(tcplen + TCPOLEN_MSS), 1); -+ htons(len), htons(len + TCPOLEN_MSS), 1); - opt[0] = TCPOPT_MSS; - opt[1] = TCPOLEN_MSS; - opt[2] = (newmss & 0xff00) >> 8; -diff --git a/net/netfilter/xt_TCPOPTSTRIP.c b/net/netfilter/xt_TCPOPTSTRIP.c -index b68fa19..625fa1d 100644 ---- a/net/netfilter/xt_TCPOPTSTRIP.c -+++ b/net/netfilter/xt_TCPOPTSTRIP.c -@@ -38,7 +38,7 @@ tcpoptstrip_mangle_packet(struct sk_buff *skb, - struct tcphdr *tcph; - u_int16_t n, o; - u_int8_t *opt; -- int len; -+ int len, tcp_hdrlen; - - /* This is a fragment, no TCP header is available */ - if (par->fragoff != 0) -@@ -52,7 +52,9 @@ tcpoptstrip_mangle_packet(struct sk_buff *skb, - return NF_DROP; - - tcph = (struct tcphdr *)(skb_network_header(skb) + tcphoff); -- if (tcph->doff * 4 > len) -+ tcp_hdrlen = tcph->doff * 4; -+ -+ if (len < tcp_hdrlen) - return NF_DROP; - - opt = (u_int8_t *)tcph; -@@ -61,10 +63,10 @@ tcpoptstrip_mangle_packet(struct sk_buff *skb, - * Walk through all TCP options - if we find some option to remove, - * set all octets to %TCPOPT_NOP and adjust checksum. - */ -- for (i = sizeof(struct tcphdr); i < tcp_hdrlen(skb); i += optl) { -+ for (i = sizeof(struct tcphdr); i < tcp_hdrlen - 1; i += optl) { - optl = optlen(opt, i); - -- if (i + optl > tcp_hdrlen(skb)) -+ if (i + optl > tcp_hdrlen) - break; - - if (!tcpoptstrip_test_bit(info->strip_bmap, opt[i])) diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c new file mode 100644 index 0000000..c566332 @@ -96600,10 +94683,10 @@ index 4fe4fb4..87a89e5 100644 return 0; } diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c -index 57ee84d..8b99cf5 100644 +index 0c61b59..941bddd 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c -@@ -121,7 +121,7 @@ static void netlink_overrun(struct sock *sk) +@@ -219,7 +219,7 @@ static void netlink_overrun(struct sock *sk) sk->sk_error_report(sk); } } @@ -96612,7 +94695,7 @@ index 57ee84d..8b99cf5 100644 } static void netlink_rcv_wake(struct sock *sk) -@@ -2771,7 +2771,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v) +@@ -2925,7 +2925,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v) sk_wmem_alloc_get(s), nlk->cb, atomic_read(&s->sk_refcnt), @@ -96622,7 +94705,7 @@ index 57ee84d..8b99cf5 100644 ); diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c -index 1076fe1..f190285 100644 +index 0c741ce..f63c3f5 100644 --- a/net/netlink/genetlink.c +++ b/net/netlink/genetlink.c @@ -310,18 +310,20 @@ int genl_register_ops(struct genl_family *family, struct genl_ops *ops) @@ -96663,8 +94746,29 @@ index 1076fe1..f190285 100644 return 0; } } +@@ -832,6 +834,10 @@ static int ctrl_dumpfamily(struct sk_buff *skb, struct netlink_callback *cb) + struct net *net = sock_net(skb->sk); + int chains_to_skip = cb->args[0]; + int fams_to_skip = cb->args[1]; ++ bool need_locking = chains_to_skip || fams_to_skip; ++ ++ if (need_locking) ++ genl_lock(); + + for (i = chains_to_skip; i < GENL_FAM_TAB_SIZE; i++) { + n = 0; +@@ -853,6 +859,9 @@ errout: + cb->args[0] = i; + cb->args[1] = n; + ++ if (need_locking) ++ genl_unlock(); ++ + return skb->len; + } + diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c -index ec0c80f..41e1830 100644 +index 698814b..7cfde4e 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, @@ -96676,7 +94780,7 @@ index ec0c80f..41e1830 100644 *uaddr_len = sizeof(struct sockaddr_ax25); } diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c -index 20a1bd0..bb8f1c1 100644 +index 75c8bbf..ee9be59 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -1681,7 +1681,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, @@ -96716,7 +94820,7 @@ index 20a1bd0..bb8f1c1 100644 msg->msg_flags |= MSG_ERRQUEUE; err = copied; -@@ -3281,7 +3283,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, +@@ -3283,7 +3285,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, case PACKET_HDRLEN: if (len > sizeof(int)) len = sizeof(int); @@ -96725,7 +94829,7 @@ index 20a1bd0..bb8f1c1 100644 return -EFAULT; switch (val) { case TPACKET_V1: -@@ -3324,7 +3326,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, +@@ -3326,7 +3328,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, len = lv; if (put_user(len, optlen)) return -EFAULT; @@ -96734,19 +94838,6 @@ index 20a1bd0..bb8f1c1 100644 return -EFAULT; return 0; } -diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c -index 5a940db..d6a502d 100644 ---- a/net/phonet/af_phonet.c -+++ b/net/phonet/af_phonet.c -@@ -469,7 +469,7 @@ int __init_or_module phonet_proto_register(unsigned int protocol, - { - int err = 0; - -- if (protocol >= PHONET_NPROTO) -+ if (protocol < 0 || protocol >= PHONET_NPROTO) - return -EINVAL; - - err = proto_register(pp->prot, 1); diff --git a/net/phonet/pep.c b/net/phonet/pep.c index e774117..900b8b7 100644 --- a/net/phonet/pep.c @@ -96792,14 +94883,14 @@ index 1afd138..0b42453 100644 seq_printf(seq, "%*s\n", 127 - len, ""); return 0; diff --git a/net/phonet/sysctl.c b/net/phonet/sysctl.c -index d6bbbbd..61561e4 100644 +index c02a8c4..3c5b600 100644 --- a/net/phonet/sysctl.c +++ b/net/phonet/sysctl.c -@@ -67,7 +67,7 @@ static int proc_local_port_range(ctl_table *table, int write, +@@ -67,7 +67,7 @@ static int proc_local_port_range(struct ctl_table *table, int write, { int ret; int range[2] = {local_port_range[0], local_port_range[1]}; -- ctl_table tmp = { +- struct ctl_table tmp = { + ctl_table_no_const tmp = { .data = &range, .maxlen = sizeof(range), @@ -97231,10 +95322,98 @@ index f226709..0e735a8 100644 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len); diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c -index 391a245..296b3d7 100644 +index 09ffcc9..3eff2c2 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c -@@ -981,7 +981,7 @@ static const struct inet6_protocol sctpv6_protocol = { +@@ -210,44 +210,23 @@ out: + in6_dev_put(idev); + } + +-/* Based on tcp_v6_xmit() in tcp_ipv6.c. */ + static int sctp_v6_xmit(struct sk_buff *skb, struct sctp_transport *transport) + { + struct sock *sk = skb->sk; + struct ipv6_pinfo *np = inet6_sk(sk); +- struct flowi6 fl6; +- +- memset(&fl6, 0, sizeof(fl6)); +- +- fl6.flowi6_proto = sk->sk_protocol; +- +- /* Fill in the dest address from the route entry passed with the skb +- * and the source address from the transport. +- */ +- fl6.daddr = transport->ipaddr.v6.sin6_addr; +- fl6.saddr = transport->saddr.v6.sin6_addr; +- +- fl6.flowlabel = np->flow_label; +- IP6_ECN_flow_xmit(sk, fl6.flowlabel); +- if (ipv6_addr_type(&fl6.saddr) & IPV6_ADDR_LINKLOCAL) +- fl6.flowi6_oif = transport->saddr.v6.sin6_scope_id; +- else +- fl6.flowi6_oif = sk->sk_bound_dev_if; +- +- if (np->opt && np->opt->srcrt) { +- struct rt0_hdr *rt0 = (struct rt0_hdr *) np->opt->srcrt; +- fl6.daddr = *rt0->addr; +- } ++ struct flowi6 *fl6 = &transport->fl.u.ip6; + + pr_debug("%s: skb:%p, len:%d, src:%pI6 dst:%pI6\n", __func__, skb, +- skb->len, &fl6.saddr, &fl6.daddr); ++ skb->len, &fl6->saddr, &fl6->daddr); + +- SCTP_INC_STATS(sock_net(sk), SCTP_MIB_OUTSCTPPACKS); ++ IP6_ECN_flow_xmit(sk, fl6->flowlabel); + + if (!(transport->param_flags & SPP_PMTUD_ENABLE)) + skb->local_df = 1; + +- return ip6_xmit(sk, skb, &fl6, np->opt, np->tclass); ++ SCTP_INC_STATS(sock_net(sk), SCTP_MIB_OUTSCTPPACKS); ++ ++ return ip6_xmit(sk, skb, fl6, np->opt, np->tclass); + } + + /* Returns the dst cache entry for the given source and destination ip +@@ -260,10 +239,12 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr, + struct dst_entry *dst = NULL; + struct flowi6 *fl6 = &fl->u.ip6; + struct sctp_bind_addr *bp; ++ struct ipv6_pinfo *np = inet6_sk(sk); + struct sctp_sockaddr_entry *laddr; + union sctp_addr *baddr = NULL; + union sctp_addr *daddr = &t->ipaddr; + union sctp_addr dst_saddr; ++ struct in6_addr *final_p, final; + __u8 matchlen = 0; + __u8 bmatchlen; + sctp_scope_t scope; +@@ -287,7 +268,8 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr, + pr_debug("src=%pI6 - ", &fl6->saddr); + } + +- dst = ip6_dst_lookup_flow(sk, fl6, NULL, false); ++ final_p = fl6_update_dst(fl6, np->opt, &final); ++ dst = ip6_dst_lookup_flow(sk, fl6, final_p, false); + if (!asoc || saddr) + goto out; + +@@ -339,10 +321,12 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr, + } + } + rcu_read_unlock(); ++ + if (baddr) { + fl6->saddr = baddr->v6.sin6_addr; + fl6->fl6_sport = baddr->v6.sin6_port; +- dst = ip6_dst_lookup_flow(sk, fl6, NULL, false); ++ final_p = fl6_update_dst(fl6, np->opt, &final); ++ dst = ip6_dst_lookup_flow(sk, fl6, final_p, false); + } + + out: +@@ -984,7 +968,7 @@ static const struct inet6_protocol sctpv6_protocol = { .flags = INET6_PROTO_NOPOLICY | INET6_PROTO_FINAL, }; @@ -97243,7 +95422,7 @@ index 391a245..296b3d7 100644 .sa_family = AF_INET6, .sctp_xmit = sctp_v6_xmit, .setsockopt = ipv6_setsockopt, -@@ -1013,7 +1013,7 @@ static struct sctp_af sctp_af_inet6 = { +@@ -1016,7 +1000,7 @@ static struct sctp_af sctp_af_inet6 = { #endif }; @@ -97252,7 +95431,7 @@ index 391a245..296b3d7 100644 .event_msgname = sctp_inet6_event_msgname, .skb_msgname = sctp_inet6_skb_msgname, .af_supported = sctp_inet6_af_supported, -@@ -1038,7 +1038,7 @@ void sctp_v6_pf_init(void) +@@ -1041,7 +1025,7 @@ void sctp_v6_pf_init(void) void sctp_v6_pf_exit(void) { @@ -97262,10 +95441,10 @@ index 391a245..296b3d7 100644 /* Initialize IPv6 support and register with socket layer. */ diff --git a/net/sctp/proc.c b/net/sctp/proc.c -index 4e45ee3..e66a031 100644 +index 62526c4..36a13c5 100644 --- a/net/sctp/proc.c +++ b/net/sctp/proc.c -@@ -337,7 +337,8 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v) +@@ -343,7 +343,8 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v) seq_printf(seq, "%8pK %8pK %-3d %-3d %-2d %-4d " "%4d %8d %8d %7d %5lu %-5d %5d ", @@ -97276,10 +95455,10 @@ index 4e45ee3..e66a031 100644 assoc->assoc_id, assoc->sndbuf_used, diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c -index eaee00c..97c0afd 100644 +index 4a17494d..f7e3fa0 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c -@@ -834,8 +834,10 @@ int sctp_register_af(struct sctp_af *af) +@@ -838,8 +838,10 @@ int sctp_register_af(struct sctp_af *af) return 0; } @@ -97291,7 +95470,7 @@ index eaee00c..97c0afd 100644 return 1; } -@@ -966,7 +968,7 @@ static inline int sctp_v4_xmit(struct sk_buff *skb, +@@ -969,7 +971,7 @@ static inline int sctp_v4_xmit(struct sk_buff *skb, static struct sctp_af sctp_af_inet; @@ -97300,7 +95479,7 @@ index eaee00c..97c0afd 100644 .event_msgname = sctp_inet_event_msgname, .skb_msgname = sctp_inet_skb_msgname, .af_supported = sctp_inet_af_supported, -@@ -1037,7 +1039,7 @@ static const struct net_protocol sctp_protocol = { +@@ -1040,7 +1042,7 @@ static const struct net_protocol sctp_protocol = { }; /* IPv4 address related functions. */ @@ -97309,7 +95488,7 @@ index eaee00c..97c0afd 100644 .sa_family = AF_INET, .sctp_xmit = sctp_v4_xmit, .setsockopt = ip_setsockopt, -@@ -1122,7 +1124,7 @@ static void sctp_v4_pf_init(void) +@@ -1125,7 +1127,7 @@ static void sctp_v4_pf_init(void) static void sctp_v4_pf_exit(void) { @@ -97319,10 +95498,10 @@ index eaee00c..97c0afd 100644 static int sctp_v4_protosw_init(void) diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c -index 8aab894..f6b7e7d 100644 +index 9da6885..7571898 100644 --- a/net/sctp/sm_sideeffect.c +++ b/net/sctp/sm_sideeffect.c -@@ -447,7 +447,7 @@ static void sctp_generate_sack_event(unsigned long data) +@@ -446,7 +446,7 @@ static void sctp_generate_sack_event(unsigned long data) sctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_SACK); } @@ -97332,10 +95511,10 @@ index 8aab894..f6b7e7d 100644 sctp_generate_t1_cookie_event, sctp_generate_t1_init_event, diff --git a/net/sctp/socket.c b/net/sctp/socket.c -index 6abb1ca..1678f8b 100644 +index c6670d2..6313e65 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c -@@ -2167,11 +2167,13 @@ static int sctp_setsockopt_events(struct sock *sk, char __user *optval, +@@ -2156,11 +2156,13 @@ static int sctp_setsockopt_events(struct sock *sk, char __user *optval, { struct sctp_association *asoc; struct sctp_ulpevent *event; @@ -97350,7 +95529,7 @@ index 6abb1ca..1678f8b 100644 /* * At the time when a user app subscribes to SCTP_SENDER_DRY_EVENT, -@@ -4222,13 +4224,16 @@ static int sctp_getsockopt_disable_fragments(struct sock *sk, int len, +@@ -4216,13 +4218,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) { @@ -97368,7 +95547,7 @@ index 6abb1ca..1678f8b 100644 return -EFAULT; return 0; } -@@ -4246,6 +4251,8 @@ static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval, +@@ -4240,6 +4245,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) { @@ -97377,7 +95556,7 @@ index 6abb1ca..1678f8b 100644 /* Applicable to UDP-style socket only */ if (sctp_style(sk, TCP)) return -EOPNOTSUPP; -@@ -4254,7 +4261,8 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv +@@ -4248,7 +4255,8 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv len = sizeof(int); if (put_user(len, optlen)) return -EFAULT; @@ -97387,7 +95566,7 @@ index 6abb1ca..1678f8b 100644 return -EFAULT; return 0; } -@@ -4626,12 +4634,15 @@ static int sctp_getsockopt_delayed_ack(struct sock *sk, int len, +@@ -4620,12 +4628,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) { @@ -97404,7 +95583,7 @@ index 6abb1ca..1678f8b 100644 return -EFAULT; return 0; } -@@ -4672,6 +4683,8 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len, +@@ -4666,6 +4677,8 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len, addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len; if (space_left < addrlen) return -ENOMEM; @@ -97413,20 +95592,29 @@ index 6abb1ca..1678f8b 100644 if (copy_to_user(to, &temp, addrlen)) return -EFAULT; to += addrlen; +@@ -6182,7 +6195,7 @@ unsigned int sctp_poll(struct file *file, struct socket *sock, poll_table *wait) + /* Is there any exceptional events? */ + if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) + mask |= POLLERR | +- sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0; ++ (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0); + if (sk->sk_shutdown & RCV_SHUTDOWN) + mask |= POLLRDHUP | POLLIN | POLLRDNORM; + if (sk->sk_shutdown == SHUTDOWN_MASK) diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c -index bf3c6e8..376d8d0 100644 +index 9a5c4c9..46e4b29 100644 --- a/net/sctp/sysctl.c +++ b/net/sctp/sysctl.c -@@ -307,7 +307,7 @@ static int proc_sctp_do_hmac_alg(ctl_table *ctl, +@@ -307,7 +307,7 @@ static int proc_sctp_do_hmac_alg(struct ctl_table *ctl, { struct net *net = current->nsproxy->net_ns; char tmp[8]; -- ctl_table tbl; +- struct ctl_table tbl; + ctl_table_no_const tbl; int ret; int changed = 0; char *none = "none"; -@@ -350,7 +350,7 @@ static int proc_sctp_do_hmac_alg(ctl_table *ctl, +@@ -350,7 +350,7 @@ static int proc_sctp_do_hmac_alg(struct ctl_table *ctl, int sctp_sysctl_net_register(struct net *net) { @@ -97435,27 +95623,8 @@ index bf3c6e8..376d8d0 100644 int i; table = kmemdup(sctp_net_table, sizeof(sctp_net_table), GFP_KERNEL); -diff --git a/net/sctp/transport.c b/net/sctp/transport.c -index 098f1d5f..60da2f7 100644 ---- a/net/sctp/transport.c -+++ b/net/sctp/transport.c -@@ -178,12 +178,12 @@ static void sctp_transport_destroy(struct sctp_transport *transport) - { - SCTP_ASSERT(transport->dead, "Transport is not dead", return); - -- call_rcu(&transport->rcu, sctp_transport_destroy_rcu); -- - sctp_packet_free(&transport->packet); - - if (transport->asoc) - sctp_association_put(transport->asoc); -+ -+ call_rcu(&transport->rcu, sctp_transport_destroy_rcu); - } - - /* Start T3_rtx timer if it is not already running and update the heartbeat diff --git a/net/socket.c b/net/socket.c -index 4ca1526..df83e47 100644 +index b2d7c62..04f19ea 100644 --- a/net/socket.c +++ b/net/socket.c @@ -88,6 +88,7 @@ @@ -97466,16 +95635,16 @@ index 4ca1526..df83e47 100644 #include <asm/uaccess.h> #include <asm/unistd.h> -@@ -105,6 +106,8 @@ - #include <linux/sockios.h> - #include <linux/atalk.h> +@@ -111,6 +112,8 @@ unsigned int sysctl_net_busy_read __read_mostly; + unsigned int sysctl_net_busy_poll __read_mostly; + #endif +#include <linux/grsock.h> + 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); -@@ -321,7 +324,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type, +@@ -327,7 +330,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type, &sockfs_dentry_operations, SOCKFS_MAGIC); } @@ -97484,7 +95653,7 @@ index 4ca1526..df83e47 100644 static struct file_system_type sock_fs_type = { .name = "sockfs", -@@ -1246,6 +1249,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; @@ -97493,7 +95662,7 @@ index 4ca1526..df83e47 100644 /* Compatibility. -@@ -1377,6 +1382,16 @@ SYSCALL_DEFINE3(socket, int, family, int, type, int, protocol) +@@ -1394,6 +1399,16 @@ SYSCALL_DEFINE3(socket, int, family, int, type, int, protocol) if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK)) flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK; @@ -97510,7 +95679,7 @@ index 4ca1526..df83e47 100644 retval = sock_create(family, type, protocol, &sock); if (retval < 0) goto out; -@@ -1504,6 +1519,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen) +@@ -1521,6 +1536,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) { @@ -97525,7 +95694,7 @@ index 4ca1526..df83e47 100644 err = security_socket_bind(sock, (struct sockaddr *)&address, addrlen); -@@ -1512,6 +1535,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen) +@@ -1529,6 +1552,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen) (struct sockaddr *) &address, addrlen); } @@ -97533,7 +95702,7 @@ index 4ca1526..df83e47 100644 fput_light(sock->file, fput_needed); } return err; -@@ -1535,10 +1559,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog) +@@ -1552,10 +1576,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog) if ((unsigned int)backlog > somaxconn) backlog = somaxconn; @@ -97554,7 +95723,7 @@ index 4ca1526..df83e47 100644 fput_light(sock->file, fput_needed); } return err; -@@ -1582,6 +1616,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr, +@@ -1599,6 +1633,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr, newsock->type = sock->type; newsock->ops = sock->ops; @@ -97573,7 +95742,7 @@ index 4ca1526..df83e47 100644 /* * We don't need try_module_get here, as the listening socket (sock) * has the protocol module (sock->ops->owner) held. -@@ -1627,6 +1673,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr, +@@ -1644,6 +1690,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr, fd_install(newfd, newfile); err = newfd; @@ -97582,7 +95751,7 @@ index 4ca1526..df83e47 100644 out_put: fput_light(sock->file, fput_needed); out: -@@ -1659,6 +1707,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr, +@@ -1676,6 +1724,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr, int, addrlen) { struct socket *sock; @@ -97590,7 +95759,7 @@ index 4ca1526..df83e47 100644 struct sockaddr_storage address; int err, fput_needed; -@@ -1669,6 +1718,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr, +@@ -1686,6 +1735,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr, if (err < 0) goto out_put; @@ -97608,7 +95777,7 @@ index 4ca1526..df83e47 100644 err = security_socket_connect(sock, (struct sockaddr *)&address, addrlen); if (err) -@@ -1750,6 +1810,8 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr, +@@ -1767,6 +1827,8 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr, * the protocol. */ @@ -97617,7 +95786,7 @@ index 4ca1526..df83e47 100644 SYSCALL_DEFINE6(sendto, int, fd, void __user *, buff, size_t, len, unsigned int, flags, struct sockaddr __user *, addr, int, addr_len) -@@ -1816,7 +1878,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size, +@@ -1833,7 +1895,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size, struct socket *sock; struct iovec iov; struct msghdr msg; @@ -97626,7 +95795,7 @@ index 4ca1526..df83e47 100644 int err, err2; int fput_needed; -@@ -2023,7 +2085,7 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg, +@@ -2040,7 +2102,7 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg, * checking falls down on this. */ if (copy_from_user(ctl_buf, @@ -97635,7 +95804,7 @@ index 4ca1526..df83e47 100644 ctl_len)) goto out_freectl; msg_sys->msg_control = ctl_buf; -@@ -2174,7 +2236,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg, +@@ -2191,7 +2253,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg, int err, total_len, len; /* kernel mode address */ @@ -97644,7 +95813,7 @@ index 4ca1526..df83e47 100644 /* user mode address pointers */ struct sockaddr __user *uaddr; -@@ -2202,7 +2264,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg, +@@ -2219,7 +2281,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg, * kernel msghdr to use the kernel address space) */ @@ -97653,7 +95822,7 @@ index 4ca1526..df83e47 100644 uaddr_len = COMPAT_NAMELEN(msg); if (MSG_CMSG_COMPAT & flags) { err = verify_compat_iovec(msg_sys, iov, &addr, VERIFY_WRITE); -@@ -2955,7 +3017,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd, +@@ -2974,7 +3036,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd, old_fs = get_fs(); set_fs(KERNEL_DS); err = dev_ioctl(net, cmd, @@ -97662,7 +95831,7 @@ index 4ca1526..df83e47 100644 set_fs(old_fs); return err; -@@ -3064,7 +3126,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd, +@@ -3083,7 +3145,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd, old_fs = get_fs(); set_fs(KERNEL_DS); @@ -97671,7 +95840,7 @@ index 4ca1526..df83e47 100644 set_fs(old_fs); if (cmd == SIOCGIFMAP && !err) { -@@ -3169,7 +3231,7 @@ static int routing_ioctl(struct net *net, struct socket *sock, +@@ -3188,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); @@ -97680,7 +95849,7 @@ index 4ca1526..df83e47 100644 devname[15] = 0; } else r4.rt_dev = NULL; -@@ -3395,8 +3457,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname, +@@ -3414,8 +3476,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname, int __user *uoptlen; int err; @@ -97691,7 +95860,7 @@ index 4ca1526..df83e47 100644 set_fs(KERNEL_DS); if (level == SOL_SOCKET) -@@ -3416,7 +3478,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname, +@@ -3435,7 +3497,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname, char __user *uoptval; int err; @@ -97701,10 +95870,10 @@ index 4ca1526..df83e47 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 29b4ba9..f648ae7 100644 +index 09fb638..2e6a5c5 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c -@@ -1144,7 +1144,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd, +@@ -1140,7 +1140,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd, uint64_t *handle) { struct rsc rsci, *rscp = NULL; @@ -97713,7 +95882,7 @@ index 29b4ba9..f648ae7 100644 long long ctxh; struct gss_api_mech *gm = NULL; time_t expiry; -@@ -1155,7 +1155,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd, +@@ -1151,7 +1151,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd, status = -ENOMEM; /* the handle needs to be just a unique id, * use a static counter */ @@ -97723,10 +95892,10 @@ index 29b4ba9..f648ae7 100644 /* make a copy for the caller */ *handle = ctxh; diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c -index 426f8fc..1ef9c32 100644 +index ecbc4e3..ad25df8 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c -@@ -1288,7 +1288,9 @@ call_start(struct rpc_task *task) +@@ -1304,7 +1304,9 @@ call_start(struct rpc_task *task) (RPC_IS_ASYNC(task) ? "async" : "sync")); /* Increment call count */ @@ -97738,7 +95907,7 @@ index 426f8fc..1ef9c32 100644 task->tk_action = call_reserve; } diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c -index 5356b12..c0f4c29 100644 +index 93a7a4e..3b98b9f 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -261,9 +261,9 @@ static int rpc_wait_bit_killable(void *word) @@ -97754,18 +95923,9 @@ index 5356b12..c0f4c29 100644 #else static inline void rpc_task_set_debuginfo(struct rpc_task *task) diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c -index 89a588b..678ed90 100644 +index b974571..678ed90 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c -@@ -740,7 +740,7 @@ svc_set_num_threads(struct svc_serv *serv, struct svc_pool *pool, int nrservs) - - __module_get(serv->sv_module); - task = kthread_create_on_node(serv->sv_function, rqstp, -- node, serv->sv_name); -+ node, "%s", serv->sv_name); - if (IS_ERR(task)) { - error = PTR_ERR(task); - module_put(serv->sv_module); @@ -1160,7 +1160,9 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) svc_putnl(resv, RPC_SUCCESS); @@ -97778,7 +95938,7 @@ index 89a588b..678ed90 100644 /* Initialize storage for argp and resp */ memset(rqstp->rq_argp, 0, procp->pc_argsize); diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c -index 8343737..677025e 100644 +index c1b6270..05089c1 100644 --- a/net/sunrpc/xprtrdma/svc_rdma.c +++ b/net/sunrpc/xprtrdma/svc_rdma.c @@ -62,15 +62,15 @@ unsigned int svcrdma_max_req_size = RPCRDMA_MAX_REQ_SIZE; @@ -97806,7 +95966,7 @@ index 8343737..677025e 100644 /* Temporary NFS request map and context caches */ struct kmem_cache *svc_rdma_map_cachep; -@@ -110,7 +110,7 @@ static int read_reset_stat(ctl_table *table, int write, +@@ -110,7 +110,7 @@ static int read_reset_stat(struct ctl_table *table, int write, len -= *ppos; if (len > *lenp) len = *lenp; @@ -97815,7 +95975,7 @@ index 8343737..677025e 100644 return -EFAULT; *lenp = len; *ppos += len; -@@ -151,63 +151,63 @@ static ctl_table svcrdma_parm_table[] = { +@@ -151,63 +151,63 @@ static struct ctl_table svcrdma_parm_table[] = { { .procname = "rdma_stat_read", .data = &rdma_stat_read, @@ -97995,10 +96155,10 @@ index 9bc6db0..47ac8c0 100644 int mode = (table->mode >> 6) & 7; return (mode << 6) | (mode << 3) | mode; diff --git a/net/tipc/link.c b/net/tipc/link.c -index a80feee..2bbbe70 100644 +index 0cc3d90..cc42021 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c -@@ -1201,7 +1201,7 @@ static int link_send_sections_long(struct tipc_port *sender, +@@ -1165,7 +1165,7 @@ static int link_send_sections_long(struct tipc_port *sender, struct tipc_msg fragm_hdr; struct sk_buff *buf, *buf_chain, *prev; u32 fragm_crs, fragm_rest, hsz, sect_rest; @@ -98006,8 +96166,8 @@ index a80feee..2bbbe70 100644 + const unchar __user *sect_crs; int curr_sect; u32 fragm_no; - -@@ -1242,7 +1242,7 @@ again: + int res = 0; +@@ -1207,7 +1207,7 @@ again: if (!sect_rest) { sect_rest = msg_sect[++curr_sect].iov_len; @@ -98016,35 +96176,26 @@ index a80feee..2bbbe70 100644 } if (sect_rest < fragm_rest) -@@ -1261,7 +1261,7 @@ error: - } - } else - skb_copy_to_linear_data_offset(buf, fragm_crs, -- sect_crs, sz); -+ (const void __force_kernel *)sect_crs, sz); - sect_crs += sz; - sect_rest -= sz; - fragm_crs += sz; diff --git a/net/tipc/msg.c b/net/tipc/msg.c -index f2db8a8..9245aa4 100644 +index ced60e2..54eab6c 100644 --- a/net/tipc/msg.c +++ b/net/tipc/msg.c -@@ -98,7 +98,7 @@ int tipc_msg_build(struct tipc_msg *hdr, struct iovec const *msg_sect, - msg_sect[cnt].iov_len); - else - skb_copy_to_linear_data_offset(*buf, pos, -- msg_sect[cnt].iov_base, -+ (const void __force_kernel *)msg_sect[cnt].iov_base, - msg_sect[cnt].iov_len); +@@ -93,7 +93,7 @@ int tipc_msg_build(struct tipc_msg *hdr, struct iovec const *msg_sect, + skb_copy_to_linear_data(*buf, hdr, hsz); + for (res = 1, cnt = 0; res && (cnt < num_sect); cnt++) { + skb_copy_to_linear_data_offset(*buf, pos, +- msg_sect[cnt].iov_base, ++ (const void __force_kernel *)msg_sect[cnt].iov_base, + msg_sect[cnt].iov_len); pos += msg_sect[cnt].iov_len; } diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c -index 6b42d47..2ac24d5 100644 +index d38bb45..4fd6ac6 100644 --- a/net/tipc/subscr.c +++ b/net/tipc/subscr.c -@@ -96,7 +96,7 @@ static void subscr_send_event(struct tipc_subscription *sub, - { - struct iovec msg_sect; +@@ -98,7 +98,7 @@ static void subscr_send_event(struct tipc_subscription *sub, u32 found_lower, + struct kvec msg_sect; + int ret; - msg_sect.iov_base = (void *)&sub->evt; + msg_sect.iov_base = (void __force_user *)&sub->evt; @@ -98052,10 +96203,10 @@ index 6b42d47..2ac24d5 100644 sub->evt.event = htohl(event, sub->swap); diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c -index 826e099..4fa8c93 100644 +index c4ce243..2be7c59 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c -@@ -783,6 +783,12 @@ static struct sock *unix_find_other(struct net *net, +@@ -784,6 +784,12 @@ static struct sock *unix_find_other(struct net *net, err = -ECONNREFUSED; if (!S_ISSOCK(inode->i_mode)) goto put_fail; @@ -98068,7 +96219,7 @@ index 826e099..4fa8c93 100644 u = unix_find_socket_byinode(inode); if (!u) goto put_fail; -@@ -803,6 +809,13 @@ static struct sock *unix_find_other(struct net *net, +@@ -804,6 +810,13 @@ static struct sock *unix_find_other(struct net *net, if (u) { struct dentry *dentry; dentry = unix_sk(u)->path.dentry; @@ -98082,7 +96233,7 @@ index 826e099..4fa8c93 100644 if (dentry) touch_atime(&unix_sk(u)->path); } else -@@ -836,12 +849,18 @@ static int unix_mknod(const char *sun_path, umode_t mode, struct path *res) +@@ -837,12 +850,18 @@ static int unix_mknod(const char *sun_path, umode_t mode, struct path *res) */ err = security_path_mknod(&path, dentry, mode, 0); if (!err) { @@ -98101,7 +96252,7 @@ index 826e099..4fa8c93 100644 done_path_create(&path, dentry); return err; } -@@ -2324,9 +2343,13 @@ static int unix_seq_show(struct seq_file *seq, void *v) +@@ -2325,9 +2344,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 { @@ -98116,7 +96267,7 @@ index 826e099..4fa8c93 100644 seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5lu", s, -@@ -2353,8 +2376,10 @@ static int unix_seq_show(struct seq_file *seq, void *v) +@@ -2354,8 +2377,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]); @@ -98130,10 +96281,10 @@ index 826e099..4fa8c93 100644 } diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c -index 8800604..0526440 100644 +index b3d5150..ff3a837 100644 --- a/net/unix/sysctl_net_unix.c +++ b/net/unix/sysctl_net_unix.c -@@ -28,7 +28,7 @@ static ctl_table unix_table[] = { +@@ -28,7 +28,7 @@ static struct ctl_table unix_table[] = { int __net_init unix_sysctl_register(struct net *net) { @@ -98142,19 +96293,6 @@ index 8800604..0526440 100644 table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL); if (table == NULL) -diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c -index 3f77f42..662d89b 100644 ---- a/net/vmw_vsock/af_vsock.c -+++ b/net/vmw_vsock/af_vsock.c -@@ -335,7 +335,7 @@ void vsock_for_each_connected_socket(void (*fn)(struct sock *sk)) - for (i = 0; i < ARRAY_SIZE(vsock_connected_table); i++) { - struct vsock_sock *vsk; - list_for_each_entry(vsk, &vsock_connected_table[i], -- connected_table); -+ connected_table) - fn(sk_vsock(vsk)); - } - diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c index c8717c1..08539f5 100644 --- a/net/wireless/wext-core.c @@ -98193,10 +96331,10 @@ index c8717c1..08539f5 100644 iwp->length += essid_compat; diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c -index ea970b8..c68edb9f 100644 +index f77c371..84e752a 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c -@@ -334,7 +334,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy) +@@ -332,7 +332,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy) { policy->walk.dead = 1; @@ -98205,7 +96343,7 @@ index ea970b8..c68edb9f 100644 del_timer(&policy->polq.hold_timer); xfrm_queue_purge(&policy->polq.hold_queue); -@@ -659,7 +659,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl) +@@ -657,7 +657,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]++; @@ -98214,7 +96352,7 @@ index ea970b8..c68edb9f 100644 rt_genid_bump(net); if (delpol) { xfrm_policy_requeue(delpol, policy); -@@ -1629,7 +1629,7 @@ free_dst: +@@ -1627,7 +1627,7 @@ free_dst: goto out; } @@ -98223,7 +96361,7 @@ index ea970b8..c68edb9f 100644 xfrm_dst_alloc_copy(void **target, const void *src, int size) { if (!*target) { -@@ -1641,7 +1641,7 @@ xfrm_dst_alloc_copy(void **target, const void *src, int size) +@@ -1639,7 +1639,7 @@ xfrm_dst_alloc_copy(void **target, const void *src, int size) return 0; } @@ -98232,7 +96370,7 @@ index ea970b8..c68edb9f 100644 xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel) { #ifdef CONFIG_XFRM_SUB_POLICY -@@ -1653,7 +1653,7 @@ xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel) +@@ -1651,7 +1651,7 @@ xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel) #endif } @@ -98241,7 +96379,7 @@ index ea970b8..c68edb9f 100644 xfrm_dst_update_origin(struct dst_entry *dst, const struct flowi *fl) { #ifdef CONFIG_XFRM_SUB_POLICY -@@ -1747,7 +1747,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols, +@@ -1745,7 +1745,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); @@ -98250,7 +96388,7 @@ index ea970b8..c68edb9f 100644 return xdst; } -@@ -2618,7 +2618,7 @@ static int xfrm_bundle_ok(struct xfrm_dst *first) +@@ -2611,7 +2611,7 @@ static int xfrm_bundle_ok(struct xfrm_dst *first) if (xdst->xfrm_genid != dst->xfrm->genid) return 0; if (xdst->num_pols > 0 && @@ -98259,7 +96397,7 @@ index ea970b8..c68edb9f 100644 return 0; mtu = dst_mtu(dst->child); -@@ -2706,8 +2706,11 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo) +@@ -2699,8 +2699,11 @@ 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; @@ -98273,7 +96411,7 @@ index ea970b8..c68edb9f 100644 rcu_assign_pointer(xfrm_policy_afinfo[afinfo->family], afinfo); } spin_unlock(&xfrm_policy_afinfo_lock); -@@ -2761,7 +2764,9 @@ int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo) +@@ -2754,7 +2757,9 @@ int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo) dst_ops->check = NULL; dst_ops->negative_advice = NULL; dst_ops->link_failure = NULL; @@ -98284,7 +96422,7 @@ index ea970b8..c68edb9f 100644 } return err; } -@@ -3144,7 +3149,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol, +@@ -3137,7 +3142,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 */ @@ -98294,10 +96432,10 @@ index ea970b8..c68edb9f 100644 } diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c -index 78f66fa..b93d547 100644 +index 54c0acd..56814bd 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c -@@ -177,12 +177,14 @@ int xfrm_register_type(const struct xfrm_type *type, unsigned short family) +@@ -174,12 +174,14 @@ int xfrm_register_type(const struct xfrm_type *type, unsigned short family) if (unlikely(afinfo == NULL)) return -EAFNOSUPPORT; @@ -98315,7 +96453,7 @@ index 78f66fa..b93d547 100644 err = -EEXIST; spin_unlock_bh(&xfrm_type_lock); xfrm_state_put_afinfo(afinfo); -@@ -198,13 +200,16 @@ int xfrm_unregister_type(const struct xfrm_type *type, unsigned short family) +@@ -195,13 +197,16 @@ int xfrm_unregister_type(const struct xfrm_type *type, unsigned short family) if (unlikely(afinfo == NULL)) return -EAFNOSUPPORT; @@ -98334,7 +96472,7 @@ index 78f66fa..b93d547 100644 spin_unlock_bh(&xfrm_type_lock); xfrm_state_put_afinfo(afinfo); return err; -@@ -214,7 +219,6 @@ EXPORT_SYMBOL(xfrm_unregister_type); +@@ -211,7 +216,6 @@ EXPORT_SYMBOL(xfrm_unregister_type); static const struct xfrm_type *xfrm_get_type(u8 proto, unsigned short family) { struct xfrm_state_afinfo *afinfo; @@ -98342,7 +96480,7 @@ index 78f66fa..b93d547 100644 const struct xfrm_type *type; int modload_attempted = 0; -@@ -222,9 +226,8 @@ retry: +@@ -219,9 +223,8 @@ retry: afinfo = xfrm_state_get_afinfo(family); if (unlikely(afinfo == NULL)) return NULL; @@ -98353,7 +96491,7 @@ index 78f66fa..b93d547 100644 if (unlikely(type && !try_module_get(type->owner))) type = NULL; if (!type && !modload_attempted) { -@@ -258,7 +261,7 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family) +@@ -255,7 +258,7 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family) return -EAFNOSUPPORT; err = -EEXIST; @@ -98362,7 +96500,7 @@ index 78f66fa..b93d547 100644 spin_lock_bh(&xfrm_mode_lock); if (modemap[mode->encap]) goto out; -@@ -267,8 +270,10 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family) +@@ -264,8 +267,10 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family) if (!try_module_get(afinfo->owner)) goto out; @@ -98374,7 +96512,7 @@ index 78f66fa..b93d547 100644 err = 0; out: -@@ -292,10 +297,12 @@ int xfrm_unregister_mode(struct xfrm_mode *mode, int family) +@@ -289,10 +294,12 @@ int xfrm_unregister_mode(struct xfrm_mode *mode, int family) return -EAFNOSUPPORT; err = -ENOENT; @@ -98388,7 +96526,7 @@ index 78f66fa..b93d547 100644 module_put(mode->afinfo->owner); err = 0; } -@@ -1486,10 +1493,10 @@ EXPORT_SYMBOL(xfrm_find_acq_byseq); +@@ -1483,10 +1490,10 @@ EXPORT_SYMBOL(xfrm_find_acq_byseq); u32 xfrm_get_acqseq(void) { u32 res; @@ -98583,10 +96721,10 @@ index 0000000..5e0222d + [[ "$plugincc" =~ "$2" ]] && echo "$2" +fi diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh -index 643764f..6cc0137 100644 +index 5de5660..d3deb89 100644 --- a/scripts/headers_install.sh +++ b/scripts/headers_install.sh -@@ -29,6 +29,7 @@ do +@@ -32,6 +32,7 @@ do FILE="$(basename "$i")" sed -r \ -e 's/([ \t(])(__user|__force|__iomem)[ \t]/\1/g' \ @@ -98608,10 +96746,10 @@ index 0149949..d482a0d 100644 kallsymso="" kallsyms_vmlinux="" diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c -index 45f9a33..e4194b3 100644 +index 2370863..212fbca 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c -@@ -140,7 +140,7 @@ static void device_id_check(const char *modname, const char *device_id, +@@ -142,7 +142,7 @@ static void device_id_check(const char *modname, const char *device_id, unsigned long size, unsigned long id_size, void *symval) { @@ -98620,7 +96758,7 @@ index 45f9a33..e4194b3 100644 if (size % id_size || size < id_size) { fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo " -@@ -168,7 +168,7 @@ static void device_id_check(const char *modname, const char *device_id, +@@ -170,7 +170,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, @@ -98629,7 +96767,7 @@ index 45f9a33..e4194b3 100644 unsigned char range_lo, unsigned char range_hi, unsigned char max, struct module *mod) { -@@ -278,7 +278,7 @@ static void do_usb_entry_multi(void *symval, struct module *mod) +@@ -280,7 +280,7 @@ static void do_usb_entry_multi(void *symval, struct module *mod) { unsigned int devlo, devhi; unsigned char chi, clo, max; @@ -98638,7 +96776,7 @@ index 45f9a33..e4194b3 100644 DEF_FIELD(symval, usb_device_id, match_flags); DEF_FIELD(symval, usb_device_id, idVendor); -@@ -531,7 +531,7 @@ static void do_pnp_device_entry(void *symval, unsigned long size, +@@ -533,7 +533,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)]; @@ -98647,7 +96785,7 @@ index 45f9a33..e4194b3 100644 buf_printf(&mod->dev_table_buf, "MODULE_ALIAS(\"pnp:d%s*\");\n", *id); -@@ -560,7 +560,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size, +@@ -562,7 +562,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; @@ -98656,7 +96794,7 @@ index 45f9a33..e4194b3 100644 int dup = 0; if (!id[0]) -@@ -586,7 +586,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size, +@@ -588,7 +588,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]; @@ -98665,7 +96803,7 @@ index 45f9a33..e4194b3 100644 buf_printf(&mod->dev_table_buf, "MODULE_ALIAS(\"pnp:d%s*\");\n", id); -@@ -938,7 +938,7 @@ static void dmi_ascii_filter(char *d, const char *s) +@@ -940,7 +940,7 @@ static void dmi_ascii_filter(char *d, const char *s) static int do_dmi_entry(const char *filename, void *symval, char *alias) { @@ -98675,10 +96813,10 @@ index 45f9a33..e4194b3 100644 sprintf(alias, "dmi*"); diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index a4be8e1..6e8a5fb 100644 +index 6216434..050cf89 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c -@@ -933,6 +933,7 @@ enum mismatch { +@@ -930,6 +930,7 @@ enum mismatch { ANY_INIT_TO_ANY_EXIT, ANY_EXIT_TO_ANY_INIT, EXPORT_TO_INIT_EXIT, @@ -98686,7 +96824,7 @@ index a4be8e1..6e8a5fb 100644 }; struct sectioncheck { -@@ -1047,6 +1048,12 @@ const struct sectioncheck sectioncheck[] = { +@@ -1016,6 +1017,12 @@ const struct sectioncheck sectioncheck[] = { .tosec = { INIT_SECTIONS, EXIT_SECTIONS, NULL }, .mismatch = EXPORT_TO_INIT_EXIT, .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL }, @@ -98699,7 +96837,7 @@ index a4be8e1..6e8a5fb 100644 } }; -@@ -1169,10 +1176,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr, +@@ -1136,10 +1143,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; @@ -98712,7 +96850,7 @@ index a4be8e1..6e8a5fb 100644 if (d < 0) d = addr - sym->st_value; if (d < distance) { -@@ -1451,6 +1458,14 @@ static void report_sec_mismatch(const char *modname, +@@ -1417,6 +1424,14 @@ static void report_sec_mismatch(const char *modname, tosym, prl_to, prl_to, tosym); free(prl_to); break; @@ -98727,7 +96865,7 @@ index a4be8e1..6e8a5fb 100644 } fprintf(stderr, "\n"); } -@@ -1685,7 +1700,7 @@ static void section_rel(const char *modname, struct elf_info *elf, +@@ -1651,7 +1666,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) { @@ -98736,7 +96874,7 @@ index a4be8e1..6e8a5fb 100644 Elf_Shdr *sechdrs = elf->sechdrs; /* Walk through all sections */ -@@ -1804,7 +1819,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf, +@@ -1770,7 +1785,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf, va_end(ap); } @@ -98745,7 +96883,7 @@ index a4be8e1..6e8a5fb 100644 { if (buf->size - buf->pos < len) { buf->size += len + SZ; -@@ -2023,7 +2038,7 @@ static void write_if_changed(struct buffer *b, const char *fname) +@@ -1989,7 +2004,7 @@ static void write_if_changed(struct buffer *b, const char *fname) if (fstat(fileno(file), &st) < 0) goto close_write; @@ -100089,10 +98227,10 @@ index 16c15ec..42b7c9f 100644 { } }; diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c -index b21830e..a7d1a17 100644 +index 2e2a0dd..a0cbc44 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c -@@ -614,7 +614,7 @@ static int apparmor_task_setrlimit(struct task_struct *task, +@@ -613,7 +613,7 @@ static int apparmor_task_setrlimit(struct task_struct *task, return error; } @@ -100149,10 +98287,10 @@ index c44b6fe..932df30 100644 if (bprm->cap_effective) return 1; diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h -index a41c9c1..83da6dd 100644 +index b3dd616..4bb17f3 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h -@@ -97,8 +97,8 @@ int ima_init_crypto(void); +@@ -83,8 +83,8 @@ int ima_init_crypto(void); extern spinlock_t ima_queue_lock; struct ima_h_table { @@ -100376,43 +98514,29 @@ index f728728..6457a0c 100644 /* diff --git a/security/security.c b/security/security.c -index a3dce87..04178a1 100644 +index 94b35ae..f4e7751 100644 --- a/security/security.c +++ b/security/security.c -@@ -20,6 +20,7 @@ - #include <linux/ima.h> - #include <linux/evm.h> - #include <linux/fsnotify.h> -+#include <linux/mm.h> - #include <linux/mman.h> - #include <linux/mount.h> - #include <linux/personality.h> -@@ -32,8 +33,8 @@ +@@ -33,8 +33,8 @@ static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] = CONFIG_DEFAULT_SECURITY; -static struct security_operations *security_ops; -static struct security_operations default_security_ops = { -+static struct security_operations *security_ops __read_only; -+static struct security_operations default_security_ops __read_only = { ++struct security_operations *security_ops __read_only; ++struct security_operations default_security_ops __read_only = { .name = "default", }; -@@ -72,11 +73,17 @@ int __init security_init(void) +@@ -73,11 +73,6 @@ int __init security_init(void) return 0; } -+#ifdef CONFIG_SECURITY_SELINUX_DISABLE -+ - void reset_security_ops(void) - { -+ pax_open_kernel(); - security_ops = &default_security_ops; -+ pax_close_kernel(); - } - -+#endif -+ +-void reset_security_ops(void) +-{ +- security_ops = &default_security_ops; +-} +- /* Save user chosen LSM */ static int __init choose_lsm(char *str) { @@ -100448,10 +98572,10 @@ index dad36a6..7e5ffbf 100644 lock = &avc_cache.slots_lock[hvalue]; diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c -index 5c6f2cd..b4f945c 100644 +index c956390..1899f06 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c -@@ -96,8 +96,6 @@ +@@ -97,8 +97,6 @@ #define NUM_SEL_MNT_OPTS 5 @@ -100460,7 +98584,7 @@ index 5c6f2cd..b4f945c 100644 /* SECMARK reference count */ static atomic_t selinux_secmark_refcount = ATOMIC_INIT(0); -@@ -5529,7 +5527,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer) +@@ -5609,7 +5607,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer) #endif @@ -100469,6 +98593,27 @@ index 5c6f2cd..b4f945c 100644 .name = "selinux", .ptrace_access_check = selinux_ptrace_access_check, +@@ -5961,6 +5959,9 @@ static void selinux_nf_ip_exit(void) + #ifdef CONFIG_SECURITY_SELINUX_DISABLE + static int selinux_disabled; + ++extern struct security_operations *security_ops; ++extern struct security_operations default_security_ops; ++ + int selinux_disable(void) + { + if (ss_initialized) { +@@ -5978,7 +5979,9 @@ int selinux_disable(void) + selinux_disabled = 1; + selinux_enabled = 0; + +- reset_security_ops(); ++ pax_open_kernel(); ++ security_ops = &default_security_ops; ++ pax_close_kernel(); + + /* Try to destroy the avc node cache */ + avc_disable(); diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h index 65f67cb..3f141ef 100644 --- a/security/selinux/include/xfrm.h @@ -100483,10 +98628,10 @@ index 65f67cb..3f141ef 100644 } #else diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c -index d52c780..6431349 100644 +index eefbd10..9f10ddb 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c -@@ -3392,7 +3392,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen) +@@ -3711,7 +3711,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen) return 0; } @@ -100718,10 +98863,10 @@ index af49721..e85058e 100644 if (err < 0) return err; diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c -index f928181..33fb83d 100644 +index a68d4c6..72af3cf 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c -@@ -2819,11 +2819,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream, +@@ -2809,11 +2809,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, @@ -100905,10 +99050,10 @@ index ea995af..f1bfa37 100644 } EXPORT_SYMBOL(amdtp_out_stream_update); diff --git a/sound/firewire/amdtp.h b/sound/firewire/amdtp.h -index b680c5e..061b7a0 100644 +index f6103d6..4843fbf 100644 --- a/sound/firewire/amdtp.h +++ b/sound/firewire/amdtp.h -@@ -139,7 +139,7 @@ static inline bool amdtp_out_streaming_error(struct amdtp_out_stream *s) +@@ -138,7 +138,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) { @@ -100918,7 +99063,7 @@ index b680c5e..061b7a0 100644 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 d428ffe..751ef78 100644 +index 58a5afe..af5bd64 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) @@ -100962,7 +99107,7 @@ index d428ffe..751ef78 100644 default: return -EINVAL; diff --git a/sound/firewire/scs1x.c b/sound/firewire/scs1x.c -index 844a555..985ab83 100644 +index 505fc81..62e569e 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) @@ -100983,7 +99128,7 @@ index 844a555..985ab83 100644 } static void scs_input_escaped_byte(struct snd_rawmidi_substream *stream, -@@ -457,8 +457,8 @@ static int scs_remove(struct device *dev) +@@ -469,8 +469,8 @@ static void scs_remove(struct fw_unit *unit) snd_card_disconnect(scs->card); @@ -101046,10 +99191,10 @@ index 7d8803a..559f8d0 100644 list_add(&s->list, &cs4297a_devs); diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c -index 55108b5..d973e11 100644 +index 8a005f0..4fe3059 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c -@@ -916,14 +916,10 @@ find_codec_preset(struct hda_codec *codec) +@@ -918,14 +918,10 @@ find_codec_preset(struct hda_codec *codec) mutex_unlock(&preset_mutex); if (mod_requested < HDA_MODREQ_MAX_COUNT) { @@ -101080,7 +99225,7 @@ 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 22056c5..25d3244 100644 +index d591c15..8cb8f94 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) @@ -101124,10 +99269,10 @@ index 22056c5..25d3244 100644 chip->pci = pci; chip->irq = -1; diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c -index 0f0bed6..c161e28 100644 +index 2f2d837..3e3f1f6 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c -@@ -657,7 +657,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) +@@ -656,7 +656,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) { struct fsl_ssi_private *ssi_private; int ret = 0; @@ -101136,19 +99281,6 @@ index 0f0bed6..c161e28 100644 struct device_node *np = pdev->dev.of_node; const char *p, *sprop; const uint32_t *iprop; -diff --git a/sound/sound_core.c b/sound/sound_core.c -index 359753f..45759f4 100644 ---- a/sound/sound_core.c -+++ b/sound/sound_core.c -@@ -292,7 +292,7 @@ retry: - } - - device_create(sound_class, dev, MKDEV(SOUND_MAJOR, s->unit_minor), -- NULL, s->name+6); -+ NULL, "%s", s->name+6); - return s->unit_minor; - - fail: diff --git a/tools/gcc/.gitignore b/tools/gcc/.gitignore new file mode 100644 index 0000000..50f2f2f @@ -102386,7 +100518,7 @@ index 0000000..568b360 +} diff --git a/tools/gcc/kernexec_plugin.c b/tools/gcc/kernexec_plugin.c new file mode 100644 -index 0000000..257529f +index 0000000..698da67 --- /dev/null +++ b/tools/gcc/kernexec_plugin.c @@ -0,0 +1,471 @@ @@ -102657,9 +100789,9 @@ index 0000000..257529f + new_fptr = make_ssa_name(new_fptr, NULL); + + // build asm volatile("orq %%r10, %0\n\t" : "=r"(new_fptr) : "0"(old_fptr)); -+ input = build_tree_list(NULL_TREE, build_string(2, "0")); ++ input = build_tree_list(NULL_TREE, build_string(1, "0")); + input = chainon(NULL_TREE, build_tree_list(input, old_fptr)); -+ output = build_tree_list(NULL_TREE, build_string(3, "=r")); ++ output = build_tree_list(NULL_TREE, build_string(2, "=r")); + output = chainon(NULL_TREE, build_tree_list(output, new_fptr)); +#if BUILDING_GCC_VERSION <= 4007 + VEC_safe_push(tree, gc, inputs, input); @@ -103190,17 +101322,17 @@ index 0000000..2ef6fd9 +} diff --git a/tools/gcc/size_overflow_hash.data b/tools/gcc/size_overflow_hash.data new file mode 100644 -index 0000000..9a7096d +index 0000000..b04803b --- /dev/null +++ b/tools/gcc/size_overflow_hash.data -@@ -0,0 +1,6400 @@ +@@ -0,0 +1,6350 @@ +intel_fake_agp_alloc_by_type_1 intel_fake_agp_alloc_by_type 1 1 NULL +batadv_orig_node_del_if_4 batadv_orig_node_del_if 2 4 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 -+padzero_55 padzero 1 55 NULL nohasharray -+sel_read_policyvers_55 sel_read_policyvers 3 55 &padzero_55 ++sel_read_policyvers_55 sel_read_policyvers 3 55 NULL nohasharray ++padzero_55 padzero 1 55 &sel_read_policyvers_55 +cfg80211_disconnected_57 cfg80211_disconnected 4 57 NULL +__skb_to_sgvec_72 __skb_to_sgvec 0 72 NULL +crypto_authenc_setkey_80 crypto_authenc_setkey 3 80 NULL @@ -103304,7 +101436,6 @@ index 0000000..9a7096d +qla4xxx_change_queue_depth_1268 qla4xxx_change_queue_depth 2 1268 NULL +ioctl_private_iw_point_1273 ioctl_private_iw_point 7 1273 NULL +batadv_tt_prepare_packet_buff_1280 batadv_tt_prepare_packet_buff 4 1280 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 +wm_adsp_buf_alloc_1317 wm_adsp_buf_alloc 2 1317 NULL +compat_put_u64_1319 compat_put_u64 1 1319 NULL @@ -103532,7 +101663,6 @@ index 0000000..9a7096d +kvm_handle_bad_page_3503 kvm_handle_bad_page 2 3503 NULL +mem_tx_free_mem_blks_read_3521 mem_tx_free_mem_blks_read 3 3521 NULL nohasharray +ieee80211_wx_set_gen_ie_rsl_3521 ieee80211_wx_set_gen_ie_rsl 3 3521 &mem_tx_free_mem_blks_read_3521 -+SyS_semtimedop_3532 SyS_semtimedop 3 3532 NULL +SyS_readv_3539 SyS_readv 3 3539 NULL +btrfs_dir_name_len_3549 btrfs_dir_name_len 0 3549 NULL +b43legacy_read16_3561 b43legacy_read16 0 3561 NULL @@ -103548,9 +101678,9 @@ index 0000000..9a7096d +cm_copy_private_data_3649 cm_copy_private_data 2 3649 &x86_swiotlb_alloc_coherent_3649 +ath6kl_disconnect_timeout_read_3650 ath6kl_disconnect_timeout_read 3 3650 NULL +i915_compat_ioctl_3656 i915_compat_ioctl 2 3656 NULL -+btmrvl_psmode_write_3703 btmrvl_psmode_write 3 3703 NULL nohasharray -+create_irq_3703 create_irq 0 3703 &btmrvl_psmode_write_3703 nohasharray -+snd_m3_assp_read_3703 snd_m3_assp_read 0 3703 &create_irq_3703 ++snd_m3_assp_read_3703 snd_m3_assp_read 0 3703 NULL nohasharray ++create_irq_3703 create_irq 0 3703 &snd_m3_assp_read_3703 nohasharray ++btmrvl_psmode_write_3703 btmrvl_psmode_write 3 3703 &create_irq_3703 +videobuf_pages_to_sg_3708 videobuf_pages_to_sg 2 3708 NULL +ci_ll_write_3740 ci_ll_write 4 3740 NULL nohasharray +ath6kl_mgmt_tx_3740 ath6kl_mgmt_tx 7 3740 &ci_ll_write_3740 @@ -103569,7 +101699,6 @@ index 0000000..9a7096d +pipeline_pre_proc_swi_read_3898 pipeline_pre_proc_swi_read 3 3898 NULL +comedi_buf_read_n_available_3899 comedi_buf_read_n_available 0 3899 NULL +vcs_write_3910 vcs_write 3 3910 NULL -+SyS_move_pages_3920 SyS_move_pages 2 3920 NULL +brcmf_debugfs_fws_stats_read_3947 brcmf_debugfs_fws_stats_read 3 3947 NULL +atalk_compat_ioctl_3991 atalk_compat_ioctl 3 3991 NULL +do_add_counters_3992 do_add_counters 3 3992 NULL @@ -103770,7 +101899,6 @@ index 0000000..9a7096d +vdma_mem_alloc_6171 vdma_mem_alloc 1 6171 NULL +wl1251_cmd_template_set_6172 wl1251_cmd_template_set 4 6172 NULL +paging64_walk_addr_generic_6180 paging64_walk_addr_generic 4 6180 NULL -+SyS_setgroups_6182 SyS_setgroups 1 6182 NULL +qp_host_get_user_memory_6189 qp_host_get_user_memory 1-2 6189 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 @@ -103839,9 +101967,9 @@ index 0000000..9a7096d +ieee80211_if_fmt_path_refresh_time_6888 ieee80211_if_fmt_path_refresh_time 3 6888 NULL nohasharray +raw_seticmpfilter_6888 raw_seticmpfilter 3 6888 &ieee80211_if_fmt_path_refresh_time_6888 +dlmfs_file_write_6892 dlmfs_file_write 3 6892 NULL -+proc_sessionid_read_6911 proc_sessionid_read 3 6911 NULL nohasharray -+acm_alloc_minor_6911 acm_alloc_minor 0 6911 &proc_sessionid_read_6911 nohasharray -+spi_show_regs_6911 spi_show_regs 3 6911 &acm_alloc_minor_6911 ++spi_show_regs_6911 spi_show_regs 3 6911 NULL nohasharray ++proc_sessionid_read_6911 proc_sessionid_read 3 6911 &spi_show_regs_6911 nohasharray ++acm_alloc_minor_6911 acm_alloc_minor 0 6911 &proc_sessionid_read_6911 +__kfifo_dma_in_finish_r_6913 __kfifo_dma_in_finish_r 2-3 6913 NULL +do_msgrcv_6921 do_msgrcv 3 6921 NULL +cache_do_downcall_6926 cache_do_downcall 3 6926 NULL @@ -103944,8 +102072,8 @@ index 0000000..9a7096d +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 -+kvm_mmu_page_set_gfn_8225 kvm_mmu_page_set_gfn 2 8225 NULL nohasharray -+create_log_8225 create_log 2 8225 &kvm_mmu_page_set_gfn_8225 ++create_log_8225 create_log 2 8225 NULL nohasharray ++kvm_mmu_page_set_gfn_8225 kvm_mmu_page_set_gfn 2 8225 &create_log_8225 +sctp_ssnmap_size_8228 sctp_ssnmap_size 0-1-2 8228 NULL +ceph_sync_write_8233 ceph_sync_write 4 8233 NULL +bnx2x_iov_get_max_queue_count_8235 bnx2x_iov_get_max_queue_count 0 8235 NULL @@ -104011,7 +102139,6 @@ index 0000000..9a7096d +__bitmap_weight_8796 __bitmap_weight 0-2 8796 NULL +cpuset_common_file_read_8800 cpuset_common_file_read 5 8800 NULL +metronomefb_write_8823 metronomefb_write 3 8823 NULL -+SyS_llistxattr_8824 SyS_llistxattr 3 8824 NULL +icmpv6_manip_pkt_8833 icmpv6_manip_pkt 4 8833 NULL nohasharray +get_queue_depth_8833 get_queue_depth 0 8833 &icmpv6_manip_pkt_8833 +dvb_ringbuffer_pkt_next_8834 dvb_ringbuffer_pkt_next 0-2 8834 NULL @@ -104030,8 +102157,8 @@ index 0000000..9a7096d +usb_allocate_stream_buffers_8964 usb_allocate_stream_buffers 3 8964 NULL +qib_qsfp_dump_8966 qib_qsfp_dump 0-3 8966 NULL +venus_mkdir_8967 venus_mkdir 4 8967 NULL -+seq_open_net_8968 seq_open_net 4 8968 NULL nohasharray -+vol_cdev_read_8968 vol_cdev_read 3 8968 &seq_open_net_8968 ++vol_cdev_read_8968 vol_cdev_read 3 8968 NULL nohasharray ++seq_open_net_8968 seq_open_net 4 8968 &vol_cdev_read_8968 +bio_integrity_get_tag_8974 bio_integrity_get_tag 3 8974 NULL +btrfs_alloc_free_block_8986 btrfs_alloc_free_block 3 8986 NULL +snd_emu10k1_ptr_read_9026 snd_emu10k1_ptr_read 0-2 9026 NULL @@ -104091,8 +102218,7 @@ index 0000000..9a7096d +scsi_tgt_kspace_exec_9522 scsi_tgt_kspace_exec 8 9522 NULL +read_file_dma_9530 read_file_dma 3 9530 NULL +ext3_alloc_branch_9534 ext3_alloc_branch 5 9534 NULL -+audit_log_n_untrustedstring_9548 audit_log_n_untrustedstring 3 9548 NULL nohasharray -+compat_SyS_pwritev64_9548 compat_SyS_pwritev64 3 9548 &audit_log_n_untrustedstring_9548 ++audit_log_n_untrustedstring_9548 audit_log_n_untrustedstring 3 9548 NULL +fw_node_create_9559 fw_node_create 2 9559 NULL +ipath_get_user_pages_9561 ipath_get_user_pages 1-2 9561 NULL +kobj_map_9566 kobj_map 2-3 9566 NULL @@ -104113,11 +102239,11 @@ index 0000000..9a7096d +dns_query_9676 dns_query 3 9676 &ks8842_read16_9676 +qib_7322_handle_hwerrors_9678 qib_7322_handle_hwerrors 3 9678 NULL +__erst_read_from_storage_9690 __erst_read_from_storage 0 9690 NULL -+x25_asy_compat_ioctl_9694 x25_asy_compat_ioctl 4 9694 NULL nohasharray -+is_hole_9694 is_hole 2 9694 &x25_asy_compat_ioctl_9694 ++is_hole_9694 is_hole 2 9694 NULL nohasharray ++x25_asy_compat_ioctl_9694 x25_asy_compat_ioctl 4 9694 &is_hole_9694 +fnb_9703 fnb 2-3 9703 NULL -+ieee80211_if_read_aid_9705 ieee80211_if_read_aid 3 9705 NULL nohasharray -+fuse_iter_npages_9705 fuse_iter_npages 0 9705 &ieee80211_if_read_aid_9705 ++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 +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 +ddb_input_read_9743 ddb_input_read 3 9743 NULL @@ -104147,7 +102273,6 @@ index 0000000..9a7096d +set_rxd_buffer_pointer_9950 set_rxd_buffer_pointer 8 9950 NULL +ext2_new_blocks_9954 ext2_new_blocks 2 9954 NULL +csum_partial_copy_fromiovecend_9957 csum_partial_copy_fromiovecend 3-4 9957 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 +ath6kl_usb_submit_ctrl_out_9978 ath6kl_usb_submit_ctrl_out 6 9978 NULL @@ -104164,8 +102289,7 @@ index 0000000..9a7096d +dynamic_ps_timeout_read_10110 dynamic_ps_timeout_read 3 10110 &get_elem_size_10110 +jbd_alloc_10112 jbd_alloc 0 10112 NULL nohasharray +gfs2_meta_read_10112 gfs2_meta_read 0 10112 &jbd_alloc_10112 -+offset_to_bit_10134 offset_to_bit 0 10134 NULL nohasharray -+SyS_migrate_pages_10134 SyS_migrate_pages 2 10134 &offset_to_bit_10134 ++offset_to_bit_10134 offset_to_bit 0 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 +hidg_alloc_ep_req_10159 hidg_alloc_ep_req 2 10159 NULL nohasharray @@ -104182,7 +102306,6 @@ index 0000000..9a7096d +read_emulate_10310 read_emulate 2-4 10310 NULL +read_file_spectral_count_10320 read_file_spectral_count 3 10320 NULL +ttm_object_device_init_10321 ttm_object_device_init 2 10321 NULL -+compat_SyS_writev_10327 compat_SyS_writev 3 10327 NULL +ubi_leb_read_10328 ubi_leb_read 0 10328 NULL +tun_sendmsg_10337 tun_sendmsg 4 10337 NULL +get_dump_page_10338 get_dump_page 1 10338 NULL @@ -104215,10 +102338,10 @@ index 0000000..9a7096d +nfs_idmap_lookup_id_10660 nfs_idmap_lookup_id 2 10660 NULL +dtf_read_device_10663 dtf_read_device 3 10663 NULL +parport_write_10669 parport_write 0 10669 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 ++inl_10708 inl 0 10708 NULL nohasharray ++selinux_inode_setxattr_10708 selinux_inode_setxattr 4 10708 &inl_10708 ++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 @@ -104259,8 +102382,8 @@ index 0000000..9a7096d +stmpe_gpio_to_irq_11110 stmpe_gpio_to_irq 2 11110 NULL +tw_change_queue_depth_11116 tw_change_queue_depth 2 11116 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 nohasharray ++cea_db_payload_len_11124 cea_db_payload_len 0 11124 &tracing_buffers_read_11124 +alloc_alien_cache_11127 alloc_alien_cache 2 11127 NULL +acpi_os_map_memory_11161 acpi_os_map_memory 1-2 11161 NULL +ioat2_alloc_ring_11172 ioat2_alloc_ring 2 11172 NULL nohasharray @@ -104380,8 +102503,8 @@ index 0000000..9a7096d +shash_compat_setkey_12267 shash_compat_setkey 3 12267 NULL +add_sctp_bind_addr_12269 add_sctp_bind_addr 3 12269 NULL +note_last_dentry_12285 note_last_dentry 3 12285 NULL -+il_dbgfs_nvm_read_12288 il_dbgfs_nvm_read 3 12288 NULL nohasharray -+roundup_to_multiple_of_64_12288 roundup_to_multiple_of_64 0-1 12288 &il_dbgfs_nvm_read_12288 ++roundup_to_multiple_of_64_12288 roundup_to_multiple_of_64 0-1 12288 NULL nohasharray ++il_dbgfs_nvm_read_12288 il_dbgfs_nvm_read 3 12288 &roundup_to_multiple_of_64_12288 +vxge_get_num_vfs_12302 vxge_get_num_vfs 0 12302 NULL +wrap_min_12303 wrap_min 0-1-2 12303 NULL +tipc_msg_build_12326 tipc_msg_build 4 12326 NULL @@ -104431,10 +102554,9 @@ index 0000000..9a7096d +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 +TSS_authhmac_12839 TSS_authhmac 3 12839 NULL -+ath6kl_wmi_add_wow_pattern_cmd_12842 ath6kl_wmi_add_wow_pattern_cmd 4 12842 NULL nohasharray -+spidev_sync_12842 spidev_sync 0 12842 &ath6kl_wmi_add_wow_pattern_cmd_12842 ++spidev_sync_12842 spidev_sync 0 12842 NULL nohasharray ++ath6kl_wmi_add_wow_pattern_cmd_12842 ath6kl_wmi_add_wow_pattern_cmd 4 12842 &spidev_sync_12842 +spidev_ioctl_12846 spidev_ioctl 2 12846 NULL +get_leb_cnt_12892 get_leb_cnt 0-2 12892 NULL +ocfs2_hamming_encode_block_12904 ocfs2_hamming_encode_block 2 12904 NULL @@ -104458,7 +102580,6 @@ index 0000000..9a7096d +blk_rq_map_sg_13092 blk_rq_map_sg 0 13092 NULL +mb_find_next_zero_bit_13100 mb_find_next_zero_bit 2-3 13100 NULL +ubifs_compat_ioctl_13108 ubifs_compat_ioctl 3 13108 NULL -+SyS_msgrcv_13109 SyS_msgrcv 3 13109 NULL +snd_rme96_playback_copy_13111 snd_rme96_playback_copy 5 13111 NULL +xen_allocate_irq_dynamic_13116 xen_allocate_irq_dynamic 0 13116 NULL +bfad_debugfs_read_13119 bfad_debugfs_read 3 13119 NULL @@ -104476,8 +102597,8 @@ index 0000000..9a7096d +svm_msrpm_offset_13220 svm_msrpm_offset 0-1 13220 NULL +fnic_trace_ctrl_write_13229 fnic_trace_ctrl_write 3 13229 NULL +asix_read_cmd_13245 asix_read_cmd 5 13245 NULL -+kvm_lapic_enable_pv_eoi_13249 kvm_lapic_enable_pv_eoi 2 13249 NULL nohasharray -+fw_download_code_13249 fw_download_code 3 13249 &kvm_lapic_enable_pv_eoi_13249 ++fw_download_code_13249 fw_download_code 3 13249 NULL nohasharray ++kvm_lapic_enable_pv_eoi_13249 kvm_lapic_enable_pv_eoi 2 13249 &fw_download_code_13249 +init_tid_tabs_13252 init_tid_tabs 2-3-4 13252 NULL +hostap_80211_get_hdrlen_13255 hostap_80211_get_hdrlen 0 13255 NULL +bio_integrity_trim_13259 bio_integrity_trim 3 13259 NULL @@ -104501,16 +102622,16 @@ index 0000000..9a7096d +sky2_receive_13407 sky2_receive 2 13407 NULL +netxen_alloc_sds_rings_13417 netxen_alloc_sds_rings 2 13417 NULL +keyring_read_13438 keyring_read 3 13438 NULL -+set_tap_pwup_pfs_13440 set_tap_pwup_pfs 3 13440 NULL nohasharray -+sctp_setsockopt_peer_primary_addr_13440 sctp_setsockopt_peer_primary_addr 3 13440 &set_tap_pwup_pfs_13440 ++sctp_setsockopt_peer_primary_addr_13440 sctp_setsockopt_peer_primary_addr 3 13440 NULL nohasharray ++set_tap_pwup_pfs_13440 set_tap_pwup_pfs 3 13440 &sctp_setsockopt_peer_primary_addr_13440 +ath6kl_cfg80211_connect_event_13443 ath6kl_cfg80211_connect_event 8-9-7 13443 NULL +mthca_buddy_alloc_13454 mthca_buddy_alloc 2 13454 NULL +ocfs2_align_bytes_to_blocks_13512 ocfs2_align_bytes_to_blocks 2 13512 NULL +core_status_13515 core_status 4 13515 NULL +smk_write_mapped_13519 smk_write_mapped 3 13519 NULL +bm_init_13529 bm_init 2 13529 NULL -+SYSC_remap_file_pages_13540 SYSC_remap_file_pages 1 13540 NULL nohasharray -+non_atomic_pte_lookup_13540 non_atomic_pte_lookup 2 13540 &SYSC_remap_file_pages_13540 ++non_atomic_pte_lookup_13540 non_atomic_pte_lookup 2 13540 NULL nohasharray ++SYSC_remap_file_pages_13540 SYSC_remap_file_pages 1 13540 &non_atomic_pte_lookup_13540 +ieee80211_if_read_ap_power_level_13558 ieee80211_if_read_ap_power_level 3 13558 NULL +ubifs_get_idx_gc_leb_13566 ubifs_get_idx_gc_leb 0 13566 NULL +sys_madvise_13569 sys_madvise 1 13569 NULL @@ -104552,8 +102673,8 @@ index 0000000..9a7096d +com90xx_found_13974 com90xx_found 3 13974 NULL +qcam_read_13977 qcam_read 3 13977 NULL +dsp_read_13980 dsp_read 2 13980 NULL -+dvb_demux_read_13981 dvb_demux_read 3 13981 NULL nohasharray -+bm_block_bits_13981 bm_block_bits 0 13981 &dvb_demux_read_13981 ++bm_block_bits_13981 bm_block_bits 0 13981 NULL nohasharray ++dvb_demux_read_13981 dvb_demux_read 3 13981 &bm_block_bits_13981 +btrfs_get_blocks_direct_14016 btrfs_get_blocks_direct 2 14016 NULL +dmi_format_ids_14018 dmi_format_ids 2 14018 NULL +_rtl92s_firmware_downloadcode_14021 _rtl92s_firmware_downloadcode 3 14021 NULL @@ -104601,8 +102722,8 @@ index 0000000..9a7096d +udplite_getfrag_14479 udplite_getfrag 3-4 14479 NULL +ieee80211_if_read_dot11MeshGateAnnouncementProtocol_14486 ieee80211_if_read_dot11MeshGateAnnouncementProtocol 3 14486 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 2-3 14536 &ep0_write_14536 ++dataflash_read_user_otp_14536 dataflash_read_user_otp 2-3 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 +drm_vmalloc_dma_14550 drm_vmalloc_dma 1 14550 NULL +usb_dump_desc_14553 usb_dump_desc 0 14553 NULL @@ -104630,8 +102751,8 @@ index 0000000..9a7096d +regmap_range_read_file_14775 regmap_range_read_file 3 14775 NULL +sta_dev_read_14782 sta_dev_read 3 14782 NULL +ext4_kvmalloc_14796 ext4_kvmalloc 1 14796 NULL -+snd_als300_gcr_read_14801 snd_als300_gcr_read 0 14801 NULL nohasharray -+hpet_readl_14801 hpet_readl 0 14801 &snd_als300_gcr_read_14801 ++hpet_readl_14801 hpet_readl 0 14801 NULL nohasharray ++snd_als300_gcr_read_14801 snd_als300_gcr_read 0 14801 &hpet_readl_14801 +bcma_scan_read32_14802 bcma_scan_read32 0 14802 NULL +do_tune_cpucache_14828 do_tune_cpucache 2 14828 NULL +__mutex_fastpath_lock_retval_14844 __mutex_fastpath_lock_retval 0 14844 NULL @@ -104645,8 +102766,8 @@ index 0000000..9a7096d +SYSC_readv_14901 SYSC_readv 3 14901 NULL +krealloc_14908 krealloc 2 14908 NULL +regmap_irq_get_virq_14910 regmap_irq_get_virq 2 14910 NULL -+qp_memcpy_to_queue_iov_14923 qp_memcpy_to_queue_iov 2-5 14923 NULL nohasharray -+__arch_hweight64_14923 __arch_hweight64 0 14923 &qp_memcpy_to_queue_iov_14923 ++__arch_hweight64_14923 __arch_hweight64 0 14923 NULL nohasharray ++qp_memcpy_to_queue_iov_14923 qp_memcpy_to_queue_iov 2-5 14923 &__arch_hweight64_14923 +ocfs2_expand_nonsparse_inode_14936 ocfs2_expand_nonsparse_inode 3-4 14936 NULL +queue_cnt_14951 queue_cnt 0 14951 NULL +videobuf_read_stream_14956 videobuf_read_stream 3 14956 NULL @@ -104662,7 +102783,6 @@ index 0000000..9a7096d +nfs4_write_cached_acl_15070 nfs4_write_cached_acl 4 15070 NULL +ntfs_copy_from_user_15072 ntfs_copy_from_user 3-5 15072 NULL +compat_SyS_preadv_15105 compat_SyS_preadv 3 15105 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 +memchr_15126 memchr 0 15126 NULL @@ -104710,19 +102830,18 @@ index 0000000..9a7096d +vme_user_write_15587 vme_user_write 3 15587 NULL +ocfs2_truncate_rec_15595 ocfs2_truncate_rec 7 15595 NULL +sx150x_install_irq_chip_15609 sx150x_install_irq_chip 3 15609 NULL -+compat_fillonedir_15620 compat_fillonedir 3 15620 NULL nohasharray -+iommu_device_max_index_15620 iommu_device_max_index 0-3-2-1 15620 &compat_fillonedir_15620 ++iommu_device_max_index_15620 iommu_device_max_index 0-3-2-1 15620 NULL nohasharray ++compat_fillonedir_15620 compat_fillonedir 3 15620 &iommu_device_max_index_15620 +set_dis_tap_pfs_15621 set_dis_tap_pfs 3 15621 NULL +proc_loginuid_read_15631 proc_loginuid_read 3 15631 NULL +tomoyo_scan_bprm_15642 tomoyo_scan_bprm 2-4 15642 NULL nohasharray -+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 ++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 +fs_path_add_15648 fs_path_add 3 15648 NULL +xsd_read_15653 xsd_read 3 15653 NULL +compat_sys_fcntl_15654 compat_sys_fcntl 3 15654 NULL +unix_bind_15668 unix_bind 3 15668 NULL -+SyS_connect_15674 SyS_connect 3 15674 NULL nohasharray -+dm_read_15674 dm_read 3 15674 &SyS_connect_15674 ++dm_read_15674 dm_read 3 15674 NULL +pstore_mkfile_15675 pstore_mkfile 6 15675 NULL +uf_sme_queue_message_15697 uf_sme_queue_message 3 15697 NULL +ocfs2_split_tree_15716 ocfs2_split_tree 5 15716 NULL @@ -104735,8 +102854,8 @@ index 0000000..9a7096d +gx1_read_conf_reg_15817 gx1_read_conf_reg 0 15817 NULL nohasharray +nameseq_list_15817 nameseq_list 3 15817 &gx1_read_conf_reg_15817 nohasharray +gnttab_expand_15817 gnttab_expand 1 15817 &nameseq_list_15817 -+firmware_upload_15822 firmware_upload 3 15822 NULL nohasharray -+afs_proc_rootcell_write_15822 afs_proc_rootcell_write 3 15822 &firmware_upload_15822 ++afs_proc_rootcell_write_15822 afs_proc_rootcell_write 3 15822 NULL nohasharray ++firmware_upload_15822 firmware_upload 3 15822 &afs_proc_rootcell_write_15822 +brcmf_sdbrcm_died_dump_15841 brcmf_sdbrcm_died_dump 3 15841 NULL +table_size_15851 table_size 0-1-2 15851 NULL +ubi_io_write_15870 ubi_io_write 5-4 15870 NULL nohasharray @@ -104774,7 +102893,6 @@ index 0000000..9a7096d +BcmGetSectionValStartOffset_16235 BcmGetSectionValStartOffset 0 16235 NULL +swiotlb_sync_single_for_device_16247 swiotlb_sync_single_for_device 2 16247 NULL nohasharray +btrfs_dev_extent_chunk_offset_16247 btrfs_dev_extent_chunk_offset 0 16247 &swiotlb_sync_single_for_device_16247 -+SyS_fgetxattr_16254 SyS_fgetxattr 4 16254 NULL +mark_written_sectors_16262 mark_written_sectors 2 16262 NULL +reiserfs_acl_count_16265 reiserfs_acl_count 0-1 16265 NULL +set_disc_pfs_16270 set_disc_pfs 3 16270 NULL @@ -104826,8 +102944,8 @@ index 0000000..9a7096d +st_write_16874 st_write 3 16874 NULL +__kfifo_peek_n_16877 __kfifo_peek_n 0 16877 NULL +idx_to_pfn_16919 idx_to_pfn 0 16919 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 +cfg80211_send_unprot_disassoc_16951 cfg80211_send_unprot_disassoc 3 16951 NULL @@ -104896,8 +103014,8 @@ index 0000000..9a7096d +ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout_17618 ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout 3 17618 NULL +twl4030_set_gpio_direction_17645 twl4030_set_gpio_direction 1 17645 NULL +SYSC_migrate_pages_17657 SYSC_migrate_pages 2 17657 NULL -+ubi_io_read_data_17662 ubi_io_read_data 0 17662 NULL nohasharray -+packet_setsockopt_17662 packet_setsockopt 5 17662 &ubi_io_read_data_17662 ++packet_setsockopt_17662 packet_setsockopt 5 17662 NULL nohasharray ++ubi_io_read_data_17662 ubi_io_read_data 0 17662 &packet_setsockopt_17662 +pwr_enable_ps_read_17686 pwr_enable_ps_read 3 17686 NULL +gfn_to_pfn_memslot_17693 gfn_to_pfn_memslot 2 17693 NULL +__einj_error_trigger_17707 __einj_error_trigger 1 17707 NULL nohasharray @@ -104967,8 +103085,8 @@ index 0000000..9a7096d +gfs2_alloc_sort_buffer_18275 gfs2_alloc_sort_buffer 1 18275 NULL +alloc_ring_18278 alloc_ring 2-4 18278 NULL +find_dirty_idx_leb_18280 find_dirty_idx_leb 0 18280 NULL -+bio_phys_segments_18281 bio_phys_segments 0 18281 NULL nohasharray -+nouveau_subdev_create__18281 nouveau_subdev_create_ 7 18281 &bio_phys_segments_18281 ++nouveau_subdev_create__18281 nouveau_subdev_create_ 7 18281 NULL nohasharray ++bio_phys_segments_18281 bio_phys_segments 0 18281 &nouveau_subdev_create__18281 +ext4_readpages_18283 ext4_readpages 4 18283 NULL +mmc_send_bus_test_18285 mmc_send_bus_test 4 18285 NULL +um_idi_write_18293 um_idi_write 3 18293 NULL @@ -105005,8 +103123,8 @@ index 0000000..9a7096d +debug_output_18575 debug_output 3 18575 NULL +check_lpt_type_18577 check_lpt_type 0 18577 NULL +__netdev_alloc_skb_18595 __netdev_alloc_skb 2 18595 NULL -+slabinfo_write_18600 slabinfo_write 3 18600 NULL nohasharray -+filemap_fdatawait_range_18600 filemap_fdatawait_range 0 18600 &slabinfo_write_18600 ++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 +batadv_arp_get_type_18609 batadv_arp_get_type 3 18609 NULL +from_buffer_18625 from_buffer 3 18625 NULL @@ -105059,8 +103177,8 @@ index 0000000..9a7096d +ieee80211_key_alloc_19065 ieee80211_key_alloc 3 19065 NULL +msix_map_region_19072 msix_map_region 2 19072 NULL +ceph_create_snap_context_19082 ceph_create_snap_context 1 19082 NULL -+brcmf_usbdev_qinit_19090 brcmf_usbdev_qinit 2 19090 NULL nohasharray -+sys_process_vm_readv_19090 sys_process_vm_readv 3-5 19090 &brcmf_usbdev_qinit_19090 ++sys_process_vm_readv_19090 sys_process_vm_readv 3-5 19090 NULL nohasharray ++brcmf_usbdev_qinit_19090 brcmf_usbdev_qinit 2 19090 &sys_process_vm_readv_19090 +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 @@ -105105,8 +103223,8 @@ index 0000000..9a7096d +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 -+wlcore_hw_get_rx_packet_len_19565 wlcore_hw_get_rx_packet_len 0 19565 NULL nohasharray -+ieee80211_if_read_tkip_mic_test_19565 ieee80211_if_read_tkip_mic_test 3 19565 &wlcore_hw_get_rx_packet_len_19565 ++ieee80211_if_read_tkip_mic_test_19565 ieee80211_if_read_tkip_mic_test 3 19565 NULL nohasharray ++wlcore_hw_get_rx_packet_len_19565 wlcore_hw_get_rx_packet_len 0 19565 &ieee80211_if_read_tkip_mic_test_19565 +nfsd_read_19568 nfsd_read 5 19568 NULL +cgroup_read_s64_19570 cgroup_read_s64 5 19570 NULL +bm_status_read_19583 bm_status_read 3 19583 NULL @@ -105171,8 +103289,7 @@ index 0000000..9a7096d +smk_set_cipso_20379 smk_set_cipso 3 20379 NULL +u64_to_uptr_20384 u64_to_uptr 1 20384 NULL +snd_nm256_readl_20394 snd_nm256_readl 0 20394 NULL -+SyS_get_mempolicy_20399 SyS_get_mempolicy 3-4 20399 NULL nohasharray -+__kfifo_from_user_20399 __kfifo_from_user 3 20399 &SyS_get_mempolicy_20399 ++__kfifo_from_user_20399 __kfifo_from_user 3 20399 NULL +xen_create_contiguous_region_20457 xen_create_contiguous_region 1 20457 NULL +nfs3_setxattr_20458 nfs3_setxattr 4 20458 NULL +dec_zcache_pers_zpages_20465 dec_zcache_pers_zpages 1 20465 NULL @@ -105351,7 +103468,6 @@ index 0000000..9a7096d +sys_remap_file_pages_22124 sys_remap_file_pages 1 22124 NULL +__bitmap_size_22138 __bitmap_size 0 22138 NULL +compat_insn_22142 compat_insn 2 22142 NULL -+SyS_sched_setaffinity_22148 SyS_sched_setaffinity 2 22148 NULL +do_tcp_sendpages_22155 do_tcp_sendpages 4 22155 NULL +__kfifo_alloc_22173 __kfifo_alloc 3 22173 NULL +fls_22210 fls 0 22210 NULL @@ -105390,8 +103506,8 @@ index 0000000..9a7096d +mp_find_ioapic_pin_22499 mp_find_ioapic_pin 0-2 22499 NULL +mutex_lock_interruptible_22505 mutex_lock_interruptible 0 22505 NULL +ip4_addr_string_22511 ip4_addr_string 0 22511 NULL -+usb_dump_config_descriptor_22522 usb_dump_config_descriptor 0 22522 NULL nohasharray -+swiotlb_tbl_unmap_single_22522 swiotlb_tbl_unmap_single 2 22522 &usb_dump_config_descriptor_22522 ++swiotlb_tbl_unmap_single_22522 swiotlb_tbl_unmap_single 2 22522 NULL nohasharray ++usb_dump_config_descriptor_22522 usb_dump_config_descriptor 0 22522 &swiotlb_tbl_unmap_single_22522 +pskb_may_pull_22546 pskb_may_pull 2 22546 NULL +ocfs2_read_extent_block_22550 ocfs2_read_extent_block 0 22550 NULL +atomic_long_read_unchecked_22551 atomic_long_read_unchecked 0 22551 NULL @@ -105557,7 +103673,6 @@ index 0000000..9a7096d +request_key_auth_read_24109 request_key_auth_read 3 24109 NULL +mpu401_read_24126 mpu401_read 3 24126 NULL +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 +set_discard_24162 set_discard 2 24162 NULL +adu_read_24177 adu_read 3 24177 NULL @@ -105605,7 +103720,6 @@ index 0000000..9a7096d +do_mpage_readpage_24536 do_mpage_readpage 3 24536 NULL +write_cache_pages_24562 write_cache_pages 0 24562 NULL +tsi148_alloc_resource_24563 tsi148_alloc_resource 2 24563 NULL -+SyS_pselect6_24582 SyS_pselect6 1 24582 NULL +udf_compute_nr_groups_24594 udf_compute_nr_groups 0 24594 NULL +count_preds_24600 count_preds 0 24600 NULL +sensor_hub_get_physical_device_count_24605 sensor_hub_get_physical_device_count 0 24605 NULL @@ -105671,12 +103785,12 @@ index 0000000..9a7096d +vfs_writev_25278 vfs_writev 3 25278 NULL +l2tp_session_create_25286 l2tp_session_create 1 25286 NULL +snd_seq_ioctl_compat_25307 snd_seq_ioctl_compat 3 25307 NULL -+ath9k_debugfs_read_buf_25316 ath9k_debugfs_read_buf 3 25316 NULL nohasharray -+help_25316 help 5 25316 &ath9k_debugfs_read_buf_25316 ++help_25316 help 5 25316 NULL nohasharray ++ath9k_debugfs_read_buf_25316 ath9k_debugfs_read_buf 3 25316 &help_25316 +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 nohasharray -+rio_destid_next_25368 rio_destid_next 2 25368 &unix_mkname_25368 ++rio_destid_next_25368 rio_destid_next 2 25368 NULL nohasharray ++unix_mkname_25368 unix_mkname 0-2 25368 &rio_destid_next_25368 +sel_read_mls_25369 sel_read_mls 3 25369 NULL +tc3589x_gpio_to_irq_25371 tc3589x_gpio_to_irq 2 25371 NULL +ebt_buf_add_pad_25413 ebt_buf_add_pad 0 25413 NULL @@ -105697,8 +103811,8 @@ index 0000000..9a7096d +__devres_alloc_25598 __devres_alloc 2 25598 NULL +copy_user_generic_25611 copy_user_generic 0 25611 NULL +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-3-4 25628 &befs_utf2nls_25628 ++__get_user_pages_25628 __get_user_pages 0-3-4 25628 NULL nohasharray ++befs_utf2nls_25628 befs_utf2nls 3 25628 &__get_user_pages_25628 +__direct_map_25647 __direct_map 5-6 25647 NULL +ext2_try_to_allocate_25667 ext2_try_to_allocate 4-2 25667 NULL +aircable_prepare_write_buffer_25669 aircable_prepare_write_buffer 3 25669 NULL @@ -105738,7 +103852,6 @@ index 0000000..9a7096d +udp_setsockopt_25985 udp_setsockopt 5 25985 NULL +ebt_compat_entry_padsize_26001 ebt_compat_entry_padsize 0 26001 NULL +lpfc_sli_probe_sriov_nr_virtfn_26004 lpfc_sli_probe_sriov_nr_virtfn 2 26004 NULL -+SyS_process_vm_readv_26019 SyS_process_vm_readv 3-5 26019 NULL +irq_create_strict_mappings_26025 irq_create_strict_mappings 2-4 26025 NULL +xfs_xattr_acl_set_26028 xfs_xattr_acl_set 4 26028 NULL +skb_mac_header_26034 skb_mac_header 0 26034 NULL @@ -105751,8 +103864,8 @@ index 0000000..9a7096d +skb_cow_26138 skb_cow 2 26138 NULL +usb_dump_device_strings_26146 usb_dump_device_strings 0 26146 NULL +copy_oldmem_page_26164 copy_oldmem_page 3-1 26164 NULL -+ath6kl_roam_table_read_26166 ath6kl_roam_table_read 3 26166 NULL nohasharray -+gfs2_xattr_acl_get_26166 gfs2_xattr_acl_get 0 26166 &ath6kl_roam_table_read_26166 ++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 +perf_adjust_period_26168 perf_adjust_period 2-3 26168 NULL +mid_get_vbt_data_r1_26170 mid_get_vbt_data_r1 2 26170 NULL +disk_devt_26180 disk_devt 0 26180 NULL @@ -105781,7 +103894,6 @@ index 0000000..9a7096d +read_vmcore_26501 read_vmcore 3 26501 NULL +vfio_pci_set_msi_trigger_26507 vfio_pci_set_msi_trigger 3-4 26507 NULL +iwl_dbgfs_rf_reset_read_26512 iwl_dbgfs_rf_reset_read 3 26512 NULL -+SyS_rt_sigpending_26538 SyS_rt_sigpending 2 26538 NULL +__vhost_add_used_n_26554 __vhost_add_used_n 3 26554 NULL +ip6_addr_string_26568 ip6_addr_string 0 26568 NULL +kvm_iommu_put_pages_26571 kvm_iommu_put_pages 2 26571 NULL @@ -105825,8 +103937,8 @@ index 0000000..9a7096d +carl9170_handle_mpdu_26940 carl9170_handle_mpdu 3 26940 NULL nohasharray +create_bm_block_list_26940 create_bm_block_list 0 26940 &carl9170_handle_mpdu_26940 +hecubafb_write_26942 hecubafb_write 3 26942 NULL -+do_trimming_26952 do_trimming 3 26952 NULL nohasharray -+extract_entropy_user_26952 extract_entropy_user 3 26952 &do_trimming_26952 ++extract_entropy_user_26952 extract_entropy_user 3 26952 NULL nohasharray ++do_trimming_26952 do_trimming 3 26952 &extract_entropy_user_26952 +pcf857x_irq_domain_map_26998 pcf857x_irq_domain_map 2 26998 NULL +swiotlb_bounce_27046 swiotlb_bounce 2-1 27046 NULL +ufs_alloc_fragments_27059 ufs_alloc_fragments 3-0-2 27059 NULL @@ -105900,12 +104012,11 @@ index 0000000..9a7096d +kcalloc_27770 kcalloc 1-2 27770 NULL +twl4030_set_gpio_dataout_27792 twl4030_set_gpio_dataout 1 27792 NULL +DivaSTraceGetMemotyRequirement_27797 DivaSTraceGetMemotyRequirement 0-1 27797 NULL -+ttm_object_file_init_27804 ttm_object_file_init 2 27804 NULL nohasharray -+SyS_readv_27804 SyS_readv 3 27804 &ttm_object_file_init_27804 ++ttm_object_file_init_27804 ttm_object_file_init 2 27804 NULL +mpihelp_mul_27805 mpihelp_mul 5-3 27805 NULL +fwtty_buffer_rx_27821 fwtty_buffer_rx 3 27821 NULL -+sys_listxattr_27833 sys_listxattr 3 27833 NULL nohasharray -+init_header_complete_27833 init_header_complete 0 27833 &sys_listxattr_27833 ++init_header_complete_27833 init_header_complete 0 27833 NULL nohasharray ++sys_listxattr_27833 sys_listxattr 3 27833 &init_header_complete_27833 +read_profile_27859 read_profile 3 27859 NULL +sky2_pci_read16_27863 sky2_pci_read16 0 27863 NULL +ieee80211_if_read_dot11MeshHWMProotInterval_27873 ieee80211_if_read_dot11MeshHWMProotInterval 3 27873 NULL @@ -105942,8 +104053,8 @@ index 0000000..9a7096d +d_path_28198 d_path 0 28198 NULL +nouveau_mxm_create__28200 nouveau_mxm_create_ 4 28200 NULL +__qp_memcpy_from_queue_28220 __qp_memcpy_from_queue 3-4 28220 NULL -+set_dis_disc_pfs_28225 set_dis_disc_pfs 3 28225 NULL nohasharray -+line6_alloc_sysex_buffer_28225 line6_alloc_sysex_buffer 4 28225 &set_dis_disc_pfs_28225 ++line6_alloc_sysex_buffer_28225 line6_alloc_sysex_buffer 4 28225 NULL nohasharray ++set_dis_disc_pfs_28225 set_dis_disc_pfs 3 28225 &line6_alloc_sysex_buffer_28225 +amd_nb_num_28228 amd_nb_num 0 28228 NULL +ext4_validate_block_bitmap_28243 ext4_validate_block_bitmap 3 28243 NULL +usemap_size_28281 usemap_size 0 28281 NULL @@ -105991,13 +104102,12 @@ index 0000000..9a7096d +setup_usemap_28636 setup_usemap 3-4 28636 NULL +blk_queue_resize_tags_28670 blk_queue_resize_tags 2 28670 NULL +__dev_alloc_skb_28681 __dev_alloc_skb 1 28681 NULL -+SyS_setgroups16_28686 SyS_setgroups16 1 28686 NULL +nl80211_send_new_peer_candidate_28692 nl80211_send_new_peer_candidate 5 28692 NULL nohasharray +kvm_mmu_get_page_28692 kvm_mmu_get_page 2 28692 &nl80211_send_new_peer_candidate_28692 +drm_plane_init_28731 drm_plane_init 6 28731 NULL +spi_execute_28736 spi_execute 5 28736 NULL -+phantom_compat_ioctl_28738 phantom_compat_ioctl 3 28738 NULL nohasharray -+snd_pcm_aio_write_28738 snd_pcm_aio_write 3 28738 &phantom_compat_ioctl_28738 ++snd_pcm_aio_write_28738 snd_pcm_aio_write 3 28738 NULL nohasharray ++phantom_compat_ioctl_28738 phantom_compat_ioctl 3 28738 &snd_pcm_aio_write_28738 +read_file_btcoex_28743 read_file_btcoex 3 28743 NULL +max_hw_blocks_28748 max_hw_blocks 0 28748 NULL +ath6kl_get_num_reg_28780 ath6kl_get_num_reg 0 28780 NULL @@ -106039,8 +104149,8 @@ index 0000000..9a7096d +reshape_ring_29147 reshape_ring 2 29147 NULL +alloc_irqs_from_29152 alloc_irqs_from 1-2 29152 NULL +drm_property_create_enum_29201 drm_property_create_enum 5 29201 NULL -+alloc_group_attrs_29203 alloc_group_attrs 3 29203 NULL nohasharray -+wusb_prf_256_29203 wusb_prf_256 7 29203 &alloc_group_attrs_29203 ++wusb_prf_256_29203 wusb_prf_256 7 29203 NULL nohasharray ++alloc_group_attrs_29203 alloc_group_attrs 3 29203 &wusb_prf_256_29203 +__mm_populate_29204 __mm_populate 1 29204 NULL +comedi_alloc_subdevices_29207 comedi_alloc_subdevices 2 29207 NULL +do_shrinker_shrink_29208 do_shrinker_shrink 0 29208 NULL @@ -106077,8 +104187,8 @@ index 0000000..9a7096d +set_brk_29551 set_brk 1 29551 NULL nohasharray +ftrace_write_29551 ftrace_write 3 29551 &set_brk_29551 +idetape_queue_rw_tail_29562 idetape_queue_rw_tail 3 29562 NULL -+alloc_empty_pages_29566 alloc_empty_pages 2 29566 NULL nohasharray -+leaf_dealloc_29566 leaf_dealloc 3 29566 &alloc_empty_pages_29566 ++leaf_dealloc_29566 leaf_dealloc 3 29566 NULL nohasharray ++alloc_empty_pages_29566 alloc_empty_pages 2 29566 &leaf_dealloc_29566 +lbs_lowsnr_read_29571 lbs_lowsnr_read 3 29571 NULL +pvr2_hdw_report_unlocked_29589 pvr2_hdw_report_unlocked 4 29589 NULL +slots_per_page_29601 slots_per_page 0 29601 NULL @@ -106122,8 +104232,8 @@ index 0000000..9a7096d +cxgbi_ddp_reserve_30091 cxgbi_ddp_reserve 4 30091 NULL +snd_midi_channel_init_set_30092 snd_midi_channel_init_set 1 30092 NULL +tg3_run_loopback_30093 tg3_run_loopback 2 30093 NULL -+dma_to_phys_30098 dma_to_phys 0-2 30098 NULL nohasharray -+rx_filter_data_filter_read_30098 rx_filter_data_filter_read 3 30098 &dma_to_phys_30098 ++rx_filter_data_filter_read_30098 rx_filter_data_filter_read 3 30098 NULL nohasharray ++dma_to_phys_30098 dma_to_phys 0-2 30098 &rx_filter_data_filter_read_30098 +skb_pagelen_30113 skb_pagelen 0 30113 NULL +spi_async_locked_30117 spi_async_locked 0 30117 NULL +calgary_unmap_page_30130 calgary_unmap_page 2-3 30130 NULL @@ -106137,7 +104247,6 @@ index 0000000..9a7096d +nfs_idmap_request_key_30208 nfs_idmap_request_key 3 30208 NULL +read_4k_modal_eeprom_30212 read_4k_modal_eeprom 3 30212 NULL +snd_ac97_pcm_assign_30218 snd_ac97_pcm_assign 2 30218 NULL -+SyS_semop_30227 SyS_semop 3 30227 NULL +f2fs_compat_ioctl_30261 f2fs_compat_ioctl 3 30261 NULL +isr_pci_pm_read_30271 isr_pci_pm_read 3 30271 NULL +compat_readv_30273 compat_readv 3 30273 NULL @@ -106178,7 +104287,6 @@ index 0000000..9a7096d +macvtap_sendmsg_30629 macvtap_sendmsg 4 30629 NULL +ieee80211_if_read_dot11MeshAwakeWindowDuration_30631 ieee80211_if_read_dot11MeshAwakeWindowDuration 3 30631 NULL +compat_raw_setsockopt_30634 compat_raw_setsockopt 5 30634 NULL -+SyS_listxattr_30647 SyS_listxattr 3 30647 NULL +agp_remap_30665 agp_remap 2 30665 NULL +jffs2_flash_read_30667 jffs2_flash_read 0 30667 NULL +il_free_pages_30692 il_free_pages 2 30692 NULL @@ -106280,12 +104388,10 @@ index 0000000..9a7096d +bcm_char_read_31750 bcm_char_read 3 31750 NULL +snd_seq_device_new_31753 snd_seq_device_new 4 31753 NULL +set_memory_wb_31761 set_memory_wb 1 31761 NULL -+SyS_lsetxattr_31766 SyS_lsetxattr 4 31766 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 -+SyS_msgsnd_31814 SyS_msgsnd 3 31814 NULL +strnlen_user_31815 strnlen_user 0-2 31815 NULL +sta_last_signal_read_31818 sta_last_signal_read 3 31818 NULL +drm_mode_crtc_set_gamma_size_31881 drm_mode_crtc_set_gamma_size 2 31881 NULL @@ -106373,7 +104479,6 @@ index 0000000..9a7096d +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 -+compat_SyS_preadv_32679 compat_SyS_preadv 3 32679 NULL +compat_SyS_pwritev_32680 compat_SyS_pwritev 3 32680 NULL +jfs_readpages_32702 jfs_readpages 4 32702 NULL +snd_hwdep_ioctl_compat_32736 snd_hwdep_ioctl_compat 3 32736 NULL @@ -106387,8 +104492,8 @@ index 0000000..9a7096d +vga_rseq_32848 vga_rseq 0 32848 NULL +new_tape_buffer_32866 new_tape_buffer 2 32866 NULL +io_apic_setup_irq_pin_32868 io_apic_setup_irq_pin 1 32868 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 ++ath6kl_usb_submit_ctrl_in_32880 ath6kl_usb_submit_ctrl_in 6 32880 NULL nohasharray ++cifs_writedata_alloc_32880 cifs_writedata_alloc 1 32880 &ath6kl_usb_submit_ctrl_in_32880 +ath6kl_usb_post_recv_transfers_32892 ath6kl_usb_post_recv_transfers 2 32892 NULL +ext4_get_group_number_32899 ext4_get_group_number 0 32899 NULL +il_dbgfs_tx_stats_read_32913 il_dbgfs_tx_stats_read 3 32913 NULL @@ -106443,8 +104548,8 @@ index 0000000..9a7096d +ubh_scanc_33436 ubh_scanc 0-4-3 33436 NULL +ovs_vport_alloc_33475 ovs_vport_alloc 1 33475 NULL +create_entry_33479 create_entry 2 33479 NULL -+elf_map_33487 elf_map 0-2 33487 NULL nohasharray -+ip_setsockopt_33487 ip_setsockopt 5 33487 &elf_map_33487 ++ip_setsockopt_33487 ip_setsockopt 5 33487 NULL nohasharray ++elf_map_33487 elf_map 0-2 33487 &ip_setsockopt_33487 +netxen_nic_hw_write_wx_128M_33488 netxen_nic_hw_write_wx_128M 2 33488 NULL +ol_dqblk_chunk_off_33489 ol_dqblk_chunk_off 2 33489 NULL +res_counter_read_33499 res_counter_read 4 33499 NULL @@ -106460,10 +104565,10 @@ index 0000000..9a7096d +count_subheaders_33591 count_subheaders 0 33591 NULL +scsi_execute_33596 scsi_execute 5 33596 NULL +comedi_buf_write_n_allocated_33604 comedi_buf_write_n_allocated 0 33604 NULL -+ip6_find_1stfragopt_33608 ip6_find_1stfragopt 0 33608 NULL nohasharray -+xt_compat_target_offset_33608 xt_compat_target_offset 0 33608 &ip6_find_1stfragopt_33608 -+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 ++xt_compat_target_offset_33608 xt_compat_target_offset 0 33608 NULL nohasharray ++ip6_find_1stfragopt_33608 ip6_find_1stfragopt 0 33608 &xt_compat_target_offset_33608 ++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 +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 @@ -106532,8 +104637,8 @@ index 0000000..9a7096d +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 -+ivtv_read_pos_34400 ivtv_read_pos 3 34400 NULL nohasharray -+iwl_calib_set_34400 iwl_calib_set 3 34400 &ivtv_read_pos_34400 ++iwl_calib_set_34400 iwl_calib_set 3 34400 NULL nohasharray ++ivtv_read_pos_34400 ivtv_read_pos 3 34400 &iwl_calib_set_34400 +wd_exp_mode_write_34407 wd_exp_mode_write 3 34407 NULL +nl80211_send_disassoc_34424 nl80211_send_disassoc 4 34424 NULL +usbtest_alloc_urb_34446 usbtest_alloc_urb 3-5 34446 NULL @@ -106541,7 +104646,6 @@ index 0000000..9a7096d +skcipher_sndbuf_34476 skcipher_sndbuf 0 34476 NULL +i2o_parm_field_get_34477 i2o_parm_field_get 5 34477 NULL +security_inode_permission_34488 security_inode_permission 0 34488 NULL -+SyS_pwritev_34494 SyS_pwritev 3 34494 NULL +tracing_stats_read_34537 tracing_stats_read 3 34537 NULL +hugetlbfs_read_actor_34547 hugetlbfs_read_actor 0-2-5-4 34547 NULL +dbBackSplit_34561 dbBackSplit 0 34561 NULL @@ -106578,8 +104682,8 @@ index 0000000..9a7096d +__inode_permission_34925 __inode_permission 0 34925 NULL nohasharray +btrfs_super_chunk_root_34925 btrfs_super_chunk_root 0 34925 &__inode_permission_34925 +ceph_aio_write_34930 ceph_aio_write 4 34930 NULL -+i2c_transfer_34958 i2c_transfer 0 34958 NULL nohasharray -+skb_gro_header_slow_34958 skb_gro_header_slow 2 34958 &i2c_transfer_34958 ++skb_gro_header_slow_34958 skb_gro_header_slow 2 34958 NULL nohasharray ++i2c_transfer_34958 i2c_transfer 0 34958 &skb_gro_header_slow_34958 +Realloc_34961 Realloc 2 34961 NULL +mq_lookup_34990 mq_lookup 2 34990 NULL +rx_rx_hdr_overflow_read_35002 rx_rx_hdr_overflow_read 3 35002 NULL @@ -106790,8 +104894,8 @@ index 0000000..9a7096d +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 -+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 +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 @@ -106848,7 +104952,6 @@ index 0000000..9a7096d +policy_residency_37629 policy_residency 0 37629 &btrfs_calc_trans_metadata_size_37629 +check_pt_base_37635 check_pt_base 3 37635 NULL +alloc_fd_37637 alloc_fd 1 37637 NULL -+SyS_mbind_37638 SyS_mbind 5 37638 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 @@ -106887,8 +104990,8 @@ index 0000000..9a7096d +persistent_ram_old_size_37997 persistent_ram_old_size 0 37997 NULL +vfs_readv_38011 vfs_readv 3 38011 NULL +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 ++klsi_105_prepare_write_buffer_38044 klsi_105_prepare_write_buffer 3 38044 NULL nohasharray ++il_dbgfs_chain_noise_read_38044 il_dbgfs_chain_noise_read 3 38044 &klsi_105_prepare_write_buffer_38044 +SyS_llistxattr_38048 SyS_llistxattr 3 38048 NULL +_xfs_buf_alloc_38058 _xfs_buf_alloc 3 38058 NULL nohasharray +is_discarded_38058 is_discarded 2 38058 &_xfs_buf_alloc_38058 @@ -106918,9 +105021,9 @@ index 0000000..9a7096d +_ipw_read_reg32_38245 _ipw_read_reg32 0 38245 NULL +from_dblock_38256 from_dblock 0-1 38256 NULL +vmci_qp_broker_set_page_store_38260 vmci_qp_broker_set_page_store 2-3 38260 NULL -+SYSC_msgrcv_38268 SYSC_msgrcv 3 38268 NULL nohasharray -+ieee80211_if_read_auto_open_plinks_38268 ieee80211_if_read_auto_open_plinks 3 38268 &SYSC_msgrcv_38268 nohasharray -+mthca_alloc_icm_table_38268 mthca_alloc_icm_table 4-3 38268 &ieee80211_if_read_auto_open_plinks_38268 ++ieee80211_if_read_auto_open_plinks_38268 ieee80211_if_read_auto_open_plinks 3 38268 NULL nohasharray ++SYSC_msgrcv_38268 SYSC_msgrcv 3 38268 &ieee80211_if_read_auto_open_plinks_38268 nohasharray ++mthca_alloc_icm_table_38268 mthca_alloc_icm_table 4-3 38268 &SYSC_msgrcv_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 nohasharray @@ -106992,8 +105095,8 @@ index 0000000..9a7096d +ext3_trim_all_free_38929 ext3_trim_all_free 3-4-2 38929 NULL +sbp_count_se_tpg_luns_38943 sbp_count_se_tpg_luns 0 38943 NULL +__ath6kl_wmi_send_mgmt_cmd_38971 __ath6kl_wmi_send_mgmt_cmd 7 38971 NULL -+usb_maxpacket_38977 usb_maxpacket 0 38977 NULL nohasharray -+C_SYSC_preadv64_38977 C_SYSC_preadv64 3 38977 &usb_maxpacket_38977 ++C_SYSC_preadv64_38977 C_SYSC_preadv64 3 38977 NULL nohasharray ++usb_maxpacket_38977 usb_maxpacket 0 38977 &C_SYSC_preadv64_38977 +OSDSetBlock_38986 OSDSetBlock 4-2 38986 NULL +udf_new_block_38999 udf_new_block 4 38999 NULL +get_nodes_39012 get_nodes 3 39012 NULL @@ -107019,8 +105122,8 @@ index 0000000..9a7096d +batadv_tt_response_fill_table_39236 batadv_tt_response_fill_table 1 39236 NULL +posix_acl_to_xattr_39237 posix_acl_to_xattr 0 39237 NULL +drm_order_39244 drm_order 0 39244 NULL -+pwr_cont_miss_bcns_spread_read_39250 pwr_cont_miss_bcns_spread_read 3 39250 NULL nohasharray -+r128_compat_ioctl_39250 r128_compat_ioctl 2 39250 &pwr_cont_miss_bcns_spread_read_39250 ++r128_compat_ioctl_39250 r128_compat_ioctl 2 39250 NULL nohasharray ++pwr_cont_miss_bcns_spread_read_39250 pwr_cont_miss_bcns_spread_read 3 39250 &r128_compat_ioctl_39250 +__skb_cow_39254 __skb_cow 2 39254 NULL +ath6kl_wmi_set_appie_cmd_39266 ath6kl_wmi_set_appie_cmd 5 39266 NULL +rx_filter_protection_filter_read_39282 rx_filter_protection_filter_read 3 39282 NULL @@ -107055,8 +105158,8 @@ index 0000000..9a7096d +ext_depth_39607 ext_depth 0 39607 NULL +nfs_idmap_get_key_39616 nfs_idmap_get_key 2 39616 NULL +sdio_readb_39618 sdio_readb 0 39618 NULL -+dm_exception_table_init_39645 dm_exception_table_init 2 39645 NULL nohasharray -+set_dev_class_39645 set_dev_class 4 39645 &dm_exception_table_init_39645 ++set_dev_class_39645 set_dev_class 4 39645 NULL nohasharray ++dm_exception_table_init_39645 dm_exception_table_init 2 39645 &set_dev_class_39645 +snd_rme32_capture_copy_39653 snd_rme32_capture_copy 5 39653 NULL +tcp_try_rmem_schedule_39657 tcp_try_rmem_schedule 3 39657 NULL nohasharray +prism2_info_hostscanresults_39657 prism2_info_hostscanresults 3 39657 &tcp_try_rmem_schedule_39657 @@ -107082,8 +105185,8 @@ index 0000000..9a7096d +oom_score_adj_read_39921 oom_score_adj_read 3 39921 &exofs_read_kern_39921 +__spi_async_39932 __spi_async 0 39932 NULL +__get_order_39935 __get_order 0 39935 NULL -+fwnet_pd_new_39947 fwnet_pd_new 4 39947 NULL nohasharray -+error_error_frame_read_39947 error_error_frame_read 3 39947 &fwnet_pd_new_39947 ++error_error_frame_read_39947 error_error_frame_read 3 39947 NULL nohasharray ++fwnet_pd_new_39947 fwnet_pd_new 4 39947 &error_error_frame_read_39947 +tty_prepare_flip_string_39955 tty_prepare_flip_string 3 39955 NULL +dma_push_rx_39973 dma_push_rx 2 39973 NULL +vfio_pci_read_39975 vfio_pci_read 3 39975 NULL @@ -107120,7 +105223,6 @@ index 0000000..9a7096d +rx_xfr_hint_trig_read_40283 rx_xfr_hint_trig_read 3 40283 NULL +_calc_trunk_info_40291 _calc_trunk_info 2 40291 NULL +crash_free_reserved_phys_range_40292 crash_free_reserved_phys_range 1 40292 NULL -+SyS_bind_40303 SyS_bind 3 40303 NULL +ubi_io_write_data_40305 ubi_io_write_data 4-5 40305 NULL +batadv_tt_changes_fill_buff_40323 batadv_tt_changes_fill_buff 4 40323 NULL +ib_get_mad_data_offset_40336 ib_get_mad_data_offset 0 40336 NULL @@ -107134,8 +105236,6 @@ index 0000000..9a7096d +atmel_rmem16_40450 atmel_rmem16 0 40450 NULL +tomoyo_update_policy_40458 tomoyo_update_policy 2 40458 NULL +zd_usb_scnprint_id_40459 zd_usb_scnprint_id 0-3 40459 NULL -+SyS_writev_40467 SyS_writev 3 40467 NULL -+SyS_select_40473 SyS_select 1 40473 NULL +batadv_hash_new_40491 batadv_hash_new 1 40491 NULL +devcgroup_inode_permission_40492 devcgroup_inode_permission 0 40492 NULL +tty_write_room_40495 tty_write_room 0 40495 NULL @@ -107242,7 +105342,6 @@ index 0000000..9a7096d +hpfs_translate_name_41497 hpfs_translate_name 3 41497 NULL +xfrm_hash_new_size_41505 xfrm_hash_new_size 0-1 41505 NULL +ldisc_receive_41516 ldisc_receive 4 41516 NULL -+SyS_preadv_41523 SyS_preadv 3 41523 NULL +tx_tx_frame_checksum_read_41553 tx_tx_frame_checksum_read 3 41553 NULL +ath6kl_endpoint_stats_read_41554 ath6kl_endpoint_stats_read 3 41554 NULL +nr_status_frames_41559 nr_status_frames 0-1 41559 NULL @@ -107295,8 +105394,8 @@ index 0000000..9a7096d +acpi_ut_create_buffer_object_42030 acpi_ut_create_buffer_object 1 42030 NULL +__hwahc_op_set_gtk_42038 __hwahc_op_set_gtk 4 42038 NULL +irda_sendmsg_ultra_42047 irda_sendmsg_ultra 4 42047 NULL -+jffs2_do_link_42048 jffs2_do_link 6 42048 NULL nohasharray -+dma_generic_alloc_coherent_42048 dma_generic_alloc_coherent 2 42048 &jffs2_do_link_42048 ++dma_generic_alloc_coherent_42048 dma_generic_alloc_coherent 2 42048 NULL nohasharray ++jffs2_do_link_42048 jffs2_do_link 6 42048 &dma_generic_alloc_coherent_42048 +ps_poll_upsd_max_ap_turn_read_42050 ps_poll_upsd_max_ap_turn_read 3 42050 NULL +InterfaceTransmitPacket_42058 InterfaceTransmitPacket 3 42058 NULL +alloc_bitset_42085 alloc_bitset 1 42085 NULL @@ -107341,7 +105440,6 @@ index 0000000..9a7096d +omfs_readpages_42490 omfs_readpages 4 42490 NULL +brcmf_sdbrcm_bus_txctl_42492 brcmf_sdbrcm_bus_txctl 3 42492 NULL +bypass_write_42498 bypass_write 3 42498 NULL -+SyS_mincore_42511 SyS_mincore 1 42511 NULL +kvm_write_wall_clock_42520 kvm_write_wall_clock 2 42520 NULL +smk_write_netlbladdr_42525 smk_write_netlbladdr 3 42525 NULL +snd_emux_create_port_42533 snd_emux_create_port 3 42533 NULL @@ -107351,8 +105449,8 @@ index 0000000..9a7096d +iwl_print_event_log_42566 iwl_print_event_log 0-5-7 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 -+__pskb_pull_42602 __pskb_pull 2 42602 NULL nohasharray -+map_state_42602 map_state 1 42602 &__pskb_pull_42602 ++map_state_42602 map_state 1 42602 NULL nohasharray ++__pskb_pull_42602 __pskb_pull 2 42602 &map_state_42602 +nd_get_link_42603 nd_get_link 0 42603 NULL +sys_move_pages_42626 sys_move_pages 2 42626 NULL +resp_write_42628 resp_write 2 42628 NULL @@ -107370,8 +105468,8 @@ index 0000000..9a7096d +ax25_setsockopt_42740 ax25_setsockopt 5 42740 NULL +xen_bind_pirq_gsi_to_irq_42750 xen_bind_pirq_gsi_to_irq 1 42750 NULL +snd_midi_event_decode_42780 snd_midi_event_decode 0 42780 NULL -+isku_sysfs_read_info_42781 isku_sysfs_read_info 6 42781 NULL nohasharray -+cryptd_hash_setkey_42781 cryptd_hash_setkey 3 42781 &isku_sysfs_read_info_42781 ++cryptd_hash_setkey_42781 cryptd_hash_setkey 3 42781 NULL nohasharray ++isku_sysfs_read_info_42781 isku_sysfs_read_info 6 42781 &cryptd_hash_setkey_42781 +koneplus_sysfs_read_42792 koneplus_sysfs_read 6 42792 NULL +ntfs_attr_extend_allocation_42796 ntfs_attr_extend_allocation 0-2 42796 NULL +fw_device_op_compat_ioctl_42804 fw_device_op_compat_ioctl 2-3 42804 NULL @@ -107405,8 +105503,8 @@ index 0000000..9a7096d +nfs_map_group_to_gid_43082 nfs_map_group_to_gid 3 43082 NULL +cpuset_sprintf_memlist_43088 cpuset_sprintf_memlist 0 43088 NULL +ieee80211_if_fmt_drop_unencrypted_43107 ieee80211_if_fmt_drop_unencrypted 3 43107 NULL -+i2c_hid_get_report_43145 i2c_hid_get_report 0 43145 NULL nohasharray -+read_file_dfs_43145 read_file_dfs 3 43145 &i2c_hid_get_report_43145 ++read_file_dfs_43145 read_file_dfs 3 43145 NULL nohasharray ++i2c_hid_get_report_43145 i2c_hid_get_report 0 43145 &read_file_dfs_43145 +uuid_string_43154 uuid_string 0 43154 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 @@ -107436,8 +105534,8 @@ index 0000000..9a7096d +usb_alloc_urb_43436 usb_alloc_urb 1 43436 NULL +ucs2_strsize_43438 ucs2_strsize 0 43438 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 +alloc_new_reservation_43480 alloc_new_reservation 4 43480 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 @@ -107481,8 +105579,8 @@ index 0000000..9a7096d +__get_required_blob_size_43980 __get_required_blob_size 0-2-3 43980 NULL +nla_reserve_43984 nla_reserve 3 43984 NULL +__clkdev_alloc_43990 __clkdev_alloc 1 43990 NULL -+bcm_recvmsg_43992 bcm_recvmsg 4 43992 NULL nohasharray -+scsi_command_size_43992 scsi_command_size 0 43992 &bcm_recvmsg_43992 ++scsi_command_size_43992 scsi_command_size 0 43992 NULL 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 +swiotlb_unmap_page_44063 swiotlb_unmap_page 2 44063 NULL @@ -107490,7 +105588,6 @@ index 0000000..9a7096d +load_discard_44083 load_discard 3 44083 NULL +xlog_recover_add_to_cont_trans_44102 xlog_recover_add_to_cont_trans 4 44102 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 +vmw_gmr_bind_44130 vmw_gmr_bind 3 44130 NULL +scsi_get_resid_44147 scsi_get_resid 0 44147 NULL +ubifs_find_dirty_idx_leb_44169 ubifs_find_dirty_idx_leb 0 44169 NULL @@ -107585,8 +105682,8 @@ index 0000000..9a7096d +stmpe_irq_map_45146 stmpe_irq_map 2 45146 NULL +crypto_aead_blocksize_45148 crypto_aead_blocksize 0 45148 NULL +gen_bitmask_string_45149 gen_bitmask_string 6 45149 NULL -+device_write_45156 device_write 3 45156 NULL nohasharray -+ocfs2_remove_inode_range_45156 ocfs2_remove_inode_range 3-4 45156 &device_write_45156 ++ocfs2_remove_inode_range_45156 ocfs2_remove_inode_range 3-4 45156 NULL nohasharray ++device_write_45156 device_write 3 45156 &ocfs2_remove_inode_range_45156 +ocfs2_dq_frozen_trigger_45159 ocfs2_dq_frozen_trigger 4 45159 NULL +tomoyo_write_self_45161 tomoyo_write_self 3 45161 NULL +sta_agg_status_write_45164 sta_agg_status_write 3 45164 NULL @@ -107606,8 +105703,8 @@ index 0000000..9a7096d +copy_vm86_regs_from_user_45340 copy_vm86_regs_from_user 3 45340 NULL +lane2_associate_req_45398 lane2_associate_req 4 45398 NULL +keymap_store_45406 keymap_store 4 45406 NULL -+ieee80211_if_fmt_dot11MeshHWMProotInterval_45421 ieee80211_if_fmt_dot11MeshHWMProotInterval 3 45421 NULL nohasharray -+paging64_gva_to_gpa_45421 paging64_gva_to_gpa 2 45421 &ieee80211_if_fmt_dot11MeshHWMProotInterval_45421 ++paging64_gva_to_gpa_45421 paging64_gva_to_gpa 2 45421 NULL nohasharray ++ieee80211_if_fmt_dot11MeshHWMProotInterval_45421 ieee80211_if_fmt_dot11MeshHWMProotInterval 3 45421 &paging64_gva_to_gpa_45421 +tty_buffer_alloc_45437 tty_buffer_alloc 2 45437 NULL +intel_render_ring_init_dri_45446 intel_render_ring_init_dri 2-3 45446 NULL nohasharray +SYSC_mremap_45446 SYSC_mremap 5-1-2 45446 &intel_render_ring_init_dri_45446 @@ -107639,8 +105736,8 @@ index 0000000..9a7096d +dgram_sendmsg_45679 dgram_sendmsg 4 45679 NULL +smk_write_ambient_45691 smk_write_ambient 3 45691 NULL +dm_compat_ctl_ioctl_45692 dm_compat_ctl_ioctl 3 45692 NULL -+bscnl_emit_45699 bscnl_emit 2-5-0 45699 NULL nohasharray -+unix_dgram_sendmsg_45699 unix_dgram_sendmsg 4 45699 &bscnl_emit_45699 ++unix_dgram_sendmsg_45699 unix_dgram_sendmsg 4 45699 NULL nohasharray ++bscnl_emit_45699 bscnl_emit 2-5-0 45699 &unix_dgram_sendmsg_45699 +dvb_ca_en50221_init_45718 dvb_ca_en50221_init 4 45718 NULL +snd_cs46xx_io_read_45734 snd_cs46xx_io_read 5 45734 NULL +rw_copy_check_uvector_45748 rw_copy_check_uvector 3 45748 NULL nohasharray @@ -107682,8 +105779,8 @@ index 0000000..9a7096d +ata_host_alloc_46094 ata_host_alloc 2 46094 NULL +arizona_set_irq_wake_46101 arizona_set_irq_wake 2 46101 NULL +pkt_ctl_compat_ioctl_46110 pkt_ctl_compat_ioctl 3 46110 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 +paging32_walk_addr_nested_46121 paging32_walk_addr_nested 3 46121 NULL @@ -107700,8 +105797,7 @@ index 0000000..9a7096d +ReadReg_46277 ReadReg 0 46277 NULL +batadv_iv_ogm_queue_add_46319 batadv_iv_ogm_queue_add 3 46319 NULL +qlcnic_83xx_sysfs_flash_bulk_write_46320 qlcnic_83xx_sysfs_flash_bulk_write 4 46320 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 ++__hwahc_dev_set_key_46328 __hwahc_dev_set_key 5 46328 NULL +iwl_dbgfs_chain_noise_read_46355 iwl_dbgfs_chain_noise_read 3 46355 NULL +smk_write_direct_46363 smk_write_direct 3 46363 NULL +__iommu_calculate_agaw_46366 __iommu_calculate_agaw 2 46366 NULL @@ -107821,8 +105917,8 @@ index 0000000..9a7096d +posix_acl_from_disk_47445 posix_acl_from_disk 2 47445 NULL +__load_mapping_47460 __load_mapping 2 47460 NULL +nvme_trans_send_fw_cmd_47479 nvme_trans_send_fw_cmd 4 47479 NULL -+newpart_47485 newpart 6 47485 NULL nohasharray -+wb_force_mapping_47485 wb_force_mapping 2 47485 &newpart_47485 ++wb_force_mapping_47485 wb_force_mapping 2 47485 NULL nohasharray ++newpart_47485 newpart 6 47485 &wb_force_mapping_47485 +core_sys_select_47494 core_sys_select 1 47494 NULL +alloc_arraycache_47505 alloc_arraycache 2 47505 NULL +unlink_simple_47506 unlink_simple 3 47506 NULL @@ -107867,8 +105963,8 @@ index 0000000..9a7096d +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 +lp8788_irq_map_47964 lp8788_irq_map 2 47964 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 ++iwl_dbgfs_ucode_tracing_read_47983 iwl_dbgfs_ucode_tracing_read 3 47983 NULL nohasharray ++mempool_resize_47983 mempool_resize 2 47983 &iwl_dbgfs_ucode_tracing_read_47983 +dbg_port_buf_47990 dbg_port_buf 2 47990 NULL +ib_umad_write_47993 ib_umad_write 3 47993 NULL +ffs_epfile_write_48014 ffs_epfile_write 3 48014 NULL @@ -107915,7 +106011,6 @@ index 0000000..9a7096d +nfs4_alloc_pages_48426 nfs4_alloc_pages 1 48426 NULL +print_filtered_48442 print_filtered 2-0 48442 NULL +tun_recvmsg_48463 tun_recvmsg 4 48463 NULL -+compat_SyS_preadv64_48469 compat_SyS_preadv64 3 48469 NULL +r8712_usbctrl_vendorreq_48489 r8712_usbctrl_vendorreq 6 48489 NULL +send_control_msg_48498 send_control_msg 6 48498 NULL +mlx4_en_create_tx_ring_48501 mlx4_en_create_tx_ring 4 48501 NULL @@ -107936,7 +106031,6 @@ index 0000000..9a7096d +sys_setgroups_48668 sys_setgroups 1 48668 &sm501_create_subdev_48668 +altera_drscan_48698 altera_drscan 2 48698 NULL +kvm_set_irq_routing_48704 kvm_set_irq_routing 3 48704 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 @@ -107947,8 +106041,8 @@ index 0000000..9a7096d +efi_memory_uc_48828 efi_memory_uc 1 48828 NULL +azx_get_position_48841 azx_get_position 0 48841 NULL +vc_do_resize_48842 vc_do_resize 3-4 48842 NULL -+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 ++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 +__ffs_ep0_read_events_48868 __ffs_ep0_read_events 3 48868 NULL +sys_setgroups16_48882 sys_setgroups16 1 48882 NULL +ext2_alloc_branch_48889 ext2_alloc_branch 4 48889 NULL @@ -108080,8 +106174,8 @@ index 0000000..9a7096d +tx_frag_need_fragmentation_read_50153 tx_frag_need_fragmentation_read 3 50153 NULL +set_cmd_header_50155 set_cmd_header 0 50155 NULL +reiserfs_bmap_count_50160 reiserfs_bmap_count 0 50160 NULL -+kmalloc_node_50163 kmalloc_node 1 50163 NULL nohasharray -+aac_nark_ioremap_50163 aac_nark_ioremap 2 50163 &kmalloc_node_50163 ++aac_nark_ioremap_50163 aac_nark_ioremap 2 50163 NULL nohasharray ++kmalloc_node_50163 kmalloc_node 1 50163 &aac_nark_ioremap_50163 +rx_filter_ibss_filter_read_50167 rx_filter_ibss_filter_read 3 50167 NULL +odev_update_50169 odev_update 2 50169 NULL +ieee80211_if_fmt_dot11MeshHWMPRannInterval_50172 ieee80211_if_fmt_dot11MeshHWMPRannInterval 3 50172 NULL nohasharray @@ -108154,8 +106248,8 @@ index 0000000..9a7096d +dvb_play_50814 dvb_play 3 50814 NULL +dpcm_show_state_50827 dpcm_show_state 0 50827 NULL +acpi_ev_install_gpe_block_50829 acpi_ev_install_gpe_block 2 50829 NULL -+create_mem_extents_50835 create_mem_extents 0 50835 NULL nohasharray -+SetArea_50835 SetArea 4 50835 &create_mem_extents_50835 ++SetArea_50835 SetArea 4 50835 NULL nohasharray ++create_mem_extents_50835 create_mem_extents 0 50835 &SetArea_50835 +videobuf_dma_init_user_50839 videobuf_dma_init_user 3 50839 NULL +self_check_write_50856 self_check_write 5 50856 NULL +carl9170_debugfs_write_50857 carl9170_debugfs_write 3 50857 NULL @@ -108174,8 +106268,8 @@ index 0000000..9a7096d +proc_write_51003 proc_write 3 51003 NULL +snd_pcm_default_page_ops_51021 snd_pcm_default_page_ops 2 51021 NULL +lbs_dev_info_51023 lbs_dev_info 3 51023 NULL -+fuse_conn_congestion_threshold_read_51028 fuse_conn_congestion_threshold_read 3 51028 NULL nohasharray -+ntfs_attr_find_51028 ntfs_attr_find 0 51028 &fuse_conn_congestion_threshold_read_51028 ++ntfs_attr_find_51028 ntfs_attr_find 0 51028 NULL nohasharray ++fuse_conn_congestion_threshold_read_51028 fuse_conn_congestion_threshold_read 3 51028 &ntfs_attr_find_51028 +BcmGetSectionValEndOffset_51039 BcmGetSectionValEndOffset 0 51039 NULL +dump_midi_51040 dump_midi 3 51040 NULL +srpt_alloc_ioctx_51042 srpt_alloc_ioctx 2-3 51042 NULL @@ -108267,8 +106361,7 @@ index 0000000..9a7096d +user_read_51881 user_read 3 51881 NULL +memblock_alloc_51884 memblock_alloc 1-2 51884 NULL +dbAdjCtl_51888 dbAdjCtl 0 51888 NULL -+SyS_mq_timedsend_51896 SyS_mq_timedsend 3 51896 NULL nohasharray -+virt_to_phys_51896 virt_to_phys 0 51896 &SyS_mq_timedsend_51896 ++virt_to_phys_51896 virt_to_phys 0 51896 NULL +wmi_set_ie_51919 wmi_set_ie 3 51919 NULL +dbg_status_buf_51930 dbg_status_buf 2 51930 NULL +__tcp_mtu_to_mss_51938 __tcp_mtu_to_mss 0-2 51938 NULL @@ -108297,8 +106390,8 @@ index 0000000..9a7096d +hysdn_conf_write_52145 hysdn_conf_write 3 52145 NULL nohasharray +ext2_alloc_blocks_52145 ext2_alloc_blocks 2 52145 &hysdn_conf_write_52145 +htable_size_52148 htable_size 0-1 52148 NULL -+smk_write_load2_52155 smk_write_load2 3 52155 NULL nohasharray -+__le16_to_cpup_52155 __le16_to_cpup 0 52155 &smk_write_load2_52155 ++__le16_to_cpup_52155 __le16_to_cpup 0 52155 NULL nohasharray ++smk_write_load2_52155 smk_write_load2 3 52155 &__le16_to_cpup_52155 +alix_present_52165 alix_present 1 52165 NULL +ieee80211_if_read_dot11MeshRetryTimeout_52168 ieee80211_if_read_dot11MeshRetryTimeout 3 52168 NULL +mga_compat_ioctl_52170 mga_compat_ioctl 2 52170 NULL @@ -108346,7 +106439,6 @@ index 0000000..9a7096d +ocfs2_make_right_split_rec_52562 ocfs2_make_right_split_rec 3 52562 NULL +emit_code_52583 emit_code 0-3 52583 NULL +isku_sysfs_read_macro_52587 isku_sysfs_read_macro 6 52587 NULL -+SyS_setsockopt_52610 SyS_setsockopt 5 52610 NULL +tps80031_writes_52638 tps80031_writes 3-4 52638 NULL +brcmf_sdio_assert_info_52653 brcmf_sdio_assert_info 4 52653 NULL +SYSC_gethostname_52677 SYSC_gethostname 2 52677 NULL @@ -108421,8 +106513,8 @@ index 0000000..9a7096d +ocfs2_xattr_set_acl_53508 ocfs2_xattr_set_acl 4 53508 NULL +check_acl_53512 check_acl 0 53512 NULL +alloc_pages_exact_nid_53515 alloc_pages_exact_nid 2 53515 NULL -+set_registers_53582 set_registers 3 53582 NULL nohasharray -+SYSC_bind_53582 SYSC_bind 3 53582 &set_registers_53582 ++SYSC_bind_53582 SYSC_bind 3 53582 NULL nohasharray ++set_registers_53582 set_registers 3 53582 &SYSC_bind_53582 +cifs_utf16_bytes_53593 cifs_utf16_bytes 0 53593 NULL +gfn_to_pfn_async_53597 gfn_to_pfn_async 2 53597 NULL +___alloc_bootmem_nopanic_53626 ___alloc_bootmem_nopanic 1-2 53626 NULL @@ -108433,16 +106525,16 @@ index 0000000..9a7096d +lowpan_fragment_xmit_53680 lowpan_fragment_xmit 3-4 53680 NULL +fuse_fill_write_pages_53682 fuse_fill_write_pages 4 53682 NULL +v4l2_event_subscribe_53687 v4l2_event_subscribe 3 53687 NULL -+igb_alloc_q_vector_53690 igb_alloc_q_vector 4-6 53690 NULL nohasharray -+bdev_logical_block_size_53690 bdev_logical_block_size 0 53690 &igb_alloc_q_vector_53690 ++bdev_logical_block_size_53690 bdev_logical_block_size 0 53690 NULL nohasharray ++igb_alloc_q_vector_53690 igb_alloc_q_vector 4-6 53690 &bdev_logical_block_size_53690 +find_overflow_devnum_53711 find_overflow_devnum 0 53711 NULL +bio_integrity_split_53714 bio_integrity_split 3 53714 NULL +__ocfs2_resv_find_window_53721 __ocfs2_resv_find_window 3 53721 NULL +wdm_write_53735 wdm_write 3 53735 NULL +ext3_try_to_allocate_with_rsv_53737 ext3_try_to_allocate_with_rsv 5-3 53737 NULL +da9052_disable_irq_53745 da9052_disable_irq 2 53745 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 nohasharray ++amdtp_out_stream_get_max_payload_53755 amdtp_out_stream_get_max_payload 0 53755 &lpfc_idiag_queacc_read_qe_53755 +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 +qp_alloc_host_work_53798 qp_alloc_host_work 3-5 53798 NULL @@ -108452,8 +106544,8 @@ index 0000000..9a7096d +nls_nullsize_53815 nls_nullsize 0 53815 NULL +pms_read_53873 pms_read 3 53873 NULL +ieee80211_if_fmt_dropped_frames_congestion_53883 ieee80211_if_fmt_dropped_frames_congestion 3 53883 NULL -+SyS_setgroups_53900 SyS_setgroups 1 53900 NULL nohasharray -+ocfs2_rm_xattr_cluster_53900 ocfs2_rm_xattr_cluster 5-4-3 53900 &SyS_setgroups_53900 ++ocfs2_rm_xattr_cluster_53900 ocfs2_rm_xattr_cluster 5-4-3 53900 NULL nohasharray ++SyS_setgroups_53900 SyS_setgroups 1 53900 &ocfs2_rm_xattr_cluster_53900 +proc_file_read_53905 proc_file_read 3 53905 NULL +early_reserve_e820_53915 early_reserve_e820 1-2 53915 NULL +ocfs2_make_clusters_writable_53938 ocfs2_make_clusters_writable 4 53938 NULL @@ -108500,8 +106592,8 @@ index 0000000..9a7096d +irq_domain_associate_many_54307 irq_domain_associate_many 2 54307 NULL +br_fdb_fillbuf_54339 br_fdb_fillbuf 0 54339 NULL +__alloc_dev_table_54343 __alloc_dev_table 2 54343 NULL -+_osd_realloc_seg_54352 _osd_realloc_seg 3 54352 NULL nohasharray -+__get_free_pages_54352 __get_free_pages 0 54352 &_osd_realloc_seg_54352 ++__get_free_pages_54352 __get_free_pages 0 54352 NULL nohasharray ++_osd_realloc_seg_54352 _osd_realloc_seg 3 54352 &__get_free_pages_54352 +tcf_hash_create_54360 tcf_hash_create 4 54360 NULL +read_file_credit_dist_stats_54367 read_file_credit_dist_stats 3 54367 NULL +vfs_readlink_54368 vfs_readlink 3 54368 NULL @@ -108558,8 +106650,8 @@ index 0000000..9a7096d +crypto_tfm_ctx_alignment_54815 crypto_tfm_ctx_alignment 0 54815 &aes_decrypt_fail_read_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 ++nouveau_engctx_create__54839 nouveau_engctx_create_ 8 54839 NULL nohasharray ++ext3_acl_from_disk_54839 ext3_acl_from_disk 2 54839 &nouveau_engctx_create__54839 +ufx_ops_write_54848 ufx_ops_write 3 54848 NULL +printer_read_54851 printer_read 3 54851 NULL +qib_reg_user_mr_54858 qib_reg_user_mr 2-3 54858 NULL @@ -108616,8 +106708,8 @@ index 0000000..9a7096d +__get_vm_area_node_55305 __get_vm_area_node 1 55305 &qp_alloc_guest_work_55305 +do_shmat_55336 do_shmat 5 55336 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 ++sctp_datamsg_from_user_55342 sctp_datamsg_from_user 4 55342 NULL nohasharray ++__wa_xfer_setup_sizes_55342 __wa_xfer_setup_sizes 0 55342 &sctp_datamsg_from_user_55342 +__memblock_alloc_base_55359 __memblock_alloc_base 1-2 55359 NULL +acpi_system_read_event_55362 acpi_system_read_event 3 55362 NULL +nf_nat_ipv4_manip_pkt_55387 nf_nat_ipv4_manip_pkt 2 55387 NULL @@ -108741,8 +106833,8 @@ index 0000000..9a7096d +event_filter_write_56609 event_filter_write 3 56609 NULL +gather_array_56641 gather_array 3 56641 NULL +uvc_debugfs_stats_read_56651 uvc_debugfs_stats_read 3 56651 NULL -+da9055_gpio_to_irq_56686 da9055_gpio_to_irq 2 56686 NULL nohasharray -+snd_gus_dram_read_56686 snd_gus_dram_read 4 56686 &da9055_gpio_to_irq_56686 ++snd_gus_dram_read_56686 snd_gus_dram_read 4 56686 NULL nohasharray ++da9055_gpio_to_irq_56686 da9055_gpio_to_irq 2 56686 &snd_gus_dram_read_56686 +build_map_info_56696 build_map_info 2 56696 NULL +dvb_ringbuffer_read_user_56702 dvb_ringbuffer_read_user 3 56702 NULL +sta_flags_read_56710 sta_flags_read 3 56710 NULL @@ -108773,8 +106865,8 @@ index 0000000..9a7096d +vlsi_alloc_ring_57003 vlsi_alloc_ring 3-4 57003 NULL +btrfs_super_csum_size_57004 btrfs_super_csum_size 0 57004 NULL +aircable_process_packet_57027 aircable_process_packet 4 57027 NULL -+ieee80211_if_fmt_state_57043 ieee80211_if_fmt_state 3 57043 NULL nohasharray -+skb_network_offset_57043 skb_network_offset 0 57043 &ieee80211_if_fmt_state_57043 ++skb_network_offset_57043 skb_network_offset 0 57043 NULL nohasharray ++ieee80211_if_fmt_state_57043 ieee80211_if_fmt_state 3 57043 &skb_network_offset_57043 +bytes_to_samples_57049 bytes_to_samples 0-2 57049 NULL +xfs_buf_read_map_57053 xfs_buf_read_map 3 57053 NULL +autofs_dev_ioctl_compat_57059 autofs_dev_ioctl_compat 3 57059 NULL @@ -108787,8 +106879,8 @@ index 0000000..9a7096d +sysfs_write_file_57116 sysfs_write_file 3 57116 NULL +cipso_v4_gentag_loc_57119 cipso_v4_gentag_loc 0 57119 NULL +nl80211_send_deauth_57136 nl80211_send_deauth 4 57136 NULL nohasharray -+ima_show_htable_value_57136 ima_show_htable_value 2 57136 &nl80211_send_deauth_57136 nohasharray -+rds_ib_sub_signaled_57136 rds_ib_sub_signaled 2 57136 &ima_show_htable_value_57136 ++rds_ib_sub_signaled_57136 rds_ib_sub_signaled 2 57136 &nl80211_send_deauth_57136 nohasharray ++ima_show_htable_value_57136 ima_show_htable_value 2 57136 &rds_ib_sub_signaled_57136 +snd_sonicvibes_getdmac_57140 snd_sonicvibes_getdmac 0 57140 NULL +udl_prime_create_57159 udl_prime_create 2 57159 NULL +__ipath_get_user_pages_57166 __ipath_get_user_pages 1-2 57166 NULL @@ -108895,8 +106987,8 @@ index 0000000..9a7096d +cm4040_write_58079 cm4040_write 3 58079 NULL +udi_log_event_58105 udi_log_event 3 58105 NULL +savemem_58129 savemem 3 58129 NULL -+slhc_init_58135 slhc_init 1-2 58135 NULL nohasharray -+ipv6_flowlabel_opt_58135 ipv6_flowlabel_opt 3 58135 &slhc_init_58135 ++ipv6_flowlabel_opt_58135 ipv6_flowlabel_opt 3 58135 NULL nohasharray ++slhc_init_58135 slhc_init 1-2 58135 &ipv6_flowlabel_opt_58135 +garmin_write_bulk_58191 garmin_write_bulk 3 58191 NULL +asix_write_cmd_58192 asix_write_cmd 5 58192 NULL +ieee80211_if_fmt_flags_58205 ieee80211_if_fmt_flags 3 58205 NULL @@ -108995,8 +107087,8 @@ index 0000000..9a7096d +scsi_io_completion_59122 scsi_io_completion 2 59122 NULL +nfc_llcp_send_i_frame_59130 nfc_llcp_send_i_frame 3 59130 NULL +__iio_add_event_config_attrs_59136 __iio_add_event_config_attrs 0 59136 NULL -+framebuffer_alloc_59145 framebuffer_alloc 1 59145 NULL nohasharray -+print_devstats_dot11RTSSuccessCount_59145 print_devstats_dot11RTSSuccessCount 3 59145 &framebuffer_alloc_59145 ++print_devstats_dot11RTSSuccessCount_59145 print_devstats_dot11RTSSuccessCount 3 59145 NULL nohasharray ++framebuffer_alloc_59145 framebuffer_alloc 1 59145 &print_devstats_dot11RTSSuccessCount_59145 +radeon_compat_ioctl_59150 radeon_compat_ioctl 2 59150 NULL +pvr2_hdw_report_clients_59152 pvr2_hdw_report_clients 3 59152 NULL +setup_window_59178 setup_window 4-2-5-7 59178 NULL @@ -109037,9 +107129,8 @@ index 0000000..9a7096d +mem_fwlog_free_mem_blks_read_59616 mem_fwlog_free_mem_blks_read 3 59616 NULL +mtrr_write_59622 mtrr_write 3 59622 NULL +find_first_zero_bit_59636 find_first_zero_bit 0-2 59636 NULL -+SyS_setdomainname_59646 SyS_setdomainname 2 59646 NULL -+hidraw_read_59650 hidraw_read 3 59650 NULL nohasharray -+ubifs_setxattr_59650 ubifs_setxattr 4 59650 &hidraw_read_59650 ++ubifs_setxattr_59650 ubifs_setxattr 4 59650 NULL nohasharray ++hidraw_read_59650 hidraw_read 3 59650 &ubifs_setxattr_59650 +v9fs_xattr_set_acl_59651 v9fs_xattr_set_acl 4 59651 NULL +paravirt_sched_clock_59660 paravirt_sched_clock 0 59660 NULL +__devcgroup_check_permission_59665 __devcgroup_check_permission 0 59665 NULL @@ -109088,8 +107179,8 @@ index 0000000..9a7096d +sys_sched_getaffinity_60033 sys_sched_getaffinity 2 60033 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 nohasharray -+pin_2_irq_60050 pin_2_irq 0-3 60050 &vcs_size_60050 ++pin_2_irq_60050 pin_2_irq 0-3 60050 NULL nohasharray ++vcs_size_60050 vcs_size 0 60050 &pin_2_irq_60050 +gru_alloc_gts_60056 gru_alloc_gts 3-2 60056 NULL +compat_writev_60063 compat_writev 3 60063 NULL +ieee80211_build_probe_req_60064 ieee80211_build_probe_req 6-8 60064 NULL @@ -109106,8 +107197,8 @@ index 0000000..9a7096d +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 +svc_compat_ioctl_60194 svc_compat_ioctl 3 60194 NULL -+qib_reg_phys_mr_60202 qib_reg_phys_mr 3 60202 NULL nohasharray -+ib_send_cm_mra_60202 ib_send_cm_mra 4 60202 &qib_reg_phys_mr_60202 ++ib_send_cm_mra_60202 ib_send_cm_mra 4 60202 NULL nohasharray ++qib_reg_phys_mr_60202 qib_reg_phys_mr 3 60202 &ib_send_cm_mra_60202 +set_tap_pfs_60203 set_tap_pfs 3 60203 NULL +ieee80211_mgmt_tx_60209 ieee80211_mgmt_tx 7 60209 NULL +btrfs_get_token_16_60220 btrfs_get_token_16 0 60220 NULL @@ -109236,7 +107327,6 @@ index 0000000..9a7096d +fragmentation_threshold_read_61718 fragmentation_threshold_read 3 61718 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 +batadv_dat_snoop_incoming_arp_reply_61801 batadv_dat_snoop_incoming_arp_reply 3 61801 NULL +tps80031_irq_init_61830 tps80031_irq_init 3 61830 NULL +bfad_debugfs_write_regwr_61841 bfad_debugfs_write_regwr 3 61841 NULL @@ -109254,7 +107344,6 @@ index 0000000..9a7096d +au0828_init_isoc_61917 au0828_init_isoc 3-2 61917 NULL +sctp_sendmsg_61919 sctp_sendmsg 4 61919 NULL +send_bulk_static_data_61932 send_bulk_static_data 3 61932 NULL -+SyS_kexec_load_61946 SyS_kexec_load 2 61946 NULL +gfn_to_pfn_memslot_atomic_61947 gfn_to_pfn_memslot_atomic 2 61947 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 @@ -109264,7 +107353,6 @@ index 0000000..9a7096d +module_alloc_exec_61991 module_alloc_exec 1 61991 NULL +virtnet_send_command_61993 virtnet_send_command 5-6 61993 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 +pmcraid_build_passthrough_ioadls_62034 pmcraid_build_passthrough_ioadls 2 62034 NULL @@ -109279,7 +107367,6 @@ index 0000000..9a7096d +qib_diag_write_62133 qib_diag_write 3 62133 NULL +ql_status_62135 ql_status 5 62135 NULL +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 +alloc_upcall_62186 alloc_upcall 2 62186 NULL +btrfs_xattr_acl_set_62203 btrfs_xattr_acl_set 4 62203 NULL @@ -109308,17 +107395,16 @@ index 0000000..9a7096d +remove_mapping_62491 remove_mapping 2 62491 NULL +mlx4_en_create_rx_ring_62498 mlx4_en_create_rx_ring 3 62498 NULL +ext_rts51x_sd_execute_read_data_62501 ext_rts51x_sd_execute_read_data 9 62501 NULL -+i915_next_seqno_read_62524 i915_next_seqno_read 3 62524 NULL nohasharray -+pep_sendmsg_62524 pep_sendmsg 4 62524 &i915_next_seqno_read_62524 ++pep_sendmsg_62524 pep_sendmsg 4 62524 NULL nohasharray ++i915_next_seqno_read_62524 i915_next_seqno_read 3 62524 &pep_sendmsg_62524 +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 +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 nohasharray -+prism2_send_mgmt_62605 prism2_send_mgmt 4 62605 &nfsd_vfs_read_62605 ++prism2_send_mgmt_62605 prism2_send_mgmt 4 62605 NULL nohasharray ++nfsd_vfs_read_62605 nfsd_vfs_read 6 62605 &prism2_send_mgmt_62605 +iommu_area_alloc_62619 iommu_area_alloc 2-3-4-7 62619 NULL +ems_pcmcia_add_card_62627 ems_pcmcia_add_card 2 62627 NULL +compat_rangeinfo_62630 compat_rangeinfo 2 62630 NULL @@ -109336,7 +107422,6 @@ index 0000000..9a7096d +ax25_sendmsg_62770 ax25_sendmsg 4 62770 NULL +page_key_alloc_62771 page_key_alloc 0 62771 NULL +C_SYSC_ipc_62776 C_SYSC_ipc 5-3-6-4 62776 NULL -+SyS_sched_getaffinity_62786 SyS_sched_getaffinity 2 62786 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 @@ -109365,7 +107450,6 @@ index 0000000..9a7096d +ib_send_cm_rtu_63138 ib_send_cm_rtu 3 63138 NULL +xen_zap_pfn_range_63149 xen_zap_pfn_range 1 63149 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 +module_alloc_update_bounds_rw_63233 module_alloc_update_bounds_rw 1 63233 NULL @@ -109441,18 +107525,16 @@ index 0000000..9a7096d +read_file_frameerrors_64001 read_file_frameerrors 3 64001 NULL +kmemdup_64015 kmemdup 2 64015 NULL +SyS_rt_sigpending_64018 SyS_rt_sigpending 2 64018 NULL -+tcf_csum_skb_nextlayer_64025 tcf_csum_skb_nextlayer 3 64025 NULL nohasharray -+offset_to_vaddr_64025 offset_to_vaddr 0-2 64025 &tcf_csum_skb_nextlayer_64025 ++offset_to_vaddr_64025 offset_to_vaddr 0-2 64025 NULL nohasharray ++tcf_csum_skb_nextlayer_64025 tcf_csum_skb_nextlayer 3 64025 &offset_to_vaddr_64025 +dbAllocDmapLev_64030 dbAllocDmapLev 0 64030 NULL +resize_async_buffer_64031 resize_async_buffer 4 64031 NULL -+SyS_fsetxattr_64039 SyS_fsetxattr 4 64039 NULL +sep_lli_table_secure_dma_64042 sep_lli_table_secure_dma 2-3 64042 NULL +tfrc_calc_x_reverse_lookup_64057 tfrc_calc_x_reverse_lookup 0 64057 NULL +get_u8_64076 get_u8 0 64076 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 -+SyS_set_mempolicy_64096 SyS_set_mempolicy 3 64096 NULL +SyS_mq_timedsend_64107 SyS_mq_timedsend 3 64107 NULL +do_load_xattr_datum_64118 do_load_xattr_datum 0 64118 NULL +ol_quota_entries_per_block_64122 ol_quota_entries_per_block 0 64122 NULL @@ -109501,8 +107583,8 @@ index 0000000..9a7096d +single_open_size_64483 single_open_size 4 64483 NULL +p54_parse_rssical_64493 p54_parse_rssical 3 64493 NULL +msg_data_sz_64503 msg_data_sz 0 64503 NULL -+handle_abnormal_pfn_64505 handle_abnormal_pfn 3 64505 NULL nohasharray -+remove_uuid_64505 remove_uuid 4 64505 &handle_abnormal_pfn_64505 ++remove_uuid_64505 remove_uuid 4 64505 NULL nohasharray ++handle_abnormal_pfn_64505 handle_abnormal_pfn 3 64505 &remove_uuid_64505 +crypto_blkcipher_alignmask_64520 crypto_blkcipher_alignmask 0 64520 NULL +opera1_usb_i2c_msgxfer_64521 opera1_usb_i2c_msgxfer 4 64521 NULL +ses_send_diag_64527 ses_send_diag 4 64527 NULL @@ -112330,31 +110412,18 @@ index 0000000..4fae911 + return 0; +} diff --git a/tools/lib/lk/Makefile b/tools/lib/lk/Makefile -index 926cbf3..b8403e0 100644 +index 280dd82..077b427 100644 --- a/tools/lib/lk/Makefile +++ b/tools/lib/lk/Makefile -@@ -10,7 +10,7 @@ LIB_OBJS += $(OUTPUT)debugfs.o +@@ -28,7 +28,7 @@ LIB_OBJS += $(OUTPUT)debugfs.o LIBFILE = liblk.a -CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -fPIC +CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -fPIC - EXTLIBS = -lpthread -lrt -lelf -lm + EXTLIBS = -lelf -lpthread -lrt -lm ALL_CFLAGS = $(CFLAGS) $(BASIC_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ALL_LDFLAGS = $(LDFLAGS) -diff --git a/tools/perf/Makefile b/tools/perf/Makefile -index b0f164b..63c9f7d 100644 ---- a/tools/perf/Makefile -+++ b/tools/perf/Makefile -@@ -188,7 +188,7 @@ endif - - ifndef PERF_DEBUG - ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -D_FORTIFY_SOURCE=2,-D_FORTIFY_SOURCE=2),y) -- CFLAGS := $(CFLAGS) -D_FORTIFY_SOURCE=2 -+ CFLAGS := $(CFLAGS) -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 - endif - endif - diff --git a/tools/perf/util/include/asm/alternative-asm.h b/tools/perf/util/include/asm/alternative-asm.h index 6789d78..4afd019e 100644 --- a/tools/perf/util/include/asm/alternative-asm.h @@ -112385,7 +110454,7 @@ index 96b919d..c49bb74 100644 + #endif diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c -index 302681c..3bde377 100644 +index 1580dd4..5627b5b 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -75,12 +75,17 @@ LIST_HEAD(vm_list); @@ -112466,7 +110535,7 @@ index 302681c..3bde377 100644 hardware_disable_all_nolock(); r = -EBUSY; } -@@ -3099,7 +3104,7 @@ static void kvm_sched_out(struct preempt_notifier *pn, +@@ -3100,7 +3105,7 @@ static void kvm_sched_out(struct preempt_notifier *pn, kvm_arch_vcpu_put(vcpu); } @@ -112475,7 +110544,7 @@ index 302681c..3bde377 100644 struct module *module) { int r; -@@ -3146,7 +3151,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, +@@ -3147,7 +3152,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, @@ -112484,7 +110553,7 @@ index 302681c..3bde377 100644 if (!kvm_vcpu_cache) { r = -ENOMEM; goto out_free_3; -@@ -3156,9 +3161,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, +@@ -3157,9 +3162,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, if (r) goto out_free; @@ -112496,7 +110565,7 @@ index 302681c..3bde377 100644 r = misc_register(&kvm_dev); if (r) { -@@ -3168,9 +3175,6 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, +@@ -3169,9 +3176,6 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, register_syscore_ops(&kvm_syscore_ops); diff --git a/3.10.11/4425_grsec_remove_EI_PAX.patch b/3.11.1/4425_grsec_remove_EI_PAX.patch index 415fda5..415fda5 100644 --- a/3.10.11/4425_grsec_remove_EI_PAX.patch +++ b/3.11.1/4425_grsec_remove_EI_PAX.patch diff --git a/3.10.11/4427_force_XATTR_PAX_tmpfs.patch b/3.11.1/4427_force_XATTR_PAX_tmpfs.patch index 3090b07..3090b07 100644 --- a/3.10.11/4427_force_XATTR_PAX_tmpfs.patch +++ b/3.11.1/4427_force_XATTR_PAX_tmpfs.patch diff --git a/3.10.11/4430_grsec-remove-localversion-grsec.patch b/3.11.1/4430_grsec-remove-localversion-grsec.patch index 31cf878..31cf878 100644 --- a/3.10.11/4430_grsec-remove-localversion-grsec.patch +++ b/3.11.1/4430_grsec-remove-localversion-grsec.patch diff --git a/3.10.11/4435_grsec-mute-warnings.patch b/3.11.1/4435_grsec-mute-warnings.patch index ed941d5..ed941d5 100644 --- a/3.10.11/4435_grsec-mute-warnings.patch +++ b/3.11.1/4435_grsec-mute-warnings.patch diff --git a/3.10.11/4440_grsec-remove-protected-paths.patch b/3.11.1/4440_grsec-remove-protected-paths.patch index 05710b1..05710b1 100644 --- a/3.10.11/4440_grsec-remove-protected-paths.patch +++ b/3.11.1/4440_grsec-remove-protected-paths.patch diff --git a/3.10.11/4450_grsec-kconfig-default-gids.patch b/3.11.1/4450_grsec-kconfig-default-gids.patch index 7a1010d..7a1010d 100644 --- a/3.10.11/4450_grsec-kconfig-default-gids.patch +++ b/3.11.1/4450_grsec-kconfig-default-gids.patch diff --git a/3.10.11/4465_selinux-avc_audit-log-curr_ip.patch b/3.11.1/4465_selinux-avc_audit-log-curr_ip.patch index 07de5c4..07de5c4 100644 --- a/3.10.11/4465_selinux-avc_audit-log-curr_ip.patch +++ b/3.11.1/4465_selinux-avc_audit-log-curr_ip.patch diff --git a/3.10.11/4470_disable-compat_vdso.patch b/3.11.1/4470_disable-compat_vdso.patch index a2d6ed9..a2d6ed9 100644 --- a/3.10.11/4470_disable-compat_vdso.patch +++ b/3.11.1/4470_disable-compat_vdso.patch diff --git a/3.10.11/4475_emutramp_default_on.patch b/3.11.1/4475_emutramp_default_on.patch index cfde6f8..cfde6f8 100644 --- a/3.10.11/4475_emutramp_default_on.patch +++ b/3.11.1/4475_emutramp_default_on.patch diff --git a/3.2.51/0000_README b/3.2.51/0000_README index 84f3d3b..e6c614e 100644 --- a/3.2.51/0000_README +++ b/3.2.51/0000_README @@ -122,7 +122,7 @@ Patch: 1050_linux-3.2.51.patch From: http://www.kernel.org Desc: Linux 3.2.51 -Patch: 4420_grsecurity-2.9.1-3.2.51-201309101928.patch +Patch: 4420_grsecurity-2.9.1-3.2.51-201309142348.patch From: http://www.grsecurity.net Desc: hardened-sources base patch from upstream grsecurity diff --git a/3.2.51/4420_grsecurity-2.9.1-3.2.51-201309101928.patch b/3.2.51/4420_grsecurity-2.9.1-3.2.51-201309142348.patch index 04ff2b3..1e50463 100644 --- a/3.2.51/4420_grsecurity-2.9.1-3.2.51-201309101928.patch +++ b/3.2.51/4420_grsecurity-2.9.1-3.2.51-201309142348.patch @@ -30378,6 +30378,32 @@ index 9e76a32..48d7145 100644 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len)) goto error; +diff --git a/crypto/api.c b/crypto/api.c +index 033a714..4f98dd5 100644 +--- a/crypto/api.c ++++ b/crypto/api.c +@@ -40,6 +40,8 @@ static inline struct crypto_alg *crypto_alg_get(struct crypto_alg *alg) + return alg; + } + ++static struct crypto_alg *crypto_larval_wait(struct crypto_alg *alg); ++ + struct crypto_alg *crypto_mod_get(struct crypto_alg *alg) + { + return try_module_get(alg->cra_module) ? crypto_alg_get(alg) : NULL; +@@ -150,8 +152,11 @@ static struct crypto_alg *crypto_larval_add(const char *name, u32 type, + } + up_write(&crypto_alg_sem); + +- if (alg != &larval->alg) ++ if (alg != &larval->alg) { + kfree(larval); ++ if (crypto_is_larval(alg)) ++ alg = crypto_larval_wait(alg); ++ } + + return alg; + } diff --git a/crypto/cryptd.c b/crypto/cryptd.c index 7bdd61b..afec999 100644 --- a/crypto/cryptd.c @@ -58841,10 +58867,10 @@ index 8a89949..6776861 100644 xfs_init_zones(void) diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig new file mode 100644 -index 0000000..2bdbcaa +index 0000000..138a59d --- /dev/null +++ b/grsecurity/Kconfig -@@ -0,0 +1,1079 @@ +@@ -0,0 +1,1080 @@ +# +# grecurity configuration +# @@ -59824,6 +59850,7 @@ index 0000000..2bdbcaa +config GRKERNSEC_DENYUSB + bool "Deny new USB connections after toggle" + default y if GRKERNSEC_CONFIG_AUTO ++ depends on SYSCTL && USB_SUPPORT + help + If you say Y here, a new sysctl option with name "deny_new_usb" + will be created. Setting its value to 1 will prevent any new @@ -59839,7 +59866,7 @@ index 0000000..2bdbcaa +config GRKERNSEC_DENYUSB_FORCE + bool "Reject all USB devices not connected at boot" + select USB -+ depends on SYSCTL && GRKERNSEC_DENYUSB ++ depends on GRKERNSEC_DENYUSB + help + If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled + that doesn't involve a sysctl entry. This option should only be @@ -94098,10 +94125,100 @@ index 7635107..4670276 100644 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len); diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c -index 8104278..300d89d 100644 +index 8104278..7aed9a7 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c -@@ -977,7 +977,7 @@ static const struct inet6_protocol sctpv6_protocol = { +@@ -205,45 +205,23 @@ out: + in6_dev_put(idev); + } + +-/* Based on tcp_v6_xmit() in tcp_ipv6.c. */ + static int sctp_v6_xmit(struct sk_buff *skb, struct sctp_transport *transport) + { + struct sock *sk = skb->sk; + struct ipv6_pinfo *np = inet6_sk(sk); +- struct flowi6 fl6; ++ struct flowi6 *fl6 = &transport->fl.u.ip6; + +- memset(&fl6, 0, sizeof(fl6)); ++ pr_debug("%s: skb:%p, len:%d, src:%pI6 dst:%pI6\n", __func__, skb, ++ skb->len, &fl6->saddr, &fl6->daddr); + +- fl6.flowi6_proto = sk->sk_protocol; +- +- /* Fill in the dest address from the route entry passed with the skb +- * and the source address from the transport. +- */ +- ipv6_addr_copy(&fl6.daddr, &transport->ipaddr.v6.sin6_addr); +- ipv6_addr_copy(&fl6.saddr, &transport->saddr.v6.sin6_addr); +- +- fl6.flowlabel = np->flow_label; +- IP6_ECN_flow_xmit(sk, fl6.flowlabel); +- if (ipv6_addr_type(&fl6.saddr) & IPV6_ADDR_LINKLOCAL) +- fl6.flowi6_oif = transport->saddr.v6.sin6_scope_id; +- else +- fl6.flowi6_oif = sk->sk_bound_dev_if; +- +- if (np->opt && np->opt->srcrt) { +- struct rt0_hdr *rt0 = (struct rt0_hdr *) np->opt->srcrt; +- ipv6_addr_copy(&fl6.daddr, rt0->addr); +- } +- +- SCTP_DEBUG_PRINTK("%s: skb:%p, len:%d, src:%pI6 dst:%pI6\n", +- __func__, skb, skb->len, +- &fl6.saddr, &fl6.daddr); +- +- SCTP_INC_STATS(SCTP_MIB_OUTSCTPPACKS); ++ IP6_ECN_flow_xmit(sk, fl6->flowlabel); + + if (!(transport->param_flags & SPP_PMTUD_ENABLE)) + skb->local_df = 1; + +- return ip6_xmit(sk, skb, &fl6, np->opt, np->tclass); ++ SCTP_INC_STATS(sock_net(sk), SCTP_MIB_OUTSCTPPACKS); ++ ++ return ip6_xmit(sk, skb, fl6, np->opt, np->tclass); + } + + /* Returns the dst cache entry for the given source and destination ip +@@ -256,10 +234,12 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr, + struct dst_entry *dst = NULL; + struct flowi6 *fl6 = &fl->u.ip6; + struct sctp_bind_addr *bp; ++ struct ipv6_pinfo *np = inet6_sk(sk); + struct sctp_sockaddr_entry *laddr; + union sctp_addr *baddr = NULL; + union sctp_addr *daddr = &t->ipaddr; + union sctp_addr dst_saddr; ++ struct in6_addr *final_p, final; + __u8 matchlen = 0; + __u8 bmatchlen; + sctp_scope_t scope; +@@ -282,7 +262,8 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr, + SCTP_DEBUG_PRINTK("SRC=%pI6 - ", &fl6->saddr); + } + +- dst = ip6_dst_lookup_flow(sk, fl6, NULL, false); ++ final_p = fl6_update_dst(fl6, np->opt, &final); ++ dst = ip6_dst_lookup_flow(sk, fl6, final_p, false); + if (!asoc || saddr) + goto out; + +@@ -333,10 +314,12 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr, + } + } + rcu_read_unlock(); ++ + if (baddr) { + ipv6_addr_copy(&fl6->saddr, &baddr->v6.sin6_addr); + fl6->fl6_sport = baddr->v6.sin6_port; +- dst = ip6_dst_lookup_flow(sk, fl6, NULL, false); ++ final_p = fl6_update_dst(fl6, np->opt, &final); ++ dst = ip6_dst_lookup_flow(sk, fl6, final_p, false); + } + + out: +@@ -977,7 +960,7 @@ static const struct inet6_protocol sctpv6_protocol = { .flags = INET6_PROTO_NOPOLICY | INET6_PROTO_FINAL, }; @@ -94110,7 +94227,7 @@ index 8104278..300d89d 100644 .sa_family = AF_INET6, .sctp_xmit = sctp_v6_xmit, .setsockopt = ipv6_setsockopt, -@@ -1009,7 +1009,7 @@ static struct sctp_af sctp_af_inet6 = { +@@ -1009,7 +992,7 @@ static struct sctp_af sctp_af_inet6 = { #endif }; @@ -94119,7 +94236,7 @@ index 8104278..300d89d 100644 .event_msgname = sctp_inet6_event_msgname, .skb_msgname = sctp_inet6_skb_msgname, .af_supported = sctp_inet6_af_supported, -@@ -1034,7 +1034,7 @@ void sctp_v6_pf_init(void) +@@ -1034,7 +1017,7 @@ void sctp_v6_pf_init(void) void sctp_v6_pf_exit(void) { |