diff options
| author | Paul Mundt | 2012-04-27 11:27:34 +0930 |
|---|---|---|
| committer | Paul Mundt | 2012-04-27 11:27:34 +0930 |
| commit | 3c3c801fcfafa53e7ab8615ca3bd596ba308f72b (patch) | |
| tree | 6ee9d86c1a9f7331b384cc1eb3a1a996ada8366f /arch | |
| parent | 82b769063598d01a8b24abf250a53f8b437e09f1 (diff) | |
| parent | ec2ccd884ab1e190bc5ddb210c7d5f5ea2ddeba3 (diff) | |
Merge branch 'sh/urgent' into sh-fixes-for-linus
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/include/asm/atomic.h | 2 | ||||
| -rw-r--r-- | arch/sh/mm/fault_32.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/include/asm/atomic.h b/arch/sh/include/asm/atomic.h index 37f2f4a55231..f4c1c20bcdf6 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)) diff --git a/arch/sh/mm/fault_32.c b/arch/sh/mm/fault_32.c index 324eef93c900..e99b104d967a 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; /* |