Module: xenomai-rpm
Branch: queue/mayday
Commit: 32d61eb649bf6eac822a8b80ba81922f887d63c6
URL:
http://git.xenomai.org/?p=xenomai-rpm.git;a=commit;h=32d61eb649bf6eac822a8b80ba81922f887d63c6
Author: Philippe Gerum <r...@xenomai.org>
Date: Sat Jun 5 11:36:37 2010 +0200
nucleus: silence deprecated warnings on __builtin_expect for old compilers
---
include/asm-powerpc/bits/pod.h | 2 +-
ksrc/nucleus/registry.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/asm-powerpc/bits/pod.h b/include/asm-powerpc/bits/pod.h
index 6fe5e7b..7093b40 100644
--- a/include/asm-powerpc/bits/pod.h
+++ b/include/asm-powerpc/bits/pod.h
@@ -138,7 +138,7 @@ static inline void xnarch_switch_to(xnarchtcb_t *out_tcb,
}
}
#else /* PPC32 */
- if (likely(next_mm)) {
+ if (likely(next_mm != NULL)) {
next->thread.pgdir = next_mm->pgd;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
get_mmu_context(next_mm);
diff --git a/ksrc/nucleus/registry.c b/ksrc/nucleus/registry.c
index 53781f2..7dc7cf0 100644
--- a/ksrc/nucleus/registry.c
+++ b/ksrc/nucleus/registry.c
@@ -1037,7 +1037,7 @@ void *xnregistry_get(xnhandle_t handle)
xnlock_get_irqsave(&nklock, s);
object = xnregistry_validate(handle);
- if (likely(object)) {
+ if (likely(object != NULL)) {
++object->safelock;
objaddr = object->objaddr;
} else
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
