From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: ttydev tree build failure
Date: Fri, 24 Jul 2009 15:54:17 +1000 [thread overview]
Message-ID: <20090724155417.62fa065d.sfr@canb.auug.org.au> (raw)
Hi Alan,
Today's linux-next build (powerpc allyesconfig) failed like this:
drivers/serial/pmac_zilog.c: In function 'pmz_suspend':
drivers/serial/pmac_zilog.c:1648: error: 'struct uart_state' has no member named 'mutex'
drivers/serial/pmac_zilog.c:1679: error: 'struct uart_state' has no member named 'mutex'
drivers/serial/pmac_zilog.c: In function 'pmz_resume':
drivers/serial/pmac_zilog.c:1708: error: 'struct uart_state' has no member named 'mutex'
drivers/serial/pmac_zilog.c:1740: error: 'struct uart_state' has no member named 'mutex'
Caused by commit d7b52714eee196caeb4195ae1a7aa8bf82bffda5
("serial-move-mutex") from the ttydev tree.
I applied the following patch for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 24 Jul 2009 15:48:36 +1000
Subject: [PATCH] serial: fix pmac_zilog fallout from uart_state mutex move
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/serial/pmac_zilog.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index 6495d01..0700cd1 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -1645,7 +1645,7 @@ static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state)
state = pmz_uart_reg.state + uap->port.line;
mutex_lock(&pmz_irq_mutex);
- mutex_lock(&state->mutex);
+ mutex_lock(&state->port.mutex);
spin_lock_irqsave(&uap->port.lock, flags);
@@ -1676,7 +1676,7 @@ static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state)
/* Shut the chip down */
pmz_set_scc_power(uap, 0);
- mutex_unlock(&state->mutex);
+ mutex_unlock(&state->port.mutex);
mutex_unlock(&pmz_irq_mutex);
pmz_debug("suspend, switching complete\n");
@@ -1705,7 +1705,7 @@ static int pmz_resume(struct macio_dev *mdev)
state = pmz_uart_reg.state + uap->port.line;
mutex_lock(&pmz_irq_mutex);
- mutex_lock(&state->mutex);
+ mutex_lock(&state->port.mutex);
spin_lock_irqsave(&uap->port.lock, flags);
if (!ZS_IS_OPEN(uap) && !ZS_IS_CONS(uap)) {
@@ -1737,7 +1737,7 @@ static int pmz_resume(struct macio_dev *mdev)
}
bail:
- mutex_unlock(&state->mutex);
+ mutex_unlock(&state->port.mutex);
mutex_unlock(&pmz_irq_mutex);
/* Right now, we deal with delay by blocking here, I'll be
--
1.6.3.3
next reply other threads:[~2009-07-24 5:54 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-24 5:54 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-07-17 3:12 linux-next: ttydev tree build failure Stephen Rothwell
2009-07-16 5:04 Stephen Rothwell
2009-07-14 4:10 Stephen Rothwell
2009-07-06 3:26 Stephen Rothwell
2009-04-20 3:09 Stephen Rothwell
2008-11-24 5:13 Stephen Rothwell
2008-11-24 9:59 ` Alan Cox
2008-10-23 6:29 Stephen Rothwell
2008-10-23 7:34 ` Alan Cox
2008-10-23 7:35 ` Benjamin Herrenschmidt
2008-10-24 4:58 ` Stephen Rothwell
2008-10-23 10:28 ` Hendrik Brueckner
2008-10-20 8:06 Stephen Rothwell
2008-10-20 21:48 ` Lee Howard
2008-10-21 9:33 ` Alan Cox
2008-10-15 9:39 Stephen Rothwell
2008-09-02 7:23 Stephen Rothwell
2008-09-02 9:22 ` Alan Cox
2008-08-20 8:23 Stephen Rothwell
2008-08-20 8:26 ` Alan Cox
2008-08-20 9:08 ` Stephen Rothwell
2008-07-23 7:17 Stephen Rothwell
2008-07-23 12:39 ` Geert Uytterhoeven
2008-07-23 14:46 ` Alan Cox
2008-07-23 15:49 ` Geert Uytterhoeven
2008-07-23 15:47 ` Alan Cox
2008-07-23 16:39 ` Geert Uytterhoeven
2008-07-23 16:28 ` Alan Cox
2008-07-23 18:55 ` Geert Uytterhoeven
2008-07-18 21:34 Aleksey Gorelov
2008-07-18 8:59 Stephen Rothwell
2008-07-02 5:30 Stephen Rothwell
2008-07-02 18:10 ` Randy Dunlap
2008-07-02 19:54 ` Alan Cox
2008-07-02 5:19 Stephen Rothwell
2008-07-02 5:21 ` Stephen Rothwell
2008-07-02 8:09 ` Alan Cox
2008-07-02 5:08 Stephen Rothwell
2008-07-02 8:05 ` Alan Cox
2008-07-01 14:17 Stephen Rothwell
2008-07-01 14:23 ` Alan Cox
2008-07-01 14:51 ` Stephen Rothwell
2008-07-01 15:27 ` Greg KH
2008-07-01 15:36 ` Alan Cox
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=20090724155417.62fa065d.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.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).