diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:27:12 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:27:12 -0400 |
commit | d14b50cc60ca465290fcdb3b88e7d5fb684361ed (patch) | |
tree | c4a712123b94cd4c0ab4d8d9d87a7619e9bcb6ba /kernel/panic.c | |
parent | a34b6fc04d58ad72fe0cc74cd448f4551bd2ebaf (diff) | |
parent | ef7d1b244fa6c94fb76d5f787b8629df64ea4046 (diff) | |
download | op-kernel-dev-d14b50cc60ca465290fcdb3b88e7d5fb684361ed.zip op-kernel-dev-d14b50cc60ca465290fcdb3b88e7d5fb684361ed.tar.gz |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'kernel/panic.c')
-rw-r--r-- | kernel/panic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index d8a0bca..9b8dcfd 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -18,6 +18,7 @@ #include <linux/interrupt.h> #include <linux/nmi.h> #include <linux/kexec.h> +#include <linux/debug_locks.h> int panic_on_oops; int tainted; |