tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by Nick Wilson and committed by Linus Torvalds 8c0e33c1 f4549448

+6 -7
unified split
+1 -1
include/linux/a.out.h
··· 138 #endif 139 #endif 140 141 - #define _N_SEGMENT_ROUND(x) (((x) + SEGMENT_SIZE - 1) & ~(SEGMENT_SIZE - 1)) 142 143 #define _N_TXTENDADDR(x) (N_TXTADDR(x)+(x).a_text) 144
··· 138 #endif 139 #endif 140 141 + #define _N_SEGMENT_ROUND(x) ALIGN(x, SEGMENT_SIZE) 142 143 #define _N_TXTENDADDR(x) (N_TXTADDR(x)+(x).a_text) 144
+1 -1
kernel/resource.c
··· 263 new->start = min; 264 if (new->end > max) 265 new->end = max; 266 - new->start = (new->start + align - 1) & ~(align - 1); 267 if (alignf) 268 alignf(alignf_data, new, size, align); 269 if (new->start < new->end && new->end - new->start >= size - 1) {
··· 263 new->start = min; 264 if (new->end > max) 265 new->end = max; 266 + new->start = ALIGN(new->start, align); 267 if (alignf) 268 alignf(alignf_data, new, size, align); 269 if (new->start < new->end && new->end - new->start >= size - 1) {
+1 -2
lib/bitmap.c
··· 289 290 #define CHUNKSZ 32 291 #define nbits_to_hold_value(val) fls(val) 292 - #define roundup_power2(val,modulus) (((val) + (modulus) - 1) & ~((modulus) - 1)) 293 #define unhex(c) (isdigit(c) ? (c - '0') : (toupper(c) - 'A' + 10)) 294 #define BASEDEC 10 /* fancier cpuset lists input in decimal */ 295 ··· 315 if (chunksz == 0) 316 chunksz = CHUNKSZ; 317 318 - i = roundup_power2(nmaskbits, CHUNKSZ) - CHUNKSZ; 319 for (; i >= 0; i -= CHUNKSZ) { 320 chunkmask = ((1ULL << chunksz) - 1); 321 word = i / BITS_PER_LONG;
··· 289 290 #define CHUNKSZ 32 291 #define nbits_to_hold_value(val) fls(val) 292 #define unhex(c) (isdigit(c) ? (c - '0') : (toupper(c) - 'A' + 10)) 293 #define BASEDEC 10 /* fancier cpuset lists input in decimal */ 294 ··· 316 if (chunksz == 0) 317 chunksz = CHUNKSZ; 318 319 + i = ALIGN(nmaskbits, CHUNKSZ) - CHUNKSZ; 320 for (; i >= 0; i -= CHUNKSZ) { 321 chunkmask = ((1ULL << chunksz) - 1); 322 word = i / BITS_PER_LONG;
+3 -3
mm/bootmem.c
··· 65 pgdat->pgdat_next = pgdat_list; 66 pgdat_list = pgdat; 67 68 - mapsize = (mapsize + (sizeof(long) - 1UL)) & ~(sizeof(long) - 1UL); 69 bdata->node_bootmem_map = phys_to_virt(mapstart << PAGE_SHIFT); 70 bdata->node_boot_start = (start << PAGE_SHIFT); 71 bdata->node_low_pfn = end; ··· 186 } else 187 preferred = 0; 188 189 - preferred = ((preferred + align - 1) & ~(align - 1)) >> PAGE_SHIFT; 190 preferred += offset; 191 areasize = (size+PAGE_SIZE-1)/PAGE_SIZE; 192 incr = align >> PAGE_SHIFT ? : 1; ··· 227 */ 228 if (align < PAGE_SIZE && 229 bdata->last_offset && bdata->last_pos+1 == start) { 230 - offset = (bdata->last_offset+align-1) & ~(align-1); 231 BUG_ON(offset > PAGE_SIZE); 232 remaining_size = PAGE_SIZE-offset; 233 if (size < remaining_size) {
··· 65 pgdat->pgdat_next = pgdat_list; 66 pgdat_list = pgdat; 67 68 + mapsize = ALIGN(mapsize, sizeof(long)); 69 bdata->node_bootmem_map = phys_to_virt(mapstart << PAGE_SHIFT); 70 bdata->node_boot_start = (start << PAGE_SHIFT); 71 bdata->node_low_pfn = end; ··· 186 } else 187 preferred = 0; 188 189 + preferred = ALIGN(preferred, align) >> PAGE_SHIFT; 190 preferred += offset; 191 areasize = (size+PAGE_SIZE-1)/PAGE_SIZE; 192 incr = align >> PAGE_SHIFT ? : 1; ··· 227 */ 228 if (align < PAGE_SIZE && 229 bdata->last_offset && bdata->last_pos+1 == start) { 230 + offset = ALIGN(bdata->last_offset, align); 231 BUG_ON(offset > PAGE_SIZE); 232 remaining_size = PAGE_SIZE-offset; 233 if (size < remaining_size) {