Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/arch/aarch64/kernel/interrupts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ static IRQ_NAMES: InterruptTicketMutex<HashMap<u8, &'static str, RandomState>> =

#[allow(dead_code)]
pub(crate) fn add_irq_name(irq_number: u8, name: &'static str) {
debug!("Register name \"{name}\" for interrupt {irq_number}");
debug!("Register name \"{name}\" for interrupt {irq_number}");
IRQ_NAMES.lock().insert(SPI_START + irq_number, name);
}

Expand Down
2 changes: 1 addition & 1 deletion src/arch/aarch64/kernel/scheduler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ extern "C" fn task_start(_f: extern "C" fn(usize), _arg: usize) -> ! {
"blr x25",
"mov x0, xzr",
"adrp x4, {exit}",
"add x4, x4, #:lo12:{exit}",
"add x4, x4, #:lo12:{exit}",
"br x4",
l0 = const 0,
exit = sym thread_exit,
Expand Down
2 changes: 1 addition & 1 deletion src/arch/aarch64/kernel/start.rs
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ unsafe extern "C" fn pre_init(boot_info: Option<&'static RawBootInfo>, cpu_id: u
unsafe {
asm!(
"adrp x4, {vector_table}",
"add x4, x4, #:lo12:{vector_table}",
"add x4, x4, #:lo12:{vector_table}",
"msr vbar_el1, x4",
vector_table = sym vector_table,
out("x4") _,
Expand Down
2 changes: 1 addition & 1 deletion src/arch/riscv64/kernel/interrupts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ static IRQ_NAMES: InterruptTicketMutex<HashMap<u8, &'static str, RandomState>> =

#[allow(dead_code)]
pub(crate) fn add_irq_name(irq_number: u8, name: &'static str) {
debug!("Register name \"{name}\" for interrupt {irq_number}");
debug!("Register name \"{name}\" for interrupt {irq_number}");
IRQ_NAMES.lock().insert(irq_number, name);
}

Expand Down
12 changes: 6 additions & 6 deletions src/arch/riscv64/kernel/start.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ pub unsafe extern "C" fn _start(hart_id: usize, boot_info: Option<&'static RawBo

naked_asm!(
// Use stack pointer from `CURRENT_STACK_ADDRESS` if set
"ld t0, {current_stack_pointer}",
"beqz t0, 2f",
"li t1, {top_offset}",
"add t0, t0, t1",
"mv sp, t0",
"ld t0, {current_stack_pointer}",
"beqz t0, 2f",
"li t1, {top_offset}",
"add t0, t0, t1",
"mv sp, t0",
"2:",

"j {pre_init}",
"j {pre_init}",
current_stack_pointer = sym CURRENT_STACK_ADDRESS,
top_offset = const KERNEL_STACK_SIZE,
pre_init = sym pre_init,
Expand Down
2 changes: 1 addition & 1 deletion src/arch/x86_64/kernel/interrupts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ extern "x86-interrupt" fn virtualization_exception(stack_frame: ExceptionStackFr
}

pub(crate) fn add_irq_name(irq_number: u8, name: &'static str) {
debug!("Register name \"{name}\" for interrupt {irq_number}");
debug!("Register name \"{name}\" for interrupt {irq_number}");
IRQ_NAMES.lock().insert(32 + irq_number, name);
}

Expand Down
2 changes: 1 addition & 1 deletion src/scheduler/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ impl PerCoreScheduler {
core_scheduler().ready_queue.push(task);
false
} else {
panic!("Invalid core_id {}!", core_id)
panic!("Invalid core_id {}!", core_id)
}
};

Expand Down