Merge commit 'v3.0' into x86/vdso

[pandora-kernel.git] / include / linux / average.h

diff --git a/include/linux/average.h b/include/linux/average.h
index 7706e40..c6028fd 100644 (file)
--- a/include/linux/average.h
+++ b/include/linux/average.h
@@ -1,8 +1,6 @@
 #ifndef _LINUX_AVERAGE_H
 #define _LINUX_AVERAGE_H
 
-#include <linux/kernel.h>
-
 /* Exponentially weighted moving average (EWMA) */
 
 /* For more documentation see lib/average.c */
@@ -26,7 +24,7 @@ extern struct ewma *ewma_add(struct ewma *avg, unsigned long val);
  */
 static inline unsigned long ewma_read(const struct ewma *avg)
 {
-       return DIV_ROUND_CLOSEST(avg->internal, avg->factor);
+       return avg->internal >> avg->factor;
 }
 
 #endif /* _LINUX_AVERAGE_H */