diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-15 03:42:11 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-15 03:42:11 -0500 |
| commit | 2e67c56248b776c0a546925c796cdb167ee4d7a0 (patch) | |
| tree | 1532ff3d2a452ed52b732fba9878846494e863e1 /arch/mips/include/asm/cacheops.h | |
| parent | 1a60864fc1c3b268a921549bcfc707c98083260b (diff) | |
| parent | 74e72f894d56eb9d2e1218530c658e7d297e002b (diff) | |
Merge branch 'akpm' (incoming from Andrew)
Merge patches from Andrew Morton:
"Six fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
lib/percpu_counter.c: fix __percpu_counter_add()
crash_dump: fix compilation error (on MIPS at least)
mm: fix crash when using XFS on loopback
MIPS: fix blast_icache32 on loongson2
MIPS: fix case mismatch in local_r4k_flush_icache_range()
nilfs2: fix segctor bug that causes file system corruption
Diffstat (limited to 'arch/mips/include/asm/cacheops.h')
| -rw-r--r-- | arch/mips/include/asm/cacheops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/include/asm/cacheops.h b/arch/mips/include/asm/cacheops.h index c75025f27c20..06b9bc7ea14b 100644 --- a/arch/mips/include/asm/cacheops.h +++ b/arch/mips/include/asm/cacheops.h | |||
| @@ -83,6 +83,6 @@ | |||
| 83 | /* | 83 | /* |
| 84 | * Loongson2-specific cacheops | 84 | * Loongson2-specific cacheops |
| 85 | */ | 85 | */ |
| 86 | #define Hit_Invalidate_I_Loongson23 0x00 | 86 | #define Hit_Invalidate_I_Loongson2 0x00 |
| 87 | 87 | ||
| 88 | #endif /* __ASM_CACHEOPS_H */ | 88 | #endif /* __ASM_CACHEOPS_H */ |