From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932297AbbJUKGB (ORCPT ); Wed, 21 Oct 2015 06:06:01 -0400 Received: from terminus.zytor.com ([198.137.202.10]:42150 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753883AbbJUKGA (ORCPT ); Wed, 21 Oct 2015 06:06:00 -0400 Date: Wed, 21 Oct 2015 03:05:06 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: chaowang@redhat.com, luto@amacapital.net, akpm@linux-foundation.org, bp@suse.de, linux-kernel@vger.kernel.org, hpa@zytor.com, jgross@suse.com, jkosina@suse.cz, peterz@infradead.org, mingo@kernel.org, tglx@linutronix.de, dyoung@redhat.com, msalter@redhat.com, jroedel@suse.de, torvalds@linux-foundation.org Reply-To: dyoung@redhat.com, msalter@redhat.com, torvalds@linux-foundation.org, jroedel@suse.de, jgross@suse.com, hpa@zytor.com, mingo@kernel.org, jkosina@suse.cz, peterz@infradead.org, tglx@linutronix.de, akpm@linux-foundation.org, bp@suse.de, linux-kernel@vger.kernel.org, chaowang@redhat.com, luto@amacapital.net In-Reply-To: <1445246268-26285-5-git-send-email-bp@alien8.de> References: <1445246268-26285-5-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/setup/crash: Remove alignment variable Git-Commit-ID: 606134f77ce22997fd2800d5937698d85c6990d9 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: 606134f77ce22997fd2800d5937698d85c6990d9 Gitweb: http://git.kernel.org/tip/606134f77ce22997fd2800d5937698d85c6990d9 Author: Borislav Petkov AuthorDate: Mon, 19 Oct 2015 11:17:44 +0200 Committer: Ingo Molnar CommitDate: Wed, 21 Oct 2015 11:10:56 +0200 x86/setup/crash: Remove alignment variable Use a macro instead. No functionality change. Signed-off-by: Borislav Petkov Reviewed-by: Dave Young Reviewed-by: Joerg Roedel Cc: Andrew Morton Cc: Andy Lutomirski Cc: H. Peter Anvin Cc: Jiri Kosina Cc: Juergen Gross Cc: Linus Torvalds Cc: Mark Salter Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: WANG Chao Cc: jerry_hoemann@hp.com Link: http://lkml.kernel.org/r/1445246268-26285-5-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/setup.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index fd9e178..ea086dd 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -480,6 +480,9 @@ static void __init memblock_x86_reserve_range_setup_data(void) #ifdef CONFIG_KEXEC_CORE +/* 16M alignment for crash kernel regions */ +#define CRASH_ALIGN (16 << 20) + /* * Keep the crash kernel below this limit. On 32 bits earlier kernels * would limit the kernel to the low 512 MiB due to mapping restrictions. @@ -496,7 +499,6 @@ static void __init memblock_x86_reserve_range_setup_data(void) static int __init reserve_crashkernel_low(void) { #ifdef CONFIG_X86_64 - const unsigned long long alignment = 16<<20; /* 16M */ unsigned long long low_base = 0, low_size = 0; unsigned long total_low_mem; unsigned long long base; @@ -525,7 +527,7 @@ static int __init reserve_crashkernel_low(void) return 0; } - low_base = memblock_find_in_range(low_size, 1ULL << 32, low_size, alignment); + low_base = memblock_find_in_range(low_size, 1ULL << 32, low_size, CRASH_ALIGN); if (!low_base) { pr_err("Cannot reserve %ldMB crashkernel low memory, please try smaller size.\n", (unsigned long)(low_size >> 20)); @@ -548,7 +550,6 @@ static int __init reserve_crashkernel_low(void) static void __init reserve_crashkernel(void) { - const unsigned long long alignment = 16<<20; /* 16M */ unsigned long long total_mem; unsigned long long crash_size, crash_base; bool high = false; @@ -572,10 +573,10 @@ static void __init reserve_crashkernel(void) /* * kexec want bzImage is below CRASH_KERNEL_ADDR_MAX */ - crash_base = memblock_find_in_range(alignment, + crash_base = memblock_find_in_range(CRASH_ALIGN, high ? CRASH_ADDR_HIGH_MAX : CRASH_ADDR_LOW_MAX, - crash_size, alignment); + crash_size, CRASH_ALIGN); if (!crash_base) { pr_info("crashkernel reservation failed - No suitable area found.\n"); return;