Automerge

cfd17071 · Linus Torvalds · d36d3c60 · 92af3e25 · cfd17071 · cfd17071
Commit cfd17071 authored Jul 31, 2002 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

arch/s390/mm/init.c arch/s390/mm/init.c +1 -1

arch/s390x/mm/init.c arch/s390x/mm/init.c +1 -1

No files found.
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -189,7 +189,7 @@ void free_initmem(void)
 		totalram_pages++;
        }
        printk ("Freeing unused kernel memory: %dk freed\n",
-		(&__init_end - &__init_begin) >> 10);
+		((unsigned long)&__init_end - (unsigned long)&__init_begin) >> 10);
 }

 #ifdef CONFIG_BLK_DEV_INITRD

--- a/arch/s390x/mm/init.c
+++ b/arch/s390x/mm/init.c
@@ -201,7 +201,7 @@ void free_initmem(void)
 		totalram_pages++;
        }
        printk ("Freeing unused kernel memory: %ldk freed\n",
-		(&__init_end - &__init_begin) >> 10);
+		((unsigned long)&__init_end - (unsigned long)&__init_begin) >> 10);
 }

 #ifdef CONFIG_BLK_DEV_INITRD