Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7e69bc7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 9c687702 3c3c801f

arch/sh/include/asm/atomic.h

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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;



	/*