From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752771AbcKYGrf (ORCPT ); Fri, 25 Nov 2016 01:47:35 -0500 Received: from terminus.zytor.com ([198.137.202.10]:59938 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752240AbcKYGra (ORCPT ); Fri, 25 Nov 2016 01:47:30 -0500 Date: Thu, 24 Nov 2016 22:46:03 -0800 From: tip-bot for Borislav Petkov Message-ID: Cc: torvalds@linux-foundation.org, bp@alien8.de, luto@kernel.org, mingo@kernel.org, jpoimboe@redhat.com, linux-kernel@vger.kernel.org, peterz@infradead.org, dvlasenk@redhat.com, brgerst@gmail.com, tglx@linutronix.de, hpa@zytor.com, bp@suse.de Reply-To: mingo@kernel.org, bp@alien8.de, luto@kernel.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, jpoimboe@redhat.com, dvlasenk@redhat.com, peterz@infradead.org, brgerst@gmail.com, tglx@linutronix.de, hpa@zytor.com, bp@suse.de In-Reply-To: <20161124210550.15025-1-bp@alien8.de> References: <20161124210550.15025-1-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/boot/64: Use defines for page size Git-Commit-ID: 9b032d21f6482ee305dcdec418c15153614b1dcc X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 9b032d21f6482ee305dcdec418c15153614b1dcc Gitweb: http://git.kernel.org/tip/9b032d21f6482ee305dcdec418c15153614b1dcc Author: Borislav Petkov AuthorDate: Thu, 24 Nov 2016 22:05:50 +0100 Committer: Ingo Molnar CommitDate: Fri, 25 Nov 2016 07:11:29 +0100 x86/boot/64: Use defines for page size ... instead of naked numbers like the rest of the asm does in this file. No code changed: # arch/x86/kernel/head_64.o: text data bss dec hex filename 1124 290864 4096 296084 48494 head_64.o.before 1124 290864 4096 296084 48494 head_64.o.after md5: 87086e202588939296f66e892414ffe2 head_64.o.before.asm 87086e202588939296f66e892414ffe2 head_64.o.after.asm Signed-off-by: Borislav Petkov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20161124210550.15025-1-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/head_64.S | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index b07cd27..a15d381 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -112,20 +112,20 @@ startup_64: movq %rdi, %rax shrq $PGDIR_SHIFT, %rax - leaq (4096 + _KERNPG_TABLE)(%rbx), %rdx + leaq (PAGE_SIZE + _KERNPG_TABLE)(%rbx), %rdx movq %rdx, 0(%rbx,%rax,8) movq %rdx, 8(%rbx,%rax,8) - addq $4096, %rdx + addq $PAGE_SIZE, %rdx movq %rdi, %rax shrq $PUD_SHIFT, %rax andl $(PTRS_PER_PUD-1), %eax - movq %rdx, 4096(%rbx,%rax,8) + movq %rdx, PAGE_SIZE(%rbx,%rax,8) incl %eax andl $(PTRS_PER_PUD-1), %eax - movq %rdx, 4096(%rbx,%rax,8) + movq %rdx, PAGE_SIZE(%rbx,%rax,8) - addq $8192, %rbx + addq $PAGE_SIZE * 2, %rbx movq %rdi, %rax shrq $PMD_SHIFT, %rdi addq $(__PAGE_KERNEL_LARGE_EXEC & ~_PAGE_GLOBAL), %rax