Commit 90118e75 authored by Jeff Dike's avatar Jeff Dike Committed by Greg Kroah-Hartman

UML - Stop using libc asm/page.h

commit 71f926f2 in mainline.

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.

[ jdike - added arch/um/kernel/skas/clone.c for -stable ]
Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5361fb20
...@@ -10,6 +10,7 @@ OFFSET(HOST_TASK_PID, task_struct, pid); ...@@ -10,6 +10,7 @@ OFFSET(HOST_TASK_PID, task_struct, pid);
DEFINE(UM_KERN_PAGE_SIZE, PAGE_SIZE); DEFINE(UM_KERN_PAGE_SIZE, PAGE_SIZE);
DEFINE(UM_KERN_PAGE_MASK, PAGE_MASK); DEFINE(UM_KERN_PAGE_MASK, PAGE_MASK);
DEFINE(UM_KERN_PAGE_SHIFT, PAGE_SHIFT);
DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC); DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC);
DEFINE_STR(UM_KERN_EMERG, KERN_EMERG); DEFINE_STR(UM_KERN_EMERG, KERN_EMERG);
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include <asm/page.h>
#include "stub-data.h" #include "stub-data.h"
#include "kern_constants.h" #include "kern_constants.h"
#include "uml-config.h" #include "uml-config.h"
...@@ -19,7 +18,7 @@ extern void stub_clone_handler(void); ...@@ -19,7 +18,7 @@ extern void stub_clone_handler(void);
#define STUB_SYSCALL_RET EAX #define STUB_SYSCALL_RET EAX
#define STUB_MMAP_NR __NR_mmap2 #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) static inline long stub_syscall0(long syscall)
{ {
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/time.h> #include <sys/time.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include <asm/page.h>
#include "ptrace_user.h" #include "ptrace_user.h"
#include "skas.h" #include "skas.h"
#include "stub-data.h" #include "stub-data.h"
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/user.h> #include <sys/user.h>
#include <asm/page.h>
#include "kern_util.h" #include "kern_util.h"
#include "as-layout.h" #include "as-layout.h"
#include "mem_user.h" #include "mem_user.h"
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include <unistd.h> #include <unistd.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <asm/page.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include "mem_user.h" #include "mem_user.h"
#include "mem.h" #include "mem.h"
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include <asm/page.h>
#include <sys/types.h> #include <sys/types.h>
#include "kern_util.h" #include "kern_util.h"
#include "user.h" #include "user.h"
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include <asm/page.h>
#include "kern_util.h" #include "kern_util.h"
#include "user.h" #include "user.h"
#include "signal_kern.h" #include "signal_kern.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment