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

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

[PATCH] bootmem: limit to 80 columns width 



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 71fb2e8f

include/linux/bootmem.h

+29 −13
Original line number Diff line number Diff line
@@ -44,8 +44,12 @@ typedef struct bootmem_data { 
extern unsigned long bootmem_bootmap_pages (unsigned long);

extern unsigned long init_bootmem (unsigned long addr, unsigned long memend);

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

extern void * __alloc_bootmem (unsigned long size, unsigned long align, unsigned long goal);

extern void * __alloc_bootmem_nopanic (unsigned long size, unsigned long align, unsigned long goal);

extern void * __alloc_bootmem (unsigned long size,

			       unsigned long align,

			       unsigned long goal);

extern void * __alloc_bootmem_nopanic (unsigned long size,

				       unsigned long align,

				       unsigned long goal);

extern void * __alloc_bootmem_low(unsigned long size,

				  unsigned long align,

				  unsigned long goal);
@@ -54,7 +58,9 @@ extern void * __alloc_bootmem_low_node(pg_data_t *pgdat, 
				       unsigned long align,

				       unsigned long goal);

extern void * __alloc_bootmem_core(struct bootmem_data *bdata,

		unsigned long size, unsigned long align, unsigned long goal,

				   unsigned long size,

				   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);
@@ -68,10 +74,20 @@ extern void reserve_bootmem (unsigned long addr, unsigned long size); 
	__alloc_bootmem_low(x, PAGE_SIZE, 0)

#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */

extern unsigned long free_all_bootmem (void);

extern void * __alloc_bootmem_node (pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal);

extern unsigned long init_bootmem_node (pg_data_t *pgdat, unsigned long freepfn, unsigned long startpfn, unsigned long endpfn);

extern void reserve_bootmem_node (pg_data_t *pgdat, unsigned long physaddr, unsigned long size);

extern void free_bootmem_node (pg_data_t *pgdat, unsigned long addr, unsigned long size);

extern void * __alloc_bootmem_node (pg_data_t *pgdat,

				    unsigned long size,

				    unsigned long align,

				    unsigned long goal);

extern unsigned long init_bootmem_node (pg_data_t *pgdat,

					unsigned long freepfn,

					unsigned long startpfn,

					unsigned long endpfn);

extern void reserve_bootmem_node (pg_data_t *pgdat,

				  unsigned long physaddr,

				  unsigned long size);

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

mm/bootmem.c

+18 −10
Original line number Diff line number Diff line
@@ -102,7 +102,8 @@ static unsigned long __init init_bootmem_core (pg_data_t *pgdat, 
 * might be used for boot-time allocations - or it might get added

 * to the free page pool later on.

 */

static void __init reserve_bootmem_core(bootmem_data_t *bdata, unsigned long addr, unsigned long size)

static void __init reserve_bootmem_core(bootmem_data_t *bdata, unsigned long addr,

					unsigned long size)

{

	unsigned long i;

	/*
@@ -127,7 +128,8 @@ static void __init reserve_bootmem_core(bootmem_data_t *bdata, unsigned long add 
		}

}



static void __init free_bootmem_core(bootmem_data_t *bdata, unsigned long addr, unsigned long size)

static void __init free_bootmem_core(bootmem_data_t *bdata, unsigned long addr,

				     unsigned long size)

{

	unsigned long i;

	unsigned long start;
@@ -355,17 +357,20 @@ static unsigned long __init free_all_bootmem_core(pg_data_t *pgdat) 
	return total;

}



unsigned long __init init_bootmem_node (pg_data_t *pgdat, unsigned long freepfn, unsigned long startpfn, unsigned long endpfn)

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

}



void __init reserve_bootmem_node (pg_data_t *pgdat, unsigned long physaddr, unsigned long size)

void __init reserve_bootmem_node (pg_data_t *pgdat, unsigned long physaddr,

				  unsigned long size)

{

	reserve_bootmem_core(pgdat->bdata, physaddr, size);

}



void __init free_bootmem_node (pg_data_t *pgdat, unsigned long physaddr, unsigned long size)

void __init free_bootmem_node (pg_data_t *pgdat, unsigned long physaddr,

			       unsigned long size)

{

	free_bootmem_core(pgdat->bdata, physaddr, size);

}
@@ -399,7 +404,8 @@ unsigned long __init free_all_bootmem (void) 
	return(free_all_bootmem_core(NODE_DATA(0)));

}



void * __init __alloc_bootmem_nopanic(unsigned long size, unsigned long align, unsigned long goal)

void * __init __alloc_bootmem_nopanic(unsigned long size, unsigned long align,

				      unsigned long goal)

{

	bootmem_data_t *bdata;

	void *ptr;
@@ -410,7 +416,8 @@ void * __init __alloc_bootmem_nopanic(unsigned long size, unsigned long align, u 
	return NULL;

}



void * __init __alloc_bootmem(unsigned long size, unsigned long align, unsigned long goal)

void * __init __alloc_bootmem(unsigned long size, unsigned long align,

			      unsigned long goal)

{

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

	if (mem)
@@ -424,8 +431,8 @@ void * __init __alloc_bootmem(unsigned long size, unsigned long align, unsigned 
}





void * __init __alloc_bootmem_node(pg_data_t *pgdat, unsigned long size, unsigned long align,

				   unsigned long goal)

void * __init __alloc_bootmem_node(pg_data_t *pgdat, unsigned long size,

				   unsigned long align, unsigned long goal)

{

	void *ptr;
@@ -438,7 +445,8 @@ void * __init __alloc_bootmem_node(pg_data_t *pgdat, unsigned long size, unsigne 


#define LOW32LIMIT 0xffffffff



void * __init __alloc_bootmem_low(unsigned long size, unsigned long align, unsigned long goal)

void * __init __alloc_bootmem_low(unsigned long size, unsigned long align,

				  unsigned long goal)

{

	bootmem_data_t *bdata;

	void *ptr;