diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 01:26:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 09:43:04 -0700 |
| commit | 71f926f2ea61994470a53c9e11d3ef993197cada (patch) | |
| tree | 731d5ce6d0be171f693a1c0960f752a5b8e708fc | |
| parent | 2f8a2dc2cf8012179e35c1f01a1eef45de18f1a7 (diff) | |
| download | op-kernel-dev-71f926f2ea61994470a53c9e11d3ef993197cada.zip op-kernel-dev-71f926f2ea61994470a53c9e11d3ef993197cada.tar.gz | |
uml: stop using libc asm/page.h
Remove includes of asm/page.h from libc code. This header seems to be
disappearing, and UML doesn't make much use of it anyway.
The one use, PAGE_SHIFT in stub.h, is handled by copying the constant from the
kernel side of the house in common_offsets.h.
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/common-offsets.h | 1 | ||||
| -rw-r--r-- | arch/um/include/sysdep-i386/stub.h | 3 | ||||
| -rw-r--r-- | arch/um/os-Linux/main.c | 1 | ||||
| -rw-r--r-- | arch/um/os-Linux/skas/mem.c | 1 | ||||
| -rw-r--r-- | arch/um/os-Linux/start_up.c | 1 | ||||
| -rw-r--r-- | arch/um/os-Linux/tt.c | 1 |
6 files changed, 2 insertions, 6 deletions
diff --git a/arch/um/include/common-offsets.h b/arch/um/include/common-offsets.h index 6eee343..2378ff4 100644 --- a/arch/um/include/common-offsets.h +++ b/arch/um/include/common-offsets.h @@ -10,6 +10,7 @@ OFFSET(HOST_TASK_PID, task_struct, pid); DEFINE(UM_KERN_PAGE_SIZE, PAGE_SIZE); DEFINE(UM_KERN_PAGE_MASK, PAGE_MASK); +DEFINE(UM_KERN_PAGE_SHIFT, PAGE_SHIFT); DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC); DEFINE_STR(UM_KERN_EMERG, KERN_EMERG); diff --git a/arch/um/include/sysdep-i386/stub.h b/arch/um/include/sysdep-i386/stub.h index 4fffae7..19c85f3 100644 --- a/arch/um/include/sysdep-i386/stub.h +++ b/arch/um/include/sysdep-i386/stub.h @@ -9,7 +9,6 @@ #include <sys/mman.h> #include <asm/ptrace.h> #include <asm/unistd.h> -#include <asm/page.h> #include "stub-data.h" #include "kern_constants.h" #include "uml-config.h" @@ -19,7 +18,7 @@ extern void stub_clone_handler(void); #define STUB_SYSCALL_RET EAX #define STUB_MMAP_NR __NR_mmap2 -#define MMAP_OFFSET(o) ((o) >> PAGE_SHIFT) +#define MMAP_OFFSET(o) ((o) >> UM_KERN_PAGE_SHIFT) static inline long stub_syscall0(long syscall) { diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c index e85f499..919c25b 100644 --- a/arch/um/os-Linux/main.c +++ b/arch/um/os-Linux/main.c @@ -12,7 +12,6 @@ #include <sys/resource.h> #include <sys/mman.h> #include <sys/user.h> -#include <asm/page.h> #include "kern_util.h" #include "as-layout.h" #include "mem_user.h" diff --git a/arch/um/os-Linux/skas/mem.c b/arch/um/os-Linux/skas/mem.c index 0f7df4e..9fbf210 100644 --- a/arch/um/os-Linux/skas/mem.c +++ b/arch/um/os-Linux/skas/mem.c @@ -9,7 +9,6 @@ #include <unistd.h> #include <sys/mman.h> #include <sys/wait.h> -#include <asm/page.h> #include <asm/unistd.h> #include "mem_user.h" #include "mem.h" diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c index 46f6139..f4f2981 100644 --- a/arch/um/os-Linux/start_up.c +++ b/arch/um/os-Linux/start_up.c @@ -19,7 +19,6 @@ #include <sys/mman.h> #include <sys/resource.h> #include <asm/unistd.h> -#include <asm/page.h> #include <sys/types.h> #include "kern_util.h" #include "user.h" diff --git a/arch/um/os-Linux/tt.c b/arch/um/os-Linux/tt.c index bcf9359..5dc113d 100644 --- a/arch/um/os-Linux/tt.c +++ b/arch/um/os-Linux/tt.c @@ -17,7 +17,6 @@ #include <sys/mman.h> #include <asm/ptrace.h> #include <asm/unistd.h> -#include <asm/page.h> #include "kern_util.h" #include "user.h" #include "signal_kern.h" |
