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
Šī revīzija ir iekļauta:
@@ -118,7 +118,7 @@ void (*mach_power_off)(void);
|
||||
*
|
||||
* Returns:
|
||||
*/
|
||||
void parse_uboot_commandline(char *commandp, int size)
|
||||
static void __init parse_uboot_commandline(char *commandp, int size)
|
||||
{
|
||||
extern unsigned long _init_sp;
|
||||
unsigned long *sp;
|
||||
|
@@ -50,6 +50,7 @@
|
||||
#include <asm/pgtable.h>
|
||||
#include <asm/traps.h>
|
||||
#include <asm/ucontext.h>
|
||||
#include <asm/cacheflush.h>
|
||||
|
||||
#ifdef CONFIG_MMU
|
||||
|
||||
@@ -181,6 +182,13 @@ static inline void push_cache (unsigned long vaddr)
|
||||
asm volatile ("movec %0,%%caar\n\t"
|
||||
"movec %1,%%cacr"
|
||||
: : "r" (vaddr + 4), "r" (temp));
|
||||
} else {
|
||||
/* CPU_IS_COLDFIRE */
|
||||
#if defined(CONFIG_CACHE_COPYBACK)
|
||||
flush_cf_dcache(0, DCACHE_MAX_ADDR);
|
||||
#endif
|
||||
/* Invalidate instruction cache for the pushed bytes */
|
||||
clear_cf_icache(vaddr, vaddr + 8);
|
||||
}
|
||||
}
|
||||
|
||||
|
Atsaukties uz šo jaunā problēmā
Block a user