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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/block: amiflop - Remove superfluous amiga_chip_alloc() cast
  m68k/atari: ARAnyM - Add support for network access
  m68k/atari: ARAnyM - Add support for console access
  m68k/atari: ARAnyM - Add support for block access
  m68k/atari: Initial ARAnyM support
  m68k: Kconfig - Remove unneeded "default n"
  m68k: Makefiles - Change to new flags variables
  m68k/amiga: Reclaim Chip RAM for PPC exception handlers
  m68k: Allow all kernel traps to be handled via exception fixups
  m68k: Use base_trap_init() to initialize vectors
  m68k: Add helper function handle_kernel_fault()

1 files changed, 78 insertions, 0 deletions

diff --git a/arch/m68k/emu/natfeat.c b/arch/m68k/emu/natfeat.c
new file mode 100644
index 000000000000..2291a7d69d49
--- /dev/null
+++ b/arch/m68k/emu/natfeat.c
@@ -0,0 +1,78 @@
+/*
+ * natfeat.c - ARAnyM hardware support via Native Features (natfeats)
+ *
+ * Copyright (c) 2005 Petr Stehlik of ARAnyM dev team
+ *
+ * Reworked for Linux by Roman Zippel <zippel@linux-m68k.org>
+ *
+ * This software may be used and distributed according to the terms of
+ * the GNU General Public License (GPL), incorporated herein by reference.
+ */
+
+#include <linux/types.h>
+#include <linux/console.h>
+#include <linux/string.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/io.h>
+#include <asm/machdep.h>
+#include <asm/natfeat.h>
+
+asm("\n"
+"       .global nf_get_id,nf_call\n"
+"nf_get_id:\n"
+"       .short  0x7300\n"
+"       rts\n"
+"nf_call:\n"
+"       .short  0x7301\n"
+"       rts\n"
+"1:     moveq.l #0,%d0\n"
+"       rts\n"
+"       .section __ex_table,\"a\"\n"
+"       .long   nf_get_id,1b\n"
+"       .long   nf_call,1b\n"
+"       .previous");
+EXPORT_SYMBOL_GPL(nf_get_id);
+EXPORT_SYMBOL_GPL(nf_call);
+
+void nfprint(const char *fmt, ...)
+{
+        static char buf[256];
+        va_list ap;
+        int n;
+
+        va_start(ap, fmt);
+        n = vsnprintf(buf, 256, fmt, ap);
+        nf_call(nf_get_id("NF_STDERR"), buf);
+        va_end(ap);
+}
+
+static void nf_poweroff(void)
+{
+        long id = nf_get_id("NF_SHUTDOWN");
+
+        if (id)
+                nf_call(id);
+}
+
+void nf_init(void)
+{
+        unsigned long id, version;
+        char buf[256];
+
+        id = nf_get_id("NF_VERSION");
+        if (!id)
+                return;
+        version = nf_call(id);
+
+        id = nf_get_id("NF_NAME");
+        if (!id)
+                return;
+        nf_call(id, buf, 256);
+        buf[255] = 0;
+
+        pr_info("NatFeats found (%s, %lu.%lu)\n", buf, version >> 16,
+                version & 0xffff);
+
+        mach_power_off = nf_poweroff;
+}