diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
| commit | f0eef25339f92f7cd4aeea23d9ae97987a5a1e82 (patch) | |
| tree | 2472e94d39f43a9580a6d2d5d92de0b749023263 /fs/xfs/support/debug.c | |
| parent | 0cfea5dd98205f2fa318836da664a7d7df1afbc1 (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Diffstat (limited to 'fs/xfs/support/debug.c')
| -rw-r--r-- | fs/xfs/support/debug.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/xfs/support/debug.c b/fs/xfs/support/debug.c index 36fbeccdc72..4363512d2f9 100644 --- a/fs/xfs/support/debug.c +++ b/fs/xfs/support/debug.c @@ -15,11 +15,9 @@ * along with this program; if not, write the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <xfs.h> #include "debug.h" #include "spin.h" -#include <asm/page.h> -#include <linux/sched.h> -#include <linux/kernel.h> static char message[256]; /* keep it off the stack */ static DEFINE_SPINLOCK(xfs_err_lock); @@ -53,8 +51,7 @@ cmn_err(register int level, char *fmt, ...) va_end(ap); spin_unlock_irqrestore(&xfs_err_lock,flags); - if (level == CE_PANIC) - BUG(); + BUG_ON(level == CE_PANIC); } void @@ -72,8 +69,7 @@ icmn_err(register int level, char *fmt, va_list ap) strcat(message, "\n"); spin_unlock_irqrestore(&xfs_err_lock,flags); printk("%s%s", err_level[level], message); - if (level == CE_PANIC) - BUG(); + BUG_ON(level == CE_PANIC); } void |