mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branch 'akpm' (updates from Andrew Morton)
Merge first patch-bomb from Andrew Morton: - various misc bits - I'm been patchmonkeying ocfs2 for a while, as Joel and Mark have been distracted. There has been quite a bit of activity. - About half the MM queue - Some backlight bits - Various lib/ updates - checkpatch updates - zillions more little rtc patches - ptrace - signals - exec - procfs - rapidio - nbd - aoe - pps - memstick - tools/testing/selftests updates * emailed patches from Andrew Morton <[email protected]>: (445 commits) tools/testing/selftests: don't assume the x bit is set on scripts selftests: add .gitignore for kcmp selftests: fix clean target in kcmp Makefile selftests: add .gitignore for vm selftests: add hugetlbfstest self-test: fix make clean selftests: exit 1 on failure kernel/resource.c: remove the unneeded assignment in function __find_resource aio: fix wrong comment in aio_complete() drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode drivers/memstick/host/r592.c: convert to module_pci_driver drivers/memstick/host/jmb38x_ms: convert to module_pci_driver pps-gpio: add device-tree binding and support drivers/pps/clients/pps-gpio.c: convert to module_platform_driver drivers/pps/clients/pps-gpio.c: convert to devm_* helpers drivers/parport/share.c: use kzalloc Documentation/accounting/getdelays.c: avoid strncpy in accounting tool aoe: update internal version number to v83 aoe: update copyright date aoe: perform I/O completions in parallel ...
This commit is contained in:
Linus Torvalds
commit
7f0ef0267e
429 changed files with 6278 additions and 4934 deletions
|
|
@ -735,7 +735,7 @@ static void __init parse_cmdline_early(char *cmdline)
|
|||
/* "mem=XXX[kKmM]" sets SDRAM size to <mem>, overriding the value we worked
|
||||
* out from the SDRAM controller mask register
|
||||
*/
|
||||
if (!memcmp(cmdline, "mem=", 4)) {
|
||||
if (!strncmp(cmdline, "mem=", 4)) {
|
||||
unsigned long long mem_size;
|
||||
|
||||
mem_size = memparse(cmdline + 4, &cmdline);
|
||||
|
|
@ -876,6 +876,7 @@ late_initcall(setup_arch_serial);
|
|||
static void __init setup_linux_memory(void)
|
||||
{
|
||||
unsigned long bootmap_size, low_top_pfn, kstart, kend, high_mem;
|
||||
unsigned long physpages;
|
||||
|
||||
kstart = (unsigned long) &__kernel_image_start - PAGE_OFFSET;
|
||||
kend = (unsigned long) &__kernel_image_end - PAGE_OFFSET;
|
||||
|
|
@ -893,19 +894,19 @@ static void __init setup_linux_memory(void)
|
|||
);
|
||||
|
||||
/* pass the memory that the kernel can immediately use over to the bootmem allocator */
|
||||
max_mapnr = num_physpages = (memory_end - memory_start) >> PAGE_SHIFT;
|
||||
max_mapnr = physpages = (memory_end - memory_start) >> PAGE_SHIFT;
|
||||
low_top_pfn = (KERNEL_LOWMEM_END - KERNEL_LOWMEM_START) >> PAGE_SHIFT;
|
||||
high_mem = 0;
|
||||
|
||||
if (num_physpages > low_top_pfn) {
|
||||
if (physpages > low_top_pfn) {
|
||||
#ifdef CONFIG_HIGHMEM
|
||||
high_mem = num_physpages - low_top_pfn;
|
||||
high_mem = physpages - low_top_pfn;
|
||||
#else
|
||||
max_mapnr = num_physpages = low_top_pfn;
|
||||
max_mapnr = physpages = low_top_pfn;
|
||||
#endif
|
||||
}
|
||||
else {
|
||||
low_top_pfn = num_physpages;
|
||||
low_top_pfn = physpages;
|
||||
}
|
||||
|
||||
min_low_pfn = memory_start >> PAGE_SHIFT;
|
||||
|
|
@ -979,7 +980,7 @@ static void __init setup_uclinux_memory(void)
|
|||
free_bootmem(memory_start, memory_end - memory_start);
|
||||
|
||||
high_memory = (void *) (memory_end & PAGE_MASK);
|
||||
max_mapnr = num_physpages = ((unsigned long) high_memory - PAGE_OFFSET) >> PAGE_SHIFT;
|
||||
max_mapnr = ((unsigned long) high_memory - PAGE_OFFSET) >> PAGE_SHIFT;
|
||||
|
||||
min_low_pfn = memory_start >> PAGE_SHIFT;
|
||||
max_low_pfn = memory_end >> PAGE_SHIFT;
|
||||
|
|
|
|||
|
|
@ -523,7 +523,7 @@ void die_if_kernel(const char *str, ...)
|
|||
return;
|
||||
|
||||
va_start(va, str);
|
||||
vsprintf(buffer, str, va);
|
||||
vsnprintf(buffer, sizeof(buffer), str, va);
|
||||
va_end(va);
|
||||
|
||||
console_verbose();
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ void __init paging_init(void)
|
|||
memset((void *) empty_zero_page, 0, PAGE_SIZE);
|
||||
|
||||
#ifdef CONFIG_HIGHMEM
|
||||
if (num_physpages - num_mappedpages) {
|
||||
if (get_num_physpages() - num_mappedpages) {
|
||||
pgd_t *pge;
|
||||
pud_t *pue;
|
||||
pmd_t *pme;
|
||||
|
|
@ -96,7 +96,7 @@ void __init paging_init(void)
|
|||
*/
|
||||
zones_size[ZONE_NORMAL] = max_low_pfn - min_low_pfn;
|
||||
#ifdef CONFIG_HIGHMEM
|
||||
zones_size[ZONE_HIGHMEM] = num_physpages - num_mappedpages;
|
||||
zones_size[ZONE_HIGHMEM] = get_num_physpages() - num_mappedpages;
|
||||
#endif
|
||||
|
||||
free_area_init(zones_size);
|
||||
|
|
@ -114,45 +114,24 @@ void __init paging_init(void)
|
|||
*/
|
||||
void __init mem_init(void)
|
||||
{
|
||||
unsigned long npages = (memory_end - memory_start) >> PAGE_SHIFT;
|
||||
unsigned long tmp;
|
||||
#ifdef CONFIG_MMU
|
||||
unsigned long loop, pfn;
|
||||
int datapages = 0;
|
||||
#endif
|
||||
int codek = 0, datak = 0;
|
||||
unsigned long code_size = _etext - _stext;
|
||||
|
||||
/* this will put all low memory onto the freelists */
|
||||
totalram_pages = free_all_bootmem();
|
||||
free_all_bootmem();
|
||||
#if defined(CONFIG_MMU) && defined(CONFIG_HIGHMEM)
|
||||
{
|
||||
unsigned long pfn;
|
||||
|
||||
#ifdef CONFIG_MMU
|
||||
for (loop = 0 ; loop < npages ; loop++)
|
||||
if (PageReserved(&mem_map[loop]))
|
||||
datapages++;
|
||||
|
||||
#ifdef CONFIG_HIGHMEM
|
||||
for (pfn = num_physpages - 1; pfn >= num_mappedpages; pfn--)
|
||||
free_highmem_page(&mem_map[pfn]);
|
||||
for (pfn = get_num_physpages() - 1;
|
||||
pfn >= num_mappedpages; pfn--)
|
||||
free_highmem_page(&mem_map[pfn]);
|
||||
}
|
||||
#endif
|
||||
|
||||
codek = ((unsigned long) &_etext - (unsigned long) &_stext) >> 10;
|
||||
datak = datapages << (PAGE_SHIFT - 10);
|
||||
|
||||
#else
|
||||
codek = (_etext - _stext) >> 10;
|
||||
datak = 0; //(__bss_stop - _sdata) >> 10;
|
||||
#endif
|
||||
|
||||
tmp = nr_free_pages() << PAGE_SHIFT;
|
||||
printk("Memory available: %luKiB/%luKiB RAM, %luKiB/%luKiB ROM (%dKiB kernel code, %dKiB data)\n",
|
||||
tmp >> 10,
|
||||
npages << (PAGE_SHIFT - 10),
|
||||
(rom_length > 0) ? ((rom_length >> 10) - codek) : 0,
|
||||
rom_length >> 10,
|
||||
codek,
|
||||
datak
|
||||
);
|
||||
|
||||
mem_init_print_info(NULL);
|
||||
if (rom_length > 0 && rom_length >= code_size)
|
||||
printk("Memory available: %luKiB/%luKiB ROM\n",
|
||||
(rom_length - code_size) >> 10, rom_length >> 10);
|
||||
} /* end mem_init() */
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
@ -162,7 +141,7 @@ void __init mem_init(void)
|
|||
void free_initmem(void)
|
||||
{
|
||||
#if defined(CONFIG_RAMKERNEL) && !defined(CONFIG_PROTECT_KERNEL)
|
||||
free_initmem_default(0);
|
||||
free_initmem_default(-1);
|
||||
#endif
|
||||
} /* end free_initmem() */
|
||||
|
||||
|
|
@ -173,6 +152,6 @@ void free_initmem(void)
|
|||
#ifdef CONFIG_BLK_DEV_INITRD
|
||||
void __init free_initrd_mem(unsigned long start, unsigned long end)
|
||||
{
|
||||
free_reserved_area(start, end, 0, "initrd");
|
||||
free_reserved_area((void *)start, (void *)end, -1, "initrd");
|
||||
} /* end free_initrd_mem() */
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue