Merge branch 'x86/urgent' into x86/pat

Reason: Change to is_new_memtype_allowed() in x86/urgent

Resolved semantic conflicts in:

	 arch/x86/mm/pat.c
	 arch/x86/mm/ioremap.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

1 files changed, 0 insertions, 5 deletions

diff --git a/arch/x86/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c
index 8100a29c854f..392bea43b890 100644
--- a/arch/x86/kernel/cpu/perfctr-watchdog.c
+++ b/arch/x86/kernel/cpu/perfctr-watchdog.c
@@ -804,8 +804,3 @@ int __kprobes lapic_wd_event(unsigned nmi_hz)
         wd_ops->rearm(wd, nmi_hz);
         return 1;
 }
-
-int lapic_watchdog_ok(void)
-{
-        return wd_ops != NULL;
-}