UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86/setup/crash: Cleanup some more 

* Remove unused auto_set variable
* Cleanup local function variable declarations
* Reformat printk string and use pr_info()

No functionality change.

Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Dave Young <dyoung@redhat.com>
Reviewed-by: Joerg Roedel <jroedel@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mark Salter <msalter@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: WANG Chao <chaowang@redhat.com>
Cc: jerry_hoemann@hp.com
Link: http://lkml.kernel.org/r/1445246268-26285-6-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Borislav Petkov 2015-10-19 11:17:45 +02:00 committed by Ingo Molnar
parent 606134f77c
commit f56d55781c
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/x86/kernel/setup.c
View File

@ -499,17 +499,15 @@ static void __init memblock_x86_reserve_range_setup_data(void)
static int __init reserve_crashkernel_low(void) static int __init reserve_crashkernel_low(void)
{ {
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
unsigned long long low_base = 0, low_size = 0; unsigned long long base, low_base = 0, low_size = 0;
unsigned long total_low_mem; unsigned long total_low_mem;
unsigned long long base;
bool auto_set = false;
int ret; int ret;
total_low_mem = memblock_mem_size(1UL << (32 - PAGE_SHIFT)); total_low_mem = memblock_mem_size(1UL << (32 - PAGE_SHIFT));
/* crashkernel=Y,low */ /* crashkernel=Y,low */
ret = parse_crashkernel_low(boot_command_line, total_low_mem, &low_size, &base); ret = parse_crashkernel_low(boot_command_line, total_low_mem, &low_size, &base);
if (ret != 0) { if (ret) {
/* /*
* two parts from lib/swiotlb.c: * two parts from lib/swiotlb.c:
* -swiotlb size: user-specified with swiotlb= or default. * -swiotlb size: user-specified with swiotlb= or default.
@ -520,7 +518,6 @@ static int __init reserve_crashkernel_low(void)
* don't run out of DMA buffers for 32-bit devices. * don't run out of DMA buffers for 32-bit devices.
*/ */
low_size = max(swiotlb_size_or_default() + (8UL << 20), 256UL << 20); low_size = max(swiotlb_size_or_default() + (8UL << 20), 256UL << 20);
auto_set = true;
} else { } else {
/* passed with crashkernel=0,low ? */ /* passed with crashkernel=0,low ? */
if (!low_size) if (!low_size)
@ -550,8 +547,7 @@ static int __init reserve_crashkernel_low(void)
static void __init reserve_crashkernel(void) static void __init reserve_crashkernel(void)
{ {
unsigned long long total_mem; unsigned long long crash_size, crash_base, total_mem;
unsigned long long crash_size, crash_base;
bool high = false; bool high = false;
int ret; int ret;
@ -600,11 +596,10 @@ static void __init reserve_crashkernel(void)
return; return;
} }
printk(KERN_INFO "Reserving %ldMB of memory at %ldMB " pr_info("Reserving %ldMB of memory at %ldMB for crashkernel (System RAM: %ldMB)\n",
"for crashkernel (System RAM: %ldMB)\n", (unsigned long)(crash_size >> 20),
(unsigned long)(crash_size >> 20), (unsigned long)(crash_base >> 20),
(unsigned long)(crash_base >> 20), (unsigned long)(total_mem >> 20));
(unsigned long)(total_mem >> 20));
crashk_res.start = crash_base; crashk_res.start = crash_base;
crashk_res.end = crash_base + crash_size - 1; crashk_res.end = crash_base + crash_size - 1;