From patchwork Fri Jan 17 16:45:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 23344 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 853DC203C6 for ; Fri, 17 Jan 2014 16:45:18 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id x13sf17218481ief.10 for ; Fri, 17 Jan 2014 08:45:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=RF+BV3O7l3nt7Tiao3J0HqOwRJlYH5Uw4Z68zwbcHck=; b=jR41EgwFVCUwJ38hsnDPuPbXS8sbn3nTdQis/W2p8CsF59c+9i189cPsziVCvql31M UCULFUAuIEyDanVqUssw8yTWXOJKEP2x4tovTgVxxYDbCcGu9IxoGbSSiKjsjnGSpXOF vmAg0SmyY4ngoPqrU3K3b3k+EItgFRaz+DxTgFYRk0B8QYPC88MNi6fFk78vSQplFW7C SpMs5ZXWkR2jP2r83DihnPlaQLJlIXChjQyPzuxvt7aa2qOzRCnS3XxVX0HtALWio0R2 pTqGaEfdS9CB3E7AlE0WuKYPPkUsChQ1KKf79k/yK8LAmB3p3rMUqwggY86nhlfw3Ale HvIw== X-Gm-Message-State: ALoCoQnx/0Fi19nbWqLjWqq7ZNUSAcuKpWpecAxfi/Wj2Ec9fbWp3SuYFW0JJesz+oh8rd0PenG+ X-Received: by 10.182.118.194 with SMTP id ko2mr1070633obb.32.1389977117751; Fri, 17 Jan 2014 08:45:17 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.128.200 with SMTP id nq8ls1174286qeb.95.gmail; Fri, 17 Jan 2014 08:45:17 -0800 (PST) X-Received: by 10.58.155.162 with SMTP id vx2mr641094veb.46.1389977117615; Fri, 17 Jan 2014 08:45:17 -0800 (PST) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id gq1si5116995vec.137.2014.01.17.08.45.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 17 Jan 2014 08:45:17 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id id10so1693546vcb.27 for ; Fri, 17 Jan 2014 08:45:17 -0800 (PST) X-Received: by 10.52.227.233 with SMTP id sd9mr532732vdc.53.1389977117534; Fri, 17 Jan 2014 08:45:17 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.59.13.131 with SMTP id ey3csp33070ved; Fri, 17 Jan 2014 08:45:16 -0800 (PST) X-Received: by 10.66.118.71 with SMTP id kk7mr3265546pab.14.1389977116435; Fri, 17 Jan 2014 08:45:16 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ek3si10613407pbd.205.2014.01.17.08.45.15; Fri, 17 Jan 2014 08:45:15 -0800 (PST) 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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752521AbaAQQpK (ORCPT + 26 others); Fri, 17 Jan 2014 11:45:10 -0500 Received: from mail-we0-f175.google.com ([74.125.82.175]:60221 "EHLO mail-we0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751918AbaAQQpF (ORCPT ); Fri, 17 Jan 2014 11:45:05 -0500 Received: by mail-we0-f175.google.com with SMTP id p61so4810543wes.34 for ; Fri, 17 Jan 2014 08:45:04 -0800 (PST) X-Received: by 10.180.106.165 with SMTP id gv5mr3333100wib.32.1389977104147; Fri, 17 Jan 2014 08:45:04 -0800 (PST) Received: from localhost.localdomain (AToulouse-654-1-359-206.w90-60.abo.wanadoo.fr. [90.60.118.206]) by mx.google.com with ESMTPSA id hv3sm4056142wib.5.2014.01.17.08.45.02 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 17 Jan 2014 08:45:03 -0800 (PST) From: Daniel Lezcano To: peterz@infradead.org Cc: mingo@kernel.org, linux-kernel@vger.kernel.org, linaro-kernel@lists.linaro.org, alex.shi@linaro.org Subject: [PATCH 1/2] sched/deadline: Fix compilation error Date: Fri, 17 Jan 2014 17:45:01 +0100 Message-Id: <1389977102-4420-1-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <52D95C5E.4070209@linaro.org> References: <52D95C5E.4070209@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.lezcano@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The pick_next_task function prototype changed with the previous patches. Signed-off-by: Daniel Lezcano --- kernel/sched/deadline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index 0de2482..db4fb9c 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -989,7 +989,7 @@ static struct sched_dl_entity *pick_next_dl_entity(struct rq *rq, return rb_entry(left, struct sched_dl_entity, rb_node); } -struct task_struct *pick_next_task_dl(struct rq *rq) +struct task_struct *pick_next_task_dl(struct rq *rq, struct task_struct *prev) { struct sched_dl_entity *dl_se; struct task_struct *p;