diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-10-13 18:36:29 +0200 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-10-13 18:36:29 +0200 |
| commit | 518d722a88a62d81150e54b8ae02be7176171ccf (patch) | |
| tree | 78b6b691908454832d49155c4b78bcc162e27c3a /Source/Kernel/Shell | |
| parent | 2d5426a233d9bd37186697e508113e07fc05141f (diff) | |
| parent | 01665d725a200c3c51bcd834cc8324ec057286c4 (diff) | |
| download | Melon-518d722a88a62d81150e54b8ae02be7176171ccf.tar.gz Melon-518d722a88a62d81150e54b8ae02be7176171ccf.zip | |
Merge branch 'heap_class'
Conflicts:
Source/Kernel/Melon.ke
Diffstat (limited to 'Source/Kernel/Shell')
| -rw-r--r-- | Source/Kernel/Shell/KernelShell-sys.class.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Kernel/Shell/KernelShell-sys.class.cpp b/Source/Kernel/Shell/KernelShell-sys.class.cpp index 17ff19c..6243b0f 100644 --- a/Source/Kernel/Shell/KernelShell-sys.class.cpp +++ b/Source/Kernel/Shell/KernelShell-sys.class.cpp @@ -29,7 +29,7 @@ void KernelShell::free(Vector<String>& args) { u32int frames = PhysMem::total(), freef = PhysMem::free(); *m_vt << " - Free frames : " << (s32int)freef << " (" << (s32int)(freef * 4 / 1024) << "Mo) of " << (s32int)frames << " (" << (s32int)(frames * 4 / 1024) << "Mo).\n"; - u32int kh = Mem::kheapSize(), freek = Mem::kheapFree; + u32int kh = Mem::kheapSize(), freek = Mem::kheapFree(); *m_vt << " - Kernel heap free : " << (s32int)(freek / 1024 / 1024) << "Mo (" << (s32int)(freek / 1024) << "Ko) of " << (s32int)(kh / 1024 / 1024) << "Mo (" << (s32int)(kh / 1024) << "Ko).\n"; } |