On Mon, Nov 13, 2017 at 04:32:33PM +0800, Baoquan He wrote: >On 11/01/17 at 07:32pm, Chao Fan wrote: >> 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. > >You can send this clean up patch alone. > OK, I will send it as a new patch.
Thanks, Chao Fan >> >> Signed-off-by: Chao Fan <[email protected]> >> --- >> 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 >> >> >> > >
