The patch titled ia64 UV: use blinking LED for heartbeat display fix has been added to the -mm tree. Its filename is ia64-uv-use-blinking-led-for-heartbeat-display-fix.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 *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: ia64 UV: use blinking LED for heartbeat display fix From: Mike Travis <travis@xxxxxxx> Fix error not caught on initial build test. Signed-off-by: Mike Travis <travis@xxxxxxx> Cc: Tony Luck <tony.luck@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/ia64/uv/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN arch/ia64/uv/kernel/setup.c~ia64-uv-use-blinking-led-for-heartbeat-display-fix arch/ia64/uv/kernel/setup.c --- a/arch/ia64/uv/kernel/setup.c~ia64-uv-use-blinking-led-for-heartbeat-display-fix +++ a/arch/ia64/uv/kernel/setup.c @@ -71,7 +71,7 @@ static void uv_display_heartbeat(void) { int cpu; - uv_hub_info->uv_heartbeat = nr_cpu_ids; + uv_hub_info->led_heartbeat_count = nr_cpu_ids; for_each_online_cpu(cpu) { struct uv_hub_info_s *hub = uv_cpu_hub_info(cpu); _ Patches currently in -mm which might be from travis@xxxxxxx are linux-next.patch zero-based-percpu-use-vmlinux_symbol-in-include-asm-generic-vmlinuxldsh.patch seq_file-add-seq_cpumask-seq_nodemask.patch switch-proc-irq-smp_affinity-et-al-to-seqfiles.patch cpuset-use-seq_cpumask-seq_nodemask.patch x86_64-uv-provide-a-led-driver-for-uv-systems.patch x86_64-uv-use-led-to-indicate-cpu-is-active.patch x86_64-uv-use-blinking-led-for-heartbeat-display.patch ia64-uv-provide-a-led-driver-for-uv-systems.patch ia64-uv-use-led-to-indicate-cpu-is-active.patch ia64-uv-use-blinking-led-for-heartbeat-display.patch ia64-uv-use-blinking-led-for-heartbeat-display-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