diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 67ce1d2bd69..35e555b71a5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-26  Jeff Law  <law@redhat.com>
+
+	PR rtl-optimization/47464
+	* df-problems.c (can_move_insn_across): Use may_trap_or_fault_p
+	rather than may_trap_p as needed.
+
 2011-01-26  DJ Delorie  <dj@redhat.com>
 
 	PR rtl-optimization/46878
diff --git a/gcc/df-problems.c b/gcc/df-problems.c
index d9fbc85882c..729cad5f023 100644
--- a/gcc/df-problems.c
+++ b/gcc/df-problems.c
@@ -3960,7 +3960,7 @@ can_move_insns_across (rtx from, rtx to, rtx across_from, rtx across_to,
 	break;
       if (NONDEBUG_INSN_P (insn))
 	{
-	  if (may_trap_p (PATTERN (insn))
+	  if (may_trap_or_fault_p (PATTERN (insn))
 	      && (trapping_insns_in_across || other_branch_live != NULL))
 	    break;