diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:05:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:05:45 -0400 |
| commit | 3ce9bcb583536c45a46c7302747029450e22279c (patch) | |
| tree | 7a4167189ffc6dc909151d1a5d040f9f0656a9f4 /arch/sparc64/mm/init.c | |
| parent | 26fd10517e810dd59ea050b052de24a75ee6dc07 (diff) | |
| parent | f7d0b926ac8c8ec0c7a83ee69409bd2e6bb39f81 (diff) | |
Merge branch 'core/xen' into x86/xen
Diffstat (limited to 'arch/sparc64/mm/init.c')
| -rw-r--r-- | arch/sparc64/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index b4aeb0f696dc..a41df7bef035 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c | |||
| @@ -1843,7 +1843,7 @@ static int pavail_rescan_ents __initdata; | |||
| 1843 | * memory list again, and make sure it provides at least as much | 1843 | * memory list again, and make sure it provides at least as much |
| 1844 | * memory as 'pavail' does. | 1844 | * memory as 'pavail' does. |
| 1845 | */ | 1845 | */ |
| 1846 | static void setup_valid_addr_bitmap_from_pavail(void) | 1846 | static void __init setup_valid_addr_bitmap_from_pavail(void) |
| 1847 | { | 1847 | { |
| 1848 | int i; | 1848 | int i; |
| 1849 | 1849 | ||