Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 164431
b: refs/heads/master
c: cc013a8
h: refs/heads/master
i:
  164429: 267b252
  164427: 82fc59c
  164423: 9839abf
  164415: 2100486
v: v3
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed Sep 22, 2009
1 parent fa70a0c commit ad58125
Show file tree
Hide file tree
Showing 21 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 73d7c33e81aed92ac185950a20407c1a2ea65a83
refs/heads/master: cc013a88906bad9d2832d6316de1c7dbc1c2a794
2 changes: 1 addition & 1 deletion trunk/arch/alpha/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ printk_memory_info(void)
initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;

printk("Memory: %luk/%luk available (%luk kernel code, %luk reserved, %luk data, %luk init)\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
max_mapnr << (PAGE_SHIFT-10),
codesize >> 10,
reservedpages << (PAGE_SHIFT-10),
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/alpha/mm/numa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ void __init mem_init(void)

printk("Memory: %luk/%luk available (%luk kernel code, %luk reserved, "
"%luk data, %luk init)\n",
(unsigned long)nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
num_physpages << (PAGE_SHIFT-10),
codesize >> 10,
reservedpages << (PAGE_SHIFT-10),
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/arm/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,8 +596,8 @@ void __init mem_init(void)

printk(KERN_NOTICE "Memory: %luKB available (%dK code, "
"%dK data, %dK init, %luK highmem)\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
codesize >> 10, datasize >> 10, initsize >> 10,
nr_free_pages() << (PAGE_SHIFT-10), codesize >> 10,
datasize >> 10, initsize >> 10,
(unsigned long) (totalhigh_pages << (PAGE_SHIFT-10)));

if (PAGE_SIZE >= 16384 && num_physpages <= 128) {
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/avr32/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ void __init mem_init(void)

printk ("Memory: %luk/%luk available (%dk kernel code, "
"%dk reserved, %dk data, %dk init)\n",
(unsigned long)nr_free_pages() << (PAGE_SHIFT - 10),
nr_free_pages() << (PAGE_SHIFT - 10),
totalram_pages << (PAGE_SHIFT - 10),
codesize >> 10,
reservedpages << (PAGE_SHIFT - 10),
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/cris/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ mem_init(void)
printk(KERN_INFO
"Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, "
"%dk init)\n" ,
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
max_mapnr << (PAGE_SHIFT-10),
codesize >> 10,
reservedpages << (PAGE_SHIFT-10),
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/ia64/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ mem_init (void)
initsize = (unsigned long) __init_end - (unsigned long) __init_begin;

printk(KERN_INFO "Memory: %luk/%luk available (%luk code, %luk reserved, "
"%luk data, %luk init)\n", (unsigned long) nr_free_pages() << (PAGE_SHIFT - 10),
"%luk data, %luk init)\n", nr_free_pages() << (PAGE_SHIFT - 10),
num_physpages << (PAGE_SHIFT - 10), codesize >> 10,
reserved_pages << (PAGE_SHIFT - 10), datasize >> 10, initsize >> 10);

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/m32r/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ void __init mem_init(void)

printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
"%dk reserved, %dk data, %dk init)\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
num_physpages << (PAGE_SHIFT-10),
codesize >> 10,
reservedpages << (PAGE_SHIFT-10),
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/m68k/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ void __init mem_init(void)
#endif

printk("Memory: %luk/%luk available (%dk kernel code, %dk data, %dk init)\n",
(unsigned long)nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
totalram_pages << (PAGE_SHIFT-10),
codepages << (PAGE_SHIFT-10),
datapages << (PAGE_SHIFT-10),
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/microblaze/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ void __init mem_init(void)
totalram_pages += free_all_bootmem();

printk(KERN_INFO "Memory: %luk/%luk available\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
num_physpages << (PAGE_SHIFT-10));
#ifdef CONFIG_MMU
mem_init_done = 1;
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/mips/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ void __init mem_init(void)

printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, "
"%ldk reserved, %ldk data, %ldk init, %ldk highmem)\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
ram << (PAGE_SHIFT-10),
codesize >> 10,
reservedpages << (PAGE_SHIFT-10),
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/mn10300/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ void __init mem_init(void)
"Memory: %luk/%luk available"
" (%dk kernel code, %dk reserved, %dk data, %dk init,"
" %ldk highmem)\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT - 10),
nr_free_pages() << (PAGE_SHIFT - 10),
max_mapnr << (PAGE_SHIFT - 10),
codesize >> 10,
reservedpages << (PAGE_SHIFT - 10),
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/parisc/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ void __init mem_init(void)
#endif

printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init)\n",
(unsigned long)nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
num_physpages << (PAGE_SHIFT-10),
codesize >> 10,
reservedpages << (PAGE_SHIFT-10),
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/powerpc/mm/mem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ void __init mem_init(void)

printk(KERN_INFO "Memory: %luk/%luk available (%luk kernel code, "
"%luk reserved, %luk data, %luk bss, %luk init)\n",
(unsigned long)nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
num_physpages << (PAGE_SHIFT-10),
codesize >> 10,
reservedpages << (PAGE_SHIFT-10),
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/s390/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ void __init mem_init(void)
datasize = (unsigned long) &_edata - (unsigned long) &_etext;
initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, %ldk data, %ldk init)\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
max_mapnr << (PAGE_SHIFT-10),
codesize >> 10,
reservedpages << (PAGE_SHIFT-10),
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/sh/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ void __init mem_init(void)

printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
"%dk data, %dk init)\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
num_physpages << (PAGE_SHIFT-10),
codesize >> 10,
datasize >> 10,
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/sparc/mm/init_32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ void __init mem_init(void)
reservedpages++;

printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init, %ldk highmem)\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
num_physpages << (PAGE_SHIFT - 10),
codepages << (PAGE_SHIFT-10),
reservedpages << (PAGE_SHIFT - 10),
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/um/kernel/mem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void __init mem_init(void)
num_physpages = totalram_pages;
max_pfn = totalram_pages;
printk(KERN_INFO "Memory: %luk available\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10));
nr_free_pages() << (PAGE_SHIFT-10));
kmalloc_ok = 1;

#ifdef CONFIG_HIGHMEM
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/x86/mm/init_32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,7 @@ void __init mem_init(void)

printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
"%dk reserved, %dk data, %dk init, %ldk highmem)\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
num_physpages << (PAGE_SHIFT-10),
codesize >> 10,
reservedpages << (PAGE_SHIFT-10),
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/x86/mm/init_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ void __init mem_init(void)

printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, "
"%ldk absent, %ldk reserved, %ldk data, %ldk init)\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
max_pfn << (PAGE_SHIFT-10),
codesize >> 10,
absent_pages << (PAGE_SHIFT-10),
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/xtensa/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ void __init mem_init(void)

printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, "
"%ldk data, %ldk init %ldk highmem)\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
nr_free_pages() << (PAGE_SHIFT-10),
ram << (PAGE_SHIFT-10),
codesize >> 10,
reservedpages << (PAGE_SHIFT-10),
Expand Down

0 comments on commit ad58125

Please sign in to comment.