aboutsummaryrefslogtreecommitdiffstats
path: root/mm/bootmem.c
diff options
context:
space:
mode:
authorNick Wilson <njw@osdl.org>2005-06-25 17:59:00 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 19:25:02 -0400
commit8c0e33c133021ee241e9d51255b9fb18eb34ef0e (patch)
tree30ddff7f7cf375c36d11d49352365a42b25e1def /mm/bootmem.c
parentf45494480f31342125870c1a184999d7c5a59471 (diff)
[PATCH] Use ALIGN to remove duplicate code
This patch makes use of ALIGN() to remove duplicate round-up code. Signed-off-by: Nick Wilson <njw@osdl.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm/bootmem.c')
-rw-r--r--mm/bootmem.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/bootmem.c b/mm/bootmem.c
index 45275f1f8947..c1330cc19783 100644
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -65,7 +65,7 @@ static unsigned long __init init_bootmem_core (pg_data_t *pgdat,
65 pgdat->pgdat_next = pgdat_list; 65 pgdat->pgdat_next = pgdat_list;
66 pgdat_list = pgdat; 66 pgdat_list = pgdat;
67 67
68 mapsize = (mapsize + (sizeof(long) - 1UL)) & ~(sizeof(long) - 1UL); 68 mapsize = ALIGN(mapsize, sizeof(long));
69 bdata->node_bootmem_map = phys_to_virt(mapstart << PAGE_SHIFT); 69 bdata->node_bootmem_map = phys_to_virt(mapstart << PAGE_SHIFT);
70 bdata->node_boot_start = (start << PAGE_SHIFT); 70 bdata->node_boot_start = (start << PAGE_SHIFT);
71 bdata->node_low_pfn = end; 71 bdata->node_low_pfn = end;
@@ -186,7 +186,7 @@ __alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size,
186 } else 186 } else
187 preferred = 0; 187 preferred = 0;
188 188
189 preferred = ((preferred + align - 1) & ~(align - 1)) >> PAGE_SHIFT; 189 preferred = ALIGN(preferred, align) >> PAGE_SHIFT;
190 preferred += offset; 190 preferred += offset;
191 areasize = (size+PAGE_SIZE-1)/PAGE_SIZE; 191 areasize = (size+PAGE_SIZE-1)/PAGE_SIZE;
192 incr = align >> PAGE_SHIFT ? : 1; 192 incr = align >> PAGE_SHIFT ? : 1;
@@ -227,7 +227,7 @@ found:
227 */ 227 */
228 if (align < PAGE_SIZE && 228 if (align < PAGE_SIZE &&
229 bdata->last_offset && bdata->last_pos+1 == start) { 229 bdata->last_offset && bdata->last_pos+1 == start) {
230 offset = (bdata->last_offset+align-1) & ~(align-1); 230 offset = ALIGN(bdata->last_offset, align);
231 BUG_ON(offset > PAGE_SIZE); 231 BUG_ON(offset > PAGE_SIZE);
232 remaining_size = PAGE_SIZE-offset; 232 remaining_size = PAGE_SIZE-offset;
233 if (size < remaining_size) { 233 if (size < remaining_size) {