diff options
-rw-r--r-- | arch/powerpc/platforms/pseries/lpar.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c index 8a204523afbc..9235c469449e 100644 --- a/arch/powerpc/platforms/pseries/lpar.c +++ b/arch/powerpc/platforms/pseries/lpar.c | |||
@@ -204,7 +204,6 @@ void __init find_udbg_vterm(void) | |||
204 | struct device_node *stdout_node; | 204 | struct device_node *stdout_node; |
205 | const u32 *termno; | 205 | const u32 *termno; |
206 | const char *name; | 206 | const char *name; |
207 | int add_console; | ||
208 | 207 | ||
209 | /* find the boot console from /chosen/stdout */ | 208 | /* find the boot console from /chosen/stdout */ |
210 | if (!of_chosen) | 209 | if (!of_chosen) |
@@ -220,8 +219,6 @@ void __init find_udbg_vterm(void) | |||
220 | printk(KERN_WARNING "stdout node missing 'name' property!\n"); | 219 | printk(KERN_WARNING "stdout node missing 'name' property!\n"); |
221 | goto out; | 220 | goto out; |
222 | } | 221 | } |
223 | /* The user has requested a console so this is already set up. */ | ||
224 | add_console = !strstr(cmd_line, "console="); | ||
225 | 222 | ||
226 | /* Check if it's a virtual terminal */ | 223 | /* Check if it's a virtual terminal */ |
227 | if (strncmp(name, "vty", 3) != 0) | 224 | if (strncmp(name, "vty", 3) != 0) |
@@ -235,15 +232,13 @@ void __init find_udbg_vterm(void) | |||
235 | udbg_putc = udbg_putcLP; | 232 | udbg_putc = udbg_putcLP; |
236 | udbg_getc = udbg_getcLP; | 233 | udbg_getc = udbg_getcLP; |
237 | udbg_getc_poll = udbg_getc_pollLP; | 234 | udbg_getc_poll = udbg_getc_pollLP; |
238 | if (add_console) | 235 | add_preferred_console("hvc", termno[0] & 0xff, NULL); |
239 | add_preferred_console("hvc", termno[0] & 0xff, NULL); | ||
240 | } else if (of_device_is_compatible(stdout_node, "hvterm-protocol")) { | 236 | } else if (of_device_is_compatible(stdout_node, "hvterm-protocol")) { |
241 | vtermno = termno[0]; | 237 | vtermno = termno[0]; |
242 | udbg_putc = udbg_hvsi_putc; | 238 | udbg_putc = udbg_hvsi_putc; |
243 | udbg_getc = udbg_hvsi_getc; | 239 | udbg_getc = udbg_hvsi_getc; |
244 | udbg_getc_poll = udbg_hvsi_getc_poll; | 240 | udbg_getc_poll = udbg_hvsi_getc_poll; |
245 | if (add_console) | 241 | add_preferred_console("hvsi", termno[0] & 0xff, NULL); |
246 | add_preferred_console("hvsi", termno[0] & 0xff, NULL); | ||
247 | } | 242 | } |
248 | out: | 243 | out: |
249 | of_node_put(stdout_node); | 244 | of_node_put(stdout_node); |