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
Merge to Fedora kernel-2.6.7-1.492
[linux-2.6.git]
/
arch
/
sparc
/
mm
/
init.c
diff --git
a/arch/sparc/mm/init.c
b/arch/sparc/mm/init.c
index
1d61ed4
..
cdc0459
100644
(file)
--- a/
arch/sparc/mm/init.c
+++ b/
arch/sparc/mm/init.c
@@
-76,7
+76,7
@@
void show_mem(void)
{
printk("Mem-info:\n");
show_free_areas();
{
printk("Mem-info:\n");
show_free_areas();
- printk("Free swap: %6dkB\n",
+ printk("Free swap: %6
l
dkB\n",
nr_swap_pages << (PAGE_SHIFT-10));
printk("%ld pages of RAM\n", totalram_pages);
printk("%d free pages\n", nr_free_pages());
nr_swap_pages << (PAGE_SHIFT-10));
printk("%ld pages of RAM\n", totalram_pages);
printk("%d free pages\n", nr_free_pages());
@@
-100,7
+100,7
@@
void __init sparc_context_init(int numctx)
clist = (ctx_list_pool + ctx);
clist->ctx_number = ctx;
clist = (ctx_list_pool + ctx);
clist->ctx_number = ctx;
- clist->ctx_mm =
0
;
+ clist->ctx_mm =
NULL
;
}
ctx_free.next = ctx_free.prev = &ctx_free;
ctx_used.next = ctx_used.prev = &ctx_used;
}
ctx_free.next = ctx_free.prev = &ctx_free;
ctx_used.next = ctx_used.prev = &ctx_used;