Merge branch 'merge' into powerpc-next

[linux-2.6-omap-h63xx.git] / arch / powerpc / kernel / kprobes.c

diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
index c176c513566b3c1a179661bae346142fa5cd4bd0..23545a2f51f34d40c02f44840eb607985c5ddc4c 100644 (file)
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
@@ -498,7 +498,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
 #ifdef CONFIG_PPC64
 unsigned long arch_deref_entry_point(void *entry)
 {
-       return (unsigned long)(((func_descr_t *)entry)->entry);
+       return ((func_descr_t *)entry)->entry;
 }
 #endif