diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-08 15:39:30 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-08 15:39:30 -0700 |
| commit | 98d86c091534f35c4bab294451ae6bccab8e9075 (patch) | |
| tree | 98c9f0b80bb078405cf173f1d5cc91c72e77082d /arch/sparc64/mm | |
| parent | d875a4b0ffad754e6d89fa561ea7dcdd79c9508b (diff) | |
| parent | 4d084617fb0d025c42c242362d1f27d337e2d407 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts:
arch/sparc/kernel/of_device.c
Diffstat (limited to 'arch/sparc64/mm')
| -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 7c3c81f60a6..4fb9de00fc8 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c @@ -1875,7 +1875,7 @@ static int pavail_rescan_ents __initdata; * memory list again, and make sure it provides at least as much * memory as 'pavail' does. */ -static void setup_valid_addr_bitmap_from_pavail(void) +static void __init setup_valid_addr_bitmap_from_pavail(void) { int i; |