diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 04:27:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:05 -0400 |
commit | 0a7675aa204ac2470bb06f562557978b03914a71 (patch) | |
tree | fa1ce4cf6d3546b57719f3fdd2b1cf891f5be52f | |
parent | ba180fd437156f7fd8cfb2fdd021d949eeef08d6 (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>
-rw-r--r-- | arch/um/include/mem.h | 21 | ||||
-rw-r--r-- | arch/um/kernel/physmem.c | 2 | ||||
-rw-r--r-- | arch/um/os-Linux/skas/process.c | 6 |
3 files changed, 6 insertions, 23 deletions
diff --git a/arch/um/include/mem.h b/arch/um/include/mem.h index e8ff0d8fa610..5cd40e99e8d5 100644 --- a/arch/um/include/mem.h +++ b/arch/um/include/mem.h | |||
@@ -1,18 +1,12 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2002, 2003 Jeff Dike (jdike@addtoit.com) | 2 | * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) |
3 | * Licensed under the GPL | 3 | * Licensed under the GPL |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #ifndef __MEM_H__ | 6 | #ifndef __MEM_H__ |
7 | #define __MEM_H__ | 7 | #define __MEM_H__ |
8 | 8 | ||
9 | #include "linux/types.h" | 9 | extern int phys_mapping(unsigned long phys, unsigned long long *offset_out); |
10 | |||
11 | extern int phys_mapping(unsigned long phys, __u64 *offset_out); | ||
12 | extern int physmem_subst_mapping(void *virt, int fd, __u64 offset, int w); | ||
13 | extern int is_remapped(void *virt); | ||
14 | extern int physmem_remove_mapping(void *virt); | ||
15 | extern void physmem_forget_descriptor(int fd); | ||
16 | 10 | ||
17 | extern unsigned long uml_physmem; | 11 | extern unsigned long uml_physmem; |
18 | static inline unsigned long to_phys(void *virt) | 12 | static inline unsigned long to_phys(void *virt) |
@@ -26,14 +20,3 @@ static inline void *to_virt(unsigned long phys) | |||
26 | } | 20 | } |
27 | 21 | ||
28 | #endif | 22 | #endif |
29 | |||
30 | /* | ||
31 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
32 | * Emacs will notice this stuff at the end of the file and automatically | ||
33 | * adjust the settings for this buffer only. This must remain at the end | ||
34 | * of the file. | ||
35 | * --------------------------------------------------------------------------- | ||
36 | * Local variables: | ||
37 | * c-file-style: "linux" | ||
38 | * End: | ||
39 | */ | ||
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 | ||
118 | int phys_mapping(unsigned long phys, __u64 *offset_out) | 118 | int phys_mapping(unsigned long phys, unsigned long long *offset_out) |
119 | { | 119 | { |
120 | int fd = -1; | 120 | int fd = -1; |
121 | 121 | ||
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, |