git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
um
/
os-Linux
/
start_up.c
diff --git
a/arch/um/os-Linux/start_up.c
b/arch/um/os-Linux/start_up.c
index
37517d4
..
b47e5e7
100644
(file)
--- a/
arch/um/os-Linux/start_up.c
+++ b/
arch/um/os-Linux/start_up.c
@@
-24,7
+24,6
@@
#include "kern_util.h"
#include "user.h"
#include "signal_kern.h"
#include "kern_util.h"
#include "user.h"
#include "signal_kern.h"
-#include "signal_user.h"
#include "sysdep/ptrace.h"
#include "sysdep/sigcontext.h"
#include "irq_user.h"
#include "sysdep/ptrace.h"
#include "sysdep/sigcontext.h"
#include "irq_user.h"
@@
-116,16
+115,16
@@
static int stop_ptraced_child(int pid, void *stack, int exitcode,
if(!WIFEXITED(status) || (WEXITSTATUS(status) != exitcode)) {
int exit_with = WEXITSTATUS(status);
if (exit_with == 2)
if(!WIFEXITED(status) || (WEXITSTATUS(status) != exitcode)) {
int exit_with = WEXITSTATUS(status);
if (exit_with == 2)
- print
k
("check_ptrace : child exited with status 2. "
+ print
f
("check_ptrace : child exited with status 2. "
"Serious trouble happening! Try updating your "
"host skas patch!\nDisabling SYSEMU support.");
"Serious trouble happening! Try updating your "
"host skas patch!\nDisabling SYSEMU support.");
- print
k
("check_ptrace : child exited with exitcode %d, while "
+ print
f
("check_ptrace : child exited with exitcode %d, while "
"expecting %d; status 0x%x", exit_with,
exitcode, status);
if (mustpanic)
panic("\n");
else
"expecting %d; status 0x%x", exit_with,
exitcode, status);
if (mustpanic)
panic("\n");
else
- print
k
("\n");
+ print
f
("\n");
ret = -1;
}
ret = -1;
}
@@
-183,7
+182,7
@@
static void __init check_sysemu(void)
void *stack;
int pid, n, status, count=0;
void *stack;
int pid, n, status, count=0;
- print
k
("Checking syscall emulation patch for ptrace...");
+ print
f
("Checking syscall emulation patch for ptrace...");
sysemu_supported = 0;
pid = start_ptraced_child(&stack);
sysemu_supported = 0;
pid = start_ptraced_child(&stack);
@@
-207,10
+206,10
@@
static void __init check_sysemu(void)
goto fail_stopped;
sysemu_supported = 1;
goto fail_stopped;
sysemu_supported = 1;
- print
k
("OK\n");
+ print
f
("OK\n");
set_using_sysemu(!force_sysemu_disabled);
set_using_sysemu(!force_sysemu_disabled);
- print
k
("Checking advanced syscall emulation patch for ptrace...");
+ print
f
("Checking advanced syscall emulation patch for ptrace...");
pid = start_ptraced_child(&stack);
if(ptrace(PTRACE_OLDSETOPTIONS, pid, 0,
pid = start_ptraced_child(&stack);
if(ptrace(PTRACE_OLDSETOPTIONS, pid, 0,
@@
-246,7
+245,7
@@
static void __init check_sysemu(void)
goto fail_stopped;
sysemu_supported = 2;
goto fail_stopped;
sysemu_supported = 2;
- print
k
("OK\n");
+ print
f
("OK\n");
if ( !force_sysemu_disabled )
set_using_sysemu(sysemu_supported);
if ( !force_sysemu_disabled )
set_using_sysemu(sysemu_supported);
@@
-255,7
+254,7
@@
static void __init check_sysemu(void)
fail:
stop_ptraced_child(pid, stack, 1, 0);
fail_stopped:
fail:
stop_ptraced_child(pid, stack, 1, 0);
fail_stopped:
- print
k
("missing\n");
+ print
f
("missing\n");
}
static void __init check_ptrace(void)
}
static void __init check_ptrace(void)
@@
-263,7
+262,7
@@
static void __init check_ptrace(void)
void *stack;
int pid, syscall, n, status;
void *stack;
int pid, syscall, n, status;
- print
k
("Checking that ptrace can change system call numbers...");
+ print
f
("Checking that ptrace can change system call numbers...");
pid = start_ptraced_child(&stack);
if(ptrace(PTRACE_OLDSETOPTIONS, pid, 0, (void *)PTRACE_O_TRACESYSGOOD) < 0)
pid = start_ptraced_child(&stack);
if(ptrace(PTRACE_OLDSETOPTIONS, pid, 0, (void *)PTRACE_O_TRACESYSGOOD) < 0)
@@
-292,7
+291,7
@@
static void __init check_ptrace(void)
}
}
stop_ptraced_child(pid, stack, 0, 1);
}
}
stop_ptraced_child(pid, stack, 0, 1);
- print
k
("OK\n");
+ print
f
("OK\n");
check_sysemu();
}
check_sysemu();
}
@@
-472,6
+471,8
@@
int can_do_skas(void)
int have_devanon = 0;
int have_devanon = 0;
+/* Runs on boot kernel stack - already safe to use printk. */
+
void check_devanon(void)
{
int fd;
void check_devanon(void)
{
int fd;