hrev50984 adds 1 changeset to branch 'master'
old head: 5d9f944f0a72c5a82be2611c00395d95335f1dc5
new head: 59bdca5dd41d480cd87ddf062237d0243cc66ee4
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=59bdca5dd41d+%5E5d9f944f0a72
----------------------------------------------------------------------------
59bdca5dd41d: kernel/x86/arch_int: Style fixes.
Thanks Axel for the review.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev50984
Commit: 59bdca5dd41d480cd87ddf062237d0243cc66ee4
URL: http://cgit.haiku-os.org/haiku/commit/?id=59bdca5dd41d
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Mon Feb 27 23:14:26 2017 UTC
----------------------------------------------------------------------------
1 file changed, 3 insertions(+), 3 deletions(-)
src/system/kernel/arch/x86/arch_int.cpp | 6 +++---
----------------------------------------------------------------------------
diff --git a/src/system/kernel/arch/x86/arch_int.cpp
b/src/system/kernel/arch/x86/arch_int.cpp
index 08c85af..126e1f3 100644
--- a/src/system/kernel/arch/x86/arch_int.cpp
+++ b/src/system/kernel/arch/x86/arch_int.cpp
@@ -295,9 +295,9 @@ x86_page_fault_exception(struct iframe* frame)
// TODO: Now we are generally allowing user_memcpy() with
interrupts
// disabled, which in most cases is a bug. We should add some
thread
// flag allowing to explicitly indicate that this handling is
desired.
- if (thread && thread->fault_handler != 0) {
- uintptr_t handler =
-
reinterpret_cast<uintptr_t>(thread->fault_handler);
+ if (thread != NULL && thread->fault_handler != 0) {
+ uintptr_t handler
+ =
reinterpret_cast<uintptr_t>(thread->fault_handler);
if (frame->ip != handler) {
frame->ip = handler;
return;
