Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh

d7e69bc7 · Linus Torvalds <[email protected]> · 2012-04-27 19:31:10 -07:00

Pull SuperH fixes from Paul Mundt.

* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
  sh: Fix up tracepoint build fallout from static key introduction.
  sh: Fix error synchronising kernel page tables

Commit: d7e69bc73c423723c30b5cd3d4b1d72c06ed22e6
Parents: 9c687702 · 3c3c801f

Merge commit. Changes below are compared with the first parent: 9c687702.

Changes

2 files changed · +2 −2

File	Status	Add	Del	Content
arch/sh/include/asm/atomic.h	modified	+1	−1	View file
arch/sh/mm/fault_32.c	modified	+1	−1	View file

arch/sh/include/asm/atomic.h

View file

diff --git a/arch/sh/include/asm/atomic.h b/arch/sh/include/asm/atomic.h
index 37f2f4a..f4c1c20 100644
--- a/arch/sh/include/asm/atomic.h
+++ b/arch/sh/include/asm/atomic.h
@@ -11,7 +11,7 @@
 #include <linux/types.h>
 #include <asm/cmpxchg.h>
 
-#define ATOMIC_INIT(i)	( (atomic_t) { (i) } )
+#define ATOMIC_INIT(i)	{ (i) }
 
 #define atomic_read(v)		(*(volatile int *)&(v)->counter)
 #define atomic_set(v,i)		((v)->counter = (i))

arch/sh/mm/fault_32.c

View file

diff --git a/arch/sh/mm/fault_32.c b/arch/sh/mm/fault_32.c
index 324eef9..e99b104 100644
--- a/arch/sh/mm/fault_32.c
+++ b/arch/sh/mm/fault_32.c
@@ -86,7 +86,7 @@ static noinline int vmalloc_fault(unsigned long address)
 	pte_t *pte_k;
 
 	/* Make sure we are in vmalloc/module/P3 area: */
-	if (!(address >= VMALLOC_START && address < P3_ADDR_MAX))
+	if (!(address >= P3SEG && address < P3_ADDR_MAX))
 		return -1;
 
 	/*