Commit-ID: 7389882c81474d635a208726edb22938645ff9ad Gitweb: http://git.kernel.org/tip/7389882c81474d635a208726edb22938645ff9ad Author: WANG Chao <chaow...@redhat.com> AuthorDate: Wed, 7 Jan 2015 18:55:48 +0800 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Fri, 23 Jan 2015 16:14:26 +0100
x86, setup: Let early_memremap() handle page alignment early_memremap() takes care of page alignment and map size, so we can just remap the required data size and get rid of the adjustments in the setup code. [tglx: Massaged changelog ] Signed-off-by: WANG Chao <chaow...@redhat.com> Cc: Matt Fleming <matt.flem...@intel.com> Cc: Borislav Petkov <b...@suse.de> Cc: Santosh Shilimkar <santosh.shilim...@ti.com> Cc: Bryan O'Donoghue <pure.lo...@nexus-software.ie> Link: http://lkml.kernel.org/r/1420628150-16872-1-git-send-email-chaow...@redhat.com Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- arch/x86/kernel/setup.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index ab4734e..c4648ada 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -431,15 +431,13 @@ static void __init parse_setup_data(void) pa_data = boot_params.hdr.setup_data; while (pa_data) { - u32 data_len, map_len, data_type; + u32 data_len, data_type; - map_len = max(PAGE_SIZE - (pa_data & ~PAGE_MASK), - (u64)sizeof(struct setup_data)); - data = early_memremap(pa_data, map_len); + data = early_memremap(pa_data, sizeof(*data)); data_len = data->len + sizeof(struct setup_data); data_type = data->type; pa_next = data->next; - early_iounmap(data, map_len); + early_iounmap(data, sizeof(*data)); switch (data_type) { case SETUP_E820_EXT: -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
