avoid redefinition of __gpfn_to_mfn and __mfn_to_gpfn
PATCH 1/1 avoid redefinition of __gpfn_to_mfn and __mfn_to_gpfn
Hi,
Changeset 8694 introduced dummy __gpfn_to_mfn and __mfn_to_gpfn into
the common xen/include/shadow.h header. Unfortunately ia64 uses these functions and has it's own definition for them. The dummy versions are overriding the real version in xen/common/grant_table.c, which causes a hang somewhere between the startup of the networking code and mounting the root fs on an ia64 domU domain. Proposed patch below. Thanks,
Alex
Signed-off-by Alex Williamson <[email protected]>
---
xen/include/xen/shadow.h Mon Jan 30 08:50:57 2006 renamed from xen/include/xen/shadow.h Mon Jan 30 12:35:43 2006 +6 -2
@@ -15,8 +15,12 @@ #define shadow_mode_translate(d) (0) -#define __gpfn_to_mfn(d, p) (p) -#define __mfn_to_gpfn(d, p) (p) +#ifndef __gpfn_to_mfn + #define __gpfn_to_mfn(d, p) (p) +#endif +#ifndef __mfn_to_gpfn + #define __mfn_to_gpfn(d, p) (p) +#endif #define guest_physmap_add_page(d, p, m) ((void)0) #define guest_physmap_remove_page(d, p, m) ((void)0)