1.1 --- a/xen/arch/ia64/tools/p2m_expose/Makefile	Thu May 03 14:21:39 2007 -0600
     1.2 +++ b/xen/arch/ia64/tools/p2m_expose/Makefile	Thu May 03 14:24:21 2007 -0600
     1.3 @@ -3,12 +3,15 @@ obj-m += expose_p2m.o
     1.4  else
     1.5  PWD := $(shell pwd)
     1.6  TOPDIR ?= $(abspath $(PWD)/../../../../..)
     1.7 -KDIR ?= $(TOPDIR)/linux-$(shell awk '/^LINUX_VER\>/{print $$3}' $(TOPDIR)/buildconfigs/mk.linux-2.6-xen)-xen
     1.8 +KVER ?= $(shell awk '/^LINUX_VER\>/{print $$3}' $(TOPDIR)/buildconfigs/mk.linux-2.6-xen)
     1.9 +KDIR ?= $(TOPDIR)/linux-$(KVER)-xen
    1.10  #CROSS_COMPILE ?= ia64-unknown-linux-
    1.11  #ARCH ?= ia64
    1.12  
    1.13  ifneq ($(O),)
    1.14  OPT_O := O=$(realpath $(O))
    1.15 +else
    1.16 +OPT_O ?= O=$(TOPDIR)/build-linux-$(KVER)-xen_ia64
    1.17  endif
    1.18  
    1.19  ifneq ($(V),)

     2.1 --- a/xen/arch/ia64/tools/p2m_expose/expose_p2m.c	Thu May 03 14:21:39 2007 -0600
     2.2 +++ b/xen/arch/ia64/tools/p2m_expose/expose_p2m.c	Thu May 03 14:24:21 2007 -0600
     2.3 @@ -64,7 +64,7 @@ do_p2m(unsigned long (*conv)(unsigned lo
     2.4  	unsigned long gpfn;
     2.5  	unsigned long mfn;
     2.6  	unsigned long count;
     2.7 -	nsec_t nsec;
     2.8 +	s64 nsec;
     2.9  
    2.10  	count = 0;
    2.11  	do_gettimeofday(&before_tv);