[S390] eliminate cpuinfo_S390 structure

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

3 files changed, 10 insertions, 28 deletions

diff --git a/arch/s390/include/asm/lowcore.h b/arch/s390/include/asm/lowcore.h
index f94386ece0d..ad543c11826 100644
--- a/arch/s390/include/asm/lowcore.h
+++ b/arch/s390/include/asm/lowcore.h
@@ -80,7 +80,6 @@
 #define __LC_USER_ASCE                  0xC50
 #define __LC_PANIC_STACK                0xC54
 #define __LC_CPUID                      0xC60
-#define __LC_CPUADDR                    0xC68
 #define __LC_IPLDEV                     0xC7C
 #define __LC_CURRENT                    0xC90
 #define __LC_INT_CLOCK                  0xC98
@@ -102,7 +101,6 @@
 #define __LC_USER_ASCE                  0xD60
 #define __LC_PANIC_STACK                0xD68
 #define __LC_CPUID                      0xD80
-#define __LC_CPUADDR                    0xD88
 #define __LC_IPLDEV                     0xDB8
 #define __LC_CURRENT                    0xDD8
 #define __LC_INT_CLOCK                  0xDE8
@@ -273,8 +271,10 @@ struct _lowcore
         __u32        user_exec_asce;           /* 0xc58 */
         __u8         pad10[0xc60-0xc5c];       /* 0xc5c */
         /* entry.S sensitive area start */
-        struct       cpuinfo_S390 cpu_data;    /* 0xc60 */
-        __u32        ipl_device;               /* 0xc7c */
+        cpuid_t      cpu_id;                   /* 0xc60 */
+        __u32        cpu_nr;                   /* 0xc68 */
+        __u32        ipl_device;               /* 0xc6c */
+        __u8         pad_0xc70[0xc80-0xc70];   /* 0xc70 */
         /* entry.S sensitive area end */
 
         /* SMP info area: defined by DJB */
@@ -366,9 +366,10 @@ struct _lowcore
         __u64        user_exec_asce;           /* 0xd70 */
         __u8         pad10[0xd80-0xd78];       /* 0xd78 */
         /* entry.S sensitive area start */
-        struct       cpuinfo_S390 cpu_data;    /* 0xd80 */
-        __u32        ipl_device;               /* 0xdb8 */
-        __u32        pad11;                    /* 0xdbc */
+        cpuid_t      cpu_id;                   /* 0xd80 */
+        __u32        cpu_nr;                   /* 0xd88 */
+        __u32        ipl_device;               /* 0xd8c */
+        __u8         pad_0xd90[0xdc0-0xd90];   /* 0xd90 */
         /* entry.S sensitive area end */
 
         /* SMP info area: defined by DJB */
diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index db4523fe38a..61862b3ac79 100644
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@ -42,22 +42,8 @@ static inline void get_cpu_id(cpuid_t *ptr)
         asm volatile("stidp 0(%1)" : "=m" (*ptr) : "a" (ptr));
 }
 
-struct cpuinfo_S390
-{
-        cpuid_t  cpu_id;
-        __u16    cpu_addr;
-        __u16    cpu_nr;
-        unsigned long loops_per_jiffy;
-        unsigned long *pgd_quick;
-#ifdef __s390x__
-        unsigned long *pmd_quick;
-#endif /* __s390x__ */
-        unsigned long *pte_quick;
-        unsigned long pgtable_cache_sz;
-};
-
 extern void s390_adjust_jiffies(void);
-extern void print_cpu_info(struct cpuinfo_S390 *);
+extern void print_cpu_info(void);
 extern int get_cpu_capability(unsigned int *);
 
 /*
diff --git a/arch/s390/include/asm/smp.h b/arch/s390/include/asm/smp.h
index 024b91e0623..2009158a450 100644
--- a/arch/s390/include/asm/smp.h
+++ b/arch/s390/include/asm/smp.h
@@ -50,12 +50,7 @@ extern void machine_power_off_smp(void);
  
 #define PROC_CHANGE_PENALTY     20              /* Schedule penalty */
 
-#define raw_smp_processor_id()  (S390_lowcore.cpu_data.cpu_nr)
-
-static inline __u16 hard_smp_processor_id(void)
-{
-        return stap();
-}
+#define raw_smp_processor_id()  (S390_lowcore.cpu_nr)
 
 /*
  * returns 1 if cpu is in stopped/check stopped state or not operational