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()

+1 -1
+1 -1
include/linux/kernel.h
··· 60 #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) 61 #define roundup(x, y) ( \ 62 { \ 63 - typeof(y) __y = y; \ 64 (((x) + (__y - 1)) / __y) * __y; \ 65 } \ 66 )
··· 60 #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) 61 #define roundup(x, y) ( \ 62 { \ 63 + const typeof(y) __y = y; \ 64 (((x) + (__y - 1)) / __y) * __y; \ 65 } \ 66 )