1.1 --- a/tools/vnet/libxutil/Makefile	Tue Dec 04 09:56:10 2007 +0000
     1.2 +++ b/tools/vnet/libxutil/Makefile	Tue Dec 04 10:04:00 2007 +0000
     1.3 @@ -24,7 +24,7 @@ LIB_SRCS += util.c
     1.4  LIB_OBJS := $(LIB_SRCS:.c=.o)
     1.5  PIC_OBJS := $(LIB_SRCS:.c=.opic)
     1.6  
     1.7 -CFLAGS   += -Werror -fno-strict-aliasing
     1.8 +CFLAGS   += -Werror -fno-strict-aliasing $(call cc-option,$(CC),-fgnu89-inline,)
     1.9  CFLAGS   += -O3
    1.10  #CFLAGS   += -g
    1.11  

     2.1 --- a/tools/vnet/vnet-module/Makefile.ver	Tue Dec 04 09:56:10 2007 +0000
     2.2 +++ b/tools/vnet/vnet-module/Makefile.ver	Tue Dec 04 10:04:00 2007 +0000
     2.3 @@ -20,14 +20,14 @@
     2.4  
     2.5  LINUX_SERIES?=2.6
     2.6  
     2.7 -LINUX_VERSION?=$(shell (/bin/ls -d $(XEN_ROOT)/pristine-linux-$(LINUX_SERIES).* 2>/dev/null) | \
     2.8 -                      sed -e 's!^.*linux-\(.\+\)!\1!' )
     2.9 +LINUX_VERSION?=$(shell (/bin/ls -d $(XEN_ROOT)/linux-$(LINUX_SERIES).* 2>/dev/null) | \
    2.10 +                      sed -e 's!^.*linux-\(.\+\).hg!\1!' )
    2.11  
    2.12  ifeq ($(LINUX_VERSION),)
    2.13  $(error Kernel source for linux $(LINUX_SERIES) not found)
    2.14  endif
    2.15  
    2.16 -KERNEL_VERSION?=$(shell (/bin/ls -d $(XEN_ROOT)/build-linux-$(LINUX_VERSION)-xen* 2>/dev/null) | \
    2.17 +KERNEL_VERSION?=$(shell (/bin/ls -d $(XEN_ROOT)/build-linux-$(LINUX_VERSION)* 2>/dev/null) | \
    2.18                        grep -v -m 1 -e '-xenU' | \
    2.19                        sed -e 's!^.*linux-\(.\+\)!\1!' )
    2.20  

     3.1 --- a/tools/vnet/vnet-module/sa.c	Tue Dec 04 09:56:10 2007 +0000
     3.2 +++ b/tools/vnet/vnet-module/sa.c	Tue Dec 04 10:04:00 2007 +0000
     3.3 @@ -16,7 +16,6 @@
     3.4   * 59 Temple Place, suite 330, Boston, MA 02111-1307 USA
     3.5   *
     3.6   */
     3.7 -#include <linux/config.h>
     3.8  #include <linux/kernel.h>
     3.9  
    3.10  #include <tunnel.h>