diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /mm/nobootmem.c | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'mm/nobootmem.c')
| -rw-r--r-- | mm/nobootmem.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/mm/nobootmem.c b/mm/nobootmem.c index e2bdb07079ce..e99f6cd1da1f 100644 --- a/mm/nobootmem.c +++ b/mm/nobootmem.c | |||
| @@ -32,14 +32,6 @@ unsigned long max_low_pfn; | |||
| 32 | unsigned long min_low_pfn; | 32 | unsigned long min_low_pfn; |
| 33 | unsigned long max_pfn; | 33 | unsigned long max_pfn; |
| 34 | 34 | ||
| 35 | #ifdef CONFIG_CRASH_DUMP | ||
| 36 | /* | ||
| 37 | * If we have booted due to a crash, max_pfn will be a very low value. We need | ||
| 38 | * to know the amount of memory that the previous kernel used. | ||
| 39 | */ | ||
| 40 | unsigned long saved_max_pfn; | ||
| 41 | #endif | ||
| 42 | |||
| 43 | static void * __init __alloc_memory_core_early(int nid, u64 size, u64 align, | 35 | static void * __init __alloc_memory_core_early(int nid, u64 size, u64 align, |
| 44 | u64 goal, u64 limit) | 36 | u64 goal, u64 limit) |
| 45 | { | 37 | { |