From patchwork Wed Jun 29 16:55:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 71196 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp2259380qgy; Wed, 29 Jun 2016 09:57:01 -0700 (PDT) X-Received: by 10.98.49.133 with SMTP id x127mr13246112pfx.90.1467219421203; Wed, 29 Jun 2016 09:57:01 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r9si5175431paz.82.2016.06.29.09.57.01; Wed, 29 Jun 2016 09:57:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-rt-users-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of linux-rt-users-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-rt-users-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751487AbcF2Q4q (ORCPT + 4 others); Wed, 29 Jun 2016 12:56:46 -0400 Received: from mail-ob0-f193.google.com ([209.85.214.193]:34049 "EHLO mail-ob0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751460AbcF2Q4p (ORCPT ); Wed, 29 Jun 2016 12:56:45 -0400 Received: by mail-ob0-f193.google.com with SMTP id s7so4032438obo.1 for ; Wed, 29 Jun 2016 09:55:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=nlofd3k+kp28QIQ/OM+8q9SIqGzYqwpSGACGGMKxvIY=; b=oQmM6XhTyEnfL0MriRhKEQqglcqul7W2eqvGk3Puclzqqw2/g01Hkun+sWivncPP7t vOKOEfgZqFUn262NoiqERZc2rEab/RApY3Ub/7f3ywWDRzthQkZQIpa+kZut5/ZR6qBL ZMsXgWjZmnQlTKVgjvO8gQ9ymeaifSa1m9e21HSCyroD35lUfyyF9tJ0Ao9q4n6eLPmr dT7Qx+hi+D5744v2ELmLvH2YPgS+zqMxe8EMfGl4sSJFCWMpHh2iXlcG6VzaJamJuYUV dc790Y4vuhGeOIfXN3ZXk8AAWsIz8j/Hnd1Bu/tpH3PFba9i1qosaKCVDvLI9onzzAxx lOYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=nlofd3k+kp28QIQ/OM+8q9SIqGzYqwpSGACGGMKxvIY=; b=BjYpF4dRAV56cSeg5ZwP0UAvrgm/tbGkKHpXUKpff9CuMSNIY8iDyy1kupky/XaEGj AQiuAg9pWJpE05UHfObY+xvfHXIEn7RbP0fm8+rP6BM+louDivR5dlhgO+kZm/b7Ttp5 XETHtwtl7mz8gvDZvpC44nHAezQ9eyDg/SyOYvaNuYg0KBZt6yzZs93Em9mlnZV+1eRu +sXzxo4eKl5NtSZSF++l9FJjkHpO3g6T+Q4Zn2vzqL1VFdPrkWA4JtqgdXdMtRbiW+3y f6icaYSoOp5eFOAQHFbkunVhLuMEiO25lBQxcjZO3Bm4m/NJ9fmaQ8vvb3c4TO2L5vOw MmMw== X-Gm-Message-State: ALyK8tI6IPMZfDjJJgZIz+2AOMallnd2rSS6K60gj0KV9rWJn4r+MNwc4cnccVVhmaubWg== X-Received: by 10.202.76.77 with SMTP id z74mr6469567oia.33.1467219319618; Wed, 29 Jun 2016 09:55:19 -0700 (PDT) Received: from serve.minyard.net ([173.64.235.97]) by smtp.gmail.com with ESMTPSA id b63sm1631820otc.20.2016.06.29.09.55.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jun 2016 09:55:19 -0700 (PDT) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id 238186CF; Wed, 29 Jun 2016 11:55:18 -0500 (CDT) Received: by t430.minyard.net (Postfix, from userid 1000) id F290330267D; Wed, 29 Jun 2016 11:55:14 -0500 (CDT) From: minyard@acm.org To: linux-rt-users@vger.kernel.org, Steven Rostedt Cc: Corey Minyard Subject: [PATCH] sched: Fix compile warning when using CONFIG_PREEMPT_NONE Date: Wed, 29 Jun 2016 11:55:11 -0500 Message-Id: <1467219311-19424-1-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 Sender: linux-rt-users-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org From: Corey Minyard preemptible_lazy() is only used under CONFIG_PREEMPT, but it was always defined. Move it into a CONFIG_PREEMPT ifdef. Signed-off-by: Corey Minyard --- kernel/sched/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/kernel/sched/core.c b/kernel/sched/core.c index f3130a8..57af106 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3454,6 +3454,7 @@ static void __sched notrace preempt_schedule_common(void) } while (need_resched()); } +#ifdef CONFIG_PREEMPT #ifdef CONFIG_PREEMPT_LAZY /* * If TIF_NEED_RESCHED is then we allow to be scheduled away since this is @@ -3478,7 +3479,6 @@ static int preemptible_lazy(void) #endif -#ifdef CONFIG_PREEMPT /* * this is the entry point to schedule() from in-kernel preemption * off of preempt_enable. Kernel preemptions off return from interrupt