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

[sfrench/cifs-2.6.git] / arch / s390 / include / asm / lowcore.h

diff --git a/arch/s390/include/asm/lowcore.h b/arch/s390/include/asm/lowcore.h
index a6870ea6ea8b48083430d38ed628ed5964f42b84..9eb36a1592c797a7d1e70e86b2c905a8266d4760 100644 (file)
--- a/arch/s390/include/asm/lowcore.h
+++ b/arch/s390/include/asm/lowcore.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    Copyright IBM Corp. 1999, 2012
  *    Author(s): Hartmut Penner <hp@de.ibm.com>,
@@ -133,8 +134,9 @@ struct lowcore {
        __u8    pad_0x03b4[0x03b8-0x03b4];      /* 0x03b4 */
        __u64   gmap;                           /* 0x03b8 */
        __u32   spinlock_lockval;               /* 0x03c0 */
-       __u32   fpu_flags;                      /* 0x03c4 */
-       __u8    pad_0x03c8[0x0400-0x03c8];      /* 0x03c8 */
+       __u32   spinlock_index;                 /* 0x03c4 */
+       __u32   fpu_flags;                      /* 0x03c8 */
+       __u8    pad_0x03cc[0x0400-0x03cc];      /* 0x03cc */
 
        /* Per cpu primary space access list */
        __u32   paste[16];                      /* 0x0400 */