hrev53517 adds 1 changeset to branch 'master'
old head: db6fcb750a1afb5fdc752322972adf6044d3b4c4
new head: 2d85a5644bb8a0590d273290492f9f66e0b8c020
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=2d85a5644bb8+%5Edb6fcb750a1a
----------------------------------------------------------------------------
2d85a5644bb8: Fix SMAP violation when running profile
* Fixes #15379.
Change-Id: I3d5672ec0ffd4c09a35535f641e433d3d714412a
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1890
Reviewed-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
[ Kacper Kasper <kacperkasper@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev53517
Commit: 2d85a5644bb8a0590d273290492f9f66e0b8c020
URL: https://git.haiku-os.org/haiku/commit/?id=2d85a5644bb8
Author: Kacper Kasper <kacperkasper@xxxxxxxxx>
Date: Fri Sep 27 20:06:55 2019 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Fri Sep 27 22:52:49 2019 UTC
Ticket: https://dev.haiku-os.org/ticket/15379
----------------------------------------------------------------------------
2 files changed, 3 insertions(+), 2 deletions(-)
src/system/kernel/debug/system_profiler.cpp | 2 +-
src/system/kernel/debug/user_debugger.cpp | 3 ++-
----------------------------------------------------------------------------
diff --git a/src/system/kernel/debug/system_profiler.cpp
b/src/system/kernel/debug/system_profiler.cpp
index bab5d10b02..87a794f55b 100644
--- a/src/system/kernel/debug/system_profiler.cpp
+++ b/src/system/kernel/debug/system_profiler.cpp
@@ -370,7 +370,7 @@ SystemProfiler::Init()
// clone the user area
void* areaBase;
fKernelArea = clone_area("profiling samples", &areaBase,
- B_ANY_KERNEL_ADDRESS, B_READ_AREA | B_WRITE_AREA,
+ B_ANY_KERNEL_ADDRESS, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA,
fUserArea);
if (fKernelArea < 0)
return fKernelArea;
diff --git a/src/system/kernel/debug/user_debugger.cpp
b/src/system/kernel/debug/user_debugger.cpp
index 20eee0e027..2553c073cd 100644
--- a/src/system/kernel/debug/user_debugger.cpp
+++ b/src/system/kernel/debug/user_debugger.cpp
@@ -2275,7 +2275,8 @@ debug_nub_thread(void *)
void* samples = NULL;
if (result == B_OK) {
clonedSampleArea =
clone_area("profiling samples", &samples,
- B_ANY_KERNEL_ADDRESS,
B_READ_AREA | B_WRITE_AREA,
+ B_ANY_KERNEL_ADDRESS,
+ B_KERNEL_READ_AREA |
B_KERNEL_WRITE_AREA,
sampleArea);
if (clonedSampleArea >= 0) {
// we need the memory locked
