[kernel] r11923 - dists/sid/linux-2.6/debian/patches/bugfix/powerpc

[Bastian Blank]

Author: waldi
Date: Wed Jul 30 07:37:28 2008
New Revision: 11923

Log:
debian/patches/bugfix/powerpc/lpar-console.patch:
Replace with a revert of the problematic piece. The patch was broken.


Modified:
   dists/sid/linux-2.6/debian/patches/bugfix/powerpc/lpar-console.patch

Modified: dists/sid/linux-2.6/debian/patches/bugfix/powerpc/lpar-console.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/powerpc/lpar-console.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/bugfix/powerpc/lpar-console.patch	Wed Jul 30 07:37:28 2008
@@ -1,40 +1,39 @@
 diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
-index 9235c46..626290d 100644
+index 9235c46..8a20452 100644
 --- a/arch/powerpc/platforms/pseries/lpar.c
 +++ b/arch/powerpc/platforms/pseries/lpar.c
-@@ -57,6 +57,7 @@ extern void pSeries_find_serial_port(void);
+@@ -204,6 +204,7 @@ void __init find_udbg_vterm(void)
+ 	struct device_node *stdout_node;
+ 	const u32 *termno;
+ 	const char *name;
++	int add_console;
  
+ 	/* find the boot console from /chosen/stdout */
+ 	if (!of_chosen)
+@@ -219,6 +220,8 @@ void __init find_udbg_vterm(void)
+ 		printk(KERN_WARNING "stdout node missing 'name' property!\n");
+ 		goto out;
+ 	}
++	/* The user has requested a console so this is already set up. */
++	add_console = !strstr(cmd_line, "console=");
  
- int vtermno;	/* virtual terminal# for udbg  */
-+static char *console_name;
- 
- #define __ALIGNED__ __attribute__((__aligned__(sizeof(long))))
- static void udbg_hvsi_putc(char c)
-@@ -232,18 +233,24 @@ void __init find_udbg_vterm(void)
+ 	/* Check if it's a virtual terminal */
+ 	if (strncmp(name, "vty", 3) != 0)
+@@ -232,13 +235,15 @@ void __init find_udbg_vterm(void)
  		udbg_putc = udbg_putcLP;
  		udbg_getc = udbg_getcLP;
  		udbg_getc_poll = udbg_getc_pollLP;
 -		add_preferred_console("hvc", termno[0] & 0xff, NULL);
-+		console_name = "hvc";
++		if (add_console)
++			add_preferred_console("hvc", termno[0] & 0xff, NULL);
  	} else if (of_device_is_compatible(stdout_node, "hvterm-protocol")) {
--		vtermno = termno[0];
+ 		vtermno = termno[0];
  		udbg_putc = udbg_hvsi_putc;
  		udbg_getc = udbg_hvsi_getc;
  		udbg_getc_poll = udbg_hvsi_getc_poll;
 -		add_preferred_console("hvsi", termno[0] & 0xff, NULL);
-+		console_name = "hvsi";
++		if (add_console)
++			add_preferred_console("hvsi", termno[0] & 0xff, NULL);
  	}
  out:
  	of_node_put(stdout_node);
- }
- 
-+static void __init enable_vterm(void)
-+{
-+	if (console_name)
-+		add_preferred_console(console_name, vtermno, NULL);
-+}
-+arch_initcall(enable_vterm);
-+
- void vpa_init(int cpu)
- {
- 	int hwcpu = get_hard_smp_processor_id(cpu);