1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/srcutree.h b/include/linux/srcutree.h
index a949f4f9e4d7..4eda108abee0 100644
--- a/include/linux/srcutree.h
+++ b/include/linux/srcutree.h
@@ -40,7 +40,7 @@ struct srcu_data {
        unsigned long srcu_unlock_count[2];     /* Unlocks per CPU. */
        /* Update-side state. */
-        raw_spinlock_t __private lock ____cacheline_internodealigned_in_smp;
+        spinlock_t __private lock ____cacheline_internodealigned_in_smp;
        struct rcu_segcblist srcu_cblist;       /* List of callbacks.*/
        unsigned long srcu_gp_seq_needed;       /* Furthest future GP needed. */
        unsigned long srcu_gp_seq_needed_exp;   /* Furthest future exp GP. */
@@ -58,7 +58,7 @@ struct srcu_data {
 * Node in SRCU combining tree, similar in function to rcu_data.
 */
 struct srcu_node {
-        raw_spinlock_t __private lock;
+        spinlock_t __private lock;
        unsigned long srcu_have_cbs[4];         /* GP seq for children */
                                                /*  having CBs, but only */
                                                /*  is > ->srcu_gq_seq. */
@@ -78,7 +78,7 @@ struct srcu_struct {
        struct srcu_node *level[RCU_NUM_LVLS + 1];
                                                /* First node at each level. */
        struct mutex srcu_cb_mutex;             /* Serialize CB preparation. */
-        raw_spinlock_t __private lock;          /* Protect counters */
+        spinlock_t __private lock;              /* Protect counters */
        struct mutex srcu_gp_mutex;             /* Serialize GP work. */
        unsigned int srcu_idx;                  /* Current rdr array element. */
        unsigned long srcu_gp_seq;              /* Grace-period seq #. */
@@ -107,7 +107,7 @@ struct srcu_struct {
 #define __SRCU_STRUCT_INIT(name)                                        \
        {                                                               \
                .sda = &name##_srcu_data,                               \
-                .lock = __RAW_SPIN_LOCK_UNLOCKED(name.lock),            \
+                .lock = __SPIN_LOCK_UNLOCKED(name.lock),                \
                .srcu_gp_seq_needed = 0 - 1,                            \
                __SRCU_DEP_MAP_INIT(name)                               \
        }

diff --git a/include/linux/srcutree.h b/include/linux/srcutree.h index a949f4f9e4d7..4eda108abee0 100644 --- a/include/linux/srcutree.h +++ b/include/linux/srcutree.h
@@ -40,7 +40,7 @@ struct srcu_data {
40	unsigned long srcu_unlock_count[2]; /* Unlocks per CPU. */	40	unsigned long srcu_unlock_count[2]; /* Unlocks per CPU. */
41		41
42	/* Update-side state. */	42	/* Update-side state. */
43	raw_spinlock_t __private lock ____cacheline_internodealigned_in_smp;	43	spinlock_t __private lock ____cacheline_internodealigned_in_smp;
44	struct rcu_segcblist srcu_cblist; /* List of callbacks.*/	44	struct rcu_segcblist srcu_cblist; /* List of callbacks.*/
45	unsigned long srcu_gp_seq_needed; /* Furthest future GP needed. */	45	unsigned long srcu_gp_seq_needed; /* Furthest future GP needed. */
46	unsigned long srcu_gp_seq_needed_exp; /* Furthest future exp GP. */	46	unsigned long srcu_gp_seq_needed_exp; /* Furthest future exp GP. */
@@ -58,7 +58,7 @@ struct srcu_data {
58	* Node in SRCU combining tree, similar in function to rcu_data.	58	* Node in SRCU combining tree, similar in function to rcu_data.
59	*/	59	*/
60	struct srcu_node {	60	struct srcu_node {
61	raw_spinlock_t __private lock;	61	spinlock_t __private lock;
62	unsigned long srcu_have_cbs[4]; /* GP seq for children */	62	unsigned long srcu_have_cbs[4]; /* GP seq for children */
63	/* having CBs, but only */	63	/* having CBs, but only */
64	/* is > ->srcu_gq_seq. */	64	/* is > ->srcu_gq_seq. */
@@ -78,7 +78,7 @@ struct srcu_struct {
78	struct srcu_node *level[RCU_NUM_LVLS + 1];	78	struct srcu_node *level[RCU_NUM_LVLS + 1];
79	/* First node at each level. */	79	/* First node at each level. */
80	struct mutex srcu_cb_mutex; /* Serialize CB preparation. */	80	struct mutex srcu_cb_mutex; /* Serialize CB preparation. */
81	raw_spinlock_t __private lock; /* Protect counters */	81	spinlock_t __private lock; /* Protect counters */
82	struct mutex srcu_gp_mutex; /* Serialize GP work. */	82	struct mutex srcu_gp_mutex; /* Serialize GP work. */
83	unsigned int srcu_idx; /* Current rdr array element. */	83	unsigned int srcu_idx; /* Current rdr array element. */
84	unsigned long srcu_gp_seq; /* Grace-period seq #. */	84	unsigned long srcu_gp_seq; /* Grace-period seq #. */
@@ -107,7 +107,7 @@ struct srcu_struct {
107	#define __SRCU_STRUCT_INIT(name) \	107	#define __SRCU_STRUCT_INIT(name) \
108	{ \	108	{ \
109	.sda = &name##_srcu_data, \	109	.sda = &name##_srcu_data, \
110	.lock = __RAW_SPIN_LOCK_UNLOCKED(name.lock), \	110	.lock = __SPIN_LOCK_UNLOCKED(name.lock), \
111	.srcu_gp_seq_needed = 0 - 1, \	111	.srcu_gp_seq_needed = 0 - 1, \
112	__SRCU_DEP_MAP_INIT(name) \	112	__SRCU_DEP_MAP_INIT(name) \
113	}	113	}