projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[linux-2.6-block.git]
/
mm
/
bootmem.c
diff --git
a/mm/bootmem.c
b/mm/bootmem.c
index d1dc23cc7f10e78e9598c87c70337bd3d2577d6a..7d1486875e1cc04c1297b4cbb2743412dd553025 100644
(file)
--- a/
mm/bootmem.c
+++ b/
mm/bootmem.c
@@
-432,8
+432,8
@@
int __init reserve_bootmem(unsigned long addr, unsigned long size,
return mark_bootmem(start, end, 1, flags);
}
return mark_bootmem(start, end, 1, flags);
}
-static unsigned long
align_idx(struct bootmem_data *bdata, unsigned long idx
,
- unsigned long step)
+static unsigned long
__init align_idx(struct bootmem_data *bdata
,
+
unsigned long idx,
unsigned long step)
{
unsigned long base = bdata->node_min_pfn;
{
unsigned long base = bdata->node_min_pfn;
@@
-445,8
+445,8
@@
static unsigned long align_idx(struct bootmem_data *bdata, unsigned long idx,
return ALIGN(base + idx, step) - base;
}
return ALIGN(base + idx, step) - base;
}
-static unsigned long
align_off(struct bootmem_data *bdata, unsigned long off
,
- unsigned long align)
+static unsigned long
__init align_off(struct bootmem_data *bdata
,
+
unsigned long off,
unsigned long align)
{
unsigned long base = PFN_PHYS(bdata->node_min_pfn);
{
unsigned long base = PFN_PHYS(bdata->node_min_pfn);