:: commit e04194d3adc2d34cd5559990d5241070ddf10131

Mintsuki <mintsuki@protonmail.com> — 2025-09-21 19:22

parents: a7e879ab3f

protos/linux: linux_direct_load() -> linux_load()

diff --git a/common/menu.c b/common/menu.c
index 64c72467..14dc78a2 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -1203,7 +1203,7 @@ noreturn void boot(char *config) {
     if (!strcmp(proto, "limine")) {
         limine_load(config, cmdline);
     } else if (!strcmp(proto, "linux")) {
-        linux_direct_load(config, cmdline);
+        linux_load(config, cmdline);
     } else if (!strcmp(proto, "multiboot1") || !strcmp(proto, "multiboot")) {
 #if defined (__x86_64__) || defined (__i386__)
         multiboot1_load(config, cmdline);
diff --git a/common/protos/linux.h b/common/protos/linux.h
index 2986ccd4..f214c25d 100644
--- a/common/protos/linux.h
+++ b/common/protos/linux.h
@@ -68,6 +68,6 @@ struct screen_info {
 #define VIDEO_CAPABILITY_SKIP_QUIRKS    (1 << 0)
 #define VIDEO_CAPABILITY_64BIT_BASE    (1 << 1)    /* Frame buffer base is 64-bit */
 
-noreturn void linux_direct_load(char *config, char *cmdline);
+noreturn void linux_load(char *config, char *cmdline);
 
 #endif
diff --git a/common/protos/linux_risc.c b/common/protos/linux_risc.c
index 026ca15e..d8bfdd02 100644
--- a/common/protos/linux_risc.c
+++ b/common/protos/linux_risc.c
@@ -401,7 +401,7 @@ noreturn static void jump_to_kernel(struct boot_param *p) {
     __builtin_unreachable();
 }
 
-noreturn void linux_direct_load(char *config, char *cmdline) {
+noreturn void linux_load(char *config, char *cmdline) {
     struct boot_param p;
     memset(&p, 0, sizeof(p));
     p.cmdline = cmdline;
diff --git a/common/protos/linux_x86.c b/common/protos/linux_x86.c
index a7b6bf9a..d48e40ff 100644
--- a/common/protos/linux_x86.c
+++ b/common/protos/linux_x86.c
@@ -288,7 +288,7 @@ struct boot_params {
 
 // End of Linux code
 
-noreturn void linux_direct_load(char *config, char *cmdline) {
+noreturn void linux_load(char *config, char *cmdline) {
     struct file_handle *kernel_file;
 
     char *kernel_path = config_get_value(config, 0, "PATH");
tab: 248 wrap: offon