From ad8f723afbfe242ad2bc5067e06ca438b6a5c8a9 Mon Sep 17 00:00:00 2001 From: Jaedon Shin Date: Fri, 12 Dec 2014 19:51:15 +0100 Subject: [PATCH] MIPS: Use phys_addr_t instead of phys_t Ralf Baechle says: "This should have been part of the merge commit c0222ac08666 (Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/- ralf/upstream-linus) but I forgot to mention the need for this in my pull request" Signed-off-by: Jaedon Shin Signed-off-by: Ralf Baechle Signed-off-by: Linus Torvalds --- arch/mips/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index a8c20afeb813..058929041368 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -493,7 +493,7 @@ static int usermem __initdata; static int __init early_parse_mem(char *p) { - phys_t start, size; + phys_addr_t start, size; /* * If a user specifies memory size, we -- 2.34.1