Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[firefly-linux-kernel-4.4.55.git] / drivers / tty / sysrq.c

diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index ed3e258f4ee9ff91967a97ce1a41b355a6ebfbf6..5381a728d23e773af0e1ebe2869e01bf98757244 100644 (file)
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -358,8 +358,7 @@ static void moom_callback(struct work_struct *ignored)
                .zonelist = node_zonelist(first_memory_node, gfp_mask),
                .nodemask = NULL,
                .gfp_mask = gfp_mask,
-               .order = 0,
-               .force_kill = true,
+               .order = -1,
        };
 
        mutex_lock(&oom_lock);
@@ -1004,6 +1003,10 @@ static const struct kernel_param_ops param_ops_sysrq_reset_seq = {
 #define param_check_sysrq_reset_seq(name, p)   \
        __param_check(name, p, unsigned short)
 
+/*
+ * not really modular, but the easiest way to keep compat with existing
+ * bootargs behaviour is to continue using module_param here.
+ */
 module_param_array_named(reset_seq, sysrq_reset_seq, sysrq_reset_seq,
                         &sysrq_reset_seq_len, 0644);
 
@@ -1120,4 +1123,4 @@ static int __init sysrq_init(void)
 
        return 0;
 }
-module_init(sysrq_init);
+device_initcall(sysrq_init);