From 5f3798921f1bde57a28d7a1704dd22314bbf9c24 Mon Sep 17 00:00:00 2001 From: Pawel Dziepak Date: Thu, 5 Dec 2013 23:33:03 +0100 Subject: [PATCH] x86/paging: Use ROUNUP() to compute the number of initial slots --- .../kernel/arch/x86/paging/32bit/X86PagingMethod32Bit.cpp | 2 +- src/system/kernel/arch/x86/paging/pae/X86PagingMethodPAE.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/system/kernel/arch/x86/paging/32bit/X86PagingMethod32Bit.cpp b/src/system/kernel/arch/x86/paging/32bit/X86PagingMethod32Bit.cpp index 0f0272f6ba..37f5149d7f 100644 --- a/src/system/kernel/arch/x86/paging/32bit/X86PagingMethod32Bit.cpp +++ b/src/system/kernel/arch/x86/paging/32bit/X86PagingMethod32Bit.cpp @@ -38,7 +38,7 @@ #define MAX_INITIAL_POOLS \ - ((SMP_MAX_CPUS * TOTAL_SLOTS_PER_CPU + EXTRA_SLOTS + 1023) / 1024) + (ROUNDUP(SMP_MAX_CPUS * TOTAL_SLOTS_PER_CPU + EXTRA_SLOTS, 1024) / 1024) using X86LargePhysicalPageMapper::PhysicalPageSlot; diff --git a/src/system/kernel/arch/x86/paging/pae/X86PagingMethodPAE.cpp b/src/system/kernel/arch/x86/paging/pae/X86PagingMethodPAE.cpp index e96b0be792..38d4e0e676 100644 --- a/src/system/kernel/arch/x86/paging/pae/X86PagingMethodPAE.cpp +++ b/src/system/kernel/arch/x86/paging/pae/X86PagingMethodPAE.cpp @@ -42,8 +42,9 @@ #define MAX_INITIAL_POOLS \ - ((SMP_MAX_CPUS * TOTAL_SLOTS_PER_CPU + EXTRA_SLOTS \ - + kPAEPageTableEntryCount - 1) / kPAEPageTableEntryCount) + (ROUNDUP(SMP_MAX_CPUS * TOTAL_SLOTS_PER_CPU + EXTRA_SLOTS, \ + kPAEPageTableEntryCount) \ + / kPAEPageTableEntryCount) using X86LargePhysicalPageMapper::PhysicalPageSlot;