LinuxQuestions.org

LinuxQuestions.org (/questions/)
-   Linux - Newbie (https://www.linuxquestions.org/questions/linux-newbie-8/)
-   -   usermode linux malformed patch for 2.6 kernel (https://www.linuxquestions.org/questions/linux-newbie-8/usermode-linux-malformed-patch-for-2-6-kernel-247660/)

frogboy 10-26-2004 06:12 PM

usermode linux malformed patch for 2.6 kernel
 
I need to patch my usermode linux kernel cos the host is using 2.6. When I try:

patch -p1 --dry-run < patch1.2

I get the following:

patching file arch/um/os-Linux/process.c

patch: **** malformed patch at line 11: @@ -87,7 +88,8 @@

===================================================

The patch is below & from http://usermodelinux.org/modules.php...ticle&sid=142. I've tried
tr -d '\r' < patchfile > tempfile, but no luck.

====================================================

--- 1.5/arch/um/os-Linux/process.c Sat Jan 18 12:29:27 2003
+++ 1.6/arch/um/os-Linux/process.c Thu Oct 2 14:27:57 2003
@@ -7,6 +7,7 @@
#include <stdio.h>
#include <errno.h>
#include <signal.h>
+ #include <linux/unistd.h>
#include <sys/mman.h>
#include <sys/wait.h>
#include "os.h"
@@ -87,7 +88,8 @@
void os_usr1_process(int pid)
{
- kill(pid, SIGUSR1);
+ syscall(__NR_tkill, pid, SIGUSR1);
+/* tkill(pid, SIGUSR1);*/
}

int os_getpid(void)

320mb 10-26-2004 10:25 PM

you might try............
Code:

patch -Np1 -i --dry-run < patch1.2


All times are GMT -5. The time now is 12:15 AM.