The patch titled Subject: powerpc-add-running_clock-for-powerpc-to-prevent-spurious-softlockup-warnings-fix has been removed from the -mm tree. Its filename was powerpc-add-running_clock-for-powerpc-to-prevent-spurious-softlockup-warnings-fix.patch This patch was dropped because it was folded into powerpc-add-running_clock-for-powerpc-to-prevent-spurious-softlockup-warnings.patch ------------------------------------------------------ From: Cyril Bur <cyrilbur@xxxxxxxxx> Subject: powerpc-add-running_clock-for-powerpc-to-prevent-spurious-softlockup-warnings-fix Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/powerpc/kernel/time.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN arch/powerpc/kernel/time.c~powerpc-add-running_clock-for-powerpc-to-prevent-spurious-softlockup-warnings-fix arch/powerpc/kernel/time.c --- a/arch/powerpc/kernel/time.c~powerpc-add-running_clock-for-powerpc-to-prevent-spurious-softlockup-warnings-fix +++ a/arch/powerpc/kernel/time.c @@ -636,8 +636,8 @@ unsigned long long running_clock(void) * timebase into the VTB when it takes a guest off the CPU, reading the * VTB would result in reading 'last switched out' guest VTB. * - * Host kernels are often compiled with CONFIG_PSERIES checked, it would - * be unsafe to rely only on the #ifdef above. + * Host kernels are often compiled with CONFIG_PPC_PSERIES checked, it + * would be unsafe to rely only on the #ifdef above. */ if (firmware_has_feature(FW_FEATURE_LPAR) && cpu_has_feature(CPU_FTR_ARCH_207S)) _ Patches currently in -mm which might be from cyrilbur@xxxxxxxxx are origin.patch add-another-clock-for-use-with-the-soft-lockup-watchdog.patch powerpc-add-running_clock-for-powerpc-to-prevent-spurious-softlockup-warnings.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