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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
sparc
/
mm
/
init.c
diff --git
a/arch/sparc/mm/init.c
b/arch/sparc/mm/init.c
index
c85ddf3
..
c03baba
100644
(file)
--- a/
arch/sparc/mm/init.c
+++ b/
arch/sparc/mm/init.c
@@
-7,6
+7,7
@@
* 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>
@@
-30,7
+31,6
@@
#include <asm/vaddrs.h>
#include <asm/pgalloc.h> /* bug in asm-generic/tlb.h: check_pgt_cache */
#include <asm/tlb.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);
@@
-349,7
+349,6
@@
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,7
+383,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);
-
init_page_count(page
);
+
set_page_count(page, 1
);
__free_page(page);
totalhigh_pages++;
}
__free_page(page);
totalhigh_pages++;
}
@@
-481,7
+480,7
@@
void free_initmem (void)
p = virt_to_page(addr);
ClearPageReserved(p);
p = virt_to_page(addr);
ClearPageReserved(p);
-
init_page_count(p
);
+
set_page_count(p, 1
);
__free_page(p);
totalram_pages++;
num_physpages++;
__free_page(p);
totalram_pages++;
num_physpages++;
@@
-498,7
+497,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);
-
init_page_count(p
);
+
set_page_count(p, 1
);
__free_page(p);
num_physpages++;
}
__free_page(p);
num_physpages++;
}