diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-01 07:47:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-01 07:47:40 +0100 |
| commit | c29c716662d0cefc0cda4903aea5ed6794174679 (patch) | |
| tree | 01d4dc47933e1bcbeca8d53b0cf5c1f70da04535 /arch/arc/include/asm/cache.h | |
| parent | x86/fpu: Finish excising 'eagerfpu' (diff) | |
| parent | fork: Add task stack refcounting sanity check and prevent premature task stac... (diff) | |
| download | linux-c29c716662d0cefc0cda4903aea5ed6794174679.tar.xz linux-c29c716662d0cefc0cda4903aea5ed6794174679.zip | |
Merge branch 'core/urgent' into x86/fpu, to merge fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arc/include/asm/cache.h')
| -rw-r--r-- | arch/arc/include/asm/cache.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arc/include/asm/cache.h b/arch/arc/include/asm/cache.h index fb781e34f322..b3410ff6a62d 100644 --- a/arch/arc/include/asm/cache.h +++ b/arch/arc/include/asm/cache.h @@ -53,7 +53,7 @@ extern void arc_cache_init(void); extern char *arc_cache_mumbojumbo(int cpu_id, char *buf, int len); extern void read_decode_cache_bcr(void); -extern int ioc_exists; +extern int ioc_enable; extern unsigned long perip_base, perip_end; #endif /* !__ASSEMBLY__ */ |