Messages in this thread | | | From | "Rafael J. Wysocki" <> | Subject | Re: [PATCH] Fix build failure in recent pm_prepare_* changes. | Date | Tue, 7 Feb 2006 00:57:26 +0100 |
| |
On Monday 06 February 2006 20:38, Andrew Morton wrote: > "Rafael J. Wysocki" <rjw@sisk.pl> wrote: > > > > Sorry, my recent change has broken it, but pm_prepare_console() and > > pm_restore_console() are only static if CONFIG_VT or CONFIG_VT_CONSOLE > > is not set which Ben told me should not happen on Macs. > > But kernel/power/power.h has > > #ifdef SUSPEND_CONSOLE
There is
#if defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE) #define SUSPEND_CONSOLE (MAX_NR_CONSOLES-1) #endif
earlier in there.
> extern int pm_prepare_console(void); > extern void pm_restore_console(void); > #else > static int pm_prepare_console(void) { return 0; } > static void pm_restore_console(void) {} > #endif > > > --- linux-2.6.16-rc1-mm5.orig/drivers/macintosh/via-pmu.c > > +++ linux-2.6.16-rc1-mm5/drivers/macintosh/via-pmu.c > > @@ -2070,6 +2070,14 @@ restore_via_state(void) > > out_8(&via[IER], IER_SET | SR_INT | CB1_INT); > > } > > > > +#if defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE) > > +extern int pm_prepare_console(void); > > +extern void pm_restore_console(void); > > +#else > > +static int pm_prepare_console(void) { return 0; } > > +static void pm_restore_console(void) {} > > +#endif > > + > > These should be in a header file. Presumably one which > kernel/power/power.h includes, too.
Then I think I should move all that to include/linux/suspend.h.
Greetings, Rafael - 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/
| |