Commit c7c6bf1e authored Sep 06, 2012 by Linus Torvalds

linux-staging

Pull a hwmon fix from Guenter Roeck:
 "One patch, fixing DIV_ROUND_CLOSEST to support negative dividends.

  While the changes are not in the drivers/hwmon directory, the problem
  primarily affects hwmon drivers, and it makes sense to push the patch
  through the hwmon tree."

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  linux/kernel.h: Fix DIV_ROUND_CLOSEST to support negative dividends

parents bd12ce8c b6d86d3d

include/linux/kernel.h

+10 −2

Original line number	Diff line number	Diff line
		@@ -82,10 +82,18 @@
		__x - (__x % (y)); \
		} \
		)

		/*
		* Divide positive or negative dividend by positive divisor and round
		* to closest integer. Result is undefined for negative divisors.
		*/
		#define DIV_ROUND_CLOSEST(x, divisor)( \
		{ \
		typeof(divisor) __divisor = divisor; \
		(((x) + ((__divisor) / 2)) / (__divisor)); \
		typeof(x) __x = x; \
		typeof(divisor) __d = divisor; \
		(((typeof(x))-1) >= 0 \|\| (__x) >= 0) ? \
		(((__x) + ((__d) / 2)) / (__d)) : \
		(((__x) - ((__d) / 2)) / (__d)); \
		} \
		)