Changeset 298 for trunk

Timestamp:

Jul 31, 2017, 2:10:39 PM (7 years ago)

Author:

max@…

Message:

Sync with TSAR.

Location:

trunk/hal/x86_64/core

Files:

• hal_context.c (modified) (1 diff)
• hal_init.c (modified) (2 diffs)

trunk/hal/x86_64/core/hal_context.c

@@ -103 +103 @@
 }
 
-void hal_cpu_context_save( thread_t * thread )
+void hal_cpu_context_save( void * ctx )
 {
         x86_panic((char *)__func__);
 }
 
-void hal_cpu_context_restore( thread_t * thread )
+void hal_cpu_context_restore( void * ctx )
 {
         x86_panic((char *)__func__);

trunk/hal/x86_64/core/hal_init.c

@@ -222 +222 @@
         size_t offset;
 
-        extern uint64_t __kernel_data_start;
-        extern uint64_t __kernel_end;
-
         memset(info, 0, sizeof(boot_info_t));
 
@@ -253 +250 @@
         info->pages_offset = offset / PAGE_SIZE;
         info->pages_nr = init_bootinfo_pages_nr();
-
-        info->kernel_code_start = (intptr_t)(KERNTEXTOFF - KERNBASE);
-        info->kernel_code_end = (intptr_t)(&__kernel_data_start - KERNBASE) - 1;
-        info->kernel_data_start = (intptr_t)(&__kernel_data_start - KERNBASE);
-        info->kernel_code_end = (intptr_t)(&__kernel_end - KERNBASE) - 1;
 }