From patchwork Sat Nov 3 22:02:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12655 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 85CD323FBB for ; Sat, 3 Nov 2012 22:02:54 +0000 (UTC) Received: from mail-pa0-f52.google.com (mail-pa0-f52.google.com [209.85.220.52]) by fiordland.canonical.com (Postfix) with ESMTP id 2547EA18455 for ; Sat, 3 Nov 2012 22:02:54 +0000 (UTC) Received: by mail-pa0-f52.google.com with SMTP id hz10so3024049pad.11 for ; Sat, 03 Nov 2012 15:02:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding :x-gm-message-state; bh=7fmnDmeR+GoVKK32jIM9ClyxRQKN1qpM/suX7t3Tp00=; b=Ut550/M64cNoNgiekO9AZNmPkkC6vCKLCVvaguD0PPH2JUQZECKw/VES6jcenapm73 /JiFe7FPcI6zRCc+GTXcZM7/jUeGS4DVnHgnddw2wzarG6Q6XFDxTm3XiLnTq1Vd4Muj iL6FseT0tAvjJZzxMArcyT5AXpu+r0/dBXUwEnxdHIEwEm9U9gaOceCF0vZA+jYPuVOI 61aD+TA8efGqU8o6HxrD1cc2/R7HCgN4cBdr7VeJkTnf3ng6HM2oqOka/TQEnGJRhOn0 N0pihUDx1bB81vLKpuo45bJOq5D+0njyv6S2U8T64gRBoo99oXv8YMEayZDDouhn9mvB nDbg== Received: by 10.69.1.73 with SMTP id be9mr18270719pbd.116.1351980173408; Sat, 03 Nov 2012 15:02:53 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.68.34.137 with SMTP id z9csp94638pbi; Sat, 3 Nov 2012 15:02:52 -0700 (PDT) Received: by 10.14.207.68 with SMTP id m44mr20351546eeo.40.1351980172320; Sat, 03 Nov 2012 15:02:52 -0700 (PDT) Received: from mail-ee0-f45.google.com (mail-ee0-f45.google.com [74.125.83.45]) by mx.google.com with ESMTPS id l45si1539272eep.99.2012.11.03.15.02.51 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 03 Nov 2012 15:02:52 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.45 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.83.45; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.83.45 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-ee0-f45.google.com with SMTP id b47so2446510eek.4 for ; Sat, 03 Nov 2012 15:02:51 -0700 (PDT) Received: by 10.14.194.72 with SMTP id l48mr20697559een.9.1351980171630; Sat, 03 Nov 2012 15:02:51 -0700 (PDT) Received: from localhost.localdomain (88.Red-2-139-206.staticIP.rima-tde.net. [2.139.206.88]) by mx.google.com with ESMTPS id d44sm34844369eeo.10.2012.11.03.15.02.50 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 03 Nov 2012 15:02:51 -0700 (PDT) From: Lee Jones To: linux-kernel@vger.kernel.org Cc: Lee Jones , Ingo Molnar , Peter Zijlstra Subject: [PATCH 4/9] sched: Don't define unthrottle_offline_cfs_rqs when !CONFIG_SMP Date: Sat, 3 Nov 2012 23:02:25 +0100 Message-Id: <1351980150-24145-5-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1351980150-24145-1-git-send-email-lee.jones@linaro.org> References: <1351980150-24145-1-git-send-email-lee.jones@linaro.org> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmkMLkgvGzmNxAxzsObXpNWqsAlLpTt6GrjZ8nul1eU6Gy2N0wBOjhQmgiht8w3h6IB0JUz Since unthrottle_offline_cfs_rqs is only ever invoked when CONFIG_SMP let's pre-processor it out when SMP is not configured. This change suppresses the build error below when !CONFIG_SMP. kernel/sched/fair.c:2055:13: warning: ‘unthrottle_offline_cfs_rqs’ defined but not used [-Wunused-function] Cc: Ingo Molnar Cc: Peter Zijlstra Signed-off-by: Lee Jones --- kernel/sched/fair.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 6b800a1..c0aab13 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -2052,6 +2052,7 @@ static void destroy_cfs_bandwidth(struct cfs_bandwidth *cfs_b) hrtimer_cancel(&cfs_b->slack_timer); } +#if defined CONFIG_SMP static void unthrottle_offline_cfs_rqs(struct rq *rq) { struct cfs_rq *cfs_rq; @@ -2071,6 +2072,7 @@ static void unthrottle_offline_cfs_rqs(struct rq *rq) unthrottle_cfs_rq(cfs_rq); } } +#endif /* CONFIG_SMP */ #else /* CONFIG_CFS_BANDWIDTH */ static __always_inline @@ -2106,7 +2108,9 @@ static inline struct cfs_bandwidth *tg_cfs_bandwidth(struct task_group *tg) return NULL; } static inline void destroy_cfs_bandwidth(struct cfs_bandwidth *cfs_b) {} +#if defined CONFIG_SMP static inline void unthrottle_offline_cfs_rqs(struct rq *rq) {} +#endif /* CONFIG_SMP */ #endif /* CONFIG_CFS_BANDWIDTH */