s390: Convert MACHINE_IS_[LPAR|VM|KVM], etc, machine_is_[lpar|vm|kvm]()

Move machine type detection to the decompressor and use static branches
to implement and use machine_is_[lpar|vm|kvm]() instead of a runtime check
via MACHINE_IS_[LPAR|VM|KVM].

Reviewed-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/s390/boot/startup.c b/arch/s390/boot/startup.c
index 41dda285ee2cca6e225d6c0908fadea8778e6efb..9c4b2b317af26c0b537381a761697eca509fd225 100644 (file)
--- a/arch/s390/boot/startup.c
+++ b/arch/s390/boot/startup.c
@@ -8,6 +8,7 @@
 #include <asm/sections.h>
 #include <asm/maccess.h>
 #include <asm/machine.h>
+#include <asm/sysinfo.h>
 #include <asm/cpu_mf.h>
 #include <asm/setup.h>
 #include <asm/timex.h>
@@ -49,6 +50,27 @@ void error(char *x)
        disabled_wait();
 }
 
+static char sysinfo_page[PAGE_SIZE] __aligned(PAGE_SIZE);
+
+static void detect_machine_type(void)
+{
+       struct sysinfo_3_2_2 *vmms = (struct sysinfo_3_2_2 *)&sysinfo_page;
+
+       /* Check current-configuration-level */
+       if (stsi(NULL, 0, 0, 0) <= 2) {
+               set_machine_feature(MFEATURE_LPAR);
+               return;
+       }
+       /* Get virtual-machine cpu information. */
+       if (stsi(vmms, 3, 2, 2) || !vmms->count)
+               return;
+       /* Detect known hypervisors */
+       if (!memcmp(vmms->vm[0].cpi, "\xd2\xe5\xd4", 3))
+               set_machine_feature(MFEATURE_KVM);
+       else if (!memcmp(vmms->vm[0].cpi, "\xa9\x61\xe5\xd4", 4))
+               set_machine_feature(MFEATURE_VM);
+}
+
 static void detect_diag9c(void)
 {
        unsigned long reg1, reg2;
@@ -520,6 +542,7 @@ void startup_kernel(void)
        sclp_early_detect_machine_features();
        detect_facilities();
        detect_diag9c();
+       detect_machine_type();
        cmma_init();
        sanitize_prot_virt_host();
        max_physmem_end = detect_max_physmem_end();

diff --git a/arch/s390/hypfs/hypfs_diag0c.c b/arch/s390/hypfs/hypfs_diag0c.c
index 4131f0daa5ead9ace2eae667fe280c830f9d9be6..61220e717af0e4cea64ee0974abab2993ca4a0a1 100644 (file)
--- a/arch/s390/hypfs/hypfs_diag0c.c
+++ b/arch/s390/hypfs/hypfs_diag0c.c
@@ -9,6 +9,7 @@
 
 #include <linux/slab.h>
 #include <linux/cpu.h>
+#include <asm/machine.h>
 #include <asm/diag.h>
 #include <asm/hypfs.h>
 #include "hypfs.h"
@@ -107,7 +108,7 @@ static struct hypfs_dbfs_file dbfs_file_0c = {
  */
 int __init hypfs_diag0c_init(void)
 {
-       if (!MACHINE_IS_VM)
+       if (!machine_is_vm())
                return 0;
        hypfs_dbfs_create_file(&dbfs_file_0c);
        return 0;
@@ -118,7 +119,7 @@ int __init hypfs_diag0c_init(void)
  */
 void hypfs_diag0c_exit(void)
 {
-       if (!MACHINE_IS_VM)
+       if (!machine_is_vm())
                return;
        hypfs_dbfs_remove_file(&dbfs_file_0c);
 }

diff --git a/arch/s390/hypfs/hypfs_diag_fs.c b/arch/s390/hypfs/hypfs_diag_fs.c
index 00a6d370a2803253b64d2db28da85e0faa154441..1e17e288cee4d641f4977789e0e6d6d07698da06 100644 (file)
--- a/arch/s390/hypfs/hypfs_diag_fs.c
+++ b/arch/s390/hypfs/hypfs_diag_fs.c
@@ -16,6 +16,7 @@
 #include <linux/string.h>
 #include <linux/vmalloc.h>
 #include <linux/mm.h>
+#include <asm/machine.h>
 #include <asm/diag.h>
 #include <asm/ebcdic.h>
 #include "hypfs_diag.h"
@@ -382,7 +383,7 @@ static void diag224_delete_name_table(void)
 
 int __init __hypfs_diag_fs_init(void)
 {
-       if (MACHINE_IS_LPAR)
+       if (machine_is_lpar())
                return diag224_get_name_table();
        return 0;
 }

diff --git a/arch/s390/hypfs/hypfs_vm.c b/arch/s390/hypfs/hypfs_vm.c
index 3db40ad853e008d206a44804fd63916a45827be9..4db2895e4da339774b837d4216a41e2d19cc9f7c 100644 (file)
--- a/arch/s390/hypfs/hypfs_vm.c
+++ b/arch/s390/hypfs/hypfs_vm.c
@@ -11,6 +11,7 @@
 #include <linux/string.h>
 #include <linux/vmalloc.h>
 #include <asm/extable.h>
+#include <asm/machine.h>
 #include <asm/diag.h>
 #include <asm/ebcdic.h>
 #include <asm/timex.h>
@@ -121,7 +122,7 @@ static struct hypfs_dbfs_file dbfs_file_2fc = {
 
 int hypfs_vm_init(void)
 {
-       if (!MACHINE_IS_VM)
+       if (!machine_is_vm())
                return 0;
        if (diag2fc(0, all_guests, NULL) > 0)
                diag2fc_guest_query = all_guests;
@@ -135,7 +136,7 @@ int hypfs_vm_init(void)
 
 void hypfs_vm_exit(void)
 {
-       if (!MACHINE_IS_VM)
+       if (!machine_is_vm())
                return;
        hypfs_dbfs_remove_file(&dbfs_file_2fc);
 }

diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
index d428635abf08c2b93564dbe25dbc448cecd86b3b..04ea1c03a5ff25a6e2bc5c9af321bc3b4b80acfc 100644 (file)
--- a/arch/s390/hypfs/inode.c
+++ b/arch/s390/hypfs/inode.c
@@ -24,6 +24,7 @@
 #include <linux/kobject.h>
 #include <linux/seq_file.h>
 #include <linux/uio.h>
+#include <asm/machine.h>
 #include <asm/ebcdic.h>
 #include "hypfs.h"
 
@@ -184,7 +185,7 @@ static ssize_t hypfs_write_iter(struct kiocb *iocb, struct iov_iter *from)
                goto out;
        }
        hypfs_delete_tree(sb->s_root);
-       if (MACHINE_IS_VM)
+       if (machine_is_vm())
                rc = hypfs_vm_create_files(sb->s_root);
        else
                rc = hypfs_diag_create_files(sb->s_root);
@@ -273,7 +274,7 @@ static int hypfs_fill_super(struct super_block *sb, struct fs_context *fc)
        sb->s_root = root_dentry = d_make_root(root_inode);
        if (!root_dentry)
                return -ENOMEM;
-       if (MACHINE_IS_VM)
+       if (machine_is_vm())
                rc = hypfs_vm_create_files(root_dentry);
        else
                rc = hypfs_diag_create_files(root_dentry);

diff --git a/arch/s390/include/asm/appldata.h b/arch/s390/include/asm/appldata.h
index a92ebbc7aa7a383d03442ef86f25d844e28c74e5..99b2902c10fdbac0def041dfd116c5c06392acda 100644 (file)
--- a/arch/s390/include/asm/appldata.h
+++ b/arch/s390/include/asm/appldata.h
@@ -9,6 +9,7 @@
 #define _ASM_S390_APPLDATA_H
 
 #include <linux/io.h>
+#include <asm/machine.h>
 #include <asm/diag.h>
 
 #define APPLDATA_START_INTERVAL_REC    0x80
@@ -48,7 +49,7 @@ static inline int appldata_asm(struct appldata_parameter_list *parm_list,
 {
        int ry;
 
-       if (!MACHINE_IS_VM)
+       if (!machine_is_vm())
                return -EOPNOTSUPP;
        parm_list->diag = 0xdc;
        parm_list->function = fn;

diff --git a/arch/s390/include/asm/machine.h b/arch/s390/include/asm/machine.h
index 4a1f1ab1888a2c05ff25fa6432fbd3063d4bfa7e..54478caa52378b6a04c4baaed330330a37d03691 100644 (file)
--- a/arch/s390/include/asm/machine.h
+++ b/arch/s390/include/asm/machine.h
@@ -15,6 +15,9 @@
 #define MFEATURE_TX            4
 #define MFEATURE_ESOP          5
 #define MFEATURE_DIAG9C                6
+#define MFEATURE_VM            7
+#define MFEATURE_KVM           8
+#define MFEATURE_LPAR          9
 
 #ifndef __ASSEMBLY__
 
@@ -88,6 +91,13 @@ DEFINE_MACHINE_HAS_FEATURE(tlb_guest, MFEATURE_TLB_GUEST)
 DEFINE_MACHINE_HAS_FEATURE(tx, MFEATURE_TX)
 DEFINE_MACHINE_HAS_FEATURE(esop, MFEATURE_ESOP)
 DEFINE_MACHINE_HAS_FEATURE(diag9c, MFEATURE_DIAG9C)
+DEFINE_MACHINE_HAS_FEATURE(vm, MFEATURE_VM)
+DEFINE_MACHINE_HAS_FEATURE(kvm, MFEATURE_KVM)
+DEFINE_MACHINE_HAS_FEATURE(lpar, MFEATURE_LPAR)
+
+#define machine_is_vm  machine_has_vm
+#define machine_is_kvm machine_has_kvm
+#define machine_is_lpar        machine_has_lpar
 
 #endif /* __ASSEMBLY__ */
 #endif /* __ASM_S390_MACHINE_H */

diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h
index f465f82a9dcab9912f52b3167bb03d48a7e7ec35..031e881b4d881d7a1594a9621d855b3bdbc5ace1 100644 (file)
--- a/arch/s390/include/asm/setup.h
+++ b/arch/s390/include/asm/setup.h
@@ -13,13 +13,6 @@
 #define PARMAREA               0x10400
 
 #define COMMAND_LINE_SIZE CONFIG_COMMAND_LINE_SIZE
-/*
- * Machine features detected in early.c
- */
-
-#define MACHINE_FLAG_VM                BIT(0)
-#define MACHINE_FLAG_KVM       BIT(1)
-#define MACHINE_FLAG_LPAR      BIT(2)
 
 #define LPP_MAGIC              BIT(31)
 #define LPP_PID_MASK           _AC(0xffffffff, UL)
@@ -63,10 +56,6 @@ extern unsigned long max_mappable;
 /* The Write Back bit position in the physaddr is given by the SLPC PCI */
 extern unsigned long mio_wb_bit_mask;
 
-#define MACHINE_IS_VM          (get_lowcore()->machine_flags & MACHINE_FLAG_VM)
-#define MACHINE_IS_KVM         (get_lowcore()->machine_flags & MACHINE_FLAG_KVM)
-#define MACHINE_IS_LPAR                (get_lowcore()->machine_flags & MACHINE_FLAG_LPAR)
-
 /*
  * Console mode. Override with conmode=
  */

diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index 59b15f6a0a0280d72eacd0fbfd730e2c92c0b1f9..fc30eb222ee9f4e91687dae14a17cb6cbfebcdd7 100644 (file)
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -22,6 +22,7 @@
 #include <asm/asm-extable.h>
 #include <linux/memblock.h>
 #include <asm/access-regs.h>
+#include <asm/machine.h>
 #include <asm/diag.h>
 #include <asm/ebcdic.h>
 #include <asm/fpu.h>
@@ -82,26 +83,6 @@ static noinline __init void init_kernel_storage_key(void)
 
 static __initdata char sysinfo_page[PAGE_SIZE] __aligned(PAGE_SIZE);
 
-static noinline __init void detect_machine_type(void)
-{
-       struct sysinfo_3_2_2 *vmms = (struct sysinfo_3_2_2 *)&sysinfo_page;
-
-       /* Check current-configuration-level */
-       if (stsi(NULL, 0, 0, 0) <= 2) {
-               get_lowcore()->machine_flags |= MACHINE_FLAG_LPAR;
-               return;
-       }
-       /* Get virtual-machine cpu information. */
-       if (stsi(vmms, 3, 2, 2) || !vmms->count)
-               return;
-
-       /* Detect known hypervisors */
-       if (!memcmp(vmms->vm[0].cpi, "\xd2\xe5\xd4", 3))
-               get_lowcore()->machine_flags |= MACHINE_FLAG_KVM;
-       else if (!memcmp(vmms->vm[0].cpi, "\xa9\x61\xe5\xd4", 4))
-               get_lowcore()->machine_flags |= MACHINE_FLAG_VM;
-}
-
 /* Remove leading, trailing and double whitespace. */
 static inline void strim_all(char *str)
 {
@@ -142,9 +123,9 @@ static noinline __init void setup_arch_string(void)
                strim_all(hvstr);
        } else {
                sprintf(hvstr, "%s",
-                       MACHINE_IS_LPAR ? "LPAR" :
-                       MACHINE_IS_VM ? "z/VM" :
-                       MACHINE_IS_KVM ? "KVM" : "unknown");
+                       machine_is_lpar() ? "LPAR" :
+                       machine_is_vm() ? "z/VM" :
+                       machine_is_kvm() ? "KVM" : "unknown");
        }
        dump_stack_set_arch_desc("%s (%s)", mstr, hvstr);
 }
@@ -249,7 +230,6 @@ void __init startup_init(void)
        lockdep_off();
        sort_amode31_extable();
        setup_lowcore_early();
-       detect_machine_type();
        setup_arch_string();
        setup_boot_command_line();
        detect_machine_facilities();

diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index 69be2309cde0072b6fea948c14c3dfcd9b8dc651..8990e2dffcdf77fe4a5841fc6c27d42717287458 100644 (file)
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -22,6 +22,7 @@
 #include <linux/debug_locks.h>
 #include <linux/vmalloc.h>
 #include <asm/asm-extable.h>
+#include <asm/machine.h>
 #include <asm/diag.h>
 #include <asm/ipl.h>
 #include <asm/smp.h>
@@ -685,7 +686,7 @@ static int __init ipl_init(void)
                goto out;
        switch (ipl_info.type) {
        case IPL_TYPE_CCW:
-               if (MACHINE_IS_VM)
+               if (machine_is_vm())
                        rc = sysfs_create_group(&ipl_kset->kobj,
                                                &ipl_ccw_attr_group_vm);
                else
@@ -1272,7 +1273,7 @@ static void reipl_block_ccw_fill_parms(struct ipl_parameter_block *ipb)
        ipb->ccw.flags = IPL_PB0_FLAG_LOADPARM;
 
        /* VM PARM */
-       if (MACHINE_IS_VM && ipl_block_valid &&
+       if (machine_is_vm() && ipl_block_valid &&
            (ipl_block.ccw.vm_flags & IPL_PB0_CCW_VM_FLAG_VP)) {
 
                ipb->ccw.vm_flags |= IPL_PB0_CCW_VM_FLAG_VP;
@@ -1286,7 +1287,7 @@ static int __init reipl_nss_init(void)
 {
        int rc;
 
-       if (!MACHINE_IS_VM)
+       if (!machine_is_vm())
                return 0;
 
        reipl_block_nss = (void *) get_zeroed_page(GFP_KERNEL);
@@ -1311,8 +1312,8 @@ static int __init reipl_ccw_init(void)
                return -ENOMEM;
 
        rc = sysfs_create_group(&reipl_kset->kobj,
-                               MACHINE_IS_VM ? &reipl_ccw_attr_group_vm
-                                             : &reipl_ccw_attr_group_lpar);
+                               machine_is_vm() ? &reipl_ccw_attr_group_vm
+                                               : &reipl_ccw_attr_group_lpar);
        if (rc)
                return rc;
 
@@ -1987,7 +1988,7 @@ static void vmcmd_run(struct shutdown_trigger *trigger)
 
 static int vmcmd_init(void)
 {
-       if (!MACHINE_IS_VM)
+       if (!machine_is_vm())
                return -EOPNOTSUPP;
        vmcmd_kset = kset_create_and_add("vmcmd", NULL, firmware_kobj);
        if (!vmcmd_kset)
@@ -2264,7 +2265,7 @@ static void __init strncpy_skip_quote(char *dst, char *src, int n)
 
 static int __init vmcmd_on_reboot_setup(char *str)
 {
-       if (!MACHINE_IS_VM)
+       if (!machine_is_vm())
                return 1;
        strncpy_skip_quote(vmcmd_on_reboot, str, VMCMD_MAX_SIZE);
        vmcmd_on_reboot[VMCMD_MAX_SIZE] = 0;
@@ -2275,7 +2276,7 @@ __setup("vmreboot=", vmcmd_on_reboot_setup);
 
 static int __init vmcmd_on_panic_setup(char *str)
 {
-       if (!MACHINE_IS_VM)
+       if (!machine_is_vm())
                return 1;
        strncpy_skip_quote(vmcmd_on_panic, str, VMCMD_MAX_SIZE);
        vmcmd_on_panic[VMCMD_MAX_SIZE] = 0;
@@ -2286,7 +2287,7 @@ __setup("vmpanic=", vmcmd_on_panic_setup);
 
 static int __init vmcmd_on_halt_setup(char *str)
 {
-       if (!MACHINE_IS_VM)
+       if (!machine_is_vm())
                return 1;
        strncpy_skip_quote(vmcmd_on_halt, str, VMCMD_MAX_SIZE);
        vmcmd_on_halt[VMCMD_MAX_SIZE] = 0;
@@ -2297,7 +2298,7 @@ __setup("vmhalt=", vmcmd_on_halt_setup);
 
 static int __init vmcmd_on_poff_setup(char *str)
 {
-       if (!MACHINE_IS_VM)
+       if (!machine_is_vm())
                return 1;
        strncpy_skip_quote(vmcmd_on_poff, str, VMCMD_MAX_SIZE);
        vmcmd_on_poff[VMCMD_MAX_SIZE] = 0;

diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index ef7be599e1f78c986e294f4591eeb5dea9b57925..d0a596f1c2f6f387d73b6dd2364b1cf64d2273fc 100644 (file)
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -25,6 +25,7 @@
 #include <asm/irq_regs.h>
 #include <asm/cputime.h>
 #include <asm/lowcore.h>
+#include <asm/machine.h>
 #include <asm/irq.h>
 #include <asm/hw_irq.h>
 #include <asm/stacktrace.h>
@@ -164,7 +165,7 @@ void noinstr do_io_irq(struct pt_regs *regs)
                        do_irq_async(regs, THIN_INTERRUPT);
                else
                        do_irq_async(regs, IO_INTERRUPT);
-       } while (MACHINE_IS_LPAR && irq_pending(regs));
+       } while (machine_is_lpar() && irq_pending(regs));
 
        irq_exit_rcu();
 

diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c
index 7962dba7bdeaa77774f10aadc94ae57aed257c2b..baeb3dcfc1c8b96080feb8fcfbc4fdc034cbb327 100644 (file)
--- a/arch/s390/kernel/machine_kexec.c
+++ b/arch/s390/kernel/machine_kexec.c
@@ -15,6 +15,7 @@
 #include <linux/debug_locks.h>
 #include <linux/cpufeature.h>
 #include <asm/guarded_storage.h>
+#include <asm/machine.h>
 #include <asm/pfault.h>
 #include <asm/cio.h>
 #include <asm/fpu.h>
@@ -179,7 +180,7 @@ void arch_kexec_unprotect_crashkres(void)
 static int machine_kexec_prepare_kdump(void)
 {
 #ifdef CONFIG_CRASH_DUMP
-       if (MACHINE_IS_VM)
+       if (machine_is_vm())
                diag10_range(PFN_DOWN(crashk_res.start),
                             PFN_DOWN(crashk_res.end - crashk_res.start + 1));
        return 0;

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index ab8816cf2f8b8bcb0b2222ee1e26673d0f228f6e..dc8ccc5e8edf4a5db2705d35dd495219ea730584 100644 (file)
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -252,7 +252,7 @@ static void __init conmode_default(void)
        char query_buffer[1024];
        char *ptr;
 
-        if (MACHINE_IS_VM) {
+       if (machine_is_vm()) {
                cpcmd("QUERY CONSOLE", query_buffer, 1024, NULL);
                console_devno = simple_strtoul(query_buffer + 5, NULL, 16);
                ptr = strstr(query_buffer, "SUBCHANNEL =");
@@ -290,7 +290,7 @@ static void __init conmode_default(void)
                        SET_CONSOLE_SCLP;
 #endif
                }
-       } else if (MACHINE_IS_KVM) {
+       } else if (machine_is_kvm()) {
                if (sclp.has_vt220 && IS_ENABLED(CONFIG_SCLP_VT220_CONSOLE))
                        SET_CONSOLE_VT220;
                else if (sclp.has_linemode && IS_ENABLED(CONFIG_SCLP_CONSOLE))
@@ -653,7 +653,7 @@ static void __init reserve_crashkernel(void)
                return;
        }
 
-       if (!oldmem_data.start && MACHINE_IS_VM)
+       if (!oldmem_data.start && machine_is_vm())
                diag10_range(PFN_DOWN(crash_base), PFN_DOWN(crash_size));
        crashk_res.start = crash_base;
        crashk_res.end = crash_base + crash_size - 1;
@@ -899,12 +899,12 @@ void __init setup_arch(char **cmdline_p)
         /*
          * print what head.S has found out about the machine
          */
-       if (MACHINE_IS_VM)
+       if (machine_is_vm())
                pr_info("Linux is running as a z/VM "
                        "guest operating system in 64-bit mode\n");
-       else if (MACHINE_IS_KVM)
+       else if (machine_is_kvm())
                pr_info("Linux is running under KVM in 64-bit mode\n");
-       else if (MACHINE_IS_LPAR)
+       else if (machine_is_lpar())
                pr_info("Linux is running natively in 64-bit mode\n");
        else
                pr_info("Linux is running as a guest in 64-bit mode\n");

diff --git a/arch/s390/kernel/sysinfo.c b/arch/s390/kernel/sysinfo.c
index d096a154cc4037a0d828a6d7af98d38712238207..1ea84e942bd4220a1c1a84dbb8de885a4952cc01 100644 (file)
--- a/arch/s390/kernel/sysinfo.c
+++ b/arch/s390/kernel/sysinfo.c
@@ -16,6 +16,7 @@
 #include <linux/export.h>
 #include <linux/slab.h>
 #include <asm/asm-extable.h>
+#include <asm/machine.h>
 #include <asm/ebcdic.h>
 #include <asm/debug.h>
 #include <asm/sysinfo.h>
@@ -378,7 +379,7 @@ static struct service_level service_level_vm = {
 static __init int create_proc_service_level(void)
 {
        proc_create_seq("service_levels", 0, NULL, &service_level_seq_ops);
-       if (MACHINE_IS_VM)
+       if (machine_is_vm())
                register_service_level(&service_level_vm);
        return 0;
 }

diff --git a/arch/s390/lib/spinlock.c b/arch/s390/lib/spinlock.c
index a81a01c449272ebad77cb031992078ac8e255eb8..9d5669d449f28cf3c2b6f4fabf9f5875b4c2aaf9 100644 (file)
--- a/arch/s390/lib/spinlock.c
+++ b/arch/s390/lib/spinlock.c
@@ -15,6 +15,7 @@
 #include <linux/percpu.h>
 #include <linux/io.h>
 #include <asm/alternative.h>
+#include <asm/machine.h>
 #include <asm/asm.h>
 
 int spin_retry = -1;
@@ -212,7 +213,7 @@ static inline void arch_spin_lock_queued(arch_spinlock_t *lp)
                if (count-- >= 0)
                        continue;
                count = spin_retry;
-               if (!MACHINE_IS_LPAR || arch_vcpu_is_preempted(owner - 1))
+               if (!machine_is_lpar() || arch_vcpu_is_preempted(owner - 1))
                        smp_yield_cpu(owner - 1);
        }
 
@@ -255,7 +256,7 @@ static inline void arch_spin_lock_classic(arch_spinlock_t *lp)
                if (count-- >= 0)
                        continue;
                count = spin_retry;
-               if (!MACHINE_IS_LPAR || arch_vcpu_is_preempted(owner - 1))
+               if (!machine_is_lpar() || arch_vcpu_is_preempted(owner - 1))
                        smp_yield_cpu(owner - 1);
        }
 }
@@ -337,7 +338,7 @@ void arch_spin_relax(arch_spinlock_t *lp)
        cpu = READ_ONCE(lp->lock) & _Q_LOCK_CPU_MASK;
        if (!cpu)
                return;
-       if (MACHINE_IS_LPAR && !arch_vcpu_is_preempted(cpu - 1))
+       if (machine_is_lpar() && !arch_vcpu_is_preempted(cpu - 1))
                return;
        smp_yield_cpu(cpu - 1);
 }

diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c
index 4692136c0af137290b05e1fdbfa866ca1b877575..a6b8b8ea90864eebb63a3a8bce161614f3637ea2 100644 (file)
--- a/arch/s390/mm/extmem.c
+++ b/arch/s390/mm/extmem.c
@@ -21,6 +21,7 @@
 #include <linux/ioport.h>
 #include <linux/refcount.h>
 #include <linux/pgtable.h>
+#include <asm/machine.h>
 #include <asm/diag.h>
 #include <asm/page.h>
 #include <asm/ebcdic.h>
@@ -255,7 +256,7 @@ segment_type (char* name)
        int rc;
        struct dcss_segment seg;
 
-       if (!MACHINE_IS_VM)
+       if (!machine_is_vm())
                return -ENOSYS;
 
        dcss_mkname(name, seg.dcss_name);
@@ -418,7 +419,7 @@ segment_load (char *name, int do_nonshared, unsigned long *addr,
        struct dcss_segment *seg;
        int rc;
 
-       if (!MACHINE_IS_VM)
+       if (!machine_is_vm())
                return -ENOSYS;
 
        mutex_lock(&dcss_lock);
@@ -540,7 +541,7 @@ segment_unload(char *name)
        unsigned long dummy;
        struct dcss_segment *seg;
 
-       if (!MACHINE_IS_VM)
+       if (!machine_is_vm())
                return;
 
        mutex_lock(&dcss_lock);
@@ -572,7 +573,7 @@ segment_save(char *name)
        char cmd2[80];
        int i, response;
 
-       if (!MACHINE_IS_VM)
+       if (!machine_is_vm())
                return;
 
        mutex_lock(&dcss_lock);

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 3ed642f4f00dacdc55ba727357f0c7fb830a6cdd..31bfb49588c217f3b7ed3407f2dc50cbf5bcf709 100644 (file)
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -21,6 +21,7 @@
 #include <linux/seq_file.h>
 #include <linux/vmalloc.h>
 
+#include <asm/machine.h>
 #include <asm/ccwdev.h>
 #include <asm/ebcdic.h>
 #include <asm/idals.h>
@@ -3382,7 +3383,7 @@ int dasd_device_is_ro(struct dasd_device *device)
        struct diag210 diag_data;
        int rc;
 
-       if (!MACHINE_IS_VM)
+       if (!machine_is_vm())
                return 0;
        ccw_device_get_id(device->cdev, &dev_id);
        memset(&diag_data, 0, sizeof(diag_data));

diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index 71d8fb86139db698dc4b44fb5fb18a40c6afd725..3bb69069dfc6ec1f9a568152bf96681fc5bfb708 100644 (file)
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -18,6 +18,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 
+#include <asm/machine.h>
 #include <asm/debug.h>
 #include <linux/uaccess.h>
 #include <asm/ipl.h>
@@ -234,7 +235,7 @@ static int __init dasd_parse_keyword(char *keyword)
                return 0;
         }
        if (strncmp("nopav", keyword, length) == 0) {
-               if (MACHINE_IS_VM)
+               if (machine_is_vm())
                        pr_info("'nopav' is not supported on z/VM\n");
                else {
                        dasd_nopav = 1;

diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c
index 26812abddef188d53387ce06d24b2b4bbd654f97..8b39803cf94c976db7336fe4079b8d58b76d5059 100644 (file)
--- a/drivers/s390/block/dasd_diag.c
+++ b/drivers/s390/block/dasd_diag.c
@@ -18,6 +18,7 @@
 #include <linux/init.h>
 #include <linux/jiffies.h>
 #include <asm/asm-extable.h>
+#include <asm/machine.h>
 #include <asm/dasd.h>
 #include <asm/debug.h>
 #include <asm/diag.h>
@@ -654,7 +655,7 @@ static struct dasd_discipline dasd_diag_discipline = {
 static int __init
 dasd_diag_init(void)
 {
-       if (!MACHINE_IS_VM) {
+       if (!machine_is_vm()) {
                pr_info("Discipline %s cannot be used without z/VM\n",
                        dasd_diag_discipline.name);
                return -ENODEV;

diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 1ebe589b5185ad88dc95dd28db69b52f8eb7621b..88fa17aea2ec843f8cec1e61a22867689c7ea226 100644 (file)
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -23,6 +23,7 @@
 #include <linux/io.h>
 
 #include <asm/css_chars.h>
+#include <asm/machine.h>
 #include <asm/debug.h>
 #include <asm/idals.h>
 #include <asm/ebcdic.h>
@@ -1953,7 +1954,7 @@ static int dasd_eckd_validate_server(struct dasd_device *device,
        if (private->uid.type == UA_BASE_PAV_ALIAS ||
            private->uid.type == UA_HYPER_PAV_ALIAS)
                return 0;
-       if (dasd_nopav || MACHINE_IS_VM)
+       if (dasd_nopav || machine_is_vm())
                enable_pav = 0;
        else
                enable_pav = 1;

diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index c763c50d1454676f223e8b29a92f5fb45ddd7932..6a61c0a595d9b314de87fa60444dd179735616a4 100644 (file)
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -23,6 +23,7 @@
 #include <linux/reboot.h>
 #include <linux/serial.h> /* ASYNC_* flags */
 #include <linux/slab.h>
+#include <asm/machine.h>
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
 #include <linux/io.h>
@@ -907,7 +908,7 @@ static int __init con3215_init(void)
                return -ENODEV;
 
        /* Set the console mode for VM */
-       if (MACHINE_IS_VM) {
+       if (machine_is_vm()) {
                cpcmd("TERM CONMODE 3215", NULL, 0, NULL);
                cpcmd("TERM AUTOCR OFF", NULL, 0, NULL);
        }

diff --git a/drivers/s390/char/con3270.c b/drivers/s390/char/con3270.c
index ae1b9aa3a2b512f25a2f40354a86b8f7b3f5717c..1a31908486702238a19c65ab44ea8a8941456992 100644 (file)
--- a/drivers/s390/char/con3270.c
+++ b/drivers/s390/char/con3270.c
@@ -23,6 +23,7 @@
 #include <linux/memblock.h>
 #include <linux/compat.h>
 
+#include <asm/machine.h>
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
 #include <asm/ebcdic.h>
@@ -2156,7 +2157,7 @@ con3270_init(void)
                return -ENODEV;
 
        /* Set the console mode for VM */
-       if (MACHINE_IS_VM) {
+       if (machine_is_vm()) {
                cpcmd("TERM CONMODE 3270", NULL, 0, NULL);
                cpcmd("TERM AUTOCR OFF", NULL, 0, NULL);
        }

diff --git a/drivers/s390/char/hmcdrv_ftp.c b/drivers/s390/char/hmcdrv_ftp.c
index 02b6f394aec20a8beaccc06fc936649efc325f0c..4e3c7ec6749bd6911df861aa5fa4ec0a098c4d28 100644 (file)
--- a/drivers/s390/char/hmcdrv_ftp.c
+++ b/drivers/s390/char/hmcdrv_ftp.c
@@ -17,6 +17,8 @@
 #include <linux/ctype.h>
 #include <linux/crc16.h>
 
+#include <asm/machine.h>
+
 #include "hmcdrv_ftp.h"
 #include "hmcdrv_cache.h"
 #include "sclp_ftp.h"
@@ -308,9 +310,9 @@ int hmcdrv_ftp_startup(void)
        mutex_lock(&hmcdrv_ftp_mutex); /* block transfers while start-up */
 
        if (hmcdrv_ftp_refcnt == 0) {
-               if (MACHINE_IS_VM)
+               if (machine_is_vm())
                        hmcdrv_ftp_funcs = &hmcdrv_ftp_zvm;
-               else if (MACHINE_IS_LPAR || MACHINE_IS_KVM)
+               else if (machine_is_lpar() || machine_is_kvm())
                        hmcdrv_ftp_funcs = &hmcdrv_ftp_lpar;
                else
                        rc = -EOPNOTSUPP;

diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c
index 7207a7f5842a1164f9fe2f8eae7cef21ae5c7c2b..2d9886651d9b9588b0bbb08e27dc1c2098b4d1b4 100644 (file)
--- a/drivers/s390/char/monreader.c
+++ b/drivers/s390/char/monreader.c
@@ -24,6 +24,7 @@
 #include <linux/slab.h>
 #include <net/iucv/iucv.h>
 #include <linux/uaccess.h>
+#include <asm/machine.h>
 #include <asm/ebcdic.h>
 #include <asm/extmem.h>
 
@@ -456,7 +457,7 @@ static int __init mon_init(void)
 {
        int rc;
 
-       if (!MACHINE_IS_VM) {
+       if (!machine_is_vm()) {
                pr_err("The z/VM *MONITOR record device driver cannot be "
                       "loaded without z/VM\n");
                return -ENODEV;

diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c
index bc5193d81f9c9f4deceab7ed61c5f5f0eec77b88..0fab1f025a94db569a7902f4c6f8172f934ba5b0 100644 (file)
--- a/drivers/s390/char/monwriter.c
+++ b/drivers/s390/char/monwriter.c
@@ -23,6 +23,7 @@
 #include <linux/slab.h>
 #include <linux/uaccess.h>
 #include <linux/io.h>
+#include <asm/machine.h>
 #include <asm/ebcdic.h>
 #include <asm/appldata.h>
 #include <asm/monwriter.h>
@@ -293,7 +294,7 @@ static struct miscdevice mon_dev = {
 
 static int __init mon_init(void)
 {
-       if (!MACHINE_IS_VM)
+       if (!machine_is_vm())
                return -ENODEV;
        /*
         * misc_register() has to be the last action in module_init(), because

diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index ba3d7114b34fe59f0c1e4e9fc89a92bab036608d..d2ce7f80ae8d9bafdfbe832c4e990c49acb3d3bb 100644 (file)
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -17,6 +17,7 @@
 #include <linux/types.h>
 #include <linux/wait.h>
 
+#include <asm/machine.h>
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
 #include <asm/ebcdic.h>
@@ -618,7 +619,7 @@ static void raw3270_reset_device_cb(struct raw3270_request *rq, void *data)
        if (rq->rc) {
                /* Reset command failed. */
                rp->state = RAW3270_STATE_INIT;
-       } else if (MACHINE_IS_VM) {
+       } else if (machine_is_vm()) {
                raw3270_size_device_vm(rp);
                raw3270_size_device_done(rp);
        } else {

diff --git a/drivers/s390/char/sclp.h b/drivers/s390/char/sclp.h
index 07a6e8a7f05a96bda00f3c45cce422a7c88cb83e..f7ca6e2f6d18f892ccbedb73217fac9e4f51eb1a 100644 (file)
--- a/drivers/s390/char/sclp.h
+++ b/drivers/s390/char/sclp.h
@@ -12,6 +12,7 @@
 #include <linux/types.h>
 #include <linux/list.h>
 #include <asm/asm-extable.h>
+#include <asm/machine.h>
 #include <asm/sclp.h>
 #include <asm/ebcdic.h>
 #include <asm/asm.h>
@@ -342,21 +343,21 @@ static inline int sclp_service_call(sclp_cmdw_t command, void *sccb)
 static inline unsigned char
 sclp_ascebc(unsigned char ch)
 {
-       return (MACHINE_IS_VM) ? _ascebc[ch] : _ascebc_500[ch];
+       return (machine_is_vm()) ? _ascebc[ch] : _ascebc_500[ch];
 }
 
 /* translate string from EBCDIC to ASCII */
 static inline void
 sclp_ebcasc_str(char *str, int nr)
 {
-       (MACHINE_IS_VM) ? EBCASC(str, nr) : EBCASC_500(str, nr);
+       (machine_is_vm()) ? EBCASC(str, nr) : EBCASC_500(str, nr);
 }
 
 /* translate string from ASCII to EBCDIC */
 static inline void
 sclp_ascebc_str(char *str, int nr)
 {
-       (MACHINE_IS_VM) ? ASCEBC(str, nr) : ASCEBC_500(str, nr);
+       (machine_is_vm()) ? ASCEBC(str, nr) : ASCEBC_500(str, nr);
 }
 
 static inline struct gds_vector *

diff --git a/drivers/s390/char/sclp_early.c b/drivers/s390/char/sclp_early.c
index e58a1f8fc673666f7e5cb5ea1cecb1a532b24fd7..93b2d20d720cc93a0d547deeb67afc2a11f564ec 100644 (file)
--- a/drivers/s390/char/sclp_early.c
+++ b/drivers/s390/char/sclp_early.c
@@ -74,7 +74,7 @@ static void __init sclp_early_facilities_detect(void)
                sclp.hamax = U64_MAX;
 
        if (!sccb->hcpua) {
-               if (MACHINE_IS_VM)
+               if (machine_is_vm())
                        sclp.max_cores = 64;
                else
                        sclp.max_cores = sccb->ncpurl;

diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c
index 892c18d2f87e9018c1b58738d7c6d687615069f3..acd5ea0f7381ca52c00ba4a24adfc2d742206da9 100644 (file)
--- a/drivers/s390/char/sclp_tty.c
+++ b/drivers/s390/char/sclp_tty.c
@@ -499,7 +499,7 @@ sclp_tty_init(void)
        int rc;
 
        /* z/VM multiplexes the line mode output on the 32xx screen */
-       if (MACHINE_IS_VM && !CONSOLE_IS_SCLP)
+       if (machine_is_vm() && !CONSOLE_IS_SCLP)
                return 0;
        if (!sclp.has_linemode)
                return 0;
@@ -524,7 +524,7 @@ sclp_tty_init(void)
        timer_setup(&sclp_tty_timer, sclp_tty_timeout, 0);
        sclp_ttybuf = NULL;
        sclp_tty_buffer_count = 0;
-       if (MACHINE_IS_VM) {
+       if (machine_is_vm()) {
                /* case input lines to lowercase */
                sclp_tty_tolower = 1;
        }

diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c
index c6d58335beb476b2772d89f59525c2d89cc31b7b..3a695c5bf77f0286a4dd17f04ca596dbbd6fc63c 100644 (file)
--- a/drivers/s390/char/vmcp.c
+++ b/drivers/s390/char/vmcp.c
@@ -23,6 +23,7 @@
 #include <linux/mutex.h>
 #include <linux/cma.h>
 #include <linux/mm.h>
+#include <asm/machine.h>
 #include <asm/cpcmd.h>
 #include <asm/debug.h>
 #include <asm/vmcp.h>
@@ -52,7 +53,7 @@ early_param("vmcp_cma", early_parse_vmcp_cma);
 
 void __init vmcp_cma_reserve(void)
 {
-       if (!MACHINE_IS_VM)
+       if (!machine_is_vm())
                return;
        cma_declare_contiguous(0, vmcp_cma_size, 0, 0, 0, false, "vmcp", &vmcp_cma);
 }
@@ -254,7 +255,7 @@ static int __init vmcp_init(void)
 {
        int ret;
 
-       if (!MACHINE_IS_VM)
+       if (!machine_is_vm())
                return 0;
 
        vmcp_debug = debug_register("vmcp", 1, 1, 240);

diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index b2d93a6e36c418d0f80710c3ddb5dcba1e4c25ae..dac85294d2f56304100508db3d0b3d9421c764fc 100644 (file)
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -23,6 +23,7 @@
 #include <linux/spinlock.h>
 #include <linux/atomic.h>
 #include <linux/uaccess.h>
+#include <asm/machine.h>
 #include <asm/cpcmd.h>
 #include <asm/debug.h>
 #include <asm/ebcdic.h>
@@ -809,7 +810,7 @@ static int __init vmlogrdr_init(void)
        int i;
        dev_t dev;
 
-       if (! MACHINE_IS_VM) {
+       if (!machine_is_vm()) {
                pr_err("not running under VM, driver not loaded.\n");
                return -ENODEV;
        }

diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
index 90ba7a2b9cb41cb3aa82814c8331fd7d13a2b010..0fd918769a4bae0175cd834091a41f673c6ce2f7 100644 (file)
--- a/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@ -18,6 +18,7 @@
 #include <linux/kobject.h>
 
 #include <linux/uaccess.h>
+#include <asm/machine.h>
 #include <asm/cio.h>
 #include <asm/ccwdev.h>
 #include <asm/debug.h>
@@ -1009,7 +1010,7 @@ static int __init ur_init(void)
        int rc;
        dev_t dev;
 
-       if (!MACHINE_IS_VM) {
+       if (!machine_is_vm()) {
                pr_err("The %s cannot be loaded without z/VM\n",
                       ur_banner);
                return -ENODEV;

diff --git a/drivers/s390/cio/device_id.c b/drivers/s390/cio/device_id.c
index a512eac8348529edcc033bdf9f977e1bbe3eae7f..d0f65d97dd4a2b9cac668f73a996bd0b62b96c66 100644 (file)
--- a/drivers/s390/cio/device_id.c
+++ b/drivers/s390/cio/device_id.c
@@ -12,6 +12,7 @@
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/errno.h>
+#include <asm/machine.h>
 #include <asm/ccwdev.h>
 #include <asm/setup.h>
 #include <asm/cio.h>
@@ -175,7 +176,7 @@ static void snsid_callback(struct ccw_device *cdev, void *data, int rc)
        struct senseid *senseid = &cdev->private->dma_area->senseid;
        int vm = 0;
 
-       if (rc && MACHINE_IS_VM) {
+       if (rc && machine_is_vm()) {
                /* Try diag 0x210 fallback on z/VM. */
                snsid_init(cdev);
                if (diag210_get_dev_info(cdev) == 0) {

diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 26e1ea1940ecb5a88f98dce9e8eda198c0d27018..20cb8d272e5677d40bbfccb321eda441003b59d5 100644 (file)
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -26,6 +26,7 @@
 #include <linux/notifier.h>
 #include <linux/kthread.h>
 #include <linux/mutex.h>
+#include <asm/machine.h>
 #include <asm/airq.h>
 #include <asm/tpi.h>
 #include <linux/atomic.h>
@@ -2324,7 +2325,7 @@ static inline int __init ap_async_init(void)
         * Setup the high resolution poll timer.
         * If we are running under z/VM adjust polling to z/VM polling rate.
         */
-       if (MACHINE_IS_VM)
+       if (machine_is_vm())
                poll_high_timeout = 1500000;
        hrtimer_init(&ap_poll_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
        ap_poll_timer.function = ap_poll_timeout;

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 75910c0bcc2bc358c05dcae87bf5a47cc41c7315..777404d66e0cc1ee4c14c5653850e25b57f066d7 100644 (file)
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -22,6 +22,7 @@
 #include <linux/hash.h>
 #include <linux/hashtable.h>
 #include <net/switchdev.h>
+#include <asm/machine.h>
 #include <asm/chsc.h>
 #include <asm/css_chars.h>
 #include <asm/setup.h>
@@ -299,7 +300,7 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card)
 
        QETH_CARD_TEXT(card, 2, "l2reqmac");
 
-       if (MACHINE_IS_VM) {
+       if (machine_is_vm()) {
                rc = qeth_vm_request_mac(card);
                if (!rc)
                        goto out;

diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c
index c84ec2fbf99beed1bcc8a46644982f7bc2669c9e..c68ba8dbc014de3802e7e96f75b1b5148e3a7703 100644 (file)
--- a/drivers/s390/net/smsgiucv.c
+++ b/drivers/s390/net/smsgiucv.c
@@ -13,6 +13,7 @@
 #include <linux/device.h>
 #include <linux/slab.h>
 #include <net/iucv/iucv.h>
+#include <asm/machine.h>
 #include <asm/cpcmd.h>
 #include <asm/ebcdic.h>
 #include "smsgiucv.h"
@@ -138,7 +139,7 @@ static int __init smsg_init(void)
 {
        int rc;
 
-       if (!MACHINE_IS_VM) {
+       if (!machine_is_vm()) {
                rc = -EPROTONOSUPPORT;
                goto out;
        }

diff --git a/drivers/s390/net/smsgiucv_app.c b/drivers/s390/net/smsgiucv_app.c
index cc44cbb0028b20f67020b55155a6aba3ba941c5d..4bd4d6bfc1262e84f6d1023ae080a34f08685953 100644 (file)
--- a/drivers/s390/net/smsgiucv_app.c
+++ b/drivers/s390/net/smsgiucv_app.c
@@ -23,6 +23,7 @@
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
 #include <net/iucv/iucv.h>
+#include <asm/machine.h>
 #include "smsgiucv.h"
 
 /* prefix used for SMSG registration */
@@ -153,7 +154,7 @@ static int __init smsgiucv_app_init(void)
        struct device_driver *smsgiucv_drv;
        int rc;
 
-       if (!MACHINE_IS_VM)
+       if (!machine_is_vm())
                return -ENODEV;
 
        smsgiucv_drv = driver_find(SMSGIUCV_DRV_NAME, &iucv_bus);

diff --git a/drivers/tty/hvc/hvc_iucv.c b/drivers/tty/hvc/hvc_iucv.c
index ed4bf40278a7eaaa94a1b49e2c9b4508630ff29b..4ca7472c38e013d41d51a9ef521cd35d1871d760 100644 (file)
--- a/drivers/tty/hvc/hvc_iucv.c
+++ b/drivers/tty/hvc/hvc_iucv.c
@@ -24,6 +24,7 @@
 #include <linux/tty.h>
 #include <linux/wait.h>
 #include <net/iucv/iucv.h>
+#include <asm/machine.h>
 
 #include "hvc_console.h"
 
@@ -1240,7 +1241,7 @@ static int param_set_vmidfilter(const char *val, const struct kernel_param *kp)
 {
        int rc;
 
-       if (!MACHINE_IS_VM || !hvc_iucv_devices)
+       if (!machine_is_vm() || !hvc_iucv_devices)
                return -ENODEV;
 
        if (!val)
@@ -1269,7 +1270,7 @@ static int param_get_vmidfilter(char *buffer, const struct kernel_param *kp)
        size_t index, len;
        void *start, *end;
 
-       if (!MACHINE_IS_VM || !hvc_iucv_devices)
+       if (!machine_is_vm() || !hvc_iucv_devices)
                return -ENODEV;
 
        rc = 0;
@@ -1306,7 +1307,7 @@ static int __init hvc_iucv_init(void)
        if (!hvc_iucv_devices)
                return -ENODEV;
 
-       if (!MACHINE_IS_VM) {
+       if (!machine_is_vm()) {
                pr_notice("The z/VM IUCV HVC device driver cannot "
                           "be used without z/VM\n");
                rc = -ENODEV;

diff --git a/drivers/watchdog/diag288_wdt.c b/drivers/watchdog/diag288_wdt.c
index 4631d0a3866a003ad8b8388fd4afaa46cbab1392..76dffc89c641bfa3a74740dce77579211fcddf0c 100644 (file)
--- a/drivers/watchdog/diag288_wdt.c
+++ b/drivers/watchdog/diag288_wdt.c
@@ -27,6 +27,7 @@
 #include <linux/moduleparam.h>
 #include <linux/slab.h>
 #include <linux/watchdog.h>
+#include <asm/machine.h>
 #include <asm/ebcdic.h>
 #include <asm/diag.h>
 #include <linux/io.h>
@@ -110,7 +111,7 @@ static int wdt_start(struct watchdog_device *dev)
        int ret;
        unsigned int func;
 
-       if (MACHINE_IS_VM) {
+       if (machine_is_vm()) {
                func = conceal_on ? (WDT_FUNC_INIT | WDT_FUNC_CONCEAL)
                        : WDT_FUNC_INIT;
                ret = diag288_str(func, dev->timeout, wdt_cmd);
@@ -136,7 +137,7 @@ static int wdt_ping(struct watchdog_device *dev)
        int ret;
        unsigned int func;
 
-       if (MACHINE_IS_VM) {
+       if (machine_is_vm()) {
                /*
                 * It seems to be ok to z/VM to use the init function to
                 * retrigger the watchdog. On LPAR WDT_FUNC_CHANGE must
@@ -192,7 +193,7 @@ static int __init diag288_init(void)
 
        watchdog_set_nowayout(&wdt_dev, nowayout_info);
 
-       if (MACHINE_IS_VM) {
+       if (machine_is_vm()) {
                cmd_buf = kmalloc(MAX_CMDLEN, GFP_KERNEL);
                if (!cmd_buf) {
                        pr_err("The watchdog cannot be initialized\n");

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 7929df08d4e023887e4a21f8e23fa56f33dd657a..cc2b3c44bc05a629d455e99369491b28b4b93884 100644 (file)
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -28,6 +28,7 @@
 #include <linux/poll.h>
 #include <linux/security.h>
 #include <net/sock.h>
+#include <asm/machine.h>
 #include <asm/ebcdic.h>
 #include <asm/cpcmd.h>
 #include <linux/kmod.h>
@@ -2272,7 +2273,7 @@ static int __init afiucv_init(void)
 {
        int err;
 
-       if (MACHINE_IS_VM && IS_ENABLED(CONFIG_IUCV)) {
+       if (machine_is_vm() && IS_ENABLED(CONFIG_IUCV)) {
                cpcmd("QUERY USERID", iucv_userid, sizeof(iucv_userid), &err);
                if (unlikely(err)) {
                        WARN_ON(err);

diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index d3e9efab7f4bd2a2251ab98d098d57d398fdb2a4..83070a2e44857ab4888d1f076542cac4dfed370a 100644 (file)
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -39,6 +39,7 @@
 #include <linux/reboot.h>
 #include <net/iucv/iucv.h>
 #include <linux/atomic.h>
+#include <asm/machine.h>
 #include <asm/ebcdic.h>
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -1865,7 +1866,7 @@ static int __init iucv_init(void)
 {
        int rc;
 
-       if (!MACHINE_IS_VM) {
+       if (!machine_is_vm()) {
                rc = -EPROTONOSUPPORT;
                goto out;
        }