hrev54857 adds 2 changesets to branch 'master'
old head: 68d37cfb3a755a7270d772b505ee15c8b18aa5e0
new head: 437df0a3fbfad7b5bc34d56935d825a8270287ef
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=437df0a3fbfa+%5E68d37cfb3a75
----------------------------------------------------------------------------
a736630c63de: Fix ppc build
Remaining uses of PAGE_SIZE that I didn't notice.
437df0a3fbfa: x86_64: fix build
This code was accidentally removed but is still needed.
[ Adrien Destugues <adrien.destugues@xxxxxxxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 6 insertions(+), 2 deletions(-)
headers/private/kernel/arch/x86/arch_cpu.h | 4 ++++
src/system/kernel/arch/ppc/paging/460/PPCVMTranslationMap460.cpp | 2 +-
.../kernel/arch/ppc/paging/classic/PPCVMTranslationMapClassic.cpp | 2 +-
############################################################################
Commit: a736630c63de2c9997256329c61c26d8b33774a4
URL: https://git.haiku-os.org/haiku/commit/?id=a736630c63de
Author: Adrien Destugues <adrien.destugues@xxxxxxxxxxxxxxxxxxxxx>
Date: Fri Jan 8 12:18:07 2021 UTC
Fix ppc build
Remaining uses of PAGE_SIZE that I didn't notice.
----------------------------------------------------------------------------
diff --git a/src/system/kernel/arch/ppc/paging/460/PPCVMTranslationMap460.cpp
b/src/system/kernel/arch/ppc/paging/460/PPCVMTranslationMap460.cpp
index a6c6fd1593..86a215f294 100644
--- a/src/system/kernel/arch/ppc/paging/460/PPCVMTranslationMap460.cpp
+++ b/src/system/kernel/arch/ppc/paging/460/PPCVMTranslationMap460.cpp
@@ -108,7 +108,7 @@
// The VSID is a 24 bit number. The lower three bits are defined by the
// (effective) segment number, which leaves us with a 21 bit space of
// VSID bases (= 2 * 1024 * 1024).
-#define MAX_VSID_BASES (PAGE_SIZE * 8)
+#define MAX_VSID_BASES (B_PAGE_SIZE * 8)
static uint32 sVSIDBaseBitmap[MAX_VSID_BASES / (sizeof(uint32) * 8)];
static spinlock sVSIDBaseBitmapLock;
diff --git
a/src/system/kernel/arch/ppc/paging/classic/PPCVMTranslationMapClassic.cpp
b/src/system/kernel/arch/ppc/paging/classic/PPCVMTranslationMapClassic.cpp
index 253bbc4adc..1f8299e51f 100644
--- a/src/system/kernel/arch/ppc/paging/classic/PPCVMTranslationMapClassic.cpp
+++ b/src/system/kernel/arch/ppc/paging/classic/PPCVMTranslationMapClassic.cpp
@@ -108,7 +108,7 @@
// The VSID is a 24 bit number. The lower three bits are defined by the
// (effective) segment number, which leaves us with a 21 bit space of
// VSID bases (= 2 * 1024 * 1024).
-#define MAX_VSID_BASES (PAGE_SIZE * 8)
+#define MAX_VSID_BASES (B_PAGE_SIZE * 8)
static uint32 sVSIDBaseBitmap[MAX_VSID_BASES / (sizeof(uint32) * 8)];
static spinlock sVSIDBaseBitmapLock;
############################################################################
Revision: hrev54857
Commit: 437df0a3fbfad7b5bc34d56935d825a8270287ef
URL: https://git.haiku-os.org/haiku/commit/?id=437df0a3fbfa
Author: Adrien Destugues <adrien.destugues@xxxxxxxxxxxxxxxxxxxxx>
Date: Fri Jan 8 12:25:11 2021 UTC
x86_64: fix build
This code was accidentally removed but is still needed.
----------------------------------------------------------------------------
diff --git a/headers/private/kernel/arch/x86/arch_cpu.h
b/headers/private/kernel/arch/x86/arch_cpu.h
index b2f3975056..2ba90b0551 100644
--- a/headers/private/kernel/arch/x86/arch_cpu.h
+++ b/headers/private/kernel/arch/x86/arch_cpu.h
@@ -21,6 +21,10 @@
#include <arch/x86/arch_cpuasm.h>
#include <arch/x86/descriptors.h>
+#ifdef __x86_64__
+# include <arch/x86/64/cpu.h>
+#endif
+
#endif // !_ASSEMBLER
