aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/setup.c
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2010-02-26 16:37:38 -0500
committerMartin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com>2010-02-26 16:37:31 -0500
commit27d71602b4a605fbb31088e69ac12187e69a9443 (patch)
tree2f4203a85e5191abbb6ffd21c277eb2afb23a0ab /arch/s390/kernel/setup.c
parent432ac5e04b931df8376e0858d4bf0fd41436a271 (diff)
[S390] add MACHINE_IS_LPAR flag
Introduce the MACHINE_IS_LPAR flag for code that should only be executed if Linux is running in an LPAR. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/setup.c')
-rw-r--r--arch/s390/kernel/setup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 8d8957b38ab3..d9fb98cde0fa 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -804,7 +804,7 @@ setup_arch(char **cmdline_p)
804 if (MACHINE_IS_VM) 804 if (MACHINE_IS_VM)
805 pr_info("Linux is running as a z/VM " 805 pr_info("Linux is running as a z/VM "
806 "guest operating system in 31-bit mode\n"); 806 "guest operating system in 31-bit mode\n");
807 else 807 else if (MACHINE_IS_LPAR)
808 pr_info("Linux is running natively in 31-bit mode\n"); 808 pr_info("Linux is running natively in 31-bit mode\n");
809 if (MACHINE_HAS_IEEE) 809 if (MACHINE_HAS_IEEE)
810 pr_info("The hardware system has IEEE compatible " 810 pr_info("The hardware system has IEEE compatible "
@@ -818,7 +818,7 @@ setup_arch(char **cmdline_p)
818 "guest operating system in 64-bit mode\n"); 818 "guest operating system in 64-bit mode\n");
819 else if (MACHINE_IS_KVM) 819 else if (MACHINE_IS_KVM)
820 pr_info("Linux is running under KVM in 64-bit mode\n"); 820 pr_info("Linux is running under KVM in 64-bit mode\n");
821 else 821 else if (MACHINE_IS_LPAR)
822 pr_info("Linux is running natively in 64-bit mode\n"); 822 pr_info("Linux is running natively in 64-bit mode\n");
823#endif /* CONFIG_64BIT */ 823#endif /* CONFIG_64BIT */
824 824