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
d90349aa
Commit
d90349aa
authored
Feb 16, 2004
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://kernel.bkbits.net/davem/sparc-2.6
into home.osdl.org:/home/torvalds/v2.5/linux
parents
f9bf472d
a16a7cd8
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
5 deletions
+14
-5
drivers/ide/ide-iops.c
drivers/ide/ide-iops.c
+4
-3
drivers/ide/ide.c
drivers/ide/ide.c
+4
-0
drivers/ide/setup-pci.c
drivers/ide/setup-pci.c
+3
-0
drivers/video/fbmem.c
drivers/video/fbmem.c
+0
-2
include/linux/ide.h
include/linux/ide.h
+3
-0
No files found.
drivers/ide/ide-iops.c
View file @
d90349aa
...
...
@@ -1125,16 +1125,17 @@ static ide_startstop_t reset_pollfunc (ide_drive_t *drive)
return
ide_stopped
;
}
void
check_dma_crc
(
ide_drive_t
*
drive
)
static
void
check_dma_crc
(
ide_drive_t
*
drive
)
{
#ifdef CONFIG_BLK_DEV_IDEDMA
if
(
drive
->
crc_count
)
{
(
void
)
HWIF
(
drive
)
->
ide_dma_off_quietly
(
drive
);
ide_set_xfer_rate
(
drive
,
ide_auto_reduce_xfer
(
drive
));
if
(
drive
->
current_speed
>=
XFER_SW_DMA_0
)
(
void
)
HWIF
(
drive
)
->
ide_dma_on
(
drive
);
}
else
{
}
else
(
void
)
__ide_dma_off
(
drive
);
}
#endif
}
void
pre_reset
(
ide_drive_t
*
drive
)
...
...
drivers/ide/ide.c
View file @
d90349aa
...
...
@@ -1320,6 +1320,7 @@ static int set_io_32bit(ide_drive_t *drive, int arg)
static
int
set_using_dma
(
ide_drive_t
*
drive
,
int
arg
)
{
#ifdef CONFIG_BLK_DEV_IDEDMA
if
(
!
drive
->
id
||
!
(
drive
->
id
->
capability
&
1
))
return
-
EPERM
;
if
(
HWIF
(
drive
)
->
ide_dma_check
==
NULL
)
...
...
@@ -1332,6 +1333,9 @@ static int set_using_dma (ide_drive_t *drive, int arg)
return
-
EIO
;
}
return
0
;
#else
return
-
EPERM
;
#endif
}
static
int
set_pio_mode
(
ide_drive_t
*
drive
,
int
arg
)
...
...
drivers/ide/setup-pci.c
View file @
d90349aa
...
...
@@ -150,6 +150,8 @@ static int ide_setup_pci_baseregs (struct pci_dev *dev, const char *name)
return
0
;
}
#ifdef CONFIG_BLK_DEV_IDEDMA_PCI
#ifdef CONFIG_BLK_DEV_IDEDMA_FORCED
/*
* Long lost data from 2.0.34 that is now in 2.0.39
...
...
@@ -279,6 +281,7 @@ static unsigned long ide_get_or_set_dma_base (ide_hwif_t *hwif)
}
return
dma_base
;
}
#endif
/* CONFIG_BLK_DEV_IDEDMA_PCI */
void
ide_setup_pci_noise
(
struct
pci_dev
*
dev
,
ide_pci_device_t
*
d
)
{
...
...
drivers/video/fbmem.c
View file @
d90349aa
...
...
@@ -107,8 +107,6 @@ extern int platinumfb_init(void);
extern
int
platinumfb_setup
(
char
*
);
extern
int
control_init
(
void
);
extern
int
control_setup
(
char
*
);
extern
int
platinum_init
(
void
);
extern
int
platinum_setup
(
char
*
);
extern
int
valkyriefb_init
(
void
);
extern
int
valkyriefb_setup
(
char
*
);
extern
int
chips_init
(
void
);
...
...
include/linux/ide.h
View file @
d90349aa
...
...
@@ -1626,6 +1626,9 @@ extern ide_startstop_t __ide_dma_queued_read(ide_drive_t *drive);
extern
ide_startstop_t
__ide_dma_queued_write
(
ide_drive_t
*
drive
);
extern
ide_startstop_t
__ide_dma_queued_start
(
ide_drive_t
*
drive
);
#endif
#else
static
inline
int
__ide_dma_off
(
ide_drive_t
*
drive
)
{
return
0
;
}
#endif
/* CONFIG_BLK_DEV_IDEDMA */
#ifndef CONFIG_BLK_DEV_IDEDMA_PCI
...
...
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