Messages in this thread Patch in this message | | | Date | Sun, 28 Feb 2010 20:59:11 +0100 | From | Ingo Molnar <> | Subject | tip: origin tree build failure |
| |
* Matthew Garrett <mjg@redhat.com> wrote:
> dell-laptop: Use buffer with 32-bit physical address
Hi, this commit introduced an allyesconfig build bug - fixed via the patch below.
Thanks,
Ingo
------------------> From 03894dc8462f82c145ec1c3aced9b0718ae4e9ed Mon Sep 17 00:00:00 2001 From: Ingo Molnar <mingo@elte.hu> Date: Sun, 28 Feb 2010 20:55:41 +0100 Subject: [PATCH] dell-laptop: Fix build error by making buffer_mutex static
The following build bug (x86, allyesconfig):
arch/x86/oprofile/built-in.o:(.data+0x250): multiple definition of `buffer_mutex'
Was triggered in -tip testing, caused by this upstream commit:
116ee77: dell-laptop: Use buffer with 32-bit physical address
There's multiple buffer_mutex's in the kernel. Make this new one static.
Signed-off-by: Ingo Molnar <mingo@elte.hu> --- drivers/platform/x86/dell-laptop.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index b7f4d27..29d96a4 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c @@ -132,8 +132,8 @@ static struct dmi_system_id __devinitdata dell_blacklist[] = { }; static struct calling_interface_buffer *buffer; -struct page *bufferpage; -DEFINE_MUTEX(buffer_mutex); +static struct page *bufferpage; +static DEFINE_MUTEX(buffer_mutex); static int hwswitch_state;
| |