openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k fixes from Geert Uytterhoeven:
 "Here are a few fixes for the m68k architecture.  Nothing fancy this
  time, just a build fix for the asm/system.h disintegration, and two
  fixes for missing platform checks (one got in during last merge
  window), which can cause crashes in multi-platform kernels."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/q40: Add missing platform check before registering platform devices
  m68k/mac: Add missing platform check before registering platform devices
  m68k: include asm/cmpxchg.h in our m68k atomic.h
This commit is contained in:
Linus Torvalds 2012-04-03 10:07:13 -07:00
parent 7d6e1cb7ae 450aed725c
commit 1e649afde3
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/m68k/include/asm/atomic.h
View File

@ -3,6 +3,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/irqflags.h> #include <linux/irqflags.h>
#include <asm/cmpxchg.h>
/* /*
* Atomic operations that C can't guarantee us. Useful for * Atomic operations that C can't guarantee us. Useful for

3
arch/m68k/mac/config.c
View File

@ -980,6 +980,9 @@ int __init mac_platform_init(void)
{ {
u8 *swim_base; u8 *swim_base;
if (!MACH_IS_MAC)
return -ENODEV;
/* /*
* Serial devices * Serial devices
*/ */

3
arch/m68k/q40/config.c
View File

@ -334,6 +334,9 @@ static __init int q40_add_kbd_device(void)
{ {
struct platform_device *pdev; struct platform_device *pdev;
if (!MACH_IS_Q40)
return -ENODEV;
pdev = platform_device_register_simple("q40kbd", -1, NULL, 0); pdev = platform_device_register_simple("q40kbd", -1, NULL, 0);
if (IS_ERR(pdev)) if (IS_ERR(pdev))
return PTR_ERR(pdev); return PTR_ERR(pdev);