From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 15 Oct 2008 00:31:54 +0000 (+1100)
Subject: Merge commit 'origin'
X-Git-Tag: v2.6.28-rc1~569^2
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=6dc6472581f693b5fc95aebedf67b4960fb85cf0

Merge commit 'origin'

Manual fixup of conflicts on:

	arch/powerpc/include/asm/dcr-regs.h
	drivers/net/ibm_newemac/core.h
---

6dc6472581f693b5fc95aebedf67b4960fb85cf0
diff --cc arch/powerpc/include/asm/sections.h
index baf318aec533,07956f3e7844..6fbce725c710
--- a/arch/powerpc/include/asm/sections.h
+++ b/arch/powerpc/include/asm/sections.h
@@@ -16,14 -18,16 +18,22 @@@ static inline int in_kernel_text(unsign
  	return 0;
  }
  
 +static inline int overlaps_kernel_text(unsigned long start, unsigned long end)
 +{
 +	return start < (unsigned long)__init_end &&
 +		(unsigned long)_stext < end;
 +}
 +
  #undef dereference_function_descriptor
- void *dereference_function_descriptor(void *);
+ static inline void *dereference_function_descriptor(void *ptr)
+ {
+ 	struct ppc64_opd_entry *desc = ptr;
+ 	void *p;
+ 
+ 	if (!probe_kernel_address(&desc->funcaddr, p))
+ 		ptr = p;
+ 	return ptr;
+ }
  
  #endif