Re: Error during compile of 2.5.69-mm8

[Thomas Schlichter <schlicht@uni-mannheim.de>]

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

Hi!

On May 22, Mads Christensen wrote:
> Hey!
>
> Well you can fix it by either compiling apm as a module or not compiling
> apm at all =)

Well, I Don't think this really is a fix, it's just a workaround for a problen 
introduced with ChangeSet@1.1167.

With that the definition of SET_MODULE_OWNER was removed from the file 
include/linux/module.h and an empty one was added to the file 
include/linux/netdevice.h.

This was done because the 'owner' field was removed from the 'struct 
net_device'. This broke all other places where SET_MODULE_OWNER was also 
used...

I made the attached patch against 2.5.69-mm8 that adds the original definition 
back to include/linux/module.h and removes all the places where it must not 
be called anymore due to the missing owner field...

I hope this was the real intention of the ChangeSet mentioned above, and I did 
not miss any false occurrence. (The most SET_MODULE_OWNER calls are now in 
the isdn subtree)

For me it compiles and works fine... ;-)

> Best Regards
> Mads Christensen

Best regards, too...
   Thomas Schlichter

P.S.: Sorry that I had to GZIP the patch, but else it would have been too 
large...

> On tor, 2003-05-22 at 15:54, Mads Christensen wrote:
> > Hello
> >
> > Got this while i tried to compile the fucker!
> >
> >   gcc -Wp,-MD,init/.version.o.d -D__KERNEL__ -Iinclude -Wall
> > -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common
> > -pipe -mpreferred-stack-boundary=2 -march=athlon
> > -Iinclude/asm-i386/mach-default -fomit-frame-pointer -nostdinc
> > -iwithprefix include    -DKBUILD_BASENAME=version
> > -DKBUILD_MODNAME=version -c -o init/.tmp_version.o init/version.c
> > scripts/fixdep init/.version.o.d init/version.o 'gcc
> > -Wp,-MD,init/.version.o.d -D__KERNEL__ -Iinclude -Wall
> > -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common
> > -pipe -mpreferred-stack-boundary=2 -march=athlon
> > -Iinclude/asm-i386/mach-default -fomit-frame-pointer -nostdinc
> > -iwithprefix include    -DKBUILD_BASENAME=version
> > -DKBUILD_MODNAME=version -c -o init/.tmp_version.o init/version.c' >
> > init/.version.o.tmp; rm -f init/.version.o.d; mv -f init/.version.o.tmp
> > init/.version.o.cmd
> >    ld -m elf_i386  -r -o init/built-in.o init/main.o init/version.o
> > init/mounts.o init/initramfs.o
> >         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 vmlinux
> >
> > arch/i386/kernel/built-in.o(.init.text+0x5521): In function `apm_init':
> > : undefined reference to `SET_MODULE_OWNER'
> >
> > make[1]: *** [vmlinux] Error 1
> > make[1]: Leaving directory `/usr/src/linux-2.4.69-mm8'
> > make: *** [stamp-build] Error 2
> >
> >
> > Thanks in advance!

[-- Attachment #1.2: SET_MODULE_OWNER.diff.gz --]
[-- Type: application/x-gzip, Size: 17020 bytes --]

[-- Attachment #2: signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]