summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/x86/machine/boot.c6
-rw-r--r--kern/arg.c2
-rw-r--r--kern/arg.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/machine/boot.c b/arch/x86/machine/boot.c
index 355b7dfe..5f27d903 100644
--- a/arch/x86/machine/boot.c
+++ b/arch/x86/machine/boot.c
@@ -347,7 +347,7 @@ boot_setup_paging(struct multiboot_raw_info *mbi, unsigned long eax)
}
static void __init
-boot_show_version(void)
+boot_log_version(void)
{
log_info(KERNEL_NAME "/" QUOTE(X15_X86_MACHINE) " " KERNEL_VERSION
#ifdef X15_X86_PAE
@@ -488,13 +488,13 @@ boot_main(void)
trap_setup();
cpu_setup();
thread_bootstrap();
+ boot_log_version();
+ arg_log_info();
console_setup();
atcons_bootstrap();
uart_bootstrap();
printf_setup();
- boot_show_version();
shell_setup();
- arg_info();
uart_info();
pmap_bootstrap();
sref_bootstrap();
diff --git a/kern/arg.c b/kern/arg.c
index ed684ce7..62ace8be 100644
--- a/kern/arg.c
+++ b/kern/arg.c
@@ -62,7 +62,7 @@ arg_setup(const char *cmdline)
}
void __init
-arg_info(void)
+arg_log_info(void)
{
char cmdline[sizeof(arg_cmdline)];
size_t i;
diff --git a/kern/arg.h b/kern/arg.h
index 937f596b..3a8d20ba 100644
--- a/kern/arg.h
+++ b/kern/arg.h
@@ -35,9 +35,9 @@
void arg_setup(const char *cmdline);
/*
- * Display command line information.
+ * Log command line information.
*/
-void arg_info(void);
+void arg_log_info(void);
/*
* Return true if an argument with the given name is present in the