Commit-ID: b76a06e08d94b2a63e47837dfe46bbbf0a3af6c2 Gitweb: http://git.kernel.org/tip/b76a06e08d94b2a63e47837dfe46bbbf0a3af6c2 Author: Anton Blanchard <anton@xxxxxxxxx> AuthorDate: Sun, 8 May 2011 19:32:36 -0400 Committer: Robert Richter <robert.richter@xxxxxxx> CommitDate: Tue, 24 May 2011 12:45:59 +0200 oprofile: Use linux/mutex.h The oprofile code is still including asm/mutex.h instead of linux/mutex.h. Signed-off-by: Anton Blanchard <anton@xxxxxxxxx> Signed-off-by: Robert Richter <robert.richter@xxxxxxx> --- drivers/oprofile/event_buffer.h | 2 +- drivers/oprofile/oprof.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/oprofile/event_buffer.h b/drivers/oprofile/event_buffer.h index 4e70749..a8d5bb3 100644 --- a/drivers/oprofile/event_buffer.h +++ b/drivers/oprofile/event_buffer.h @@ -11,7 +11,7 @@ #define EVENT_BUFFER_H #include <linux/types.h> -#include <asm/mutex.h> +#include <linux/mutex.h> int alloc_event_buffer(void); diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c index f9bda64..dccd863 100644 --- a/drivers/oprofile/oprof.c +++ b/drivers/oprofile/oprof.c @@ -14,7 +14,7 @@ #include <linux/moduleparam.h> #include <linux/workqueue.h> #include <linux/time.h> -#include <asm/mutex.h> +#include <linux/mutex.h> #include "oprof.h" #include "event_buffer.h" -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|