diff options
author | Jeremy Allison <jra@samba.org> | 2005-06-22 20:35:06 -0400 |
---|---|---|
committer | Steve French <sfrench@hera.kernel.org> | 2005-06-22 20:35:06 -0400 |
commit | 1bdf7a78c2b21fb94dfe7994dbe89310b18479d2 (patch) | |
tree | 7741cfd476f9c622a10c198da421fdb3e38708b9 /arch/frv/mm/init.c | |
parent | ac67055ef2378ea95c34b593ddf9d0a0737a240a (diff) | |
parent | a4936044001694f033fe4ea94d6034d51a6b465c (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/frv/mm/init.c')
-rw-r--r-- | arch/frv/mm/init.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/frv/mm/init.c b/arch/frv/mm/init.c index 41958f57c838..79433159b5f0 100644 --- a/arch/frv/mm/init.c +++ b/arch/frv/mm/init.c | |||
@@ -169,7 +169,6 @@ void __init mem_init(void) | |||
169 | struct page *page = &mem_map[pfn]; | 169 | struct page *page = &mem_map[pfn]; |
170 | 170 | ||
171 | ClearPageReserved(page); | 171 | ClearPageReserved(page); |
172 | set_bit(PG_highmem, &page->flags); | ||
173 | set_page_count(page, 1); | 172 | set_page_count(page, 1); |
174 | __free_page(page); | 173 | __free_page(page); |
175 | totalram_pages++; | 174 | totalram_pages++; |