Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 170168d0a351c045adc0bee0987e51dfc82890c0

Authored by Namhyung Kim
Committed by Linus Torvalds
1 parent e574b5fd20
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

vmalloc: rename temporary variable in __insert_vmap_area() 

Rename redundant 'tmp' to fix following sparse warnings:

 mm/vmalloc.c:296:34: warning: symbol 'tmp' shadows an earlier one
 mm/vmalloc.c:293:24: originally declared here

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 4 additions and 4 deletions Side-by-side Diff

... ... @@ -293,13 +293,13 @@
293 293 struct rb_node *tmp;
294 294  
295 295 while (*p) {
296   - struct vmap_area *tmp;
  296 + struct vmap_area *tmp_va;
297 297  
298 298 parent = *p;
299   - tmp = rb_entry(parent, struct vmap_area, rb_node);
300   - if (va->va_start < tmp->va_end)
  299 + tmp_va = rb_entry(parent, struct vmap_area, rb_node);
  300 + if (va->va_start < tmp_va->va_end)
301 301 p = &(*p)->rb_left;
302   - else if (va->va_end > tmp->va_start)
  302 + else if (va->va_end > tmp_va->va_start)
303 303 p = &(*p)->rb_right;
304 304 else
305 305 BUG();