From: Heiko Carstens <heiko.carstens@de•ibm.com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Martin Schwidefsky <schwidefsky@de•ibm.com>,
linux-s390@vger•kernel.org, linux-next@vger•kernel.org,
Tejun Heo <tj@kernel•org>, Rusty Russell <rusty@rustcorp•com.au>,
Christoph Lameter <cl@linux-foundation•org>,
Ingo Molnar <mingo@elte•hu>, Sachin Sant <sachinp@in•ibm.com>
Subject: Re: [-next Nov 16] s390 build failure (arch/s390/kernel/time)
Date: Tue, 17 Nov 2009 08:59:17 +0100 [thread overview]
Message-ID: <20091117075917.GA5124@osiris.boeblingen.de.ibm.com> (raw)
In-Reply-To: <20091117162546.16bb00b0.sfr@canb.auug.org.au>
On Tue, Nov 17, 2009 at 04:25:46PM +1100, Stephen Rothwell wrote:
> On Tue, 17 Nov 2009 10:06:13 +0530 Sachin Sant <sachinp@in•ibm.com> wrote:
> >
> > Next 20091116 build failed on a s390 box with
> >
> > arch/s390/kernel/time.c: In function 'get_sync_clock':
> > arch/s390/kernel/time.c:337: error: 'clock_sync_sync' undeclared (first use in this function)
> > arch/s390/kernel/time.c:337: error: (Each undeclared identifier is reported only once
> > arch/s390/kernel/time.c:337: error: for each function it appears in.)
> > arch/s390/kernel/time.c: In function 'check_sync_clock':
> > arch/s390/kernel/time.c:387: error: 'clock_sync_sync' undeclared (first use in this function)
>
> Caused by commits 8283cb43ab3e92a039d3486a0f6253df95a5fa55 ("[S390] clock
> sync mode flags") (which entered Linus' tree during 2.6.30-rc1) and
> commit d2fec595511b5718bdb65645b3d5d99800d97943 ("[S390] stp support")
> (which entered Linus' tree during 2.6.27-rc1) but only exposed by commit
> e0fdb0e050eae331046385643618f12452aa7e73 ("percpu: add __percpu for
> sparse") from the percpu tree.
>
> Needs to be fixed in the s390 tree. (put_per_cpu() now references its
> argument, so that had better be a real variable :-))
Weird... at least it wasn't a bug. Patch below will fix compile breakage.
---
arch/s390/kernel/time.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: linux-next/arch/s390/kernel/time.c
===================================================================
--- linux-next.orig/arch/s390/kernel/time.c
+++ linux-next/arch/s390/kernel/time.c
@@ -334,7 +334,7 @@ int get_sync_clock(unsigned long long *c
sw0 = atomic_read(sw_ptr);
*clock = get_clock();
sw1 = atomic_read(sw_ptr);
- put_cpu_var(clock_sync_sync);
+ put_cpu_var(clock_sync_word);
if (sw0 == sw1 && (sw0 & 0x80000000U))
/* Success: time is in sync. */
return 0;
@@ -384,7 +384,7 @@ static inline int check_sync_clock(void)
sw_ptr = &get_cpu_var(clock_sync_word);
rc = (atomic_read(sw_ptr) & 0x80000000U) != 0;
- put_cpu_var(clock_sync_sync);
+ put_cpu_var(clock_sync_word);
return rc;
}
next prev parent reply other threads:[~2009-11-17 7:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-16 7:14 linux-next: Tree for November 16 Stephen Rothwell
2009-11-16 14:32 ` Borislav Petkov
2009-11-17 3:19 ` edac-amd tree (Was: Re: linux-next: Tree for November 16) Stephen Rothwell
2009-11-17 12:00 ` Borislav Petkov
2009-11-16 23:32 ` [PATCH -next] acpi: get_bios_limit static inline when CPU_FREQ=n Randy Dunlap
2009-11-16 23:32 ` [PATCH -next] x86/cpufreq: don't use acpi_processor_get_bios_limit when not available Randy Dunlap
2009-11-17 4:36 ` [-next Nov 16] s390 build failure (arch/s390/kernel/time) Sachin Sant
2009-11-17 5:25 ` Stephen Rothwell
2009-11-17 7:59 ` Heiko Carstens [this message]
2009-11-17 11:55 ` Sachin Sant
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=20091117075917.GA5124@osiris.boeblingen.de.ibm.com \
--to=heiko.carstens@de$(echo .)ibm.com \
--cc=cl@linux-foundation$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-s390@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=rusty@rustcorp$(echo .)com.au \
--cc=sachinp@in$(echo .)ibm.com \
--cc=schwidefsky@de$(echo .)ibm.com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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