diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-05 08:58:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-05 08:58:00 -0400 |
| commit | 755b20f49220683bc2469f4d956dee39101440aa (patch) | |
| tree | de85b9ecb341d30d3b4f86b7e45075d559cdfb4c /arch/metag/kernel | |
| parent | dd7fd3a82ce55e5772d41b1faa2439f15318a902 (diff) | |
| parent | 6154c187b97ee7513046bb4eb317a89f738f13ef (diff) | |
Merge tag 'metag-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag
Pull metag architecture updates from James Hogan:
"Just a few minor fixes:
- Fix another incorrect inline asm register constraint, which has
been lying quietly for 5 and a half years before finally causing
build breakage during this merge window.
- Removal of duplicated KERN_INFO from Joe Perches
- Typo fixes from Andrea Gelmini"
* tag 'metag-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
metag: Fix __cmpxchg_u32 asm constraint for CMP
metag: Remove duplicate KERN_<LEVEL> prefix
metag: Fix typos
Diffstat (limited to 'arch/metag/kernel')
| -rw-r--r-- | arch/metag/kernel/cachepart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/metag/kernel/cachepart.c b/arch/metag/kernel/cachepart.c index 04b7d4f8429a..db944c2e7d88 100644 --- a/arch/metag/kernel/cachepart.c +++ b/arch/metag/kernel/cachepart.c @@ -15,7 +15,7 @@ #define SYSC_DCPART(n) (SYSC_DCPART0 + SYSC_xCPARTn_STRIDE * (n)) #define SYSC_ICPART(n) (SYSC_ICPART0 + SYSC_xCPARTn_STRIDE * (n)) -#define CACHE_ASSOCIATIVITY 4 /* 4 way set-assosiative */ +#define CACHE_ASSOCIATIVITY 4 /* 4 way set-associative */ #define ICACHE 0 #define DCACHE 1 |