diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-06-09 12:55:42 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-06-09 12:55:42 +0800 |
| commit | 3b8d7f4db34913c8e2ea0177723784b646f7424e (patch) | |
| tree | 1c28a8a8c273dffd031935f5ee509db5c5e0f386 /arch/metag | |
| parent | f669f023e2ce45ab6e289bd980d435e1dae0e362 (diff) | |
| parent | c2f7eb8029e23c4f5445340d8fc0d05367538e6d (diff) | |
Merge tag v3.10.42 into linux-linaro-lsk
This is the 3.10.42 stable release
Diffstat (limited to 'arch/metag')
| -rw-r--r-- | arch/metag/include/asm/barrier.h | 3 | ||||
| -rw-r--r-- | arch/metag/include/asm/processor.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/metag/include/asm/barrier.h b/arch/metag/include/asm/barrier.h index c90bfc6bf648..e355a4c10968 100644 --- a/arch/metag/include/asm/barrier.h +++ b/arch/metag/include/asm/barrier.h @@ -15,6 +15,7 @@ static inline void wr_fence(void) volatile int *flushptr = (volatile int *) LINSYSEVENT_WR_FENCE; barrier(); *flushptr = 0; + barrier(); } #else /* CONFIG_METAG_META21 */ @@ -35,6 +36,7 @@ static inline void wr_fence(void) *flushptr = 0; *flushptr = 0; *flushptr = 0; + barrier(); } #endif /* !CONFIG_METAG_META21 */ @@ -68,6 +70,7 @@ static inline void fence(void) volatile int *flushptr = (volatile int *) LINSYSEVENT_WR_ATOMIC_UNLOCK; barrier(); *flushptr = 0; + barrier(); } #define smp_mb() fence() #define smp_rmb() fence() diff --git a/arch/metag/include/asm/processor.h b/arch/metag/include/asm/processor.h index 9b029a7911c3..579e3d93a5ca 100644 --- a/arch/metag/include/asm/processor.h +++ b/arch/metag/include/asm/processor.h @@ -22,6 +22,8 @@ /* Add an extra page of padding at the top of the stack for the guard page. */ #define STACK_TOP (TASK_SIZE - PAGE_SIZE) #define STACK_TOP_MAX STACK_TOP +/* Maximum virtual space for stack */ +#define STACK_SIZE_MAX (1 << 28) /* 256 MB */ /* This decides where the kernel will search for a free chunk of vm * space during mmap's. |