diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 11:53:13 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 11:53:13 +1100 |
| commit | 24035e3af6d9ea1aab89a107cb5e743a4e674614 (patch) | |
| tree | 95135ebca5e9d2b1822a42f1e0a54cf2561fb48a /arch | |
| parent | ba84f4598a881f6a879ea38b9e1bf64ef17b46d0 (diff) | |
| parent | 49225a7d26a4eea143393bcd349fead7b8547f93 (diff) | |
Merge remote-tracking branch 's390/features'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/Kconfig | 20 | ||||
| -rw-r--r-- | arch/s390/Makefile | 3 |
2 files changed, 6 insertions, 17 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 636bcb81d068..271a02f821c0 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -341,26 +341,16 @@ config STACK_GUARD The minimum size for the stack guard should be 256 for 31 bit and 512 for 64 bit. -config WARN_STACK +config WARN_DYNAMIC_STACK def_bool n - prompt "Emit compiler warnings for function with broken stack usage" + prompt "Emit compiler warnings for function with dynamic stack usage" help - This option enables the compiler options -mwarn-framesize and - -mwarn-dynamicstack. If the compiler supports these options it - will generate warnings for function which either use alloca or - create a stack frame bigger than CONFIG_WARN_STACK_SIZE. + This option enables the compiler option -mwarn-dynamicstack. If the + compiler supports this options generates warnings for functions + that dynamically allocate stack space using alloca. Say N if you are unsure. -config WARN_STACK_SIZE - int "Maximum frame size considered safe (128-2048)" - range 128 2048 - depends on WARN_STACK - default "2048" - help - This allows you to specify the maximum frame size a function may - have without the compiler complaining about it. - config ARCH_POPULATES_NODE_MAP def_bool y diff --git a/arch/s390/Makefile b/arch/s390/Makefile index d5b8a6ade525..27a0b5df5ead 100644 --- a/arch/s390/Makefile +++ b/arch/s390/Makefile @@ -80,8 +80,7 @@ endif endif ifeq ($(call cc-option-yn,-mwarn-dynamicstack),y) -cflags-$(CONFIG_WARN_STACK) += -mwarn-dynamicstack -cflags-$(CONFIG_WARN_STACK) += -mwarn-framesize=$(CONFIG_WARN_STACK_SIZE) +cflags-$(CONFIG_WARN_DYNAMIC_STACK) += -mwarn-dynamicstack endif KBUILD_CFLAGS += -mbackchain -msoft-float $(cflags-y) |