summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjdike <jdike>2003-01-18 16:26:39 +0000
committerjdike <jdike>2003-01-18 16:26:39 +0000
commit7f8870fbf3244d357dd31493c0de8a8f282efd0d (patch)
tree8f5b6ccd92a630b1af9e3c66a8205bf9c1c2b900
parent1da2b82c9368f98cb41fce3eae842045e6a8edfd (diff)
downloaduml-history-7f8870fbf3244d357dd31493c0de8a8f282efd0d.tar.gz
Changed printk to printf in can_do_skas, which runs on the process stack,
not on a kernel stack.
-rw-r--r--arch/um/kernel/process.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index 040ba48..309a8da 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -37,7 +37,7 @@
#include "uml-config.h"
#include "choose-mode.h"
#include "mode.h"
-#ifdef CONFIG_MODE_SKAS
+#ifdef UML_CONFIG_MODE_SKAS
#include "skas.h"
#include "skas_ptrace.h"
#endif
@@ -47,7 +47,7 @@ void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int))
int flags = 0, pages;
if(sig_stack != NULL){
- pages = (1 << CONFIG_KERNEL_STACK_ORDER) - 2;
+ pages = (1 << UML_CONFIG_KERNEL_STACK_ORDER) - 2;
set_sigstack(sig_stack, pages * page_size());
flags = SA_ONSTACK;
}
@@ -242,32 +242,32 @@ int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr)
int can_do_skas(void)
{
-#ifdef CONFIG_MODE_SKAS
+#ifdef UML_CONFIG_MODE_SKAS
struct ptrace_faultinfo fi;
void *stack;
int pid, n, ret = 1;
- printk("Checking for the skas3 patch in the host...");
+ printf("Checking for the skas3 patch in the host...");
pid = start_ptraced_child(&stack);
n = ptrace(PTRACE_FAULTINFO, pid, 0, &fi);
if(n < 0){
if(errno == EIO)
- printk("not found\n");
- else printk("No (unexpected errno - %d)\n", errno);
+ printf("not found\n");
+ else printf("No (unexpected errno - %d)\n", errno);
ret = 0;
}
- else printk("found\n");
+ else printf("found\n");
init_registers(pid);
stop_ptraced_child(pid, stack, 1);
- printk("Checking for /proc/mm...");
+ printf("Checking for /proc/mm...");
if(access("/proc/mm", W_OK)){
- printk("not found\n");
+ printf("not found\n");
ret = 0;
}
- else printk("found\n");
+ else printf("found\n");
return(ret);
#else