base: remove pager code from public API

Fix #1593

repos/base-pistachio/lib/mk/base-common.mk

@@ -7,8 +7,7 @@
 LIBS += cxx startup syscall
 
 SRC_CC += cap_copy.cc
-SRC_CC += ipc/ipc.cc ipc/pager.cc ipc/ipc_marshal_cap.cc
-SRC_CC += pager/pager.cc pager/common.cc
+SRC_CC += ipc/ipc.cc ipc/ipc_marshal_cap.cc
 SRC_CC += avl_tree/avl_tree.cc
 SRC_CC += allocator/slab.cc
 SRC_CC += allocator/allocator_avl.cc

repos/base-pistachio/src/core/include/ipc_pager.h

@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE__IPC_PAGER_H_
-#define _INCLUDE__BASE__IPC_PAGER_H_
+#ifndef _CORE__INCLUDE__IPC_PAGER_H_
+#define _CORE__INCLUDE__IPC_PAGER_H_
 
 /* Genode includes */
 #include <base/cache.h>
@@ -186,4 +186,4 @@ namespace Genode {
 	};
 }
 
-#endif /* _INCLUDE__BASE__IPC_PAGER_H_ */
+#endif /* _CORE__INCLUDE__IPC_PAGER_H_ */

repos/base-pistachio/src/core/include/platform_thread.h

@@ -16,10 +16,10 @@
 
 /* Genode includes */
 #include <base/native_types.h>
-#include <base/pager.h>
 #include <base/thread_state.h>
 
 /* core includes */
+#include <pager.h>
 #include <platform_pd.h>
 #include <address_space.h>
 

repos/base-pistachio/src/core/ipc_pager.cc

@@ -11,10 +11,13 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#include <base/ipc_pager.h>
+/* Genode includes */
 #include <base/printf.h>
 #include <base/sleep.h>
 
+/* Core includes */
+#include <ipc_pager.h>
+
 namespace Pistachio
 {
 #include <l4/message.h>

repos/base-pistachio/src/core/pager.cc

@@ -14,7 +14,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#include <base/pager.h>
+/* Core includes */
+#include <pager.h>
 
 using namespace Genode;
 

repos/base-pistachio/src/core/target.inc

@@ -4,33 +4,36 @@ LIBS         = base-common
 
 GEN_CORE_DIR = $(BASE_DIR)/src/core
 
-SRC_CC       = main.cc \
-               multiboot_info.cc \
-               ram_session_component.cc \
-               ram_session_support.cc \
-               rom_session_component.cc \
-               cap_session_component.cc \
-               cpu_session_component.cc \
-               cpu_session_platform.cc \
-               pd_session_component.cc \
-               io_mem_session_component.cc \
-               io_mem_session_support.cc \
-               thread_start.cc \
-               platform_thread.cc \
-               platform_pd.cc \
-               platform.cc \
-               platform_services.cc \
-               dataspace_component.cc \
-               rm_session_component.cc \
-               rm_session_support.cc \
-               irq_session_component.cc \
-               signal_session_component.cc \
-               signal_source_component.cc \
-               trace_session_component.cc \
-               dump_alloc.cc \
+SRC_CC       = cap_session_component.cc \
                context_area.cc \
                core_printf.cc \
-               kip.cc
+               cpu_session_component.cc \
+               cpu_session_platform.cc \
+               dataspace_component.cc \
+               dump_alloc.cc \
+               io_mem_session_component.cc \
+               io_mem_session_support.cc \
+               ipc_pager.cc \
+               irq_session_component.cc \
+               kip.cc \
+               main.cc \
+               multiboot_info.cc \
+               pd_session_component.cc \
+               pager.cc \
+               pager_common.cc \
+               platform.cc \
+               platform_pd.cc \
+               platform_services.cc \
+               platform_thread.cc \
+               ram_session_component.cc \
+               ram_session_support.cc \
+               rm_session_component.cc \
+               rm_session_support.cc \
+               rom_session_component.cc \
+               signal_session_component.cc \
+               signal_source_component.cc \
+               thread_start.cc \
+               trace_session_component.cc
 
 INC_DIR     += $(REP_DIR)/src/core/include \
                $(REP_DIR)/src/base/console \
@@ -54,6 +57,7 @@ vpath trace_session_component.cc  $(GEN_CORE_DIR)
 vpath dataspace_component.cc      $(GEN_CORE_DIR)
 vpath dump_alloc.cc               $(GEN_CORE_DIR)
 vpath context_area.cc             $(GEN_CORE_DIR)
+vpath pager_common.cc             $(GEN_CORE_DIR)
 vpath core_printf.cc              $(BASE_DIR)/src/base/console
 vpath kip.cc                      $(REP_DIR)/src/base/kip
 vpath %.cc                        $(REP_DIR)/src/core