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>

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 e12d18cc77..a20d313c82 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)
         unsigned long current_stack = current_stub_stack();
         struct stub_data *data = (struct stub_data *) current_stack;
         struct stub_data *child_data = (struct stub_data *) new_stack;
-        __u64 new_offset;
+        unsigned long long new_offset;
         int new_fd = phys_mapping(to_phys((void *)new_stack), &new_offset);
 
         /*
@@ -444,7 +444,7 @@ void map_stub_pages(int fd, unsigned long code,
 {
         struct proc_mm_op mmop;
         int n;
-        __u64 code_offset;
+        unsigned long long code_offset;
         int code_fd = phys_mapping(to_phys((void *) &__syscall_stub_start),
                                    &code_offset);
 
@@ -469,7 +469,7 @@ void map_stub_pages(int fd, unsigned long code,
         }
 
         if (stack) {
-                __u64 map_offset;
+                unsigned long long map_offset;
                 int map_fd = phys_mapping(to_phys((void *)stack), &map_offset);
                 mmop = ((struct proc_mm_op)
                                 { .op        = MM_MMAP,