From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754580AbdKALdN (ORCPT ); Wed, 1 Nov 2017 07:33:13 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:16588 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753474AbdKALdJ (ORCPT ); Wed, 1 Nov 2017 07:33:09 -0400 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="29810167" From: Chao Fan To: , , , , , , , CC: , , , Chao Fan Subject: [PATCH v2 4/4] kaslr: clean up a useless variable and some usless space Date: Wed, 1 Nov 2017 19:32:03 +0800 Message-ID: <20171101113203.27741-5-fanc.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171101113203.27741-1-fanc.fnst@cn.fujitsu.com> References: <20171101113203.27741-1-fanc.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain X-yoursite-MailScanner-ID: 5D1A0481849E.ABE13 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: fanc.fnst@cn.fujitsu.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There are two same variable "rc" in this function. 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 fcd640fdeaed..aff184e19270 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c @@ -211,7 +211,6 @@ static int parse_immovable_mem(char *p, static void mem_avoid_memmap(char *str) { static int i; - int rc; if (i >= MAX_MEMMAP_REGIONS) return; @@ -290,7 +289,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); @@ -436,7 +435,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; -- 2.13.6