From 8debdc269492a669497626ad0d4d35c3348a5800 Mon Sep 17 00:00:00 2001
From: Chris Wright <chrisw@sous-sol.org>
Date: Tue, 28 Apr 2009 12:11:37 -0700
Subject: [PATCH 2/2] kvm: external module: don't conflict w/ phys_addr_t

Make sure not to cause duplicate definition for phys_addr_t.

RH-Upstream-status: submission pending
Signed-off-by: Chris Wright <chrisw@redhat.com>
Bugzilla: 498071
Message-ID: <20090428191137.GD17091@x200.localdomain>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Acked-by: Don Dutile <ddutile@redhat.com>
Acked-by: Zachary Amsden <zamsden@redhat.com>
Acked-by: Eduardo Habkost <ehabkost@redhat.com>
---
 kernel/x86/external-module-compat.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/kernel/x86/external-module-compat.h b/kernel/x86/external-module-compat.h
index 9ba1cc8..a03087d 100644
--- a/kernel/x86/external-module-compat.h
+++ b/kernel/x86/external-module-compat.h
@@ -394,10 +394,12 @@ struct mtrr_state_type {
 #endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
+#if !defined(RHEL_RELEASE_CODE) || RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5,4)
 
 typedef u64 phys_addr_t;
 
 #endif
+#endif
 
 #ifndef CONFIG_HAVE_KVM_IRQCHIP
 #define CONFIG_HAVE_KVM_IRQCHIP 1
-- 
1.6.3.rc4.29.g8146