From patchwork Tue Nov 3 16:21:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 7545611 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A4EEABEEA4 for ; Tue, 3 Nov 2015 16:23:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E4C6F205E7 for ; Tue, 3 Nov 2015 16:23:27 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 12674204A7 for ; Tue, 3 Nov 2015 16:23:27 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZteL4-0004jy-5b; Tue, 03 Nov 2015 16:21:38 +0000 Received: from smtp02.citrix.com ([66.165.176.63]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZteL0-0004YY-CN for linux-arm-kernel@lists.infradead.org; Tue, 03 Nov 2015 16:21:35 +0000 X-IronPort-AV: E=Sophos;i="5.20,239,1444694400"; d="scan'208";a="315347476" From: Stefano Stabellini To: Subject: [PATCH v10 2/5] missing include in cputime.c, remove #ifdef CONFIG_PARAVIRT from sched/core.c Date: Tue, 3 Nov 2015 16:21:01 +0000 Message-ID: <1446567664-11890-2-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 X-DLP: MIA2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151103_082134_680361_59996523 X-CRM114-Status: UNSURE ( 8.02 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.2 (----) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux@arm.linux.org.uk, Ian.Campbell@citrix.com, arnd@arndb.de, Stefano Stabellini , marc.zyngier@arm.com, catalin.marinas@arm.com, konrad.wilk@oracle.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, peterz@infradead.org, mingo@redhat.com, olof@lixom.net, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ifdef CONFIG_PARAVIRT in sched/core.c is redundant, as asm/paravirt.h is already protected by #ifdef CONFIG_PARAVIRT. Add include asm/paravirt.h to cputime.c, as steal_account_process_tick calls paravirt_steal_clock, which is defined in paravirt.h. Signed-off-by: Stefano Stabellini CC: mingo@redhat.com CC: peterz@infradead.org --- kernel/sched/core.c | 2 -- kernel/sched/cputime.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index bcd214e..395fad9 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -79,9 +79,7 @@ #include #include #include -#ifdef CONFIG_PARAVIRT #include -#endif #include "sched.h" #include "../workqueue_internal.h" diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index 8cbc3db..a1426fa 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -5,6 +5,7 @@ #include #include #include "sched.h" +#include #ifdef CONFIG_IRQ_TIME_ACCOUNTING