aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/os-Linux/skas/process.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/os-Linux/skas/process.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/os-Linux/skas/process.c')
-rw-r--r--arch/um/os-Linux/skas/process.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c
index e12d18cc77da..a20d313c823e 100644
--- a/arch/um/os-Linux/skas/process.c
+++ b/arch/um/os-Linux/skas/process.c
@@ -382,7 +382,7 @@ int copy_context_skas0(unsigned long new_stack, int pid)
382 unsigned long current_stack = current_stub_stack(); 382 unsigned long current_stack = current_stub_stack();
383 struct stub_data *data = (struct stub_data *) current_stack; 383 struct stub_data *data = (struct stub_data *) current_stack;
384 struct stub_data *child_data = (struct stub_data *) new_stack; 384 struct stub_data *child_data = (struct stub_data *) new_stack;
385 __u64 new_offset; 385 unsigned long long new_offset;
386 int new_fd = phys_mapping(to_phys((void *)new_stack), &new_offset); 386 int new_fd = phys_mapping(to_phys((void *)new_stack), &new_offset);
387 387
388 /* 388 /*
@@ -444,7 +444,7 @@ void map_stub_pages(int fd, unsigned long code,
444{ 444{
445 struct proc_mm_op mmop; 445 struct proc_mm_op mmop;
446 int n; 446 int n;
447 __u64 code_offset; 447 unsigned long long code_offset;
448 int code_fd = phys_mapping(to_phys((void *) &__syscall_stub_start), 448 int code_fd = phys_mapping(to_phys((void *) &__syscall_stub_start),
449 &code_offset); 449 &code_offset);
450 450
@@ -469,7 +469,7 @@ void map_stub_pages(int fd, unsigned long code,
469 } 469 }
470 470
471 if (stack) { 471 if (stack) {
472 __u64 map_offset; 472 unsigned long long map_offset;
473 int map_fd = phys_mapping(to_phys((void *)stack), &map_offset); 473 int map_fd = phys_mapping(to_phys((void *)stack), &map_offset);
474 mmop = ((struct proc_mm_op) 474 mmop = ((struct proc_mm_op)
475 { .op = MM_MMAP, 475 { .op = MM_MMAP,