s390/sclp: move sclp_facilities into "struct sclp"
Let's also move the facilities into the sclp struct, so we can avoid
another separate external variable.
Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
diff --git a/drivers/s390/char/sclp_early.c b/drivers/s390/char/sclp_early.c
index 914ff62..d7f696d 100644
--- a/drivers/s390/char/sclp_early.c
+++ b/drivers/s390/char/sclp_early.c
@@ -52,7 +52,6 @@
struct sclp_info sclp;
EXPORT_SYMBOL(sclp);
-u64 sclp_facilities;
static int __init sclp_cmd_sync_early(sclp_cmdw_t cmd, void *sccb)
{
@@ -105,7 +104,7 @@
if (sclp_read_info_early(sccb))
return;
- sclp_facilities = sccb->facilities;
+ sclp.facilities = sccb->facilities;
sclp.has_sprp = !!(sccb->fac84 & 0x02);
sclp.has_cpu_type = !!(sccb->fac84 & 0x01);
if (sccb->fac85 & 0x02)