Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[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>
+6
-13
arch/arm/mm/init.c
+6
-13
arch/arm/mm/init.c
···
93
93
};
94
94
95
95
#define O_PFN_DOWN(x) ((x) >> PAGE_SHIFT)
96
-
#define V_PFN_DOWN(x) O_PFN_DOWN(__pa(x))
97
-
98
96
#define O_PFN_UP(x) (PAGE_ALIGN(x) >> PAGE_SHIFT)
99
-
#define V_PFN_UP(x) O_PFN_UP(__pa(x))
100
-
101
-
#define PFN_SIZE(x) ((x) >> PAGE_SHIFT)
102
-
#define PFN_RANGE(s,e) PFN_SIZE(PAGE_ALIGN((unsigned long)(e)) - \
103
-
(((unsigned long)(s)) & PAGE_MASK))
104
97
105
98
/*
106
99
* FIXME: We really want to avoid allocating the bootmap bitmap
···
106
113
{
107
114
unsigned int start_pfn, bank, bootmap_pfn;
108
115
109
-
start_pfn = V_PFN_UP(&_end);
116
+
start_pfn = O_PFN_UP(__pa(&_end));
110
117
bootmap_pfn = 0;
111
118
112
119
for (bank = 0; bank < mi->nr_banks; bank ++) {
···
115
122
if (mi->bank[bank].node != node)
116
123
continue;
117
124
118
-
start = O_PFN_UP(mi->bank[bank].start);
119
-
end = O_PFN_DOWN(mi->bank[bank].size +
120
-
mi->bank[bank].start);
125
+
start = mi->bank[bank].start >> PAGE_SHIFT;
126
+
end = (mi->bank[bank].size +
127
+
mi->bank[bank].start) >> PAGE_SHIFT;
121
128
122
129
if (end < start_pfn)
123
130
continue;
···
184
191
/*
185
192
* Get the start and end pfns for this bank
186
193
*/
187
-
start = O_PFN_UP(mi->bank[i].start);
188
-
end = O_PFN_DOWN(mi->bank[i].start + mi->bank[i].size);
194
+
start = mi->bank[i].start >> PAGE_SHIFT;
195
+
end = (mi->bank[i].start + mi->bank[i].size) >> PAGE_SHIFT;
189
196
190
197
if (np[node].start > start)
191
198
np[node].start = start;