Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
365c9ee0
Commit
365c9ee0
authored
Aug 31, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'regmap/topic/sparse' into regmap-next
parents
4460d028
b4519c71
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
drivers/base/regmap/regmap.c
drivers/base/regmap/regmap.c
+2
-0
No files found.
drivers/base/regmap/regmap.c
View file @
365c9ee0
...
@@ -303,6 +303,7 @@ static void regmap_unlock_mutex(void *__map)
...
@@ -303,6 +303,7 @@ static void regmap_unlock_mutex(void *__map)
}
}
static
void
regmap_lock_spinlock
(
void
*
__map
)
static
void
regmap_lock_spinlock
(
void
*
__map
)
__acquires
(
&
map
->
spinlock
)
{
{
struct
regmap
*
map
=
__map
;
struct
regmap
*
map
=
__map
;
unsigned
long
flags
;
unsigned
long
flags
;
...
@@ -312,6 +313,7 @@ static void regmap_lock_spinlock(void *__map)
...
@@ -312,6 +313,7 @@ static void regmap_lock_spinlock(void *__map)
}
}
static
void
regmap_unlock_spinlock
(
void
*
__map
)
static
void
regmap_unlock_spinlock
(
void
*
__map
)
__releases
(
&
map
->
spinlock
)
{
{
struct
regmap
*
map
=
__map
;
struct
regmap
*
map
=
__map
;
spin_unlock_irqrestore
(
&
map
->
spinlock
,
map
->
spinlock_flags
);
spin_unlock_irqrestore
(
&
map
->
spinlock
,
map
->
spinlock_flags
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment