diff options
| -rw-r--r-- | cputlb.c | 3 | ||||
| -rw-r--r-- | exec.c | 3 | ||||
| -rw-r--r-- | memory-internal.h (renamed from exec-obsolete.h) | 8 | ||||
| -rw-r--r-- | memory.c | 3 |
4 files changed, 5 insertions, 12 deletions
diff --git a/cputlb.c b/cputlb.c index 51b5897d37..0627f32e35 100644 --- a/cputlb.c +++ b/cputlb.c @@ -24,8 +24,7 @@ #include "cputlb.h" -#define WANT_EXEC_OBSOLETE -#include "exec-obsolete.h" +#include "memory-internal.h" //#define DEBUG_TLB //#define DEBUG_TLB_CHECK diff --git a/exec.c b/exec.c index 7899042ce9..eb0ec93f9a 100644 --- a/exec.c +++ b/exec.c @@ -59,8 +59,7 @@ #include "cputlb.h" -#define WANT_EXEC_OBSOLETE -#include "exec-obsolete.h" +#include "memory-internal.h" //#define DEBUG_TB_INVALIDATE //#define DEBUG_FLUSH diff --git a/exec-obsolete.h b/memory-internal.h index 286e2f75e1..43fa886264 100644 --- a/exec-obsolete.h +++ b/memory-internal.h @@ -16,12 +16,8 @@ * The functions declared here will be removed soon. */ -#ifndef EXEC_OBSOLETE_H -#define EXEC_OBSOLETE_H - -#ifndef WANT_EXEC_OBSOLETE -#error Do not include exec-obsolete.h -#endif +#ifndef MEMORY_INTERNAL_H +#define MEMORY_INTERNAL_H #ifndef CONFIG_USER_ONLY #include "hw/xen.h" diff --git a/memory.c b/memory.c index 4f3ade06dd..1aeca08dda 100644 --- a/memory.c +++ b/memory.c @@ -20,8 +20,7 @@ #include "kvm.h" #include <assert.h> -#define WANT_EXEC_OBSOLETE -#include "exec-obsolete.h" +#include "memory-internal.h" unsigned memory_region_transaction_depth = 0; static bool global_dirty_log = false; |