[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-03787ceed8f7bf06af29f3b213017d89f8e9423d@git.kernel.org>
Date: Tue, 3 Mar 2009 14:36:31 GMT
From: Ingo Molnar <mingo@...e.hu>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
penberg@...helsinki.fi, tglx@...utronix.de, mingo@...e.hu
Subject: [tip:x86/mm] x86: set_highmem_pages_init() cleanup, fix !CONFIG_NUMA && CONFIG_HIGHMEM=y
Commit-ID: 03787ceed8f7bf06af29f3b213017d89f8e9423d
Gitweb: http://git.kernel.org/tip/03787ceed8f7bf06af29f3b213017d89f8e9423d
Author: "Ingo Molnar" <mingo@...e.hu>
AuthorDate: Tue, 3 Mar 2009 15:32:24 +0100
Commit: Ingo Molnar <mingo@...e.hu>
CommitDate: Tue, 3 Mar 2009 15:32:24 +0100
x86: set_highmem_pages_init() cleanup, fix !CONFIG_NUMA && CONFIG_HIGHMEM=y
Impact: build fix
arch/x86/mm/highmem_32.c:187: error: static declaration of 'set_highmem_pages_init' follows non-static declaration
arch/x86/include/asm/numa_32.h:8: error: previous declaration of 'set_highmem_pages_init' was here
Signed-off-by: Pekka Enberg <penberg@...helsinki.fi>
LKML-Reference: <1236082212.2675.24.camel@...berg-laptop>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/mm/highmem_32.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
index 13a823c..00f127c 100644
--- a/arch/x86/mm/highmem_32.c
+++ b/arch/x86/mm/highmem_32.c
@@ -183,7 +183,7 @@ void __init set_highmem_pages_init(void)
totalram_pages += totalhigh_pages;
}
#else
-static void __init set_highmem_pages_init(void)
+void __init set_highmem_pages_init(void)
{
add_highpages_with_active_regions(0, highstart_pfn, highend_pfn);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists