diff options
| -rw-r--r-- | arch/x86/Kconfig.debug | 9 | ||||
| -rw-r--r-- | arch/x86/include/asm/module.h | 7 | ||||
| -rw-r--r-- | arch/x86/include/asm/page_32_types.h | 4 |
3 files changed, 1 insertions, 19 deletions
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug index badda8e20e78..7f1530838bc8 100644 --- a/arch/x86/Kconfig.debug +++ b/arch/x86/Kconfig.debug | |||
| @@ -121,15 +121,6 @@ config DEBUG_NX_TEST | |||
| 121 | and the software setup of this feature. | 121 | and the software setup of this feature. |
| 122 | If in doubt, say "N" | 122 | If in doubt, say "N" |
| 123 | 123 | ||
| 124 | config 4KSTACKS | ||
| 125 | bool "Use 4Kb for kernel stacks instead of 8Kb" | ||
| 126 | depends on X86_32 | ||
| 127 | ---help--- | ||
| 128 | If you say Y here the kernel will use a 4Kb stacksize for the | ||
| 129 | kernel stack attached to each process/thread. This facilitates | ||
| 130 | running more threads on a system and also reduces the pressure | ||
| 131 | on the VM subsystem for higher order allocations. | ||
| 132 | |||
| 133 | config DOUBLEFAULT | 124 | config DOUBLEFAULT |
| 134 | default y | 125 | default y |
| 135 | bool "Enable doublefault exception handler" if EMBEDDED | 126 | bool "Enable doublefault exception handler" if EMBEDDED |
diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h index 3e2ce58a31a3..67763c5d8b4e 100644 --- a/arch/x86/include/asm/module.h +++ b/arch/x86/include/asm/module.h | |||
| @@ -60,12 +60,7 @@ | |||
| 60 | #endif | 60 | #endif |
| 61 | 61 | ||
| 62 | #ifdef CONFIG_X86_32 | 62 | #ifdef CONFIG_X86_32 |
| 63 | # ifdef CONFIG_4KSTACKS | 63 | # define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY |
| 64 | # define MODULE_STACKSIZE "4KSTACKS " | ||
| 65 | # else | ||
| 66 | # define MODULE_STACKSIZE "" | ||
| 67 | # endif | ||
| 68 | # define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE | ||
| 69 | #endif | 64 | #endif |
| 70 | 65 | ||
| 71 | #endif /* _ASM_X86_MODULE_H */ | 66 | #endif /* _ASM_X86_MODULE_H */ |
diff --git a/arch/x86/include/asm/page_32_types.h b/arch/x86/include/asm/page_32_types.h index 6f1b7331313f..ade619ff9e2a 100644 --- a/arch/x86/include/asm/page_32_types.h +++ b/arch/x86/include/asm/page_32_types.h | |||
| @@ -15,11 +15,7 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) | 16 | #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) |
| 17 | 17 | ||
| 18 | #ifdef CONFIG_4KSTACKS | ||
| 19 | #define THREAD_ORDER 0 | ||
| 20 | #else | ||
| 21 | #define THREAD_ORDER 1 | 18 | #define THREAD_ORDER 1 |
| 22 | #endif | ||
| 23 | #define THREAD_SIZE (PAGE_SIZE << THREAD_ORDER) | 19 | #define THREAD_SIZE (PAGE_SIZE << THREAD_ORDER) |
| 24 | 20 | ||
| 25 | #define STACKFAULT_STACK 0 | 21 | #define STACKFAULT_STACK 0 |
