Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / include / asm-s390 / sclp.h

diff --git a/include/asm-s390/sclp.h b/include/asm-s390/sclp.h
index cb9faf1..fed7bee 100644 (file)
--- a/include/asm-s390/sclp.h
+++ b/include/asm-s390/sclp.h
@@ -27,9 +27,27 @@ struct sclp_ipl_info {
        char loadparm[LOADPARM_LEN];
 };
 
-void sclp_readinfo_early(void);
+struct sclp_cpu_entry {
+       u8 address;
+       u8 reserved0[13];
+       u8 type;
+       u8 reserved1;
+} __attribute__((packed));
+
+struct sclp_cpu_info {
+       unsigned int configured;
+       unsigned int standby;
+       unsigned int combined;
+       int has_cpu_type;
+       struct sclp_cpu_entry cpu[255];
+};
+
+int sclp_get_cpu_info(struct sclp_cpu_info *info);
+int sclp_cpu_configure(u8 cpu);
+int sclp_cpu_deconfigure(u8 cpu);
 void sclp_facilities_detect(void);
-unsigned long long sclp_memory_detect(void);
+unsigned long long sclp_get_rnmax(void);
+unsigned long long sclp_get_rzm(void);
 int sclp_sdias_blk_count(void);
 int sclp_sdias_copy(void *dest, int blk_num, int nr_blks);
 int sclp_chp_configure(struct chp_id chpid);