Skip to content

Commit f1a9676

Browse files
committed
solo5: Update kernel_start stubs needed for linking
1 parent fc18e60 commit f1a9676

1 file changed

Lines changed: 2 additions & 12 deletions

File tree

src/platform/x86_solo5/kernel_start.cpp

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ extern "C" {
1111

1212
extern void __platform_init();
1313
extern void default_stdout_handlers();
14+
void __arch_subscribe_irq(unsigned char) {} // for now
1415

1516
char cmdline[256];
1617
uintptr_t mem_size;
@@ -28,12 +29,6 @@ extern "C" {
2829
void set_stack();
2930
void* get_cpu_ebp();
3031

31-
// Set to NULL. There are no interrupts in ukvm
32-
void (*current_eoi_mechanism)();
33-
void (*current_intr_handler)();
34-
void (*cpu_sampling_irq_handler)();
35-
36-
3732
void kernel_start()
3833
{
3934

@@ -67,12 +62,6 @@ extern "C" {
6762
// Call global ctors
6863
__libc_init_array();
6964

70-
// interrupts.asm uses these symbols. This is just to make the compiler happy.
71-
// These won't ever be called.
72-
current_eoi_mechanism = NULL;
73-
current_intr_handler = NULL;
74-
cpu_sampling_irq_handler = NULL;
75-
7665
// Initialize OS including devices
7766
OS::start(cmdline, mem_size);
7867

@@ -91,5 +80,6 @@ extern "C" {
9180

9281
// set the stack location to its new includeos location, and call kernel_start
9382
set_stack();
83+
return 0;
9484
}
9585
}

0 commit comments

Comments
 (0)