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

Commit 8c0e33c1 authored by Nick Wilson's avatar Nick Wilson Committed by Linus Torvalds
Browse files

[PATCH] Use ALIGN to remove duplicate code 



This patch makes use of ALIGN() to remove duplicate round-up code.

Signed-off-by: default avatarNick Wilson <njw@osdl.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f4549448

include/linux/a.out.h

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ enum machine_type { 
#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)

kernel/resource.c

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ static int find_resource(struct resource *root, struct resource *new, 
			new->start = min;

		if (new->end > max)

			new->end = max;

		new->start = (new->start + align - 1) & ~(align - 1);

		new->start = ALIGN(new->start, align);

		if (alignf)

			alignf(alignf_data, new, size, align);

		if (new->start < new->end && new->end - new->start >= size - 1) {

lib/bitmap.c

+1 −2
Original line number Diff line number Diff line
@@ -289,7 +289,6 @@ EXPORT_SYMBOL(__bitmap_weight); 


#define CHUNKSZ				32

#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 BASEDEC 10		/* fancier cpuset lists input in decimal */
@@ -316,7 +315,7 @@ int bitmap_scnprintf(char *buf, unsigned int buflen, 
	if (chunksz == 0)

		chunksz = CHUNKSZ;



	i = roundup_power2(nmaskbits, CHUNKSZ) - CHUNKSZ;

	i = ALIGN(nmaskbits, CHUNKSZ) - CHUNKSZ;

	for (; i >= 0; i -= CHUNKSZ) {

		chunkmask = ((1ULL << chunksz) - 1);

		word = i / BITS_PER_LONG;

mm/bootmem.c

+3 −3
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static unsigned long __init init_bootmem_core (pg_data_t *pgdat, 
	pgdat->pgdat_next = pgdat_list;

	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_boot_start = (start << PAGE_SHIFT);

	bdata->node_low_pfn = end;
@@ -186,7 +186,7 @@ __alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size, 
	} else

		preferred = 0;



	preferred = ((preferred + align - 1) & ~(align - 1)) >> PAGE_SHIFT;

	preferred = ALIGN(preferred, align) >> PAGE_SHIFT;

	preferred += offset;

	areasize = (size+PAGE_SIZE-1)/PAGE_SIZE;

	incr = align >> PAGE_SHIFT ? : 1;
@@ -227,7 +227,7 @@ __alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size, 
	 */

	if (align < PAGE_SIZE &&

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

		remaining_size = PAGE_SIZE-offset;

		if (size < remaining_size) {