From mboxrd@z Thu Jan  1 00:00:00 1970
From: Samuel Thibault <samuel.thibault@eu.citrix.com>
Subject: [PATCH] minios: fix x86_32 compilation
Date: Tue, 22 Jan 2008 11:11:41 +0000
Message-ID: <20080122111141.GA5592@implementation.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

Fix x86_32 compilation

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>

---
(That is not needed in 3.2)

diff -r b4e8d0bb7901 extras/mini-os/include/fs.h
--- a/extras/mini-os/include/fs.h	Tue Jan 22 10:53:14 2008 +0000
+++ b/extras/mini-os/include/fs.h	Tue Jan 22 11:08:43 2008 +0000
@@ -3,6 +3,7 @@
 
 #include <xen/io/fsif.h>
 #include <semaphore.h>
+#include <types.h>
 
 struct fs_import 
 {
diff -r b4e8d0bb7901 extras/mini-os/include/types.h
--- a/extras/mini-os/include/types.h	Tue Jan 22 10:53:14 2008 +0000
+++ b/extras/mini-os/include/types.h	Tue Jan 22 11:08:43 2008 +0000
@@ -19,6 +19,7 @@
 
 #ifndef _TYPES_H_
 #define _TYPES_H_
+#include <stddef.h>
 
 typedef signed char         s8;
 typedef unsigned char       u8;
@@ -78,5 +79,4 @@ typedef s64 int64_t;
 #define UINT_MAX            (~0U)
 
 typedef long ssize_t;
-typedef unsigned long size_t;
 #endif /* _TYPES_H_ */
diff -r b4e8d0bb7901 extras/mini-os/include/x86/arch_sched.h
--- a/extras/mini-os/include/x86/arch_sched.h	Tue Jan 22 10:53:14 2008 +0000
+++ b/extras/mini-os/include/x86/arch_sched.h	Tue Jan 22 11:08:43 2008 +0000
@@ -12,7 +12,7 @@ static inline struct thread* get_current
 #else
     register unsigned long sp asm("rsp");
 #endif 
-    current = (void *)(sp & ~(STACK_SIZE-1));
+    current = (void *)(unsigned long)(sp & ~(STACK_SIZE-1));
     return *current;
 }
 
diff -r b4e8d0bb7901 extras/mini-os/kernel.c
--- a/extras/mini-os/kernel.c	Tue Jan 22 10:53:14 2008 +0000
+++ b/extras/mini-os/kernel.c	Tue Jan 22 11:08:43 2008 +0000
@@ -89,7 +89,7 @@ static void netfront_thread(void *p)
     init_netfront(NULL, NULL, NULL);
 }
 
-#define RAND_MIX 2654435769
+#define RAND_MIX 2654435769U
 
 /* Should be random enough for this use */
 static int rand(void)