Merge branch 'master' of git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test

18 files changed, 28 insertions, 20 deletions

diff --git a/cases/soft-inj/panic/data/fatal b/cases/soft-inj/panic/data/fatal
index a749a27..b24942b 100644
--- a/cases/soft-inj/panic/data/fatal
+++ b/cases/soft-inj/panic/data/fatal
@@ -3,6 +3,6 @@
 # don't try casually
 CPU 0 BANK 4
 MCGSTATUS MCIP
-STATUS FATAL
+STATUS FATAL S
 RIP 12343434
 MISC 11
diff --git a/cases/soft-inj/panic/data/fatal_eipv b/cases/soft-inj/panic/data/fatal_eipv
index 0208626..7e6a93a 100644
--- a/cases/soft-inj/panic/data/fatal_eipv
+++ b/cases/soft-inj/panic/data/fatal_eipv
@@ -3,5 +3,5 @@
 # don't try casually
 CPU 1 BANK 4
 MCGSTATUS MCIP EIPV
-STATUS FATAL
+STATUS FATAL S
 RIP 0x10:0x12343434
diff --git a/cases/soft-inj/panic/data/fatal_irq b/cases/soft-inj/panic/data/fatal_irq
index 2b1684d..63ef36b 100644
--- a/cases/soft-inj/panic/data/fatal_irq
+++ b/cases/soft-inj/panic/data/fatal_irq
@@ -3,7 +3,7 @@
 # don't try casually
 CPU 0 BANK 4
 MCGSTATUS MCIP
-STATUS FATAL
+STATUS FATAL S
 RIP 12343434
 MISC 11
 IN_IRQ
diff --git a/cases/soft-inj/panic/data/fatal_no_en b/cases/soft-inj/panic/data/fatal_no_en
index 03a24d1..12da496 100644
--- a/cases/soft-inj/panic/data/fatal_no_en
+++ b/cases/soft-inj/panic/data/fatal_no_en
@@ -3,6 +3,6 @@
 # don't try casually
 CPU 0 BANK 4
 MCGSTATUS MCIP
-STATUS UC VAL PCC
+STATUS UC VAL PCC S
 RIP 0x10:12343434
 MISC 11
diff --git a/cases/soft-inj/panic/data/fatal_over b/cases/soft-inj/panic/data/fatal_over
index 783c156..6f44419 100644
--- a/cases/soft-inj/panic/data/fatal_over
+++ b/cases/soft-inj/panic/data/fatal_over
@@ -3,7 +3,7 @@
 # don't try casually
 CPU 0 BANK 4
 MCGSTATUS MCIP
-STATUS FATAL OVER
+STATUS FATAL OVER S
 RIP 12343434
 MISC 11
 
diff --git a/cases/soft-inj/panic/data/fatal_ripv b/cases/soft-inj/panic/data/fatal_ripv
index e0af684..1978747 100644
--- a/cases/soft-inj/panic/data/fatal_ripv
+++ b/cases/soft-inj/panic/data/fatal_ripv
@@ -3,5 +3,5 @@
 # don't try casually
 CPU 1 BANK 4
 MCGSTATUS MCIP RIPV
-STATUS FATAL
+STATUS FATAL S
 RIP 0x10:0x12343434
diff --git a/cases/soft-inj/panic/data/fatal_timeout b/cases/soft-inj/panic/data/fatal_timeout
index 3083bd6..c910141 100644
--- a/cases/soft-inj/panic/data/fatal_timeout
+++ b/cases/soft-inj/panic/data/fatal_timeout
@@ -3,7 +3,7 @@
 # don't try casually
 CPU 0 BANK 4
 MCGSTATUS MCIP
-STATUS FATAL
+STATUS FATAL S
 RIP 0x10:0x12343434
 MISC 0xb
 NOBROADCAST
diff --git a/cases/soft-inj/panic/data/fatal_timeout_ripv b/cases/soft-inj/panic/data/fatal_timeout_ripv
index 623d563..0e34e00 100644
--- a/cases/soft-inj/panic/data/fatal_timeout_ripv
+++ b/cases/soft-inj/panic/data/fatal_timeout_ripv
@@ -3,7 +3,7 @@
 # don't try casually
 CPU 0 BANK 4
 MCGSTATUS MCIP RIPV
-STATUS FATAL
+STATUS FATAL S
 RIP 0x10:0x12343434
 MISC 0xb
 NOBROADCAST
diff --git a/cases/soft-inj/panic/data/fatal_userspace b/cases/soft-inj/panic/data/fatal_userspace
index 56c1f2e..3b8fe7f 100644
--- a/cases/soft-inj/panic/data/fatal_userspace
+++ b/cases/soft-inj/panic/data/fatal_userspace
@@ -3,5 +3,5 @@
 # don't try casually
 CPU 1 BANK 4
 MCGSTATUS MCIP EIPV
-STATUS FATAL
+STATUS FATAL S
 RIP 0x73:0x12343434
diff --git a/cases/soft-inj/panic_npcc/data/fatal_severity b/cases/soft-inj/panic_npcc/data/fatal_severity
index f46f222..4dfd8ed 100644
--- a/cases/soft-inj/panic_npcc/data/fatal_severity
+++ b/cases/soft-inj/panic_npcc/data/fatal_severity
@@ -12,5 +12,5 @@ HOLD
 
 CPU 1 BANK 1
 MCGSTATUS MCIP
-STATUS FATAL
+STATUS FATAL S
 RIP 0x10:0xabcdcdcd
diff --git a/cases/soft-inj/panic_npcc/data/uc_no_eripv b/cases/soft-inj/panic_npcc/data/uc_no_eripv
index a317a1d..91f3b17 100644
--- a/cases/soft-inj/panic_npcc/data/uc_no_eripv
+++ b/cases/soft-inj/panic_npcc/data/uc_no_eripv
@@ -1,5 +1,5 @@
 CPU 0 BANK 1
-STATUS UNCORRECTED
+STATUS UNCORRECTED S
 MCGSTATUS MCIP
 ADDR 0x1234
 RIP 0x10:0xdeadbabe
diff --git a/cases/soft-inj/panic_npcc/data/uc_no_eripv_timeout b/cases/soft-inj/panic_npcc/data/uc_no_eripv_timeout
index 9fa29de..23cd098 100644
--- a/cases/soft-inj/panic_npcc/data/uc_no_eripv_timeout
+++ b/cases/soft-inj/panic_npcc/data/uc_no_eripv_timeout
@@ -1,5 +1,5 @@
 CPU 0 BANK 1
-STATUS UNCORRECTED
+STATUS UNCORRECTED S
 MCGSTATUS MCIP
 ADDR 0x1234
 RIP 0x10:0xdeadbabe
diff --git a/cases/soft-inj/panic_npcc/data/uc_no_mcip b/cases/soft-inj/panic_npcc/data/uc_no_mcip
index 51eeba4..c4ac81a 100644
--- a/cases/soft-inj/panic_npcc/data/uc_no_mcip
+++ b/cases/soft-inj/panic_npcc/data/uc_no_mcip
@@ -1,4 +1,4 @@
 CPU 0 BANK 1
-STATUS UNCORRECTED
+STATUS UNCORRECTED S
 ADDR 0x1234
 RIP 0x10:0xdeadbabe
diff --git a/cases/soft-inj/panic_npcc/data/uc_no_mcip_timeout b/cases/soft-inj/panic_npcc/data/uc_no_mcip_timeout
index 0126722..3f31a4f 100644
--- a/cases/soft-inj/panic_npcc/data/uc_no_mcip_timeout
+++ b/cases/soft-inj/panic_npcc/data/uc_no_mcip_timeout
@@ -1,5 +1,5 @@
 CPU 0 BANK 1
-STATUS UNCORRECTED
+STATUS UNCORRECTED S
 ADDR 0x1234
 RIP 0x10:0xdeadbabe
 NOBROADCAST
diff --git a/cases/soft-inj/panic_npcc/data/uncorrected b/cases/soft-inj/panic_npcc/data/uncorrected
index c270b29..3917b76 100644
--- a/cases/soft-inj/panic_npcc/data/uncorrected
+++ b/cases/soft-inj/panic_npcc/data/uncorrected
@@ -1,6 +1,6 @@
 # this should just kill the process
 CPU 0 BANK 2
-STATUS UNCORRECTED
+STATUS UNCORRECTED S
 MCGSTATUS EIPV MCIP
 ADDR 0x1234
 RIP 0x10:0xdeadbabe
diff --git a/cases/soft-inj/panic_npcc/data/uncorrected_timeout b/cases/soft-inj/panic_npcc/data/uncorrected_timeout
index 6e627a7..4a469cd 100644
--- a/cases/soft-inj/panic_npcc/data/uncorrected_timeout
+++ b/cases/soft-inj/panic_npcc/data/uncorrected_timeout
@@ -1,6 +1,6 @@
 # this should just kill the process
 CPU 0 BANK 2
-STATUS UNCORRECTED
+STATUS UNCORRECTED S
 MCGSTATUS EIPV MCIP
 ADDR 0x1234
 RIP 0x10:0xdeadbabe
diff --git a/cases/soft-inj/panic_npcc/data/unknown b/cases/soft-inj/panic_npcc/data/unknown
index 007a980..25ecb5b 100644
--- a/cases/soft-inj/panic_npcc/data/unknown
+++ b/cases/soft-inj/panic_npcc/data/unknown
@@ -1,3 +1,3 @@
 # this should just kill the process
 CPU 0 BANK 2
-STATUS UC
+STATUS UC S
diff --git a/drivers/kdump/driver.sh b/drivers/kdump/driver.sh
index f5982ec..b072312 100755
--- a/drivers/kdump/driver.sh
+++ b/drivers/kdump/driver.sh
@@ -63,16 +63,24 @@ EOF
 setup_kdump ()
 {
     echo "Start kdump daemon."
-    /etc/init.d/kdump restart
+
+    if [ -f /etc/init.d/kdump ]; then
+	    daemon=kdump
+    else
+	    #SLE11
+	    daemon=boot.kdump
+    fi
+
+    /etc/init.d/"${daemon}" restart
 
     echo "Enable kdump daemon by default."
     # Red Hat and SUSE.
     if [ -x "/sbin/chkconfig" ]; then
-        /sbin/chkconfig kdump on
+        /sbin/chkconfig "${daemon}" on
 
     # Debian and Ubuntu.
     elif [ -x "/sbin/update-rc.d" ]; then
-        /sbin/update-rc.d kdump defaults
+        /sbin/update-rc.d "${daemon}" defaults
     fi
 }