lkml.org 
[lkml]   [1997]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectBootup messages
Hi,

The following cosmetic patch makes the bootup messages look a bit better:

- The kernel version banner is now printed before all other messages,
so it's now cleanly visible what kernel is going to start. It also
contains "/SMP" if it's a SMP kernel and it's been shortened a bit
to fit in 80 columns.

- Both console init messages are combined into one, the number of VC's
is no longer displayed.

- The BogoMIPS message now looks like some other HW testing messages.

- An extra sti() in init.c has been removed.

Any comments?

Have a nice fortnight
--
Martin `MJ' Mares <mj@gts.cz> http://atrey.karlin.mff.cuni.cz/~mj/
Faculty of Math and Physics, Charles University, Prague, Czech Rep., Earth
"Press any key to quit or any other key to continue"


--- ./drivers/char/console.c.mj Sat Sep 13 12:21:06 1997
+++ ./drivers/char/console.c Sat Sep 13 13:15:20 1997
@@ -2095,6 +2095,10 @@
set_origin(currcons);
csi_J(currcons, 0);

+ printk("Console: %s %s %ldx%ld",
+ can_do_color ? "colour" : "mono",
+ display_desc, video_num_columns, video_num_lines);
+
/* Figure out the size of the screen and screen font so we
can figure out the appropriate screen size should we load
a different font */
@@ -2108,15 +2112,10 @@
/* This may be suboptimal but is a safe bet - go with it */
video_scan_lines = video_font_height * video_num_lines;

- printk("Console: %ld point font, %ld scans\n",
- video_font_height, video_scan_lines);
+ printk(", %ld point font, %ld scans",
+ video_font_height, video_scan_lines);
}
-
- printk("Console: %s %s %ldx%ld, %d virtual console%s (max %d)\n",
- can_do_color ? "colour" : "mono",
- display_desc, video_num_columns, video_num_lines,
- MIN_NR_CONSOLES, (MIN_NR_CONSOLES == 1) ? "" : "s",
- MAX_NR_CONSOLES);
+ printk("\n");

con_type_init_finish();

--- ./init/main.c.mj Sat Sep 13 11:48:14 1997
+++ ./init/main.c Sat Sep 13 12:28:36 1997
@@ -625,7 +625,7 @@

loops_per_sec = (1<<12);

- printk("Calibrating delay loop.. ");
+ printk("Calibrating delay loop... ");
while (loops_per_sec <<= 1) {
/* wait for "start of" clock tick */
ticks = jiffies;
@@ -656,7 +656,7 @@
/* finally, adjust loops per second in terms of seconds instead of clocks */
loops_per_sec *= HZ;
/* Round the value and print it */
- printk("ok - %lu.%02lu BogoMIPS\n",
+ printk("%lu.%02lu BogoMIPS\n",
(loops_per_sec+2500)/500000,
((loops_per_sec+2500)/5000) % 100);
}
@@ -886,6 +886,7 @@
* Interrupts are still disabled. Do necessary setups, then
* enable them
*/
+ printk(linux_banner);
setup_arch(&command_line, &memory_start, &memory_end);
memory_start = paging_init(memory_start,memory_end);
trap_init();
@@ -952,10 +953,8 @@
ipc_init();
#endif
dquot_init();
- sti();
check_bugs();

- printk(linux_banner);
printk("POSIX conformance testing by UNIFIX\n");
#ifdef __SMP__
smp_init();
--- ./init/version.c.mj Sat Sep 13 11:53:52 1997
+++ ./init/version.c Sat Sep 13 13:18:07 1997
@@ -26,5 +26,9 @@
};

const char *linux_banner =
- "Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@"
- LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n";
+ UTS_SYSNAME " " UTS_RELEASE
+#ifdef __SMP__
+ "/SMP"
+#endif
+ " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")"
+ " (" LINUX_COMPILER ") " UTS_VERSION "\n";
--- ./Makefile.mj Sat Sep 13 12:00:23 1997
+++ ./Makefile Sat Sep 13 13:01:28 1997
@@ -237,13 +237,7 @@
fi

include/linux/compile.h: $(CONFIGURATION) include/linux/version.h newversion
- @if [ -f .name ]; then \
- echo \#define UTS_VERSION \"\#`cat .version`-`cat .name` `date`\"; \
- else \
- echo \#define UTS_VERSION \"\#`cat .version` `date`\"; \
- fi >> .ver
- @echo \#define LINUX_COMPILE_TIME \"`date +%T`\" >> .ver
- @echo \#define LINUX_COMPILE_BY \"`whoami`\" >> .ver
+ @echo \#define LINUX_COMPILE_BY \"`whoami`\" > .ver
@echo \#define LINUX_COMPILE_HOST \"`hostname`\" >> .ver
@if [ -x /bin/dnsdomainname ]; then \
echo \#define LINUX_COMPILE_DOMAIN \"`dnsdomainname`\"; \
@@ -252,7 +246,12 @@
else \
echo \#define LINUX_COMPILE_DOMAIN ; \
fi >> .ver
- @echo \#define LINUX_COMPILER \"`$(CC) -v 2>&1 | tail -1`\" >> .ver
+ @echo \#define LINUX_COMPILER \"`$(CC) -v 2>&1 | tail -1 | sed -e 's/ version / /'`\" >> .ver
+ @if [ -f .name ]; then \
+ echo \#define UTS_VERSION \"\#`cat .version`-`cat .name` `date '+%a %d-%b-%y %T'`\"; \
+ else \
+ echo \#define UTS_VERSION \"\#`cat .version` `date '+%a %d-%b-%y %T'`\"; \
+ fi >> .ver
@mv -f .ver $@

include/linux/version.h: ./Makefile
\
 
 \ /
  Last update: 2005-03-22 13:40    [W:0.112 / U:0.140 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site