From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753284AbdKWQeZ (ORCPT ); Thu, 23 Nov 2017 11:34:25 -0500 Received: from Galois.linutronix.de ([146.0.238.70]:44077 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752880AbdKWQeY (ORCPT ); Thu, 23 Nov 2017 11:34:24 -0500 Date: Thu, 23 Nov 2017 17:34:03 +0100 (CET) From: Thomas Gleixner To: Chao Fan cc: hpa@zytor.com, mingo@redhat.com, x86@kernel.org, keescook@chromium.org, gregkh@linuxfoundation.org, n-horiguchi@ah.jp.nec.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH] kaslr: clean up a useless variable and some usless space In-Reply-To: <20171123090847.15293-1-fanc.fnst@cn.fujitsu.com> Message-ID: References: <20171123090847.15293-1-fanc.fnst@cn.fujitsu.com> User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 23 Nov 2017, Chao Fan wrote: > There are two same variable "rc" in mem_avoid_memmap. One is in the > circulation, the other is out of the circulation. The one out will never > be used, so drop it. > > Signed-off-by: Chao Fan > --- > 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 a63fbc25ce84..8199a6187251 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"); This change is unrelated. > > 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++];) Ditto. > ; > mem_avoid[MEM_AVOID_CMDLINE].start = cmd_line; > mem_avoid[MEM_AVOID_CMDLINE].size = cmd_line_size; Thanks, tglx