From 9ad1adfc3585e63c3d741e35131557ab43d5c590 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Tue, 8 Nov 2005 22:48:08 +1100 Subject: [PATCH] --- yaml --- r: 13689 b: refs/heads/master c: 3825ac0ee66b50cb0208ee74796fe65f3040e67c h: refs/heads/master i: 13687: 28a6f55bb18a2309f2d8a63e998b18e3a5132419 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/prom_init.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 13a370c6f169..cc8eaa65c9cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e9191daf643255c24893427f966795e4167ca2c +refs/heads/master: 3825ac0ee66b50cb0208ee74796fe65f3040e67c diff --git a/trunk/arch/powerpc/kernel/prom_init.c b/trunk/arch/powerpc/kernel/prom_init.c index 6dc33d19fc2a..58f0917bd6b6 100644 --- a/trunk/arch/powerpc/kernel/prom_init.c +++ b/trunk/arch/powerpc/kernel/prom_init.c @@ -2081,8 +2081,13 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, prom_printf("copying OF device tree ...\n"); flatten_device_tree(); - /* in case stdin is USB and still active on IBM machines... */ - prom_close_stdin(); + /* + * in case stdin is USB and still active on IBM machines... + * Unfortunately quiesce crashes on some powermacs if we have + * closed stdin already (in particular the powerbook 101). + */ + if (RELOC(of_platform) != PLATFORM_POWERMAC) + prom_close_stdin(); /* * Call OF "quiesce" method to shut down pending DMA's from