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
88b6548e
Commit
88b6548e
authored
Apr 19, 2004
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge evo:v2.6/linux into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents
dfb9c436
b35a6769
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
8 deletions
+5
-8
include/net/sock.h
include/net/sock.h
+0
-2
kernel/posix-timers.c
kernel/posix-timers.c
+5
-6
No files found.
include/net/sock.h
View file @
88b6548e
...
...
@@ -341,8 +341,6 @@ static __inline__ void __sk_add_node(struct sock *sk, struct hlist_head *list)
hlist_add_head
(
&
sk
->
sk_node
,
list
);
}
static
inline
void
sock_hold
(
struct
sock
*
sk
);
static
__inline__
void
sk_add_node
(
struct
sock
*
sk
,
struct
hlist_head
*
list
)
{
sock_hold
(
sk
);
...
...
kernel/posix-timers.c
View file @
88b6548e
...
...
@@ -189,7 +189,11 @@ static u64 do_posix_clock_monotonic_gettime_parts(
int
do_posix_clock_monotonic_gettime
(
struct
timespec
*
tp
);
int
do_posix_clock_monotonic_settime
(
struct
timespec
*
tp
);
static
struct
k_itimer
*
lock_timer
(
timer_t
timer_id
,
unsigned
long
*
flags
);
static
inline
void
unlock_timer
(
struct
k_itimer
*
timr
,
unsigned
long
flags
);
static
inline
void
unlock_timer
(
struct
k_itimer
*
timr
,
unsigned
long
flags
)
{
spin_unlock_irqrestore
(
&
timr
->
it_lock
,
flags
);
}
/*
* Initialize everything, well, just everything in Posix clocks/timers ;)
...
...
@@ -553,11 +557,6 @@ static int good_timespec(const struct timespec *ts)
return
1
;
}
static
inline
void
unlock_timer
(
struct
k_itimer
*
timr
,
unsigned
long
flags
)
{
spin_unlock_irqrestore
(
&
timr
->
it_lock
,
flags
);
}
/*
* Locking issues: We need to protect the result of the id look up until
* we get the timer locked down so it is not deleted under us. The
...
...
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