diff options
author | Andi Kleen <andi@firstfloor.org> | 2010-08-09 20:19:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-09 23:44:58 -0400 |
commit | 4e60c86bd9e5a7110ed28874d0b6592186550ae8 (patch) | |
tree | 9fb60e9f49b44b293a0c0c7d9f40e1a354a22b5a /mm | |
parent | 627295e492638936e76f3d8fcb1e0a3367b88341 (diff) |
gcc-4.6: mm: fix unused but set warnings
No real bugs, just some dead code and some fixups.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/filemap.c | 2 | ||||
-rw-r--r-- | mm/memory.c | 2 | ||||
-rw-r--r-- | mm/slab.c | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 20e5642e9f9f..3d4df44e4221 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -2238,14 +2238,12 @@ static ssize_t generic_perform_write(struct file *file, | |||
2238 | 2238 | ||
2239 | do { | 2239 | do { |
2240 | struct page *page; | 2240 | struct page *page; |
2241 | pgoff_t index; /* Pagecache index for current page */ | ||
2242 | unsigned long offset; /* Offset into pagecache page */ | 2241 | unsigned long offset; /* Offset into pagecache page */ |
2243 | unsigned long bytes; /* Bytes to write to page */ | 2242 | unsigned long bytes; /* Bytes to write to page */ |
2244 | size_t copied; /* Bytes copied from user */ | 2243 | size_t copied; /* Bytes copied from user */ |
2245 | void *fsdata; | 2244 | void *fsdata; |
2246 | 2245 | ||
2247 | offset = (pos & (PAGE_CACHE_SIZE - 1)); | 2246 | offset = (pos & (PAGE_CACHE_SIZE - 1)); |
2248 | index = pos >> PAGE_CACHE_SHIFT; | ||
2249 | bytes = min_t(unsigned long, PAGE_CACHE_SIZE - offset, | 2247 | bytes = min_t(unsigned long, PAGE_CACHE_SIZE - offset, |
2250 | iov_iter_count(i)); | 2248 | iov_iter_count(i)); |
2251 | 2249 | ||
diff --git a/mm/memory.c b/mm/memory.c index bde42c6d3633..6b0c37dcfd16 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -307,7 +307,6 @@ void free_pgd_range(struct mmu_gather *tlb, | |||
307 | { | 307 | { |
308 | pgd_t *pgd; | 308 | pgd_t *pgd; |
309 | unsigned long next; | 309 | unsigned long next; |
310 | unsigned long start; | ||
311 | 310 | ||
312 | /* | 311 | /* |
313 | * The next few lines have given us lots of grief... | 312 | * The next few lines have given us lots of grief... |
@@ -351,7 +350,6 @@ void free_pgd_range(struct mmu_gather *tlb, | |||
351 | if (addr > end - 1) | 350 | if (addr > end - 1) |
352 | return; | 351 | return; |
353 | 352 | ||
354 | start = addr; | ||
355 | pgd = pgd_offset(tlb->mm, addr); | 353 | pgd = pgd_offset(tlb->mm, addr); |
356 | do { | 354 | do { |
357 | next = pgd_addr_end(addr, end); | 355 | next = pgd_addr_end(addr, end); |
@@ -394,7 +394,7 @@ static void kmem_list3_init(struct kmem_list3 *parent) | |||
394 | #define STATS_DEC_ACTIVE(x) do { } while (0) | 394 | #define STATS_DEC_ACTIVE(x) do { } while (0) |
395 | #define STATS_INC_ALLOCED(x) do { } while (0) | 395 | #define STATS_INC_ALLOCED(x) do { } while (0) |
396 | #define STATS_INC_GROWN(x) do { } while (0) | 396 | #define STATS_INC_GROWN(x) do { } while (0) |
397 | #define STATS_ADD_REAPED(x,y) do { } while (0) | 397 | #define STATS_ADD_REAPED(x,y) do { (void)(y); } while (0) |
398 | #define STATS_SET_HIGH(x) do { } while (0) | 398 | #define STATS_SET_HIGH(x) do { } while (0) |
399 | #define STATS_INC_ERR(x) do { } while (0) | 399 | #define STATS_INC_ERR(x) do { } while (0) |
400 | #define STATS_INC_NODEALLOCS(x) do { } while (0) | 400 | #define STATS_INC_NODEALLOCS(x) do { } while (0) |