From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 29 May 2014 23:57:25 +0000 (+1000)
Subject: Merge remote-tracking branch 'powerpc/next'
X-Git-Tag: next-20140530~107
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e496d47dc8be507c0ec26a2dba5a54fa72691bdc;p=karo-tx-linux.git

Merge remote-tracking branch 'powerpc/next'

Conflicts:
	arch/powerpc/include/asm/sections.h
---

e496d47dc8be507c0ec26a2dba5a54fa72691bdc
diff --cc arch/powerpc/include/asm/sections.h
index 521790330672,d1bb96d5a298..a5e930aca804
--- 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)
  {