From 7160ae76e5ecba9a6c9dfe8795565ded52d484aa Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 15 Nov 2011 14:48:56 -0800 Subject: [PATCH] --- yaml --- r: 283523 b: refs/heads/master c: 706d9a9c8b5758390036b9980a2b12d809599777 h: refs/heads/master i: 283521: b88ca01ea9a643a3cf9495b4469010ca0a5f4de1 283519: f303c8b3a980d884776f688ac7ce7a5d2bef6fed v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/e820.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5fa36aa5dffe..01cf22de430c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1bbdd669298b7ca08284ddb29153dfc039dd89d +refs/heads/master: 706d9a9c8b5758390036b9980a2b12d809599777 diff --git a/trunk/arch/x86/kernel/e820.c b/trunk/arch/x86/kernel/e820.c index f655f802260d..d6bd85352c81 100644 --- a/trunk/arch/x86/kernel/e820.c +++ b/trunk/arch/x86/kernel/e820.c @@ -296,7 +296,7 @@ int __init sanitize_e820_map(struct e820entry *biosmap, int max_nr_map, chg_nr = chgidx; /* sort change-point list by memory addresses (low -> high) */ - sort(change_point, chg_nr, sizeof *change_point, cpcompare, 0); + sort(change_point, chg_nr, sizeof *change_point, cpcompare, NULL); /* create a new bios memory map, removing overlaps */ overlap_entries = 0; /* number of entries in the overlap table */