git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kernel/IPStack - (minor) TODO retransmit timer
[tpg/acess2.git]
/
KernelLand
/
Kernel
/
arch
/
x86_64
/
main.c
diff --git
a/KernelLand/Kernel/arch/x86_64/main.c
b/KernelLand/Kernel/arch/x86_64/main.c
index
f4c4a81
..
bd8bb4a
100644
(file)
--- a/
KernelLand/Kernel/arch/x86_64/main.c
+++ b/
KernelLand/Kernel/arch/x86_64/main.c
@@
-19,7
+19,6
@@
// === IMPORTS ===
extern void Desctab_Init(void);
extern void MM_InitVirt(void);
// === IMPORTS ===
extern void Desctab_Init(void);
extern void MM_InitVirt(void);
-extern void Heap_Install(void);
extern int Time_Setup(void);
extern char gKernelEnd[];
extern int Time_Setup(void);
extern char gKernelEnd[];
@@
-118,13
+117,14
@@
void Arch_LoadBootModules(void)
// Unmap and free
numPages = (gaArch_BootModules[i].Size + ((Uint)gaArch_BootModules[i].Base&0xFFF) + 0xFFF) >> 12;
// Unmap and free
numPages = (gaArch_BootModules[i].Size + ((Uint)gaArch_BootModules[i].Base&0xFFF) + 0xFFF) >> 12;
- MM_UnmapHWPages(
(tVAddr)
gaArch_BootModules[i].Base, numPages );
+ MM_UnmapHWPages( gaArch_BootModules[i].Base, numPages );
for( j = 0; j < numPages; j++ )
MM_DerefPhys( gaArch_BootModules[i].PBase + (j << 12) );
for( j = 0; j < numPages; j++ )
MM_DerefPhys( gaArch_BootModules[i].PBase + (j << 12) );
+ // TODO: What the fuck?
if( (tVAddr) gaArch_BootModules[i].ArgString < KERNEL_BASE )
if( (tVAddr) gaArch_BootModules[i].ArgString < KERNEL_BASE )
- MM_UnmapHWPages(
(tVAddr)
gaArch_BootModules[i].ArgString, 2 );
+ MM_UnmapHWPages( gaArch_BootModules[i].ArgString, 2 );
}
Log_Log("Arch", "Boot modules loaded");
if( gaArch_BootModules )
}
Log_Log("Arch", "Boot modules loaded");
if( gaArch_BootModules )
UCC
git Repository :: git.ucc.asn.au