From ccab02c72332d62c78f376be10f21044b5b226aa Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner <yuriks@yuriks.net>
Date: Sun, 19 Jul 2015 02:22:28 -0300
Subject: [PATCH] Memory: Move PAGE_MASK and PAGE_BITS to memory.h

---
 src/core/memory.h       | 2 ++
 src/core/memory_setup.h | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/core/memory.h b/src/core/memory.h
index 418609de0..2a06cc6c3 100644
--- a/src/core/memory.h
+++ b/src/core/memory.h
@@ -15,6 +15,8 @@ namespace Memory {
  * be mapped.
  */
 const u32 PAGE_SIZE = 0x1000;
+const u32 PAGE_MASK = PAGE_SIZE - 1;
+const int PAGE_BITS = 12;
 
 /// Physical memory regions as seen from the ARM11
 enum : PAddr {
diff --git a/src/core/memory_setup.h b/src/core/memory_setup.h
index 361bfc816..84ff30120 100644
--- a/src/core/memory_setup.h
+++ b/src/core/memory_setup.h
@@ -10,9 +10,6 @@
 
 namespace Memory {
 
-const u32 PAGE_MASK = PAGE_SIZE - 1;
-const int PAGE_BITS = 12;
-
 void InitMemoryMap();
 
 /**