hrev56156 adds 2 changesets to branch 'master'
old head: 2823fe54e1cfb232d13214e0c835cd45ed1098a9
new head: 8a30322767fff0ffb3e56193015ac6898321807f
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=8a30322767ff+%5E2823fe54e1cf
----------------------------------------------------------------------------
f89204718306: kernel.h: don't include user address tests in boot loader
8a30322767ff: libroot: move catopen/catgets/catclose out of libbe
[ Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx> ]
----------------------------------------------------------------------------
4 files changed, 4 insertions(+), 1 deletion(-)
headers/private/kernel/kernel.h | 3 +++
src/kits/locale/Jamfile | 1 -
src/system/libroot/posix/Jamfile | 1 +
src/{kits/locale => system/libroot/posix}/cat.cpp | 0
############################################################################
Commit: f892047183068339e55901bb6d0fc2e258248113
URL: https://git.haiku-os.org/haiku/commit/?id=f89204718306
Author: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
Date: Fri Jun 3 22:31:05 2022 UTC
kernel.h: don't include user address tests in boot loader
----------------------------------------------------------------------------
diff --git a/headers/private/kernel/kernel.h b/headers/private/kernel/kernel.h
index 981f37a892..0cfa2dec8b 100644
--- a/headers/private/kernel/kernel.h
+++ b/headers/private/kernel/kernel.h
@@ -30,6 +30,8 @@
((addr_t)(x) >= KERNEL_BASE && (addr_t)(x) <= KERNEL_TOP)
#endif
+#ifndef _BOOT_MODE
+
// Buffers passed in from user-space shouldn't point into the kernel.
#if USER_BASE == 0
# define IS_USER_ADDRESS(x) ((addr_t)(x) <= USER_TOP)
@@ -56,6 +58,7 @@ is_user_address_range(const void* addr, size_t size)
}
#endif
+#endif // !_BOOT_MODE
#define DEBUG_KERNEL_STACKS
// Note, debugging kernel stacks doesn't really work yet. Since the
############################################################################
Revision: hrev56156
Commit: 8a30322767fff0ffb3e56193015ac6898321807f
URL: https://git.haiku-os.org/haiku/commit/?id=8a30322767ff
Author: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
Date: Fri Jun 3 23:04:40 2022 UTC
libroot: move catopen/catgets/catclose out of libbe
----------------------------------------------------------------------------
diff --git a/src/kits/locale/Jamfile b/src/kits/locale/Jamfile
index d6fad85790..3880624547 100644
--- a/src/kits/locale/Jamfile
+++ b/src/kits/locale/Jamfile
@@ -6,7 +6,6 @@ UsePrivateHeaders locale shared ;
UsePublicHeaders locale storage ;
local sources =
- cat.cpp
Catalog.cpp
CatalogData.cpp
Collator.cpp
diff --git a/src/system/libroot/posix/Jamfile b/src/system/libroot/posix/Jamfile
index 90446f4ef2..d91c0d1a04 100644
--- a/src/system/libroot/posix/Jamfile
+++ b/src/system/libroot/posix/Jamfile
@@ -27,6 +27,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
MergeObject <$(architecture)>posix_main.o :
assert.cpp
+ cat.cpp
dlfcn.c
dirent.c
errno.c
diff --git a/src/kits/locale/cat.cpp b/src/system/libroot/posix/cat.cpp
similarity index 100%
rename from src/kits/locale/cat.cpp
rename to src/system/libroot/posix/cat.cpp
