Messages in this thread Patch in this message | | | Date | Wed, 11 Apr 2012 16:13:21 -0700 | From | Greg KH <> | Subject | [ 14/42] m68k/mac: Add missing platform check before registering platform devices |
| |
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <geert@linux-m68k.org>
commit 6cfeba53911d6d2f17ebbd1246893557d5ff5aeb upstream.
On multi-platform kernels, the Mac platform devices should be registered when running on Mac only. Else it may crash later.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- arch/m68k/mac/config.c | 3 +++ 1 file changed, 3 insertions(+)
--- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c @@ -950,6 +950,9 @@ int __init mac_platform_init(void) { u8 *swim_base; + if (!MACH_IS_MAC) + return -ENODEV; + /* * Serial devices */
| |