ia64/xen-unstable

changeset 16836:d5e22e766d1f

minios: Fix x86_32 compilation

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Jan 22 11:19:40 2008 +0000 (2008-01-22)
parents b006c58b055e
children 7b1e7e8a5130
files extras/mini-os/include/fs.h extras/mini-os/include/types.h extras/mini-os/include/x86/arch_sched.h extras/mini-os/kernel.c
line diff
     1.1 --- a/extras/mini-os/include/fs.h	Tue Jan 22 11:18:10 2008 +0000
     1.2 +++ b/extras/mini-os/include/fs.h	Tue Jan 22 11:19:40 2008 +0000
     1.3 @@ -3,6 +3,7 @@
     1.4  
     1.5  #include <xen/io/fsif.h>
     1.6  #include <semaphore.h>
     1.7 +#include <types.h>
     1.8  
     1.9  struct fs_import 
    1.10  {
     2.1 --- a/extras/mini-os/include/types.h	Tue Jan 22 11:18:10 2008 +0000
     2.2 +++ b/extras/mini-os/include/types.h	Tue Jan 22 11:19:40 2008 +0000
     2.3 @@ -19,6 +19,7 @@
     2.4  
     2.5  #ifndef _TYPES_H_
     2.6  #define _TYPES_H_
     2.7 +#include <stddef.h>
     2.8  
     2.9  typedef signed char         s8;
    2.10  typedef unsigned char       u8;
    2.11 @@ -78,5 +79,4 @@ typedef s64 int64_t;
    2.12  #define UINT_MAX            (~0U)
    2.13  
    2.14  typedef long ssize_t;
    2.15 -typedef unsigned long size_t;
    2.16  #endif /* _TYPES_H_ */
     3.1 --- a/extras/mini-os/include/x86/arch_sched.h	Tue Jan 22 11:18:10 2008 +0000
     3.2 +++ b/extras/mini-os/include/x86/arch_sched.h	Tue Jan 22 11:19:40 2008 +0000
     3.3 @@ -12,7 +12,7 @@ static inline struct thread* get_current
     3.4  #else
     3.5      register unsigned long sp asm("rsp");
     3.6  #endif 
     3.7 -    current = (void *)(sp & ~(STACK_SIZE-1));
     3.8 +    current = (void *)(unsigned long)(sp & ~(STACK_SIZE-1));
     3.9      return *current;
    3.10  }
    3.11  
     4.1 --- a/extras/mini-os/kernel.c	Tue Jan 22 11:18:10 2008 +0000
     4.2 +++ b/extras/mini-os/kernel.c	Tue Jan 22 11:19:40 2008 +0000
     4.3 @@ -89,7 +89,7 @@ static void netfront_thread(void *p)
     4.4      init_netfront(NULL, NULL, NULL);
     4.5  }
     4.6  
     4.7 -#define RAND_MIX 2654435769
     4.8 +#define RAND_MIX 2654435769U
     4.9  
    4.10  /* Should be random enough for this use */
    4.11  static int rand(void)