diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 37c6d096598..d941bb5fc39 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-04  Yao Qi  <yao@codesourcery.com>
+
+	* gdb.base/disp-step-syscall.exp (disp_step_cross_syscall): Catch error
+	messages for KFAIL.
+
 2012-03-03  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* gdb.ada/arrayidx.exp: Call get_compiler_info.  New variable old_gcc.
diff --git a/gdb/testsuite/gdb.base/disp-step-syscall.exp b/gdb/testsuite/gdb.base/disp-step-syscall.exp
index 486701c7eab..915cb97476b 100644
--- a/gdb/testsuite/gdb.base/disp-step-syscall.exp
+++ b/gdb/testsuite/gdb.base/disp-step-syscall.exp
@@ -127,6 +127,10 @@ proc disp_step_cross_syscall { syscall } { with_test_prefix "$syscall" {
 	    fail $test
 	    return
 	}
+	-re "\\\[Inferior .* exited normally\\\].*\r\n$gdb_prompt $" {
+	    fail $test
+	    return
+	}
 	-re "\r\n$gdb_prompt $" {
 	    pass $test
 	}