Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71f926f2 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

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: 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>
parent 2f8a2dc2

arch/um/include/common-offsets.h

+1 −0
Original line number Diff line number Diff line
@@ -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);

arch/um/include/sysdep-i386/stub.h

+1 −2
Original line number Diff line number Diff line
@@ -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)

{

arch/um/os-Linux/main.c

+0 −1
Original line number Diff line number Diff line
@@ -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"

arch/um/os-Linux/skas/mem.c

+0 −1
Original line number Diff line number Diff line
@@ -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"

arch/um/os-Linux/start_up.c

+0 −1
Original line number Diff line number Diff line
@@ -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"