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
Kirill Smelkov
linux
Commits
fa751d5c
Commit
fa751d5c
authored
Jan 04, 2004
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://bk.arm.linux.org.uk/linux-2.6-serial
into home.osdl.org:/home/torvalds/v2.5/linux
parents
0ef06869
11f96351
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
arch/x86_64/lib/memset.S
arch/x86_64/lib/memset.S
+1
-1
drivers/ide/ide-iops.c
drivers/ide/ide-iops.c
+9
-0
No files found.
arch/x86_64/lib/memset.S
View file @
fa751d5c
...
...
@@ -113,7 +113,7 @@ memset_c:
/
*
expand
byte
value
*/
movzbl
%
sil
,%
esi
movabs
$
0x0101010101010101
,%
rax
mul
%
e
si
/*
with
rax
,
clobbers
rdx
*/
mul
q
%
r
si
/*
with
rax
,
clobbers
rdx
*/
rep
stosq
movl
%
r8d
,%
ecx
...
...
drivers/ide/ide-iops.c
View file @
fa751d5c
...
...
@@ -647,6 +647,15 @@ int ide_wait_stat (ide_startstop_t *startstop, ide_drive_t *drive, u8 good, u8 b
timeout
+=
jiffies
;
while
((
stat
=
hwif
->
INB
(
IDE_STATUS_REG
))
&
BUSY_STAT
)
{
if
(
time_after
(
jiffies
,
timeout
))
{
/*
* One last read after the timeout in case
* heavy interrupt load made us not make any
* progress during the timeout..
*/
stat
=
hwif
->
INB
(
IDE_STATUS_REG
);
if
(
!
(
stat
&
BUSY_STAT
))
break
;
local_irq_restore
(
flags
);
*
startstop
=
DRIVER
(
drive
)
->
error
(
drive
,
"status timeout"
,
stat
);
return
1
;
...
...
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