Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f71bf0ca authored by Franck Bui-Huu's avatar Franck Bui-Huu Committed by Linus Torvalds
Browse files

[PATCH] bootmem: miscellaneous coding style fixes 



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

Signed-off-by: default avatarFranck Bui-Huu <vagabon.xyz@gmail.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent bbc7b92e

include/linux/bootmem.h

+49 −46
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ extern void * __alloc_bootmem_core(struct bootmem_data *bdata, 
				  unsigned long align,

				  unsigned long goal,

				  unsigned long limit);



#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE

extern void reserve_bootmem(unsigned long addr, unsigned long size);

#define alloc_bootmem(x) \
@@ -70,7 +71,9 @@ extern void reserve_bootmem (unsigned long addr, unsigned long size); 
#define alloc_bootmem_low_pages(x) \

	__alloc_bootmem_low(x, PAGE_SIZE, 0)

#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */



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,

				  unsigned long size,

				  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,

			      unsigned long addr,

			      unsigned long size);

extern unsigned long free_all_bootmem_node (pg_data_t *pgdat);



#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE

#define alloc_bootmem_node(pgdat, x) \

	__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;

}

#endif

#endif /* CONFIG_HAVE_ARCH_ALLOC_REMAP */



extern unsigned long __meminitdata nr_kernel_pages;

extern unsigned long nr_all_pages;

mm/bootmem.c

+44 −37
Original line number Diff line number Diff line
@@ -48,12 +48,14 @@ unsigned long __init bootmem_bootmap_pages (unsigned long pages) 


	return mapsize;

}



/*

 * link bdata in order

 */

static void __init link_bootmem(bootmem_data_t *bdata)

{

	bootmem_data_t *ent;



	if (list_empty(&bdata_list)) {

		list_add(&bdata->list, &bdata_list);

		return;
@@ -66,7 +68,6 @@ static void __init link_bootmem(bootmem_data_t *bdata) 
		}

	}

	list_add_tail(&bdata->list, &bdata_list);

	return;

}



/*
@@ -267,12 +268,14 @@ __alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size, 
			areasize = 0;

			/* last_pos unchanged */

			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);

		} else {

			remaining_size = size - remaining_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->last_pos = start + areasize - 1;

			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 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,
@@ -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)

{

	return(free_all_bootmem_core(pgdat));

	return free_all_bootmem_core(pgdat);

}



unsigned long __init init_bootmem(unsigned long start, unsigned long pages)

{

	max_low_pfn = pages;

	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
@@ -405,7 +408,7 @@ void __init free_bootmem (unsigned long addr, unsigned long size) 


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,
@@ -414,9 +417,11 @@ void * __init __alloc_bootmem_nopanic(unsigned long size, unsigned long align, 
	bootmem_data_t *bdata;

	void *ptr;



	list_for_each_entry(bdata, &bdata_list, list)

		if ((ptr = __alloc_bootmem_core(bdata, size, align, goal, 0)))

			return(ptr);

	list_for_each_entry(bdata, &bdata_list, list) {

		ptr = __alloc_bootmem_core(bdata, size, align, goal, 0);

		if (ptr)

			return ptr;

	}

	return NULL;

}
@@ -424,6 +429,7 @@ void * __init __alloc_bootmem(unsigned long size, unsigned long align, 
			      unsigned long goal)

{

	void *mem = __alloc_bootmem_nopanic(size,align,goal);



	if (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);

	if (ptr)

		return (ptr);

		return ptr;



	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;

	void *ptr;



	list_for_each_entry(bdata, &bdata_list, list)

		if ((ptr = __alloc_bootmem_core(bdata, size,

						 align, goal, LOW32LIMIT)))

			return(ptr);

	list_for_each_entry(bdata, &bdata_list, list) {

		ptr = __alloc_bootmem_core(bdata, size, align, goal, LOW32LIMIT);

		if (ptr)

			return ptr;

	}



	/*

	 * Whoops, we cannot satisfy the allocation request.