Revert "membarrier/kabi: fix kabi for membarrier_state"

hulk inclusion
category: bugfix
bugzilla: 30939
CVE: NA

-------------------------------------------------

The kabi can be broken before official release.

This reverts commit f316812150a4fbb52720fe7fb7702c5a52c37602.
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
Reviewed-By: NXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

include/linux/mm_types.h

@@ -369,6 +369,16 @@ struct mm_struct {
 		unsigned long highest_vm_end;	/* highest vma end address */
 		pgd_t * pgd;
 
+#ifdef CONFIG_MEMBARRIER
+		/**
+		 * @membarrier_state: Flags controlling membarrier behavior.
+		 *
+		 * This field is close to @pgd to hopefully fit in the same
+		 * cache-line, which needs to be touched by switch_mm().
+		 */
+		atomic_t membarrier_state;
+#endif
+
 		/**
 		 * @mm_users: The number of users including userspace.
 		 *
@@ -439,16 +449,6 @@ struct mm_struct {
 
 		struct core_state *core_state; /* coredumping support */
 
-#ifdef CONFIG_MEMBARRIER
-		/**
-		 * @membarrier_state: Flags controlling membarrier behavior.
-		 *
-		 * This field is close to @pgd to hopefully fit in the same
-		 * cache-line, which needs to be touched by switch_mm().
-		 */
-		atomic_t membarrier_state;
-#endif
-
 #ifdef CONFIG_AIO
 		spinlock_t			ioctx_lock;
 		struct kioctx_table __rcu	*ioctx_table;

kernel/sched/sched.h

@@ -843,6 +843,10 @@ struct rq {
 
 	atomic_t		nr_iowait;
 
+#ifdef CONFIG_MEMBARRIER
+	int membarrier_state;
+#endif
+
 #ifdef CONFIG_SMP
 	struct root_domain	*rd;
 	struct sched_domain	*sd;
@@ -926,14 +930,7 @@ struct rq {
 	struct cpuidle_state	*idle_state;
 #endif
 
-#if defined(CONFIG_MEMBARRIER) && !defined(__GENKSYMS__)
-	union {
-		int membarrier_state;
-		long membarrier_state_KABI;
-	};
-#else
 	KABI_RESERVE(1)
-#endif
 	KABI_RESERVE(2)
 };