[XFS] Merge in trivial changes, sync up headers with userspace

equivalents.

SGI-PV: 907752
SGI-Modid: xfs-linux-melb:xfs-kern:24961a

Signed-off-by: Nathan Scott <nathans@sgi.com>

1 files changed, 0 insertions, 1 deletions

diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
index d7b6b5d16704..2a21c5024017 100644
--- a/fs/xfs/xfs_error.c
+++ b/fs/xfs/xfs_error.c
@@ -54,7 +54,6 @@ xfs_error_trap(int e)
                 if (e != xfs_etrap[i])
                         continue;
                 cmn_err(CE_NOTE, "xfs_error_trap: error %d", e);
-                debug_stop_all_cpus((void *)-1LL);
                 BUG();
                 break;
         }