diff options
| author |   Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> | 2010-10-05 08:16:08 +0000 |
|---|---|---|
| committer |   Paul Mundt <lethal@linux-sh.org> | 2010-10-06 16:53:28 +0900 |
| commit | 901c28c257eb8903a7d66c900df163e2c13ca995 (patch) | |
| tree | 9d5cde441120ac52b281e233b43cf601e229c2ee /arch | |
| parent | sh: fix uninitialized spinlock (diff) | |
| download | linux-dev-901c28c257eb8903a7d66c900df163e2c13ca995.tar.xz linux-dev-901c28c257eb8903a7d66c900df163e2c13ca995.zip | |
sh: Fix address calculation of Initrd
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/kernel/setup.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index f24d0ea8be2d..4e278467f76c 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -135,8 +135,9 @@ void __init check_for_initrd(void) goto disable; } - if (unlikely(start < PAGE_OFFSET)) { - pr_err("initrd start < PAGE_OFFSET\n"); + if (unlikely(start < __MEMORY_START)) { + pr_err("initrd start (%08lx) < __MEMORY_START(%x)\n", + start, __MEMORY_START); goto disable; } @@ -157,7 +158,7 @@ void __init check_for_initrd(void) /* * Address sanitization */ - initrd_start = (unsigned long)__va(__pa(start)); + initrd_start = (unsigned long)__va(start); initrd_end = initrd_start + INITRD_SIZE; memblock_reserve(__pa(initrd_start), INITRD_SIZE); |