Commit b3bd3de66f60df4c9a2076e2886a622458929056

Authored by Andi Kleen
Committed by Ingo Molnar
1 parent ef5dc121d5

gcc-4.6: kernel/*: Fix unused but set warnings

No real bugs I believe, just some dead code.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: andi@firstfloor.org
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Showing 5 changed files with 3 additions and 12 deletions Side-by-side Diff

kernel/debug/kdb/kdb_bp.c
... ... @@ -274,7 +274,6 @@
274 274 int i, bpno;
275 275 kdb_bp_t *bp, *bp_check;
276 276 int diag;
277   - int free;
278 277 char *symname = NULL;
279 278 long offset = 0ul;
280 279 int nextarg;
... ... @@ -305,7 +304,6 @@
305 304 /*
306 305 * Find an empty bp structure to allocate
307 306 */
308   - free = KDB_MAXBPT;
309 307 for (bpno = 0, bp = kdb_breakpoints; bpno < KDB_MAXBPT; bpno++, bp++) {
310 308 if (bp->bp_free)
311 309 break;
... ... @@ -1091,11 +1091,10 @@
1091 1091 */
1092 1092 ktime_t hrtimer_get_remaining(const struct hrtimer *timer)
1093 1093 {
1094   - struct hrtimer_clock_base *base;
1095 1094 unsigned long flags;
1096 1095 ktime_t rem;
1097 1096  
1098   - base = lock_hrtimer_base(timer, &flags);
  1097 + lock_hrtimer_base(timer, &flags);
1099 1098 rem = hrtimer_expires_remaining(timer);
1100 1099 unlock_hrtimer_base(timer, &flags);
1101 1100  
... ... @@ -1313,7 +1313,7 @@
1313 1313 find_idlest_group(struct sched_domain *sd, struct task_struct *p,
1314 1314 int this_cpu, int load_idx)
1315 1315 {
1316   - struct sched_group *idlest = NULL, *this = NULL, *group = sd->groups;
  1316 + struct sched_group *idlest = NULL, *group = sd->groups;
1317 1317 unsigned long min_load = ULONG_MAX, this_load = 0;
1318 1318 int imbalance = 100 + (sd->imbalance_pct-100)/2;
1319 1319  
... ... @@ -1348,7 +1348,6 @@
1348 1348  
1349 1349 if (local_group) {
1350 1350 this_load = avg_load;
1351   - this = group;
1352 1351 } else if (avg_load < min_load) {
1353 1352 min_load = avg_load;
1354 1353 idlest = group;
... ... @@ -1713,10 +1713,7 @@
1713 1713 {
1714 1714 sysctl_set_parent(NULL, root_table);
1715 1715 #ifdef CONFIG_SYSCTL_SYSCALL_CHECK
1716   - {
1717   - int err;
1718   - err = sysctl_check_table(current->nsproxy, root_table);
1719   - }
  1716 + sysctl_check_table(current->nsproxy, root_table);
1720 1717 #endif
1721 1718 return 0;
1722 1719 }
kernel/trace/ring_buffer.c
... ... @@ -2985,13 +2985,11 @@
2985 2985  
2986 2986 static void rb_advance_iter(struct ring_buffer_iter *iter)
2987 2987 {
2988   - struct ring_buffer *buffer;
2989 2988 struct ring_buffer_per_cpu *cpu_buffer;
2990 2989 struct ring_buffer_event *event;
2991 2990 unsigned length;
2992 2991  
2993 2992 cpu_buffer = iter->cpu_buffer;
2994   - buffer = cpu_buffer->buffer;
2995 2993  
2996 2994 /*
2997 2995 * Check if we are at the end of the buffer.