Author: maks-guest
Date: Fri Feb 16 12:37:50 2007
New Revision: 8310
Added:
dists/sid/linux-2.6/debian/patches/bugfix/net-ipv6-mcast.patch
dists/sid/linux-2.6/debian/patches/bugfix/uml-compilation.patch
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/patches/series/11
Log:
fix 2.6.16.38 patch,
missing bits are the reverted ipv6 multicast fix
+ some semi-important uml stuff.
do some real work instead of creating a mess.
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog (original)
+++ dists/sid/linux-2.6/debian/changelog Fri Feb 16 12:37:50 2007
@@ -1,8 +1,5 @@
linux-2.6 (2.6.18.dfsg.1-11) UNRELEASED; urgency=low
- [ Bastian Blank ]
- * Back out 2.6.16 patches. (closes: #410375)
-
[ Jurij Smakov ]
* Disable CONFIG_DEBUG_FS on sparc32, as it makes the kernel too big,
resulting in a boot failure. This is ABI-changing, but we cannot
@@ -16,7 +13,11 @@
* atiixp: add cable detection support, fixing breakage w/ 40-pin cable
(closes: #411024)
- -- dann frazier <[EMAIL PROTECTED]> Thu, 15 Feb 2007 19:34:51 -0700
+ [ maximilian attems ]
+ * Fix incomplete ipv6 multicast patch from 2.6.16.38. (closes: #410375)
+ * UML compile 2.6.16.38 fix forward port completed.
+
+ -- maximilian attems <[EMAIL PROTECTED]> Fri, 16 Feb 2007 12:35:02 +0100
linux-2.6 (2.6.18.dfsg.1-10) unstable; urgency=low
Added: dists/sid/linux-2.6/debian/patches/bugfix/net-ipv6-mcast.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/net-ipv6-mcast.patch Fri Feb
16 12:37:50 2007
@@ -0,0 +1,37 @@
+diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
+index 77da3a8..e8f1441 100644
+--- a/net/ipv6/addrconf.c
++++ b/net/ipv6/addrconf.c
+@@ -321,6 +321,7 @@ void in6_dev_finish_destroy(struct inet6_dev *idev)
+ static struct inet6_dev * ipv6_add_dev(struct net_device *dev)
+ {
+ struct inet6_dev *ndev;
++ struct in6_addr maddr;
+
+ ASSERT_RTNL();
+
+@@ -393,10 +394,6 @@ static struct inet6_dev * ipv6_add_dev(struct net_device
*dev)
+ if (netif_carrier_ok(dev))
+ ndev->if_flags |= IF_READY;
+
+- write_lock_bh(&addrconf_lock);
+- dev->ip6_ptr = ndev;
+- write_unlock_bh(&addrconf_lock);
+-
+ ipv6_mc_init_dev(ndev);
+ ndev->tstamp = jiffies;
+ #ifdef CONFIG_SYSCTL
+@@ -406,6 +403,13 @@ static struct inet6_dev * ipv6_add_dev(struct net_device
*dev)
+ NULL);
+ addrconf_sysctl_register(ndev, &ndev->cnf);
+ #endif
++ write_lock_bh(&addrconf_lock);
++ dev->ip6_ptr = ndev;
++ write_unlock_bh(&addrconf_lock);
++
++ /* Join all-node multicast group */
++ ipv6_addr_all_nodes(&maddr);
++ ipv6_dev_mc_inc(dev, &maddr);
+ return ndev;
+ }
+
Added: dists/sid/linux-2.6/debian/patches/bugfix/uml-compilation.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/uml-compilation.patch Fri Feb
16 12:37:50 2007
@@ -0,0 +1,80 @@
+commit 43aa2c34a65b64370635ac447994f99e7d410890
+Author: Adrian Bunk <[EMAIL PROTECTED]>
+Date: Fri Jan 5 03:17:11 2007 +0100
+
+ fix the UML compilation
+
+ Based on patches from Linus' tree.
+
+ Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
+
+diff --git a/arch/um/os-Linux/process.c b/arch/um/os-Linux/process.c
+index d261888..a0afd10 100644
+--- a/arch/um/os-Linux/process.c
++++ b/arch/um/os-Linux/process.c
+@@ -11,6 +11,7 @@
+ #include <sys/mman.h>
+ #include <sys/wait.h>
+ #include <sys/mman.h>
++#include <sys/syscall.h>
+ #include "ptrace_user.h"
+ #include "os.h"
+ #include "user.h"
+diff --git a/arch/um/sys-i386/unmap.c b/arch/um/sys-i386/unmap.c
+index 1b0ad0e..8e55cd5 100644
+--- a/arch/um/sys-i386/unmap.c
++++ b/arch/um/sys-i386/unmap.c
+@@ -5,20 +5,17 @@
+
+ #include <linux/mman.h>
+ #include <asm/unistd.h>
++#include <sys/syscall.h>
+
+-static int errno;
+-
+-static inline _syscall2(int,munmap,void *,start,size_t,len)
+-static inline _syscall6(void *,mmap2,void
*,addr,size_t,len,int,prot,int,flags,int,fd,off_t,offset)
+ int switcheroo(int fd, int prot, void *from, void *to, int size)
+ {
+- if(munmap(to, size) < 0){
++ if (syscall(__NR_munmap, to, size) < 0){
+ return(-1);
+ }
+- if(mmap2(to, size, prot, MAP_SHARED | MAP_FIXED, fd, 0) == (void*) -1 ){
++ if (syscall(__NR_mmap2, to, size, prot, MAP_SHARED | MAP_FIXED, fd, 0)
== (void*) -1 ){
+ return(-1);
+ }
+- if(munmap(from, size) < 0){
++ if (syscall(__NR_munmap, from, size) < 0){
+ return(-1);
+ }
+ return(0);
+diff --git a/arch/um/sys-x86_64/unmap.c b/arch/um/sys-x86_64/unmap.c
+index f4a4bff..57c9286 100644
+--- a/arch/um/sys-x86_64/unmap.c
++++ b/arch/um/sys-x86_64/unmap.c
+@@ -5,20 +5,17 @@
+
+ #include <linux/mman.h>
+ #include <asm/unistd.h>
++#include <sys/syscall.h>
+
+-static int errno;
+-
+-static inline _syscall2(int,munmap,void *,start,size_t,len)
+-static inline _syscall6(void *,mmap,void
*,addr,size_t,len,int,prot,int,flags,int,fd,off_t,offset)
+ int switcheroo(int fd, int prot, void *from, void *to, int size)
+ {
+- if(munmap(to, size) < 0){
++ if (syscall(__NR_munmap, to, size) < 0){
+ return(-1);
+ }
+- if(mmap(to, size, prot, MAP_SHARED | MAP_FIXED, fd, 0) == (void*) -1){
++ if (syscall(__NR_mmap, to, size, prot, MAP_SHARED | MAP_FIXED, fd, 0)
== (void*) -1){
+ return(-1);
+ }
+- if(munmap(from, size) < 0){
++ if (syscall(__NR_munmap, from, size) < 0){
+ return(-1);
+ }
+ return(0);
Modified: dists/sid/linux-2.6/debian/patches/series/11
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/11 (original)
+++ dists/sid/linux-2.6/debian/patches/series/11 Fri Feb 16 12:37:50 2007
@@ -1,4 +1,5 @@
- bugfix/2.6.16.34
-- bugfix/2.6.16.38
+ bugfix/atiixp-only-one-channel.patch
+ bugfix/atiixp-cable-detection-support.patch
++ bugfix/net-ipv6-mcast.patch
++ bugfix/uml-compilation.patch
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
