The patch titled
Subject: powerpc: merge fix for watchdog_enable_hardlockup_detector API change
has been added to the -mm tree. Its filename is
powerpc-merge-fix-for-watchdog_enable_hardlockup_detector-api-change.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/powerpc-merge-fix-for-watchdog_enable_hardlockup_detector-api-change.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/powerpc-merge-fix-for-watchdog_enable_hardlockup_detector-api-change.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Subject: powerpc: merge fix for watchdog_enable_hardlockup_detector API change
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/powerpc/kernel/setup_64.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN arch/powerpc/kernel/setup_64.c~powerpc-merge-fix-for-watchdog_enable_hardlockup_detector-api-change arch/powerpc/kernel/setup_64.c
--- a/arch/powerpc/kernel/setup_64.c~powerpc-merge-fix-for-watchdog_enable_hardlockup_detector-api-change
+++ a/arch/powerpc/kernel/setup_64.c
@@ -793,7 +793,7 @@ u64 hw_nmi_get_sample_period(int watchdo
*/
static int __init disable_hardlockup_detector(void)
{
- watchdog_enable_hardlockup_detector(false);
+ hardlockup_detector_disable();
return 0;
}
_
Patches currently in -mm which might be from sfr@xxxxxxxxxxxxxxxx are
mm-cma-release-trigger-fixpatch.patch
lib-add-huge-i-o-map-capability-interfaces-fix.patch
mm-change-ioremap-to-set-up-huge-i-o-mappings-fix.patch
zsmalloc-support-compaction-fix.patch
zsmalloc-remove-extra-cond_resched-in-__zs_compact.patch
fs-fat-remove-unnecessary-includes-fix-2.patch
mm-rcu-protected-get_mm_exe_file-fix.patch
linux-next.patch
powerpc-merge-fix-for-watchdog_enable_hardlockup_detector-api-change.patch
kernel-forkc-export-kernel_thread-to-modules.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
