From 6ce9b0563d0d91406490192067c9054efc5ae551 Mon Sep 17 00:00:00 2001
From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Date: Tue, 17 Jul 2012 21:55:34 +0800
Subject: [PATCH] --- yaml --- r: 329801 b: refs/heads/master c:
 f340a51b7e41abbe92ae3a327c0020974a059f95 h: refs/heads/master i:   329799:
 6eebafbbcf55883517e703529a80c3c6e9b314bf v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/kvm_host.h | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f59ac4fef6ff..672ef4d9ab5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca0565f5736e67af3172d188577b57e303dd082a
+refs/heads/master: f340a51b7e41abbe92ae3a327c0020974a059f95
diff --git a/trunk/include/linux/kvm_host.h b/trunk/include/linux/kvm_host.h
index 5f956cde1374..e8d13a072d24 100644
--- a/trunk/include/linux/kvm_host.h
+++ b/trunk/include/linux/kvm_host.h
@@ -378,10 +378,6 @@ id_to_memslot(struct kvm_memslots *slots, int id)
 	return slot;
 }
 
-#define HPA_MSB ((sizeof(hpa_t) * 8) - 1)
-#define HPA_ERR_MASK ((hpa_t)1 << HPA_MSB)
-static inline int is_error_hpa(hpa_t hpa) { return hpa >> HPA_MSB; }
-
 extern struct page *bad_page;
 
 int is_error_page(struct page *page);