From: Guenter Roeck <linux@roeck-us.net>
To: Peter Zijlstra <peterz@infradead.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Ingo Molnar <mingo@kernel.org>,
"David S. Miller" <davem@davemloft.net>
Subject: Re: linux-next: Tree for Aug 23
Date: Tue, 2 Sep 2014 16:50:38 -0700 [thread overview]
Message-ID: <20140902235038.GA23286@roeck-us.net> (raw)
In-Reply-To: <20140902202126.GA3190@worktop.ger.corp.intel.com>
On Tue, Sep 02, 2014 at 10:21:26PM +0200, Peter Zijlstra wrote:
> On Tue, Sep 02, 2014 at 12:04:45PM -0700, Guenter Roeck wrote:
>
> > I provided qemu images and instructions as follows.
> > http://server.roeck-us.net/qemu/mipsel/ MIPS 32 bit, little endian
> > http://server.roeck-us.net/qemu/mips64el/ MIPS 64 bit, little endian
> >
> > Let me know if you also need big endian images.
>
> Thanks! Does the below work? It appears to work for the mips64 build I did.
> I'll send a proper patch tomorrow; sleep time :-)
>
Yes, this fixes the problem for both mips32 and mips64.
Guenter
> ---
> diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig
> index e18741e..869efe7 100644
> --- a/arch/mips/configs/malta_defconfig
> +++ b/arch/mips/configs/malta_defconfig
> @@ -441,3 +441,6 @@ CONFIG_CRYPTO_TEA=m
> CONFIG_CRYPTO_TWOFISH=m
> # CONFIG_CRYPTO_ANSI_CPRNG is not set
> CONFIG_CRC16=m
> +CONFIG_BLK_DEV_INITRD=y
> +CONFIG_CPU_MIPS64_R1=y
> +CONFIG_64BIT=y
> diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
> index 476fe3b..f3ee721 100644
> --- a/arch/mips/include/asm/atomic.h
> +++ b/arch/mips/include/asm/atomic.h
> @@ -93,7 +93,7 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
> " " #asm_op " %0, %1, %3 \n" \
> " sc %0, %2 \n" \
> " beqzl %0, 1b \n" \
> - " addu %0, %1, %3 \n" \
> + " " #asm_op " %0, %1, %3 \n" \
> " .set mips0 \n" \
> : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
> : "Ir" (i)); \
> @@ -111,7 +111,7 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
> : "Ir" (i)); \
> } while (unlikely(!result)); \
> \
> - result = temp + i; \
> + result = temp; result c_op i; \
> } else { \
> unsigned long flags; \
> \
> @@ -387,7 +387,7 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
> : "memory"); \
> } while (unlikely(!result)); \
> \
> - result = temp + i; \
> + result = temp; result c_op i; \
> } else { \
> unsigned long flags; \
> \
>
>
next prev parent reply other threads:[~2014-09-02 23:50 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-22 22:04 linux-next: Tree for Aug 23 Stephen Rothwell
2014-08-25 4:57 ` Guenter Roeck
2014-09-01 15:58 ` Peter Zijlstra
2014-09-01 16:46 ` Guenter Roeck
2014-09-01 19:04 ` Peter Zijlstra
2014-09-02 9:40 ` Peter Zijlstra
2014-09-02 9:55 ` Peter Zijlstra
2014-09-02 19:04 ` Guenter Roeck
2014-09-02 20:21 ` Peter Zijlstra
2014-09-02 23:50 ` Guenter Roeck [this message]
2014-09-10 17:31 ` [tip:locking/arch] locking, mips: Fix atomics tip-bot for Peter Zijlstra
2014-09-02 17:59 ` linux-next: Tree for Aug 23 Guenter Roeck
2014-09-10 17:31 ` [tip:locking/arch] locking, sparc64: Fix atomics tip-bot for Peter Zijlstra
-- strict thread matches above, loose matches on Subject: below --
2023-08-23 6:14 linux-next: Tree for Aug 23 Stephen Rothwell
2022-08-23 5:26 Stephen Rothwell
2021-08-23 10:26 Stephen Rothwell
2019-08-23 9:26 Stephen Rothwell
2019-08-24 2:37 ` John Hubbard
2018-08-23 3:32 Stephen Rothwell
2017-08-23 7:09 Stephen Rothwell
2016-08-23 4:55 Stephen Rothwell
2012-08-23 5:22 Stephen Rothwell
2011-08-23 6:04 Stephen Rothwell
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=20140902235038.GA23286@roeck-us.net \
--to=linux@roeck-us.net \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
/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).