Commit 814ce252 authored Nov 08, 2010 by Linus Torvalds

Merge branch 'for-linus' of...

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  kernel: Constify temporary variable in roundup()

parents 0e154825 6070bf35

include/linux/kernel.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ extern const char linux_proc_banner[];
		#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
		#define roundup(x, y) ( \
		{ \
		typeof(y) __y = y; \
		const typeof(y) __y = y; \
		(((x) + (__y - 1)) / __y) * __y; \
		} \
		)