From Michael Lotz <mmlr@xxxxxxxx>:
Michael Lotz has uploaded this change for review. (
https://review.haiku-os.org/c/haiku/+/2845 ;)
Change subject: Cleanup: Various comment and whitespace fixes.
......................................................................
Cleanup: Various comment and whitespace fixes.
---
M headers/private/kernel/arch/x86/arch_kernel.h
M headers/private/kernel/lock.h
M headers/private/kernel/vm/VMTranslationMap.h
M headers/private/system/vm_defs.h
M src/system/kernel/arch/x86/paging/X86VMTranslationMap.h
M src/system/kernel/main.cpp
M src/system/kernel/vm/VMAnonymousCache.cpp
M src/system/kernel/vm/VMUserAddressSpace.cpp
8 files changed, 9 insertions(+), 10 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/45/2845/1
diff --git a/headers/private/kernel/arch/x86/arch_kernel.h
b/headers/private/kernel/arch/x86/arch_kernel.h
index efd914f..e90175a 100644
--- a/headers/private/kernel/arch/x86/arch_kernel.h
+++ b/headers/private/kernel/arch/x86/arch_kernel.h
@@ -34,7 +34,7 @@
// whole kernel address space is the top 512GB of the address space.
#define KERNEL_BASE 0xffffff0000000000
#define KERNEL_SIZE 0x10000000000
-#define KERNEL_TOP (KERNEL_BASE + (KERNEL_SIZE - 1))
+#define KERNEL_TOP (KERNEL_BASE + (KERNEL_SIZE -
1))
#define KERNEL_LOAD_BASE 0xffffffff80000000
// Kernel physical memory map area.
diff --git a/headers/private/kernel/lock.h b/headers/private/kernel/lock.h
index 92d0dda..256b2e6 100644
--- a/headers/private/kernel/lock.h
+++ b/headers/private/kernel/lock.h
@@ -154,12 +154,11 @@
extern void mutex_transfer_lock(mutex* lock, thread_id thread);
extern status_t mutex_switch_lock(mutex* from, mutex* to);
// Unlocks "from" and locks "to" such that unlocking and starting to
wait
- // for the lock is atomically. I.e. if "from" guards the object "to"
belongs
+ // for the lock is atomic. I.e. if "from" guards the object "to" belongs
// to, the operation is safe as long as "from" is held while destroying
// "to".
extern status_t mutex_switch_from_read_lock(rw_lock* from, mutex* to);
- // Like mutex_switch_lock(), just for a switching from a read-locked
- // rw_lock.
+ // Like mutex_switch_lock(), just for switching from a read-locked
rw_lock.
// implementation private:
diff --git a/headers/private/kernel/vm/VMTranslationMap.h
b/headers/private/kernel/vm/VMTranslationMap.h
index cffde94..4a21f7b 100644
--- a/headers/private/kernel/vm/VMTranslationMap.h
+++ b/headers/private/kernel/vm/VMTranslationMap.h
@@ -26,7 +26,7 @@
VMTranslationMap();
virtual ~VMTranslationMap();
- virtual bool Lock() = 0;
+ virtual bool Lock() = 0;
virtual void Unlock() = 0;
virtual addr_t MappedSize() const = 0;
diff --git a/headers/private/system/vm_defs.h b/headers/private/system/vm_defs.h
index eefa895..a898854 100644
--- a/headers/private/system/vm_defs.h
+++ b/headers/private/system/vm_defs.h
@@ -17,7 +17,7 @@
(B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA | B_KERNEL_EXECUTE_AREA \
| B_KERNEL_STACK_AREA)
-// TODO: These aren't really a protection flags, but since the "protection"
+// TODO: These aren't really protection flags, but since the "protection"
// field is the only flag field, we currently use it for this.
// A cleaner approach would be appreciated - maybe just an official generic
// flags region in the protection field.
diff --git a/src/system/kernel/arch/x86/paging/X86VMTranslationMap.h
b/src/system/kernel/arch/x86/paging/X86VMTranslationMap.h
index a07b314..bf63215 100644
--- a/src/system/kernel/arch/x86/paging/X86VMTranslationMap.h
+++ b/src/system/kernel/arch/x86/paging/X86VMTranslationMap.h
@@ -27,7 +27,7 @@
status_t Init(bool kernel);
- virtual bool Lock() final;
+ virtual bool Lock() final;
virtual void Unlock() final;
virtual addr_t MappedSize() const final;
diff --git a/src/system/kernel/main.cpp b/src/system/kernel/main.cpp
index 2071f67..813f508 100644
--- a/src/system/kernel/main.cpp
+++ b/src/system/kernel/main.cpp
@@ -8,7 +8,7 @@
*/
-/*! This is main - initializes the kernel and launches the Bootscript */
+/*! This is main - initializes the kernel and launches the launch_daemon */
#include <string.h>
diff --git a/src/system/kernel/vm/VMAnonymousCache.cpp
b/src/system/kernel/vm/VMAnonymousCache.cpp
index 1c45c4b..3337833 100644
--- a/src/system/kernel/vm/VMAnonymousCache.cpp
+++ b/src/system/kernel/vm/VMAnonymousCache.cpp
@@ -958,7 +958,7 @@
{
VMAnonymousCache* source = dynamic_cast<VMAnonymousCache*>(_source);
if (source == NULL) {
- panic("VMAnonymousCache::MergeStore(): merge with incompatible
cache "
+ panic("VMAnonymousCache::Merge(): merge with incompatible cache
"
"%p requested", _source);
return;
}
diff --git a/src/system/kernel/vm/VMUserAddressSpace.cpp
b/src/system/kernel/vm/VMUserAddressSpace.cpp
index 4e302bc..d0cf344 100644
--- a/src/system/kernel/vm/VMUserAddressSpace.cpp
+++ b/src/system/kernel/vm/VMUserAddressSpace.cpp
@@ -347,7 +347,7 @@
// check to see if this address space has entered DELETE state
if (fDeleting) {
// okay, someone is trying to delete this address space now, so
we can't
- // insert the area, so back out
+ // remove the area, so back out
return B_BAD_TEAM_ID;
}
--
To view, visit https://review.haiku-os.org/c/haiku/+/2845
To unsubscribe, or for help writing mail filters, visit
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I37c3e3346813efc595df651421b7e8ff4fbf3339
Gerrit-Change-Number: 2845
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Lotz <mmlr@xxxxxxxx>
Gerrit-MessageType: newchange
