Commit 94d8f785 authored by Ingo Molnar's avatar Ingo Molnar Committed by Matthew Garrett

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:

  116ee77b: 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: default avatarIngo Molnar <mingo@elte.hu>
parent 30ff056c
...@@ -132,8 +132,8 @@ static struct dmi_system_id __devinitdata dell_blacklist[] = { ...@@ -132,8 +132,8 @@ static struct dmi_system_id __devinitdata dell_blacklist[] = {
}; };
static struct calling_interface_buffer *buffer; static struct calling_interface_buffer *buffer;
struct page *bufferpage; static struct page *bufferpage;
DEFINE_MUTEX(buffer_mutex); static DEFINE_MUTEX(buffer_mutex);
static int hwswitch_state; static int hwswitch_state;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment