Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / arch / mips / oprofile / op_model_mipsxx.c

diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c
index a09c5f9..a175d67 100644 (file)
--- a/arch/mips/oprofile/op_model_mipsxx.c
+++ b/arch/mips/oprofile/op_model_mipsxx.c
@@ -49,6 +49,7 @@ static inline unsigned int r_c0_ ## r ## n(void)                      \
        default:                                                        \
                BUG();                                                  \
        }                                                               \
+       return 0;                                                       \
 }                                                                      \
                                                                        \
 static inline void w_c0_ ## r ## n(unsigned int value)                 \
@@ -65,6 +66,7 @@ static inline void w_c0_ ## r ## n(unsigned int value)                        \
        default:                                                        \
                BUG();                                                  \
        }                                                               \
+       return;                                                         \
 }                                                                      \
 
 __define_perf_accessors(perfcntr, 0, 2)