diff -urN linux-2.6.22/arch/i386/defconfig linux-2.6.22-16kstacks/arch/i386/defconfig
--- linux-2.6.22/arch/i386/defconfig	2007-07-08 19:32:17.000000000 -0400
+++ linux-2.6.22-16kstacks/arch/i386/defconfig	2007-07-17 13:24:28.000000000 -0400
@@ -1454,6 +1454,7 @@
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_RODATA is not set
 # CONFIG_4KSTACKS is not set
+CONFIG_16KSTACKS=y
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_MPPARSE=y
 CONFIG_DOUBLEFAULT=y
diff -urN linux-2.6.22/arch/i386/Kconfig.debug linux-2.6.22-16kstacks/arch/i386/Kconfig.debug
--- linux-2.6.22/arch/i386/Kconfig.debug	2007-07-08 19:32:17.000000000 -0400
+++ linux-2.6.22-16kstacks/arch/i386/Kconfig.debug	2007-07-17 13:24:28.000000000 -0400
@@ -66,6 +66,14 @@
 	  on the VM subsystem for higher order allocations. This option
 	  will also use IRQ stacks to compensate for the reduced stackspace.
 
+config 16KSTACKS
+	bool "Use 16Kb for kernel stacks instead of 8Kb"
+	depends on DEBUG_KERNEL
+	help
+	  If you say Y here the kernel will use a 16Kb stacksize for the
+	  kernel stack attached to each process/thread. This option
+	  will also use IRQ stacks to compensate for the reduced stackspace.
+
 config X86_FIND_SMP_CONFIG
 	bool
 	depends on X86_LOCAL_APIC || X86_VOYAGER
diff -urN linux-2.6.22/arch/i386/kernel/irq.c linux-2.6.22-16kstacks/arch/i386/kernel/irq.c
--- linux-2.6.22/arch/i386/kernel/irq.c	2007-07-08 19:32:17.000000000 -0400
+++ linux-2.6.22-16kstacks/arch/i386/kernel/irq.c	2007-07-17 13:24:28.000000000 -0400
@@ -50,7 +50,7 @@
 #endif
 }
 
-#ifdef CONFIG_4KSTACKS
+#if defined(CONFIG_4KSTACKS) || defined(CONFIG_16KSTACKS)
 /*
  * per-CPU IRQ handling contexts (thread information and stack)
  */
@@ -74,7 +74,7 @@
 	/* high bit used in ret_from_ code */
 	int irq = ~regs->orig_eax;
 	struct irq_desc *desc = irq_desc + irq;
-#ifdef CONFIG_4KSTACKS
+#if defined(CONFIG_4KSTACKS) || defined(CONFIG_16KSTACKS)
 	union irq_ctx *curctx, *irqctx;
 	u32 *isp;
 #endif
@@ -102,7 +102,7 @@
 	}
 #endif
 
-#ifdef CONFIG_4KSTACKS
+#if defined(CONFIG_4KSTACKS) || defined(CONFIG_16KSTACKS)
 
 	curctx = (union irq_ctx *) current_thread_info();
 	irqctx = hardirq_ctx[smp_processor_id()];
@@ -147,7 +147,7 @@
 	return 1;
 }
 
-#ifdef CONFIG_4KSTACKS
+#if defined(CONFIG_4KSTACKS) || defined(CONFIG_16KSTACKS)
 
 /*
  * These should really be __section__(".bss.page_aligned") as well, but
diff -urN linux-2.6.22/include/asm-i386/irq.h linux-2.6.22-16kstacks/include/asm-i386/irq.h
--- linux-2.6.22/include/asm-i386/irq.h	2007-07-08 19:32:17.000000000 -0400
+++ linux-2.6.22-16kstacks/include/asm-i386/irq.h	2007-07-17 13:24:28.000000000 -0400
@@ -24,7 +24,7 @@
 # define ARCH_HAS_NMI_WATCHDOG		/* See include/linux/nmi.h */
 #endif
 
-#ifdef CONFIG_4KSTACKS
+#if defined(CONFIG_4KSTACKS) || defined(CONFIG_16KSTACKS)
   extern void irq_ctx_init(int cpu);
   extern void irq_ctx_exit(int cpu);
 # define __ARCH_HAS_DO_SOFTIRQ
diff -urN linux-2.6.22/include/asm-i386/module.h linux-2.6.22-16kstacks/include/asm-i386/module.h
--- linux-2.6.22/include/asm-i386/module.h	2007-07-08 19:32:17.000000000 -0400
+++ linux-2.6.22-16kstacks/include/asm-i386/module.h	2007-07-17 13:24:28.000000000 -0400
@@ -67,8 +67,12 @@
 #ifdef CONFIG_4KSTACKS
 #define MODULE_STACKSIZE "4KSTACKS "
 #else
+#ifdef CONFIG_16KSTACKS
+#define MODULE_STACKSIZE "16KSTACKS "
+#else
 #define MODULE_STACKSIZE ""
 #endif
+#endif
 
 #define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE
 
diff -urN linux-2.6.22/include/asm-i386/thread_info.h linux-2.6.22-16kstacks/include/asm-i386/thread_info.h
--- linux-2.6.22/include/asm-i386/thread_info.h	2007-07-08 19:32:17.000000000 -0400
+++ linux-2.6.22-16kstacks/include/asm-i386/thread_info.h	2007-07-17 13:24:28.000000000 -0400
@@ -56,8 +56,12 @@
 #ifdef CONFIG_4KSTACKS
 #define THREAD_SIZE            (4096)
 #else
+#ifdef CONFIG_16KSTACKS
+#define THREAD_SIZE		(16384)
+#else
 #define THREAD_SIZE		(8192)
 #endif
+#endif
 
 #define STACK_WARN             (THREAD_SIZE/8)
 /*