aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-08 18:30:11 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-08 18:30:11 -0800
commit814ce2521121c2459e16cea8c7221e157edbeddd (patch)
tree50c04090f09d6d9e491b3ecd1af5ff14b474e70b
parent0e15482566b752718e7225168380904f1d0cdfa3 (diff)
parent6070bf3596f3b5a54091a08d5b2bc90c143dc264 (diff)
downloadlinaro-lsk-814ce2521121c2459e16cea8c7221e157edbeddd.tar.gz
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()
-rw-r--r--include/linux/kernel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 450092c1e35..b526947bdf4 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -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; \
} \
)