diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-08 12:41:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-08 12:41:09 +0200 |
| commit | 99e711101c7822d9ddf39f16c026b97e16a9f517 (patch) | |
| tree | 97f9d3bc19a3595365e68115015e27f1d4e7009d /include/linux/util_macros.h | |
| parent | f1dc154f82595386cddcc7b980d8760474c3dd2d (diff) | |
| parent | 3e0283a53f7d2f2dae7bc4aa7f3104cb5988018f (diff) | |
Merge branch 'linus' into x86/cleanups, before applying dependent patch
Diffstat (limited to 'include/linux/util_macros.h')
| -rw-r--r-- | include/linux/util_macros.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/util_macros.h b/include/linux/util_macros.h index d5f4fb69dba3..f9b2ce58039b 100644 --- a/include/linux/util_macros.h +++ b/include/linux/util_macros.h @@ -5,7 +5,7 @@ ({ \ typeof(as) __fc_i, __fc_as = (as) - 1; \ typeof(x) __fc_x = (x); \ - typeof(*a) *__fc_a = (a); \ + typeof(*a) const *__fc_a = (a); \ for (__fc_i = 0; __fc_i < __fc_as; __fc_i++) { \ if (__fc_x op DIV_ROUND_CLOSEST(__fc_a[__fc_i] + \ __fc_a[__fc_i + 1], 2)) \ |