diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
| commit | 20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch) | |
| tree | b4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /mm/bootmem.c | |
| parent | dd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff) | |
| parent | 64821324ca49f24be1a66f2f432108f96a24e596 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'mm/bootmem.c')
| -rw-r--r-- | mm/bootmem.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mm/bootmem.c b/mm/bootmem.c index d213feded10d..50353e0dac12 100644 --- a/mm/bootmem.c +++ b/mm/bootmem.c | |||
| @@ -29,9 +29,7 @@ unsigned long max_low_pfn; | |||
| 29 | unsigned long min_low_pfn; | 29 | unsigned long min_low_pfn; |
| 30 | unsigned long max_pfn; | 30 | unsigned long max_pfn; |
| 31 | 31 | ||
| 32 | EXPORT_SYMBOL(max_pfn); /* This is exported so | 32 | EXPORT_UNUSED_SYMBOL(max_pfn); /* June 2006 */ |
| 33 | * dma_get_required_mask(), which uses | ||
| 34 | * it, can be an inline function */ | ||
| 35 | 33 | ||
| 36 | static LIST_HEAD(bdata_list); | 34 | static LIST_HEAD(bdata_list); |
| 37 | #ifdef CONFIG_CRASH_DUMP | 35 | #ifdef CONFIG_CRASH_DUMP |