From 0942bf0ce0bd369f49954738f176a2fcb663af89 Mon Sep 17 00:00:00 2001 From: NAKAMURA Gou Date: Mon, 22 Dec 2014 16:18:03 +0900 Subject: [PATCH] make dkprintf() evaluate its parameters always Parameters of dkprintf() should be evaluated even if dkprintf() is disabled. Because this enables to find expression of parameter obsolete and to avoid unnecessary compiler warnings such as "unused variable". --- arch/x86/kernel/cpu.c | 2 +- arch/x86/kernel/gencore.c | 2 +- arch/x86/kernel/memory.c | 2 +- arch/x86/kernel/syscall.c | 2 +- kernel/devobj.c | 2 +- kernel/fileobj.c | 2 +- kernel/futex.c | 2 +- kernel/host.c | 2 +- kernel/init.c | 2 +- kernel/listeners.c | 2 +- kernel/mem.c | 2 +- kernel/process.c | 2 +- kernel/syscall.c | 2 +- kernel/timer.c | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/x86/kernel/cpu.c b/arch/x86/kernel/cpu.c index 7d4ba5de..ba030e51 100644 --- a/arch/x86/kernel/cpu.c +++ b/arch/x86/kernel/cpu.c @@ -49,7 +49,7 @@ #ifdef DEBUG_PRINT_CPU #define dkprintf kprintf #else -#define dkprintf(...) +#define dkprintf(...) do { if (0) kprintf(__VA_ARGS__); } while (0) #endif diff --git a/arch/x86/kernel/gencore.c b/arch/x86/kernel/gencore.c index 80cb840b..24a6a4f9 100644 --- a/arch/x86/kernel/gencore.c +++ b/arch/x86/kernel/gencore.c @@ -15,7 +15,7 @@ #define dkprintf(...) kprintf(__VA_ARGS__) #define ekprintf(...) kprintf(__VA_ARGS__) #else -#define dkprintf(...) +#define dkprintf(...) do { if (0) kprintf(__VA_ARGS__); } while (0) #define ekprintf(...) kprintf(__VA_ARGS__) #endif diff --git a/arch/x86/kernel/memory.c b/arch/x86/kernel/memory.c index f36e1da1..586d0e48 100644 --- a/arch/x86/kernel/memory.c +++ b/arch/x86/kernel/memory.c @@ -21,7 +21,7 @@ #include #include -#define dkprintf(...) +#define dkprintf(...) do { if (0) kprintf(__VA_ARGS__); } while (0) #define ekprintf(...) kprintf(__VA_ARGS__) static char *last_page; diff --git a/arch/x86/kernel/syscall.c b/arch/x86/kernel/syscall.c index 1ad2b504..b6e4b82a 100644 --- a/arch/x86/kernel/syscall.c +++ b/arch/x86/kernel/syscall.c @@ -34,7 +34,7 @@ long do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact); #ifdef DEBUG_PRINT_SC #define dkprintf kprintf #else -#define dkprintf(...) +#define dkprintf(...) do { if (0) kprintf(__VA_ARGS__); } while (0) #endif /* diff --git a/kernel/devobj.c b/kernel/devobj.c index c291b0c4..20757393 100644 --- a/kernel/devobj.c +++ b/kernel/devobj.c @@ -33,7 +33,7 @@ #include #include -#define dkprintf(...) +#define dkprintf(...) do { if (0) kprintf(__VA_ARGS__); } while (0) #define ekprintf(...) kprintf(__VA_ARGS__) struct devobj { diff --git a/kernel/fileobj.c b/kernel/fileobj.c index df83646d..6404627e 100644 --- a/kernel/fileobj.c +++ b/kernel/fileobj.c @@ -26,7 +26,7 @@ #include #include -#define dkprintf(...) +#define dkprintf(...) do { if (0) kprintf(__VA_ARGS__); } while (0) #define ekprintf(...) kprintf(__VA_ARGS__) static ihk_spinlock_t fileobj_list_lock = SPIN_LOCK_UNLOCKED; diff --git a/kernel/futex.c b/kernel/futex.c index c29ac83d..2174d6cc 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -76,7 +76,7 @@ #ifdef DEBUG_PRINT_FUTEX #define dkprintf kprintf #else -#define dkprintf(...) +#define dkprintf(...) do { if (0) kprintf(__VA_ARGS__); } while (0) #endif int futex_cmpxchg_enabled; diff --git a/kernel/host.c b/kernel/host.c index 621511d3..b662e8cd 100644 --- a/kernel/host.c +++ b/kernel/host.c @@ -34,7 +34,7 @@ #ifdef DEBUG_PRINT_HOST #define dkprintf kprintf #else -#define dkprintf(...) +#define dkprintf(...) do { if (0) kprintf(__VA_ARGS__); } while (0) #endif void check_mapping_for_proc(struct process *proc, unsigned long addr) diff --git a/kernel/init.c b/kernel/init.c index 66a808e2..bc273863 100644 --- a/kernel/init.c +++ b/kernel/init.c @@ -40,7 +40,7 @@ #ifdef DEBUG_PRINT_INIT #define dkprintf kprintf #else -#define dkprintf(...) +#define dkprintf(...) do { if (0) kprintf(__VA_ARGS__); } while (0) #endif int osnum = 0; diff --git a/kernel/listeners.c b/kernel/listeners.c index f30ab889..5d964e13 100644 --- a/kernel/listeners.c +++ b/kernel/listeners.c @@ -24,7 +24,7 @@ #define dkprintf(...) kprintf(__VA_ARGS__) #define ekprintf(...) kprintf(__VA_ARGS__) #else -#define dkprintf(...) +#define dkprintf(...) do { if (0) kprintf(__VA_ARGS__); } while (0) #define ekprintf(...) kprintf(__VA_ARGS__) #endif diff --git a/kernel/mem.c b/kernel/mem.c index 5b2a2f8d..f5260062 100644 --- a/kernel/mem.c +++ b/kernel/mem.c @@ -44,7 +44,7 @@ #define dkprintf(...) kprintf(__VA_ARGS__) #define ekprintf(...) kprintf(__VA_ARGS__) #else -#define dkprintf(...) +#define dkprintf(...) do { if (0) kprintf(__VA_ARGS__); } while (0) #define ekprintf(...) kprintf(__VA_ARGS__) #endif diff --git a/kernel/process.c b/kernel/process.c index 105793fb..bc93df7a 100644 --- a/kernel/process.c +++ b/kernel/process.c @@ -38,7 +38,7 @@ #define dkprintf(...) kprintf(__VA_ARGS__) #define ekprintf(...) kprintf(__VA_ARGS__) #else -#define dkprintf(...) +#define dkprintf(...) do { if (0) kprintf(__VA_ARGS__); } while (0) #define ekprintf(...) kprintf(__VA_ARGS__) #endif diff --git a/kernel/syscall.c b/kernel/syscall.c index 313b0f4b..c3dc8eb5 100644 --- a/kernel/syscall.c +++ b/kernel/syscall.c @@ -59,7 +59,7 @@ #define dkprintf(...) kprintf(__VA_ARGS__) #define ekprintf(...) kprintf(__VA_ARGS__) #else -#define dkprintf(...) +#define dkprintf(...) do { if (0) kprintf(__VA_ARGS__); } while (0) #define ekprintf(...) kprintf(__VA_ARGS__) #endif diff --git a/kernel/timer.c b/kernel/timer.c index f8c16777..4ffcb36b 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -38,7 +38,7 @@ #ifdef DEBUG_PRINT_TIMER #define dkprintf kprintf #else -#define dkprintf(...) +#define dkprintf(...) do { if (0) kprintf(__VA_ARGS__); } while (0) #endif #define LOOP_TIMEOUT 10