projects
/
unionfs-2.6.39.y.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
adf679a
)
m68k/mac: Add missing platform check before registering platform devices
author
Geert Uytterhoeven
<geert@linux-m68k.org>
Sun, 18 Mar 2012 12:21:38 +0000
(13:21 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Fri, 13 Apr 2012 16:13:52 +0000
(09:13 -0700)
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
patch
|
blob
|
history
diff --git
a/arch/m68k/mac/config.c
b/arch/m68k/mac/config.c
index f60ff5f59205c1f2285f53fd2c1ae08bae9d6d93..da3b8d8ac45cd4e7f47670c243809b560234c657 100644
(file)
--- a/
arch/m68k/mac/config.c
+++ b/
arch/m68k/mac/config.c
@@
-981,6
+981,9
@@
int __init mac_platform_init(void)
{
u8 *swim_base;
+ if (!MACH_IS_MAC)
+ return -ENODEV;
+
/*
* Serial devices
*/