SuperH fixes for 3.4-rc5
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk+Z/vwACgkQGkmNcg7/o7jWdQCfTKAJPg8gffRjSBrUlfqkztHB 2ZsAoKtzT6qIORi78eivNuYIpDXYg2o7 =+V2Z -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
d7e69bc73c
|
@ -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))
|
||||
|
|
|
@ -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;
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue