From patchwork Sat Jan 27 15:53:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin 'ldir' Darbyshire-Bryant X-Patchwork-Id: 866736 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="d+4NVadQ"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=darbyshire-bryant.me.uk header.i=@darbyshire-bryant.me.uk header.b="JWpxoyxs"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zTL1j30Qsz9sBd for ; Sun, 28 Jan 2018 02:54:33 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=nFQKQBJYTRcMJ62cQVIxblx1auzrP866Jwb8cmKGUok=; b=d+4NVadQqZzMq7 7XdoxmBgazNc4Xa1k5NvYWNp+dZ92gaBpT6QPWtZVBCqiUsshRkJku4fV1pLhSyfVR8Fm+IiNnk24 5hXxcwmiTVSPS0uXGFAYPUuqHeb0teLITj3POasK0xCFbyWMk8pFjAhyXoqvBRp6k6bnvu33Ts/6V b1H03cVqtwFiLnUt5hyhhC5t4oJCWEXQ94dwq565r7ZLIqowuExEuPzxhQM0CER/QkfzKpwaJY45I K0ORpcED8u5e4r0lOM34xKpbyeg2Awya1qCe480geIn3tl3BHV1N/gpeGB4YBfJTDT0XHZfPl4/Jn ZzrEBaHthu1mmzZjO4kw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1efSoG-0007e9-58; Sat, 27 Jan 2018 15:54:28 +0000 Received: from mail-eopbgr40058.outbound.protection.outlook.com ([40.107.4.58] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1efSoC-0007dd-TV for lede-dev@lists.infradead.org; Sat, 27 Jan 2018 15:54:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darbyshire-bryant.me.uk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=e9li1sRBX8yZqva1uiGNN1gV37d4raZXtOopBT7ZQPI=; b=JWpxoyxsRFNjYClJELigta6MtF8UHFrWhfsqEcBGv9WctcwTzC41GkQWM8prpll+sYkAnsgo0KbhdWh1FaE9G3tWuDg+ARkzOI1r52a9FXb6rjkRWie3FKYme7eYK1KbuK3WBh8HeGNHjjDYUb9KI0nsyn+WIWhlOqgtyVyQGmo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kevin@darbyshire-bryant.me.uk; Received: from Rowlf.darbyshire-bryant.me.uk (151.231.154.194) by HE1PR0702MB3739.eurprd07.prod.outlook.com (2603:10a6:7:8d::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.464.6; Sat, 27 Jan 2018 15:54:07 +0000 From: Kevin Darbyshire-Bryant To: lede-dev@lists.infradead.org Date: Sat, 27 Jan 2018 15:53:57 +0000 Message-Id: <20180127155357.98759-1-ldir@darbyshire-bryant.me.uk> X-Mailer: git-send-email 2.14.3 (Apple Git-98) MIME-Version: 1.0 X-Originating-IP: [151.231.154.194] X-ClientProxiedBy: VI1PR0802CA0009.eurprd08.prod.outlook.com (2603:10a6:800:aa::19) To HE1PR0702MB3739.eurprd07.prod.outlook.com (2603:10a6:7:8d::29) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3c15227d-4386-42bd-05f9-08d5659e32e9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:HE1PR0702MB3739; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0702MB3739; 3:qaOYHefGmpJDFSQh0VWxAh6HlJ7ahVMKEM6hYWw5zDAaofEQ8kir5i2pruDKsgejwMFvI+S4c6bLhk1CSSpsG6A17QK3Bqt7fVoeWABgnuJqJV9ODCqB+KDsztkkpQuypWgCGz5w4PxMwTZ+qCjwrz7uqvolf8Rduv2vGjSrOYa+Gtn5rpzvTHk5Rcy+KTtDeLHAOhCfUP2hokcT7bWNuOdPdb/U8u6u91UZzN5nNIYc/1imiLC5IvObO3nLZAGE; 25:SmOm2Jod7rUsbOm7e9/K+exsnutGgD7Ke+hsusVT5wz3Y0rkl1eV6vEC7bBrit+QFAWorstXQk1nLU5iK8NZk00/JC7VB5u0bRCQ14HwTqM3+ynCqNEWOAwrEZve7zyLIApRK89UIZZ24yT3rrTfy8TXyy9i8D7v8iGB3ulYpUobt+po7/U0futuXRF+oAJVcPOEH+bzH1PJS6s1UnPimGWk5UJUizTZZzkzTftA/o6Z0iyThcnNIH12qBRC9MJxtaSucBUBCyF3utQ1SNSjUDEocixJuHlLUsOjG6WdOGNyyrC5YUTrEk/ShDcGd5NW+sTgm3HMjpeRqc0Po8eYSg==; 31:iaLdouWXkvfbZl2EYAe8PT5q+KmL6YUoXxs1KfULZdXucR3W1NUZ7Hmzx9FZPwWudQfFSSfcCerZfwictEjp7GPTPHnmgwWakbjNCbOQKyP2jC2tFcRTS3+AU/AOCFg7Tb2MHb7GzmpQzVYDJEfvmosh3zQpx9EsRMZDsLwHoUooc0Is/yF25ri+3suKw8kdrKXSC/YzhbVzO/cF7LjCVnCw6XPK9/WYP00Us4vhqXE= X-MS-TrafficTypeDiagnostic: HE1PR0702MB3739: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(7411616537696); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(10201501046)(3231023)(2400081)(944501161)(93006095)(93001095)(3002001)(6041288)(2016111802025)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(6043046)(6072148)(201708071742011); SRVR:HE1PR0702MB3739; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0702MB3739; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0702MB3739; 4:HNFeYaWPT3Nu8z3U33sbBssLSC1IkCn94FaDypfXdqJJQNlN4Se8pt4Y+tOc1VKi0JtJrEcJj3laIelmP5CBCv8P7xPlX7u/CxaIOPASM9SAcsaaqSXeEaawTmGLBHvymClcMLBFTQ5ABFYAI4fwVfKkr3WRhS2RN/9sJ7lf2gYXqNumzWHYBk5IajJsFC54mgei8N7HLbAMZXFGiztH5YMC5wunm8pQ7R/CVAklto2+LLejlxudKx1q8NF3E5ZMMg3iLy+zoVIZbdd5vf5lNSAfGo8trY3PUTSioGHT9aZgfny5pAkyTkGrqUDopHrl X-Forefront-PRVS: 056544FBEE X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(39830400003)(376002)(396003)(366004)(39380400002)(5423002)(189003)(199004)(186003)(69596002)(50226002)(6916009)(42882006)(7696005)(52116002)(74482002)(59450400001)(81166006)(81156014)(8676002)(575784001)(68736007)(51416003)(47776003)(7736002)(386003)(5660300001)(8936002)(26005)(66066001)(16526019)(305945005)(6666003)(97736004)(478600001)(36756003)(53936002)(25786009)(4326008)(316002)(16586007)(2906002)(105586002)(53416004)(1076002)(2351001)(106356001)(6486002)(3846002)(6116002)(50466002)(48376002)(107886003)(2361001)(21314002); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0702MB3739; H:Rowlf.darbyshire-bryant.me.uk; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: darbyshire-bryant.me.uk does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR0702MB3739; 23:ent0zlOIRNXS9OhRhYjLA/2ak42OQ0RGL/pix33?= ehSDimPQVlptLTuS1CcDo0p+2CUa+4MU85PTIkaujd15i8yImLuyHAwfwyHtxm6BxeAJ7K618I0CAilWGhc1X3rd78wI3iJjx84vewyAYx4Padw6uHxJZihTMJi34sjeyKGjMCX7MKa3TqTYIeOipqi2S06OoGfsMbtVnzvgQ2vGsyy9iqDwouLxP218EpI+P7/ZUH6HRnFKr3SFtFPUNh0k3ABNDG88wQ80a/v2ksi64SEbocbbNvDGfQhPJDGIHnr1NI0uaG84QVOJNM2OXcVlNal+jAq5MhYGB5O9kSsHRs2CtRdFkr/zhNkiKgA0eikqtsytGazJjtc1D0a1Pq/U4Edn71BCABzyJRJI7vJQTZJ9qC/GrrFeLgvPbwGtjtT2uigy94xx+/oS3tGOeyKgKhcplsmckWVUUroDvP/afkJIEoHYGtf/P1PTT0xaKoJgbMXKLfcc5T7+o6jhLOBQYzwjqnMIPUXc+6rxDflaRHnfjf9VLe8Yyc5W1lLmqkDT2V7Bqk+UEaZbi/MZCQA3hUCU16TYkJpHlaiAbeI9Ula0E3OnowKwL5ddU+uGYlZF/C55z9t2nOKH0CdMP/awdxF1TP5Rv+giVZM1nB2fu6EOl9hp21YObuL8Ouhc2/oq5v1ZmnEZnrxW7pttfQ8+d9KYsJ0oO0kdqkPUUoRAWoJ8nhXrlcLed6DLKXLgNQ2H67mbfsecGjot8tU4Ed8vftmJM6U7Wiz9Moazyf6eAMRuGL/0+9u7RFnTRzjeInS5B+ARaTVUS78g3xBqAv6TXAFzmAOo5MSVeHlduF0lQfjN3FcgEf+uNt9WB5eUsdRirWJ9xhx6Whp/SYXONb+++JqISAKbUQZksBd75GESiWMhtBD/M8ZtucDlLhPr762oIH36WmoAoF5haIofuF0TiiT55E/C+3jYTj4h/y8It7HCKb9exjAQecCMS6XVPL6ymMP5/qq6pFbkHIUOj2Wmiy5mlx10U2I+KcUQVm7OZeOCRTiRCjjgbc6jJJ/hgHLg2TKaHuINDCsSwYeNzJbagbEW+exa2EYPEj/QB7tHLHGfT1aUP7EQkHEWIOan569HSbU8WxHi9Zu/1gNedI9z+urK3xiAlrvnIHJSTwWwNRdsGWr2FqUMwMIaR+MRIU/j5Om9hgJph/b5MvPCOr4xwBBfyxmtiahLos9xM1wUmrkh1t0GrhLsQIQ9i1itpCIGruIhuHNCSWdparT6Avpk8 X-Microsoft-Exchange-Diagnostics: 1; HE1PR0702MB3739; 6:oNb2gcUKcYKRB0cNNd/rZMdaGPmkod5E1BmaGaE4rh+ElOc0IGR68YYNWIMC7V+jSNoJp5iZudAI2aVQTIn6uf3ctxL+TucRqy60Re39sa6nG96JrVJyYIpnxvqnSNl+Cel7qFldFNDp0B7Kpx5IIJnfgttUtvT7SsLlnEBJMt01DKNplMhwCvodEDahMv+oWbo0uOup5GPLu5/MDPbwqZoAhf/zgu557HDr2hyXroyELIAPUwpLyMzOjjX7tXfYIuSrZPuG2nbvg3uf1b1hm6hDIF5hWGJJEETUo9f4Lyo6wblTZG6eornBX0UHDEaaeWY+PRxhLSMLslgsWkgBY4J361cA5DEwegnHUmyvpcc=; 5:Jc/ykJUmOWH8YJ/NIAzbi/d+5HfxnzNmLdcipm4DFJKP91vUgI2nFWk06sxb493jxTcQr61C4gJM/wJmcNVzlOfv4yk1lry01KNEUzjEO9MVccl0x7lfHuA16FCo1DdqQIRQ/vCdmwVvzdeUXLT6SEKGwD9V9NW1skCRGo7MW0E=; 24:STN+mJk6L+GiFI/Ty7Lj9ykxI5yNRTXw+mM+UJoZ1ouiprQSVbxKnI0pJwX8a+pVpbjr9oaCE51qCfzzsYCr+rsoupAY47iFDLF2n9dliMU=; 7:6pqSgyvPGAJ4x4Re2adx48GxZlvlwbNbkGwfu2CM9mN0ER8783VMYBQrM92EIm7Zm8OX1An0X1Rm6rGvgDZle1/kyculzh+qtZoXVKgJEnOk7Sx3E4FdmWRc3+jCIkvXA7qTSDjISykX/phlKiUxTmwOIAnmKiEcREWaypz5w/r0sgmvyBXNntK0DCHH7NcKs2TRkVKUlaGvoyqC07ysz480o/eURsyi60A7+CtNVqBoZhgBkEmWAboSQgyiuI8e SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2018 15:54:07.3194 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3c15227d-4386-42bd-05f9-08d5659e32e9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 9151708b-c553-406f-8e56-694f435154a4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0702MB3739 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -3.0 (---) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-3.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [40.107.4.58 listed in list.dnswl.org] -1.0 RCVD_IN_MSPIKE_H5 RBL: Excellent reputation (+5) [40.107.4.58 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Subject: [LEDE-DEV] [PATCH v1] kernel: bump 4.4 to 4.4.113 X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Darbyshire-Bryant Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Refresh patches. Refresh x86/config for RETPOLINE. More Meltdown & Spectre mitigation. Signed-off-by: Kevin Darbyshire-Bryant --- include/kernel-version.mk | 4 ++-- ...backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch | 2 +- target/linux/generic/patches-4.4/221-module_exports.patch | 2 +- target/linux/generic/patches-4.4/834-ledtrig-libata.patch | 8 ++++---- target/linux/oxnas/patches-4.4/999-libata-hacks.patch | 4 ++-- target/linux/x86/config-4.4 | 4 +++- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 344c33009e..c7b038a8e0 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -3,10 +3,10 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .43 -LINUX_VERSION-4.4 = .112 +LINUX_VERSION-4.4 = .113 LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c -LINUX_KERNEL_HASH-4.4.112 = 544b42cbeed022896115c76a18fc97b4507d5b41d7ac0ce1dce9afd6ffd11ecd +LINUX_KERNEL_HASH-4.4.113 = b772d2898d2a791b5bf8bd597beccef385934e237f6c6bb1cf4c609940af773d ifdef KERNEL_PATCHVER LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) diff --git a/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch b/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch index 48714aa466..7cce9bc77f 100644 --- a/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch +++ b/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch @@ -47,7 +47,7 @@ Signed-off-by: Jacek Anaszewski #include #include -@@ -4914,6 +4915,9 @@ void ata_qc_complete(struct ata_queued_c +@@ -4915,6 +4916,9 @@ void ata_qc_complete(struct ata_queued_c { struct ata_port *ap = qc->ap; diff --git a/target/linux/generic/patches-4.4/221-module_exports.patch b/target/linux/generic/patches-4.4/221-module_exports.patch index 510a86c468..44c0a6dec6 100644 --- a/target/linux/generic/patches-4.4/221-module_exports.patch +++ b/target/linux/generic/patches-4.4/221-module_exports.patch @@ -54,7 +54,7 @@ } --- a/scripts/Makefile.build +++ b/scripts/Makefile.build -@@ -299,7 +299,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $( +@@ -372,7 +372,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $( # Linker scripts preprocessor (.lds.S -> .lds) # --------------------------------------------------------------------------- quiet_cmd_cpp_lds_S = LDS $@ diff --git a/target/linux/generic/patches-4.4/834-ledtrig-libata.patch b/target/linux/generic/patches-4.4/834-ledtrig-libata.patch index c3d187a098..ad63634479 100644 --- a/target/linux/generic/patches-4.4/834-ledtrig-libata.patch +++ b/target/linux/generic/patches-4.4/834-ledtrig-libata.patch @@ -69,7 +69,7 @@ Signed-off-by: Daniel Golle /** * ata_build_rw_tf - Build ATA taskfile for given read/write request * @tf: Target ATA taskfile -@@ -4780,6 +4793,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -4781,6 +4794,9 @@ struct ata_queued_cmd *ata_qc_new_init(s if (tag < 0) return NULL; } @@ -79,7 +79,7 @@ Signed-off-by: Daniel Golle qc = __ata_qc_from_tag(ap, tag); qc->tag = tag; -@@ -5677,6 +5693,9 @@ struct ata_port *ata_port_alloc(struct a +@@ -5678,6 +5694,9 @@ struct ata_port *ata_port_alloc(struct a ap->stats.unhandled_irq = 1; ap->stats.idle_irq = 1; #endif @@ -89,7 +89,7 @@ Signed-off-by: Daniel Golle ata_sff_port_init(ap); return ap; -@@ -5698,6 +5717,12 @@ static void ata_host_release(struct devi +@@ -5699,6 +5718,12 @@ static void ata_host_release(struct devi kfree(ap->pmp_link); kfree(ap->slave_link); @@ -102,7 +102,7 @@ Signed-off-by: Daniel Golle kfree(ap); host->ports[i] = NULL; } -@@ -6144,7 +6169,23 @@ int ata_host_register(struct ata_host *h +@@ -6145,7 +6170,23 @@ int ata_host_register(struct ata_host *h host->ports[i]->print_id = atomic_inc_return(&ata_print_id); host->ports[i]->local_port_no = i + 1; } diff --git a/target/linux/oxnas/patches-4.4/999-libata-hacks.patch b/target/linux/oxnas/patches-4.4/999-libata-hacks.patch index 1f4799dd88..ac278ab234 100644 --- a/target/linux/oxnas/patches-4.4/999-libata-hacks.patch +++ b/target/linux/oxnas/patches-4.4/999-libata-hacks.patch @@ -15,7 +15,7 @@ /* initialize internal qc */ /* XXX: Tag 0 is used for drivers with legacy EH as some -@@ -4787,6 +4795,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -4788,6 +4796,9 @@ struct ata_queued_cmd *ata_qc_new_init(s if (unlikely(ap->pflags & ATA_PFLAG_FROZEN)) return NULL; @@ -25,7 +25,7 @@ /* libsas case */ if (ap->flags & ATA_FLAG_SAS_HOST) { tag = ata_sas_allocate_tag(ap); -@@ -4832,6 +4843,8 @@ void ata_qc_free(struct ata_queued_cmd * +@@ -4833,6 +4844,8 @@ void ata_qc_free(struct ata_queued_cmd * qc->tag = ATA_TAG_POISON; if (ap->flags & ATA_FLAG_SAS_HOST) ata_sas_free_tag(tag, ap); diff --git a/target/linux/x86/config-4.4 b/target/linux/x86/config-4.4 index 26bb124b8c..b441679d03 100644 --- a/target/linux/x86/config-4.4 +++ b/target/linux/x86/config-4.4 @@ -40,6 +40,7 @@ CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_ARCH_USE_QUEUED_RWLOCKS=y CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y +CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y @@ -138,6 +139,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_IO=y @@ -351,13 +353,13 @@ CONFIG_RATIONAL=y CONFIG_RD_BZIP2=y CONFIG_RD_GZIP=y # CONFIG_RELOCATABLE is not set +CONFIG_RETPOLINE=y CONFIG_RTC_CLASS=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y # CONFIG_SBC7240_WDT is not set # CONFIG_SBC8360_WDT is not set # CONFIG_SBC_EPX_C3_WATCHDOG is not set # CONFIG_SC1200_WDT is not set -CONFIG_SCHED_HRTICK=y # CONFIG_SCHED_INFO is not set CONFIG_SCSI=y CONFIG_SCSI_SPI_ATTRS=y