diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-09 09:04:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-09 09:04:46 -0700 |
| commit | 833ae40b517a99e05fc4aea399e71f633f3348d2 (patch) | |
| tree | 827e720027fd4349e303f065ae58859184d11935 /arch/m68k/platform/68360/commproc.c | |
| parent | 20e029d791b22000c45ac7ce5a09e8dee8a3d323 (diff) | |
| parent | c065edde73508c6da4afaf064e5999eb3e5aead1 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu fixes from Greg Ungerer:
"Just a small collection of cleanups and fixes this time, no big
changes. The most interresting are to make the m68k and m68knommu
consistently use CONFIG_IOMAP, clean out some unused board config
options and flush the cache on signal stack creation"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: remove 16 unused boards in Kconfig.machine
m68k: define 'VM_DATA_DEFAULT_FLAGS' no matter whether has 'NOMMU' or not
m68knommu: user generic iomap to support ioread*/iowrite*
m68k/coldfire: flush cache when creating the signal stack frame
m68knommu: Mark functions only called from setup_arch() __init
Diffstat (limited to 'arch/m68k/platform/68360/commproc.c')
| -rw-r--r-- | arch/m68k/platform/68360/commproc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/platform/68360/commproc.c b/arch/m68k/platform/68360/commproc.c index 8e4e10cc0080..315727b7ff40 100644 --- a/arch/m68k/platform/68360/commproc.c +++ b/arch/m68k/platform/68360/commproc.c @@ -31,6 +31,7 @@ */ #include <linux/errno.h> +#include <linux/init.h> #include <linux/sched.h> #include <linux/kernel.h> #include <linux/param.h> @@ -77,7 +78,7 @@ void m360_cpm_reset(void); -void m360_cpm_reset() +void __init m360_cpm_reset() { /* pte_t *pte; */ |