Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
From: Paul Burton <paul.burton@mips.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Ralf Baechle <ralf@linux-mips.org>,
	James Hogan <jhogan@kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Huacai Chen <chenhc@lemote.com>, Huang Pei <huangpei@loongson.cn>
Subject: Re: linux-next: manual merge of the mips tree with the mips-fixes tree
Date: Tue, 5 Feb 2019 23:35:31 +0000
Message-ID: <20190205233530.tnk6boxzxm7okgcr@pburton-laptop> (raw)
In-Reply-To: <20190206091736.73bd95ec@canb.auug.org.au>

Hi Stephen,

On Wed, Feb 06, 2019 at 09:17:36AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the mips tree got conflicts in:
> 
>   arch/mips/include/asm/barrier.h
>   arch/mips/include/asm/pgtable.h
> 
> between commit:
> 
>   e02e07e3127d ("MIPS: Loongson: Introduce and use loongson_llsc_mb()")
> 
> from the mips-fixes tree and commits:
> 
>   535113896e80 ("MIPS: Add GINVT instruction helpers")
>   82f4f66ddf11 ("MIPS: Remove open-coded cmpxchg() in set_pte()")
> 
> from the mips tree.
> 
> I fixed it up (see below and for the latter file, I used the mips tree
> version but wondered if cmpxchg() needs the fixups from the mips-fixes
> tree commit)

Thanks - that looks good.

cmpxchg() doesn't need the added loongson_llsc_mb() barrier that
set_pte() has in mips-fixes because for the affected Loongson 3
configurations the smp_mb__before_llsc() that cmpxchg() already contains
is equivalent (both will emit a "sync 0" instruction).

Thanks,
    Paul

  reply index

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-05 22:17 Stephen Rothwell
2019-02-05 23:35 ` Paul Burton [this message]
2019-02-05 23:44   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2019-11-04 23:05 Stephen Rothwell
2019-02-07 22:22 Stephen Rothwell
2018-06-28 23:46 Stephen Rothwell

Reply instructions:

You may reply publically 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=20190205233530.tnk6boxzxm7okgcr@pburton-laptop \
    --to=paul.burton@mips.com \
    --cc=chenhc@lemote.com \
    --cc=huangpei@loongson.cn \
    --cc=jhogan@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=ralf@linux-mips.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

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git