UML - Stop using libc asm/page.h

PATCH In review Jeff Dike 2 participants 2 messages Nov 1, 2007 – Nov 14, 2007 User-mode Linux (UML)

lore

Share & tools

lore

Jeff Dike

author

2007-11-01 19:53 UTC #0 lore raw

PATCH 1/4 UML - Stop using libc asm/page.h

commit cd56e0945db8a5cd3176dcff2319f9e0c96bcb50

Author: Jeff Dike <[email protected]>
Date:   Tue Oct 16 01:26:44 2007 -0700

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 Jeff Dike <[email protected]>

Signed-off-by Andrew Morton <[email protected]>

Signed-off-by Linus Torvalds <[email protected]>

---
 arch/um/include/common-offsets.h   |    1 +
 arch/um/include/sysdep-i386/stub.h |    3 +--
 arch/um/kernel/skas/clone.c        |    1 -
 arch/um/os-Linux/main.c            |    1 -
 arch/um/os-Linux/skas/mem.c        |    1 -
 arch/um/os-Linux/start_up.c        |    1 -
 arch/um/os-Linux/tt.c              |    1 -
 7 files changed, 2 insertions(+), 7 deletions(-)

arch/um/include/common-offsets.h +1 -0

index 6eee343..2378ff4 100644
@@ -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

index 4fffae7..19c85f3 100644
@@ -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/kernel/skas/clone.c +0 -1

index 47b812b..885a125 100644
@@ -3,7 +3,6 @@
 #include <sys/mman.h>
 #include <sys/time.h>
 #include <asm/unistd.h>
-#include <asm/page.h>
 #include "ptrace_user.h"
 #include "skas.h"
 #include "stub-data.h"

arch/um/os-Linux/main.c +0 -1

index e85f499..919c25b 100644
@@ -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

index 0f7df4e..9fbf210 100644
@@ -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

index 46f6139..f4f2981 100644
@@ -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"

arch/um/os-Linux/tt.c +0 -1

index bcf9359..5dc113d 100644
@@ -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"

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
User-mode-linux-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

[email protected]

2007-11-14 18:58 UTC #1 lore raw

patch uml-stop-using-libc-asm-page.h.patch queued to -stable tree

This is a note to let you know that we have just queued up the patch titled

Subject: UML - Stop using libc asm/page.h

to the 2.6.23-stable tree. Its filename is

uml-stop-using-libc-asm-page.h.patch

A git repo of this tree can be found at
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

From [email protected] Thu Nov 1 12:53:55 2007
From: Jeff Dike <[email protected]>
Date: Thu, 1 Nov 2007 15:53:25 -0400
Subject: UML - Stop using libc asm/page.h
To: [email protected]
Cc: LKML <[email protected]>, uml-devel <[email protected]>
Message-ID: <[email protected]>
Content-Disposition: inline

From: Jeff Dike <[email protected]>

commit 71f926f2ea61994470a53c9e11d3ef993197cada in mainline.