[PATCH -tip 1/2] x86/alternatives: Fix build warning
in [Kernel]
|
Prev: linux-next: build failure after merge of the net tree
Next: [PATCH -tip 2/2] kprobes: Add mcount in kprobes blacklist
From: Masami Hiramatsu on 5 Feb 2010 01:20 Fixes below warnings. ==== FYI, there's this new build warning on x86 defconfig: arch/x86/kernel/alternative.c: In function 'alternatives_text_reserved': arch/x86/kernel/alternative.c:402: warning: comparison of distinct pointer types lacks a cast arch/x86/kernel/alternative.c:402: warning: comparison of distinct pointer types lacks a cast arch/x86/kernel/alternative.c:405: warning: comparison of distinct pointer types lacks a cast arch/x86/kernel/alternative.c:405: warning: comparison of distinct pointer types lacks a cast Caused by: 2cfa197: ftrace/alternatives: Introducing *_text_reserved functions ==== Signed-off-by: Masami Hiramatsu <mhiramat(a)redhat.com> Reported-by: Ingo Molnar <mingo(a)elte.hu> --- arch/x86/kernel/alternative.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 3832fdc..99d9920 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -399,10 +399,10 @@ int alternatives_text_reserved(void *start, void *end) u8 **ptr; list_for_each_entry(mod, &smp_alt_modules, next) { - if (mod->text > end || mod->text_end < start) + if (mod->text > (u8 *)end || mod->text_end < (u8 *)start) continue; for (ptr = mod->locks; ptr < mod->locks_end; ptr++) - if (start <= *ptr && end >= *ptr) + if ((u8 *)start <= *ptr && (u8 *)end >= *ptr) return 1; } -- Masami Hiramatsu Software Engineer Hitachi Computer Products (America), Inc. Software Solutions Division e-mail: mhiramat(a)redhat.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |