From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: KVM: x86: remove WARN_ON from get_kernel_ns() Date: Thu, 10 Apr 2014 18:19:12 -0300 Message-ID: <20140410211912.GA30474@amt.cnet> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: kvm-devel Return-path: Received: from mx1.redhat.com ([209.132.183.28]:30020 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934020AbaDJVTa (ORCPT ); Thu, 10 Apr 2014 17:19:30 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s3ALJTm7032408 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 10 Apr 2014 17:19:30 -0400 Received: from amt.cnet (vpn1-4-26.gru2.redhat.com [10.97.4.26]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s3ALJSVr014549 for ; Thu, 10 Apr 2014 17:19:29 -0400 Received: from amt.cnet (localhost [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id CD6D5100385 for ; Thu, 10 Apr 2014 18:19:13 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.7/8.14.7/Submit) id s3ALJD3E030519 for kvm@vger.kernel.org; Thu, 10 Apr 2014 18:19:13 -0300 Content-Disposition: inline Sender: kvm-owner@vger.kernel.org List-ID: Function and callers can be preempted. https://bugzilla.kernel.org/show_bug.cgi?id=73721 Signed-off-by: Marcelo Tosatti diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 2b85784..ee0c3b5 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1109,7 +1109,6 @@ static inline u64 get_kernel_ns(void) { struct timespec ts; - WARN_ON(preemptible()); ktime_get_ts(&ts); monotonic_to_bootbased(&ts); return timespec_to_ns(&ts);