Skip to content

Commit

Permalink
dell-laptop: Fix build error by making buffer_mutex static
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ingo Molnar authored and Matthew Garrett committed Mar 1, 2010
1 parent 30ff056 commit 94d8f78
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/platform/x86/dell-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 94d8f78

Please sign in to comment.