aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Dearman <chris.dearman@imgtec.com>2015-12-14 11:14:04 -0800
committerChris Dearman <chris.dearman@imgtec.com>2015-12-14 11:29:15 -0800
commite5018b941822bf2f525d518eede0ab94a0953c87 (patch)
tree2c518dd740d99a812e0da0e834abb70c9e541c05
parent83c001cd43649062543a64c966b62335921b5ac5 (diff)
downloadv4.1-e5018b941822bf2f525d518eede0ab94a0953c87.tar.gz
Handle rd_start being passed as a physical address
-rw-r--r--arch/mips/kernel/setup.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index be73c491182..5f59fcab673 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -191,6 +191,8 @@ static int __init rd_start_early(char *p)
if (start < XKPHYS)
start = (int)start;
#endif
+ if (start < PAGE_OFFSET)
+ start = (unsigned long)__va(start);
initrd_start = start;
initrd_end += start;
return 0;