diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-28 08:06:15 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-28 08:06:15 +0100 |
commit | 52af051a452b8dd045d82ae2fc78bdfb2b090b2a (patch) | |
tree | 2f926b830b05e2c94689c2414c25a58d7a738a2d | |
parent | f6a4545c09ec2c20bc657ee0d3a72ca4a5de3db0 (diff) | |
parent | c2007dcec4dfe8bdfb884791034a0d9f8fcf5650 (diff) | |
download | kernel-5.0.0-0.rc4.git0.1.vanilla.knurd.1.fc28.tar.gz kernel-5.0.0-0.rc4.git0.1.vanilla.knurd.1.fc28.tar.xz kernel-5.0.0-0.rc4.git0.1.vanilla.knurd.1.fc28.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.0.0-0.rc4.git0.1.vanilla.knurd.1.fc30kernel-5.0.0-0.rc4.git0.1.vanilla.knurd.1.fc29kernel-5.0.0-0.rc4.git0.1.vanilla.knurd.1.fc28
-rw-r--r-- | 0001-Correct-warning-with-gcc9.patch | 35 | ||||
-rw-r--r-- | 0001-Drop-that-for-now.patch | 25 | ||||
-rw-r--r-- | 0001-s390-jump_label-Correct-asm-contraint.patch | 50 | ||||
-rw-r--r-- | bcm2835-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch | 138 | ||||
-rw-r--r-- | configs/fedora/generic/arm/CONFIG_88EU_AP_MODE | 1 | ||||
-rw-r--r-- | configs/fedora/generic/arm/armv7/CONFIG_88EU_AP_MODE | 1 | ||||
-rw-r--r-- | include-linux-module.h-mark-init-cleanup_module-aliases-as-__cold.patch | 149 | ||||
-rw-r--r-- | kernel-armv7hl-debug.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-debug.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-lpae.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl.config | 2 | ||||
-rw-r--r-- | kernel.spec | 20 | ||||
-rw-r--r-- | lib-crc32.c-mark-crc32_le_base-__crc32c_le_base-aliases-as-__pure.patch | 124 | ||||
-rw-r--r-- | sources | 3 |
14 files changed, 402 insertions, 152 deletions
diff --git a/0001-Correct-warning-with-gcc9.patch b/0001-Correct-warning-with-gcc9.patch new file mode 100644 index 000000000..9a5e94230 --- /dev/null +++ b/0001-Correct-warning-with-gcc9.patch @@ -0,0 +1,35 @@ +From 0de1315ee843713bafb9a59bc040a024f688c62a Mon Sep 17 00:00:00 2001 +From: Laura Abbott <labbott@redhat.com> +Date: Wed, 23 Jan 2019 13:56:47 +0100 +Subject: [PATCH] Correct warning with gcc9 + +Suggested from Arnd + +Signed-off-by: Laura Abbott <labbott@redhat.com> +--- + include/linux/module.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/linux/module.h b/include/linux/module.h +index 8fa38d3e7538..f2a24b59cca4 100644 +--- a/include/linux/module.h ++++ b/include/linux/module.h +@@ -129,13 +129,13 @@ extern void cleanup_module(void); + #define module_init(initfn) \ + static inline initcall_t __maybe_unused __inittest(void) \ + { return initfn; } \ +- int init_module(void) __attribute__((alias(#initfn))); ++ int init_module(void) __attribute__((cold, alias(#initfn))); + + /* This is only required if you want to be unloadable. */ + #define module_exit(exitfn) \ + static inline exitcall_t __maybe_unused __exittest(void) \ + { return exitfn; } \ +- void cleanup_module(void) __attribute__((alias(#exitfn))); ++ void cleanup_module(void) __attribute__((cold, alias(#exitfn))); + + #endif + +-- +2.20.1 + diff --git a/0001-Drop-that-for-now.patch b/0001-Drop-that-for-now.patch new file mode 100644 index 000000000..6419d9d9a --- /dev/null +++ b/0001-Drop-that-for-now.patch @@ -0,0 +1,25 @@ +From 12cec6680e67d6b4fed9e30cd8c1f13871996cc1 Mon Sep 17 00:00:00 2001 +From: Laura Abbott <labbott@redhat.com> +Date: Wed, 23 Jan 2019 14:36:37 +0100 +Subject: [PATCH] Drop that for now + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index f5b1d0d168e0..5f31107b22d1 100644 +--- a/Makefile ++++ b/Makefile +@@ -430,7 +430,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE + KBUILD_CFLAGS := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \ + -fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \ + -Werror-implicit-function-declaration -Werror=implicit-int \ +- -Wno-format-security \ ++ -Wno-format-security -Wno-address-of-packed-member \ + -std=gnu89 + KBUILD_CPPFLAGS := -D__KERNEL__ + KBUILD_AFLAGS_KERNEL := +-- +2.20.1 + diff --git a/0001-s390-jump_label-Correct-asm-contraint.patch b/0001-s390-jump_label-Correct-asm-contraint.patch new file mode 100644 index 000000000..37ece86d1 --- /dev/null +++ b/0001-s390-jump_label-Correct-asm-contraint.patch @@ -0,0 +1,50 @@ +From dc6aae3ea5041f47d2445ba2ce086f9e8679861e Mon Sep 17 00:00:00 2001 +From: Laura Abbott <labbott@redhat.com> +Date: Wed, 23 Jan 2019 13:50:24 +0100 +Subject: [PATCH] s390/jump_label: Correct asm contraint +To: Martin Schwidefsky <schwidefsky@de.ibm.com> +To: Heiko Carstens <heiko.carstens@de.ibm.com> +Cc: linux-s390@vger.kernel.org +Cc: linux-kernel@vger.kernel.org + +There's a build failure with gcc9: + + ./arch/s390/include/asm/jump_label.h: Assembler messages: + ./arch/s390/include/asm/jump_label.h:23: Error: bad expression + ./arch/s390/include/asm/jump_label.h:23: Error: junk at end of line, first unrecognized character is `r' + make[1]: *** [scripts/Makefile.build:277: init/main.o] Error 1 + +According to the toolchain people, the actual issue is the use of +"X" constraint which is too permissive. Switch to using "i" instead. + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1668703 +Signed-off-by: Laura Abbott <labbott@redhat.com> +--- + arch/s390/include/asm/jump_label.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/s390/include/asm/jump_label.h b/arch/s390/include/asm/jump_label.h +index e2d3e6c43395..41dabfd8518d 100644 +--- a/arch/s390/include/asm/jump_label.h ++++ b/arch/s390/include/asm/jump_label.h +@@ -22,7 +22,7 @@ static inline bool arch_static_branch(struct static_key *key, bool branch) + ".long 0b-.,%l[label]-.\n" + ".quad %0-.\n" + ".popsection\n" +- : : "X" (&((char *)key)[branch]) : : label); ++ : : "i" (&((char *)key)[branch]) : : label); + return false; + label: + return true; +@@ -36,7 +36,7 @@ static inline bool arch_static_branch_jump(struct static_key *key, bool branch) + ".long 0b-.,%l[label]-.\n" + ".quad %0-.\n" + ".popsection\n" +- : : "X" (&((char *)key)[branch]) : : label); ++ : : "i" (&((char *)key)[branch]) : : label); + return false; + label: + return true; +-- +2.20.1 + diff --git a/bcm2835-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch b/bcm2835-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch deleted file mode 100644 index a57781800..000000000 --- a/bcm2835-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch +++ /dev/null @@ -1,138 +0,0 @@ -From patchwork Sun Dec 23 20:59:17 2018 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Stefan Wahren <stefan.wahren@i2se.com> -X-Patchwork-Id: 10741809 -Return-Path: - <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> -Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org - [172.30.200.125]) - by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2E9B66C2 - for <patchwork-linux-arm@patchwork.kernel.org>; - Sun, 23 Dec 2018 21:00:35 +0000 (UTC) -Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) - by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1BF3B28783 - for <patchwork-linux-arm@patchwork.kernel.org>; - Sun, 23 Dec 2018 21:00:35 +0000 (UTC) -Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) - id 0FE412878E; Sun, 23 Dec 2018 21:00:35 +0000 (UTC) -X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on - pdx-wl-mail.web.codeaurora.org -X-Spam-Level: -X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, - DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 -Received: from bombadil.infradead.org (bombadil.infradead.org - [198.137.202.133]) - (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) - (No client certificate requested) - by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B7EB128783 - for <patchwork-linux-arm@patchwork.kernel.org>; - Sun, 23 Dec 2018 21:00:34 +0000 (UTC) -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:MIME-Version:Cc:List-Subscribe: - List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: - Subject: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=0Cfst0aavwq2BzhOoJiKH5s4NpJ/Us+GjXPJ4zrLsg0=; b=ZZ4 - op3YV27iZX0UKzSqXuUq2LaE+MP3aEAQmT8Rdvb/NFFHbn+wqbOszDRj6XW3ajga4pCSwUf3L4gvo - ZheL4Sb+6+oiR1HdK8EBuDjmzKY1qn/zgS8gwvVv6TSbD2Bz8Lw0hQ/tW2MwUuIDngXtzfUoFvHrp - wADpWDQf/OcQj2dRuqMLquQTkjTnYDP94Ml87y52NZhbu9+9n3h0+0X7oerCqM/RLjCwl9atrORaV - DAWfKL1pif2kz0UoT1x6vjaOmbSa3NqSXmUo+2dM64jUixp5JllINpIuIDUX2KNTo2pRF3og+BnsP - 8TFZ0aIA+N69i6dOIQTBKCcJIb86Jjw==; -Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) - by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) - id 1gbArL-0005Ta-RL; Sun, 23 Dec 2018 21:00:27 +0000 -Received: from mout.kundenserver.de ([212.227.126.131]) - by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) - id 1gbArH-0004QG-NL - for linux-arm-kernel@lists.infradead.org; Sun, 23 Dec 2018 21:00:25 +0000 -Received: from localhost.localdomain ([37.4.249.153]) by - mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) - id 1MSZDt-1gz0AW3YfB-00SsKG; Sun, 23 Dec 2018 21:59:57 +0100 -From: Stefan Wahren <stefan.wahren@i2se.com> -To: Al Cooper <alcooperx@gmail.com>, Adrian Hunter <adrian.hunter@intel.com>, - Ulf Hansson <ulf.hansson@linaro.org> -Subject: [PATCH 1/2] mmc: sdhci-iproc: handle mmc_of_parse() errors during - probe -Date: Sun, 23 Dec 2018 21:59:17 +0100 -Message-Id: <1545598758-4502-1-git-send-email-stefan.wahren@i2se.com> -X-Mailer: git-send-email 2.7.4 -X-Provags-ID: V03:K1:FsBhp74NqgbMckX6QGEkM7zbuM0fjnbtNqB9c5GjfSu+JG+zOVC - nt6p6+TF28Gk+lb0VFAh2hNrWHdwlR1sqk5ygcbOiXLgQ93PecRf9Zl130rJ7qR4Km04fzv - AR0JypQ0XgjJ+nia824FdeQ9oO4xRynoGH5q7Raco0HsIMewr0syOybYSJgsqI5UUptIo+5 - FhdCMrpIfxuFpRh23naog== -X-UI-Out-Filterresults: notjunk:1;V03:K0:7uvqm/6Tn2w=:qedwftyLF+r+WaFGRyzPKR - vItrffDfG7f534X5qt1icf/24c6TYj93h3+1AKvP593z2hpmJxIemKNrdRT7/zXPP+Ipke8UQ - I08zvqpRa5wcGU3iO0jQaPt/WU58GkdmjkiuWzotVkbcj4+NuMi4iMPfiAMd1VdT5ouv2omWI - /7S/9AqsTnPbNYo+5i1oNsSFDmrxWvlKZC9K+Ab8vTe8J9L+wUiRCWFHsOr0C9lC1J3MRHbgZ - OPX3nnGBLnuKcWjrMJyIjqsNOJ2w89xWpOFvNfsPTrVhHX/xApgyQQcbDBXvwgMh709QJowTD - 88M4HvgmrK3Ah0BS164aJZtufA38R7Fpay/nQ6hojx7BKV6OM712L+vkkzNuK4MrfQKtQeiv5 - sf7mvN2YqPw13dJxC70+a8u2MvwhX7Udha2YtQJT7ZhcqlIYkVb4HoDJ565iYqAe/jp9npFjh - 3wPekqu1cY3V/0rhdWVETv/Atcchi598SE0RS4cL8/C7Z189r2wCrohPWDDedc8/AmF+J9y4N - 2lAHyAmq7u7IUBkxmYHzFu+KvE6jVNgVFm6mB21lO2gHqTIz6toyP36igFPxPp0FZrigwqCWb - Ot1jt/Ep+g9ykC8xjM36X5RKjfDrAOpgwSb+FWRqaablXguW1xgCC2weNx8PjENo21hCxHNgG - 2jSstrMAZFww3b39FzyTblcT3LcsuU6JOjyIMPCApzh0y7wgI+VVT+y3jyezQpszpAxbbdYnS - WH896vn09u7vjjjfG9zlqROWkG+q3ZLGfxrm4gRjo5HnJF78W1Fq11QIq0U= -X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 -X-CRM114-CacheID: sfid-20181223_130024_058181_62761026 -X-CRM114-Status: GOOD ( 14.51 ) -X-BeenThere: linux-arm-kernel@lists.infradead.org -X-Mailman-Version: 2.1.21 -Precedence: list -List-Id: <linux-arm-kernel.lists.infradead.org> -List-Unsubscribe: - <http://lists.infradead.org/mailman/options/linux-arm-kernel>, - <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> -List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> -List-Post: <mailto:linux-arm-kernel@lists.infradead.org> -List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> -List-Subscribe: - <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, - <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> -Cc: Stefan Wahren <stefan.wahren@i2se.com>, - Florian Fainelli <f.fainelli@gmail.com>, - Scott Branden <sbranden@broadcom.com>, - Ray Jui <rjui@broadcom.com>, linux-mmc@vger.kernel.org, - stable@vger.kernel.org, - Eric Anholt <eric@anholt.net>, bcm-kernel-feedback-list@broadcom.com, - Gregory Fong <gregory.0xf0@gmail.com>, - Brian Norris <computersforpeace@gmail.com>, - linux-arm-kernel@lists.infradead.org -MIME-Version: 1.0 -Content-Type: text/plain; charset="us-ascii" -Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> -Errors-To: - linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org -X-Virus-Scanned: ClamAV using ClamSMTP - -We need to handle mmc_of_parse() errors during probe. - -This finally fixes the wifi regression on Raspberry Pi 3 series. -In error case the wifi chip was permanently in reset because of -the power sequence depending on the deferred probe of the GPIO expander. - -Fixes: b580c52d58d9 ("mmc: sdhci-iproc: add IPROC SDHCI driver") -Cc: stable@vger.kernel.org -Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> ---- - drivers/mmc/host/sdhci-iproc.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c -index 0db9905..9d12c06 100644 ---- a/drivers/mmc/host/sdhci-iproc.c -+++ b/drivers/mmc/host/sdhci-iproc.c -@@ -296,7 +296,10 @@ static int sdhci_iproc_probe(struct platform_device *pdev) - - iproc_host->data = iproc_data; - -- mmc_of_parse(host->mmc); -+ ret = mmc_of_parse(host->mmc); -+ if (ret) -+ goto err; -+ - sdhci_get_property(pdev); - - host->mmc->caps |= iproc_host->data->mmc_caps; diff --git a/configs/fedora/generic/arm/CONFIG_88EU_AP_MODE b/configs/fedora/generic/arm/CONFIG_88EU_AP_MODE new file mode 100644 index 000000000..8ba98fbe9 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_88EU_AP_MODE @@ -0,0 +1 @@ +CONFIG_88EU_AP_MODE=y diff --git a/configs/fedora/generic/arm/armv7/CONFIG_88EU_AP_MODE b/configs/fedora/generic/arm/armv7/CONFIG_88EU_AP_MODE deleted file mode 100644 index 55fc5ec1e..000000000 --- a/configs/fedora/generic/arm/armv7/CONFIG_88EU_AP_MODE +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_88EU_AP_MODE is not set diff --git a/include-linux-module.h-mark-init-cleanup_module-aliases-as-__cold.patch b/include-linux-module.h-mark-init-cleanup_module-aliases-as-__cold.patch new file mode 100644 index 000000000..f350e6f32 --- /dev/null +++ b/include-linux-module.h-mark-init-cleanup_module-aliases-as-__cold.patch @@ -0,0 +1,149 @@ +From patchwork Wed Jan 23 17:37:07 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> +X-Patchwork-Id: 1034989 +Return-Path: <SRS0=drEb=P7=vger.kernel.org=linux-kernel-owner@kernel.org> +Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) + by smtp.lore.kernel.org (Postfix) with ESMTP id A7D50C282C0 + for <linux-kernel@archiver.kernel.org>; Wed, 23 Jan 2019 17:38:31 +0000 (UTC) +Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) + by mail.kernel.org (Postfix) with ESMTP id 7CE1F20870 + for <linux-kernel@archiver.kernel.org>; Wed, 23 Jan 2019 17:38:31 +0000 (UTC) +Authentication-Results: mail.kernel.org; + dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com + header.b="qdRA7oPl" +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1726152AbfAWRi3 (ORCPT + <rfc822;linux-kernel@archiver.kernel.org>); + Wed, 23 Jan 2019 12:38:29 -0500 +Received: from mail-wm1-f67.google.com ([209.85.128.67]:52719 "EHLO + mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1725896AbfAWRi3 (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Wed, 23 Jan 2019 12:38:29 -0500 +Received: by mail-wm1-f67.google.com with SMTP id m1so242485wml.2 + for <linux-kernel@vger.kernel.org>; + Wed, 23 Jan 2019 09:38:27 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=20161025; + h=date:from:to:cc:subject:message-id:mime-version:content-disposition + :user-agent; + bh=1joVTuHcQFv5PhIFvZBlpu1jeKwRQi2Ty1HKsqzNx+0=; + b=qdRA7oPloipduZyiYE/EECaW/vCZup5EXmE5a1XgE9mc55H+TTPNNRTt44QJbQgbnn + wTNksIkBx8Gs0k3pJI9QIDO2J5AipLN8OOoxkPiDIJtAC8buHzQrdTxFG/4Uxw7tRf8X + A6PNyuUGr+02itkYIlALzEuDHvZna8yZx0zCeCDXF2IrGt0NBHZVTzz1XfX8LeQlCh9L + hleyVdDQnDvwxA7dXqrA4UugXUlEqT8HnIAUdg8+/xubsXOSz9T/22+zc9pZ9uSHm2uq + DpO/hgx1e5DONDN8T+sjjKCO0LnJ8Z9ZS0Huf+8W2XH1uxo48jSgXUOsygPQ36+8R/7t + ng6Q== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20161025; + h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version + :content-disposition:user-agent; + bh=1joVTuHcQFv5PhIFvZBlpu1jeKwRQi2Ty1HKsqzNx+0=; + b=ZQrXdTIYsCSUGNJS1C0dn+gibvoSHb2o+kcUMGTbH6G2tag3Zy4vnfIcBT0xhmvPLq + 5pU8jskcufXp0qQ0sivNsBpJYJCbsqqiChoivTs9WC4rxoM5G62Wi0pAZL59fGGDnmyV + xjSTkSoxe8CiB+26BDzg52zkynkWC2v0OHgaM7/1lTeTqNxdYIvQ+hC4LXdy40bAP64/ + JIC1nET+KwewpPHJQc2u87ah4xp6nEjzO/4wTP3CUi4zbZPTU17oH007IAXhObL7JO0r + XkRBJAgpcTKexfAJB7HnAUc4KLSv5L5Uz+Z14TusskTuK6njE11PE9GSJ7Z7lqufqJNZ + Z4GQ== +X-Gm-Message-State: AJcUukdaW+EjUkHLIrpaLWRYCoF9XYWdpSiPfNnJgu3VB9CW8t9xYlZJ + NDU6hJ2AXvnDR+awfdjm6IU= +X-Google-Smtp-Source: + ALg8bN59XklA0HTVEDaLFI+8dguNdipIQWTlgIi23N78PjaLBzniLMXowf2nCpIra7boIidjtFvfYg== +X-Received: by 2002:a1c:7c05:: with SMTP id x5mr3525198wmc.54.1548265106544; + Wed, 23 Jan 2019 09:38:26 -0800 (PST) +Received: from gmail.com (79.108.96.12.dyn.user.ono.com. [79.108.96.12]) + by smtp.gmail.com with ESMTPSA id + r77sm74200791wmd.22.2019.01.23.09.38.25 + (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); + Wed, 23 Jan 2019 09:38:25 -0800 (PST) +Date: Wed, 23 Jan 2019 18:37:07 +0100 +From: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> +To: Jessica Yu <jeyu@kernel.org> +Cc: Laura Abbott <labbott@redhat.com>, + Martin Sebor <msebor@gcc.gnu.org>, linux-kernel@vger.kernel.org +Subject: [PATCH] include/linux/module.h: mark init/cleanup_module aliases as + __cold +Message-ID: <20190123173707.GA16603@gmail.com> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +User-Agent: elm/2 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org + +The upcoming GCC 9 release adds the -Wmissing-attributes warnings +(enabled by -Wall), which trigger for all the init/cleanup_module +aliases in the kernel (defined by the module_init/exit macros), +ending up being very noisy. + +These aliases point to the __init/__exit functions of a module, +which are defined as __cold (among other attributes). However, +the aliases themselves do not have the __cold attribute. + +Since the compiler behaves differently when compiling a __cold +function as well as when compiling paths leading to calls +to __cold functions, the warning is trying to point out +the possibly-forgotten attribute in the alias. + +In order to keep the warning enabled, we choose to silence +the warning by marking the aliases as __cold. This is possible +marking either the extern declaration, the definition, or both. +In order to avoid changing the behavior of callers, we do it +only in the definition of the aliases (since those are not +seen by any other TU). + +Suggested-by: Martin Sebor <msebor@gcc.gnu.org> +Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> +--- +Note that an alternative is using the new copy attribute +introduced by GCC 9 (Martin told me about it, as well as the +new warning). + +What I am concerned about using __copy is that I am not sure +we should be copying all the attributes (even if some are +blacklisted by the copy itself), since: + - We have unknown-to-GCC attributes (e.g. from plugins). + - We wouldn't enjoy the fix for older compilers + (e.g. if the fix had an actual impact). + +So here I took the conservative approach for the moment, +and we can discuss/apply whether another solution is best. + +Jessica: please review what I explain in the commit message. +Do we actually want the __cold attribute in the declaration +as well? If yes, AFAIK, GCC would assume paths that end up +calling the __init/__exit functions are not meant to be taken +(but when we are asked to load modules, that is the expected +path, no?). + +I will put this in the compiler-attributes tree and get +some time in linux-next, unless you want to pick it up! + + include/linux/module.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/linux/module.h b/include/linux/module.h +index 8fa38d3e7538..c4e805e87628 100644 +--- a/include/linux/module.h ++++ b/include/linux/module.h +@@ -129,13 +129,13 @@ extern void cleanup_module(void); + #define module_init(initfn) \ + static inline initcall_t __maybe_unused __inittest(void) \ + { return initfn; } \ +- int init_module(void) __attribute__((alias(#initfn))); ++ int init_module(void) __cold __attribute__((alias(#initfn))); + + /* This is only required if you want to be unloadable. */ + #define module_exit(exitfn) \ + static inline exitcall_t __maybe_unused __exittest(void) \ + { return exitfn; } \ +- void cleanup_module(void) __attribute__((alias(#exitfn))); ++ void cleanup_module(void) __cold __attribute__((alias(#exitfn))); + + #endif + diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index ace4b4f23..dd6d82fe0 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -23,7 +23,7 @@ CONFIG_8139TOO_8129=y CONFIG_8139TOO=m # CONFIG_8139TOO_PIO is not set # CONFIG_8139TOO_TUNE_TWISTER is not set -# CONFIG_88EU_AP_MODE is not set +CONFIG_88EU_AP_MODE=y CONFIG_9P_FSCACHE=y CONFIG_9P_FS=m CONFIG_9P_FS_POSIX_ACL=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 54a7188eb..e4acad62e 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -23,7 +23,7 @@ CONFIG_8139TOO_8129=y CONFIG_8139TOO=m # CONFIG_8139TOO_PIO is not set # CONFIG_8139TOO_TUNE_TWISTER is not set -# CONFIG_88EU_AP_MODE is not set +CONFIG_88EU_AP_MODE=y CONFIG_9P_FSCACHE=y CONFIG_9P_FS=m CONFIG_9P_FS_POSIX_ACL=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 6870c60ac..de3a65676 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -23,7 +23,7 @@ CONFIG_8139TOO_8129=y CONFIG_8139TOO=m # CONFIG_8139TOO_PIO is not set # CONFIG_8139TOO_TUNE_TWISTER is not set -# CONFIG_88EU_AP_MODE is not set +CONFIG_88EU_AP_MODE=y CONFIG_9P_FSCACHE=y CONFIG_9P_FS=m CONFIG_9P_FS_POSIX_ACL=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index fb89d9e32..141dc0d68 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -23,7 +23,7 @@ CONFIG_8139TOO_8129=y CONFIG_8139TOO=m # CONFIG_8139TOO_PIO is not set # CONFIG_8139TOO_TUNE_TWISTER is not set -# CONFIG_88EU_AP_MODE is not set +CONFIG_88EU_AP_MODE=y CONFIG_9P_FSCACHE=y CONFIG_9P_FS=m CONFIG_9P_FS_POSIX_ACL=y diff --git a/kernel.spec b/kernel.spec index bcdd5f00f..f4628ea68 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,9 +77,9 @@ Summary: The Linux kernel # Work around for major version bump %define upstream_sublevel 0 # The rc snapshot level -%global rcrev 3 +%global rcrev 4 # The git snapshot level -%define gitrev 1 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -342,7 +342,7 @@ Summary: The Linux kernel # Which is a BadThing(tm). # We only build kernel-headers on the following... -%define nobuildarches i386 +%define nobuildarches i386 s390x %ifarch %nobuildarches %define with_up 0 @@ -441,7 +441,7 @@ BuildRequires: binutils-%{_build_arch}-linux-gnu, gcc-%{_build_arch}-linux-gnu %endif # Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{kversion}.tar.xz -Source0: https://git.kernel.org/torvalds/t/linux-5.0-rc3.tar.gz +Source0: https://git.kernel.org/torvalds/t/linux-5.0-rc4.tar.gz Source11: x509.genkey Source12: remove-binary-diff.pl @@ -596,9 +596,6 @@ Patch306: arm-sdhci-esdhc-imx-fixes.patch # Initall support for the 3A+ Patch330: bcm2837-dts-add-Raspberry-Pi-3-A.patch -# https://patchwork.kernel.org/patch/10741809/ -Patch331: bcm2835-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch - # https://www.spinics.net/lists/arm-kernel/msg699583.html Patch332: ARM-dts-bcm283x-Several-DTS-improvements.patch @@ -618,6 +615,11 @@ Patch501: input-rmi4-remove-the-need-for-artifical-IRQ.patch # https://patchwork.kernel.org/patch/10752253/ Patch504: efi-use-32-bit-alignment-for-efi_guid_t.patch +# gcc9 fixes +Patch505: include-linux-module.h-mark-init-cleanup_module-aliases-as-__cold.patch +Patch506: lib-crc32.c-mark-crc32_le_base-__crc32c_le_base-aliases-as-__pure.patch +Patch507: 0001-Drop-that-for-now.patch + # END OF PATCH DEFINITIONS %endif @@ -1894,6 +1896,10 @@ fi # # %changelog +* Mon Jan 28 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-0.rc4.git0.1 +- Linux v5.0-rc4 +- Disable debugging options. + * Wed Jan 23 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-0.rc3.git1.1 - Linux v5.0-rc3-53-g333478a7eb21 diff --git a/lib-crc32.c-mark-crc32_le_base-__crc32c_le_base-aliases-as-__pure.patch b/lib-crc32.c-mark-crc32_le_base-__crc32c_le_base-aliases-as-__pure.patch new file mode 100644 index 000000000..2010603f4 --- /dev/null +++ b/lib-crc32.c-mark-crc32_le_base-__crc32c_le_base-aliases-as-__pure.patch @@ -0,0 +1,124 @@ +From patchwork Thu Jan 24 15:44:20 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> +X-Patchwork-Id: 1035252 +Return-Path: <SRS0=jJS3=QA=vger.kernel.org=linux-kernel-owner@kernel.org> +Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) + by smtp.lore.kernel.org (Postfix) with ESMTP id 95925C282C3 + for <linux-kernel@archiver.kernel.org>; Thu, 24 Jan 2019 15:44:28 +0000 (UTC) +Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) + by mail.kernel.org (Postfix) with ESMTP id 6368521872 + for <linux-kernel@archiver.kernel.org>; Thu, 24 Jan 2019 15:44:28 +0000 (UTC) +Authentication-Results: mail.kernel.org; + dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com + header.b="DEOxuN9k" +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1728590AbfAXPo1 (ORCPT + <rfc822;linux-kernel@archiver.kernel.org>); + Thu, 24 Jan 2019 10:44:27 -0500 +Received: from mail-wm1-f68.google.com ([209.85.128.68]:37788 "EHLO + mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1727649AbfAXPo0 (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Thu, 24 Jan 2019 10:44:26 -0500 +Received: by mail-wm1-f68.google.com with SMTP id g67so3548002wmd.2 + for <linux-kernel@vger.kernel.org>; + Thu, 24 Jan 2019 07:44:25 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=20161025; + h=date:from:to:cc:subject:message-id:mime-version:content-disposition + :user-agent; + bh=JeyLhzrsCRzzO/4nbb0LJSQxILVpgC++VcQqugacalc=; + b=DEOxuN9kV3A3qQ3ere0UjnfgT3DE1Gc4z/52Qty46F/mbpPja2OkXvtPJ15RK9/h4Z + AG1fdkKf/GjCRaBidO9BLWwcoq0uiTV69J0KR0rF67QR9zxgGVEl8fu6s/ZmtKnnIdF4 + AysPfOHY+/MwlcB6UOzADtS69SDUYTsxDxOfHBj/FjnS7WmNetq8ae17VvRdpd/JEWtE + M58OhgBYmckFYuVXQTEEhpm8w6TIefPA5S3r3KeUuXclMeqJ07pU1vJWK7tdTp7sIeAv + xYgGq49/NBPkUl4l+LdwVBwp+o6pvUfh2w9zBQW67xZu6rn/j500BV8xdubxQqHTauSM + oQPw== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20161025; + h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version + :content-disposition:user-agent; + bh=JeyLhzrsCRzzO/4nbb0LJSQxILVpgC++VcQqugacalc=; + b=twekOdboep908h8e5de5qIQIgDuUrOYeS/p8s5bh3AYpMD9r3CIJtanHSCWnFCsPIw + /hesYDvbpVSiQTI1afBap2tw2ugq2aL2Sur2/9BhWE5So2HlVMlN5M6S8ccs6IK6Ldzh + +wxWJnq7dnvwbpMLcT3mASpdlEUPTaVTA7AazIssYrIDY9ucJA4vfYUemvvTtKn2tovO + lJjVDsOwv7/3P9XphLneTUXTI1ZD9soUX/qpt1m4n4BAme1tHfmbAL4cceRfMf7eFKhh + t3iRpkh/6ZHMGw0moeXPkTB+WTDhA7MgsmQA/X6tmPfjfMQsEo+OKRUBtFuuVDY5wzSf + eX7Q== +X-Gm-Message-State: AJcUukcM8ZahlKLufK0H1V2XtT0GIN899FyU1V2PJM0+/GfK3XvzMW2n + o0kPoin07YrKIK/Zh71qAxI= +X-Google-Smtp-Source: + ALg8bN7upuyKWCD/cTB9FAkdcEyU6dlTStUcg49cEAv640NugO83fRipoQ9X2YGpIogSFxA7BbHmeQ== +X-Received: by 2002:a1c:bbd6:: with SMTP id l205mr2979576wmf.97.1548344665032; + Thu, 24 Jan 2019 07:44:25 -0800 (PST) +Received: from gmail.com (79.108.96.12.dyn.user.ono.com. [79.108.96.12]) + by smtp.gmail.com with ESMTPSA id + k128sm80898610wmd.37.2019.01.24.07.44.23 + (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); + Thu, 24 Jan 2019 07:44:24 -0800 (PST) +Date: Thu, 24 Jan 2019 16:44:20 +0100 +From: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> +To: Krzysztof Kozlowski <krzk@kernel.org> +Cc: Laura Abbott <labbott@redhat.com>, + Herbert Xu <herbert@gondor.apana.org.au>, + Ard Biesheuvel <ard.biesheuvel@linaro.org>, + Catalin Marinas <catalin.marinas@arm.com>, + Martin Sebor <msebor@gcc.gnu.org>, linux-kernel@vger.kernel.org +Subject: [PATCH] lib/crc32.c: mark crc32_le_base/__crc32c_le_base aliases as + __pure +Message-ID: <20190124154420.GA11471@gmail.com> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +User-Agent: elm/2 +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org + +The upcoming GCC 9 release extends the -Wmissing-attributes warnings +(enabled by -Wall) to C and aliases: it warns when particular function +attributes are missing in the aliases but not in their target. + +In particular, it triggers here because crc32_le_base/__crc32c_le_base +aren't __pure while their target crc32_le/__crc32c_le are. + +These aliases are used by architectures as a fallback in accelerated +versions of CRC32. See commit 9784d82db3eb ("lib/crc32: make core crc32() +routines weak so they can be overridden"). + +Therefore, being fallbacks, it is likely that even if the aliases +were called from C, there wouldn't be any optimizations possible. +Currently, the only user is arm64, which calls this from asm. + +Still, marking the aliases as __pure makes sense and is a good idea +for documentation purposes and possible future optimizations, +which also silences the warning. + +Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> +--- +I am picking this up through the compiler-attributes tree +and putting it into -next along with the other cleanup +for -Wmissing-attributes (unless some other maintainer wants it). + + lib/crc32.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/crc32.c b/lib/crc32.c +index 45b1d67a1767..4a20455d1f61 100644 +--- a/lib/crc32.c ++++ b/lib/crc32.c +@@ -206,8 +206,8 @@ u32 __pure __weak __crc32c_le(u32 crc, unsigned char const *p, size_t len) + EXPORT_SYMBOL(crc32_le); + EXPORT_SYMBOL(__crc32c_le); + +-u32 crc32_le_base(u32, unsigned char const *, size_t) __alias(crc32_le); +-u32 __crc32c_le_base(u32, unsigned char const *, size_t) __alias(__crc32c_le); ++u32 __pure crc32_le_base(u32, unsigned char const *, size_t) __alias(crc32_le); ++u32 __pure __crc32c_le_base(u32, unsigned char const *, size_t) __alias(__crc32c_le); + + /* + * This multiplies the polynomials x and y modulo the given modulus. @@ -1,2 +1 @@ -SHA512 (linux-5.0-rc3.tar.gz) = 4af12c1918c35635ce35e0fd51af36d9c9aa24a79eeab0c5889b7abb12b8feedcdcaa1969f45ab421a371046898e1676d266f38e7dacffb7240d501566e03ce2 -SHA512 (patch-5.0-rc3-git1.xz) = caf337615fd24a1b2cfe106cca310c08d86ced32f01da3274625e68e43df00392eda0829037736c17b0dab3c47cb3649be73599cdd655ea05af0c8aa5edfb410 +SHA512 (linux-5.0-rc4.tar.gz) = bc7431fd672e4a96c466ec108a17a692b617f60914924ba7fa635d901f632a0b25d067d427eaff4195e3e7c6c5d6269aff3c896854cd5a42a31f6b830c693f0f |