Messages in this thread Patch in this message |  | | | Date | Sat, 3 Jul 2004 22:46:47 +0200 | | From | Pavel Machek <> | | Subject | Re: [PATCH] kernel/power/swsusp.c |
| |
Hi!
> Swsusp allocates a vt before it nows if it will need it. This interferes > with bootsplash. Here is a patch that moves the pm_prepare_console() call > so that its only executed if swsusp finds a valid image to resume.
You are moving it inside function that should have no business doing this... Would something like this work better? [hand-edited, apply by hand; untested].
BTW is bootsplash actually used by suse and/or redhat? Suse certainly has some splashscreen... Perhaps some splash support into swsusp (as an add on) would be good idea, but it would be good to only code it once. Pavel
--- clean/kernel/power/swsusp.c 2004-06-22 12:36:47.000000000 +0200 +++ linux/kernel/power/swsusp.c 2004-07-03 22:40:47.000000000 +0200 @@ -1190,9 +1190,6 @@ } MDELAY(1000); - if (pm_prepare_console()) - printk("swsusp: Can't allocate a console... proceeding\n"); - if (!resume_file[0] && resume_status == RESUME_SPECIFIED) { printk( "suspension device unspecified\n" ); return -EINVAL; @@ -1201,12 +1198,17 @@ printk( "resuming from %s\n", resume_file); if (read_suspend_image(resume_file, 0)) goto read_failure; + + if (pm_prepare_console()) + printk("swsusp: Can't allocate a console... proceeding\n"); + device_suspend(4); do_magic(1); panic("This never returns"); read_failure: - pm_restore_console(); return 0; }
-- People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl! - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|  |