From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Wed, 14 May 2008 15:39:43 +0000 (+0100)
Subject: Stubdom changes to exec-all.h.
X-Git-Tag: xen-3.3.0-rc1~191
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=60ed839e7761f906b528854387dfef34f816b6b2;p=qemu-xen-3.4-testing.git

Stubdom changes to exec-all.h.
---

diff --git a/exec-all.h b/exec-all.h
index d8c6c337..8d4e6f60 100644
--- a/exec-all.h
+++ b/exec-all.h
@@ -303,7 +303,11 @@ extern CPUWriteMemoryFunc *io_mem_write[IO_MEM_NB_ENTRIES][4];
 extern CPUReadMemoryFunc *io_mem_read[IO_MEM_NB_ENTRIES][4];
 extern void *io_mem_opaque[IO_MEM_NB_ENTRIES];
 
-#if defined(__hppa__)
+#if defined(CONFIG_STUBDOM)
+
+#include <spinlock.h>
+
+#elif defined(__hppa__)
 
 typedef int spinlock_t[4];
 
@@ -519,7 +523,7 @@ extern spinlock_t tb_lock;
 
 extern int tb_invalidated_flag;
 
-#if !defined(CONFIG_USER_ONLY)
+#if !defined(CONFIG_USER_ONLY) && !defined(CONFIG_DM)
 
 void tlb_fill(target_ulong addr, int is_write, int mmu_idx,
               void *retaddr);
@@ -546,7 +550,7 @@ void tlb_fill(target_ulong addr, int is_write, int mmu_idx,
 
 #endif
 
-#if defined(CONFIG_USER_ONLY)
+#if defined(CONFIG_USER_ONLY) || defined(CONFIG_DM)
 static inline target_ulong get_phys_addr_code(CPUState *env1, target_ulong addr)
 {
     return addr;