More Makefile cleanups, otherwise mainly noticeable are the netfilter fix
and the LVM update.
Linus
-----
- pre4:
- Christoph Rohland: shmfs cleanup
- Nicolas Pitre: don't forget loop.c flags
- Geert Uytterhoeven: new-style m68k Makefiles
- Neil Brown: knfsd cleanups, raid5 re-org
- Andrea Arkangeli: update to LVM-0.9
- LC Chang: sis900 driver doc update
- David Miller: netfilter oops fix
- Andrew Grover: acpi update
- pre3:
- Christian Jullien: smc9194: proper dev_kfree_skb_irq
- Cort Dougan: new-style PowerPC Makefiles
- Andrew Morton, Petr Vandrovec: fix run_task_queue
- Christoph Rohland: shmfs for shared memory handling
- pre2:
- Kai Germaschewski: ISDN update (including Makefiles)
- Jens Axboe: cdrom updates
- Petr Vandrovec; Matrox G450 support
- Bill Nottingham: fix FAT32 filesystems on 64-bit platforms
- David Miller: sparc (and other) Makefile fixup
- Andrea Arkangeli: alpha SMP TLB context fix (and cleanups)
- Niels Kristian Bech Jensen: checkconfig, USB warnings
- Andrew Grover: large ACPI update
- pre1:
- me: drop support for old-style Makefiles entirely. Big.
- me: check b_end_io at the IO submission path
- me: fix "ptep_mkdirty()" (so that swapoff() works correctly)
- fix fault case in copy_from_user() with a constant size, where
((size & 3) == 3)
Linus Torvalds wrote:
> - pre4:
> - Andrea Arkangeli: update to LVM-0.9
gcc -D__KERNEL__ -I/usr/local/src/linux/include -Wall
-Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strict-aliasing -pipe
-mpreferred-stack-boundary=2 -march=i686 -malign-functions=4 -DMODULE
-DMODVERSIONS -include
/usr/local/src/linux/include/linux/modversions.h -c -o lvm.o lvm.c
lvm.c: In function `lvm_do_vg_extend':
lvm.c:2024: warning: implicit declaration of function
`lvm_do_create_proc_entry_of_pv'
lvm.c: In function `lvm_do_create_proc_entry_of_lv':
lvm.c:3016: `pde' undeclared (first use in this function)
lvm.c:3016: (Each undeclared identifier is reported only once
lvm.c:3016: for each function it appears in.)
lvm.c: At top level:
lvm.c:3044: warning: type mismatch with previous implicit declaration
lvm.c:2024: warning: previous implicit declaration of
`lvm_do_create_proc_entry_of_pv'
lvm.c:3044: warning: `lvm_do_create_proc_entry_of_pv' was previously
implicitly declared to return `int'
lvm.c: In function `lvm_do_create_proc_entry_of_pv':
lvm.c:3050: `pde' undeclared (first use in this function)
lvm.c: At top level:
lvm.c:147: warning: `lvm_short_version' defined but not used
make[2]: *** [lvm.o] Error 1
make[2]: Leaving directory `/data2/usr/local/src/linux-2.4/drivers/md'
--------------- .config
#
# Multi-device support (RAID and LVM)
#
CONFIG_MD=y
CONFIG_BLK_DEV_MD=m
CONFIG_MD_LINEAR=m
CONFIG_MD_RAID0=m
CONFIG_MD_RAID1=m
CONFIG_MD_RAID5=m
CONFIG_BLK_DEV_LVM=m
-----------------
--
Eyal Lebedinsky ([email protected])
On Sat, Dec 23, 2000 at 12:00:27AM +1100, Eyal Lebedinsky wrote:
> Linus Torvalds wrote:
> > - pre4:
> > - Andrea Arkangeli: update to LVM-0.9
>
> gcc -D__KERNEL__ -I/usr/local/src/linux/include -Wall
> -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strict-aliasing -pipe
> -mpreferred-stack-boundary=2 -march=i686 -malign-functions=4 -DMODULE
> -DMODVERSIONS -include
> /usr/local/src/linux/include/linux/modversions.h -c -o lvm.o lvm.c
> lvm.c: In function `lvm_do_vg_extend':
> lvm.c:2024: warning: implicit declaration of function
> `lvm_do_create_proc_entry_of_pv'
> lvm.c: In function `lvm_do_create_proc_entry_of_lv':
> lvm.c:3016: `pde' undeclared (first use in this function)
> lvm.c:3016: (Each undeclared identifier is reported only once
> lvm.c:3016: for each function it appears in.)
> lvm.c: At top level:
> lvm.c:3044: warning: type mismatch with previous implicit declaration
> lvm.c:2024: warning: previous implicit declaration of
> `lvm_do_create_proc_entry_of_pv'
> lvm.c:3044: warning: `lvm_do_create_proc_entry_of_pv' was previously
> implicitly declared to return `int'
> lvm.c: In function `lvm_do_create_proc_entry_of_pv':
> lvm.c:3050: `pde' undeclared (first use in this function)
> lvm.c: At top level:
> lvm.c:147: warning: `lvm_short_version' defined but not used
> make[2]: *** [lvm.o] Error 1
> make[2]: Leaving directory `/data2/usr/local/src/linux-2.4/drivers/md'
Strange, test13-pre3 plus the 0.9 lvm patch compiled and worked fine
for me. I'll try to compile test13-pre4 now and I'll let you know.
Andrea
On Fri, Dec 22, 2000 at 03:31:45PM +0100, Andrea Arcangeli wrote:
> On Sat, Dec 23, 2000 at 12:00:27AM +1100, Eyal Lebedinsky wrote:
> > Linus Torvalds wrote:
> > > - pre4:
> > > - Andrea Arkangeli: update to LVM-0.9
> >
> > gcc -D__KERNEL__ -I/usr/local/src/linux/include -Wall
> > -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strict-aliasing -pipe
> > -mpreferred-stack-boundary=2 -march=i686 -malign-functions=4 -DMODULE
> > -DMODVERSIONS -include
> > /usr/local/src/linux/include/linux/modversions.h -c -o lvm.o lvm.c
> > lvm.c: In function `lvm_do_vg_extend':
> > lvm.c:2024: warning: implicit declaration of function
> > `lvm_do_create_proc_entry_of_pv'
> > lvm.c: In function `lvm_do_create_proc_entry_of_lv':
> > lvm.c:3016: `pde' undeclared (first use in this function)
> > lvm.c:3016: (Each undeclared identifier is reported only once
> > lvm.c:3016: for each function it appears in.)
> > lvm.c: At top level:
> > lvm.c:3044: warning: type mismatch with previous implicit declaration
> > lvm.c:2024: warning: previous implicit declaration of
> > `lvm_do_create_proc_entry_of_pv'
> > lvm.c:3044: warning: `lvm_do_create_proc_entry_of_pv' was previously
> > implicitly declared to return `int'
> > lvm.c: In function `lvm_do_create_proc_entry_of_pv':
> > lvm.c:3050: `pde' undeclared (first use in this function)
> > lvm.c: At top level:
> > lvm.c:147: warning: `lvm_short_version' defined but not used
> > make[2]: *** [lvm.o] Error 1
> > make[2]: Leaving directory `/data2/usr/local/src/linux-2.4/drivers/md'
>
> Strange, test13-pre3 plus the 0.9 lvm patch compiled and worked fine
> for me. I'll try to compile test13-pre4 now and I'll let you know.
Ok, found it, you can workaround it with:
CONFIG_LVM_PROC_FS=y
(I never tried to compile LVM without procfs support, you really
want /proc support too, anyways of course it should compile also
without /proc support so it's a minor bug...)
Andrea
On Fri, Dec 22, 2000 at 04:01:50PM +0100, Andrea Arcangeli wrote:
> On Fri, Dec 22, 2000 at 03:31:45PM +0100, Andrea Arcangeli wrote:
> > On Sat, Dec 23, 2000 at 12:00:27AM +1100, Eyal Lebedinsky wrote:
> > > Linus Torvalds wrote:
> > > > - pre4:
> > > > - Andrea Arkangeli: update to LVM-0.9
> > >
> > > gcc -D__KERNEL__ -I/usr/local/src/linux/include -Wall
> > > -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strict-aliasing -pipe
> > > -mpreferred-stack-boundary=2 -march=i686 -malign-functions=4 -DMODULE
> > > -DMODVERSIONS -include
> > > /usr/local/src/linux/include/linux/modversions.h -c -o lvm.o lvm.c
> > > lvm.c: In function `lvm_do_vg_extend':
> > > lvm.c:2024: warning: implicit declaration of function
> > > `lvm_do_create_proc_entry_of_pv'
> > > lvm.c: In function `lvm_do_create_proc_entry_of_lv':
> > > lvm.c:3016: `pde' undeclared (first use in this function)
> > > lvm.c:3016: (Each undeclared identifier is reported only once
> > > lvm.c:3016: for each function it appears in.)
> > > lvm.c: At top level:
> > > lvm.c:3044: warning: type mismatch with previous implicit declaration
> > > lvm.c:2024: warning: previous implicit declaration of
> > > `lvm_do_create_proc_entry_of_pv'
> > > lvm.c:3044: warning: `lvm_do_create_proc_entry_of_pv' was previously
> > > implicitly declared to return `int'
> > > lvm.c: In function `lvm_do_create_proc_entry_of_pv':
> > > lvm.c:3050: `pde' undeclared (first use in this function)
> > > lvm.c: At top level:
> > > lvm.c:147: warning: `lvm_short_version' defined but not used
> > > make[2]: *** [lvm.o] Error 1
> > > make[2]: Leaving directory `/data2/usr/local/src/linux-2.4/drivers/md'
> >
> > Strange, test13-pre3 plus the 0.9 lvm patch compiled and worked fine
> > for me. I'll try to compile test13-pre4 now and I'll let you know.
>
> Ok, found it, you can workaround it with:
>
> CONFIG_LVM_PROC_FS=y
>
> (I never tried to compile LVM without procfs support, you really
> want /proc support too, anyways of course it should compile also
> without /proc support so it's a minor bug...)
Ok this should fix the problem and it cleanups a little bit the code:
ftp://ftp.us.kernel.org/pub/linux/kernel/people/andrea/patches/v2.4/2.4.0-test13-pre4/lvm-proc-fixes-1
Please confirm and then I'll sumbit it to Linus.
Andrea
In article <[email protected]> you wrote:
> Linus Torvalds wrote:
>> - pre4:
>> - Andrea Arkangeli: update to LVM-0.9
> lvm.c: In function `lvm_do_create_proc_entry_of_lv':
[snip]
Hi,
The patch below fixes this.
Greetings,
Arjan van de Ven
diff -ur linux/drivers/md/lvm.c /mnt/raid/0/linux/drivers/md/lvm.c
--- linux/drivers/md/lvm.c Fri Dec 22 17:05:20 2000
+++ /mnt/raid/0/linux/drivers/md/lvm.c Fri Dec 22 12:39:37 2000
@@ -2021,7 +2021,9 @@
for (p = 0; p < vg_ptr->pv_max; p++) {
if ( ( pv_ptr = vg_ptr->pv[p]) == NULL) {
ret = lvm_do_pv_create(arg, vg_ptr, p);
+#if defined CONFIG_LVM_PROC_FS && defined CONFIG_PROC_FS
lvm_do_create_proc_entry_of_pv ( vg_ptr, pv_ptr);
+#endif
if ( ret != 0) return ret;
/* We don't need the PE list
@@ -3002,6 +3004,8 @@
} /* lvm_do_pv_status() */
+#if defined CONFIG_LVM_PROC_FS && defined CONFIG_PROC_FS
+
/*
* create a /proc entry for a logical volume
@@ -3021,8 +3025,6 @@
}
}
}
-
-
/*
* remove a /proc entry for a logical volume
*/
@@ -3038,6 +3040,7 @@
}
+
/*
* create a /proc entry for a physical volume
*/
@@ -3074,7 +3077,6 @@
/*
* create a /proc entry for a volume group
*/
-#if defined CONFIG_LVM_PROC_FS && defined CONFIG_PROC_FS
void lvm_do_create_proc_entry_of_vg ( vg_t *vg_ptr) {
int l, p;
pv_t *pv_ptr;
On Fri, Dec 22, 2000 at 05:07:27PM +0100, Arjan van de Ven wrote:
> In article <[email protected]> you wrote:
> > Linus Torvalds wrote:
> >> - pre4:
> >> - Andrea Arkangeli: update to LVM-0.9
>
> > lvm.c: In function `lvm_do_create_proc_entry_of_lv':
>
> [snip]
>
> Hi,
>
> The patch below fixes this.
I prefer my one that also kills the bogus check for CONFIG_PROC_FS introducing
a dependency on CONFIG_PROC_FS in config.in.
Andrea
Andrea Arcangeli wrote:
> Ok, found it, you can workaround it with:
>
> CONFIG_LVM_PROC_FS=y
Yes, this fixed it. I do build with proc, and have no idea why
this was off in my config. Anyway, why is there this private proc
option in .config at all? most modules use the global setting for
proc (CONFIG_PROC_FS), only very few have such private options.
--
Eyal Lebedinsky ([email protected])
Hello,
With 2.4.0-test13-pre4 i noticed
"Networking options"
<M> LAN Emulation (LANE) support
<M> Multi-Protocol Over ATM (MPOA) support
results with 'make bzImage' in:
make[1]: Leaving directory `/usr/src/linux-2.4.0-test13-4/arch/i386/lib'
ld -m elf_i386 -T /usr/src/linux/arch/i386/vmlinux.lds -e stext arch/i386/kernel/head.o arch/i386/kernel/init_task.o init/main.o init/version.o \
--start-group \
arch/i386/kernel/kernel.o arch/i386/mm/mm.o kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o \
drivers/block/block.o drivers/char/char.o drivers/misc/misc.o drivers/net/net.o drivers/media/media.o drivers/char/drm/drm.o drivers/net/fc/fc.o drivers/net/appletalk/appletalk.o drivers/net/tokenring/tr.a drivers/net/wan/wan.o drivers/atm/atm.o drivers/ide/idedriver.o drivers/scsi/scsidrv.o drivers/cdrom/driver.o drivers/pci/driver.o drivers/video/video.o drivers/net/hamradio/hamradio.o drivers/md/mddev.o \
net/network.o \
/usr/src/linux/arch/i386/lib/lib.a /usr/src/linux/lib/lib.a /usr/src/linux/arch/i386/lib/lib.a \
--end-group \
-o vmlinux
net/network.o: In function `atm_ioctl':
net/network.o(.text+0x3ff92): undefined reference to `atm_lane_init'
net/network.o(.text+0x40039): undefined reference to `atm_mpoa_init'
make: *** [vmlinux] Error 1
sjoerd:/usr/src/linux #
Unsetting these options "fixed" this for me.
Greatings,
--
Arjan Filius
mailto:[email protected]
In article <[email protected]> you wrote:
> net/network.o(.text+0x3ff92): undefined reference to `atm_lane_init'
> net/network.o(.text+0x40039): undefined reference to `atm_mpoa_init'
Hi,
The patch below should fix that.
Greetings,
Arjan van de Ven
--- linux/net/atm/Makefile Fri Dec 22 18:22:15 2000
+++ ../0/linux/net/atm/Makefile Fri Dec 22 19:01:03 2000
@@ -37,6 +37,11 @@
obj-$(CONFIG_ATM) += lec.o lane_mpoa_init.o
endif
+ifeq ($(CONFIG_ATM_LANE),m)
+obj-$(CONFIG_ATM) += lane_mpoa_init.o
+obj-m += lec.o
+endif
+
ifeq ($(CONFIG_ATM_MPOA),y)
obj-$(CONFIG_ATM) += mpoa.o
endif