diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-22 19:13:54 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-22 19:13:54 -0500 |
| commit | f01c18456993bab43067b678f56c87ca954aa43b (patch) | |
| tree | 3e0cd0cdf1a57618202b46a7126125902e3ab832 /arch/arm/mm/init.c | |
| parent | 949ec2c8e6b7b89179b85baf6309c009e1a1b951 (diff) | |
| parent | 1c2e02750b992703a8a18634e08b04353face243 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/mm/init.c')
| -rw-r--r-- | arch/arm/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 8b276ee38acf..b0321e943b76 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
| @@ -531,7 +531,7 @@ static inline void free_area(unsigned long addr, unsigned long end, char *s) | |||
| 531 | for (; addr < end; addr += PAGE_SIZE) { | 531 | for (; addr < end; addr += PAGE_SIZE) { |
| 532 | struct page *page = virt_to_page(addr); | 532 | struct page *page = virt_to_page(addr); |
| 533 | ClearPageReserved(page); | 533 | ClearPageReserved(page); |
| 534 | set_page_count(page, 1); | 534 | init_page_count(page); |
| 535 | free_page(addr); | 535 | free_page(addr); |
| 536 | totalram_pages++; | 536 | totalram_pages++; |
| 537 | } | 537 | } |
