Re: [PATCH] [20/50] x86_64: Fix some broken white space in arch/x86_64/mm/init.c
Much, much better :) > -static void __meminit phys_pud_init(pud_t *pud_page, unsigned long addr, > unsigned long end) > -{ +static void __meminit phys_pud_init(pud_t *pud_page, ulong addr, ulong end) If somebody have *strong* objections, please say so. [] > @@ -737,7 +750,7 @@ int in_gate_area_no_task(unsigned long addr) > void * __init alloc_bootmem_high_node(pg_data_t *pgdat, unsigned long size) > { > return __alloc_bootmem_core(pgdat->bdata, size, > - SMP_CACHE_BYTES, (4UL*1024*1024*1024), 0); > + SMP_CACHE_BYTES, (4UL*1024*1024*1024), 0); > } Maybe just? + return __alloc_bootmem_core(pgdat->bdata, size, SMP_CACHE_BYTES, 1UL << 32, 0); (87 is alright sometimes) _ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] [20/50] x86_64: Fix some broken white space in arch/x86_64/mm/init.c
On Sat, 2007-09-22 at 00:32 +0200, Andi Kleen wrote: > No functional changes > Signed-off-by: Andi Kleen <[EMAIL PROTECTED]> Can we please fix _ALL_ white space and coding style issues in this file while we are at it? Updated patch below. tglx diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c index 458893b..346c962 100644 --- a/arch/x86_64/mm/init.c +++ b/arch/x86_64/mm/init.c @@ -70,10 +70,11 @@ void show_mem(void) printk(KERN_INFO "Mem-info:\n"); show_free_areas(); - printk(KERN_INFO "Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); + printk(KERN_INFO "Free swap: %6ldkB\n", + nr_swap_pages<<(PAGE_SHIFT-10)); for_each_online_pgdat(pgdat) { - for (i = 0; i < pgdat->node_spanned_pages; ++i) { + for (i = 0; i < pgdat->node_spanned_pages; ++i) { /* this loop can take a while with 256 GB and 4k pages so update the NMI watchdog */ if (unlikely(i % MAX_ORDER_NR_PAGES == 0)) { @@ -89,7 +90,7 @@ void show_mem(void) cached++; else if (page_count(page)) shared += page_count(page) - 1; - } + } } printk(KERN_INFO "%lu pages of RAM\n", total); printk(KERN_INFO "%lu reserved pages\n",reserved); @@ -100,21 +101,22 @@ void show_mem(void) int after_bootmem; static __init void *spp_getpage(void) -{ +{ void *ptr; if (after_bootmem) - ptr = (void *) get_zeroed_page(GFP_ATOMIC); + ptr = (void *) get_zeroed_page(GFP_ATOMIC); else ptr = alloc_bootmem_pages(PAGE_SIZE); if (!ptr || ((unsigned long)ptr & ~PAGE_MASK)) - panic("set_pte_phys: cannot allocate page data %s\n", after_bootmem?"after bootmem":""); + panic("set_pte_phys: cannot allocate page data %s\n", + after_bootmem?"after bootmem":""); Dprintk("spp_getpage %p\n", ptr); return ptr; -} +} static __init void set_pte_phys(unsigned long vaddr, -unsigned long phys, pgprot_t prot) + unsigned long phys, pgprot_t prot) { pgd_t *pgd; pud_t *pud; @@ -130,10 +132,11 @@ static __init void set_pte_phys(unsigned long vaddr, } pud = pud_offset(pgd, vaddr); if (pud_none(*pud)) { - pmd = (pmd_t *) spp_getpage(); + pmd = (pmd_t *) spp_getpage(); set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE | _PAGE_USER)); if (pmd != pmd_offset(pud, 0)) { - printk("PAGETABLE BUG #01! %p <-> %p\n", pmd, pmd_offset(pud,0)); + printk("PAGETABLE BUG #01! %p <-> %p\n", pmd, + pmd_offset(pud,0)); return; } } @@ -162,7 +165,7 @@ static __init void set_pte_phys(unsigned long vaddr, } /* NOTE: this is meant to be run only at boot */ -void __init +void __init __set_fixmap (enum fixed_addresses idx, unsigned long phys, pgprot_t prot) { unsigned long address = __fix_to_virt(idx); @@ -177,7 +180,7 @@ __set_fixmap (enum fixed_addresses idx, unsigned long phys, pgprot_t prot) unsigned long __meminitdata table_start, table_end; static __meminit void *alloc_low_page(unsigned long *phys) -{ +{ unsigned long pfn = table_end++; void *adr; @@ -187,8 +190,8 @@ static __meminit void *alloc_low_page(unsigned long *phys) return adr; } - if (pfn >= end_pfn) - panic("alloc_low_page: ran out of memory"); + if (pfn >= end_pfn) + panic("alloc_low_page: ran out of memory"); adr = early_ioremap(pfn * PAGE_SIZE, PAGE_SIZE); memset(adr, 0, PAGE_SIZE); @@ -197,13 +200,13 @@ static __meminit void *alloc_low_page(unsigned long *phys) } static __meminit void unmap_low_page(void *adr) -{ +{ if (after_bootmem) return; early_iounmap(adr, PAGE_SIZE); -} +} /* Must run before zap_low_mappings */ __meminit void *early_ioremap(unsigned long addr, unsigned long size) @@ -224,7 +227,8 @@ __meminit void *early_ioremap(unsigned long addr, unsigned long size) vaddr += addr & ~PMD_MASK; addr &= PMD_MASK; for (i = 0; i < pmds; i++, addr += PMD_SIZE) - set_pmd(pmd + i,__pmd(addr | _KERNPG_TABLE | _PAGE_PSE)); + set_pmd(pmd + i, + __pmd(addr | _KERNPG_TABLE | _PAGE_PSE)); __flush_tlb(); return (void *)vaddr; next: @@ -284,8 +288,9 @@ phys_pmd_update(pud_t *pud, unsigned long address, unsigned long end) __flush_tlb_all(); } -static void __meminit phys_pud_init(pud_t
[PATCH] [20/50] x86_64: Fix some broken white space in arch/x86_64/mm/init.c
No functional changes Signed-off-by: Andi Kleen <[EMAIL PROTECTED]> --- arch/x86_64/mm/init.c | 40 1 file changed, 20 insertions(+), 20 deletions(-) Index: linux/arch/x86_64/mm/init.c === --- linux.orig/arch/x86_64/mm/init.c +++ linux/arch/x86_64/mm/init.c @@ -73,7 +73,7 @@ void show_mem(void) printk(KERN_INFO "Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); for_each_online_pgdat(pgdat) { - for (i = 0; i < pgdat->node_spanned_pages; ++i) { + for (i = 0; i < pgdat->node_spanned_pages; ++i) { /* this loop can take a while with 256 GB and 4k pages so update the NMI watchdog */ if (unlikely(i % MAX_ORDER_NR_PAGES == 0)) { @@ -89,7 +89,7 @@ void show_mem(void) cached++; else if (page_count(page)) shared += page_count(page) - 1; - } + } } printk(KERN_INFO "%lu pages of RAM\n", total); printk(KERN_INFO "%lu reserved pages\n",reserved); @@ -114,7 +114,7 @@ static __init void *spp_getpage(void) } static __init void set_pte_phys(unsigned long vaddr, -unsigned long phys, pgprot_t prot) + unsigned long phys, pgprot_t prot) { pgd_t *pgd; pud_t *pud; @@ -324,7 +324,7 @@ static void __init find_early_table_spac puds = (end + PUD_SIZE - 1) >> PUD_SHIFT; pmds = (end + PMD_SIZE - 1) >> PMD_SHIFT; tables = round_up(puds * sizeof(pud_t), PAGE_SIZE) + -round_up(pmds * sizeof(pmd_t), PAGE_SIZE); + round_up(pmds * sizeof(pmd_t), PAGE_SIZE); /* RED-PEN putting page tables only on node 0 could cause a hotspot and fill up ZONE_DMA. The page tables @@ -338,8 +338,8 @@ static void __init find_early_table_spac table_end = table_start; early_printk("kernel direct mapping tables up to %lx @ %lx-%lx\n", - end, table_start << PAGE_SHIFT, - (table_start << PAGE_SHIFT) + tables); +end, table_start << PAGE_SHIFT, +(table_start << PAGE_SHIFT) + tables); } /* Setup the direct mapping of the physical memory at PAGE_OFFSET. @@ -428,7 +428,7 @@ void __init clear_kernel_mapping(unsigne if (0 == (pmd_val(*pmd) & _PAGE_PSE)) { /* Could handle this, but it should not happen currently. */ printk(KERN_ERR - "clear_kernel_mapping: mapping has been split. will leak memory\n"); + "clear_kernel_mapping: mapping has been split. will leak memory\n"); pmd_ERROR(*pmd); } set_pmd(pmd, __pmd(0)); @@ -539,7 +539,7 @@ void __init mem_init(void) totalram_pages = free_all_bootmem(); #endif reservedpages = end_pfn - totalram_pages - - absent_pages_in_range(0, end_pfn); + absent_pages_in_range(0, end_pfn); after_bootmem = 1; @@ -554,15 +554,15 @@ void __init mem_init(void) kclist_add(&kcore_kernel, &_stext, _end - _stext); kclist_add(&kcore_modules, (void *)MODULES_VADDR, MODULES_LEN); kclist_add(&kcore_vsyscall, (void *)VSYSCALL_START, -VSYSCALL_END - VSYSCALL_START); + VSYSCALL_END - VSYSCALL_START); printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, %ldk data, %ldk init)\n", - (unsigned long) nr_free_pages() << (PAGE_SHIFT-10), - end_pfn << (PAGE_SHIFT-10), - codesize >> 10, - reservedpages << (PAGE_SHIFT-10), - datasize >> 10, - initsize >> 10); + (unsigned long) nr_free_pages() << (PAGE_SHIFT-10), + end_pfn << (PAGE_SHIFT-10), + codesize >> 10, + reservedpages << (PAGE_SHIFT-10), + datasize >> 10, + initsize >> 10); } void free_init_pages(char *what, unsigned long begin, unsigned long end) @@ -669,10 +669,10 @@ void __init reserve_bootmem_generic(unsi int kern_addr_valid(unsigned long addr) { unsigned long above = ((long)addr) >> __VIRTUAL_MASK_SHIFT; - pgd_t *pgd; - pud_t *pud; - pmd_t *pmd; - pte_t *pte; + pgd_t *pgd; + pud_t *pud; + pmd_t *pmd; + pte_t *pte; if (above != 0 && above != -1UL) return 0; @@ -737,7 +737,7 @@ int in_gate_area_no_task(unsigned long a void * __init alloc_bootmem_high_node(pg_data_t *pgdat, unsigned long size) { return __alloc_bootmem_core(pgdat->bdata, size, - SMP_CACHE_BYTES