From patchwork Wed Apr 29 21:20:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 20821 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n3TLLPw4009861 for ; Wed, 29 Apr 2009 21:21:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756360AbZD2VVF (ORCPT ); Wed, 29 Apr 2009 17:21:05 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756352AbZD2VVE (ORCPT ); Wed, 29 Apr 2009 17:21:04 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:51771 "EHLO e7.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756065AbZD2VVC (ORCPT ); Wed, 29 Apr 2009 17:21:02 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e7.ny.us.ibm.com (8.13.1/8.13.1) with ESMTP id n3TLAQt4018047 for ; Wed, 29 Apr 2009 17:10:26 -0400 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n3TLL1hp104944 for ; Wed, 29 Apr 2009 17:21:01 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n3TLL1SP032597 for ; Wed, 29 Apr 2009 17:21:01 -0400 Received: from localhost.localdomain (sig-9-65-58-151.mts.ibm.com [9.65.58.151]) by d01av01.pok.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n3TLKdgI031204; Wed, 29 Apr 2009 17:20:59 -0400 From: Anthony Liguori To: kvm@vger.kernel.org Cc: Anthony Liguori , Avi Kivity Subject: [PATCH 07/21] Remove dead macros likely/unlikely in exec.c Date: Wed, 29 Apr 2009 16:20:24 -0500 Message-Id: <1241040038-17183-8-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1241040038-17183-1-git-send-email-aliguori@us.ibm.com> References: <1241040038-17183-1-git-send-email-aliguori@us.ibm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org More left overs from the old migration code. Signed-off-by: Anthony Liguori --- exec.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/exec.c b/exec.c index 16d3cf8..e9d83a8 100644 --- a/exec.c +++ b/exec.c @@ -3500,14 +3500,6 @@ uint32_t lduw_phys(target_phys_addr_t addr) return tswap16(val); } -#ifdef __GNUC__ -#define likely(x) __builtin_expect(!!(x), 1) -#define unlikely(x) __builtin_expect(!!(x), 0) -#else -#define likely(x) x -#define unlikely(x) x -#endif - /* warning: addr must be aligned. The ram page is not masked as dirty and the code inside is not invalidated. It is useful if the dirty bits are used to track modified PTEs */