The following commit has been merged into the x86/build branch of tip:

Commit-ID:     2d0004d19829c84aaf2c7d48b5e2892d548970b6
Gitweb:        
https://git.kernel.org/tip/2d0004d19829c84aaf2c7d48b5e2892d548970b6
Author:        Kees Cook <[email protected]>
AuthorDate:    Tue, 29 Oct 2019 14:13:48 -07:00
Committer:     Borislav Petkov <[email protected]>
CommitterDate: Mon, 04 Nov 2019 18:46:55 +01:00

x86/mm: Remove redundant address-of operators on addresses

The &s on addresses are redundant. Remove them to match all the other
similar functions.

Signed-off-by: Kees Cook <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Dave Hansen <[email protected]>
Cc: Heiko Carstens <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: Michael Ellerman <[email protected]>
Cc: Michal Simek <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Rick Edgecombe <[email protected]>
Cc: Segher Boessenkool <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Will Deacon <[email protected]>
Cc: x86-ml <[email protected]>
Cc: Yoshinori Sato <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
---
 arch/x86/mm/init_64.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 26299e9..e67ddca 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -1300,9 +1300,9 @@ void mark_rodata_ro(void)
 {
        unsigned long start = PFN_ALIGN(_text);
        unsigned long rodata_start = PFN_ALIGN(__start_rodata);
-       unsigned long end = (unsigned long) &__end_rodata_hpage_align;
-       unsigned long text_end = PFN_ALIGN(&_etext);
-       unsigned long rodata_end = PFN_ALIGN(&__end_rodata);
+       unsigned long end = (unsigned long)__end_rodata_hpage_align;
+       unsigned long text_end = PFN_ALIGN(_etext);
+       unsigned long rodata_end = PFN_ALIGN(__end_rodata);
        unsigned long all_end;
 
        printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n",

Reply via email to