mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 23:27:06 +00:00
Code Issues Releases Wiki Activity

[PATCH] bootmem: miscellaneous coding style fixes

Browse source 
It fixes various coding style issues, specially when spaces are useless.  For
example '*' go next to the function name.

Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Franck Bui-Huu 2006-09-25 23:31:08 -07:00 committed by Linus Torvalds
parent bbc7b92e33
commit f71bf0cac7
2 changed files with 93 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/linux/bootmem.h
View file

@ -59,6 +59,7 @@ extern void * __alloc_bootmem_core(struct bootmem_data *bdata,
unsigned long align, unsigned long align,
unsigned long goal, unsigned long goal,
unsigned long limit); unsigned long limit);
#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE
extern void reserve_bootmem(unsigned long addr, unsigned long size); extern void reserve_bootmem(unsigned long addr, unsigned long size);
#define alloc_bootmem(x) \ #define alloc_bootmem(x) \
@ -70,7 +71,9 @@ extern void reserve_bootmem (unsigned long addr, unsigned long size);
#define alloc_bootmem_low_pages(x) \ #define alloc_bootmem_low_pages(x) \
__alloc_bootmem_low(x, PAGE_SIZE, 0) __alloc_bootmem_low(x, PAGE_SIZE, 0)
#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */ #endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */
extern unsigned long free_all_bootmem(void); extern unsigned long free_all_bootmem(void);
extern unsigned long free_all_bootmem_node(pg_data_t *pgdat);
extern void *__alloc_bootmem_node(pg_data_t *pgdat, extern void *__alloc_bootmem_node(pg_data_t *pgdat,
unsigned long size, unsigned long size,
unsigned long align, unsigned long align,
@ -85,7 +88,7 @@ extern void reserve_bootmem_node (pg_data_t *pgdat,
extern void free_bootmem_node(pg_data_t *pgdat, extern void free_bootmem_node(pg_data_t *pgdat,
unsigned long addr, unsigned long addr,
unsigned long size); unsigned long size);
extern unsigned long free_all_bootmem_node (pg_data_t *pgdat);
#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE
#define alloc_bootmem_node(pgdat, x) \ #define alloc_bootmem_node(pgdat, x) \
__alloc_bootmem_node(pgdat, x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) __alloc_bootmem_node(pgdat, x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
@ -102,7 +105,7 @@ static inline void *alloc_remap(int nid, unsigned long size)
{ {
return NULL; return NULL;
} }
#endif #endif /* CONFIG_HAVE_ARCH_ALLOC_REMAP */
extern unsigned long __meminitdata nr_kernel_pages; extern unsigned long __meminitdata nr_kernel_pages;
extern unsigned long nr_all_pages; extern unsigned long nr_all_pages;

37
mm/bootmem.c
View file

@ -48,12 +48,14 @@ unsigned long __init bootmem_bootmap_pages (unsigned long pages)
return mapsize; return mapsize;
} }
/* /*
* link bdata in order * link bdata in order
*/ */
static void __init link_bootmem(bootmem_data_t *bdata) static void __init link_bootmem(bootmem_data_t *bdata)
{ {
bootmem_data_t *ent; bootmem_data_t *ent;
if (list_empty(&bdata_list)) { if (list_empty(&bdata_list)) {
list_add(&bdata->list, &bdata_list); list_add(&bdata->list, &bdata_list);
return; return;
@ -66,7 +68,6 @@ static void __init link_bootmem(bootmem_data_t *bdata)
} }
} }
list_add_tail(&bdata->list, &bdata_list); list_add_tail(&bdata->list, &bdata_list);
return;
} }
/* /*
@ -267,12 +268,14 @@ __alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size,
areasize = 0; areasize = 0;
/* last_pos unchanged */ /* last_pos unchanged */
bdata->last_offset = offset + size; bdata->last_offset = offset + size;
ret = phys_to_virt(bdata->last_pos*PAGE_SIZE + offset + ret = phys_to_virt(bdata->last_pos * PAGE_SIZE +
offset +
bdata->node_boot_start); bdata->node_boot_start);
} else { } else {
remaining_size = size - remaining_size; remaining_size = size - remaining_size;
areasize = (remaining_size + PAGE_SIZE-1) / PAGE_SIZE; areasize = (remaining_size + PAGE_SIZE-1) / PAGE_SIZE;
ret = phys_to_virt(bdata->last_pos*PAGE_SIZE + offset + ret = phys_to_virt(bdata->last_pos * PAGE_SIZE +
offset +
bdata->node_boot_start); bdata->node_boot_start);
bdata->last_pos = start + areasize - 1; bdata->last_pos = start + areasize - 1;
bdata->last_offset = remaining_size; bdata->last_offset = remaining_size;
@ -364,7 +367,7 @@ static unsigned long __init free_all_bootmem_core(pg_data_t *pgdat)
unsigned long __init init_bootmem_node(pg_data_t *pgdat, unsigned long freepfn, unsigned long __init init_bootmem_node(pg_data_t *pgdat, unsigned long freepfn,
unsigned long startpfn, unsigned long endpfn) unsigned long startpfn, unsigned long endpfn)
{ {
return(init_bootmem_core(pgdat, freepfn, startpfn, endpfn)); return init_bootmem_core(pgdat, freepfn, startpfn, endpfn);
} }
void __init reserve_bootmem_node(pg_data_t *pgdat, unsigned long physaddr, void __init reserve_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,
@ -381,14 +384,14 @@ void __init free_bootmem_node (pg_data_t *pgdat, unsigned long physaddr,
unsigned long __init free_all_bootmem_node(pg_data_t *pgdat) unsigned long __init free_all_bootmem_node(pg_data_t *pgdat)
{ {
return(free_all_bootmem_core(pgdat)); return free_all_bootmem_core(pgdat);
} }
unsigned long __init init_bootmem(unsigned long start, unsigned long pages) unsigned long __init init_bootmem(unsigned long start, unsigned long pages)
{ {
max_low_pfn = pages; max_low_pfn = pages;
min_low_pfn = start; min_low_pfn = start;
return(init_bootmem_core(NODE_DATA(0), start, 0, pages)); return init_bootmem_core(NODE_DATA(0), start, 0, pages);
} }
#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE
@ -405,7 +408,7 @@ void __init free_bootmem (unsigned long addr, unsigned long size)
unsigned long __init free_all_bootmem(void) unsigned long __init free_all_bootmem(void)
{ {
return(free_all_bootmem_core(NODE_DATA(0))); return free_all_bootmem_core(NODE_DATA(0));
} }
void * __init __alloc_bootmem_nopanic(unsigned long size, unsigned long align, void * __init __alloc_bootmem_nopanic(unsigned long size, unsigned long align,
@ -414,9 +417,11 @@ void * __init __alloc_bootmem_nopanic(unsigned long size, unsigned long align,
bootmem_data_t *bdata; bootmem_data_t *bdata;
void *ptr; void *ptr;
list_for_each_entry(bdata, &bdata_list, list) list_for_each_entry(bdata, &bdata_list, list) {
if ((ptr = __alloc_bootmem_core(bdata, size, align, goal, 0))) ptr = __alloc_bootmem_core(bdata, size, align, goal, 0);
return(ptr); if (ptr)
return ptr;
}
return NULL; return NULL;
} }
@ -424,6 +429,7 @@ void * __init __alloc_bootmem(unsigned long size, unsigned long align,
unsigned long goal) unsigned long goal)
{ {
void *mem = __alloc_bootmem_nopanic(size,align,goal); void *mem = __alloc_bootmem_nopanic(size,align,goal);
if (mem) if (mem)
return mem; return mem;
/* /*
@ -442,7 +448,7 @@ void * __init __alloc_bootmem_node(pg_data_t *pgdat, unsigned long size,
ptr = __alloc_bootmem_core(pgdat->bdata, size, align, goal, 0); ptr = __alloc_bootmem_core(pgdat->bdata, size, align, goal, 0);
if (ptr) if (ptr)
return (ptr); return ptr;
return __alloc_bootmem(size, align, goal); return __alloc_bootmem(size, align, goal);
} }
@ -455,10 +461,11 @@ void * __init __alloc_bootmem_low(unsigned long size, unsigned long align,
bootmem_data_t *bdata; bootmem_data_t *bdata;
void *ptr; void *ptr;
list_for_each_entry(bdata, &bdata_list, list) list_for_each_entry(bdata, &bdata_list, list) {
if ((ptr = __alloc_bootmem_core(bdata, size, ptr = __alloc_bootmem_core(bdata, size, align, goal, LOW32LIMIT);
align, goal, LOW32LIMIT))) if (ptr)
return(ptr); return ptr;
}
/* /*
* Whoops, we cannot satisfy the allocation request. * Whoops, we cannot satisfy the allocation request.