LU-402 Update to rhel6.1 kernel 2.6.32-131.2.1.el6

Change-Id: Ib16f8db85b9188f7a9f5982e2914eb647d4b1f07
Signed-off-by: Oleg Drokin <green@whamcloud.com>
Reviewed-on: http://review.whamcloud.com/933
Reviewed-by: Johann Lombardi <johann@whamcloud.com>
Tested-by: Johann Lombardi <johann@whamcloud.com>

diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4
index 7d673c2..bdc414f 100644 (file)
--- a/build/autoconf/lustre-build-linux.m4
+++ b/build/autoconf/lustre-build-linux.m4
@@ -373,7 +373,9 @@ _ACEOF
 # LB_LANG_PROGRAM(C)([PROLOGUE], [BODY])
 # --------------------------------------
 m4_define([LB_LANG_PROGRAM],
-[$1
+[
+#include <linux/kernel.h>
+$1
 int
 main (void)
 {

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index ba5af00..6b037c3 100644 (file)
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -1329,6 +1329,21 @@ AC_DEFUN([LN_FUNC_DUMP_TRACE],
                AC_MSG_RESULT(no)
        ],[
        ])
+       AC_MSG_CHECKING([dump_trace want address])
+       LB_LINUX_TRY_COMPILE([
+               struct task_struct;
+               struct pt_regs;
+               #include <asm/stacktrace.h>
+       ],[
+               dump_trace(NULL, NULL, NULL, 0, NULL, NULL);
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_DUMP_TRACE_ADDRESS, 1,
+                         [dump_trace want address argument])
+       ],[
+               AC_MSG_RESULT(no)
+       ],[
+       ])
 EXTRA_KCFLAGS="$tmp_flags"
 ])
 ])

diff --git a/lnet/libcfs/linux/linux-debug.c b/lnet/libcfs/linux/linux-debug.c
index 7ff51d1..4ea752d 100644 (file)
--- a/lnet/libcfs/linux/linux-debug.c
+++ b/lnet/libcfs/linux/linux-debug.c
@@ -278,9 +278,9 @@ static DUMP_TRACE_CONST struct stacktrace_ops print_trace_ops = {
         /* show_trace_log_lvl() */
        printk("\nCall Trace:\n");
        dump_trace(tsk, NULL, NULL,
-#ifdef HAVE_TRACE_ADDRESS_RELIABLE
+#ifdef HAVE_DUMP_TRACE_ADDRESS
                    0,
-#endif /* HAVE_TRACE_ADDRESS_RELIABLE */
+#endif /* HAVE_DUMP_TRACE_ADDRESS */
                    &print_trace_ops, NULL);
        printk("\n");
 #elif defined(HAVE_SCHED_SHOW_TASK)

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 7866522..ab391f1 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -2,17 +2,17 @@
        * version 1.8.6-wc
        * Support for kernels:
          2.6.18-238.12.1.el5 (RHEL 5)
-         2.6.32-71.18.2.el6 (RHEL 6) - patchless client only
+         2.6.32-131.2.1.el6 (RHEL 6) - patchless client only
        * Recommended e2fsprogs version: 1.41.90.wc2
        * Use ext4-based ldiskfs as default for RHEL5
        * Add support for 24TB LUN (RHEL5 server only)
 
 Severity   : enhancement
-Jira       : LU-228
-Description: Add support for RHEL5.6 (2.6.18-238.9.1.el5)
+Jira       : LU-228, LU-403
+Description: Add support for RHEL5.6 (2.6.18-238.12.1.el5)
 
 Severity   : enhancement
-Jira       : LU-62, LU-73
+Jira       : LU-62, LU-73, LU-402
 Description: Add RHEL6 client support
 
 Severity   : major

diff --git a/lustre/kernel_patches/targets/2.6-rhel6.target.in b/lustre/kernel_patches/targets/2.6-rhel6.target.in
index 0c1d2b5..9dae9ec 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-rhel6.target.in
+++ b/lustre/kernel_patches/targets/2.6-rhel6.target.in
@@ -1,5 +1,5 @@
 lnxmaj="2.6.32"
-lnxrel="71.18.2.el6"
+lnxrel="131.2.1.el6"
 
 KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm
 EXTRA_VERSION=${lnxrel}_lustre.@VERSION@

diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index 2e37924..f50875c 100644 (file)
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -1,9 +1,7 @@
 SERIES                VERSION                  COMMENT
 
 SUPPORTED KERNELS:
-2.6-rhel5             RHEL5: 2.6.18-238.9.1.el5
-2.6-sles10            SLES10: 2.6.16.60-0.69.1
-2.6-sles11            SLES11: 2.6.32.19-0.2.1
+2.6-rhel5             RHEL5: 2.6.18-238.12.1.el5
 
 CLIENT SUPPORT FOR UNPATCHED KERNELS:
                    kernel.org 2.6.16-2.6.32