aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/kernel/physmem.c
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2007-10-16 04:27:05 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 12:43:05 -0400
commit0a7675aa204ac2470bb06f562557978b03914a71 (patch)
treefa1ce4cf6d3546b57719f3fdd2b1cf891f5be52f /arch/um/kernel/physmem.c
parentba180fd437156f7fd8cfb2fdd021d949eeef08d6 (diff)
uml: remove __u64 usage from physical memory subsystem
Eliminate some uses of __u64 in the physical memory support. It's hard to get a definition of __u64 in both kernel and userspace code on x86_64, so this changes them to unsigned long long. There are also a copyright update and formatting comment removal from the affected header. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/kernel/physmem.c')
-rw-r--r--arch/um/kernel/physmem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c
index a55d221d8a4c..1fe86d8cf092 100644
--- a/arch/um/kernel/physmem.c
+++ b/arch/um/kernel/physmem.c
@@ -115,7 +115,7 @@ void __init setup_physmem(unsigned long start, unsigned long reserve_end,
115 len - bootmap_size - reserve); 115 len - bootmap_size - reserve);
116} 116}
117 117
118int phys_mapping(unsigned long phys, __u64 *offset_out) 118int phys_mapping(unsigned long phys, unsigned long long *offset_out)
119{ 119{
120 int fd = -1; 120 int fd = -1;
121 121