[Xen-changelog] [xen-unstable] [IA64] Compilation fix of p2m module

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1178223861 21600
# Node ID 367d9ab41d804936dfc9707aa22fcd188e7ac59e
# Parent  204046d995621fe88649daaaffa32ee42c18cdd4
[IA64] Compilation fix of p2m module

nsec_t is replaced with s64 and update Makefile of expose_p2m.

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 xen/arch/ia64/tools/p2m_expose/Makefile     |    5 ++++-
 xen/arch/ia64/tools/p2m_expose/expose_p2m.c |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff -r 204046d99562 -r 367d9ab41d80 xen/arch/ia64/tools/p2m_expose/Makefile
--- a/xen/arch/ia64/tools/p2m_expose/Makefile   Thu May 03 14:21:39 2007 -0600
+++ b/xen/arch/ia64/tools/p2m_expose/Makefile   Thu May 03 14:24:21 2007 -0600
@@ -3,12 +3,15 @@ else
 else
 PWD := $(shell pwd)
 TOPDIR ?= $(abspath $(PWD)/../../../../..)
-KDIR ?= $(TOPDIR)/linux-$(shell awk '/^LINUX_VER\>/{print $$3}' 
$(TOPDIR)/buildconfigs/mk.linux-2.6-xen)-xen
+KVER ?= $(shell awk '/^LINUX_VER\>/{print $$3}' 
$(TOPDIR)/buildconfigs/mk.linux-2.6-xen)
+KDIR ?= $(TOPDIR)/linux-$(KVER)-xen
 #CROSS_COMPILE ?= ia64-unknown-linux-
 #ARCH ?= ia64
 
 ifneq ($(O),)
 OPT_O := O=$(realpath $(O))
+else
+OPT_O ?= O=$(TOPDIR)/build-linux-$(KVER)-xen_ia64
 endif
 
 ifneq ($(V),)
diff -r 204046d99562 -r 367d9ab41d80 xen/arch/ia64/tools/p2m_expose/expose_p2m.c
--- a/xen/arch/ia64/tools/p2m_expose/expose_p2m.c       Thu May 03 14:21:39 
2007 -0600
+++ b/xen/arch/ia64/tools/p2m_expose/expose_p2m.c       Thu May 03 14:24:21 
2007 -0600
@@ -64,7 +64,7 @@ do_p2m(unsigned long (*conv)(unsigned lo
        unsigned long gpfn;
        unsigned long mfn;
        unsigned long count;
-       nsec_t nsec;
+       s64 nsec;
 
        count = 0;
        do_gettimeofday(&before_tv);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog