aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/s390/kernel/dis.c2
-rw-r--r--drivers/char/ipmi/ipmi_watchdog.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c
index dabaf98943d0..a057ebf108a7 100644
--- a/arch/s390/kernel/dis.c
+++ b/arch/s390/kernel/dis.c
@@ -23,6 +23,7 @@
23#include <linux/kallsyms.h> 23#include <linux/kallsyms.h>
24#include <linux/reboot.h> 24#include <linux/reboot.h>
25#include <linux/kprobes.h> 25#include <linux/kprobes.h>
26#include <linux/kdebug.h>
26 27
27#include <asm/system.h> 28#include <asm/system.h>
28#include <asm/uaccess.h> 29#include <asm/uaccess.h>
@@ -33,7 +34,6 @@
33#include <asm/s390_ext.h> 34#include <asm/s390_ext.h>
34#include <asm/lowcore.h> 35#include <asm/lowcore.h>
35#include <asm/debug.h> 36#include <asm/debug.h>
36#include <asm/kdebug.h>
37 37
38#ifndef CONFIG_64BIT 38#ifndef CONFIG_64BIT
39#define ONELONG "%08lx: " 39#define ONELONG "%08lx: "
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index b6a972ed5bb3..147c12047cf3 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -61,7 +61,6 @@
61 how it will work. So in the unlikely event that another 61 how it will work. So in the unlikely event that another
62 architecture supports this, we can figure out a good generic 62 architecture supports this, we can figure out a good generic
63 mechanism for it at that time. */ 63 mechanism for it at that time. */
64#include <asm/kdebug.h>
65#define HAVE_DIE_NMI_POST 64#define HAVE_DIE_NMI_POST
66#endif 65#endif
67 66