diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:25:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:25:47 -0400 |
| commit | 49666145de54b5d6d256442bb1bec03ffae1ac76 (patch) | |
| tree | b79bcaabffa18847cab31efdf798dc5740e8d73b /kernel/panic.c | |
| parent | bcd68373877e74d8ca5039c10dc5d699ba5dc7d0 (diff) | |
| parent | 41ace1861a93f12f70ff10026fb1539fea38fcf8 (diff) | |
Merge branch 'upstream-fixes' into upstream
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 d8a0bca21233..9b8dcfd1ca93 100644 --- a/kernel/panic.c +++ b/kernel/panic.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
| 19 | #include <linux/nmi.h> | 19 | #include <linux/nmi.h> |
| 20 | #include <linux/kexec.h> | 20 | #include <linux/kexec.h> |
| 21 | #include <linux/debug_locks.h> | ||
| 21 | 22 | ||
| 22 | int panic_on_oops; | 23 | int panic_on_oops; |
| 23 | int tainted; | 24 | int tainted; |