2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c
index 1bbae433fbd8..c431198bdbc4 100644
--- a/drivers/s390/char/zcore.c
+++ b/drivers/s390/char/zcore.c
@@ -275,7 +275,7 @@ struct zcore_header {
         u32 num_pages;
         u32 pad1;
         u64 tod;
-        cpuid_t cpu_id;
+        struct cpuid cpu_id;
         u32 arch_id;
         u32 volnr;
         u32 build_arch;
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 45858f3b7318..e995123fd805 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -657,8 +657,8 @@ css_generate_pgid(struct channel_subsystem *css, u32 tod_high)
                 css->global_pgid.pgid_high.cpu_addr = 0;
 #endif
         }
-        css->global_pgid.cpu_id = ((cpuid_t *) __LC_CPUID)->ident;
-        css->global_pgid.cpu_model = ((cpuid_t *) __LC_CPUID)->machine;
+        css->global_pgid.cpu_id = S390_lowcore.cpu_id.ident;
+        css->global_pgid.cpu_model = S390_lowcore.cpu_id.machine;
         css->global_pgid.tod_high = tod_high;
 
 }