The patch titled
slow-down-printk-during-boot-fix
has been added to the -mm tree. Its filename is
slow-down-printk-during-boot-fix.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: slow-down-printk-during-boot-fix
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Not all architectures implement CONFIG_HZ.
Cc: Dave Jones <davej@xxxxxxxxxx>
Cc: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/printk.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN kernel/printk.c~slow-down-printk-during-boot-fix kernel/printk.c
--- a/kernel/printk.c~slow-down-printk-during-boot-fix
+++ a/kernel/printk.c
@@ -172,7 +172,7 @@ unsigned long long printk_delay_msec; /*
static int __init boot_delay_setup(char *str)
{
unsigned long lpj = preset_lpj ? preset_lpj : 1000000; /* some guess */
- unsigned long long loops_per_msec = lpj / 1000 * CONFIG_HZ;
+ unsigned long long loops_per_msec = lpj / 1000 * HZ;
get_option(&str, &boot_delay);
if (boot_delay > 10 * 1000)
@@ -180,8 +180,8 @@ static int __init boot_delay_setup(char
printk_delay_msec = loops_per_msec;
printk(KERN_DEBUG "boot_delay: %u, preset_lpj: %ld, lpj: %lu, "
- "CONFIG_HZ: %d, printk_delay_msec: %llu\n",
- boot_delay, preset_lpj, lpj, CONFIG_HZ, printk_delay_msec);
+ "HZ: %d, printk_delay_msec: %llu\n",
+ boot_delay, preset_lpj, lpj, HZ, printk_delay_msec);
return 1;
}
__setup("boot_delay=", boot_delay_setup);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
mm-merge-populate-and-nopage-into-fault-fixes-nonlinear.patch
mm-fault-feedback-2.patch
freezer-run-show_state-when-freezing-times-out.patch
pm-introduce-hibernation-and-suspend-notifiers.patch
pm-disable-usermode-helper-before-hibernation-and-suspend.patch
slow-down-printk-during-boot-fix.patch
kernel-doc-fix-leading-dot-in-man-mode-output.patch
coredump-masking-reimplementation-of-dumpable-using-two-flags.patch
lockstat-core-infrastructure.patch
lockstat-human-readability-tweaks.patch
lockdep-various-fixes.patch
lockstat-measure-lock-bouncing.patch
some-kmalloc-memset-kzalloc-tree-wide.patch
dequeue_huge_page-warning-fix.patch
lguest-the-host-code.patch
lguest-the-net-driver.patch
drivers-edac-new-i82443bxgz-mc-driver-broken.patch
drivers-edac-fix-e752x-reversed-csrows-fix.patch
drivers-edac-new-pasemi-driver-fix.patch
drivers-edac-new-i82975x-driver-fix.patch
kernel-sysctlc-finish-off-the-warning-comments.patch
afs-build-fix.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
