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
/
m68k
/
mm
/
init.c
diff --git
a/arch/m68k/mm/init.c
b/arch/m68k/mm/init.c
index
d79dbfa
..
ab90213
100644
(file)
--- a/
arch/m68k/mm/init.c
+++ b/
arch/m68k/mm/init.c
@@
-7,7
+7,6
@@
* to motorola.c and sun3mmu.c
*/
* to motorola.c and sun3mmu.c
*/
-#include <linux/config.h>
#include <linux/signal.h>
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/signal.h>
#include <linux/sched.h>
#include <linux/mm.h>
@@
-47,7
+46,7
@@
void show_mem(void)
printk("\nMem-info:\n");
show_free_areas();
printk("\nMem-info:\n");
show_free_areas();
- printk("Free swap: %6
dkB\n",
nr_swap_pages<<(PAGE_SHIFT-10));
+ printk("Free swap: %6
ldkB\n",
nr_swap_pages<<(PAGE_SHIFT-10));
i = max_mapnr;
while (i-- > 0) {
total++;
i = max_mapnr;
while (i-- > 0) {
total++;
@@
-137,7
+136,7
@@
void free_initrd_mem(unsigned long start, unsigned long end)
int pages = 0;
for (; start < end; start += PAGE_SIZE) {
ClearPageReserved(virt_to_page(start));
int pages = 0;
for (; start < end; start += PAGE_SIZE) {
ClearPageReserved(virt_to_page(start));
-
set_page_count(virt_to_page(start), 1
);
+
init_page_count(virt_to_page(start)
);
free_page(start);
totalram_pages++;
pages++;
free_page(start);
totalram_pages++;
pages++;