From patchwork Mon Apr 29 21:45:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Cross X-Patchwork-Id: 2502671 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 2D5433FD1A for ; Mon, 29 Apr 2013 21:47:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932739Ab3D2VqD (ORCPT ); Mon, 29 Apr 2013 17:46:03 -0400 Received: from mail-qc0-f202.google.com ([209.85.216.202]:64362 "EHLO mail-qc0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759492Ab3D2Vpz (ORCPT ); Mon, 29 Apr 2013 17:45:55 -0400 Received: by mail-qc0-f202.google.com with SMTP id k26so712477qcs.1 for ; Mon, 29 Apr 2013 14:45:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=8SDKhQiDIkx5Vtlk3d8HeIESe9/pT5HW5wTsgz1CIz4=; b=Ms3wOfnl7dyhITtBNpS66UVzNKTY3SWsLpsJ5SAtjZJoHW8bYqG5O02J7qeRd3MduC Y990Jg16A1+dtlf5bC4HO+CSk7Ja1jflSAYPhNtLdrZRagVAquAxamyeTsl0N5rPtaly NuCprltijIVhHFM6RUejzY8HtTv8eccaCdMwVFBt7MUXxLLim8hOeGmG2uE4Yi7SLR/Y ifA6urEbCiAx1079b53Orgmg4yhKb+YE7dsX/0/599jFIqS6Gm52f2ZJXa8LypOFM+vK 95fEHefOXd9Ck2gkkSFR+nrh/HPIfhDEDGfdOu+Eg0lPPW8rjCvFi8UMcm6E16Aqieiz yP/g== X-Received: by 10.236.80.106 with SMTP id j70mr13425081yhe.11.1367271954481; Mon, 29 Apr 2013 14:45:54 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id u58si1362177yhe.2.2013.04.29.14.45.54 for (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Mon, 29 Apr 2013 14:45:54 -0700 (PDT) Received: from walnut.mtv.corp.google.com (walnut.mtv.corp.google.com [172.18.105.48]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 541EE31C022; Mon, 29 Apr 2013 14:45:54 -0700 (PDT) Received: by walnut.mtv.corp.google.com (Postfix, from userid 99897) id 011A216206F; Mon, 29 Apr 2013 14:45:53 -0700 (PDT) From: Colin Cross To: linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, "Rafael J. Wysocki" , arve@android.com, Colin Cross , Darren Hart , Thomas Gleixner , Andrew Morton , Randy Dunlap , Al Viro Subject: [PATCH 07/10] futex: use freezable blocking call Date: Mon, 29 Apr 2013 14:45:43 -0700 Message-Id: <1367271946-7239-8-git-send-email-ccross@android.com> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1367271946-7239-1-git-send-email-ccross@android.com> References: <1367271946-7239-1-git-send-email-ccross@android.com> X-Gm-Message-State: ALoCoQlWu3w3SbJRSuFDjVv7fjP50hn9evFFn2qCh64e2DlAWDUWuPSU0D9hjNffbEdWHAbMya6ztdBf5OEXa3xpPRUUSeHDWsruPuazYP/0Tk4DG0MvV3XSyTKLagmUc2MhrQ5tl45aQ97o4zwgDZY1nfbEQLd55IlDBpThoFWsnIdIYh49kAtWpDb5t1iZK7EOUaMdgYff Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Avoid waking up every thread sleeping in a futex_wait call during suspend and resume by calling a freezable blocking call. Signed-off-by: Colin Cross --- kernel/futex.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/futex.c b/kernel/futex.c index b26dcfc..d710fae 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -61,6 +61,7 @@ #include #include #include +#include #include @@ -1807,7 +1808,7 @@ static void futex_wait_queue_me(struct futex_hash_bucket *hb, struct futex_q *q, * is no timeout, or if it has yet to expire. */ if (!timeout || timeout->task) - schedule(); + freezable_schedule(); } __set_current_state(TASK_RUNNING); }