Commit fd1cf905 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 06b8ab55 f93125ae
...@@ -55,7 +55,7 @@ unsigned int get_global_icache_size(void) ...@@ -55,7 +55,7 @@ unsigned int get_global_icache_size(void)
return (get_icache_size() * ((temp >> SYSC_xCPARTG_AND_S) + 1)) >> 4; 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 cache_size;
unsigned int t_cache_part; unsigned int t_cache_part;
...@@ -94,7 +94,7 @@ static unsigned int get_thread_cache_size(unsigned int cache, int thread_id) ...@@ -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) void check_for_cache_aliasing(int thread_id)
{ {
unsigned int thread_cache_size; int thread_cache_size;
unsigned int cache_type; unsigned int cache_type;
for (cache_type = ICACHE; cache_type <= DCACHE; cache_type++) { for (cache_type = ICACHE; cache_type <= DCACHE; cache_type++) {
thread_cache_size = thread_cache_size =
......
...@@ -173,7 +173,7 @@ hugetlb_get_unmapped_area_existing(unsigned long len) ...@@ -173,7 +173,7 @@ hugetlb_get_unmapped_area_existing(unsigned long len)
mm->context.part_huge = 0; mm->context.part_huge = 0;
return addr; 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? */ /* space after a huge vma in 2nd level page table? */
if (vma->vm_end & HUGEPT_MASK) { if (vma->vm_end & HUGEPT_MASK) {
after_huge = 1; after_huge = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment