On Thu, Jun 04, 2015 at 07:42:38AM +0200, Ingo Molnar wrote: > >* Wei Yang <[email protected]> wrote: > >> pa_data and found are highly related, so there is no need to set a found >> flag. >> >> This patch removes the found and just return when pa_data is NULL. >> >> Signed-off-by: Wei Yang <[email protected]> >> --- >> arch/x86/kernel/setup.c | 7 +++---- >> 1 file changed, 3 insertions(+), 4 deletions(-) >> >> diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c >> index 0a2421c..b95e653 100644 >> --- a/arch/x86/kernel/setup.c >> +++ b/arch/x86/kernel/setup.c >> @@ -461,19 +461,18 @@ static void __init e820_reserve_setup_data(void) >> { >> struct setup_data *data; >> u64 pa_data; >> - int found = 0; >> >> pa_data = boot_params.hdr.setup_data; >> + if (!pa_data) >> + return; >> + >> while (pa_data) { >> data = early_memremap(pa_data, sizeof(*data)); >> e820_update_range(pa_data, sizeof(*data)+data->len, >> E820_RAM, E820_RESERVED_KERN); >> - found = 1; >> pa_data = data->next; >> early_iounmap(data, sizeof(*data)); >> } >> - if (!found) >> - return; >> >> sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); >> memcpy(&e820_saved, &e820, sizeof(struct e820map)); > >This patch does not apply to Linus's latest tree.
Thanks Ingo. Rebased on top of v4.1-rc6. > >Thanks, > > Ingo -- Richard Yang Help you, Help me -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
