diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-20 01:30:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-20 01:30:34 -0400 |
| commit | 41abc90228f98774263572ec99e7ab820f091002 (patch) | |
| tree | ce41e35a000ae50780b3f09b5be5d46fe93bf2d2 /mm | |
| parent | a7b0806392b527e8a616e7ea6f17aafe33949a9f (diff) | |
| parent | ffe6902b66aaa4ca6694bc19639259c16d84ddb1 (diff) | |
Merge tag 'metag-for-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag
Pull Metag architecture and related fixes from James Hogan:
"Mostly fixes for metag and parisc relating to upgrowing stacks.
- Fix missing compiler barriers in metag memory barriers.
- Fix BUG_ON on metag when RLIMIT_STACK hard limit is increased
beyond safe value.
- Make maximum stack size configurable. This reduces the default
user stack size back to 80MB (especially on parisc after their
removal of _STK_LIM_MAX override). This only affects metag and
parisc.
- Remove metag _STK_LIM_MAX override to match other arches and follow
parisc, now that it is safe to do so (due to the BUG_ON fix
mentioned above).
- Finally now that both metag and parisc _STK_LIM_MAX overrides have
been removed, it makes sense to remove _STK_LIM_MAX altogether"
* tag 'metag-for-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
asm-generic: remove _STK_LIM_MAX
metag: Remove _STK_LIM_MAX override
parisc,metag: Do not hardcode maximum userspace stack size
metag: Reduce maximum stack size to 256MB
metag: fix memory barriers
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/Kconfig | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index ebe5880c29d6..1b5a95f0fa01 100644 --- a/mm/Kconfig +++ b/mm/Kconfig | |||
| @@ -581,3 +581,18 @@ config PGTABLE_MAPPING | |||
| 581 | 581 | ||
| 582 | config GENERIC_EARLY_IOREMAP | 582 | config GENERIC_EARLY_IOREMAP |
| 583 | bool | 583 | bool |
| 584 | |||
| 585 | config MAX_STACK_SIZE_MB | ||
| 586 | int "Maximum user stack size for 32-bit processes (MB)" | ||
| 587 | default 80 | ||
| 588 | range 8 256 if METAG | ||
| 589 | range 8 2048 | ||
| 590 | depends on STACK_GROWSUP && (!64BIT || COMPAT) | ||
| 591 | help | ||
| 592 | This is the maximum stack size in Megabytes in the VM layout of 32-bit | ||
| 593 | user processes when the stack grows upwards (currently only on parisc | ||
| 594 | and metag arch). The stack will be located at the highest memory | ||
| 595 | address minus the given value, unless the RLIMIT_STACK hard limit is | ||
| 596 | changed to a smaller value in which case that is used. | ||
| 597 | |||
| 598 | A sane initial value is 80 MB. | ||