From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F2F371381F3 for ; Sun, 15 Sep 2013 19:25:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 69827E0A6E; Sun, 15 Sep 2013 19:25:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 087FDE0A6E for ; Sun, 15 Sep 2013 19:25:57 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C557733E917 for ; Sun, 15 Sep 2013 19:25:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 55A90E530A for ; Sun, 15 Sep 2013 19:25:54 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1379270735.15167dccca0c219bdf1a0c24253974a848069aa4.blueness@gentoo> Subject: [gentoo-commits] proj/hardened-patchset:master commit in: 3.2.51/, 3.11.1/, 3.10.11/ X-VCS-Repository: proj/hardened-patchset X-VCS-Files: 3.10.11/0000_README 3.10.11/1010_linux-3.10.11.patch 3.10.11/4420_grsecurity-2.9.1-3.10.11-201309081953.patch 3.10.11/4425_grsec_remove_EI_PAX.patch 3.10.11/4427_force_XATTR_PAX_tmpfs.patch 3.10.11/4430_grsec-remove-localversion-grsec.patch 3.10.11/4435_grsec-mute-warnings.patch 3.10.11/4440_grsec-remove-protected-paths.patch 3.10.11/4450_grsec-kconfig-default-gids.patch 3.10.11/4465_selinux-avc_audit-log-curr_ip.patch 3.10.11/4470_disable-compat_vdso.patch 3.10.11/4475_emutramp_default_on.patch 3.11.1/0000_README 3.11.1/1000_linux-3.11.1.patch 3.11.1/4420_grsecurity-2.9.1-3.11.1-201309151124.patch 3.11.1/4425_grsec_remove_EI_PAX.patch 3.11.1/4427_force_XATTR_PAX_tmpfs.patch 3.11.1/4430_grsec-remove-localversion-grsec.patch 3.11.1/4435_grsec-mute-warnings.patch 3.11.1/4440_grsec-remove-protected-paths.patch 3.11.1/4450_grsec-kconfig-default-gids.patch 3.11.1/4465_selinux-avc_audit-log-curr_ip.patch 3.11.1/4470_disable-compat_vdso.patch 3.11.1/4475_emutramp_default_on.pat ch 3.2.51/0000_README 3.2.51/4420_grsecurity-2.9.1-3.2.51-201309101928.patch 3.2.51/4420_grsecurity-2.9.1-3.2.51-201309142348.patch X-VCS-Directories: 3.2.51/ 3.11.1/ 3.10.11/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 15167dccca0c219bdf1a0c24253974a848069aa4 X-VCS-Branch: master Date: Sun, 15 Sep 2013 19:25:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 225dee9d-dbb9-40bb-bcda-35172116c850 X-Archives-Hash: 6bdad488dd9368c3adc052d59ed864fa commit: 15167dccca0c219bdf1a0c24253974a848069aa4 Author: Anthony G. Basile gentoo org> AuthorDate: Sun Sep 15 18:45:35 2013 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sun Sep 15 18:45:35 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-patchset.git;a=commit;h=15167dcc Grsec/PaX: 2.9.1-{3.2.51,3.11.1}-201309151124 --- 3.10.11/1010_linux-3.10.11.patch | 1130 -- {3.10.11 => 3.11.1}/0000_README | 6 +- 3.11.1/1000_linux-3.11.1.patch | 401 + ...4420_grsecurity-2.9.1-3.11.1-201309151124.patch | 12617 ++++++++----------- {3.10.11 => 3.11.1}/4425_grsec_remove_EI_PAX.patch | 0 .../4427_force_XATTR_PAX_tmpfs.patch | 0 .../4430_grsec-remove-localversion-grsec.patch | 0 {3.10.11 => 3.11.1}/4435_grsec-mute-warnings.patch | 0 .../4440_grsec-remove-protected-paths.patch | 0 .../4450_grsec-kconfig-default-gids.patch | 0 .../4465_selinux-avc_audit-log-curr_ip.patch | 0 {3.10.11 => 3.11.1}/4470_disable-compat_vdso.patch | 0 {3.10.11 => 3.11.1}/4475_emutramp_default_on.patch | 0 3.2.51/0000_README | 2 +- ...420_grsecurity-2.9.1-3.2.51-201309142348.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 - #include - #include -+#include - -+ -+/* -+ * 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 - #include - --#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 - * -@@ -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 "); -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 - #include - #include -+#include - - 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 similarity index 93% rename from 3.10.11/0000_README rename to 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 + * +@@ -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 "); +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 similarity index 91% rename from 3.10.11/4420_grsecurity-2.9.1-3.10.11-201309081953.patch rename to 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 #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 #include -@@ -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<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 - 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 /* For VMALLOC_END */ #include @@ -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 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 -+#include - #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 #include -@@ -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 #include 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 - #include +@@ -21,7 +21,7 @@ + #define CREATE_TRACE_POINTS + #include -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 + + 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 +@@ -65,7 +65,7 @@ + #include - 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 + #include +@@ -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 +#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 - #include - #include -+#include - - /* - * 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; + + /* 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(); -@@ -146,7 +248,7 @@ static int pkt_type_offset(void) +- 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 - #include - #include -+#include - #include "internal.h" - - MODULE_AUTHOR("Thomas Renninger "); -@@ -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 #include #include -@@ -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 /* 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 "); 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 +@@ -52,6 +52,7 @@ #include #include + #include +#include #include "qib_common.h" @@ -41742,10 +41131,10 @@ index 04c69af..5f92d00 100644 #include #include 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 #include 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 #include -@@ -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