lkml.org 
[lkml]   [2006]   [Feb]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    SubjectRe: [PATCH] Fix build failure in recent pm_prepare_* changes.
    Date
    Hi,

    On Monday 06 February 2006 15:23, Olaf Hering wrote:
    > On Mon, Feb 06, Olaf Hering wrote:
    >
    > > On Sun, Feb 05, Dave Jones wrote:
    > >
    > > > On Sun, Feb 05, 2006 at 01:56:10PM +0100, Olaf Hering wrote:
    > > > > On Fri, Feb 03, Linux Kernel Mailing List wrote:
    > > > >
    > > > > > tree 8f70444139c8564c0f1e88e1f33adda036ae6a96
    > > > > > parent 278ff9537030bbb292b33504f5e1f6e0126793eb
    > > > > > author Dave Jones <davej@redhat.com> Fri, 03 Feb 2006 19:03:44 -0800
    > > > > > committer Linus Torvalds <torvalds@g5.osdl.org> Sat, 04 Feb 2006 00:32:00 -0800
    > > > > >
    > > > > > [PATCH] Fix build failure in recent pm_prepare_* changes.
    > > > > >
    > > > > > kernel/power/power.h:49: error: static declaration of 'pm_prepare_console' follows non-static declaration
    > > > > > include/linux/suspend.h:46: error: previous declaration of 'pm_prepare_console' was here
    > > > > > kernel/power/power.h:50: error: static declaration of 'pm_restore_console' follows non-static declaration
    > > > > > include/linux/suspend.h:47: error: previous declaration of 'pm_restore_console' was here

    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.

    > > > > >
    > > > > > Signed-off-by: Dave Jones <davej@redhat.com>
    > > > >
    > > > > this one is not correct, please have a closer look at
    > > > > f7b8988ff50d99c99746f65f420364e91362c065
    > > > >
    > > > > CC drivers/macintosh/via-pmu.o
    > > > > drivers/macintosh/via-pmu.c: In function 'pmac_suspend_devices':
    > > > > drivers/macintosh/via-pmu.c:2078: error: implicit declaration of function 'pm_prepare_console'
    > > > > drivers/macintosh/via-pmu.c: In function 'pmac_wakeup_devices':
    > > > > drivers/macintosh/via-pmu.c:2194: error: implicit declaration of function 'pm_restore_console'
    > > > > make[2]: *** [drivers/macintosh/via-pmu.o] Error 1

    >
    >
    > via-pmu needs to call console functions directly from the pmu_ioctl.
    >
    > drivers/macintosh/via-pmu.c | 4 ++++
    > 1 files changed, 4 insertions(+)
    >
    > Index: linux-2.6.16-rc2-olh/drivers/macintosh/via-pmu.c
    > ===================================================================
    > --- linux-2.6.16-rc2-olh.orig/drivers/macintosh/via-pmu.c
    > +++ linux-2.6.16-rc2-olh/drivers/macintosh/via-pmu.c
    > @@ -2070,6 +2070,10 @@ restore_via_state(void)
    > out_8(&via[IER], IER_SET | SR_INT | CB1_INT);
    > }
    >
    > +/* to avoid include mess */
    > +extern int pm_prepare_console(void);
    > +extern void pm_restore_console(void);

    if CONFIG_VT or CONFIG_VT_CONSOLE is not set, these functions are not defined.

    > +
    > static int
    > pmac_suspend_devices(void)
    > {
    >

    I think the complete fix should look like that:

    --- 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
    +
    static int
    pmac_suspend_devices(void)
    {

    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/

    \
     
     \ /
      Last update: 2006-02-06 16:04    [W:0.027 / U:1.500 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site