Commit a480222f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull header documentation fix from Ingo Molnar:
 "Fix the parameter description <asm-generic/div64.h>"

* 'core-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  asm-generic/div64: Fix documentation of do_div() parameter
parents cef72982 e8e4eb0f

include/asm-generic/div64.h

+3 −3
Original line number Diff line number Diff line
@@ -28,12 +28,12 @@ 


/**

 * do_div - returns 2 values: calculate remainder and update new dividend

 * @n: pointer to uint64_t dividend (will be updated)

 * @n: uint64_t dividend (will be updated)

 * @base: uint32_t divisor

 *

 * Summary:

 * ``uint32_t remainder = *n % base;``

 * ``*n = *n / base;``

 * ``uint32_t remainder = n % base;``

 * ``n = n / base;``

 *

 * Return: (uint32_t)remainder

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE