The patch titled i386, x86_64: comment magic constants in delay.h has been added to the -mm tree. Its filename is i386-x86_64-comment-magic-constants-in-delayh.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: i386, x86_64: comment magic constants in delay.h From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx> For both i386 and x86_64, copy from arch/$ARCH/lib/delay.c comments about the used magic constants, plus a few other niceties. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx> Cc: Andi Kleen <ak@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- include/asm-i386/delay.h | 5 ++++- include/asm-x86_64/delay.h | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff -puN include/asm-i386/delay.h~i386-x86_64-comment-magic-constants-in-delayh include/asm-i386/delay.h --- a/include/asm-i386/delay.h~i386-x86_64-comment-magic-constants-in-delayh +++ a/include/asm-i386/delay.h @@ -7,6 +7,7 @@ * Delay routines calling functions in arch/i386/lib/delay.c */ +/* Undefined functions to get compile-time errors */ extern void __bad_udelay(void); extern void __bad_ndelay(void); @@ -15,10 +16,12 @@ extern void __ndelay(unsigned long nsecs extern void __const_udelay(unsigned long usecs); extern void __delay(unsigned long loops); +/* 0x10c7 is 2**32 / 1000000 (rounded up) */ #define udelay(n) (__builtin_constant_p(n) ? \ ((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c7ul)) : \ __udelay(n)) - + +/* 0x5 is 2**32 / 1000000000 (rounded up) */ #define ndelay(n) (__builtin_constant_p(n) ? \ ((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \ __ndelay(n)) diff -puN include/asm-x86_64/delay.h~i386-x86_64-comment-magic-constants-in-delayh include/asm-x86_64/delay.h --- a/include/asm-x86_64/delay.h~i386-x86_64-comment-magic-constants-in-delayh +++ a/include/asm-x86_64/delay.h @@ -7,18 +7,21 @@ * Delay routines calling functions in arch/x86_64/lib/delay.c */ +/* Undefined functions to get compile-time errors */ extern void __bad_udelay(void); extern void __bad_ndelay(void); extern void __udelay(unsigned long usecs); -extern void __ndelay(unsigned long usecs); +extern void __ndelay(unsigned long nsecs); extern void __const_udelay(unsigned long usecs); extern void __delay(unsigned long loops); +/* 0x10c7 is 2**32 / 1000000 (rounded up) */ #define udelay(n) (__builtin_constant_p(n) ? \ ((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c7ul)) : \ __udelay(n)) +/* 0x5 is 2**32 / 1000000000 (rounded up) */ #define ndelay(n) (__builtin_constant_p(n) ? \ ((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \ __ndelay(n)) _ Patches currently in -mm which might be from blaisorblade@xxxxxxxx are fix-remove-the-use-of-_syscallx-macros-in-uml.patch uml-fix-compilation-options-for-user_objs.patch uml-ubd-driver-allow-using-up-to-16-ubd-devices.patch uml-ubd-driver-document-some-struct-fields.patch uml-ubd-driver-var-renames.patch uml-ubd-driver-give-better-names-to-some-functions.patch uml-ubd-driver-change-ubd_lock-to-be-a-mutex.patch uml-ubd-driver-ubd_io_lock-usage-fixup.patch uml-ubd-driver-reformat-ubd_config.patch uml-ubd-driver-convert-do_ubd-to-a-boolean-variable.patch uml-ubd-driver-use-bitfields-where-possible.patch uml-ubd-driver-do-not-store-error-codes-as-fd.patch uml-ubd-driver-various-little-changes.patch make-x86_64-udelay-round-up-instead-of-down.patch i386-x86_64-comment-magic-constants-in-delayh.patch uml-fix-prototypes.patch uml-make-execvp-safe-for-our-usage.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html