Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux.git] / arch / s390 / include / asm / sclp.h

diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h
index dea883f85d66ae59edf460320ca2db07e5be4523..bab456be9a4f9f0803c8e9a73f82fe2fec55504c 100644 (file)
--- a/arch/s390/include/asm/sclp.h
+++ b/arch/s390/include/asm/sclp.h
@@ -63,12 +63,12 @@ struct sclp_info {
        unsigned int mtid;
        unsigned int mtid_cp;
        unsigned int mtid_prev;
-       unsigned long long rzm;
-       unsigned long long rnmax;
-       unsigned long long hamax;
+       unsigned long rzm;
+       unsigned long rnmax;
+       unsigned long hamax;
        unsigned int max_cores;
        unsigned long hsa_size;
-       unsigned long long facilities;
+       unsigned long facilities;
 };
 extern struct sclp_info sclp;
 
@@ -83,8 +83,9 @@ int sclp_chp_read_info(struct sclp_chp_info *info);
 void sclp_get_ipl_info(struct sclp_ipl_info *info);
 int sclp_pci_configure(u32 fid);
 int sclp_pci_deconfigure(u32 fid);
-int memcpy_hsa(void *dest, unsigned long src, size_t count, int mode);
+int memcpy_hsa_kernel(void *dest, unsigned long src, size_t count);
+int memcpy_hsa_user(void __user *dest, unsigned long src, size_t count);
 void sclp_early_detect(void);
-int _sclp_print_early(const char *);
+void _sclp_print_early(const char *);
 
 #endif /* _ASM_S390_SCLP_H */