projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uml: remove page_size()
[powerpc.git]
/
arch
/
um
/
os-Linux
/
skas
/
process.c
diff --git
a/arch/um/os-Linux/skas/process.c
b/arch/um/os-Linux/skas/process.c
index
0564422
..
29fd079
100644
(file)
--- a/
arch/um/os-Linux/skas/process.c
+++ b/
arch/um/os-Linux/skas/process.c
@@
-18,7
+18,6
@@
#include <asm/types.h>
#include "user.h"
#include "sysdep/ptrace.h"
#include <asm/types.h>
#include "user.h"
#include "sysdep/ptrace.h"
-#include "user_util.h"
#include "kern_util.h"
#include "skas.h"
#include "stub-data.h"
#include "kern_util.h"
#include "skas.h"
#include "stub-data.h"
@@
-34,6
+33,7
@@
#include "uml-config.h"
#include "process.h"
#include "longjmp.h"
#include "uml-config.h"
#include "process.h"
#include "longjmp.h"
+#include "kern_constants.h"
int is_skas_winch(int pid, int fd, void *data)
{
int is_skas_winch(int pid, int fd, void *data)
{
@@
-172,7
+172,7
@@
static int userspace_tramp(void *stack)
int fd;
__u64 offset;
fd = phys_mapping(to_phys(&__syscall_stub_start), &offset);
int fd;
__u64 offset;
fd = phys_mapping(to_phys(&__syscall_stub_start), &offset);
- addr = mmap64((void *) UML_CONFIG_STUB_CODE,
page_size()
,
+ addr = mmap64((void *) UML_CONFIG_STUB_CODE,
UM_KERN_PAGE_SIZE
,
PROT_EXEC, MAP_FIXED | MAP_PRIVATE, fd, offset);
if(addr == MAP_FAILED){
printk("mapping mmap stub failed, errno = %d\n",
PROT_EXEC, MAP_FIXED | MAP_PRIVATE, fd, offset);
if(addr == MAP_FAILED){
printk("mapping mmap stub failed, errno = %d\n",
@@
-182,8
+182,8
@@
static int userspace_tramp(void *stack)
if(stack != NULL){
fd = phys_mapping(to_phys(stack), &offset);
if(stack != NULL){
fd = phys_mapping(to_phys(stack), &offset);
- addr = mmap((void *) UML_CONFIG_STUB_DATA,
page_size(),
- PROT_READ | PROT_WRITE,
+ addr = mmap((void *) UML_CONFIG_STUB_DATA,
+
UM_KERN_PAGE_SIZE,
PROT_READ | PROT_WRITE,
MAP_FIXED | MAP_SHARED, fd, offset);
if(addr == MAP_FAILED){
printk("mapping segfault stack failed, "
MAP_FIXED | MAP_SHARED, fd, offset);
if(addr == MAP_FAILED){
printk("mapping segfault stack failed, "
@@
-199,7
+199,7
@@
static int userspace_tramp(void *stack)
(unsigned long) stub_segv_handler -
(unsigned long) &__syscall_stub_start;
(unsigned long) stub_segv_handler -
(unsigned long) &__syscall_stub_start;
- set_sigstack((void *) UML_CONFIG_STUB_DATA,
page_size()
);
+ set_sigstack((void *) UML_CONFIG_STUB_DATA,
UM_KERN_PAGE_SIZE
);
sigemptyset(&sa.sa_mask);
sigaddset(&sa.sa_mask, SIGIO);
sigaddset(&sa.sa_mask, SIGWINCH);
sigemptyset(&sa.sa_mask);
sigaddset(&sa.sa_mask, SIGIO);
sigaddset(&sa.sa_mask, SIGWINCH);