Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@penguin.transmeta.com>2002-07-31 23:28:55 -0700
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-07-31 23:28:55 -0700
commitcfd17071e7f4855823f9cd85937bb182c7148b9f (patch)
tree82eac0fe511fd82e9658ef323188818545525699
parentd36d3c60b51c0633a4b7ff71adfc5317398b340d (diff)
parent92af3e2529bb657aa7ab1352a53f7f1ace1dc4c3 (diff)
Automerge
-rw-r--r--arch/s390/mm/init.c2
-rw-r--r--arch/s390x/mm/init.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index c1c55f6d426a..58bf8ddb97b4 100644
--- 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
diff --git a/arch/s390x/mm/init.c b/arch/s390x/mm/init.c
index 829989878dea..d000067dbf0c 100644
--- 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