These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / s390 / char / sclp.c

diff --git a/kernel/drivers/s390/char/sclp.c b/kernel/drivers/s390/char/sclp.c
index 41ba56d..f58bf4c 100644 (file)
--- a/kernel/drivers/s390/char/sclp.c
+++ b/kernel/drivers/s390/char/sclp.c
@@ -53,7 +53,7 @@ static DECLARE_COMPLETION(sclp_request_queue_flushed);
 /* Number of console pages to allocate, used by sclp_con.c and sclp_vt220.c */
 int sclp_console_pages = SCLP_CONSOLE_PAGES;
 /* Flag to indicate if buffer pages are dropped on buffer full condition */
-int sclp_console_drop = 0;
+int sclp_console_drop = 1;
 /* Number of times the console dropped buffer pages */
 unsigned long sclp_console_full;
 
@@ -79,8 +79,8 @@ static int __init sclp_setup_console_drop(char *str)
        int drop, rc;
 
        rc = kstrtoint(str, 0, &drop);
-       if (!rc && drop)
-               sclp_console_drop = 1;
+       if (!rc)
+               sclp_console_drop = drop;
        return 1;
 }
 
@@ -665,7 +665,7 @@ sclp_state_change_cb(struct evbuf_header *evbuf)
                sclp_send_mask = scbuf->sclp_send_mask;
        spin_unlock_irqrestore(&sclp_lock, flags);
        if (scbuf->validity_sclp_active_facility_mask)
-               sclp_facilities = scbuf->sclp_active_facility_mask;
+               sclp.facilities = scbuf->sclp_active_facility_mask;
        sclp_dispatch_state_change();
 }