x86: nmi_32/64.c - use apic_write_around instead of apic_write

apic_write_around will be expanded to apic_write in 64bit mode
anyway. Only a few CPUs (well, old CPUs to be precise) requires
such an action. In general it should not hurt and could be cleaned
up for apic_write (just in case)

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: hpa@zytor.com
Cc: mingo@redhat.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --cc arch/x86/kernel/nmi_32.c
Simple merge

diff --cc arch/x86/kernel/nmi_64.c
Simple merge