Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci-2.6.23
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-2.6.23
Commits
a8b76b49
Commit
a8b76b49
authored
Feb 27, 2006
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
parents
637029c6
c3c013a2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
0 deletions
+7
-0
drivers/scsi/libata-core.c
drivers/scsi/libata-core.c
+4
-0
drivers/scsi/libata-scsi.c
drivers/scsi/libata-scsi.c
+2
-0
drivers/scsi/libata.h
drivers/scsi/libata.h
+1
-0
No files found.
drivers/scsi/libata-core.c
View file @
a8b76b49
...
@@ -82,6 +82,10 @@ int atapi_enabled = 0;
...
@@ -82,6 +82,10 @@ int atapi_enabled = 0;
module_param
(
atapi_enabled
,
int
,
0444
);
module_param
(
atapi_enabled
,
int
,
0444
);
MODULE_PARM_DESC
(
atapi_enabled
,
"Enable discovery of ATAPI devices (0=off, 1=on)"
);
MODULE_PARM_DESC
(
atapi_enabled
,
"Enable discovery of ATAPI devices (0=off, 1=on)"
);
int
libata_fua
=
0
;
module_param_named
(
fua
,
libata_fua
,
int
,
0444
);
MODULE_PARM_DESC
(
fua
,
"FUA support (0=off, 1=on)"
);
MODULE_AUTHOR
(
"Jeff Garzik"
);
MODULE_AUTHOR
(
"Jeff Garzik"
);
MODULE_DESCRIPTION
(
"Library module for ATA devices"
);
MODULE_DESCRIPTION
(
"Library module for ATA devices"
);
MODULE_LICENSE
(
"GPL"
);
MODULE_LICENSE
(
"GPL"
);
...
...
drivers/scsi/libata-scsi.c
View file @
a8b76b49
...
@@ -1708,6 +1708,8 @@ static int ata_dev_supports_fua(u16 *id)
...
@@ -1708,6 +1708,8 @@ static int ata_dev_supports_fua(u16 *id)
{
{
unsigned
char
model
[
41
],
fw
[
9
];
unsigned
char
model
[
41
],
fw
[
9
];
if
(
!
libata_fua
)
return
0
;
if
(
!
ata_id_has_fua
(
id
))
if
(
!
ata_id_has_fua
(
id
))
return
0
;
return
0
;
...
...
drivers/scsi/libata.h
View file @
a8b76b49
...
@@ -41,6 +41,7 @@ struct ata_scsi_args {
...
@@ -41,6 +41,7 @@ struct ata_scsi_args {
/* libata-core.c */
/* libata-core.c */
extern
int
atapi_enabled
;
extern
int
atapi_enabled
;
extern
int
libata_fua
;
extern
struct
ata_queued_cmd
*
ata_qc_new_init
(
struct
ata_port
*
ap
,
extern
struct
ata_queued_cmd
*
ata_qc_new_init
(
struct
ata_port
*
ap
,
struct
ata_device
*
dev
);
struct
ata_device
*
dev
);
extern
int
ata_rwcmd_protocol
(
struct
ata_queued_cmd
*
qc
);
extern
int
ata_rwcmd_protocol
(
struct
ata_queued_cmd
*
qc
);
...
...
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