m68k patches for 2.6.26

PATCH In review Geert Uytterhoeven 4 participants 22 messages Apr 24, 2008 – Apr 25, 2008

Subsystems (10)

Networking Network drivers Block layer HID +6 more subsystems

lore

Share & tools

lore

Geert Uytterhoeven

author maintainer

2008-04-24 18:34 UTC #0 lore raw

cover m68k patches for 2.6.26

Hi Linus, Andrew,

Here are some m68k patches for 2.6.26:
[01] m68k: Convert access_ok() to an inline function
[02] m68k: Kill CONFIG_FB_DAFB
[03] m68k: FB_HP300 depends on DIO and doesn't need FB_CFB_FILLRECT
[04] m68k: Kill CONFIG_WHIPPET_SERIAL
[05] m68k vme_scc: avoid global namespace pollution
[06] m68k: Make gcc aware that BUG() does not return
[07] m68k: Correct jump if not running on HP300
[08] m68k: macide doesn't check for Mac
[09] m68k: dnfb doesn't check for Apollo
[10] m68k: Some network drivers do not check the platform
[11] m68k: Some input drivers do not check the platform
[12] m68k: Return -ENODEV if no device is found
[13] m68k: Q40/Q60 floppy support is broken
[14] m68k: Update defconfigs
[15] m68k: Add multi_defconfig

Nothing controversial, so please apply, thanks!

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Geert Uytterhoeven

author maintainer

2008-04-24 18:35 UTC #1 lore raw

PATCH 1/15 m68k: Convert access_ok() to an inline function

From: Geert Uytterhoeven <[email protected]>

Convert access_ok() from a macro to an inline function, so the compiler no longer complains about unused variables:

fs/read_write.c: In function 'rw_copy_check_uvector':
fs/read_write.c:556: warning: unused variable 'buf'

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 include/asm-m68k/uaccess.h |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

include/asm-m68k/uaccess.h +5 -1

@@ -14,7 +14,11 @@
 #define VERIFY_WRITE	1
 
 /* We let the MMU do all checking */
-#define access_ok(type,addr,size) 1
+static inline int access_ok(int type, const void __user *addr,
+			    unsigned long size)
+{
+	return 1;
+}
 
 /*
  * The exception table consists of pairs of addresses: the first is the

Signature · 10 lines

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Geert Uytterhoeven

author maintainer

2008-04-24 18:34 UTC #2 lore raw

PATCH 2/15 m68k: Kill CONFIG_FB_DAFB

In reply to Geert Uytterhoeven

From: Geert Uytterhoeven <[email protected]>

CONFIG_FB_DAFB is a leftover from pre-Kconfig

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 drivers/video/Kconfig |    1 -
 1 file changed, 1 deletion(-)

drivers/video/Kconfig +0 -1

@@ -594,7 +594,6 @@ config FB_MAC
 	select FB_CFB_IMAGEBLIT
 	select FB_MACMODES
 
-#      bool '  Apple DAFB display support' CONFIG_FB_DAFB
 config FB_HP300
 	bool
 	depends on (FB = y) && HP300

Signature · 17 lines

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds


-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone

Geert Uytterhoeven

author maintainer

2008-04-24 18:34 UTC #3 lore raw

PATCH 3/15 m68k: FB_HP300 depends on DIO and doesnt need FB_CFB_FILLRECT

In reply to Geert Uytterhoeven

From: Geert Uytterhoeven <[email protected]>

Correct FB_HP300 dependencies:
- FB_HP300 doesn't depend only on HP300, but also on DIO (which depends on

    HP300)

- FB_HP300 does not need FB_CFB_FILLRECT

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 drivers/video/Kconfig |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

drivers/video/Kconfig +1 -2

@@ -596,8 +596,7 @@ config FB_MAC
 
 config FB_HP300
 	bool
-	depends on (FB = y) && HP300
-	select FB_CFB_FILLRECT
+	depends on (FB = y) && DIO
 	select FB_CFB_IMAGEBLIT
 	default y

Signature · 17 lines

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds


-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone

Geert Uytterhoeven

author maintainer

2008-04-24 18:37 UTC #4 lore raw

PATCH 4/15 m68k: Kill CONFIG_WHIPPET_SERIAL

In reply to Geert Uytterhoeven

From: Geert Uytterhoeven <[email protected]>

The Hisoft Whippet PCMCIA serial driver has been removed a long time ago, but it's Kconfig symbol still existed.

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 arch/m68k/Kconfig |    7 -------
 1 file changed, 7 deletions(-)

arch/m68k/Kconfig +0 -7

@@ -539,13 +539,6 @@ config AMIGA_BUILTIN_SERIAL
 
 	  To compile this driver as a module, choose M here.
 
-config WHIPPET_SERIAL
-	tristate "Hisoft Whippet PCMCIA serial support"
-	depends on AMIGA_PCMCIA
-	help
-	  HiSoft has a web page at <http://www.hisoft.co.uk/>, but there
-	  is no listing for the Whippet in their Amiga section.
-
 config MULTIFACE_III_TTY
 	tristate "Multiface Card III serial support"
 	depends on AMIGA

Signature · 10 lines

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Geert Uytterhoeven

author maintainer

2008-04-24 18:36 UTC #5 lore raw

PATCH 5/15 m68k vme_scc: avoid global namespace pollution

In reply to Geert Uytterhoeven

From: Geert Uytterhoeven <[email protected]>

m68k vme_scc:
- make scc_ports[] static
- kill unused global scc_initialized

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 drivers/char/vme_scc.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

drivers/char/vme_scc.c +1 -3

@@ -89,9 +89,7 @@ static void scc_break_ctl(struct tty_str
 
 static struct tty_driver *scc_driver;
 
-struct scc_port scc_ports[2];
-
-int scc_initialized = 0;
+static struct scc_port scc_ports[2];
 
 /*---------------------------------------------------------------------------
  * Interface from generic_serial.c back here

Signature · 10 lines

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Geert Uytterhoeven

author maintainer

2008-04-24 18:39 UTC #6 lore raw

PATCH 6/15 m68k: Make gcc aware that BUG() does not return

In reply to Geert Uytterhoeven

From: Geert Uytterhoeven <[email protected]>

Use __builtin_trap()' instead of asm volatile("illegal")' in the m68k BUG() macros (as suggested by Andrew Pinski), to kill warnings in code that assumes BUG() does not return.

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 include/asm-m68k/bug.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

include/asm-m68k/bug.h +2 -2

@@ -7,7 +7,7 @@
 #ifndef CONFIG_SUN3
 #define BUG() do { \
 	printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
-	asm volatile("illegal"); \
+	__builtin_trap(); \
 } while (0)
 #else
 #define BUG() do { \

@@ -17,7 +17,7 @@
 #endif
 #else
 #define BUG() do { \
-	asm volatile("illegal"); \
+	__builtin_trap(); \
 } while (0)
 #endif

Signature · 10 lines

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Geert Uytterhoeven

author maintainer

2008-04-24 18:35 UTC #7 lore raw

PATCH 7/15 m68k: Correct jump if not running on HP300

In reply to Geert Uytterhoeven

From: Geert Uytterhoeven <[email protected]>

When running a HP300-enabled kernel on non-HP300 hardware, a test in the early startup code jumps to the wrong label, causing a double bus fault.

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 arch/m68k/kernel/head.S |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/m68k/kernel/head.S +1 -1

@@ -1434,7 +1434,7 @@ L(mmu_fixup_done):
 #endif
 
 #ifdef CONFIG_HP300
-	is_not_hp300(1f)
+	is_not_hp300(2f)
 	/*
 	 * Fix up the iobase register to point to the new location of the LEDs.
 	 */

Signature · 10 lines

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Geert Uytterhoeven

author maintainer

2008-04-24 18:34 UTC #8 lore raw

PATCH 8/15 m68k: macide doesnt check for Mac

In reply to Geert Uytterhoeven

From: Geert Uytterhoeven <[email protected]>

The Macintosh IDE driver (macide) doesn't check whether it's actually running on Mac hardware, causing a crash if it isn't.

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 drivers/ide/legacy/macide.c |    3 +++
 1 file changed, 3 insertions(+)

drivers/ide/legacy/macide.c +3 -0

@@ -95,6 +95,9 @@ static int __init macide_init(void)
 	int irq;
 	hw_regs_t hw;
 
+	if (!MACH_IS_MAC)
+		return -ENODEV;
+
 	switch (macintosh_config->ide_type) {
 	case MAC_IDE_QUADRA:
 		base = IDE_BASE;

Signature · 10 lines

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Geert Uytterhoeven

author maintainer

2008-04-24 18:34 UTC #9 lore raw

PATCH 9/15 m68k: dnfb doesnt check for Apollo

In reply to Geert Uytterhoeven

From: Geert Uytterhoeven <[email protected]>

The Apollo frame buffer device driver (dnfb) doesn't check whether it's actually running on Apollo hardware, causing a crash if it isn't.

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 drivers/video/dnfb.c |    3 +++
 1 file changed, 3 insertions(+)

drivers/video/dnfb.c +3 -0

@@ -284,6 +284,9 @@ int __init dnfb_init(void)
 {
 	int ret;
 
+	if (!MACH_IS_APOLLO)
+		return -ENODEV;
+
 	if (fb_get_options("dnfb", NULL))
 		return -ENODEV;

Signature · 17 lines

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds


-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone

Geert Uytterhoeven

author maintainer

2008-04-24 18:34 UTC #10 lore raw

PATCH 10/15 m68k: Some network drivers do not check the platform

In reply to Geert Uytterhoeven

From: Geert Uytterhoeven <[email protected]>

Some network drivers do not check whether they're actually running on the correct platform, causing multi-platform kernels to crash if they are not.

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 drivers/net/82596.c     |    7 +++++++
 drivers/net/apne.c      |    3 +++
 drivers/net/mac89x0.c   |    3 +++
 drivers/net/macmace.c   |    3 +++
 drivers/net/sun3lance.c |    3 +++
 5 files changed, 19 insertions(+)

drivers/net/82596.c +7 -0

@@ -1162,6 +1162,7 @@ struct net_device * __init i82596_probe(
 		memcpy(eth_addr, (void *) 0xfffc1f2c, 6);	/* YUCK! Get addr from NOVRAM */
 		dev->base_addr = MVME_I596_BASE;
 		dev->irq = (unsigned) MVME16x_IRQ_I596;
+		goto found;
 	}
 #endif
 #ifdef ENABLE_BVME6000_NET

@@ -1176,6 +1177,7 @@ struct net_device * __init i82596_probe(
 		rtc[3] = msr;
 		dev->base_addr = BVME_I596_BASE;
 		dev->irq = (unsigned) BVME_IRQ_I596;
+		goto found;
 	}
 #endif
 #ifdef ENABLE_APRICOT

@@ -1212,8 +1214,13 @@ struct net_device * __init i82596_probe(
 		}
 
 		dev->irq = 10;
+		goto found;
 	}
 #endif
+	err = -ENODEV;
+	goto out;
+
+found:
 	dev->mem_start = (int)__get_free_pages(GFP_ATOMIC, 0);
 	if (!dev->mem_start) {
 		err = -ENOMEM;

drivers/net/apne.c +3 -0

@@ -127,6 +127,9 @@ struct net_device * __init apne_probe(in
 #endif
 	int err;
 
+	if (!MACH_IS_AMIGA)
+		return ERR_PTR(-ENODEV);
+
 	if (apne_owned)
 		return ERR_PTR(-ENODEV);

drivers/net/mac89x0.c +3 -0

@@ -183,6 +183,9 @@ struct net_device * __init mac89x0_probe
 	int err = -ENODEV;
 	DECLARE_MAC_BUF(mac);
 
+	if (!MACH_IS_MAC)
+		return ERR_PTR(-ENODEV);
+
 	dev = alloc_etherdev(sizeof(struct net_local));
 	if (!dev)
 		return ERR_PTR(-ENOMEM);

drivers/net/macmace.c +3 -0

@@ -781,6 +781,9 @@ static int __init mac_mace_init_module(v
 {
 	int err;
 
+	if (!MACH_IS_MAC)
+		return -ENODEV;
+
 	if ((err = platform_driver_register(&mac_mace_driver))) {
 		printk(KERN_ERR "Driver registration failed\n");
 		return err;

drivers/net/sun3lance.c +3 -0

@@ -250,6 +250,9 @@ struct net_device * __init sun3lance_pro
 	static int found;
 	int err = -ENODEV;
 
+	if (!MACH_IS_SUN3 && !MACH_IS_SUN3X)
+		return ERR_PTR(-ENODEV);
+
 	/* check that this machine has an onboard lance */
 	switch(idprom->id_machtype) {
 	case SM_SUN3|SM_3_50:

Signature · 10 lines

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Christoph Hellwig

2008-04-24 18:42 UTC #11 lore raw

Re: [patch 10/15] m68k: Some network drivers do not check the platform

drivers/net/macmace.c static int __init mac_mace_init_module(v · line 789

Quoted 11 lines · Geert Uytterhoeven

+++ b/drivers/net/macmace.c

drivers/net/macmace.c +3 -0

@@ -781,6 +781,9 @@ static int __init mac_mace_init_module(v
 {
 	int err;
 
+	if (!MACH_IS_MAC)
+		return -ENODEV;
+
 	if ((err = platform_driver_register(&mac_mace_driver))) {
 		printk(KERN_ERR "Driver registration failed\n");
 		return err;

This is rather odd. The whole point of the platform_driver infrastructure is that the arch code only registers it if it's present and then the driver can match for it. So the right fix here is to move the platform_driver_register(&mac_mace_driver) into the mac arch setup code. A quick grep shows this is a quite common pattern for m68k drivers.

Geert Uytterhoeven

author maintainer

2008-04-24 18:51 UTC #12 lore raw

Re: [patch 10/15] m68k: Some network drivers do not check the platform

Quoted 6 lines · Christoph Hellwig

Quoted 5 lines · Geert Uytterhoeven
+++ b/drivers/net/macmace.c
drivers/net/macmace.c +0 -0
@@ -781,6 +781,9 @@ static int __init mac_mace_init_module(v
 {
 	int err;
 

Quoted 11 lines

drivers/net/macmace.c static int __init mac_mace_init_module(v · line 789
Quoted 6 lines
drivers/net/macmace.c +3 -0
+	if (!MACH_IS_MAC)
+		return -ENODEV;
+
 	if ((err = platform_driver_register(&mac_mace_driver))) {
 		printk(KERN_ERR "Driver registration failed\n");
 		return err;
This is rather odd. The whole point of the platform_driver infrastructure is that the arch code only registers it if it's present and then the driver can match for it. So the right fix here is to move the platform_driver_register(&mac_mace_driver) into the mac arch setup

I suppose you mean platform_*device*_register(), not platform_*driver*_register()?

Quoted 2 lines

code. A quick grep shows this is a quite common pattern for m68k drivers.

I know. That's work in progress.

All these drivers predate the platform device framework and have been converted to this framework a while ago, without separating the actual platform drivers and platform devices.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Christoph Hellwig

2008-04-24 18:53 UTC #13 lore raw

Re: [patch 10/15] m68k: Some network drivers do not check the platform

Quoted 2 lines · Geert Uytterhoeven

I suppose you mean platform_*device*_register(), not platform_*driver*_register()?

Yes, sorry.

---end quoted text---

Brad Boyer

2008-04-24 21:49 UTC #14 lore raw

Re: [patch 10/15] m68k: Some network drivers do not check the platform

In reply to Geert Uytterhoeven

Quoted 15 lines · Geert Uytterhoeven

Quoted 6 lines · Christoph Hellwig
Quoted 5 lines · Geert Uytterhoeven
+++ b/drivers/net/macmace.c
drivers/net/macmace.c +0 -0
@@ -781,6 +781,9 @@ static int __init mac_mace_init_module(v
 {
 	int err;
 
Quoted 7 lines
drivers/net/macmace.c static int __init mac_mace_init_module(v · line 789
Quoted 6 lines
drivers/net/macmace.c +3 -0
+	if (!MACH_IS_MAC)
+		return -ENODEV;
+
 	if ((err = platform_driver_register(&mac_mace_driver))) {
 		printk(KERN_ERR "Driver registration failed\n");
 		return err;

Quoted 3 lines

All these drivers predate the platform device framework and have been converted to this framework a while ago, without separating the actual platform drivers and platform devices.

At some point I intend to merge macmace.c into mace.c by using the macio bus code on m68k macs. This would avoid the need for these checks, but it's not something I have working yet. My first driver to merge with ppc would be serial since we don't need any DMA support for that. It's on my list of things to do once I get macio working on m68k. I'll be sure to send a patch to the m68k list as soon as I have something that runs. After that I'll copy it to the ppc list to make sure I didn't break that, and submit it for inclusion once people are satisfied.

Brad Boyer
[email protected]

Geert Uytterhoeven

author maintainer

2008-04-24 18:29 UTC #15 lore raw

PATCH 11/15 m68k: Some input drivers do not check the platform

In reply to Geert Uytterhoeven

From: Geert Uytterhoeven <[email protected]>

Some input drivers do not check whether they're actually running on the correct platform, causing multi-platform kernels to crash if they are not.

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 drivers/input/misc/hp_sdc_rtc.c  |    5 +++++
 drivers/input/serio/hp_sdc_mlc.c |    5 +++++
 2 files changed, 10 insertions(+)

drivers/input/misc/hp_sdc_rtc.c +5 -0

@@ -691,6 +691,11 @@ static int __init hp_sdc_rtc_init(void)
 {
 	int ret;
 
+#ifdef __mc68000__
+	if (!MACH_IS_HP300)
+		return -ENODEV;
+#endif
+
 	init_MUTEX(&i8042tregs);
 
 	if ((ret = hp_sdc_request_timer_irq(&hp_sdc_rtc_isr)))

drivers/input/serio/hp_sdc_mlc.c +5 -0

@@ -306,6 +306,11 @@ static int __init hp_sdc_mlc_init(void)
 {
 	hil_mlc *mlc = &hp_sdc_mlc;
 
+#ifdef __mc68000__
+	if (!MACH_IS_HP300)
+		return -ENODEV;
+#endif
+
 	printk(KERN_INFO PREFIX "Registering the System Domain Controller's HIL MLC.\n");
 
 	hp_sdc_mlc_priv.emtestmode = 0;

Signature · 10 lines

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Geert Uytterhoeven

author maintainer

2008-04-24 18:38 UTC #16 lore raw

PATCH 12/15 m68k: Return -ENODEV if no device is found

In reply to Geert Uytterhoeven

From: Geert Uytterhoeven <[email protected]>

According to the tests in do_initcalls(), the proper error code in case no device is found is -ENODEV, not -ENXIO or -EIO.

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 drivers/block/amiflop.c      |    6 +++---
 drivers/block/z2ram.c        |    2 +-
 drivers/input/serio/q40kbd.c |    2 +-
 drivers/video/amifb.c        |    4 ++--
 drivers/video/hpfb.c         |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

drivers/block/amiflop.c +3 -3

@@ -1714,10 +1714,10 @@ static int __init amiga_floppy_init(void
 	int i, ret;
 
 	if (!MACH_IS_AMIGA)
-		return -ENXIO;
+		return -ENODEV;
 
 	if (!AMIGAHW_PRESENT(AMI_FLOPPY))
-		return -ENXIO;
+		return -ENODEV;
 
 	if (register_blkdev(FLOPPY_MAJOR,"fd"))
 		return -EBUSY;

@@ -1755,7 +1755,7 @@ static int __init amiga_floppy_init(void
 	if (!floppy_queue)
 		goto out_queue;
 
-	ret = -ENXIO;
+	ret = -ENODEV;
 	if (fd_probe_drives() < 1) /* No usable drives */
 		goto out_probe;

drivers/block/z2ram.c +1 -1

@@ -332,7 +332,7 @@ z2_init(void)
     int ret;
 
     if (!MACH_IS_AMIGA)
-	return -ENXIO;
+	return -ENODEV;
 
     ret = -EBUSY;
     if (register_blkdev(Z2RAM_MAJOR, DEVICE_NAME))

drivers/input/serio/q40kbd.c +1 -1

@@ -156,7 +156,7 @@ static int __init q40kbd_init(void)
 	int error;
 
 	if (!MACH_IS_Q40)
-		return -EIO;
+		return -ENODEV;
 
 	error = platform_driver_register(&q40kbd_driver);
 	if (error)

drivers/video/amifb.c +2 -2

@@ -2261,7 +2261,7 @@ int __init amifb_init(void)
 	amifb_setup(option);
 #endif
 	if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(AMI_VIDEO))
-		return -ENXIO;
+		return -ENODEV;
 
 	/*
 	 * We request all registers starting from bplpt[0]

@@ -2333,7 +2333,7 @@ default_chipset:
 			strcat(fb_info.fix.id, "Unknown");
 			goto default_chipset;
 #else /* CONFIG_FB_AMIGA_OCS */
-			err = -ENXIO;
+			err = -ENODEV;
 			goto amifb_error;
 #endif /* CONFIG_FB_AMIGA_OCS */
 			break;

drivers/video/hpfb.c +1 -1

@@ -382,7 +382,7 @@ int __init hpfb_init(void)
 #define INTFBPADDR 0x560000
 
 	if (!MACH_IS_HP300)
-		return -ENXIO;
+		return -ENODEV;
 
 	if (fb_get_options("hpfb", NULL))
 		return -ENODEV;

Signature · 10 lines

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Geert Uytterhoeven

author maintainer

2008-04-24 18:36 UTC #17 lore raw

PATCH 13/15 m68k: Q40/Q60 floppy support is broken

In reply to Geert Uytterhoeven

From: Geert Uytterhoeven <[email protected]>

Mark Q40/Q60 floppy support broken:

arch/m68k/q40/q40ints.c: In function 'q40_irq_handler':
arch/m68k/q40/q40ints.c:214: error: implicit declaration of function 'floppy_hardint'

Including <asm/floppy.h> doesn't help, as it causes a lot of additional error messages (cfr. Sun 3x).

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 arch/m68k/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/m68k/Kconfig +1 -1

@@ -44,7 +44,7 @@ config GENERIC_IOMAP
 
 config ARCH_MAY_HAVE_PC_FDC
 	bool
-	depends on Q40 || (BROKEN && SUN3X)
+	depends on BROKEN && (Q40 || SUN3X)
 	default y
 
 config NO_IOPORT

Signature · 10 lines

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Geert Uytterhoeven

author maintainer

2008-04-24 18:37 UTC #18 lore raw

PATCH 14/15 m68k: Update defconfigs

In reply to Geert Uytterhoeven

From: Geert Uytterhoeven <[email protected]>

Update the m68k defconfigs

Signed-off-by Geert Uytterhoeven <[email protected]>

---
 arch/m68k/configs/amiga_defconfig    |  130 ++++++++++++++++++----------------
 arch/m68k/configs/apollo_defconfig   |  112 ++++++++++++++++++-----------
 arch/m68k/configs/atari_defconfig    |  115 ++++++++++++++++++------------
 arch/m68k/configs/bvme6000_defconfig |  112 ++++++++++++++++++-----------
 arch/m68k/configs/hp300_defconfig    |  114 ++++++++++++++++++------------
 arch/m68k/configs/mac_defconfig      |  115 ++++++++++++++++++------------
 arch/m68k/configs/mvme147_defconfig  |  112 ++++++++++++++++++-----------
 arch/m68k/configs/mvme16x_defconfig  |  112 ++++++++++++++++++-----------
 arch/m68k/configs/q40_defconfig      |  131 ++++++++++++++++++-----------------
 arch/m68k/configs/sun3_defconfig     |  112 ++++++++++++++++++-----------
 arch/m68k/configs/sun3x_defconfig    |  112 ++++++++++++++++++-----------
 11 files changed, 775 insertions(+), 502 deletions(-)

arch/m68k/configs/amiga_defconfig +71 ~~-59~~

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.25-rc8
-# Wed Apr  2 20:46:06 2008
+# Linux kernel version: 2.6.25
+# Wed Apr 23 22:51:57 2008
 #
 CONFIG_M68K=y
 CONFIG_MMU=y

@@ -222,8 +222,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
 CONFIG_INET6_XFRM_MODE_BEET=m
 CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_SIT=m
+CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_IPV6_TUNNEL=m
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set

@@ -239,6 +241,7 @@ CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CT_ACCT=y
 CONFIG_NF_CONNTRACK_MARK=y
 # CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CT_PROTO_DCCP is not set
 CONFIG_NF_CT_PROTO_GRE=m
 CONFIG_NF_CT_PROTO_SCTP=m
 CONFIG_NF_CT_PROTO_UDPLITE=m

@@ -317,6 +320,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
 CONFIG_NF_NAT_TFTP=m

@@ -410,8 +415,6 @@ CONFIG_IEEE80211=m
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
-CONFIG_IEEE80211_SOFTMAC=m
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 # CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set

@@ -477,27 +480,12 @@ CONFIG_IDE_PROC_FS=y
 #
 # IDE chipset support/bugfixes
 #
-# CONFIG_IDE_GENERIC is not set
 # CONFIG_BLK_DEV_PLATFORM is not set
 CONFIG_BLK_DEV_GAYLE=y
 CONFIG_BLK_DEV_IDEDOUBLER=y
 CONFIG_BLK_DEV_BUDDHA=y
-
-#
-# Other IDE chipsets support
-#
-
-#
-# Note: most of these also require special kernel boot parameters
-#
-# CONFIG_BLK_DEV_4DRIVES is not set
-# CONFIG_BLK_DEV_ALI14XX is not set
-# CONFIG_BLK_DEV_DTC2278 is not set
-# CONFIG_BLK_DEV_HT6560B is not set
-# CONFIG_BLK_DEV_QD65XX is not set
-# CONFIG_BLK_DEV_UMC8672 is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDE_ARCH_OBSOLETE_INIT is not set
+# CONFIG_BLK_DEV_HD_ONLY is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

@@ -626,6 +614,7 @@ CONFIG_APNE=m
 #
 # CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
 # CONFIG_WAN is not set
 # CONFIG_PLIP is not set
 CONFIG_PPP=m

@@ -779,6 +768,7 @@ CONFIG_SSB_POSSIBLE=y
 # Multifunction device drivers
 #
 # CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
 
 #
 # Multimedia devices

@@ -861,17 +851,12 @@ CONFIG_HIDRAW=y
 # CONFIG_NEW_LEDS is not set
 # CONFIG_RTC_CLASS is not set
 # CONFIG_AUXDISPLAY is not set
-
-#
-# Userspace I/O
-#
 # CONFIG_UIO is not set
 
 #
 # Character devices
 #
 CONFIG_AMIGA_BUILTIN_SERIAL=y
-# CONFIG_WHIPPET_SERIAL is not set
 CONFIG_MULTIFACE_III_TTY=m
 # CONFIG_SERIAL_CONSOLE is not set

@@ -894,16 +879,14 @@ CONFIG_JFS_FS=m
 # CONFIG_JFS_SECURITY is not set
 # CONFIG_JFS_DEBUG is not set
 # CONFIG_JFS_STATISTICS is not set
-CONFIG_FS_POSIX_ACL=y
+# CONFIG_FS_POSIX_ACL is not set
 CONFIG_XFS_FS=m
 # CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_SECURITY is not set
 # CONFIG_XFS_POSIX_ACL is not set
 # CONFIG_XFS_RT is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_NOLOCK=m
-CONFIG_GFS2_FS_LOCKING_DLM=m
 CONFIG_OCFS2_FS=m
+# CONFIG_OCFS2_FS_O2CB is not set
+# CONFIG_OCFS2_FS_USERSPACE_CLUSTER is not set
 # CONFIG_OCFS2_DEBUG_MASKLOG is not set
 # CONFIG_OCFS2_DEBUG_FS is not set
 CONFIG_DNOTIFY=y

@@ -1073,53 +1056,82 @@ CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_XOR=m
 CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_SEQIV=m
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+
+#
+# Hash modes
+#
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_NULL=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_SHA1=m
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_XTS=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
 CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+
+#
+# Compression
+#
 CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_LZO=m
 # CONFIG_CRYPTO_HW is not set

@@ -1129,7 +1141,7 @@ CONFIG_CRYPTO_LZO=m
 CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
-# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 # CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=m

arch/m68k/configs/apollo_defconfig +70 ~~-42~~