diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-13 18:18:09 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-13 18:18:09 -0600 |
| commit | fd1cf90580289f83f9c972bb367a74d846d281c4 (patch) | |
| tree | 79e067defccd0c9ef4610f2db352762da5eef216 /arch | |
| parent | 06b8ab55289345ab191bf4bf0e4acc6d4bdf293d (diff) | |
| parent | f93125ae17d1d259b5aba84016db260903822194 (diff) | |
| download | linux-fd1cf90580289f83f9c972bb367a74d846d281c4.tar.bz2 | |
Merge tag 'metag-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag
Pull metag architecture updates from James Hogan:
"Just a couple of minor static analysis fixes, removal of a NULL check
that should never happen, and fix an error check where an unsigned
value was being checked to see if it was negative"
* tag 'metag-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
metag: cachepart: Fix failure check
metag: hugetlbpage: Remove null pointer checks that could never happen
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/metag/kernel/cachepart.c | 4 | ||||
| -rw-r--r-- | arch/metag/mm/hugetlbpage.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/metag/kernel/cachepart.c b/arch/metag/kernel/cachepart.c index 0a2385fa2a1d..04b7d4f8429a 100644 --- a/arch/metag/kernel/cachepart.c +++ b/arch/metag/kernel/cachepart.c @@ -55,7 +55,7 @@ unsigned int get_global_icache_size(void) return (get_icache_size() * ((temp >> SYSC_xCPARTG_AND_S) + 1)) >> 4; } -static unsigned int get_thread_cache_size(unsigned int cache, int thread_id) +static int get_thread_cache_size(unsigned int cache, int thread_id) { unsigned int cache_size; unsigned int t_cache_part; @@ -94,7 +94,7 @@ static unsigned int get_thread_cache_size(unsigned int cache, int thread_id) void check_for_cache_aliasing(int thread_id) { - unsigned int thread_cache_size; + int thread_cache_size; unsigned int cache_type; for (cache_type = ICACHE; cache_type <= DCACHE; cache_type++) { thread_cache_size = diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c index 3c52fa6d0f8e..3c32075d2945 100644 --- a/arch/metag/mm/hugetlbpage.c +++ b/arch/metag/mm/hugetlbpage.c @@ -173,7 +173,7 @@ new_search: mm->context.part_huge = 0; return addr; } - if (vma && (vma->vm_flags & MAP_HUGETLB)) { + if (vma->vm_flags & MAP_HUGETLB) { /* space after a huge vma in 2nd level page table? */ if (vma->vm_end & HUGEPT_MASK) { after_huge = 1; |