Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull two sparc fixes from David S. Miller.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Be less verbose during vmemmap population.
sparc64: do not clobber personality flags in sys_sparc64_personality()
+28
-10
+5
-5
arch/sparc/kernel/sys_sparc_64.c
+5
-5
arch/sparc/kernel/sys_sparc_64.c
···
502
502
{
503
503
int ret;
504
504
505
-
if (current->personality == PER_LINUX32 &&
506
-
personality == PER_LINUX)
507
-
personality = PER_LINUX32;
505
+
if (personality(current->personality) == PER_LINUX32 &&
506
+
personality(personality) == PER_LINUX)
507
+
personality |= PER_LINUX32;
508
508
ret = sys_personality(personality);
509
-
if (ret == PER_LINUX32)
510
-
ret = PER_LINUX;
509
+
if (personality(ret) == PER_LINUX32)
510
+
ret &= ~PER_LINUX32;
511
511
512
512
return ret;
513
513
}
+23
-5
arch/sparc/mm/init_64.c
+23
-5
arch/sparc/mm/init_64.c
···
2020
2020
#ifdef CONFIG_SPARSEMEM_VMEMMAP
2021
2021
unsigned long vmemmap_table[VMEMMAP_SIZE];
2022
2022
2023
+
static long __meminitdata addr_start, addr_end;
2024
+
static int __meminitdata node_start;
2025
+
2023
2026
int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node)
2024
2027
{
2025
2028
unsigned long vstart = (unsigned long) start;
···
2053
2050
2054
2051
*vmem_pp = pte_base | __pa(block);
2055
2052
2056
-
printk(KERN_INFO "[%p-%p] page_structs=%lu "
2057
-
"node=%d entry=%lu/%lu\n", start, block, nr,
2058
-
node,
2059
-
addr >> VMEMMAP_CHUNK_SHIFT,
2060
-
VMEMMAP_SIZE);
2053
+
/* check to see if we have contiguous blocks */
2054
+
if (addr_end != addr || node_start != node) {
2055
+
if (addr_start)
2056
+
printk(KERN_DEBUG " [%lx-%lx] on node %d\n",
2057
+
addr_start, addr_end-1, node_start);
2058
+
addr_start = addr;
2059
+
node_start = node;
2060
+
}
2061
+
addr_end = addr + VMEMMAP_CHUNK;
2061
2062
}
2062
2063
}
2063
2064
return 0;
2065
+
}
2066
+
2067
+
void __meminit vmemmap_populate_print_last(void)
2068
+
{
2069
+
if (addr_start) {
2070
+
printk(KERN_DEBUG " [%lx-%lx] on node %d\n",
2071
+
addr_start, addr_end-1, node_start);
2072
+
addr_start = 0;
2073
+
addr_end = 0;
2074
+
node_start = 0;
2075
+
}
2064
2076
}
2065
2077
#endif /* CONFIG_SPARSEMEM_VMEMMAP */
2066
2078