diff --git a/base-hw/src/core/include/platform_pd.h b/base-hw/src/core/include/platform_pd.h index 650a9e3807..3e0d855d53 100644 --- a/base-hw/src/core/include/platform_pd.h +++ b/base-hw/src/core/include/platform_pd.h @@ -24,12 +24,6 @@ #include #include -namespace Kernel -{ - Genode::size_t pd_size(); - unsigned pd_alignm_log2(); -} - namespace Genode { /** @@ -69,7 +63,7 @@ namespace Genode Range_allocator * ram = platform()->ram_alloc(); bool kernel_pd_ok = ram->alloc_aligned(Kernel::pd_size(), &kernel_pd, - Kernel::pd_alignm_log2()).is_ok(); + Kernel::pd_alignment_log2()).is_ok(); if (!kernel_pd_ok) { PERR("failed to allocate kernel object"); throw Root::Quota_exceeded(); diff --git a/base-hw/src/core/kernel/core_interface.h b/base-hw/src/core/kernel/core_interface.h index d869a62f80..708f735529 100644 --- a/base-hw/src/core/kernel/core_interface.h +++ b/base-hw/src/core/kernel/core_interface.h @@ -23,10 +23,10 @@ namespace Kernel size_t mode_transition_size(); size_t thread_size(); size_t pd_size(); + unsigned pd_alignment_log2(); size_t signal_context_size(); size_t signal_receiver_size(); size_t vm_size(); - unsigned kernel_pd_alignm_log2(); /** * Kernel names of the kernel calls diff --git a/base-hw/src/core/kernel/kernel.cc b/base-hw/src/core/kernel/kernel.cc index 372e030c0b..ee823f9ffd 100644 --- a/base-hw/src/core/kernel/kernel.cc +++ b/base-hw/src/core/kernel/kernel.cc @@ -134,12 +134,12 @@ namespace Kernel /** * Get attributes of the kernel objects */ - size_t thread_size() { return sizeof(Thread); } - size_t pd_size() { return sizeof(Tlb) + sizeof(Pd); } - size_t signal_context_size() { return sizeof(Signal_context); } - size_t signal_receiver_size() { return sizeof(Signal_receiver); } - unsigned pd_alignm_log2() { return Tlb::ALIGNM_LOG2; } - size_t vm_size() { return sizeof(Vm); } + size_t thread_size() { return sizeof(Thread); } + size_t pd_size() { return sizeof(Tlb) + sizeof(Pd); } + size_t signal_context_size() { return sizeof(Signal_context); } + size_t signal_receiver_size() { return sizeof(Signal_receiver); } + unsigned pd_alignment_log2() { return Tlb::ALIGNM_LOG2; } + size_t vm_size() { return sizeof(Vm); } enum { STACK_SIZE = 64 * 1024 };