From 3eed4a065bcbbdc531f52b777dfc503e80329953 Mon Sep 17 00:00:00 2001
From: yangsheng <yangsheng>
Date: Thu, 28 May 2009 13:44:14 +0000
Subject: [PATCH] Branch HEAD b=18668

i=adilger, johann

Remove the 8kstack patch.
---
 lustre/autoconf/lustre-core.m4                     | 17 +++++++++++++++++
 lustre/kernel_patches/series/2.6-rhel5.series      |  1 -
 lustre/kernel_patches/series/2.6.22-vanilla.series |  1 -
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 0c07de1..cbf9877 100644
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -1544,6 +1544,22 @@ LB_LINUX_TRY_COMPILE([
 ])
 ])
 
+# Ensure stack size big than 8k in Lustre server
+AC_DEFUN([LC_STACK_SIZE],
+[AC_MSG_CHECKING([stack size big than 8k])
+LB_LINUX_TRY_COMPILE([
+	#include <linux/thread_info.h>
+],[
+        #if THREAD_SIZE < 8192
+        #error "stack size < 8192"
+        #endif
+],[
+        AC_MSG_RESULT(yes)
+],[
+        AC_MSG_ERROR([Lustre requires that Linux is configured with at least a 8KB stack.])
+])
+])
+
 #
 # LC_PROG_LINUX
 #
@@ -1553,6 +1569,7 @@ AC_DEFUN([LC_PROG_LINUX],
          [LC_LUSTRE_VERSION_H
          if test x$enable_server = xyes ; then
              AC_DEFINE(HAVE_SERVER_SUPPORT, 1, [support server])
+             LC_STACK_SIZE
              LC_CONFIG_BACKINGFS
          fi
          LC_CONFIG_PINGER
diff --git a/lustre/kernel_patches/series/2.6-rhel5.series b/lustre/kernel_patches/series/2.6-rhel5.series
index 906c06e..22ce7320 100644
--- a/lustre/kernel_patches/series/2.6-rhel5.series
+++ b/lustre/kernel_patches/series/2.6-rhel5.series
@@ -5,7 +5,6 @@ jbd-jcberr-2.6.18-vanilla.patch
 export_symbols-2.6.18-vanilla.patch
 dev_read_only-2.6.18-vanilla.patch
 export-2.6.18-vanilla.patch
-8kstack-2.6.12.patch
 export-show_task-2.6.18-vanilla.patch
 sd_iostats-2.6-rhel5.patch
 export_symbol_numa-2.6-fc5.patch
diff --git a/lustre/kernel_patches/series/2.6.22-vanilla.series b/lustre/kernel_patches/series/2.6.22-vanilla.series
index 12db55e..9f45f51 100644
--- a/lustre/kernel_patches/series/2.6.22-vanilla.series
+++ b/lustre/kernel_patches/series/2.6.22-vanilla.series
@@ -8,7 +8,6 @@ export_symbols-2.6.22-vanilla.patch
 export-nr_free_buffer_pages.patch
 dev_read_only-2.6.22-vanilla.patch 
 export-2.6.18-vanilla.patch 
-8kstack-2.6.12.patch
 export-show_task-2.6.18-vanilla.patch 
 sd_iostats-2.6.22-vanilla.patch
 quota-large-limits-rhel5.patch
-- 
1.8.3.1