diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-09-17 17:40:19 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-09-17 17:40:49 -0400 |
| commit | 3bb045f1e2e51124200ef043256df4c7ad86bebd (patch) | |
| tree | 78e4150fc7108bef4d8fa183d7f7dc00beb73a54 /arch/x86/kernel/dumpstack.c | |
| parent | 80938332d8cf652f6b16e0788cf0ca136befe0b5 (diff) | |
| parent | dcb73bf402e0d5b28ce925dbbe4dab3b00b21eee (diff) | |
Merge branch 'x86/pat' into x86/urgent
Merge reason:
Suresh Siddha (1):
x86, pat: don't use rb-tree based lookup in reserve_memtype()
... requires previous x86/pat commits already pushed to Linus.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/dumpstack.c')
| -rw-r--r-- | arch/x86/kernel/dumpstack.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index c8405718a4c3..2d8a371d4339 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/bug.h> | 15 | #include <linux/bug.h> |
| 16 | #include <linux/nmi.h> | 16 | #include <linux/nmi.h> |
| 17 | #include <linux/sysfs.h> | 17 | #include <linux/sysfs.h> |
| 18 | #include <linux/ftrace.h> | ||
| 19 | 18 | ||
| 20 | #include <asm/stacktrace.h> | 19 | #include <asm/stacktrace.h> |
| 21 | 20 | ||