WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] minios: Fix x86_32 compilation

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] minios: Fix x86_32 compilation
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Wed, 23 Jan 2008 01:10:18 -0800
Delivery-date: Wed, 23 Jan 2008 01:12:04 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1201000780 0
# Node ID d5e22e766d1f2081aaf2c92fcf3144f1ba681843
# Parent  b006c58b055e779391d579656bdd77a3984d5e2e
minios: Fix x86_32 compilation

Signed-off-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxxx>
---
 extras/mini-os/include/fs.h             |    1 +
 extras/mini-os/include/types.h          |    2 +-
 extras/mini-os/include/x86/arch_sched.h |    2 +-
 extras/mini-os/kernel.c                 |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff -r b006c58b055e -r d5e22e766d1f extras/mini-os/include/fs.h
--- a/extras/mini-os/include/fs.h       Tue Jan 22 11:18:10 2008 +0000
+++ b/extras/mini-os/include/fs.h       Tue Jan 22 11:19:40 2008 +0000
@@ -3,6 +3,7 @@
 
 #include <xen/io/fsif.h>
 #include <semaphore.h>
+#include <types.h>
 
 struct fs_import 
 {
diff -r b006c58b055e -r d5e22e766d1f extras/mini-os/include/types.h
--- a/extras/mini-os/include/types.h    Tue Jan 22 11:18:10 2008 +0000
+++ b/extras/mini-os/include/types.h    Tue Jan 22 11:19:40 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 b006c58b055e -r d5e22e766d1f extras/mini-os/include/x86/arch_sched.h
--- a/extras/mini-os/include/x86/arch_sched.h   Tue Jan 22 11:18:10 2008 +0000
+++ b/extras/mini-os/include/x86/arch_sched.h   Tue Jan 22 11:19:40 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 b006c58b055e -r d5e22e766d1f extras/mini-os/kernel.c
--- a/extras/mini-os/kernel.c   Tue Jan 22 11:18:10 2008 +0000
+++ b/extras/mini-os/kernel.c   Tue Jan 22 11:19:40 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)

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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] minios: Fix x86_32 compilation, Xen patchbot-unstable <=