diff --git a/filesystem/etc/init.rc b/filesystem/etc/init.rc index c13d3ef..8dc3d4e 100644 --- a/filesystem/etc/init.rc +++ b/filesystem/etc/init.rc @@ -1,6 +1,5 @@ -acid tls -randd initfs:bin/pcid /etc/pcid.toml +randd ethernetd ipd tcpd diff --git a/kernel/syscall/process.rs b/kernel/syscall/process.rs index 43c5610..6fa2fad 100644 --- a/kernel/syscall/process.rs +++ b/kernel/syscall/process.rs @@ -206,8 +206,6 @@ pub fn clone(flags: usize, stack_base: usize) -> Result { tls.file_size); } - println!("TLS clone {:X} {} {}", new_tls.mem.start_address().get(), new_tls.file_size, new_tls.mem.size()); - new_tls.mem.remap(tls.mem.flags(), true); tls_option = Some(new_tls); } @@ -429,7 +427,6 @@ pub fn clone(flags: usize, stack_base: usize) -> Result { // Setup user TLS if let Some(mut tls) = tls_option { tls.mem.move_to(VirtualAddress::new(arch::USER_TLS_OFFSET), &mut new_table, &mut temporary_page, true); - println!("TLS clone move {:X}, {}, {}", tls.mem.start_address().get(), tls.file_size, tls.mem.size()); context.tls = Some(tls); } @@ -602,7 +599,7 @@ pub fn exec(path: &[u8], arg_ptrs: &[[usize; 2]]) -> Result { file_size: file_size, mem: context::memory::Memory::new( VirtualAddress::new(arch::USER_TLS_OFFSET), - (size + 4095)/4096 * 4096, + size, entry::NO_EXECUTE | entry::WRITABLE | entry::USER_ACCESSIBLE, true, true @@ -616,8 +613,6 @@ pub fn exec(path: &[u8], arg_ptrs: &[[usize; 2]]) -> Result { file_size); } - println!("Map TLS {:X} {} {} to {:X} {}", master.get(), file_size, size, tls.mem.start_address().get(), tls.mem.size()); - context.tls = Some(tls); }