[S390] More cleanup for struct _lowcore

Remove cpu_id from lowcore and replace addr_t with __u64.

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

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 511649115bd7..da6df0483289 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -648,6 +648,8 @@ static void css_process_crw(struct crw *crw0, struct crw *crw1, int overflow)
 static void __init
 css_generate_pgid(struct channel_subsystem *css, u32 tod_high)
 {
+        struct cpuid cpu_id;
+
         if (css_general_characteristics.mcss) {
                 css->global_pgid.pgid_high.ext_cssid.version = 0x80;
                 css->global_pgid.pgid_high.ext_cssid.cssid = css->cssid;
@@ -658,8 +660,9 @@ css_generate_pgid(struct channel_subsystem *css, u32 tod_high)
                 css->global_pgid.pgid_high.cpu_addr = 0;
 #endif
         }
-        css->global_pgid.cpu_id = S390_lowcore.cpu_id.ident;
-        css->global_pgid.cpu_model = S390_lowcore.cpu_id.machine;
+        get_cpu_id(&cpu_id);
+        css->global_pgid.cpu_id = cpu_id.ident;
+        css->global_pgid.cpu_model = cpu_id.machine;
         css->global_pgid.tod_high = tod_high;
 
 }