The patch titled
have-x86-use-add_active_range-and-free_area_init_nodes-fix
has been removed from the -mm tree. Its filename is
have-x86-use-add_active_range-and-free_area_init_nodes-fix.patch
This patch was dropped because it was folded into have-x86-use-add_active_range-and-free_area_init_nodes.patch
------------------------------------------------------
Subject: have-x86-use-add_active_range-and-free_area_init_nodes-fix
From: Andrew Morton <akpm@xxxxxxxx>
arch/i386/kernel/setup.c: In function 'zone_sizes_init':
arch/i386/kernel/setup.c:1079: error: 'highend_pfn' undeclared (first use in this function)
arch/i386/kernel/setup.c:1079: error: (Each undeclared identifier is reported only once
arch/i386/kernel/setup.c:1079: error: for each function it appears in.)
arch/i386/kernel/setup.c:1079: warning: excess elements in array initializer
arch/i386/kernel/setup.c:1079: warning: (near initialization for 'max_zone_pfns')
Cc: Mel Gorman <mel@xxxxxxxxx>
Cc: Dave Hansen <haveblue@xxxxxxxxxx>
Cc: Andy Whitcroft <apw@xxxxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: "Keith Mannthey" <kmannth@xxxxxxxxx>
Cc: "Luck, Tony" <tony.luck@xxxxxxxxx>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: Yasunori Goto <y-goto@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/setup.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff -puN arch/i386/kernel/setup.c~have-x86-use-add_active_range-and-free_area_init_nodes-fix arch/i386/kernel/setup.c
--- a/arch/i386/kernel/setup.c~have-x86-use-add_active_range-and-free_area_init_nodes-fix
+++ a/arch/i386/kernel/setup.c
@@ -1039,15 +1039,19 @@ static unsigned long __init setup_memory
void __init zone_sizes_init(void)
{
+#ifdef CONFIG_HIGHMEM
unsigned long max_zone_pfns[MAX_NR_ZONES] = {
virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT,
max_low_pfn,
highend_pfn};
-#ifndef CONFIG_HIGHMEM
- unsigned long highend_pfn = max_low_pfn;
+ add_active_range(0, 0, highend_pfn);
+#else
+ unsigned long max_zone_pfns[MAX_NR_ZONES] = {
+ virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT,
+ max_low_pfn};
+ add_active_range(0, 0, max_low_pfn);
#endif
- add_active_range(0, 0, highend_pfn);
free_area_init_nodes(max_zone_pfns);
}
#else
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
revert-x86_64-mm-i386-remove-lock-section.patch
fix-x86_64-mm-spinlock-cleanup.patch
have-x86-use-add_active_range-and-free_area_init_nodes.patch
have-x86-use-add_active_range-and-free_area_init_nodes-fix.patch
vm-add-per-zone-writeout-counter.patch
slab-fix-kmalloc_node-applying-memory-policies-if-nodeid-==-numa_node_id-fix.patch
gfp_thisnode-for-the-slab-allocator-v2-fix.patch
do_no_pfn-tweaks.patch
nommu-set-bdi-capabilities-for-dev-mem-and-dev-kmem-tidy.patch
nommu-move-the-fallback-arch_vma_name-to-a-sensible-place-fix.patch
inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-fix-fix.patch
x86-microcode-microcode-driver-cleanup-tidy.patch
x86-microcode-add-sysfs-and-hotplug-support-fix.patch
eisa-bus-modalias-attributes-support-1-fix-git-kbuild-fix.patch
add-address_space_operationsbatch_write-fix.patch
alloc_fdtable-cleanup.patch
sysctl-allow-proc-sys-without-sys_sysctl-fix.patch
add-probe_kernel_address.patch
x86-use-probe_kernel_address-in-handle_bug.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
