aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-09 12:04:46 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-09 12:04:46 -0400
commit833ae40b517a99e05fc4aea399e71f633f3348d2 (patch)
tree827e720027fd4349e303f065ae58859184d11935 /arch/m68k/kernel
parent20e029d791b22000c45ac7ce5a09e8dee8a3d323 (diff)
parentc065edde73508c6da4afaf064e5999eb3e5aead1 (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/kernel')
-rw-r--r--arch/m68k/kernel/setup_no.c2
-rw-r--r--arch/m68k/kernel/signal.c8
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c
index 911ba472e6c4..5b16f5d61b44 100644
--- a/arch/m68k/kernel/setup_no.c
+++ b/arch/m68k/kernel/setup_no.c
@@ -118,7 +118,7 @@ void (*mach_power_off)(void);
118 * 118 *
119 * Returns: 119 * Returns:
120 */ 120 */
121void parse_uboot_commandline(char *commandp, int size) 121static void __init parse_uboot_commandline(char *commandp, int size)
122{ 122{
123 extern unsigned long _init_sp; 123 extern unsigned long _init_sp;
124 unsigned long *sp; 124 unsigned long *sp;
diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c
index 2a16df3d9312..57fd286e4b0b 100644
--- a/arch/m68k/kernel/signal.c
+++ b/arch/m68k/kernel/signal.c
@@ -50,6 +50,7 @@
50#include <asm/pgtable.h> 50#include <asm/pgtable.h>
51#include <asm/traps.h> 51#include <asm/traps.h>
52#include <asm/ucontext.h> 52#include <asm/ucontext.h>
53#include <asm/cacheflush.h>
53 54
54#ifdef CONFIG_MMU 55#ifdef CONFIG_MMU
55 56
@@ -181,6 +182,13 @@ static inline void push_cache (unsigned long vaddr)
181 asm volatile ("movec %0,%%caar\n\t" 182 asm volatile ("movec %0,%%caar\n\t"
182 "movec %1,%%cacr" 183 "movec %1,%%cacr"
183 : : "r" (vaddr + 4), "r" (temp)); 184 : : "r" (vaddr + 4), "r" (temp));
185 } else {
186 /* CPU_IS_COLDFIRE */
187#if defined(CONFIG_CACHE_COPYBACK)
188 flush_cf_dcache(0, DCACHE_MAX_ADDR);
189#endif
190 /* Invalidate instruction cache for the pushed bytes */
191 clear_cf_icache(vaddr, vaddr + 8);
184 } 192 }
185} 193}
186 194