inter-module-* removal.. small next step

inter-module-* removal.. small next step

[Arjan van de Ven]

Hi,

intermodule is deprecated for quite some time now, and MTD is the sole last
user in the tree. To shrink the kernel for the people who don't use MTD, and
to prevent accidental return of more users of this, make the compiling of
this function conditional on MTD.


Signed-off-by: Arjan van de Ven <arjan@infradead.org>

--- linux/kernel/Makefile	2005-01-30 18:57:11.000000000 +0100
+++ linux/kernel/Makefile	2005-01-30 18:57:11.000000000 +0100
@@ -6,7 +6,7 @@
 	    exit.o itimer.o time.o softirq.o resource.o \
 	    sysctl.o capability.o ptrace.o timer.o user.o \
 	    signal.o sys.o kmod.o workqueue.o pid.o \
-	    rcupdate.o intermodule.o extable.o params.o posix-timers.o \
+	    rcupdate.o extable.o params.o posix-timers.o \
 	    kthread.o wait.o kfifo.o sys_ni.o
 
 obj-$(CONFIG_FUTEX) += futex.o
@@ -27,6 +27,10 @@
 obj-$(CONFIG_SYSFS) += ksysfs.o
 obj-$(CONFIG_GENERIC_HARDIRQS) += irq/
 
+inter-$(CONFIG_MTD)	+= intermodule.o
+obj-y	+= $(inter-y)
+obj-y  += $(inter=m)
+
 ifneq ($(CONFIG_IA64),y)
 # According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is
 # needed for x86 only.  Why this used to be enabled for all architectures is beyond

Re: inter-module-* removal.. small next step

[Adrian Bunk]

On Sun, Jan 30, 2005 at 06:00:17PM +0000, Arjan van de Ven wrote:
> Hi,
> 
> intermodule is deprecated for quite some time now, and MTD is the sole last
> user in the tree. To shrink the kernel for the people who don't use MTD, and
> to prevent accidental return of more users of this, make the compiling of
> this function conditional on MTD.
> 
> 
> Signed-off-by: Arjan van de Ven <arjan@infradead.org>
> 
> --- linux/kernel/Makefile	2005-01-30 18:57:11.000000000 +0100
> +++ linux/kernel/Makefile	2005-01-30 18:57:11.000000000 +0100
> @@ -6,7 +6,7 @@
>  	    exit.o itimer.o time.o softirq.o resource.o \
>  	    sysctl.o capability.o ptrace.o timer.o user.o \
>  	    signal.o sys.o kmod.o workqueue.o pid.o \
> -	    rcupdate.o intermodule.o extable.o params.o posix-timers.o \
> +	    rcupdate.o extable.o params.o posix-timers.o \
>  	    kthread.o wait.o kfifo.o sys_ni.o
>  
>  obj-$(CONFIG_FUTEX) += futex.o
> @@ -27,6 +27,10 @@
>  obj-$(CONFIG_SYSFS) += ksysfs.o
>  obj-$(CONFIG_GENERIC_HARDIRQS) += irq/
>  
> +inter-$(CONFIG_MTD)	+= intermodule.o
> +obj-y	+= $(inter-y)
> +obj-y  += $(inter=m)
>...

This should be inter-m .

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: inter-module-* removal.. small next step

[Adrian Bunk]

On Sun, Jan 30, 2005 at 06:00:17PM +0000, Arjan van de Ven wrote:

> Hi,
> 
> intermodule is deprecated for quite some time now, and MTD is the sole last
> user in the tree. To shrink the kernel for the people who don't use MTD, and
> to prevent accidental return of more users of this, make the compiling of
> this function conditional on MTD.
>...

agpgart-allow-multiple-backends-to-be-initialized.patch in -mm adds a 
call to inter_module_unregister to drivers/char/agp/backend.c ...

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: inter-module-* removal.. small next step

[Arjan van de Ven]

On Sun, 2005-01-30 at 19:10 +0100, Adrian Bunk wrote:
> On Sun, Jan 30, 2005 at 06:00:17PM +0000, Arjan van de Ven wrote:
> 
> > Hi,
> > 
> > intermodule is deprecated for quite some time now, and MTD is the sole last
> > user in the tree. To shrink the kernel for the people who don't use MTD, and
> > to prevent accidental return of more users of this, make the compiling of
> > this function conditional on MTD.
> >...
> 
> agpgart-allow-multiple-backends-to-be-initialized.patch in -mm adds a 
> call to inter_module_unregister to drivers/char/agp/backend.c ...

that is a bug in -mm; inter-module* got removed from agp entirely some
time ago 

sounds like andrew has some bad patchnoise in his his agp patch

Re: inter-module-* removal.. small next step

[Andrew Morton]

Arjan van de Ven <arjan@infradead.org> wrote:
>
> On Sun, 2005-01-30 at 19:10 +0100, Adrian Bunk wrote:
> > On Sun, Jan 30, 2005 at 06:00:17PM +0000, Arjan van de Ven wrote:
> > 
> > > Hi,
> > > 
> > > intermodule is deprecated for quite some time now, and MTD is the sole last
> > > user in the tree. To shrink the kernel for the people who don't use MTD, and
> > > to prevent accidental return of more users of this, make the compiling of
> > > this function conditional on MTD.
> > >...
> > 
> > agpgart-allow-multiple-backends-to-be-initialized.patch in -mm adds a 
> > call to inter_module_unregister to drivers/char/agp/backend.c ...
> 
> that is a bug in -mm; inter-module* got removed from agp entirely some
> time ago 

Michael's patches put it back in.  What's the fix?

Re: inter-module-* removal.. small next step

[Arjan van de Ven]

On Sun, 2005-01-30 at 11:58 -0800, Andrew Morton wrote:
> Arjan van de Ven <arjan@infradead.org> wrote:
> >
> > On Sun, 2005-01-30 at 19:10 +0100, Adrian Bunk wrote:
> > > On Sun, Jan 30, 2005 at 06:00:17PM +0000, Arjan van de Ven wrote:
> > > 
> > > > Hi,
> > > > 
> > > > intermodule is deprecated for quite some time now, and MTD is the sole last
> > > > user in the tree. To shrink the kernel for the people who don't use MTD, and
> > > > to prevent accidental return of more users of this, make the compiling of
> > > > this function conditional on MTD.
> > > >...
> > > 
> > > agpgart-allow-multiple-backends-to-be-initialized.patch in -mm adds a 
> > > call to inter_module_unregister to drivers/char/agp/backend.c ...
> > 
> > that is a bug in -mm; inter-module* got removed from agp entirely some
> > time ago 
> 
> Michael's patches put it back in.  What's the fix?

they only put it half in. just drop the one line; it tries to unregister
something that never got registered... 
the old cleanup code had to do that, but that got removed. The patch
basically replaces the cleanup code, and thus puts it back in. One line
deleted and it's fine.

Re: inter-module-* removal.. small next step

[David Woodhouse]

On Sun, 2005-01-30 at 18:00 +0000, Arjan van de Ven wrote:
> Hi,
> 
> intermodule is deprecated for quite some time now, and MTD is the sole last
> user in the tree. To shrink the kernel for the people who don't use MTD, and
> to prevent accidental return of more users of this, make the compiling of
> this function conditional on MTD.

Please get the dependencies right -- it's not core MTD code, but the NOR
chip drivers and the old DiskOnChip drivers which use this. 

-- 
dwmw2

Re: inter-module-* removal.. small next step

[Jon Smirl]

On Mon, 31 Jan 2005 00:41:52 +0000, David Woodhouse <dwmw2@infradead.org> wrote:
> On Sun, 2005-01-30 at 18:00 +0000, Arjan van de Ven wrote:
> > Hi,
> >
> > intermodule is deprecated for quite some time now, and MTD is the sole last
> > user in the tree. To shrink the kernel for the people who don't use MTD, and
> > to prevent accidental return of more users of this, make the compiling of
> > this function conditional on MTD.
> 
> Please get the dependencies right -- it's not core MTD code, but the NOR
> chip drivers and the old DiskOnChip drivers which use this.

Are these things old enough to just be marked broken instead and
finish removing inter_xx?

-- 
Jon Smirl
jonsmirl@gmail.com

Re: inter-module-* removal.. small next step

[David Woodhouse]

On Sun, 2005-01-30 at 19:54 -0500, Jon Smirl wrote:
> Are these things old enough to just be marked broken instead and
> finish removing inter_xx?

The DiskOnChip drivers are getting that way; not the NOR flash drivers
though. Those need the problem solving properly; just hacking out the
inter_module_ crap and replacing it without thinking too hard isn't the
answer. I'll be glad to see the back of it though -- I was annoyed
enough when it was done in the first place, against my wishes.

-- 
dwmw2

Re: inter-module-* removal.. small next step

[Arjan van de Ven]

On Mon, 2005-01-31 at 00:41 +0000, David Woodhouse wrote:
> On Sun, 2005-01-30 at 18:00 +0000, Arjan van de Ven wrote:
> > Hi,
> > 
> > intermodule is deprecated for quite some time now, and MTD is the sole last
> > user in the tree. To shrink the kernel for the people who don't use MTD, and
> > to prevent accidental return of more users of this, make the compiling of
> > this function conditional on MTD.
> 
> Please get the dependencies right -- it's not core MTD code, but the NOR
> chip drivers and the old DiskOnChip drivers which use this. 

that's just a slightly more finegrained thing, not sure if it's worth
going that deep, esp since it become 2 deps not one, making a bigger
mess than needed.

now if one of the two can go (obsolete) it'd make sense

Re: inter-module-* removal.. small next step

[Jörn Engel]

On Mon, 31 January 2005 09:24:29 +0100, Arjan van de Ven wrote:
> On Mon, 2005-01-31 at 00:41 +0000, David Woodhouse wrote:
> > On Sun, 2005-01-30 at 18:00 +0000, Arjan van de Ven wrote:
> > > 
> > > intermodule is deprecated for quite some time now, and MTD is the sole last
> > > user in the tree. To shrink the kernel for the people who don't use MTD, and
> > > to prevent accidental return of more users of this, make the compiling of
> > > this function conditional on MTD.
> > 
> > Please get the dependencies right -- it's not core MTD code, but the NOR
> > chip drivers and the old DiskOnChip drivers which use this. 
> 
> that's just a slightly more finegrained thing, not sure if it's worth
> going that deep, esp since it become 2 deps not one, making a bigger
> mess than needed.

How about this one?  It's actually less messy inside kernel/Makefile.

Completely untested, though.

Jörn

-- 
"Error protection by error detection and correction."
-- from a university class


Signed-off-by: Jörn Engel <joern@wohnheim.fh-wedel.de>
---

 drivers/mtd/chips/Kconfig   |    4 ++++
 drivers/mtd/devices/Kconfig |    4 ++++
 kernel/Makefile             |    3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

--- linux-2.6.10cow/kernel/Makefile~inter_module	2004-12-28 17:31:37.000000000 +0100
+++ linux-2.6.10cow/kernel/Makefile	2005-01-31 14:49:40.000000000 +0100
@@ -6,9 +6,10 @@ obj-y     = sched.o fork.o exec_domain.o
 	    exit.o itimer.o time.o softirq.o resource.o \
 	    sysctl.o capability.o ptrace.o timer.o user.o \
 	    signal.o sys.o kmod.o workqueue.o pid.o \
-	    rcupdate.o intermodule.o extable.o params.o posix-timers.o \
+	    rcupdate.o extable.o params.o posix-timers.o \
 	    kthread.o wait.o kfifo.o sys_ni.o
 
+obj-$(CONFIG_INTER_MODULE_CRAP) += intermodule.o
 obj-$(CONFIG_FUTEX) += futex.o
 obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o
 obj-$(CONFIG_SMP) += cpu.o spinlock.o
--- linux-2.6.10cow/drivers/mtd/devices/Kconfig~inter_module	2005-01-11 20:48:52.000000000 +0100
+++ linux-2.6.10cow/drivers/mtd/devices/Kconfig	2005-01-31 14:51:29.000000000 +0100
@@ -140,6 +140,7 @@ comment "Disk-On-Chip Device Drivers"
 config MTD_DOC2000
 	tristate "M-Systems Disk-On-Chip 2000 and Millennium (DEPRECATED)"
 	depends on MTD
+	select INTER_MODULE_CRAP
 	---help---
 	  This provides an MTD device driver for the M-Systems DiskOnChip
 	  2000 and Millennium devices.  Originally designed for the DiskOnChip
@@ -161,6 +162,7 @@ config MTD_DOC2000
 config MTD_DOC2001
 	tristate "M-Systems Disk-On-Chip Millennium-only alternative driver (DEPRECATED)"
 	depends on MTD
+	select INTER_MODULE_CRAP
 	---help---
 	  This provides an alternative MTD device driver for the M-Systems 
 	  DiskOnChip Millennium devices.  Use this if you have problems with
@@ -181,6 +183,7 @@ config MTD_DOC2001
 config MTD_DOC2001PLUS
 	tristate "M-Systems Disk-On-Chip Millennium Plus"
 	depends on MTD
+	select INTER_MODULE_CRAP
 	---help---
 	  This provides an MTD device driver for the M-Systems DiskOnChip
 	  Millennium Plus devices.
@@ -198,6 +201,7 @@ config MTD_DOCPROBE
 	tristate
 	default m if MTD_DOC2001!=y && MTD_DOC2000!=y && MTD_DOC2001PLUS!=y && (MTD_DOC2001=m || MTD_DOC2000=m || MTD_DOC2001PLUS=m)
 	default y if MTD_DOC2001=y || MTD_DOC2000=y || MTD_DOC2001PLUS=y
+	select INTER_MODULE_CRAP
 	help
 	  This isn't a real config option; it's derived.
 
--- linux-2.6.10cow/drivers/mtd/chips/Kconfig~inter_module	2004-09-04 22:59:02.000000000 +0200
+++ linux-2.6.10cow/drivers/mtd/chips/Kconfig	2005-01-31 14:53:05.000000000 +0100
@@ -7,6 +7,7 @@ menu "RAM/ROM/Flash chip drivers"
 config MTD_CFI
 	tristate "Detect flash chips by Common Flash Interface (CFI) probe"
 	depends on MTD
+	select INTER_MODULE_CRAP
 	help
 	  The Common Flash Interface specification was developed by Intel,
 	  AMD and other flash manufactures that provides a universal method
@@ -158,6 +159,7 @@ config MTD_CFI_I8
 config MTD_CFI_INTELEXT
 	tristate "Support for Intel/Sharp flash chips"
 	depends on MTD_GEN_PROBE
+	select INTER_MODULE_CRAP
 	help
 	  The Common Flash Interface defines a number of different command
 	  sets which a CFI-compliant chip may claim to implement. This code
@@ -167,6 +169,7 @@ config MTD_CFI_INTELEXT
 config MTD_CFI_AMDSTD
 	tristate "Support for AMD/Fujitsu flash chips"
 	depends on MTD_GEN_PROBE
+	select INTER_MODULE_CRAP
 	help
 	  The Common Flash Interface defines a number of different command
 	  sets which a CFI-compliant chip may claim to implement. This code
@@ -197,6 +200,7 @@ config MTD_CFI_AMDSTD_RETRY_MAX
 config MTD_CFI_STAA
 	tristate "Support for ST (Advanced Architecture) flash chips"
 	depends on MTD_GEN_PROBE
+	select INTER_MODULE_CRAP
 	help
 	  The Common Flash Interface defines a number of different command
 	  sets which a CFI-compliant chip may claim to implement. This code

Re: inter-module-* removal.. small next step

[Adrian Bunk]

On Mon, Jan 31, 2005 at 02:56:32PM +0100, Jörn Engel wrote:
> On Mon, 31 January 2005 09:24:29 +0100, Arjan van de Ven wrote:
> > On Mon, 2005-01-31 at 00:41 +0000, David Woodhouse wrote:
> > > On Sun, 2005-01-30 at 18:00 +0000, Arjan van de Ven wrote:
> > > > 
> > > > intermodule is deprecated for quite some time now, and MTD is the sole last
> > > > user in the tree. To shrink the kernel for the people who don't use MTD, and
> > > > to prevent accidental return of more users of this, make the compiling of
> > > > this function conditional on MTD.
> > > 
> > > Please get the dependencies right -- it's not core MTD code, but the NOR
> > > chip drivers and the old DiskOnChip drivers which use this. 
> > 
> > that's just a slightly more finegrained thing, not sure if it's worth
> > going that deep, esp since it become 2 deps not one, making a bigger
> > mess than needed.
> 
> How about this one?  It's actually less messy inside kernel/Makefile.
> 
> Completely untested, though.

Your patch doesn't add a Kconfig entry for INTER_MODULE_CRAP.

> Jörn
>...

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: inter-module-* removal.. small next step

[Jörn Engel]

On Mon, 31 January 2005 15:01:04 +0100, Adrian Bunk wrote:
> 
> Your patch doesn't add a Kconfig entry for INTER_MODULE_CRAP.

True.  But where to add it?  arch/*/Kconfig is pretty ugly.
drivers/mtd/Kconfig?

Jörn

-- 
When in doubt, use brute force.
-- Ken Thompson

Re: inter-module-* removal.. small next step

[Jörn Engel]

On Mon, 31 January 2005 15:01:04 +0100, Adrian Bunk wrote:
> 
> Your patch doesn't add a Kconfig entry for INTER_MODULE_CRAP.

Now it does, and it picked up dwmw2's suggestion as well.

Jörn

-- 
He who knows others is wise.
He who knows himself is enlightened.
-- Lao Tsu


Signed-off-by: Jörn Engel <joern@wohnheim.fh-wedel.de>
---

 drivers/mtd/Kconfig         |    4 ++++
 drivers/mtd/chips/Kconfig   |    1 +
 drivers/mtd/devices/Kconfig |    1 +
 kernel/Makefile             |    3 ++-
 4 files changed, 8 insertions(+), 1 deletion(-)

--- linux-2.6.10cow/drivers/mtd/Kconfig~inter_module	2004-09-04 22:59:02.000000000 +0200
+++ linux-2.6.10cow/drivers/mtd/Kconfig	2005-01-31 15:29:14.000000000 +0100
@@ -2,6 +2,10 @@
 
 menu "Memory Technology Devices (MTD)"
 
+# This doens't actually belong here, but mtd is the last user, so...
+config INTER_MODULE_CRAP
+	boolean
+
 config MTD
 	tristate "Memory Technology Device (MTD) support"
 	help
--- linux-2.6.10cow/drivers/mtd/chips/Kconfig~inter_module	2004-09-04 22:59:02.000000000 +0200
+++ linux-2.6.10cow/drivers/mtd/chips/Kconfig	2005-01-31 15:32:42.000000000 +0100
@@ -31,6 +31,7 @@ config MTD_GEN_PROBE
 	tristate
 	default m if MTD_CFI!=y && !MTD_INTELPROBE && MTD_JEDECPROBE!=y && (MTD_CFI=m || MTD_JEDECPROBE=m)
 	default y if MTD_CFI=y || MTD_INTELPROBE || MTD_JEDECPROBE=y
+	select INTER_MODULE_CRAP
 
 config MTD_CFI_ADV_OPTIONS
 	bool "Flash chip driver advanced configuration options"
--- linux-2.6.10cow/drivers/mtd/devices/Kconfig~inter_module	2005-01-11 20:48:52.000000000 +0100
+++ linux-2.6.10cow/drivers/mtd/devices/Kconfig	2005-01-31 15:31:59.000000000 +0100
@@ -198,6 +198,7 @@ config MTD_DOCPROBE
 	tristate
 	default m if MTD_DOC2001!=y && MTD_DOC2000!=y && MTD_DOC2001PLUS!=y && (MTD_DOC2001=m || MTD_DOC2000=m || MTD_DOC2001PLUS=m)
 	default y if MTD_DOC2001=y || MTD_DOC2000=y || MTD_DOC2001PLUS=y
+	select INTER_MODULE_CRAP
 	help
 	  This isn't a real config option; it's derived.
 
--- linux-2.6.10cow/kernel/Makefile~inter_module	2004-12-28 17:31:37.000000000 +0100
+++ linux-2.6.10cow/kernel/Makefile	2005-01-31 14:49:40.000000000 +0100
@@ -6,9 +6,10 @@ obj-y     = sched.o fork.o exec_domain.o
 	    exit.o itimer.o time.o softirq.o resource.o \
 	    sysctl.o capability.o ptrace.o timer.o user.o \
 	    signal.o sys.o kmod.o workqueue.o pid.o \
-	    rcupdate.o intermodule.o extable.o params.o posix-timers.o \
+	    rcupdate.o extable.o params.o posix-timers.o \
 	    kthread.o wait.o kfifo.o sys_ni.o
 
+obj-$(CONFIG_INTER_MODULE_CRAP) += intermodule.o
 obj-$(CONFIG_FUTEX) += futex.o
 obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o
 obj-$(CONFIG_SMP) += cpu.o spinlock.o

Re: inter-module-* removal.. small next step

[David Woodhouse]

On Mon, 2005-01-31 at 14:56 +0100, Jörn Engel wrote:
> 
> How about this one?  It's actually less messy inside kernel/Makefile.
> 
> Completely untested, though.

Surely it would suffice just to make MTD_GEN_PROBE and MTD_DOCPROBE
select it, rather than all the _users_ of each?

-- 
dwmw2

Re: inter-module-* removal.. small next step

[Jörn Engel]

On Mon, 31 January 2005 14:06:47 +0000, David Woodhouse wrote:
> On Mon, 2005-01-31 at 14:56 +0100, Jörn Engel wrote:
> > 
> > How about this one?  It's actually less messy inside kernel/Makefile.
> > 
> > Completely untested, though.
> 
> Surely it would suffice just to make MTD_GEN_PROBE and MTD_DOCPROBE
> select it, rather than all the _users_ of each?

Agreed.  Actually, those two should be selected by their respective
users, instead of the current *cough* logic.

Jörn

-- 
The story so far:
In the beginning the Universe was created.  This has made a lot
of people very angry and been widely regarded as a bad move.
-- Douglas Adams