staging: unisys: fix kdump support

The s-Par drivers used to be out-of-tree, so they needed a parameter to
let them know we were going into a dump. This patch removes that code
and uses the built-in kernel function instead.

Reviewed-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/visorchipset/globals.h b/drivers/staging/unisys/visorchipset/globals.h
index f76e498a36b5f00a871acca8d7df38cc372075be..36b21ec3b120cd2f2a9f077c922506658919be7a 100644 (file)
--- a/drivers/staging/unisys/visorchipset/globals.h
+++ b/drivers/staging/unisys/visorchipset/globals.h
@@ -36,7 +36,6 @@ extern int visorchipset_serverregwait;
 extern int visorchipset_clientregwait;
 extern int visorchipset_testteardown;
 extern int visorchipset_disable_controlvm;
-extern int visorchipset_crash_kernel;
 extern int visorchipset_holdchipsetready;
 
 #endif

diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index f2663d2c753003cdb62171e176baa61b2051cee3..899bf684cf00675c21dfc5785549a67486ff3a21 100644 (file)
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -30,6 +30,7 @@
 #include <linux/netdevice.h>
 #include <linux/platform_device.h>
 #include <linux/uuid.h>
+#include <linux/crash_dump.h>
 
 #define CURRENT_FILE_PC VISOR_CHIPSET_PC_visorchipset_main_c
 #define TEST_VNIC_PHYSITF "eth0"       /* physical network itf for
@@ -2207,7 +2208,7 @@ visorchipset_init(void)
        }
        if (!visorchipset_disable_controlvm) {
                /* if booting in a crash kernel */
-               if (visorchipset_crash_kernel)
+               if (is_kdump_kernel())
                        INIT_DELAYED_WORK(&periodic_controlvm_work,
                                          setup_crash_devices_work_queue);
                else
@@ -2315,10 +2316,6 @@ module_param_named(disable_controlvm, visorchipset_disable_controlvm, int,
 MODULE_PARM_DESC(visorchipset_disable_controlvm,
                 "1 to disable polling of controlVm channel");
 int visorchipset_disable_controlvm = 0;        /* default is off */
-module_param_named(crash_kernel, visorchipset_crash_kernel, int, S_IRUGO);
-MODULE_PARM_DESC(visorchipset_crash_kernel,
-                "1 means we are running in crash kernel");
-int visorchipset_crash_kernel = 0; /* default is running in non-crash kernel */
 module_param_named(holdchipsetready, visorchipset_holdchipsetready,
                   int, S_IRUGO);
 MODULE_PARM_DESC(visorchipset_holdchipsetready,