lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'gcl/next' into next

Browse Source
This commit is contained in:
Benjamin Herrenschmidt
2010-08-04 10:26:03 +10:00
parent e8e5c2155b 0c2daaafcd
commit 412a4ac5e9
505 changed files with 5834 additions and 197452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/kernel/crash_dump.c
View File

@@ -13,7 +13,7 @@
#include <linux/crash_dump.h>
#include <linux/bootmem.h>
#include <linux/lmb.h>
#include <linux/memblock.h>
#include <asm/code-patching.h>
#include <asm/kdump.h>
#include <asm/prom.h>
@@ -33,7 +33,7 @@ unsigned long long elfcorehdr_addr = ELFCORE_ADDR_MAX;
#ifndef CONFIG_RELOCATABLE
void __init reserve_kdump_trampoline(void)
{
lmb_reserve(0, KDUMP_RESERVE_LIMIT);
memblock_reserve(0, KDUMP_RESERVE_LIMIT);
}
static void __init create_trampoline(unsigned long addr)