The patch titled
Subject: powerpc: merge fix for watchdog_enable_hardlockup_detector API change
has been removed from the -mm tree. Its filename was
powerpc-merge-fix-for-watchdog_enable_hardlockup_detector-api-change.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
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
origin.patch
linux-next.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
