[tip:x86/cleanups] x86: Use "do { } while(0)" for empty flush_tlb_fix_spurious_fault() macro

From: tip-bot for Jesper Juhl
Date: Sun Dec 18 2011 - 18:51:43 EST


Commit-ID: 2ac13462b6d242684996e88a07fbed6dec6af622
Gitweb: http://git.kernel.org/tip/2ac13462b6d242684996e88a07fbed6dec6af622
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
AuthorDate: Sun, 18 Dec 2011 01:32:09 +0100
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Sun, 18 Dec 2011 09:14:18 +0100

x86: Use "do { } while(0)" for empty flush_tlb_fix_spurious_fault() macro

If one builds the kernel with -Wempty-body one gets this
warning:

mm/memory.c:3432:46: warning: suggest braces around empty body in an Âif statement [-Wempty-body]

due to the fact that 'flush_tlb_fix_spurious_fault' is a macro
that can sometimes be defined to nothing.

Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Cc: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: linux-mm@xxxxxxxxx
Cc: Michel Lespinasse <walken@xxxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: Rik van Riel <riel@xxxxxxxxxx>
Cc: Mel Gorman <mel@xxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Link: http://lkml.kernel.org/r/alpine.LNX.2.00.1112180128070.21784@xxxxxxxxxxxxxxxxxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
arch/x86/include/asm/pgtable.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index 18601c8..49afb3f 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -703,7 +703,7 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm,
pte_update(mm, addr, ptep);
}

-#define flush_tlb_fix_spurious_fault(vma, address)
+#define flush_tlb_fix_spurious_fault(vma, address) do { } while (0)

#define mk_pmd(page, pgprot) pfn_pmd(page_to_pfn(page), (pgprot))

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/