mm/mm_init.c: use round_up() to calculate usermap size
PATCH 1/1 mm/mm_init.c: use round_up() to calculate usermap size
Since pageblock_nr_pages and BITS_PER_LONG are power of 2, we could use round_up() to calculate it.
Also we have renamed blockflags to pageblock_flags, adjust the comment accordingly.
--- mm/mm_init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
mm/mm_init.c +3 -3
@@ -1459,7 +1459,7 @@ void __meminit init_currently_empty_zone(struct zone *zone,#ifndef CONFIG_SPARSEMEM /* -* Calculate the size of the zone->blockflags rounded to an unsigned long +* Calculate the size of the zone->pageblock_flags rounded to an unsigned long * Start by making sure zonesize is a multiple of pageblock_order by rounding * up. Then use 1 NR_PAGEBLOCK_BITS worth of bits per pageblock, finally * round what is now in bits to nearest long in bits, then return it in
@@ -1470,10 +1470,10 @@ static unsigned long __init usemap_size(unsigned long zone_start_pfn, unsigned lunsigned long usemapsize; zonesize += zone_start_pfn & (pageblock_nr_pages-1 ); - usemapsize =roundup (zonesize, pageblock_nr_pages); + usemapsize =round_up (zonesize, pageblock_nr_pages); usemapsize = usemapsize >> pageblock_order; usemapsize *=NR_PAGEBLOCK_BITS ; - usemapsize =roundup (usemapsize,BITS_PER_LONG ); + usemapsize =round_up (usemapsize,BITS_PER_LONG );return usemapsize /BITS_PER_BYTE ; }
Signature · 1 line
2.34.1
Quoted 8 lines · Wei Yang
Since
pageblock_nr_pagesandBITS_PER_LONGare power of 2, we could useround_up()to calculate it.Also we have renamed blockflags to
pageblock_flags, adjust the comment accordingly.Signed-off-by Wei Yang <[email protected]>Suggested-by Shivank Garg <[email protected]>
Thanks for the patch.
Quoted 30 lines
--- mm/mm_init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)mm/mm_init.c +3
-3@@ -1459,7 +1459,7 @@ void __meminit init_currently_empty_zone(struct zone *zone,#ifndef CONFIG_SPARSEMEM /* -* Calculate the size of the zone->blockflags rounded to an unsigned long +* Calculate the size of the zone->pageblock_flags rounded to an unsigned long * Start by making sure zonesize is a multiple of pageblock_order by rounding * up. Then use 1 NR_PAGEBLOCK_BITS worth of bits per pageblock, finally * round what is now in bits to nearest long in bits, then return it in @@ -1470,10 +1470,10 @@ static unsigned long __init usemap_size(unsigned long zone_start_pfn, unsigned lunsigned long usemapsize; zonesize += zone_start_pfn & (pageblock_nr_pages-1 ); - usemapsize =roundup (zonesize, pageblock_nr_pages); + usemapsize =round_up (zonesize, pageblock_nr_pages); usemapsize = usemapsize >> pageblock_order; usemapsize *=NR_PAGEBLOCK_BITS ; - usemapsize =roundup (usemapsize,BITS_PER_LONG ); + usemapsize =round_up (usemapsize,BITS_PER_LONG );return usemapsize /BITS_PER_BYTE ; }
Quoted 28 lines · Wei Yang
Since
pageblock_nr_pagesandBITS_PER_LONGare power of 2, we could useround_up()to calculate it.Also we have renamed blockflags to
pageblock_flags, adjust the comment accordingly.Signed-off-by Wei Yang <[email protected]>Suggested-by Shivank Garg <[email protected]>--- mm/mm_init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)mm/mm_init.c +1
-1@@ -1459,7 +1459,7 @@ void __meminit init_currently_empty_zone(struct zone *zone,#ifndef CONFIG_SPARSEMEM /* -* Calculate the size of the zone->blockflags rounded to an unsigned long +* Calculate the size of the zone->pageblock_flags rounded to an unsigned long * Start by making sure zonesize is a multiple of pageblock_order by rounding * up. Then use 1 NR_PAGEBLOCK_BITS worth of bits per pageblock, finally * round what is now in bits to nearest long in bits, then return it in @@ -1470,10 +1470,10 @@ static unsigned long __init usemap_size(unsigned long zone_start_pfn, unsigned lunsigned long usemapsize;
mm/mm_init.c static unsigned long __init usemap_size(unsigned long zone_start_pfn, unsigned l · line 1479
Quoted 10 lines
mm/mm_init.c +2
-2zonesize += zone_start_pfn & (pageblock_nr_pages-1 ); - usemapsize =roundup (zonesize, pageblock_nr_pages); + usemapsize =round_up (zonesize, pageblock_nr_pages); usemapsize = usemapsize >> pageblock_order; usemapsize *=NR_PAGEBLOCK_BITS ; - usemapsize =roundup (usemapsize,BITS_PER_LONG ); + usemapsize =round_up (usemapsize,BITS_PER_LONG );return usemapsize /BITS_PER_BYTE ; }
Signature · 3 lines
Cheers, David / dhildenb
Quoted 28 lines · Wei Yang
Since
pageblock_nr_pagesandBITS_PER_LONGare power of 2, we could useround_up()to calculate it.Also we have renamed blockflags to
pageblock_flags, adjust the comment accordingly.Signed-off-by Wei Yang <[email protected]>Suggested-by Shivank Garg <[email protected]>--- mm/mm_init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)mm/mm_init.c +1
-1@@ -1459,7 +1459,7 @@ void __meminit init_currently_empty_zone(struct zone *zone,#ifndef CONFIG_SPARSEMEM /* -* Calculate the size of the zone->blockflags rounded to an unsigned long +* Calculate the size of the zone->pageblock_flags rounded to an unsigned long * Start by making sure zonesize is a multiple of pageblock_order by rounding * up. Then use 1 NR_PAGEBLOCK_BITS worth of bits per pageblock, finally * round what is now in bits to nearest long in bits, then return it in @@ -1470,10 +1470,10 @@ static unsigned long __init usemap_size(unsigned long zone_start_pfn, unsigned lunsigned long usemapsize;
mm/mm_init.c static unsigned long __init usemap_size(unsigned long zone_start_pfn, unsigned l · line 1479
Quoted 10 lines
mm/mm_init.c +2
-2zonesize += zone_start_pfn & (pageblock_nr_pages-1 ); - usemapsize =roundup (zonesize, pageblock_nr_pages); + usemapsize =round_up (zonesize, pageblock_nr_pages); usemapsize = usemapsize >> pageblock_order; usemapsize *=NR_PAGEBLOCK_BITS ; - usemapsize =roundup (usemapsize,BITS_PER_LONG ); + usemapsize =round_up (usemapsize,BITS_PER_LONG );return usemapsize /BITS_PER_BYTE ; }
Quoted 8 lines · Wei Yang
Since
pageblock_nr_pagesandBITS_PER_LONGare power of 2, we could useround_up()to calculate it.Also we have renamed blockflags to
pageblock_flags, adjust the comment accordingly.Signed-off-by Wei Yang <[email protected]>Suggested-by Shivank Garg <[email protected]>
Quoted 33 lines
--- mm/mm_init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)mm/mm_init.c +3
-3@@ -1459,7 +1459,7 @@ void __meminit init_currently_empty_zone(struct zone *zone,#ifndef CONFIG_SPARSEMEM /* -* Calculate the size of the zone->blockflags rounded to an unsigned long +* Calculate the size of the zone->pageblock_flags rounded to an unsigned long * Start by making sure zonesize is a multiple of pageblock_order by rounding * up. Then use 1 NR_PAGEBLOCK_BITS worth of bits per pageblock, finally * round what is now in bits to nearest long in bits, then return it in @@ -1470,10 +1470,10 @@ static unsigned long __init usemap_size(unsigned long zone_start_pfn, unsigned lunsigned long usemapsize; zonesize += zone_start_pfn & (pageblock_nr_pages-1 ); - usemapsize =roundup (zonesize, pageblock_nr_pages); + usemapsize =round_up (zonesize, pageblock_nr_pages); usemapsize = usemapsize >> pageblock_order; usemapsize *=NR_PAGEBLOCK_BITS ; - usemapsize =roundup (usemapsize,BITS_PER_LONG ); + usemapsize =round_up (usemapsize,BITS_PER_LONG );return usemapsize /BITS_PER_BYTE ; }Signature · 1 line
2.34.1
Signature · 2 lines
Sincerely yours, Mike.