From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934146Ab3E1NZ3 (ORCPT ); Tue, 28 May 2013 09:25:29 -0400 Received: from terminus.zytor.com ([198.137.202.10]:50447 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934133Ab3E1NZY (ORCPT ); Tue, 28 May 2013 09:25:24 -0400 Date: Tue, 28 May 2013 06:24:34 -0700 From: "tip-bot for Michael S. Tsirkin" Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, a.p.zijlstra@chello.nl, torvalds@linux-foundation.org, mst@redhat.com, peterz@infradead.org, akpm@linux-foundation.org, tglx@linutronix.de Reply-To: mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, mst@redhat.com, torvalds@linux-foundation.org, a.p.zijlstra@chello.nl, peterz@infradead.org, akpm@linux-foundation.org, tglx@linutronix.de In-Reply-To: <1369577426-26721-9-git-send-email-mst@redhat.com> References: <1369577426-26721-9-git-send-email-mst@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/mm] x86: uaccess s/might_sleep/might_fault/ Git-Commit-ID: 016be2e55d98aee0b97b94b200d6e0e110c8392a X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 016be2e55d98aee0b97b94b200d6e0e110c8392a Gitweb: http://git.kernel.org/tip/016be2e55d98aee0b97b94b200d6e0e110c8392a Author: Michael S. Tsirkin AuthorDate: Sun, 26 May 2013 17:31:55 +0300 Committer: Ingo Molnar CommitDate: Tue, 28 May 2013 09:41:10 +0200 x86: uaccess s/might_sleep/might_fault/ The only reason uaccess routines might sleep is if they fault. Make this explicit. Signed-off-by: Michael S. Tsirkin Signed-off-by: Peter Zijlstra Cc: Linus Torvalds Cc: Andrew Morton Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1369577426-26721-9-git-send-email-mst@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/include/asm/uaccess_64.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h index 142810c..4f7923d 100644 --- a/arch/x86/include/asm/uaccess_64.h +++ b/arch/x86/include/asm/uaccess_64.h @@ -235,7 +235,7 @@ extern long __copy_user_nocache(void *dst, const void __user *src, static inline int __copy_from_user_nocache(void *dst, const void __user *src, unsigned size) { - might_sleep(); + might_fault(); return __copy_user_nocache(dst, src, size, 1); }