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/mips/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/mips/mm/init.c')
| -rw-r--r-- | arch/mips/mm/init.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index b027ce7efbc6..73843c528778 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c | |||
| @@ -232,7 +232,6 @@ void __init mem_init(void) | |||
| 232 | #ifdef CONFIG_LIMITED_DMA | 232 | #ifdef CONFIG_LIMITED_DMA |
| 233 | set_page_address(page, lowmem_page_address(page)); | 233 | set_page_address(page, lowmem_page_address(page)); |
| 234 | #endif | 234 | #endif |
| 235 | set_bit(PG_highmem, &page->flags); | ||
| 236 | set_page_count(page, 1); | 235 | set_page_count(page, 1); |
| 237 | __free_page(page); | 236 | __free_page(page); |
| 238 | totalhigh_pages++; | 237 | totalhigh_pages++; |