From patchwork Mon Jun 6 14:09:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102252 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp1501844qgf; Mon, 6 Jun 2016 07:11:33 -0700 (PDT) X-Received: by 10.66.123.37 with SMTP id lx5mr25019808pab.101.1465222293043; Mon, 06 Jun 2016 07:11:33 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b8si5486173paw.151.2016.06.06.07.11.32; Mon, 06 Jun 2016 07:11:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753087AbcFFOLP (ORCPT + 31 others); Mon, 6 Jun 2016 10:11:15 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:54479 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752808AbcFFOLM (ORCPT ); Mon, 6 Jun 2016 10:11:12 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue004) with ESMTPA (Nemesis) id 0MJ09d-1bBr9h03b7-002UQX; Mon, 06 Jun 2016 16:09:16 +0200 From: Arnd Bergmann To: Alexandre Belloni Cc: linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com, Arnd Bergmann , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org Subject: [PATCH] x86: include linux/ratelimit.h in nmi.c Date: Mon, 6 Jun 2016 16:09:52 +0200 Message-Id: <1465222212-2579966-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:xgYO9kyUHpzr7snb3iWbLEVTfIgh2stFQUrZvmizhFcOhO93DP1 S7lkmk3OjOy9MI9FI0OdNxY3sw3qttEsJOPaGOEzHRax9FC3YuSWmGf1PbFDWwlL7kXB90l 0zDy6T+uDXFA1CG/yV4jwtcXudnmtQYNxWn7kIx2dHWpx1QEINVnftbHVhn4Bye7SQ3XAyv S0NVWQMXw2Oj2BpT5+kRQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:uyGIsrtk90A=:nFCLBQY6Z4zd5ZpZaXF61O q8ceJ55ShnzQn12E5DgckYY22i8hw2RYnKExMltAiAPHndiSHRk69rJ57omNxy10GJuZi29bz L+mj6/SXEDE1oyrATbooN9+3rZWXh7cqd8c8gzVVChThQ3bV5xoPuCBSJKOb/Ufy3fMzd+WL+ S6tSOFVecR5cBvuTYHhxbfd9Pcm2oxTX19aStIq42bF/tu4wupBmo0PPiMUzCRp2icjsOAJ7L PFQzUxywkaB6t4e8yd/FY29QqEi5YNCkzTc+FfjDwuf7gnYUaF0ShB8tbHpubDnveRph/zZyK rKgTuArEsQmaKA3tuGQZ6+Peg9YvtU8G3wCjEkM2WkZqQ9XLaDVbqOHb3Z8oomyob5wMqP2uI +eC2COSSltQMR50FnW9JFRK3xhmeLjOiRhNaZhB/zi3PnMutYOR+l5maLDwDtj0XaHjAAKrxA 8valeuFPOuAsujH8niIhSVmGXHeNAwzpn4rq03VpXLiW1V3mI1Tl3PWw2f7R/aWHAOYerQTST H7CKBusCZhbJQu9ho3ptbgp3P4ltjxMsOjzVqYlw0Y3SSXo0TFsLqlMsSmojeWHtafAn3Da7U QL3xI6ftSq66k+l7olGuLT66WXENMrkKFXtM1Vl1Cqli9rWUK/ymIoOMG6Q4ECGxYTy8scVXK akfIEMJ654IugyaKgUKDvEbYknMLPTeP/qntRSV8fo28MPYFO7DFm4nYEheUloVudOiA= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When building random configurations, we now occasionally get a new build error: In file included from include/linux/kernel.h:13:0, from include/linux/list.h:8, from include/linux/preempt.h:10, from include/linux/spinlock.h:50, from arch/x86/kernel/nmi.c:13: arch/x86/kernel/nmi.c: In function 'nmi_max_handler': include/linux/printk.h:375:9: error: type defaults to 'int' in declaration of 'DEFINE_RATELIMIT_STATE' [-Werror=implicit-int] static DEFINE_RATELIMIT_STATE(_rs, \ ^ arch/x86/kernel/nmi.c:110:2: note: in expansion of macro 'printk_ratelimited' printk_ratelimited(KERN_INFO ^~~~~~~~~~~~~~~~~~ This was working before the rtc rework series because linux/ratelimit.h was included implictly through asm/mach_traps.h -> asm/mc146818rtc.h -> linux/mc146818rtc.h -> linux/rtc.h -> linux/device.h. We clearly shouldn't rely on this indirect inclusion, so this adds an explicit #include in the file that needs it. Signed-off-by: Arnd Bergmann Reported-by: kbuild test robot Fixes: 5ab788d73832 ("rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h") --- It's only broken in the linux-rtc git at the moment, so it makes sense to fix it there. arch/x86/kernel/nmi.c | 1 + 1 file changed, 1 insertion(+) -- 2.7.0 diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c index 04b132a767f1..bfe4d6c96fbd 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include