Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
d524c5e2
Commit
d524c5e2
authored
Feb 12, 2006
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
parents
19bf9cbf
a7122f91
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
239 additions
and
223 deletions
+239
-223
drivers/char/watchdog/pcwd.c
drivers/char/watchdog/pcwd.c
+232
-218
drivers/char/watchdog/sa1100_wdt.c
drivers/char/watchdog/sa1100_wdt.c
+7
-5
No files found.
drivers/char/watchdog/pcwd.c
View file @
d524c5e2
This diff is collapsed.
Click to expand it.
drivers/char/watchdog/sa1100_wdt.c
View file @
d524c5e2
...
...
@@ -93,23 +93,25 @@ static int sa1100dog_ioctl(struct inode *inode, struct file *file,
{
int
ret
=
-
ENOIOCTLCMD
;
int
time
;
void
__user
*
argp
=
(
void
__user
*
)
arg
;
int
__user
*
p
=
argp
;
switch
(
cmd
)
{
case
WDIOC_GETSUPPORT
:
ret
=
copy_to_user
(
(
struct
watchdog_info
__user
*
)
arg
,
&
ident
,
ret
=
copy_to_user
(
argp
,
&
ident
,
sizeof
(
ident
))
?
-
EFAULT
:
0
;
break
;
case
WDIOC_GETSTATUS
:
ret
=
put_user
(
0
,
(
int
__user
*
)
arg
);
ret
=
put_user
(
0
,
p
);
break
;
case
WDIOC_GETBOOTSTATUS
:
ret
=
put_user
(
boot_status
,
(
int
__user
*
)
arg
);
ret
=
put_user
(
boot_status
,
p
);
break
;
case
WDIOC_SETTIMEOUT
:
ret
=
get_user
(
time
,
(
int
__user
*
)
arg
);
ret
=
get_user
(
time
,
p
);
if
(
ret
)
break
;
...
...
@@ -123,7 +125,7 @@ static int sa1100dog_ioctl(struct inode *inode, struct file *file,
/*fall through*/
case
WDIOC_GETTIMEOUT
:
ret
=
put_user
(
pre_margin
/
OSCR_FREQ
,
(
int
__user
*
)
arg
);
ret
=
put_user
(
pre_margin
/
OSCR_FREQ
,
p
);
break
;
case
WDIOC_KEEPALIVE
:
...
...
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