diff options
| author | Matt Tolentino <metolent@cs.vt.edu> | 2006-01-17 07:03:44 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-16 23:18:35 -0800 |
| commit | c09b42404d29c8a9266f8186632330dc8474bf2e (patch) | |
| tree | 26477ddbd49e6de7ef16e21d7a7440b9b9f11c57 /arch/i386 | |
| parent | 44df75e629106efcada087cead6c3f33ed6bcc60 (diff) | |
[PATCH] x86_64: add __meminit for memory hotplug
Add __meminit to the __init lineup to ensure functions default
to __init when memory hotplug is not enabled. Replace __devinit
with __meminit on functions that were changed when the memory
hotplug code was introduced.
Signed-off-by: Matt Tolentino <matthew.e.tolentino@intel.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c index 7df494b51a5..2700f01994b 100644 --- a/arch/i386/mm/init.c +++ b/arch/i386/mm/init.c @@ -268,7 +268,7 @@ static void __init permanent_kmaps_init(pgd_t *pgd_base) pkmap_page_table = pte; } -static void __devinit free_new_highpage(struct page *page) +static void __meminit free_new_highpage(struct page *page) { set_page_count(page, 1); __free_page(page); |