# HG changeset patch
# User tristan.gingold@xxxxxxxx
# Node ID 9e584707057ee4e6ec629b0bf6d0d0092306281c
# Parent  82481ae1fa183f99bab7a96eeeddc20fbd8d33b3
Misc small changes to avoid warnings.
Tested with and without CONFIG_SMP.

diff -r 82481ae1fa18 -r 9e584707057e xen/arch/ia64/linux-xen/time.c
--- a/xen/arch/ia64/linux-xen/time.c	Thu Oct 20 06:31:36 2005
+++ b/xen/arch/ia64/linux-xen/time.c	Thu Oct 20 07:16:25 2005
@@ -158,7 +158,12 @@
 {
 	unsigned long platform_base_freq, itc_freq;
 	struct pal_freq_ratio itc_ratio, proc_ratio;
+#ifdef XEN
+	long status, itc_drift;
+	unsigned long platform_base_drift;
+#else
 	long status, platform_base_drift, itc_drift;
+#endif
 
 	/*
 	 * According to SAL v2.6, we need to use a SAL call to determine the platform base
diff -r 82481ae1fa18 -r 9e584707057e xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c	Thu Oct 20 06:31:36 2005
+++ b/xen/arch/ia64/xen/domain.c	Thu Oct 20 07:16:25 2005
@@ -1143,7 +1143,7 @@
 	while(1);
 }
 
-void dummy_called(char *function)
+void dummy_called(const char *function)
 {
 	if (platform_is_hp_ski()) asm("break 0;;");
 	printf("dummy called in %s: spinning....\n", function);
diff -r 82481ae1fa18 -r 9e584707057e xen/arch/ia64/xen/grant_table.c
--- a/xen/arch/ia64/xen/grant_table.c	Thu Oct 20 06:31:36 2005
+++ b/xen/arch/ia64/xen/grant_table.c	Thu Oct 20 07:16:25 2005
@@ -1002,7 +1002,9 @@
     unsigned int cmd, void *uop, unsigned int count)
 {
     long rc;
+#if defined (CONFIG_SMP) || !defined (__ia64__)
     struct domain *d = current->domain;
+#endif
     
     if ( count > 512 )
         return -EINVAL;
diff -r 82481ae1fa18 -r 9e584707057e xen/arch/ia64/xen/xensetup.c
--- a/xen/arch/ia64/xen/xensetup.c	Thu Oct 20 06:31:36 2005
+++ b/xen/arch/ia64/xen/xensetup.c	Thu Oct 20 07:16:25 2005
@@ -165,10 +165,12 @@
 {
     char *cmdline;
     void *heap_start;
-    int i;
     unsigned long nr_pages, firsthole_start;
     unsigned long dom0_memory_start, dom0_memory_end;
     unsigned long initial_images_start, initial_images_end;
+#ifdef CONFIG_SMP
+    int i;
+#endif
 
     running_on_sim = is_platform_hp_ski();
     /* Kernel may be relocated by EFI loader */
@@ -260,7 +262,6 @@
 	(xenheap_phys_end-__pa(heap_start)) >> 10);
 
     late_setup_arch(&cmdline);
-    setup_per_cpu_areas();
     mem_init();
 
 printk("About to call scheduler_init()\n");
diff -r 82481ae1fa18 -r 9e584707057e xen/include/asm-ia64/config.h
--- a/xen/include/asm-ia64/config.h	Thu Oct 20 06:31:36 2005
+++ b/xen/include/asm-ia64/config.h	Thu Oct 20 07:16:25 2005
@@ -268,7 +268,7 @@
 
 #define FORCE_CRASH()	asm("break 0;;");
 
-void dummy_called(char *function);
+void dummy_called(const char *function);
 #define dummy()	dummy_called(__FUNCTION__)
 
 // these declarations got moved at some point, find a better place for them
diff -r 82481ae1fa18 -r 9e584707057e xen/include/asm-ia64/linux-xen/asm/uaccess.h
--- a/xen/include/asm-ia64/linux-xen/asm/uaccess.h	Thu Oct 20 06:31:36 2005
+++ b/xen/include/asm-ia64/linux-xen/asm/uaccess.h	Thu Oct 20 07:16:25 2005
@@ -34,6 +34,7 @@
 
 #include <linux/compiler.h>
 #include <linux/errno.h>
+#include <linux/cpumask.h>
 #include <linux/sched.h>
 #include <linux/page-flags.h>
 #include <linux/mm.h>
diff -r 82481ae1fa18 -r 9e584707057e xen/include/asm-ia64/linux/mmzone.h
--- a/xen/include/asm-ia64/linux/mmzone.h	Thu Oct 20 06:31:36 2005
+++ b/xen/include/asm-ia64/linux/mmzone.h	Thu Oct 20 07:16:25 2005
@@ -7,7 +7,9 @@
 #include <linux/config.h>
 #include <linux/spinlock.h>
 #include <linux/list.h>
+#ifndef XEN
 #include <linux/wait.h>
+#endif
 #include <linux/cache.h>
 #include <linux/threads.h>
 #include <linux/numa.h>
diff -r 82481ae1fa18 -r 9e584707057e xen/include/asm-ia64/linux/percpu.h
--- a/xen/include/asm-ia64/linux/percpu.h	Thu Oct 20 06:31:36 2005
+++ b/xen/include/asm-ia64/linux/percpu.h	Thu Oct 20 07:16:25 2005
@@ -42,6 +42,7 @@
 
 #define per_cpu_ptr(ptr, cpu) (ptr)
 
+#ifndef XEN
 static inline void *__alloc_percpu(size_t size, size_t align)
 {
 	void *ret = kmalloc(size, GFP_KERNEL);
@@ -53,6 +54,7 @@
 {	
 	kfree(ptr);
 }
+#endif
 
 #endif /* CONFIG_SMP */