From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
To: x86@kernel.org
Cc: linux-kernel@vger.kernel.org,
Matthew Garrett <mjg59@srcf.ucam.org>, Jim Bos <jim876@xs4all.nl>,
Maarten Lankhorst <m.b.lankhorst@gmail.com>
Subject: [PATCH] x86, efi: free memory with the correct call
Date: Mon, 6 Jun 2011 17:56:53 +0200 [thread overview]
Message-ID: <1307375813-14438-1-git-send-email-m.b.lankhorst@gmail.com> (raw)
Commit 916f676f8dc introduced a call to free_bootmem_late while it
reserves memory with memblock_x64_reserve_range
Fix this call to silence the swapper BUGs:
BUG: Bad page state in process swapper pfn:00000
Signed-off-by: Maarten Lankhorst <m.b.lankhorst@gmail.com>
Tested-by: Jim Bos <jim876@xs4all.nl>
---
arch/x86/platform/efi/efi.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 0d3a4fa..d2eefaa 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -29,7 +29,6 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/efi.h>
-#include <linux/bootmem.h>
#include <linux/memblock.h>
#include <linux/spinlock.h>
#include <linux/uaccess.h>
@@ -334,7 +333,7 @@ static void __init efi_free_boot_services(void)
md->type != EFI_BOOT_SERVICES_DATA)
continue;
- free_bootmem_late(start, size);
+ memblock_x86_free_memory_in_range(start, start + size);
}
}
--
1.7.4.1
reply other threads:[~2011-06-06 15:57 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1307375813-14438-1-git-send-email-m.b.lankhorst@gmail.com \
--to=m.b.lankhorst@gmail.com \
--cc=jim876@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=mjg59@srcf.ucam.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome