summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJaedon Shin <jaedon.shin@gmail.com>2014-12-12 21:51:15 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-13 02:36:13 +0300
commitad8f723afbfe242ad2bc5067e06ca438b6a5c8a9 (patch)
tree99d10da36fb5b947dcb03fb1e0d7af87218366d1 /arch
parent26ceb127f7bcf473db926c6a026b18ddd6f274e8 (diff)
downloadlinux-ad8f723afbfe242ad2bc5067e06ca438b6a5c8a9.tar.xz
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 <jaedon.shin@gmail.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
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