linux-kernel - [PATCH] x86: fix double definition for __VIRTUAL_MASK

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20190508204411.13452-1-ynorov@marvell.com>
Date:   Wed,  8 May 2019 13:44:11 -0700
From:   Yury Norov <yury.norov@...il.com>
To:     Thomas Gleixner <tglx@...utronix.de>,
        Ingo Molnar <mingo@...hat.com>, Borislav Petkov <bp@...en8.de>,
        "H. Peter Anvin" <hpa@...or.com>, Andi Kleen <ak@...ux.intel.com>,
        Michal Hocko <mhocko@...e.com>,
        Josh Poimboeuf <jpoimboe@...hat.com>,
        Dave Hansen <dave.hansen@...el.com>
Cc:     Yury Norov <ynorov@...vell.com>, x86@...nel.org,
        linux-kernel@...r.kernel.org
Subject: [PATCH] x86: fix double definition for __VIRTUAL_MASK_SHIFT

__VIRTUAL_MASK_SHIFT is defined twice to the same valie in
arch/x86/include/asm/page_32_types.h. Fix it.

Signed-off-by: Yury Norov <ynorov@...vell.com>
---
 arch/x86/include/asm/page_32_types.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/x86/include/asm/page_32_types.h b/arch/x86/include/asm/page_32_types.h
index 0d5c739eebd7..9bfac5c80d89 100644
--- a/arch/x86/include/asm/page_32_types.h
+++ b/arch/x86/include/asm/page_32_types.h
@@ -28,6 +28,8 @@
 #define MCE_STACK 0
 #define N_EXCEPTION_STACKS 1
 
+#define __VIRTUAL_MASK_SHIFT	32
+
 #ifdef CONFIG_X86_PAE
 /*
  * This is beyond the 44 bit limit imposed by the 32bit long pfns,
@@ -36,11 +38,8 @@
  * The real limit is still 44 bits.
  */
 #define __PHYSICAL_MASK_SHIFT	52
-#define __VIRTUAL_MASK_SHIFT	32
-
 #else  /* !CONFIG_X86_PAE */
 #define __PHYSICAL_MASK_SHIFT	32
-#define __VIRTUAL_MASK_SHIFT	32
 #endif	/* CONFIG_X86_PAE */
 
 /*
-- 
2.17.1