git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
sparc
/
mm
/
init.c
diff --git
a/arch/sparc/mm/init.c
b/arch/sparc/mm/init.c
index
a2dea69
..
c85ddf3
100644
(file)
--- a/
arch/sparc/mm/init.c
+++ b/
arch/sparc/mm/init.c
@@
-7,7
+7,6
@@
* Copyright (C) 2000 Anton Blanchard (anton@samba.org)
*/
* Copyright (C) 2000 Anton Blanchard (anton@samba.org)
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/signal.h>
#include <linux/sched.h>
#include <linux/module.h>
#include <linux/signal.h>
#include <linux/sched.h>
@@
-25,13
+24,13
@@
#include <linux/bootmem.h>
#include <asm/system.h>
#include <linux/bootmem.h>
#include <asm/system.h>
-#include <asm/segment.h>
#include <asm/vac-ops.h>
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/vaddrs.h>
#include <asm/pgalloc.h> /* bug in asm-generic/tlb.h: check_pgt_cache */
#include <asm/tlb.h>
#include <asm/vac-ops.h>
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/vaddrs.h>
#include <asm/pgalloc.h> /* bug in asm-generic/tlb.h: check_pgt_cache */
#include <asm/tlb.h>
+#include <asm/prom.h>
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
@@
-350,6
+349,7
@@
void __init paging_init(void)
protection_map[14] = PAGE_SHARED;
protection_map[15] = PAGE_SHARED;
btfixup();
protection_map[14] = PAGE_SHARED;
protection_map[15] = PAGE_SHARED;
btfixup();
+ prom_build_devicetree();
device_scan();
}
device_scan();
}
@@
-384,8
+384,7
@@
void map_high_region(unsigned long start_pfn, unsigned long end_pfn)
struct page *page = pfn_to_page(tmp);
ClearPageReserved(page);
struct page *page = pfn_to_page(tmp);
ClearPageReserved(page);
- set_bit(PG_highmem, &page->flags);
- set_page_count(page, 1);
+ init_page_count(page);
__free_page(page);
totalhigh_pages++;
}
__free_page(page);
totalhigh_pages++;
}
@@
-482,7
+481,7
@@
void free_initmem (void)
p = virt_to_page(addr);
ClearPageReserved(p);
p = virt_to_page(addr);
ClearPageReserved(p);
-
set_page_count(p, 1
);
+
init_page_count(p
);
__free_page(p);
totalram_pages++;
num_physpages++;
__free_page(p);
totalram_pages++;
num_physpages++;
@@
-499,7
+498,7
@@
void free_initrd_mem(unsigned long start, unsigned long end)
struct page *p = virt_to_page(start);
ClearPageReserved(p);
struct page *p = virt_to_page(start);
ClearPageReserved(p);
-
set_page_count(p, 1
);
+
init_page_count(p
);
__free_page(p);
num_physpages++;
}
__free_page(p);
num_physpages++;
}