Commit 1e649afd authored Apr 03, 2012 by Linus Torvalds

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

parents 7d6e1cb7 450aed72

arch/m68k/include/asm/atomic.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@

		#include <linux/types.h>
		#include <linux/irqflags.h>
		#include <asm/cmpxchg.h>

		/*
		* Atomic operations that C can't guarantee us. Useful for

arch/m68k/mac/config.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -980,6 +980,9 @@ int __init mac_platform_init(void)
		{
		u8 *swim_base;

		if (!MACH_IS_MAC)
		return -ENODEV;

		/*
		* Serial devices
		*/

arch/m68k/q40/config.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -334,6 +334,9 @@ static __init int q40_add_kbd_device(void)
		{
		struct platform_device *pdev;

		if (!MACH_IS_Q40)
		return -ENODEV;

		pdev = platform_device_register_simple("q40kbd", -1, NULL, 0);
		if (IS_ERR(pdev))
		return PTR_ERR(pdev);