From: Greg Kroah-Hartman Date: Mon, 15 Sep 2014 05:15:58 +0000 (-0700) Subject: build fix for queue-3.10/powerpc-mm-use-read-barrier-when-creating-real_pte.patch... X-Git-Tag: v3.10.55~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a214eee98c1ff07b4ea9931addc8d5b4f3c9e40f;p=thirdparty%2Fkernel%2Fstable-queue.git build fix for queue-3.10/powerpc-mm-use-read-barrier-when-creating-real_pte.patch from Ben --- diff --git a/queue-3.10/powerpc-mm-use-read-barrier-when-creating-real_pte.patch b/queue-3.10/powerpc-mm-use-read-barrier-when-creating-real_pte.patch index 24d419a5ba8..3737cf95051 100644 --- a/queue-3.10/powerpc-mm-use-read-barrier-when-creating-real_pte.patch +++ b/queue-3.10/powerpc-mm-use-read-barrier-when-creating-real_pte.patch @@ -20,12 +20,20 @@ Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Greg Kroah-Hartman --- - arch/powerpc/include/asm/pte-hash64-64k.h | 30 +++++++++++++++++++++++++----- - 1 file changed, 25 insertions(+), 5 deletions(-) + arch/powerpc/include/asm/pte-hash64-64k.h | 32 +++++++++++++++++++++++++----- + 1 file changed, 27 insertions(+), 5 deletions(-) --- a/arch/powerpc/include/asm/pte-hash64-64k.h +++ b/arch/powerpc/include/asm/pte-hash64-64k.h -@@ -46,11 +46,31 @@ +@@ -40,17 +40,39 @@ + + #ifndef __ASSEMBLY__ + ++#include /* for smp_rmb() */ ++ + /* + * With 64K pages on hash table, we have a special PTE format that + * uses a second "half" of the page table to encode sub-page information * in order to deal with 64K made of 4K HW pages. Thus we override the * generic accessors and iterators here */