s390 seems to define a macro: __SMALL_STACK with gcc's -D, and bases that -D flag off of CONFIG_SMALL_STACK. This patch makes it use the existing CONFIG_ option instead.
This patch has been compile tested with the config option both on and off. Signed-off-by: Dave Hansen <[EMAIL PROTECTED]> --- threadalloc-dave/include/asm-s390/thread_info.h | 4 ++-- threadalloc-dave/arch/s390/Makefile | 4 ---- MAINTAINERS | 0 3 files changed, 2 insertions(+), 6 deletions(-) diff -puN include/asm-s390/thread_info.h~s390-kill-__SMALL_STACK include/asm-s390/thread_info.h --- threadalloc/include/asm-s390/thread_info.h~s390-kill-__SMALL_STACK 2006-09-01 12:10:52.000000000 -0700 +++ threadalloc-dave/include/asm-s390/thread_info.h 2006-09-01 12:11:45.000000000 -0700 @@ -15,7 +15,7 @@ * Size of kernel stack for each process */ #ifndef __s390x__ -#ifndef __SMALL_STACK +#ifndef CONFIG_SMALL_STACK #define THREAD_ORDER 1 #define ASYNC_ORDER 1 #else @@ -23,7 +23,7 @@ #define ASYNC_ORDER 0 #endif #else /* __s390x__ */ -#ifndef __SMALL_STACK +#ifndef CONFIG_SMALL_STACK #define THREAD_ORDER 2 #define ASYNC_ORDER 2 #else diff -puN arch/s390/Makefile~s390-kill-__SMALL_STACK arch/s390/Makefile --- threadalloc/arch/s390/Makefile~s390-kill-__SMALL_STACK 2006-09-01 12:10:52.000000000 -0700 +++ threadalloc-dave/arch/s390/Makefile 2006-09-01 12:19:14.000000000 -0700 @@ -43,8 +43,6 @@ cflags-$(CONFIG_FRAME_POINTER) += -fno-o ifeq ($(call cc-option-yn,-mkernel-backchain),y) cflags-$(CONFIG_PACK_STACK) += -mkernel-backchain -D__PACK_STACK aflags-$(CONFIG_PACK_STACK) += -D__PACK_STACK -cflags-$(CONFIG_SMALL_STACK) += -D__SMALL_STACK -aflags-$(CONFIG_SMALL_STACK) += -D__SMALL_STACK ifdef CONFIG_SMALL_STACK STACK_SIZE := $(shell echo $$(($(STACK_SIZE)/2)) ) endif @@ -54,8 +52,6 @@ endif ifeq ($(call cc-option-yn,-mpacked-stack),y) cflags-$(CONFIG_PACK_STACK) += -mpacked-stack -D__PACK_STACK aflags-$(CONFIG_PACK_STACK) += -D__PACK_STACK -cflags-$(CONFIG_SMALL_STACK) += -D__SMALL_STACK -aflags-$(CONFIG_SMALL_STACK) += -D__SMALL_STACK ifdef CONFIG_SMALL_STACK STACK_SIZE := $(shell echo $$(($(STACK_SIZE)/2)) ) endif diff -puN arch/s390/Kconfig~s390-kill-__SMALL_STACK arch/s390/Kconfig diff -puN MAINTAINERS~s390-kill-__SMALL_STACK MAINTAINERS _ ---------------------------------------------------------------------- For LINUX-390 subscribe / signoff / archive access instructions, send email to [EMAIL PROTECTED] with the message: INFO LINUX-390 or visit http://www.marist.edu/htbin/wlvindex?LINUX-390
