OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] ARM: Remove explicit page-alignments in memory init 

Since meminfo.bank[] array contains page-aligned start/size, we
no longer need to explicitly round up/down the addresses when
converting to PFNs.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2005-06-22 21:47:25 +01:00
parent 3a66941106
commit 92a8cbed29
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/arm/mm/init.c
View File

@ -93,14 +93,7 @@ struct node_info {
}; };
#define O_PFN_DOWN(x) ((x) >> PAGE_SHIFT) #define O_PFN_DOWN(x) ((x) >> PAGE_SHIFT)
#define V_PFN_DOWN(x) O_PFN_DOWN(__pa(x))
#define O_PFN_UP(x) (PAGE_ALIGN(x) >> PAGE_SHIFT) #define O_PFN_UP(x) (PAGE_ALIGN(x) >> PAGE_SHIFT)
#define V_PFN_UP(x) O_PFN_UP(__pa(x))
#define PFN_SIZE(x) ((x) >> PAGE_SHIFT)
#define PFN_RANGE(s,e) PFN_SIZE(PAGE_ALIGN((unsigned long)(e)) - \
(((unsigned long)(s)) & PAGE_MASK))
/* /*
* FIXME: We really want to avoid allocating the bootmap bitmap * FIXME: We really want to avoid allocating the bootmap bitmap
@ -113,7 +106,7 @@ find_bootmap_pfn(int node, struct meminfo *mi, unsigned int bootmap_pages)
{ {
unsigned int start_pfn, bank, bootmap_pfn; unsigned int start_pfn, bank, bootmap_pfn;
start_pfn = V_PFN_UP(&_end); start_pfn = O_PFN_UP(__pa(&_end));
bootmap_pfn = 0; bootmap_pfn = 0;
for (bank = 0; bank < mi->nr_banks; bank ++) { for (bank = 0; bank < mi->nr_banks; bank ++) {
@ -122,9 +115,9 @@ find_bootmap_pfn(int node, struct meminfo *mi, unsigned int bootmap_pages)
if (mi->bank[bank].node != node) if (mi->bank[bank].node != node)
continue; continue;
start = O_PFN_UP(mi->bank[bank].start); start = mi->bank[bank].start >> PAGE_SHIFT;
end = O_PFN_DOWN(mi->bank[bank].size + end = (mi->bank[bank].size +
mi->bank[bank].start); mi->bank[bank].start) >> PAGE_SHIFT;
if (end < start_pfn) if (end < start_pfn)
continue; continue;
@ -191,8 +184,8 @@ find_memend_and_nodes(struct meminfo *mi, struct node_info *np)
/* /*
* Get the start and end pfns for this bank * Get the start and end pfns for this bank
*/ */
start = O_PFN_UP(mi->bank[i].start); start = mi->bank[i].start >> PAGE_SHIFT;
end = O_PFN_DOWN(mi->bank[i].start + mi->bank[i].size); end = (mi->bank[i].start + mi->bank[i].size) >> PAGE_SHIFT;
if (np[node].start > start) if (np[node].start > start)
np[node].start = start; np[node].start = start;