All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	<linuxppc-dev@lists.ozlabs.org>, Alexander Graf <agraf@suse.de>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Anton Blanchard <anton@samba.org>
Subject: linux-next: manual merge of the powerpc tree with Linus' tree
Date: Thu, 29 May 2014 12:04:48 +1000	[thread overview]
Message-ID: <20140529120448.1a90dd4a@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1210 bytes --]

Hi all,

Today's linux-next merge of the powerpc tree got a conflict in
arch/powerpc/include/asm/sections.h between commit b18db0b80867 ("KVM
guest: Make pv trampoline code executable") from the  tree and commit
07de8377f748 ("powerpc: Fix ABIv2 issue with
dereference_function_descriptor") from the powerpc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/powerpc/include/asm/sections.h
index 521790330672,d1bb96d5a298..000000000000
--- a/arch/powerpc/include/asm/sections.h
+++ b/arch/powerpc/include/asm/sections.h
@@@ -39,17 -39,7 +39,18 @@@ static inline int overlaps_kernel_text(
  		(unsigned long)_stext < end;
  }
  
 +static inline int overlaps_kvm_tmp(unsigned long start, unsigned long end)
 +{
 +#ifdef CONFIG_KVM_GUEST
 +	extern char kvm_tmp[];
 +	return start < (unsigned long)kvm_tmp &&
 +		(unsigned long)&kvm_tmp[1024 * 1024] < end;
 +#else
 +	return 0;
 +#endif
 +}
 +
+ #if !defined(_CALL_ELF) || _CALL_ELF != 2
  #undef dereference_function_descriptor
  static inline void *dereference_function_descriptor(void *ptr)
  {

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	linuxppc-dev@lists.ozlabs.org, Alexander Graf <agraf@suse.de>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Anton Blanchard <anton@samba.org>
Subject: linux-next: manual merge of the powerpc tree with Linus' tree
Date: Thu, 29 May 2014 12:04:48 +1000	[thread overview]
Message-ID: <20140529120448.1a90dd4a@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1210 bytes --]

Hi all,

Today's linux-next merge of the powerpc tree got a conflict in
arch/powerpc/include/asm/sections.h between commit b18db0b80867 ("KVM
guest: Make pv trampoline code executable") from the  tree and commit
07de8377f748 ("powerpc: Fix ABIv2 issue with
dereference_function_descriptor") from the powerpc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/powerpc/include/asm/sections.h
index 521790330672,d1bb96d5a298..000000000000
--- a/arch/powerpc/include/asm/sections.h
+++ b/arch/powerpc/include/asm/sections.h
@@@ -39,17 -39,7 +39,18 @@@ static inline int overlaps_kernel_text(
  		(unsigned long)_stext < end;
  }
  
 +static inline int overlaps_kvm_tmp(unsigned long start, unsigned long end)
 +{
 +#ifdef CONFIG_KVM_GUEST
 +	extern char kvm_tmp[];
 +	return start < (unsigned long)kvm_tmp &&
 +		(unsigned long)&kvm_tmp[1024 * 1024] < end;
 +#else
 +	return 0;
 +#endif
 +}
 +
+ #if !defined(_CALL_ELF) || _CALL_ELF != 2
  #undef dereference_function_descriptor
  static inline void *dereference_function_descriptor(void *ptr)
  {

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2014-05-29  2:04 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-29  2:04 Stephen Rothwell [this message]
2014-05-29  2:04 ` linux-next: manual merge of the powerpc tree with Linus' tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2021-08-15 22:27 Stephen Rothwell
2021-08-15 22:27 ` Stephen Rothwell
2018-08-14 23:19 Stephen Rothwell
2017-11-07 22:32 Stephen Rothwell
2017-10-30 12:51 Mark Brown
2017-11-13  5:37 ` Stephen Rothwell
2017-02-16 22:06 Stephen Rothwell
2016-06-29  0:35 Stephen Rothwell
2016-06-29  0:35 ` Stephen Rothwell
2016-06-29  5:24 ` Naveen N. Rao
2016-06-29  6:33   ` Michael Ellerman
2016-05-01 23:50 Stephen Rothwell
2016-05-01 23:50 ` Stephen Rothwell
2009-12-08 23:49 Stephen Rothwell
2009-12-08 23:49 ` 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=20140529120448.1a90dd4a@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=agraf@suse.de \
    --cc=anton@samba.org \
    --cc=benh@kernel.crashing.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linuxppc-dev@lists.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.