+ parport-prevent-arm-boards-frmo-crashing-when-cups-is-loaded.patch added to -mm tree

+ parport-prevent-arm-boards-frmo-crashing-when-cups-is-loaded.patch added to -mm tree

[akpm]

The patch titled
     parport: prevent ARM boards frmo crashing when CUPS is loaded
has been added to the -mm tree.  Its filename is
     parport-prevent-arm-boards-frmo-crashing-when-cups-is-loaded.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: parport: prevent ARM boards frmo crashing when CUPS is loaded
From: Lee Jones <lee.jones@canonical.com>

When CUPS loads, it tries to load several drivers that it may need.  When
one of these drivers, specifically parport_pc is loaded on ARM based
systems, it causes a segmentation fault as the ISA addresses which are
attempted are not writable on non-PC based architectures.  This code
prevents ISA addresses from being attempted except on x86.

Addresses http://bugs.launchpad.net/bugs/601226

Signed-off-by: Lee Jones <lee.jones@canonical.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/arm/include/asm/parport.h |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff -puN arch/arm/include/asm/parport.h~parport-prevent-arm-boards-frmo-crashing-when-cups-is-loaded arch/arm/include/asm/parport.h
--- a/arch/arm/include/asm/parport.h~parport-prevent-arm-boards-frmo-crashing-when-cups-is-loaded
+++ a/arch/arm/include/asm/parport.h
@@ -9,10 +9,13 @@
 #ifndef __ASMARM_PARPORT_H
 #define __ASMARM_PARPORT_H
 
-static int __devinit parport_pc_find_isa_ports (int autoirq, int autodma);
 static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma)
 {
-	return parport_pc_find_isa_ports (autoirq, autodma);
+/* parport_pc_find_isa_ports uses direct register addresses which are
+ * only correct on x86 architectures. This may have undesirable
+ * consequences (including segfaults) when used on other architectures.
+ */
+	return 0;
 }
 
 #endif /* !(_ASMARM_PARPORT_H) */
_

Patches currently in -mm which might be from lee.jones@canonical.com are

parport-prevent-arm-boards-frmo-crashing-when-cups-is-loaded.patch
parport-prevent-arm-boards-frmo-crashing-when-cups-is-loaded-fix.patch