s390: Make diag224 public

Diag204's cpu structures only contain the cpu type by means of an
index in the diag224 name table. Hence, to be able to use diag204 in
any meaningful way, we also need a usable diag224 interface.

Signed-off-by: Janosch Frank <frankja@linux.vnet.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

diff --git a/arch/s390/hypfs/hypfs_diag.c b/arch/s390/hypfs/hypfs_diag.c
index 1e28414d7275e7db21f1c6c7b62dc8f4637f7b84..28f03ca60100a3399b501721851b789871c787e2 100644 (file)
--- a/arch/s390/hypfs/hypfs_diag.c
+++ b/arch/s390/hypfs/hypfs_diag.c
@@ -360,20 +360,6 @@ out:
 
 /* Diagnose 224 functions */
 
-static int diag224(void *ptr)
-{
-       int rc = -EOPNOTSUPP;
-
-       diag_stat_inc(DIAG_STAT_X224);
-       asm volatile(
-               "       diag    %1,%2,0x224\n"
-               "0:     lhi     %0,0x0\n"
-               "1:\n"
-               EX_TABLE(0b,1b)
-               : "+d" (rc) :"d" (0), "d" (ptr) : "memory");
-       return rc;
-}
-
 static int diag224_get_name_table(void)
 {
        /* memory must be below 2GB */

diff --git a/arch/s390/include/asm/diag.h b/arch/s390/include/asm/diag.h
index f72744f14e311395d3666eee5a73d64a526de0b0..197e303a76e96c5f38d40fd0414d5f0e0dde1fb5 100644 (file)
--- a/arch/s390/include/asm/diag.h
+++ b/arch/s390/include/asm/diag.h
@@ -205,4 +205,5 @@ struct diag204_x_phys_cpu {
 } __packed;
 
 int diag204(unsigned long subcode, unsigned long size, void *addr);
+int diag224(void *ptr);
 #endif /* _ASM_S390_DIAG_H */

diff --git a/arch/s390/kernel/diag.c b/arch/s390/kernel/diag.c
index f4ce4a248811e4aeff24de26537cd31c5ef37f7b..a44faf4a045442b68a330bbf09a0aab2d755cda1 100644 (file)
--- a/arch/s390/kernel/diag.c
+++ b/arch/s390/kernel/diag.c
@@ -218,3 +218,18 @@ int diag210(struct diag210 *addr)
        return ccode;
 }
 EXPORT_SYMBOL(diag210);
+
+int diag224(void *ptr)
+{
+       int rc = -EOPNOTSUPP;
+
+       diag_stat_inc(DIAG_STAT_X224);
+       asm volatile(
+               "       diag    %1,%2,0x224\n"
+               "0:     lhi     %0,0x0\n"
+               "1:\n"
+               EX_TABLE(0b,1b)
+               : "+d" (rc) :"d" (0), "d" (ptr) : "memory");
+       return rc;
+}
+EXPORT_SYMBOL(diag224);