adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] Use ALIGN to remove duplicate code

Browse source 
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>
This commit is contained in:
Nick Wilson 2005-06-25 14:59:00 -07:00 committed by Linus Torvalds
parent f45494480f
commit 8c0e33c133
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/linux/a.out.h
View file

@ -138,7 +138,7 @@ enum machine_type {
#endif #endif
#endif #endif
#define _N_SEGMENT_ROUND(x) (((x) + SEGMENT_SIZE - 1) & ~(SEGMENT_SIZE - 1)) #define _N_SEGMENT_ROUND(x) ALIGN(x, SEGMENT_SIZE)
#define _N_TXTENDADDR(x) (N_TXTADDR(x)+(x).a_text) #define _N_TXTENDADDR(x) (N_TXTADDR(x)+(x).a_text)

2
kernel/resource.c
View file

@ -263,7 +263,7 @@ static int find_resource(struct resource *root, struct resource *new,
new->start = min; new->start = min;
if (new->end > max) if (new->end > max)
new->end = max; new->end = max;
new->start = (new->start + align - 1) & ~(align - 1); new->start = ALIGN(new->start, align);
if (alignf) if (alignf)
alignf(alignf_data, new, size, align); alignf(alignf_data, new, size, align);
if (new->start < new->end && new->end - new->start >= size - 1) { if (new->start < new->end && new->end - new->start >= size - 1) {

3
lib/bitmap.c
View file

@ -289,7 +289,6 @@ EXPORT_SYMBOL(__bitmap_weight);
#define CHUNKSZ 32 #define CHUNKSZ 32
#define nbits_to_hold_value(val) fls(val) #define nbits_to_hold_value(val) fls(val)
#define roundup_power2(val,modulus) (((val) + (modulus) - 1) & ~((modulus) - 1))
#define unhex(c) (isdigit(c) ? (c - '0') : (toupper(c) - 'A' + 10)) #define unhex(c) (isdigit(c) ? (c - '0') : (toupper(c) - 'A' + 10))
#define BASEDEC 10 /* fancier cpuset lists input in decimal */ #define BASEDEC 10 /* fancier cpuset lists input in decimal */
@ -316,7 +315,7 @@ int bitmap_scnprintf(char *buf, unsigned int buflen,
if (chunksz == 0) if (chunksz == 0)
chunksz = CHUNKSZ; chunksz = CHUNKSZ;
i = roundup_power2(nmaskbits, CHUNKSZ) - CHUNKSZ; i = ALIGN(nmaskbits, CHUNKSZ) - CHUNKSZ;
for (; i >= 0; i -= CHUNKSZ) { for (; i >= 0; i -= CHUNKSZ) {
chunkmask = ((1ULL << chunksz) - 1); chunkmask = ((1ULL << chunksz) - 1);
word = i / BITS_PER_LONG; word = i / BITS_PER_LONG;

6
mm/bootmem.c
View file

@ -65,7 +65,7 @@ static unsigned long __init init_bootmem_core (pg_data_t *pgdat,
pgdat->pgdat_next = pgdat_list; pgdat->pgdat_next = pgdat_list;
pgdat_list = pgdat; pgdat_list = pgdat;
mapsize = (mapsize + (sizeof(long) - 1UL)) & ~(sizeof(long) - 1UL); mapsize = ALIGN(mapsize, sizeof(long));
bdata->node_bootmem_map = phys_to_virt(mapstart << PAGE_SHIFT); bdata->node_bootmem_map = phys_to_virt(mapstart << PAGE_SHIFT);
bdata->node_boot_start = (start << PAGE_SHIFT); bdata->node_boot_start = (start << PAGE_SHIFT);
bdata->node_low_pfn = end; bdata->node_low_pfn = end;
@ -186,7 +186,7 @@ __alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size,
} else } else
preferred = 0; preferred = 0;
preferred = ((preferred + align - 1) & ~(align - 1)) >> PAGE_SHIFT; preferred = ALIGN(preferred, align) >> PAGE_SHIFT;
preferred += offset; preferred += offset;
areasize = (size+PAGE_SIZE-1)/PAGE_SIZE; areasize = (size+PAGE_SIZE-1)/PAGE_SIZE;
incr = align >> PAGE_SHIFT ? : 1; incr = align >> PAGE_SHIFT ? : 1;
@ -227,7 +227,7 @@ found:
*/ */
if (align < PAGE_SIZE && if (align < PAGE_SIZE &&
bdata->last_offset && bdata->last_pos+1 == start) { bdata->last_offset && bdata->last_pos+1 == start) {
offset = (bdata->last_offset+align-1) & ~(align-1); offset = ALIGN(bdata->last_offset, align);
BUG_ON(offset > PAGE_SIZE); BUG_ON(offset > PAGE_SIZE);
remaining_size = PAGE_SIZE-offset; remaining_size = PAGE_SIZE-offset;
if (size < remaining_size) { if (size < remaining_size) {