lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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:
Linus Torvalds
2012-04-27 19:31:10 -07:00
parent 9c687702b6 3c3c801fcf
commit d7e69bc73c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sh/include/asm/atomic.h
View File

@@ -11,7 +11,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <asm/cmpxchg.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_read(v) (*(volatile int *)&(v)->counter)
#define atomic_set(v,i) ((v)->counter = (i)) #define atomic_set(v,i) ((v)->counter = (i))

2
arch/sh/mm/fault_32.c
View File

@@ -86,7 +86,7 @@ static noinline int vmalloc_fault(unsigned long address)
pte_t *pte_k; pte_t *pte_k;
/* Make sure we are in vmalloc/module/P3 area: */ /* 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; return -1;
/* /*