History

Merge branch 'x86-kdump-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull kdump fixes from Peter Anvin: "The kexec/kdump people have found several problems with the support for loading over 4 GiB that was introduced in this merge cycle. This is partly due to a number of design problems inherent in the way the various pieces of kdump fit together (it is pretty horrifically manual in many places.) After a *lot* of iterations this is the patchset that was agreed upon, but of course it is now very late in the cycle. However, because it changes both the syntax and semantics of the crashkernel option, it would be desirable to avoid a stable release with the broken interfaces." I'm not happy with the timing, since originally the plan was to release the final 3.9 tomorrow. But apparently I'm doing an -rc8 instead... * 'x86-kdump-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: kexec: use Crash kernel for Crash kernel low x86, kdump: Change crashkernel_high/low= to crashkernel=,high/low x86, kdump: Retore crashkernel= to allocate under 896M x86, kdump: Set crashkernel_low automatically

Linus Torvalds committed 13 years ago

Commit 830ac852 parents db93f8b 157752d6 files · +180 −28Browse files

Showing the changes to include/linux (2 of 6 files). Show all

Unified · Split

2 files
  1. include/linux/kexec.h +2 −0
  2. include/linux/swiotlb.h +1 −0
include/linux/kexec.h+2−0
@@ -200,6 +200,8 @@ extern size_t vmcoreinfo_max_size; · 199 unmodified lines
200200
201201 int __init parse_crashkernel(char *cmdline, unsigned long long system_ram,
202202 unsigned long long *crash_size, unsigned long long *crash_base);
203+int parse_crashkernel_high(char *cmdline, unsigned long long system_ram,
204+ unsigned long long *crash_size, unsigned long long *crash_base);
203205 int parse_crashkernel_low(char *cmdline, unsigned long long system_ram,
204206 unsigned long long *crash_size, unsigned long long *crash_base);
205207 int crash_shrink_memory(unsigned long new_size);
include/linux/swiotlb.h+1−0
@@ -25,6 +25,7 @@ extern int swiotlb_force; · 24 unmodified lines
2525 extern void swiotlb_init(int verbose);
2626 int swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose);
2727 extern unsigned long swiotlb_nr_tbl(void);
28+unsigned long swiotlb_size_or_default(void);
2829 extern int swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs);
2930
3031 /*