diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 20:51:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 20:51:34 -0400 |
commit | 3573d3869de475cca9f2d4998fc3c2871a4cc2db (patch) | |
tree | 5b556cd8abcef8014f5ea4b9e95835ba4badc40a /arch/arc/mm/cache_arc700.c | |
parent | c8d9762affa0a97e299be2cabfec861515ef1580 (diff) | |
parent | 61fb4bfc010b0d2940f7fd87acbce6a0f03217cb (diff) |
Merge tag 'arc-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC changes from Vineet Gupta:
- Support for external initrd from Noam
- Fix broken serial console in nsimosci Virtual Platform
- Reuse of ENTRY/END assembler macros across hand asm code
- Other minor fixes here and there
* tag 'arc-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: [nsimosci] Unbork console
ARC: [nsimosci] Change .dts to use generic 8250 UART
ARC: [SMP] General Fixes
ARC: Remove unused DT template file
ARC: [clockevent] simplify timer ISR
ARC: [clockevent] can't be SoC specific
ARC: Remove ARC_HAS_COH_RTSC
ARC: switch to generic ENTRY/END assembler annotations
ARC: support external initrd
ARC: add uImage to .gitignore
ARC: [arcfpga] Fix __initconst data const-correctness
Diffstat (limited to 'arch/arc/mm/cache_arc700.c')
-rw-r--r-- | arch/arc/mm/cache_arc700.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arc/mm/cache_arc700.c b/arch/arc/mm/cache_arc700.c index 400c663b21c2..89edf7961a2f 100644 --- a/arch/arc/mm/cache_arc700.c +++ b/arch/arc/mm/cache_arc700.c | |||
@@ -100,10 +100,9 @@ | |||
100 | #define DC_CTRL_INV_MODE_FLUSH 0x40 | 100 | #define DC_CTRL_INV_MODE_FLUSH 0x40 |
101 | #define DC_CTRL_FLUSH_STATUS 0x100 | 101 | #define DC_CTRL_FLUSH_STATUS 0x100 |
102 | 102 | ||
103 | char *arc_cache_mumbojumbo(int cpu_id, char *buf, int len) | 103 | char *arc_cache_mumbojumbo(int c, char *buf, int len) |
104 | { | 104 | { |
105 | int n = 0; | 105 | int n = 0; |
106 | unsigned int c = smp_processor_id(); | ||
107 | 106 | ||
108 | #define PR_CACHE(p, enb, str) \ | 107 | #define PR_CACHE(p, enb, str) \ |
109 | { \ | 108 | { \ |