Commit-ID: 69550d41ff9c884c6d996fca41037974b2255852 Gitweb: https://git.kernel.org/tip/69550d41ff9c884c6d996fca41037974b2255852 Author: Chao Fan <fanc.f...@cn.fujitsu.com> AuthorDate: Thu, 23 Nov 2017 17:08:47 +0800 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Thu, 23 Nov 2017 20:17:59 +0100
x86/boot/KASLR: Remove unused variable There are two variables "rc" in mem_avoid_memmap. One at the top of the function and another one inside the while() loop. Drop the outer one as it is unused. Cleanup some whitespace damage while at it. Signed-off-by: Chao Fan <fanc.f...@cn.fujitsu.com> Signed-off-by: Thomas Gleixner <t...@linutronix.de> Cc: gre...@linuxfoundation.org Cc: n-horigu...@ah.jp.nec.com Cc: keesc...@chromium.org Link: https://lkml.kernel.org/r/20171123090847.15293-1-fanc.f...@cn.fujitsu.com --- arch/x86/boot/compressed/kaslr.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c index a63fbc2..8199a61 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c @@ -171,7 +171,6 @@ parse_memmap(char *p, unsigned long long *start, unsigned long long *size) static void mem_avoid_memmap(char *str) { static int i; - int rc; if (i >= MAX_MEMMAP_REGIONS) return; @@ -219,7 +218,7 @@ static int handle_mem_memmap(void) return 0; tmp_cmdline = malloc(len + 1); - if (!tmp_cmdline ) + if (!tmp_cmdline) error("Failed to allocate space for tmp_cmdline"); memcpy(tmp_cmdline, args, len); @@ -363,7 +362,7 @@ static void mem_avoid_init(unsigned long input, unsigned long input_size, cmd_line |= boot_params->hdr.cmd_line_ptr; /* Calculate size of cmd_line. */ ptr = (char *)(unsigned long)cmd_line; - for (cmd_line_size = 0; ptr[cmd_line_size++]; ) + for (cmd_line_size = 0; ptr[cmd_line_size++];) ; mem_avoid[MEM_AVOID_CMDLINE].start = cmd_line; mem_avoid[MEM_AVOID_CMDLINE].size = cmd_line_size;
