Patch "ARM: 8636/1: Cleanup sanity_check_meminfo" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jun 12, 2017

Subsystems (2)

Stable branch Arm (32-bit)

lore

Share & tools

lore

[email protected]

author maintainer Applied

2017-06-12 13:44 UTC #0 lore raw

This is a note to let you know that I've just added the patch titled

ARM: 8636/1: Cleanup sanity_check_meminfo

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:

     arm-8636-1-cleanup-sanity_check_meminfo.patch

and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 374d446d25d6271ee615952a3b7f123ba4983c35 Mon Sep 17 00:00:00 2001

From: Laura Abbott <[email protected]>
Date: Fri, 13 Jan 2017 22:51:08 +0100
Subject: ARM: 8636/1: Cleanup sanity_check_meminfo

From: Laura Abbott <[email protected]>

commit 374d446d25d6271ee615952a3b7f123ba4983c35 upstream.

The logic for sanity_check_meminfo has become difficult to follow. Clean up the code so it's more obvious what the code is actually trying to do. Additionally, meminfo is now removed so rename the function to better describe its purpose.

Tested-by Magnus Lilja <[email protected]>

Reviewed-by Nicolas Pitre <[email protected]>

Signed-off-by Laura Abbott <[email protected]>

Signed-off-by Russell King <[email protected]>

Cc Julien Grall <[email protected]>

Signed-off-by Greg Kroah-Hartman <[email protected]>

---
 arch/arm/kernel/setup.c |    4 +-
 arch/arm/mm/mmu.c       |   66 +++++++++++++++++-------------------------------
 arch/arm/mm/nommu.c     |    8 ++---
 3 files changed, 30 insertions(+), 48 deletions(-)

arch/arm/kernel/setup.c +2 -2

@@ -81,7 +81,7 @@ __setup("fpe=", fpe_setup);
 extern void init_default_cache_policy(unsigned long);
 extern void paging_init(const struct machine_desc *desc);
 extern void early_paging_init(const struct machine_desc *);
-extern void sanity_check_meminfo(void);
+extern void adjust_lowmem_bounds(void);
 extern enum reboot_mode reboot_mode;
 extern void setup_dma_zone(const struct machine_desc *desc);

@@ -1093,7 +1093,7 @@ void __init setup_arch(char **cmdline_p)
 	setup_dma_zone(mdesc);
 	xen_early_init();
 	efi_init();
-	sanity_check_meminfo();
+	adjust_lowmem_bounds();
 	arm_memblock_init(mdesc);
 
 	early_ioremap_reset();

arch/arm/mm/mmu.c +24 ~~-42~~

95 lines not on this page · raw message

arch/arm/mm/nommu.c +4 -4

@@ -85,7 +85,7 @@ static unsigned long irbar_read(void)
 }
 
 /* MPU initialisation functions */
-void __init sanity_check_meminfo_mpu(void)
+void __init adjust_lowmem_bounds_mpu(void)
 {
 	phys_addr_t phys_offset = PHYS_OFFSET;
 	phys_addr_t aligned_region_size, specified_mem_size, rounded_mem_size;

@@ -274,7 +274,7 @@ void __init mpu_setup(void)
 	}
 }
 #else
-static void sanity_check_meminfo_mpu(void) {}
+static void adjust_lowmem_bounds_mpu(void) {}
 static void __init mpu_setup(void) {}
 #endif /* CONFIG_ARM_MPU */

@@ -295,10 +295,10 @@ void __init arm_mm_memblock_reserve(void
 #endif
 }
 
-void __init sanity_check_meminfo(void)
+void __init adjust_lowmem_bounds(void)
 {
 	phys_addr_t end;
-	sanity_check_meminfo_mpu();
+	adjust_lowmem_bounds_mpu();
 	end = memblock_end_of_DRAM();
 	high_memory = __va(end - 1) + 1;
 	memblock_set_current_limit(end);

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/arm-8636-1-cleanup-sanity_check_meminfo.patch queue-4.9/arm-8637-1-adjust-memory-boundaries-after-reservations.patch