summaryrefslogtreecommitdiff
path: root/arch/x86/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 03:24:24 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 03:24:24 +0400
commit35c23d5d797629a83389bf5dccc5e4a7fb477504 (patch)
tree6031a0713cb1434cd9334dc23665b08d43738313 /arch/x86/include
parent57935b262c40a3cbe54c5a61be230331a48f0a3a (diff)
parent719038de98bc8479b771c582a1e4a1e86079da22 (diff)
downloadlinux-35c23d5d797629a83389bf5dccc5e4a7fb477504.tar.xz
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cpu updates from Ingo Molnar: "Two changes: - Extend 32-bit double fault debugging aid to 64-bit - Fix a build warning" * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/intel/cacheinfo: Shut up last long-standing warning x86: Extend #DF debugging aid to 64-bit
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/processor.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 22224b3b43bb..5b87d52eed0b 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -981,5 +981,5 @@ bool xen_set_default_idle(void);
#endif
void stop_this_cpu(void *dummy);
-
+void df_debug(struct pt_regs *regs, long error_code);
#endif /* _ASM_X86_PROCESSOR_H */