OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'char-misc-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[uclinux-h8/linux.git]
/
arch
/
x86
/
kernel
/
crash.c
diff --git
a/arch/x86/kernel/crash.c
b/arch/x86/kernel/crash.c
index
e068d66
..
74ca2fe
100644
(file)
--- a/
arch/x86/kernel/crash.c
+++ b/
arch/x86/kernel/crash.c
@@
-185,10
+185,9
@@
void native_machine_crash_shutdown(struct pt_regs *regs)
}
#ifdef CONFIG_KEXEC_FILE
}
#ifdef CONFIG_KEXEC_FILE
-static int get_nr_ram_ranges_callback(unsigned long start_pfn,
- unsigned long nr_pfn, void *arg)
+static int get_nr_ram_ranges_callback(u64 start, u64 end, void *arg)
{
{
- int *nr_ranges = arg;
+
unsigned
int *nr_ranges = arg;
(*nr_ranges)++;
return 0;
(*nr_ranges)++;
return 0;
@@
-214,7
+213,7
@@
static void fill_up_crash_elf_data(struct crash_elf_data *ced,
ced->image = image;
ced->image = image;
- walk_system_ram_r
ange
(0, -1, &nr_ranges,
+ walk_system_ram_r
es
(0, -1, &nr_ranges,
get_nr_ram_ranges_callback);
ced->max_nr_ranges = nr_ranges;
get_nr_ram_ranges_callback);
ced->max_nr_ranges = nr_ranges;