diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-03-01 15:43:52 +0100 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2010-03-01 15:43:52 +0100 |
| commit | 94d8f785dd1f021c1971df73e6437f000c0d9449 (patch) | |
| tree | d73b42a1cfac190234be138e352b531f07ddec68 | |
| parent | Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | linux-94d8f785dd1f021c1971df73e6437f000c0d9449.tar.xz linux-94d8f785dd1f021c1971df73e6437f000c0d9449.zip | |
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>
| -rw-r--r-- | 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 b7f4d2705916..29d96a4f5769 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; |