diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-03 14:49:26 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-03 14:49:26 -0700 |
commit | 57a9d89dc093d86920748fa706fd55f4fcd2399a (patch) | |
tree | 9f0e1fe5ffb42713f381739d0140e8ae677375e3 /include | |
parent | 567cfea99af61ef19da42f8491da98cf94a4d166 (diff) | |
parent | e9637415a92cf25ad800b7fdeddcd30cce7b44ab (diff) | |
download | linux-57a9d89dc093d86920748fa706fd55f4fcd2399a.tar.gz linux-57a9d89dc093d86920748fa706fd55f4fcd2399a.tar.bz2 linux-57a9d89dc093d86920748fa706fd55f4fcd2399a.zip |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block layer fix from Jens Axboe:
"Just one patch in this pull request, fixing a regression caused by a
'mathematically correct' change to lcm()"
* 'for-linus' of git://git.kernel.dk/linux-block:
block: fix blk_stack_limits() regression due to lcm() change
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/lcm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/lcm.h b/include/linux/lcm.h index 7bf01d779b45..1ce79a7f1daa 100644 --- a/include/linux/lcm.h +++ b/include/linux/lcm.h @@ -4,5 +4,6 @@ #include <linux/compiler.h> unsigned long lcm(unsigned long a, unsigned long b) __attribute_const__; +unsigned long lcm_not_zero(unsigned long a, unsigned long b) __attribute_const__; #endif /* _LCM_H */ |