diff options
| author | Andi Kleen <andi@firstfloor.org> | 2010-08-09 17:19:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-09 20:44:58 -0700 |
| commit | 4e60c86bd9e5a7110ed28874d0b6592186550ae8 (patch) | |
| tree | 9fb60e9f49b44b293a0c0c7d9f40e1a354a22b5a /include/linux | |
| 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 'include/linux')
| -rw-r--r-- | include/linux/highmem.h | 6 | ||||
| -rw-r--r-- | include/linux/mmdebug.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/highmem.h b/include/linux/highmem.h index 67460f01022..e3060ef85b6 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h @@ -73,7 +73,11 @@ static inline void *kmap_atomic(struct page *page, enum km_type idx) } #define kmap_atomic_prot(page, idx, prot) kmap_atomic(page, idx) -#define kunmap_atomic_notypecheck(addr, idx) do { pagefault_enable(); } while (0) +static inline void kunmap_atomic_notypecheck(void *addr, enum km_type idx) +{ + pagefault_enable(); +} + #define kmap_atomic_pfn(pfn, idx) kmap_atomic(pfn_to_page(pfn), (idx)) #define kmap_atomic_to_page(ptr) virt_to_page(ptr) diff --git a/include/linux/mmdebug.h b/include/linux/mmdebug.h index ee24ef8ab61..c04ecfe03f7 100644 --- a/include/linux/mmdebug.h +++ b/include/linux/mmdebug.h @@ -4,7 +4,7 @@ #ifdef CONFIG_DEBUG_VM #define VM_BUG_ON(cond) BUG_ON(cond) #else -#define VM_BUG_ON(cond) do { } while (0) +#define VM_BUG_ON(cond) do { (void)(cond); } while (0) #endif #ifdef CONFIG_DEBUG_VIRTUAL |