]>
Commit | Line | Data |
---|---|---|
e71ed1dd JB |
1 | From 82f973442d7a7fe4b08b86aeccd11ac33ecf01d1 Mon Sep 17 00:00:00 2001 |
2 | From: Gerald Van Baren <gvb@unssw.com> | |
3 | Date: Tue, 25 Oct 2011 22:17:17 -0400 | |
4 | Subject: [PATCH] Fix deprecated/removed spinlock declaration | |
5 | ||
6 | Signed-off-by: Gerald Van Baren <gvb@unssw.com> | |
7 | --- | |
8 | backfire.c | 3 +-- | |
9 | 1 files changed, 1 insertions(+), 2 deletions(-) | |
10 | ||
11 | diff --git a/backfire.c b/backfire.c | |
12 | index aaf9c4a..0e9a0df 100644 | |
13 | --- a/src/backfire/backfire.c | |
14 | +++ b/src/backfire/backfire.c | |
15 | @@ -24,7 +24,6 @@ | |
16 | #include <linux/sched.h> | |
17 | #include <linux/cpumask.h> | |
18 | #include <linux/time.h> | |
19 | -#include <linux/smp_lock.h> | |
20 | #include <linux/types.h> | |
21 | #include <linux/errno.h> | |
22 | #include <linux/miscdevice.h> | |
23 | @@ -36,7 +35,7 @@ | |
24 | ||
25 | #define BACKFIRE_MINOR MISC_DYNAMIC_MINOR | |
26 | ||
27 | -static spinlock_t backfire_state_lock = SPIN_LOCK_UNLOCKED; | |
28 | +static DEFINE_SPINLOCK(backfire_state_lock); | |
29 | static int backfire_open_cnt; /* #times opened */ | |
30 | static int backfire_open_mode; /* special open modes */ | |
31 | static struct timeval sendtime; /* when the most recent signal was sent */ | |
32 | -- | |
33 | 1.7.5.4 | |
34 | ||
35 | Also <asm/system.h> is gone for most architectures since v3.4-rc1~54^2. | |
37a5aca1 JB |
36 | --- rt-tests-1.6/src/backfire/backfire.c.orig 2020-02-09 10:27:54.181066040 +0100 |
37 | +++ rt-tests-1.6/src/backfire/backfire.c 2020-02-09 10:29:12.863973111 +0100 | |
38 | @@ -16,8 +16,6 @@ | |
e71ed1dd | 39 | #include <linux/spinlock.h> |
37a5aca1 | 40 | #include <linux/uaccess.h> |
e71ed1dd | 41 | |
e71ed1dd | 42 | -#include <asm/system.h> |
37a5aca1 | 43 | - |
e71ed1dd JB |
44 | #define BACKFIRE_MINOR MISC_DYNAMIC_MINOR |
45 | ||
37a5aca1 | 46 | static DEFINE_SPINLOCK(backfire_state_lock); |