* [patch] 2.6.10-rc2-mm2: ISDN divert_init.c compile error
2004-11-18 10:15 2.6.10-rc2-mm2 Andrew Morton
@ 2004-11-18 11:36 ` Adrian Bunk
2004-11-18 12:10 ` 2.6.10-rc2-mm2 Hirokazu Takata
` (8 subsequent siblings)
9 siblings, 0 replies; 43+ messages in thread
From: Adrian Bunk @ 2004-11-18 11:36 UTC (permalink / raw)
To: Andrew Morton, kkeil, kai.germaschewski; +Cc: linux-kernel, isdn4linux
The following compile error comes from Linus' tree:
<-- snip -->
...
CC drivers/isdn/divert/divert_init.o
drivers/isdn/divert/divert_init.c:25: error: conflicting types for 'printk'
include/linux/kernel.h:106: error: previous declaration of 'printk' was here
drivers/isdn/divert/divert_init.c:25: error: conflicting types for 'printk'
include/linux/kernel.h:106: error: previous declaration of 'printk' was here
make[3]: *** [drivers/isdn/divert/divert_init.o] Error 1
<-- snip -->
The fix is simple:
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
--- linux-2.6.10-rc2-mm2-full/drivers/isdn/divert/divert_init.c.old 2004-11-18 12:28:11.000000000 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/isdn/divert/divert_init.c 2004-11-18 12:31:08.000000000 +0100
@@ -12,6 +12,7 @@
#include <linux/module.h>
#include <linux/version.h>
#include <linux/init.h>
+#include <linux/kernel.h>
#include "isdn_divert.h"
@@ -19,11 +20,6 @@
MODULE_AUTHOR("Werner Cornelius");
MODULE_LICENSE("GPL");
-/********************/
-/* needed externals */
-/********************/
-extern int printk(const char *fmt,...);
-
/****************************************/
/* structure containing interface to hl */
/****************************************/
^ permalink raw reply [flat|nested] 43+ messages in thread* Re: 2.6.10-rc2-mm2
2004-11-18 10:15 2.6.10-rc2-mm2 Andrew Morton
2004-11-18 11:36 ` [patch] 2.6.10-rc2-mm2: ISDN divert_init.c compile error Adrian Bunk
@ 2004-11-18 12:10 ` Hirokazu Takata
2004-11-18 13:20 ` 2.6.10-rc2-mm2 Hirokazu Takata
2004-11-18 12:42 ` 2.6.10-rc2-mm2 William Lee Irwin III
` (7 subsequent siblings)
9 siblings, 1 reply; 43+ messages in thread
From: Hirokazu Takata @ 2004-11-18 12:10 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, takata
Hi, Andrew,
From: Andrew Morton <akpm@osdl.org>
Subject: 2.6.10-rc2-mm2
Date: Thu, 18 Nov 2004 02:15:38 -0800
>
> +m32r-fix-build-error-of.patch
>
> m32r build fix
Please drop this patch from -mm tree.
Again, the patch was prepared for not -mm-tree but bk-tree.
# The -mm tree is sometimes too experimental for developing and
# maintaining our new m32r port.
# I don't have good idea...
Thank you.
From: Hirokazu Takata <takata@linux-m32r.org>
Subject: [PATCH 2.6.10-rc2-bk1] m32r: Fix build error of arch/m32r/mm/fault.c
Date: Wed, 17 Nov 2004 11:46:31 +0900 (JST)
> Hi,
>
> Please drop "Changes for arch/m32r/mm/fault.c@1.3" or
> apply the attached patch to bk-tree for m32r.
>
> The modification of "Changes for arch/m32r/mm/fault.c@1.3" was
> prepared for enforce-a-gap-between-heap-and-stack.patch(*) of -mm tree,
> but it has not been merged into mainline.
> (*) "heap-stack-gap for 2.6" (Sep. 25, 2004)
> http://www.uwsg.iu.edu/hypermail/linux/kernel/0409.3/0435.html
>
> So, this patch is for withdrawing the previous arch/m32r/mm/fault.c.
>
> Thanks.
>
> Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
> ---
>
> arch/m32r/mm/fault.c | 2 +-
> 1 files changed, 1 insertion(+), 1 deletion(-)
>
>
> diff -ruNp a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c
> --- a/arch/m32r/mm/fault.c 2004-11-15 12:16:47.000000000 +0900
> +++ b/arch/m32r/mm/fault.c 2004-11-17 10:54:24.000000000 +0900
> @@ -182,7 +182,7 @@ asmlinkage void do_page_fault(struct pt_
> goto bad_area;
> }
> #endif
> - if (expand_stack(vma, address, NULL))
> + if (expand_stack(vma, address))
> goto bad_area;
> /*
> * Ok, we have a good vm_area for this memory access, so
>
> --
> Hirokazu Takata <takata@linux-m32r.org>
> Linux/M32R Project: http://www.linux-m32r.org/
-- Takata
^ permalink raw reply [flat|nested] 43+ messages in thread* Re: 2.6.10-rc2-mm2
2004-11-18 12:10 ` 2.6.10-rc2-mm2 Hirokazu Takata
@ 2004-11-18 13:20 ` Hirokazu Takata
0 siblings, 0 replies; 43+ messages in thread
From: Hirokazu Takata @ 2004-11-18 13:20 UTC (permalink / raw)
To: takata; +Cc: akpm, linux-kernel
Hi, Andrew,
I'm sorry. You are definitely correct.
Please accept my apology.
-- Takata
From: Hirokazu Takata <takata@linux-m32r.org>
Subject: Re: 2.6.10-rc2-mm2
Date: Thu, 18 Nov 2004 21:10:48 +0900 (JST)
> Hi, Andrew,
>
> From: Andrew Morton <akpm@osdl.org>
> Subject: 2.6.10-rc2-mm2
> Date: Thu, 18 Nov 2004 02:15:38 -0800
> >
> > +m32r-fix-build-error-of.patch
> >
> > m32r build fix
>
> Please drop this patch from -mm tree.
> Again, the patch was prepared for not -mm-tree but bk-tree.
>
> # The -mm tree is sometimes too experimental for developing and
> # maintaining our new m32r port.
> # I don't have good idea...
>
> Thank you.
>
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: 2.6.10-rc2-mm2
2004-11-18 10:15 2.6.10-rc2-mm2 Andrew Morton
2004-11-18 11:36 ` [patch] 2.6.10-rc2-mm2: ISDN divert_init.c compile error Adrian Bunk
2004-11-18 12:10 ` 2.6.10-rc2-mm2 Hirokazu Takata
@ 2004-11-18 12:42 ` William Lee Irwin III
2004-11-20 11:35 ` [patch] 2.6.10-rc2-mm2: OSS ac97_codec.h: #include pci.h Adrian Bunk
2004-11-18 12:45 ` 2.6.10-rc2-mm2 William Lee Irwin III
` (6 subsequent siblings)
9 siblings, 1 reply; 43+ messages in thread
From: William Lee Irwin III @ 2004-11-18 12:42 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
On Thu, Nov 18, 2004 at 02:15:38AM -0800, Andrew Morton wrote:
> +oss-ac97-quirk-facility.patch
> Add and use device quirk lists in this OSS driver
That patch may not actually be responsible for the warning. It's
trivially resolved regardless.
This patch adds a forward declaration of struct pci_dev to repair the
following warning:
In file included from sound/oss/emu10k1/hwaccess.h:38,
from sound/oss/emu10k1/cardmi.c:36:
include/linux/ac97_codec.h:337: warning: `struct pci_dev' declared inside parameter list
include/linux/ac97_codec.h:337: warning: its scope is only this definition or declaration, which is probably not what you want
Index: mm2-2.6.10-rc2/include/linux/ac97_codec.h
===================================================================
--- mm2-2.6.10-rc2.orig/include/linux/ac97_codec.h 2004-11-18 02:56:31.000000000 -0800
+++ mm2-2.6.10-rc2/include/linux/ac97_codec.h 2004-11-18 03:53:05.308878784 -0800
@@ -334,6 +334,7 @@
int type; /* quirk type above */
};
+struct pci_dev;
extern int ac97_tune_hardware(struct pci_dev *pdev, struct ac97_quirk *quirk, int override);
#endif /* _AC97_CODEC_H_ */
^ permalink raw reply [flat|nested] 43+ messages in thread* [patch] 2.6.10-rc2-mm2: OSS ac97_codec.h: #include pci.h
2004-11-18 12:42 ` 2.6.10-rc2-mm2 William Lee Irwin III
@ 2004-11-20 11:35 ` Adrian Bunk
2004-11-20 11:45 ` William Lee Irwin III
0 siblings, 1 reply; 43+ messages in thread
From: Adrian Bunk @ 2004-11-20 11:35 UTC (permalink / raw)
To: William Lee Irwin III; +Cc: Andrew Morton, linux-kernel
On Thu, Nov 18, 2004 at 04:42:20AM -0800, William Lee Irwin III wrote:
> On Thu, Nov 18, 2004 at 02:15:38AM -0800, Andrew Morton wrote:
> > +oss-ac97-quirk-facility.patch
> > Add and use device quirk lists in this OSS driver
>
> That patch may not actually be responsible for the warning. It's
> trivially resolved regardless.
>
> This patch adds a forward declaration of struct pci_dev to repair the
> following warning:
>
> In file included from sound/oss/emu10k1/hwaccess.h:38,
> from sound/oss/emu10k1/cardmi.c:36:
> include/linux/ac97_codec.h:337: warning: `struct pci_dev' declared inside parameter list
> include/linux/ac97_codec.h:337: warning: its scope is only this definition or declaration, which is probably not what you want
>
> Index: mm2-2.6.10-rc2/include/linux/ac97_codec.h
> ===================================================================
> --- mm2-2.6.10-rc2.orig/include/linux/ac97_codec.h 2004-11-18 02:56:31.000000000 -0800
> +++ mm2-2.6.10-rc2/include/linux/ac97_codec.h 2004-11-18 03:53:05.308878784 -0800
> @@ -334,6 +334,7 @@
> int type; /* quirk type above */
> };
>
> +struct pci_dev;
> extern int ac97_tune_hardware(struct pci_dev *pdev, struct ac97_quirk *quirk, int override);
>
> #endif /* _AC97_CODEC_H_ */
Wouldn't it be better to simply #include pci.h?
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- linux-2.6.10-rc2-mm2-full/include/linux/ac97_codec.h.old 2004-11-20 12:11:31.000000000 +0100
+++ linux-2.6.10-rc2-mm2-full/include/linux/ac97_codec.h 2004-11-20 12:12:26.000000000 +0100
@@ -3,6 +3,7 @@
#include <linux/types.h>
#include <linux/soundcard.h>
+#include <linux/pci.h>
/* AC97 1.0 */
#define AC97_RESET 0x0000 //
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [patch] 2.6.10-rc2-mm2: OSS ac97_codec.h: #include pci.h
2004-11-20 11:35 ` [patch] 2.6.10-rc2-mm2: OSS ac97_codec.h: #include pci.h Adrian Bunk
@ 2004-11-20 11:45 ` William Lee Irwin III
0 siblings, 0 replies; 43+ messages in thread
From: William Lee Irwin III @ 2004-11-20 11:45 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Andrew Morton, linux-kernel
On Thu, Nov 18, 2004 at 04:42:20AM -0800, William Lee Irwin III wrote:
>> +struct pci_dev;
>> extern int ac97_tune_hardware(struct pci_dev *pdev, struct ac97_quirk *quirk, int override);
>>
>> #endif /* _AC97_CODEC_H_ */
On Sat, Nov 20, 2004 at 12:35:45PM +0100, Adrian Bunk wrote:
> Wouldn't it be better to simply #include pci.h?
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
Could be; I opted for avoiding header tangling by default, but if most
includers will use pci.h anyway, so be it.
-- wli
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: 2.6.10-rc2-mm2
2004-11-18 10:15 2.6.10-rc2-mm2 Andrew Morton
` (2 preceding siblings ...)
2004-11-18 12:42 ` 2.6.10-rc2-mm2 William Lee Irwin III
@ 2004-11-18 12:45 ` William Lee Irwin III
2004-11-18 13:57 ` 2.6.10-rc2-mm2 William Lee Irwin III
` (5 subsequent siblings)
9 siblings, 0 replies; 43+ messages in thread
From: William Lee Irwin III @ 2004-11-18 12:45 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
On Thu, Nov 18, 2004 at 02:15:38AM -0800, Andrew Morton wrote:
> +parport_pc-config_pci=n-build-fix.patch
> parport build fix
This patch resolves the following warning by removing a const qualifier
conflicting with __setup's expected function type.
drivers/parport/parport_pc.c:3323: warning: initialization from incompatible pointer type
Index: mm2-2.6.10-rc2/drivers/parport/parport_pc.c
===================================================================
--- mm2-2.6.10-rc2.orig/drivers/parport/parport_pc.c 2004-11-18 02:55:03.000000000 -0800
+++ mm2-2.6.10-rc2/drivers/parport/parport_pc.c 2004-11-18 03:56:11.208617728 -0800
@@ -3155,8 +3155,8 @@
}
#ifdef CONFIG_PCI
-static int __init parport_init_mode_setup(const char *str) {
-
+static int __init parport_init_mode_setup(char *str)
+{
printk(KERN_DEBUG "parport_pc.c: Specified parameter parport_init_mode=%s\n", str);
if (!strcmp (str, "spp"))
^ permalink raw reply [flat|nested] 43+ messages in thread* Re: 2.6.10-rc2-mm2
2004-11-18 10:15 2.6.10-rc2-mm2 Andrew Morton
` (3 preceding siblings ...)
2004-11-18 12:45 ` 2.6.10-rc2-mm2 William Lee Irwin III
@ 2004-11-18 13:57 ` William Lee Irwin III
2004-11-18 14:31 ` 2.6.10-rc2-mm2 William Lee Irwin III
2004-11-18 15:41 ` Adrian Bunk
` (4 subsequent siblings)
9 siblings, 1 reply; 43+ messages in thread
From: William Lee Irwin III @ 2004-11-18 13:57 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
On Thu, Nov 18, 2004 at 02:15:38AM -0800, Andrew Morton wrote:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.10-rc2/2.6.10-rc2-mm2/
> - Lots of small bugfixes. Some against patches in -mm, some against Linus's
> tree.
> - There's a patch here which should address the oom-killings which a few
> people have reported.
Whatever broke sparc64 (likely sunzilog.c) is between 2.6.9-bk2 and
2.6.9-bk3. I suspect serial changes.
-- wli
^ permalink raw reply [flat|nested] 43+ messages in thread* [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
2004-11-18 10:15 2.6.10-rc2-mm2 Andrew Morton
@ 2004-11-18 15:41 ` Adrian Bunk
2004-11-18 12:10 ` 2.6.10-rc2-mm2 Hirokazu Takata
` (8 subsequent siblings)
9 siblings, 0 replies; 43+ messages in thread
From: Adrian Bunk @ 2004-11-18 15:41 UTC (permalink / raw)
To: Andrew Morton, dwmw2; +Cc: linux-mtd, linux-kernel
On Thu, Nov 18, 2004 at 02:15:38AM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.10-rc2-mm1:
>...
> bk-mtd.patch
>...
Ths causes the following compile error:
<-- snip -->
...
CC drivers/mtd/chips/cfi_probe.o
In file included from drivers/mtd/chips/cfi_probe.c:18:
include/linux/mtd/xip.h:77:2: #error "missing IRQ and timer primitives for XIP MTD support"
{standard input}: Assembler messages:
{standard input}:5: Warning: ignoring changed section attributes for .data
make[3]: *** [drivers/mtd/chips/cfi_probe.o] Error 1
<-- snip -->
Let's put the dependencies from the #error into the Kconfig file:
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
--- linux-2.6.10-rc2-mm2-full/drivers/mtd/chips/Kconfig.old 2004-11-18 16:35:40.000000000 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/mtd/chips/Kconfig 2004-11-18 16:38:37.000000000 +0100
@@ -274,7 +274,7 @@
config MTD_XIP
bool "XIP aware MTD support"
- depends on !SMP && MTD_CFI_INTELEXT && EXPERIMENTAL
+ depends on !SMP && MTD_CFI_INTELEXT && (ARCH_SA1100 || ARCH_PXA) && EXPERIMENTAL
default y if XIP_KERNEL
help
This allows MTD support to work with flash memory which is also
^ permalink raw reply [flat|nested] 43+ messages in thread* [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
@ 2004-11-18 15:41 ` Adrian Bunk
0 siblings, 0 replies; 43+ messages in thread
From: Adrian Bunk @ 2004-11-18 15:41 UTC (permalink / raw)
To: Andrew Morton, dwmw2; +Cc: linux-kernel, linux-mtd
On Thu, Nov 18, 2004 at 02:15:38AM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.10-rc2-mm1:
>...
> bk-mtd.patch
>...
Ths causes the following compile error:
<-- snip -->
...
CC drivers/mtd/chips/cfi_probe.o
In file included from drivers/mtd/chips/cfi_probe.c:18:
include/linux/mtd/xip.h:77:2: #error "missing IRQ and timer primitives for XIP MTD support"
{standard input}: Assembler messages:
{standard input}:5: Warning: ignoring changed section attributes for .data
make[3]: *** [drivers/mtd/chips/cfi_probe.o] Error 1
<-- snip -->
Let's put the dependencies from the #error into the Kconfig file:
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
--- linux-2.6.10-rc2-mm2-full/drivers/mtd/chips/Kconfig.old 2004-11-18 16:35:40.000000000 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/mtd/chips/Kconfig 2004-11-18 16:38:37.000000000 +0100
@@ -274,7 +274,7 @@
config MTD_XIP
bool "XIP aware MTD support"
- depends on !SMP && MTD_CFI_INTELEXT && EXPERIMENTAL
+ depends on !SMP && MTD_CFI_INTELEXT && (ARCH_SA1100 || ARCH_PXA) && EXPERIMENTAL
default y if XIP_KERNEL
help
This allows MTD support to work with flash memory which is also
^ permalink raw reply [flat|nested] 43+ messages in thread* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
2004-11-18 15:41 ` Adrian Bunk
@ 2004-11-18 15:51 ` David Woodhouse
-1 siblings, 0 replies; 43+ messages in thread
From: David Woodhouse @ 2004-11-18 15:51 UTC (permalink / raw)
To: Adrian Bunk, nico; +Cc: Andrew Morton, linux-mtd, linux-kernel
On Thu, 2004-11-18 at 16:41 +0100, Adrian Bunk wrote:
> Let's put the dependencies from the #error into the Kconfig file:
Looks sane to me. Nico?
--
dwmw2
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
@ 2004-11-18 15:51 ` David Woodhouse
0 siblings, 0 replies; 43+ messages in thread
From: David Woodhouse @ 2004-11-18 15:51 UTC (permalink / raw)
To: Adrian Bunk, nico; +Cc: Andrew Morton, linux-kernel, linux-mtd
On Thu, 2004-11-18 at 16:41 +0100, Adrian Bunk wrote:
> Let's put the dependencies from the #error into the Kconfig file:
Looks sane to me. Nico?
--
dwmw2
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
2004-11-18 15:51 ` David Woodhouse
@ 2004-11-18 16:34 ` Nicolas Pitre
-1 siblings, 0 replies; 43+ messages in thread
From: Nicolas Pitre @ 2004-11-18 16:34 UTC (permalink / raw)
To: David Woodhouse; +Cc: Andrew Morton, linux-mtd, linux-kernel, Adrian Bunk
On Thu, 18 Nov 2004, David Woodhouse wrote:
> On Thu, 2004-11-18 at 16:41 +0100, Adrian Bunk wrote:
> > Let's put the dependencies from the #error into the Kconfig file:
>
> Looks sane to me. Nico?
And why is the current arrangement actually a problem?
Nicolas
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
@ 2004-11-18 16:34 ` Nicolas Pitre
0 siblings, 0 replies; 43+ messages in thread
From: Nicolas Pitre @ 2004-11-18 16:34 UTC (permalink / raw)
To: David Woodhouse; +Cc: Adrian Bunk, Andrew Morton, linux-kernel, linux-mtd
On Thu, 18 Nov 2004, David Woodhouse wrote:
> On Thu, 2004-11-18 at 16:41 +0100, Adrian Bunk wrote:
> > Let's put the dependencies from the #error into the Kconfig file:
>
> Looks sane to me. Nico?
And why is the current arrangement actually a problem?
Nicolas
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
2004-11-18 16:34 ` Nicolas Pitre
@ 2004-11-18 17:02 ` Russell King
-1 siblings, 0 replies; 43+ messages in thread
From: Russell King @ 2004-11-18 17:02 UTC (permalink / raw)
To: Nicolas Pitre
Cc: Andrew Morton, linux-mtd, David Woodhouse, linux-kernel,
Adrian Bunk
On Thu, Nov 18, 2004 at 11:34:56AM -0500, Nicolas Pitre wrote:
> On Thu, 18 Nov 2004, David Woodhouse wrote:
>
> > On Thu, 2004-11-18 at 16:41 +0100, Adrian Bunk wrote:
> > > Let's put the dependencies from the #error into the Kconfig file:
> >
> > Looks sane to me. Nico?
>
> And why is the current arrangement actually a problem?
because it prevents building with, eg, make allyesconfig
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core
^ permalink raw reply [flat|nested] 43+ messages in thread* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
@ 2004-11-18 17:02 ` Russell King
0 siblings, 0 replies; 43+ messages in thread
From: Russell King @ 2004-11-18 17:02 UTC (permalink / raw)
To: Nicolas Pitre
Cc: David Woodhouse, Adrian Bunk, Andrew Morton, linux-kernel,
linux-mtd
On Thu, Nov 18, 2004 at 11:34:56AM -0500, Nicolas Pitre wrote:
> On Thu, 18 Nov 2004, David Woodhouse wrote:
>
> > On Thu, 2004-11-18 at 16:41 +0100, Adrian Bunk wrote:
> > > Let's put the dependencies from the #error into the Kconfig file:
> >
> > Looks sane to me. Nico?
>
> And why is the current arrangement actually a problem?
because it prevents building with, eg, make allyesconfig
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
2004-11-18 16:34 ` Nicolas Pitre
@ 2004-11-18 21:32 ` Adrian Bunk
-1 siblings, 0 replies; 43+ messages in thread
From: Adrian Bunk @ 2004-11-18 21:32 UTC (permalink / raw)
To: Nicolas Pitre; +Cc: Andrew Morton, linux-mtd, David Woodhouse, linux-kernel
On Thu, Nov 18, 2004 at 11:34:56AM -0500, Nicolas Pitre wrote:
> On Thu, 18 Nov 2004, David Woodhouse wrote:
>
> > On Thu, 2004-11-18 at 16:41 +0100, Adrian Bunk wrote:
> > > Let's put the dependencies from the #error into the Kconfig file:
> >
> > Looks sane to me. Nico?
>
> And why is the current arrangement actually a problem?
If you are able to select an option, it should also compile (and work).
At least on i386, this is usually true for every single option.
> Nicolas
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
^ permalink raw reply [flat|nested] 43+ messages in thread* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
@ 2004-11-18 21:32 ` Adrian Bunk
0 siblings, 0 replies; 43+ messages in thread
From: Adrian Bunk @ 2004-11-18 21:32 UTC (permalink / raw)
To: Nicolas Pitre; +Cc: David Woodhouse, Andrew Morton, linux-kernel, linux-mtd
On Thu, Nov 18, 2004 at 11:34:56AM -0500, Nicolas Pitre wrote:
> On Thu, 18 Nov 2004, David Woodhouse wrote:
>
> > On Thu, 2004-11-18 at 16:41 +0100, Adrian Bunk wrote:
> > > Let's put the dependencies from the #error into the Kconfig file:
> >
> > Looks sane to me. Nico?
>
> And why is the current arrangement actually a problem?
If you are able to select an option, it should also compile (and work).
At least on i386, this is usually true for every single option.
> Nicolas
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
^ permalink raw reply [flat|nested] 43+ messages in thread* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
2004-11-18 21:32 ` Adrian Bunk
@ 2004-11-18 22:31 ` Nicolas Pitre
-1 siblings, 0 replies; 43+ messages in thread
From: Nicolas Pitre @ 2004-11-18 22:31 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Andrew Morton, linux-mtd, David Woodhouse, lkml
On Thu, 18 Nov 2004, Adrian Bunk wrote:
> On Thu, Nov 18, 2004 at 11:34:56AM -0500, Nicolas Pitre wrote:
> > On Thu, 18 Nov 2004, David Woodhouse wrote:
> >
> > > On Thu, 2004-11-18 at 16:41 +0100, Adrian Bunk wrote:
> > > > Let's put the dependencies from the #error into the Kconfig file:
> > >
> > > Looks sane to me. Nico?
> >
> > And why is the current arrangement actually a problem?
>
> If you are able to select an option, it should also compile (and work).
>
> At least on i386, this is usually true for every single option.
Fine. I thought the #error would encourage people to add the missing
bits to that file. No? ;-)
Can we make it conditional on CONFIG_XIP_KERNEL instead?
It would be less messy IMHO.
Nicolas
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
@ 2004-11-18 22:31 ` Nicolas Pitre
0 siblings, 0 replies; 43+ messages in thread
From: Nicolas Pitre @ 2004-11-18 22:31 UTC (permalink / raw)
To: Adrian Bunk; +Cc: David Woodhouse, Andrew Morton, lkml, linux-mtd
On Thu, 18 Nov 2004, Adrian Bunk wrote:
> On Thu, Nov 18, 2004 at 11:34:56AM -0500, Nicolas Pitre wrote:
> > On Thu, 18 Nov 2004, David Woodhouse wrote:
> >
> > > On Thu, 2004-11-18 at 16:41 +0100, Adrian Bunk wrote:
> > > > Let's put the dependencies from the #error into the Kconfig file:
> > >
> > > Looks sane to me. Nico?
> >
> > And why is the current arrangement actually a problem?
>
> If you are able to select an option, it should also compile (and work).
>
> At least on i386, this is usually true for every single option.
Fine. I thought the #error would encourage people to add the missing
bits to that file. No? ;-)
Can we make it conditional on CONFIG_XIP_KERNEL instead?
It would be less messy IMHO.
Nicolas
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
2004-11-18 22:31 ` Nicolas Pitre
@ 2004-11-18 23:25 ` Adrian Bunk
-1 siblings, 0 replies; 43+ messages in thread
From: Adrian Bunk @ 2004-11-18 23:25 UTC (permalink / raw)
To: Nicolas Pitre; +Cc: Andrew Morton, linux-mtd, David Woodhouse, lkml
On Thu, Nov 18, 2004 at 05:31:32PM -0500, Nicolas Pitre wrote:
>...
> Can we make it conditional on CONFIG_XIP_KERNEL instead?
> It would be less messy IMHO.
I copied the dependency from the #ifdef before the #error.
The #error should either go or be the same than the Kconfig dependency.
> Nicolas
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
^ permalink raw reply [flat|nested] 43+ messages in thread* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
@ 2004-11-18 23:25 ` Adrian Bunk
0 siblings, 0 replies; 43+ messages in thread
From: Adrian Bunk @ 2004-11-18 23:25 UTC (permalink / raw)
To: Nicolas Pitre; +Cc: David Woodhouse, Andrew Morton, lkml, linux-mtd
On Thu, Nov 18, 2004 at 05:31:32PM -0500, Nicolas Pitre wrote:
>...
> Can we make it conditional on CONFIG_XIP_KERNEL instead?
> It would be less messy IMHO.
I copied the dependency from the #ifdef before the #error.
The #error should either go or be the same than the Kconfig dependency.
> Nicolas
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
^ permalink raw reply [flat|nested] 43+ messages in thread* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
2004-11-18 23:25 ` Adrian Bunk
@ 2004-11-19 1:58 ` Nicolas Pitre
-1 siblings, 0 replies; 43+ messages in thread
From: Nicolas Pitre @ 2004-11-19 1:58 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Andrew Morton, linux-mtd, David Woodhouse, lkml
On Fri, 19 Nov 2004, Adrian Bunk wrote:
> On Thu, Nov 18, 2004 at 05:31:32PM -0500, Nicolas Pitre wrote:
> >...
> > Can we make it conditional on CONFIG_XIP_KERNEL instead?
> > It would be less messy IMHO.
>
> I copied the dependency from the #ifdef before the #error.
>
> The #error should either go or be the same than the Kconfig dependency.
And on what basis? This just doesn't make sense.
CONFIG_MTD_XIP is there to be compatible with kernels which are made
XIP. This currently means _all_ ARM flavours the kernel currently
supports. Yet there is only SA11x0 and PXA2xx which have proper MTD_XIP
primitives ence the #error.
My position is therefore that the CONFIG_MTD_XIP should depend on
CONFIG_XIP_KERNEL since this is what it is for, and the #error stay as
is. If ever you make x86 kernel XIPable you'll need to add the missing
bits guarded by the #error anyway.
And no, allyesconfig makes little sense on ARM as it has been discussed
on lkml before.
Nicolas
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
@ 2004-11-19 1:58 ` Nicolas Pitre
0 siblings, 0 replies; 43+ messages in thread
From: Nicolas Pitre @ 2004-11-19 1:58 UTC (permalink / raw)
To: Adrian Bunk; +Cc: David Woodhouse, Andrew Morton, lkml, linux-mtd
On Fri, 19 Nov 2004, Adrian Bunk wrote:
> On Thu, Nov 18, 2004 at 05:31:32PM -0500, Nicolas Pitre wrote:
> >...
> > Can we make it conditional on CONFIG_XIP_KERNEL instead?
> > It would be less messy IMHO.
>
> I copied the dependency from the #ifdef before the #error.
>
> The #error should either go or be the same than the Kconfig dependency.
And on what basis? This just doesn't make sense.
CONFIG_MTD_XIP is there to be compatible with kernels which are made
XIP. This currently means _all_ ARM flavours the kernel currently
supports. Yet there is only SA11x0 and PXA2xx which have proper MTD_XIP
primitives ence the #error.
My position is therefore that the CONFIG_MTD_XIP should depend on
CONFIG_XIP_KERNEL since this is what it is for, and the #error stay as
is. If ever you make x86 kernel XIPable you'll need to add the missing
bits guarded by the #error anyway.
And no, allyesconfig makes little sense on ARM as it has been discussed
on lkml before.
Nicolas
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
2004-11-19 1:58 ` Nicolas Pitre
@ 2004-11-19 13:35 ` Adrian Bunk
-1 siblings, 0 replies; 43+ messages in thread
From: Adrian Bunk @ 2004-11-19 13:35 UTC (permalink / raw)
To: Nicolas Pitre; +Cc: Andrew Morton, linux-mtd, David Woodhouse, lkml
On Thu, Nov 18, 2004 at 08:58:26PM -0500, Nicolas Pitre wrote:
> On Fri, 19 Nov 2004, Adrian Bunk wrote:
>
> > On Thu, Nov 18, 2004 at 05:31:32PM -0500, Nicolas Pitre wrote:
> > >...
> > > Can we make it conditional on CONFIG_XIP_KERNEL instead?
> > > It would be less messy IMHO.
> >
> > I copied the dependency from the #ifdef before the #error.
> >
> > The #error should either go or be the same than the Kconfig dependency.
>
> And on what basis? This just doesn't make sense.
>
> CONFIG_MTD_XIP is there to be compatible with kernels which are made
> XIP. This currently means _all_ ARM flavours the kernel currently
> supports. Yet there is only SA11x0 and PXA2xx which have proper MTD_XIP
> primitives ence the #error.
>
> My position is therefore that the CONFIG_MTD_XIP should depend on
> CONFIG_XIP_KERNEL since this is what it is for, and the #error stay as
> is. If ever you make x86 kernel XIPable you'll need to add the missing
> bits guarded by the #error anyway.
>
> And no, allyesconfig makes little sense on ARM as it has been discussed
> on lkml before.
I'm not talking about allyesconfig.
The Kconfig file should express all dependencies of a driver.
If a driver doesn't compile, it should not be selectable - and not
#error at compile time.
Rethinking it, perhaps the following expresses the dependencies best:
depends on ... && XIP_KERNEL && (ARCH_SA1100 || ARCH_PXA || BROKEN)
This would push the #error as a dependency on BROKEN to the Kconfig
file.
> Nicolas
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
^ permalink raw reply [flat|nested] 43+ messages in thread* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
@ 2004-11-19 13:35 ` Adrian Bunk
0 siblings, 0 replies; 43+ messages in thread
From: Adrian Bunk @ 2004-11-19 13:35 UTC (permalink / raw)
To: Nicolas Pitre; +Cc: David Woodhouse, Andrew Morton, lkml, linux-mtd
On Thu, Nov 18, 2004 at 08:58:26PM -0500, Nicolas Pitre wrote:
> On Fri, 19 Nov 2004, Adrian Bunk wrote:
>
> > On Thu, Nov 18, 2004 at 05:31:32PM -0500, Nicolas Pitre wrote:
> > >...
> > > Can we make it conditional on CONFIG_XIP_KERNEL instead?
> > > It would be less messy IMHO.
> >
> > I copied the dependency from the #ifdef before the #error.
> >
> > The #error should either go or be the same than the Kconfig dependency.
>
> And on what basis? This just doesn't make sense.
>
> CONFIG_MTD_XIP is there to be compatible with kernels which are made
> XIP. This currently means _all_ ARM flavours the kernel currently
> supports. Yet there is only SA11x0 and PXA2xx which have proper MTD_XIP
> primitives ence the #error.
>
> My position is therefore that the CONFIG_MTD_XIP should depend on
> CONFIG_XIP_KERNEL since this is what it is for, and the #error stay as
> is. If ever you make x86 kernel XIPable you'll need to add the missing
> bits guarded by the #error anyway.
>
> And no, allyesconfig makes little sense on ARM as it has been discussed
> on lkml before.
I'm not talking about allyesconfig.
The Kconfig file should express all dependencies of a driver.
If a driver doesn't compile, it should not be selectable - and not
#error at compile time.
Rethinking it, perhaps the following expresses the dependencies best:
depends on ... && XIP_KERNEL && (ARCH_SA1100 || ARCH_PXA || BROKEN)
This would push the #error as a dependency on BROKEN to the Kconfig
file.
> Nicolas
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
^ permalink raw reply [flat|nested] 43+ messages in thread* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
2004-11-19 13:35 ` Adrian Bunk
@ 2004-11-19 16:35 ` Nicolas Pitre
-1 siblings, 0 replies; 43+ messages in thread
From: Nicolas Pitre @ 2004-11-19 16:35 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Andrew Morton, linux-mtd, David Woodhouse, lkml
On Fri, 19 Nov 2004, Adrian Bunk wrote:
> On Thu, Nov 18, 2004 at 08:58:26PM -0500, Nicolas Pitre wrote:
> > On Fri, 19 Nov 2004, Adrian Bunk wrote:
> >
> > > The #error should either go or be the same than the Kconfig dependency.
> >
> > And on what basis? This just doesn't make sense.
> >
> > CONFIG_MTD_XIP is there to be compatible with kernels which are made
> > XIP. This currently means _all_ ARM flavours the kernel currently
> > supports. Yet there is only SA11x0 and PXA2xx which have proper MTD_XIP
> > primitives ence the #error.
> >
> > My position is therefore that the CONFIG_MTD_XIP should depend on
> > CONFIG_XIP_KERNEL since this is what it is for, and the #error stay as
> > is. If ever you make x86 kernel XIPable you'll need to add the missing
> > bits guarded by the #error anyway.
> >
> > And no, allyesconfig makes little sense on ARM as it has been discussed
> > on lkml before.
>
> I'm not talking about allyesconfig.
>
> The Kconfig file should express all dependencies of a driver.
> If a driver doesn't compile, it should not be selectable - and not
> #error at compile time.
Absolutely!
So please would you just ask Andrew to apply the following patch and be
happy? Thank you.
--- ./drivers/mtd/chips/Kconfig.orig Fri Nov 19 11:25:45 2004
+++ ./drivers/mtd/chips/Kconfig Fri Nov 19 11:28:08 2004
@@ -274,8 +274,7 @@
config MTD_XIP
bool "XIP aware MTD support"
- depends on !SMP && MTD_CFI_INTELEXT && EXPERIMENTAL
- default y if XIP_KERNEL
+ depends on XIP_KERNEL && !SMP && MTD_CFI_INTELEXT && EXPERIMENTAL
help
This allows MTD support to work with flash memory which is also
used for XIP purposes. If you're not sure what this is all about
Nicolas
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
@ 2004-11-19 16:35 ` Nicolas Pitre
0 siblings, 0 replies; 43+ messages in thread
From: Nicolas Pitre @ 2004-11-19 16:35 UTC (permalink / raw)
To: Adrian Bunk; +Cc: David Woodhouse, Andrew Morton, lkml, linux-mtd
On Fri, 19 Nov 2004, Adrian Bunk wrote:
> On Thu, Nov 18, 2004 at 08:58:26PM -0500, Nicolas Pitre wrote:
> > On Fri, 19 Nov 2004, Adrian Bunk wrote:
> >
> > > The #error should either go or be the same than the Kconfig dependency.
> >
> > And on what basis? This just doesn't make sense.
> >
> > CONFIG_MTD_XIP is there to be compatible with kernels which are made
> > XIP. This currently means _all_ ARM flavours the kernel currently
> > supports. Yet there is only SA11x0 and PXA2xx which have proper MTD_XIP
> > primitives ence the #error.
> >
> > My position is therefore that the CONFIG_MTD_XIP should depend on
> > CONFIG_XIP_KERNEL since this is what it is for, and the #error stay as
> > is. If ever you make x86 kernel XIPable you'll need to add the missing
> > bits guarded by the #error anyway.
> >
> > And no, allyesconfig makes little sense on ARM as it has been discussed
> > on lkml before.
>
> I'm not talking about allyesconfig.
>
> The Kconfig file should express all dependencies of a driver.
> If a driver doesn't compile, it should not be selectable - and not
> #error at compile time.
Absolutely!
So please would you just ask Andrew to apply the following patch and be
happy? Thank you.
--- ./drivers/mtd/chips/Kconfig.orig Fri Nov 19 11:25:45 2004
+++ ./drivers/mtd/chips/Kconfig Fri Nov 19 11:28:08 2004
@@ -274,8 +274,7 @@
config MTD_XIP
bool "XIP aware MTD support"
- depends on !SMP && MTD_CFI_INTELEXT && EXPERIMENTAL
- default y if XIP_KERNEL
+ depends on XIP_KERNEL && !SMP && MTD_CFI_INTELEXT && EXPERIMENTAL
help
This allows MTD support to work with flash memory which is also
used for XIP purposes. If you're not sure what this is all about
Nicolas
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
2004-11-19 16:35 ` Nicolas Pitre
@ 2004-11-21 19:56 ` Adrian Bunk
-1 siblings, 0 replies; 43+ messages in thread
From: Adrian Bunk @ 2004-11-21 19:56 UTC (permalink / raw)
To: Nicolas Pitre; +Cc: Andrew Morton, linux-mtd, David Woodhouse, lkml
On Fri, Nov 19, 2004 at 11:35:26AM -0500, Nicolas Pitre wrote:
> On Fri, 19 Nov 2004, Adrian Bunk wrote:
>
> >...
> > The Kconfig file should express all dependencies of a driver.
> > If a driver doesn't compile, it should not be selectable - and not
> > #error at compile time.
>
> Absolutely!
Good that we agree. :-)
> So please would you just ask Andrew to apply the following patch and be
> happy? Thank you.
A slightly improved patch is below.
> --- ./drivers/mtd/chips/Kconfig.orig Fri Nov 19 11:25:45 2004
> +++ ./drivers/mtd/chips/Kconfig Fri Nov 19 11:28:08 2004
> @@ -274,8 +274,7 @@
>
> config MTD_XIP
> bool "XIP aware MTD support"
> - depends on !SMP && MTD_CFI_INTELEXT && EXPERIMENTAL
> - default y if XIP_KERNEL
> + depends on XIP_KERNEL && !SMP && MTD_CFI_INTELEXT && EXPERIMENTAL
> help
> This allows MTD support to work with flash memory which is also
> used for XIP purposes. If you're not sure what this is all about
>
>
> Nicolas
cu
Adrian
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- linux-2.6.10-rc2-mm2-full/drivers/mtd/chips/Kconfig.old 2004-11-18 16:35:40.000000000 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/mtd/chips/Kconfig 2004-11-21 20:54:43.000000000 +0100
@@ -274,8 +274,8 @@
config MTD_XIP
bool "XIP aware MTD support"
- depends on !SMP && MTD_CFI_INTELEXT && EXPERIMENTAL
- default y if XIP_KERNEL
+ depends on XIP_KERNEL && !SMP && MTD_CFI_INTELEXT && EXPERIMENTAL && (ARCH_SA1100 || ARCH_PXA || BROKEN)
+ default y
help
This allows MTD support to work with flash memory which is also
used for XIP purposes. If you're not sure what this is all about
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
@ 2004-11-21 19:56 ` Adrian Bunk
0 siblings, 0 replies; 43+ messages in thread
From: Adrian Bunk @ 2004-11-21 19:56 UTC (permalink / raw)
To: Nicolas Pitre; +Cc: David Woodhouse, Andrew Morton, lkml, linux-mtd
On Fri, Nov 19, 2004 at 11:35:26AM -0500, Nicolas Pitre wrote:
> On Fri, 19 Nov 2004, Adrian Bunk wrote:
>
> >...
> > The Kconfig file should express all dependencies of a driver.
> > If a driver doesn't compile, it should not be selectable - and not
> > #error at compile time.
>
> Absolutely!
Good that we agree. :-)
> So please would you just ask Andrew to apply the following patch and be
> happy? Thank you.
A slightly improved patch is below.
> --- ./drivers/mtd/chips/Kconfig.orig Fri Nov 19 11:25:45 2004
> +++ ./drivers/mtd/chips/Kconfig Fri Nov 19 11:28:08 2004
> @@ -274,8 +274,7 @@
>
> config MTD_XIP
> bool "XIP aware MTD support"
> - depends on !SMP && MTD_CFI_INTELEXT && EXPERIMENTAL
> - default y if XIP_KERNEL
> + depends on XIP_KERNEL && !SMP && MTD_CFI_INTELEXT && EXPERIMENTAL
> help
> This allows MTD support to work with flash memory which is also
> used for XIP purposes. If you're not sure what this is all about
>
>
> Nicolas
cu
Adrian
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- linux-2.6.10-rc2-mm2-full/drivers/mtd/chips/Kconfig.old 2004-11-18 16:35:40.000000000 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/mtd/chips/Kconfig 2004-11-21 20:54:43.000000000 +0100
@@ -274,8 +274,8 @@
config MTD_XIP
bool "XIP aware MTD support"
- depends on !SMP && MTD_CFI_INTELEXT && EXPERIMENTAL
- default y if XIP_KERNEL
+ depends on XIP_KERNEL && !SMP && MTD_CFI_INTELEXT && EXPERIMENTAL && (ARCH_SA1100 || ARCH_PXA || BROKEN)
+ default y
help
This allows MTD support to work with flash memory which is also
used for XIP purposes. If you're not sure what this is all about
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
2004-11-21 19:56 ` Adrian Bunk
@ 2004-11-22 0:38 ` Nicolas Pitre
-1 siblings, 0 replies; 43+ messages in thread
From: Nicolas Pitre @ 2004-11-22 0:38 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Andrew Morton, David Woodhouse, linux-mtd, lkml
On Sun, 21 Nov 2004, Adrian Bunk wrote:
> On Fri, Nov 19, 2004 at 11:35:26AM -0500, Nicolas Pitre wrote:
>
> > On Fri, 19 Nov 2004, Adrian Bunk wrote:
> >
> > > The Kconfig file should express all dependencies of a driver.
> >
> > Absolutely!
>
> Good that we agree. :-)
On this very point only.
> > So please would you just ask Andrew to apply the following patch and be
> > happy? Thank you.
>
> A slightly improved patch is below.
But I continue to disagree with your proposed patch.
And I'll bet that you will continue to disagree with mine.
Can we let the MTD maintainer arbitrate on this?
Nicolas
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
@ 2004-11-22 0:38 ` Nicolas Pitre
0 siblings, 0 replies; 43+ messages in thread
From: Nicolas Pitre @ 2004-11-22 0:38 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Andrew Morton, linux-mtd, David Woodhouse, lkml
On Sun, 21 Nov 2004, Adrian Bunk wrote:
> On Fri, Nov 19, 2004 at 11:35:26AM -0500, Nicolas Pitre wrote:
>
> > On Fri, 19 Nov 2004, Adrian Bunk wrote:
> >
> > > The Kconfig file should express all dependencies of a driver.
> >
> > Absolutely!
>
> Good that we agree. :-)
On this very point only.
> > So please would you just ask Andrew to apply the following patch and be
> > happy? Thank you.
>
> A slightly improved patch is below.
But I continue to disagree with your proposed patch.
And I'll bet that you will continue to disagree with mine.
Can we let the MTD maintainer arbitrate on this?
Nicolas
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
2004-11-22 0:38 ` Nicolas Pitre
@ 2004-11-22 7:38 ` David Woodhouse
-1 siblings, 0 replies; 43+ messages in thread
From: David Woodhouse @ 2004-11-22 7:38 UTC (permalink / raw)
To: Nicolas Pitre; +Cc: Andrew Morton, linux-mtd, lkml, Adrian Bunk
On Sun, 2004-11-21 at 19:38 -0500, Nicolas Pitre wrote:
> But I continue to disagree with your proposed patch.
> And I'll bet that you will continue to disagree with mine.
>
> Can we let the MTD maintainer arbitrate on this?
Personally I prefer the #error. People with platforms which _don't_ yet
provide the underlying primitives which the XIP code needs will see the
option, turn it on and work out what they need to do. Otherwise, they'll
continue to be unaware that it even exists.
I consider that to be more important than the case of someone who turns
it on when they don't actually want it.
--
dwmw2
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [patch] 2.6.10-rc2-mm2: MTD_XIP dependencies
@ 2004-11-22 7:38 ` David Woodhouse
0 siblings, 0 replies; 43+ messages in thread
From: David Woodhouse @ 2004-11-22 7:38 UTC (permalink / raw)
To: Nicolas Pitre; +Cc: Adrian Bunk, Andrew Morton, linux-mtd, lkml
On Sun, 2004-11-21 at 19:38 -0500, Nicolas Pitre wrote:
> But I continue to disagree with your proposed patch.
> And I'll bet that you will continue to disagree with mine.
>
> Can we let the MTD maintainer arbitrate on this?
Personally I prefer the #error. People with platforms which _don't_ yet
provide the underlying primitives which the XIP code needs will see the
option, turn it on and work out what they need to do. Otherwise, they'll
continue to be unaware that it even exists.
I consider that to be more important than the case of someone who turns
it on when they don't actually want it.
--
dwmw2
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: 2.6.10-rc2-mm2
2004-11-18 10:15 2.6.10-rc2-mm2 Andrew Morton
` (5 preceding siblings ...)
2004-11-18 15:41 ` Adrian Bunk
@ 2004-11-18 22:51 ` Valdis.Kletnieks
2004-11-19 0:04 ` [patch] 2.6.10-rc2-mm2: `ST_partstat' multiple definition Adrian Bunk
` (2 subsequent siblings)
9 siblings, 0 replies; 43+ messages in thread
From: Valdis.Kletnieks @ 2004-11-18 22:51 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
On Thu, 18 Nov 2004 02:15:38 PST, Andrew Morton said:
>
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.10-rc2/2.6.
10-rc2-mm2/
>
> - Lots of small bugfixes. Some against patches in -mm, some against Linus's
...
> +selinux-atomic_dec_and_test-bug.patch
>
> Fix the SELinux scalability patches in -mm
This one was apparently the cause of my massive message flooding the other day.
At least, a -rc2-mm1 without it spews msgs, and a -rc2-mm1 with it doesn't.
Will try -rc2-mm2 tonight...
^ permalink raw reply [flat|nested] 43+ messages in thread* [patch] 2.6.10-rc2-mm2: `ST_partstat' multiple definition
2004-11-18 10:15 2.6.10-rc2-mm2 Andrew Morton
` (6 preceding siblings ...)
2004-11-18 22:51 ` 2.6.10-rc2-mm2 Valdis.Kletnieks
@ 2004-11-19 0:04 ` Adrian Bunk
2004-11-20 2:40 ` 2.6.10-rc2-mm2 Lee Revell
2004-11-20 18:31 ` 2.6.10-rc2-mm2 William Lee Irwin III
9 siblings, 0 replies; 43+ messages in thread
From: Adrian Bunk @ 2004-11-19 0:04 UTC (permalink / raw)
To: Andrew Morton, Kai Makisara; +Cc: linux-kernel, James.Bottomley, linux-scsi
The following compile error is still present:
<-- snip -->
...
LD drivers/scsi/built-in.o
drivers/scsi/osst.o(.bss+0x0): multiple definition of `ST_partstat'
drivers/scsi/st.o(.bss+0x0): first defined here
make[2]: *** [drivers/scsi/built-in.o] Error 1
<-- snip -->
The patch below fixes this issue.
It is also present in 2.6.10-rc2. Please put it therefore on your
must-go-to-linus-before-2.6.10-or-the-world-will-stop-turning list.
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
--- linux-2.6.10-rc2-mm2-full/drivers/scsi/st.h.old 2004-11-18 22:49:28.000000000 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/scsi/st.h 2004-11-18 22:49:48.000000000 +0100
@@ -67,7 +67,7 @@
u32 last_block_visited;
int drv_block; /* The block where the drive head is */
int drv_file;
-} ST_partstat;
+};
#define ST_NBR_PARTITIONS 4
^ permalink raw reply [flat|nested] 43+ messages in thread* Re: 2.6.10-rc2-mm2
2004-11-18 10:15 2.6.10-rc2-mm2 Andrew Morton
` (7 preceding siblings ...)
2004-11-19 0:04 ` [patch] 2.6.10-rc2-mm2: `ST_partstat' multiple definition Adrian Bunk
@ 2004-11-20 2:40 ` Lee Revell
2004-11-20 17:24 ` 2.6.10-rc2-mm2 Lee Revell
2004-11-20 18:31 ` 2.6.10-rc2-mm2 William Lee Irwin III
9 siblings, 1 reply; 43+ messages in thread
From: Lee Revell @ 2004-11-20 2:40 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
On Thu, 2004-11-18 at 02:15 -0800, Andrew Morton wrote:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.10-rc2/2.6.10-rc2-mm2/
New warnings:
In file included from sound/oss/emu10k1/hwaccess.h:38,
from sound/oss/emu10k1/recmgr.h:35,
from sound/oss/emu10k1/recmgr.c:34:
include/linux/ac97_codec.h:337: warning: `struct pci_dev' declared inside parameter list
include/linux/ac97_codec.h:337: warning: its scope is only this definition or declaration, which is probably not what you want
Looks like the OSS AC97 quirk facility is to blame, here is line 337:
extern int ac97_tune_hardware(struct pci_dev *pdev, struct ac97_quirk *quirk, int override);
Lee
^ permalink raw reply [flat|nested] 43+ messages in thread* Re: 2.6.10-rc2-mm2
2004-11-18 10:15 2.6.10-rc2-mm2 Andrew Morton
` (8 preceding siblings ...)
2004-11-20 2:40 ` 2.6.10-rc2-mm2 Lee Revell
@ 2004-11-20 18:31 ` William Lee Irwin III
2004-11-20 21:19 ` 2.6.10-rc2-mm2 Christoph Hellwig
9 siblings, 1 reply; 43+ messages in thread
From: William Lee Irwin III @ 2004-11-20 18:31 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
On Thu, Nov 18, 2004 at 02:15:38AM -0800, Andrew Morton wrote:
> +frv-kill-off-highmem_start_page.patch
> +frv-remove-obsolete-hardirq-stuff-from-includes.patch
> +further-nommu-changes.patch
> +further-nommu-proc-changes.patch
> +frv-arch-nommu-changes.patch
This patch converts FRV to use remap_pfn_range() in its
io_remap_page_range() function.
Index: mm2-2.6.10-rc2/include/asm-frv/pgtable.h
===================================================================
--- mm2-2.6.10-rc2.orig/include/asm-frv/pgtable.h 2004-11-20 00:57:54.000000000 -0800
+++ mm2-2.6.10-rc2/include/asm-frv/pgtable.h 2004-11-20 10:27:32.173203883 -0800
@@ -442,7 +442,8 @@
#define PageSkip(page) (0)
#define kern_addr_valid(addr) (1)
-#define io_remap_page_range remap_page_range
+#define io_remap_page_range(vma, vaddr, paddr, size, prot) \
+ remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot)
#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY
^ permalink raw reply [flat|nested] 43+ messages in thread* Re: 2.6.10-rc2-mm2
2004-11-20 18:31 ` 2.6.10-rc2-mm2 William Lee Irwin III
@ 2004-11-20 21:19 ` Christoph Hellwig
2004-11-20 21:29 ` 2.6.10-rc2-mm2 William Lee Irwin III
0 siblings, 1 reply; 43+ messages in thread
From: Christoph Hellwig @ 2004-11-20 21:19 UTC (permalink / raw)
To: William Lee Irwin III; +Cc: Andrew Morton, linux-kernel
On Sat, Nov 20, 2004 at 10:31:28AM -0800, William Lee Irwin III wrote:
> On Thu, Nov 18, 2004 at 02:15:38AM -0800, Andrew Morton wrote:
> > +frv-kill-off-highmem_start_page.patch
> > +frv-remove-obsolete-hardirq-stuff-from-includes.patch
> > +further-nommu-changes.patch
> > +further-nommu-proc-changes.patch
> > +frv-arch-nommu-changes.patch
>
> This patch converts FRV to use remap_pfn_range() in its
> io_remap_page_range() function.
What about introducing io_remap_pfn_range while you're at it so we can
have a cross-plattform calling convention?
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: 2.6.10-rc2-mm2
2004-11-20 21:19 ` 2.6.10-rc2-mm2 Christoph Hellwig
@ 2004-11-20 21:29 ` William Lee Irwin III
0 siblings, 0 replies; 43+ messages in thread
From: William Lee Irwin III @ 2004-11-20 21:29 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: Andrew Morton, linux-kernel
On Sat, Nov 20, 2004 at 10:31:28AM -0800, William Lee Irwin III wrote:
>> This patch converts FRV to use remap_pfn_range() in its
>> io_remap_page_range() function.
On Sat, Nov 20, 2004 at 09:19:31PM +0000, Christoph Hellwig wrote:
> What about introducing io_remap_pfn_range while you're at it so we can
> have a cross-plattform calling convention?
That's a pretty serious issue and the one that actually compelled work
to be done on remap_pfn_range(), though it was known to be an issue
for other reasons sufficiently compelling for mainline inclusion in
isolation. You might say that the "ulterior motive" on my part with
remap_pfn_range() was to ultimately leverage it to help resolve the
io_remap_page_range() issue though it directly benefits ia32 and ppc440.
A bit of research is needed to deal with the six-argument variants for
that effort that hasn't been wrapped up yet, and that's really the only
thing holding back the io_remap_pfn_range() sweep to unify the 5 and 6
argument conventions. I do have the hardware to test the 6 argument
architectures, which should make testing easy once I dredge up the info.
-- wli
^ permalink raw reply [flat|nested] 43+ messages in thread