Re: 2.3.43/44pre8 can't compile on K7 (alignment)

From: David S. Miller (davem@redhat.com)
Date: Fri Feb 11 2000 - 23:08:56 EST

  • Next message: Alan Cox: "Re: Why is ReGet breaking things?"

    This fixes it, already sent to Linus:

    diff -u --recursive --new-file --exclude=CVS --exclude=.cvsignore vanilla/linux/include/linux/interrupt.h linux/include/linux/interrupt.h
    --- vanilla/linux/include/linux/interrupt.h Wed Feb 9 21:33:04 2000
    +++ linux/include/linux/interrupt.h Fri Feb 11 17:55:24 2000
    @@ -4,6 +4,7 @@
     
     #include <linux/kernel.h>
     #include <linux/smp.h>
    +#include <linux/cache.h>
     #include <asm/bitops.h>
     #include <asm/atomic.h>
     
    diff -u --recursive --new-file --exclude=CVS --exclude=.cvsignore vanilla/linux/include/linux/netdevice.h linux/include/linux/netdevice.h
    --- vanilla/linux/include/linux/netdevice.h Wed Feb 9 21:34:14 2000
    +++ linux/include/linux/netdevice.h Fri Feb 11 17:55:25 2000
    @@ -125,6 +125,7 @@
     
     extern const char *if_port_text[];
     
    +#include <linux/cache.h>
     #include <linux/skbuff.h>
     
     struct neighbour;
    diff -u --recursive --new-file --exclude=CVS --exclude=.cvsignore vanilla/linux/include/net/sock.h linux/include/net/sock.h
    --- vanilla/linux/include/net/sock.h Wed Feb 9 21:34:22 2000
    +++ linux/include/net/sock.h Fri Feb 11 18:08:30 2000
    @@ -35,6 +35,7 @@
     
     #include <linux/config.h>
     #include <linux/timer.h>
    +#include <linux/cache.h>
     #include <linux/in.h> /* struct sockaddr_in */
     
     #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
    diff -u --recursive --new-file --exclude=CVS --exclude=.cvsignore vanilla/linux/net/core/skbuff.c linux/net/core/skbuff.c
    --- vanilla/linux/net/core/skbuff.c Wed Feb 9 20:08:09 2000
    +++ linux/net/core/skbuff.c Fri Feb 11 14:27:23 2000
    @@ -4,7 +4,7 @@
      * Authors: Alan Cox <iiitac@pyr.swan.ac.uk>
      * Florian La Roche <rzsfl@rz.uni-sb.de>
      *
    - * Version: $Id: skbuff.c,v 1.66 2000/02/09 21:11:30 davem Exp $
    + * Version: $Id: skbuff.c,v 1.67 2000/02/11 22:27:23 davem Exp $
      *
      * Fixes:
      * Alan Cox : Fixed the worst of the load balancer bugs.
    @@ -49,6 +49,7 @@
     #include <linux/string.h>
     #include <linux/skbuff.h>
     #include <linux/slab.h>
    +#include <linux/cache.h>
     #include <linux/init.h>
     
     #include <net/ip.h>
    diff -u --recursive --new-file --exclude=CVS --exclude=.cvsignore vanilla/linux/net/ipv4/tcp_ipv4.c linux/net/ipv4/tcp_ipv4.c
    --- vanilla/linux/net/ipv4/tcp_ipv4.c Tue Feb 8 18:35:27 2000
    +++ linux/net/ipv4/tcp_ipv4.c Fri Feb 11 14:27:26 2000
    @@ -5,7 +5,7 @@
      *
      * Implementation of the Transmission Control Protocol(TCP).
      *
    - * Version: $Id: tcp_ipv4.c,v 1.199 2000/02/08 21:27:17 davem Exp $
    + * Version: $Id: tcp_ipv4.c,v 1.200 2000/02/11 22:27:26 davem Exp $
      *
      * IPv4 specific functions
      *
    @@ -51,6 +51,7 @@
     #include <linux/types.h>
     #include <linux/fcntl.h>
     #include <linux/random.h>
    +#include <linux/cache.h>
     #include <linux/init.h>
     
     #include <net/icmp.h>
    diff -u --recursive --new-file --exclude=CVS --exclude=.cvsignore vanilla/linux/net/socket.c linux/net/socket.c
    --- vanilla/linux/net/socket.c Fri Feb 11 16:19:44 2000
    +++ linux/net/socket.c Fri Feb 11 18:19:56 2000
    @@ -69,6 +69,7 @@
     #include <linux/wanrouter.h>
     #include <linux/init.h>
     #include <linux/poll.h>
    +#include <linux/cache.h>
     
     #if defined(CONFIG_KMOD) && defined(CONFIG_NET)
     #include <linux/kmod.h>

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.rutgers.edu
    Please read the FAQ at http://www.tux.org/lkml/



    This archive was generated by hypermail 2b29 : Sat Feb 12 2000 - 04:52:46 EST