diff options
author | Alexis211 <alexis211@gmail.com> | 2009-10-16 22:58:05 +0200 |
---|---|---|
committer | Alexis211 <alexis211@gmail.com> | 2009-10-16 22:58:05 +0200 |
commit | 54d76800cf8010434065556e12f693b101383d8b (patch) | |
tree | 5388f108f5a461fac83f593c19b85533f1a0e468 /Source/Kernel/TaskManager/Thread.class.cpp | |
parent | 518d722a88a62d81150e54b8ae02be7176171ccf (diff) | |
parent | 4d5348a49f54d95c0271c8f9c4ef01c005d6b74b (diff) | |
download | Melon-54d76800cf8010434065556e12f693b101383d8b.tar.gz Melon-54d76800cf8010434065556e12f693b101383d8b.zip |
Merge branch 'heap_class'
Conflicts:
Source/Kernel/Melon.ke
Diffstat (limited to 'Source/Kernel/TaskManager/Thread.class.cpp')
-rw-r--r-- | Source/Kernel/TaskManager/Thread.class.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Kernel/TaskManager/Thread.class.cpp b/Source/Kernel/TaskManager/Thread.class.cpp index fd5cfd9..fe1d08e 100644 --- a/Source/Kernel/TaskManager/Thread.class.cpp +++ b/Source/Kernel/TaskManager/Thread.class.cpp @@ -34,8 +34,9 @@ Thread::Thread(Process* process, thread_entry_t entry_point, void* data) { Thread::~Thread() { Task::unregisterThread(this); - if (m_isKernel) + if (m_isKernel) { PageAlloc::free((void*)m_kernelStackFrame); + } //Don't unregister thread in process, it has probably already been done } |