Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'sh/urgent' into sh-fixes-for-linus

Browse source
This commit is contained in:
Paul Mundt 2012-04-27 11:27:34 +09:30
commit 3c3c801fcf
2 changed files with 2 additions and 2 deletions
Show stats 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;
/* /*