Skip to contentSkip to conversation

execute sn2 early console setup only on sn2s

DISCUSSION Greg Edwards 2 participants 3 messages Aug 30, 2005

lore
Share & tools
lore
#0 lore raw

Encapsulate the sn2 early console setup in a platform check. HP reported this causing some problems with console setup on some of their boxes.

Index: git-linus/arch/ia64/kernel/setup.c
=================================--- git-linus.orig/arch/ia64/kernel/setup.c 2005-08-30 15:13:11.399460142 -0500
+++ git-linus/arch/ia64/kernel/setup.c 2005-08-30 15:15:53.959188707 -0500
@@ -288,7 +288,7 @@ early_console_setup (char *cmdline)
int earlycons = 0;

#ifdef CONFIG_SERIAL_SGI_L1_CONSOLE
- {
+ if (ia64_platform_is("sn2")) {
extern int sn_serial_console_early_setup(void); if (!sn_serial_console_early_setup())
earlycons++;

#1 lore raw

Review early_console_setup (char *cmdline) · line 294

Quoted 12 lines · Greg Edwards

Index: git-linus/arch/ia64/kernel/setup.c
=================================> --- git-linus.orig/arch/ia64/kernel/setup.c 2005-08-30 15:13:11.399460142 -0500
+++ git-linus/arch/ia64/kernel/setup.c 2005-08-30 15:15:53.959188707 -0500

(quoted diff) +1 -1
@@ -288,7 +288,7 @@ early_console_setup (char *cmdline)
 	int earlycons = 0;
 
 #ifdef CONFIG_SERIAL_SGI_L1_CONSOLE
-	{
+	if (ia64_platform_is("sn2")) {
 		extern int sn_serial_console_early_setup(void);
 		if (!sn_serial_console_early_setup())
 			earlycons++;

The first thing sn_serial_console_early_setup does is to check for sn2.

Andreas.

Signature · 4 lines
Andreas Schwab, SuSE Labs, [email protected]
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
#2 lore raw
In reply to Greg Edwards

On Tue, Aug 30, 2005 at 10:45:18PM +0200, Andreas Schwab wrote:

| Greg Edwards <[email protected]> writes:
| 
| > Index: git-linus/arch/ia64/kernel/setup.c
| > =================================| > --- git-linus.orig/arch/ia64/kernel/setup.c	2005-08-30 15:13:11.399460142 -0500
| > +++ git-linus/arch/ia64/kernel/setup.c	2005-08-30 15:15:53.959188707 -0500
| > @@ -288,7 +288,7 @@ early_console_setup (char *cmdline)
| >  	int earlycons = 0;
| >  
| >  #ifdef CONFIG_SERIAL_SGI_L1_CONSOLE
| > -	{
| > +	if (ia64_platform_is("sn2")) {
| >  		extern int sn_serial_console_early_setup(void);
| >  		if (!sn_serial_console_early_setup())
| >  			earlycons++;
| 
| The first thing sn_serial_console_early_setup does is to check for sn2.

Ugg. Completely forget this. I was getting this confused with a different SuSE tree. ;)

Greg