[uml-devel] corrections to 2.4 series incrementals: multiple-includes

["D. Bahi" <dbahi@enterasys.com>]

[-- Attachment #1.1: Type: text/plain, Size: 358 bytes --]

patches to patches ? or, developers can figure this out....

this is a corrected version of the fix-smp patch found on:

   http://user-mode-linux.sourceforge.net/patches.html

The line in the available patch incorrectly attempts to patch
arch/um/os/drivers/ethertap_kern.c instead of um/os-Linux/drivers
(a clean tree):

And thus fails to apply completely.

[-- Attachment #1.2: multiple-includes.clean --]
[-- Type: text/plain, Size: 858 bytes --]

--- linux-2.4.26_uml-patch-2.4.26-2um.orig/arch/um/kernel/frame_kern.c	2004-08-01 07:52:46.000000000 -0400
+++ linux-2.4.26_uml-patch-2.4.26-2um_incrementals/arch/um/kernel/frame_kern.c	2004-08-03 13:37:27.000000000 -0400
@@ -6,7 +6,6 @@
 #include "asm/ptrace.h"
 #include "asm/uaccess.h"
 #include "asm/signal.h"
-#include "asm/uaccess.h"
 #include "asm/ucontext.h"
 #include "frame_kern.h"
 #include "sigcontext.h"
--- linux-2.4.26_uml-patch-2.4.26-2um.orig/arch/um/os-Linux/drivers/ethertap_kern.c	2004-08-01 07:52:46.000000000 -0400
+++ linux-2.4.26_uml-patch-2.4.26-2um_incrementals/arch/um/os-Linux/drivers/ethertap_kern.c	2004-08-03 13:38:02.000000000 -0400
@@ -8,7 +8,6 @@
 #include "linux/init.h"
 #include "linux/netdevice.h"
 #include "linux/etherdevice.h"
-#include "linux/init.h"
 #include "net_kern.h"
 #include "net_user.h"
 #include "etap.h"

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 187 bytes --]