linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: "Guido Günther" <agx@sigxcpu.org>
To: linuxppc-dev@ozlabs.org
Subject: [PATCH] Always define pmu_sys_suspended
Date: Wed, 27 Feb 2008 15:14:52 +0100	[thread overview]
Message-ID: <20080227141452.GA10345@bogon.ms20.nix> (raw)

In current Linus git pmu_sys_suspended is only defined if
CONFIG_SUSPEND is set, so compilation fails with:

drivers/built-in.o: In function `pmu_led_set':
via-pmu-led.c:(.text+0x48622): undefined reference to `pmu_sys_suspended'
via-pmu-led.c:(.text+0x48626): undefined reference to `pmu_sys_suspended'
drivers/built-in.o: In function `pmu_req_done':
via-pmu-led.c:(.text+0x48696): undefined reference to `pmu_sys_suspended'
via-pmu-led.c:(.text+0x4869a): undefined reference to `pmu_sys_suspended'
make: *** [.tmp_vmlinux1] Error 1

since via-pmu-led.c uses it unconditionally. Instead of adding more '#ifdef'
clutter I moved it out of the #ifdef so it's always available. Need to fix
compilation on PPC32 without CONFIG_SUSPEND.

Signed-off-by: Guido Guenther <agx@sigxcpu.org>
---
 drivers/macintosh/via-pmu.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index ebec663..296edcb 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -2437,8 +2437,8 @@ void pmu_blink(int n)
 }
 #endif /* DEBUG_SLEEP */
 
-#if defined(CONFIG_SUSPEND) && defined(CONFIG_PPC32)
 int pmu_sys_suspended;
+#if defined(CONFIG_SUSPEND) && defined(CONFIG_PPC32)
 
 static int pmu_sys_suspend(struct sys_device *sysdev, pm_message_t state)
 {
-- 
1.5.4.2

             reply	other threads:[~2008-02-27 14:38 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-27 14:14 Guido Günther [this message]
2008-02-27 14:16 ` [PATCH] Export pmu_* variables unconditionally Guido Günther
2008-03-08 19:20 ` Guido Günther
2008-03-12 22:54 ` [PATCH] Always define pmu_sys_suspended Paul Mackerras
  -- strict thread matches above, loose matches on Subject: below --
2008-03-08 19:19 Guido Günther

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080227141452.GA10345@bogon.ms20.nix \
    --to=agx@sigxcpu.org \
    --cc=linuxppc-dev@ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).