Commit 814ce252 authored by Linus Torvalds's avatar 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
...@@ -60,7 +60,7 @@ extern const char linux_proc_banner[]; ...@@ -60,7 +60,7 @@ extern const char linux_proc_banner[];
#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
#define roundup(x, y) ( \ #define roundup(x, y) ( \
{ \ { \
typeof(y) __y = y; \ const typeof(y) __y = y; \
(((x) + (__y - 1)) / __y) * __y; \ (((x) + (__y - 1)) / __y) * __y; \
} \ } \
) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment