From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752220AbbJOIVn (ORCPT ); Thu, 15 Oct 2015 04:21:43 -0400 Received: from mail.skyhub.de ([78.46.96.112]:56193 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750817AbbJOIUi (ORCPT ); Thu, 15 Oct 2015 04:20:38 -0400 From: Borislav Petkov To: LKML Cc: Andrew Morton , Andy Lutomirski , Dave Young , "H. Peter Anvin" , Ingo Molnar , jerry_hoemann@hp.com, Jiri Kosina , Joerg Roedel , Juergen Gross , Mark Salter , Thomas Gleixner , WANG Chao , x86-ml Subject: [PATCH 2/5] x86/setup/crash: Remove alignment variable Date: Thu, 15 Oct 2015 10:20:28 +0200 Message-Id: <1444897231-7906-3-git-send-email-bp@alien8.de> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1444897231-7906-1-git-send-email-bp@alien8.de> References: <1444897231-7906-1-git-send-email-bp@alien8.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Borislav Petkov Use a macro instead. No functionality change. Cc: Andrew Morton Cc: Andy Lutomirski Cc: Dave Young Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: jerry_hoemann@hp.com Cc: Jiri Kosina Cc: Joerg Roedel Cc: Juergen Gross Cc: Mark Salter Cc: Thomas Gleixner Cc: WANG Chao Cc: x86-ml Signed-off-by: Borislav Petkov --- 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 fd9e178aa890..ea086dd8e821 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; -- 2.3.5