Re: 2.5.69-mm4

[Alexander Hoogerhuis]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Andrew Morton <[e-mail]> writes:

> Alexander Hoogerhuis <[e-mail]> wrote:
> >
> > net/core/dev.c:1496: conflicting types for `handle_bridge'
> >  net/core/dev.c:1468: previous declaration of `handle_bridge'
> 
> argh, sorry, stupid.
> 
> diff -puN net/core/dev.c~handle_bridge-fix net/core/dev.c
> --- 25/net/core/dev.c~handle_bridge-fix	2003-05-13 00:10:47.000000000 -0700
> +++ 25-akpm/net/core/dev.c	2003-05-13 00:10:57.000000000 -0700
> @@ -1491,7 +1491,7 @@ static inline void handle_diverter(struc
>  #endif
>  }
>  
> -static inline int handle_bridge(struct sk_buff *skb,
> +static inline int __handle_bridge(struct sk_buff *skb,
>  			struct packet_type **pt_prev, int *ret)
>  {
>  #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
> @@ -1548,7 +1548,7 @@ int netif_receive_skb(struct sk_buff *sk
>  
>  	handle_diverter(skb);
>  
> -	if (handle_bridge(skb, &pt_prev, &ret))
> +	if (__handle_bridge(skb, &pt_prev, &ret))
>  		goto out;
>  
>  	list_for_each_entry_rcu(ptype, &ptype_base[ntohs(type)&15], list) {
> 

And this one :)

        ld -m elf_i386  -T arch/i386/vmlinux.lds.s arch/i386/kernel/head.o arch/i386/kernel/init_task.o   init/built-in.o --start-group  usr/built-in.o  arch/i386/kernel/built-in.o  arch/i386/mm/built-in.o  arch/i386/mach-default/built-in.o  kernel/built-in.o  mm/built-in.o  fs/built-in.o  ipc/built-in.o  security/built-in.o  crypto/built-in.o  lib/lib.a  arch/i386/lib/lib.a  drivers/built-in.o  sound/built-in.o  arch/i386/pci/built-in.o  net/built-in.o --end-group  -o .tmp_vmlinux1
kernel/built-in.o(.text+0x1005): In function `schedule':
: undefined reference to `active_load_balance'
make: *** [.tmp_vmlinux1] Error 1
alexh@lapper ~/src/linux/linux-2.5.69-mm4 $

mvh,
A
- -- 
Alexander Hoogerhuis                               | [e-mail]
CCNP - CCDP - MCNE - CCSE                          | [phone]
"You have zero privacy anyway. Get over it."  --Scott McNealy
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (GNU/Linux)
Comment: Processed by Mailcrypt 3.5.8 <http://mailcrypt.sourceforge.net/>

iD8DBQE+wKY3CQ1pa+gRoggRAmd6AKDCJGGIiqot4yzmTlVdWpvQR1JagwCaAsY7
UdsL8kbCLzCEKTrsL/ijsoA=
=Uhvc
-----END PGP SIGNATURE-----