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
0684fe0a
Commit
0684fe0a
authored
May 21, 2002
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge nuts.ninka.net:/home/davem/src/BK/BAK-sparc-2.5
into nuts.ninka.net:/home/davem/src/BK/sparc-2.5
parents
e6d19c6a
87b76279
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
10 deletions
+8
-10
arch/sparc/kernel/ioport.c
arch/sparc/kernel/ioport.c
+3
-3
arch/sparc/mm/srmmu.c
arch/sparc/mm/srmmu.c
+0
-1
drivers/net/sunlance.c
drivers/net/sunlance.c
+2
-2
include/asm-sparc/pgalloc.h
include/asm-sparc/pgalloc.h
+0
-1
include/asm-sparc/sbus.h
include/asm-sparc/sbus.h
+3
-3
No files found.
arch/sparc/kernel/ioport.c
View file @
0684fe0a
...
...
@@ -351,7 +351,7 @@ void sbus_free_consistent(struct sbus_dev *sdev, long n, void *p, u32 ba)
* CPU view of this memory may be inconsistent with
* a device view and explicit flushing is necessary.
*/
u32
sbus_map_single
(
struct
sbus_dev
*
sdev
,
void
*
va
,
long
len
,
int
direction
)
dma_addr_t
sbus_map_single
(
struct
sbus_dev
*
sdev
,
void
*
va
,
size_t
len
,
int
direction
)
{
#if 0 /* This is the version that abuses consistent space */
unsigned long len_total = (len + PAGE_SIZE-1) & PAGE_MASK;
...
...
@@ -398,7 +398,7 @@ u32 sbus_map_single(struct sbus_dev *sdev, void *va, long len, int direction)
#endif
}
void
sbus_unmap_single
(
struct
sbus_dev
*
sdev
,
u32
ba
,
long
n
,
int
direction
)
void
sbus_unmap_single
(
struct
sbus_dev
*
sdev
,
dma_addr_t
ba
,
size_t
n
,
int
direction
)
{
#if 0 /* This is the version that abuses consistent space */
struct resource *res;
...
...
@@ -445,7 +445,7 @@ void sbus_unmap_sg(struct sbus_dev *sdev, struct scatterlist *sg, int n, int dir
/*
*/
void
sbus_dma_sync_single
(
struct
sbus_dev
*
sdev
,
u32
ba
,
long
size
,
int
direction
)
void
sbus_dma_sync_single
(
struct
sbus_dev
*
sdev
,
dma_addr_t
ba
,
size_t
size
,
int
direction
)
{
#if 0
unsigned long va;
...
...
arch/sparc/mm/srmmu.c
View file @
0684fe0a
...
...
@@ -394,7 +394,6 @@ static pte_t *srmmu_pte_alloc_one_fast(struct mm_struct *mm, unsigned long addre
static
pte_t
*
srmmu_pte_alloc_one
(
struct
mm_struct
*
mm
,
unsigned
long
address
)
{
BUG
();
return
NULL
;
}
...
...
drivers/net/sunlance.c
View file @
0684fe0a
...
...
@@ -258,7 +258,7 @@ struct lance_private {
void
(
*
tx
)(
struct
net_device
*
);
char
*
name
;
__u32
init_block_dvma
;
dma_addr_t
init_block_dvma
;
struct
net_device
*
dev
;
/* Backpointer */
struct
lance_private
*
next_module
;
struct
sbus_dev
*
sdev
;
...
...
@@ -320,7 +320,7 @@ static void lance_init_ring_dvma(struct net_device *dev)
{
struct
lance_private
*
lp
=
(
struct
lance_private
*
)
dev
->
priv
;
volatile
struct
lance_init_block
*
ib
=
lp
->
init_block
;
__u32
aib
=
lp
->
init_block_dvma
;
dma_addr_t
aib
=
lp
->
init_block_dvma
;
__u32
leptr
;
int
i
;
...
...
include/asm-sparc/pgalloc.h
View file @
0684fe0a
...
...
@@ -117,7 +117,6 @@ BTFIXUPDEF_CALL(void, free_pgd_fast, pgd_t *)
static
__inline__
pmd_t
*
pmd_alloc_one
(
struct
mm_struct
*
mm
,
unsigned
long
address
)
{
BUG
();
return
0
;
}
...
...
include/asm-sparc/sbus.h
View file @
0684fe0a
...
...
@@ -112,13 +112,13 @@ extern void sbus_free_consistent(struct sbus_dev *, long, void *, u32);
#define SBUS_DMA_NONE 3
/* All the rest use streaming mode mappings. */
extern
u32
sbus_map_single
(
struct
sbus_dev
*
,
void
*
,
long
,
int
);
extern
void
sbus_unmap_single
(
struct
sbus_dev
*
,
u32
,
long
,
int
);
extern
dma_addr_t
sbus_map_single
(
struct
sbus_dev
*
,
void
*
,
size_t
,
int
);
extern
void
sbus_unmap_single
(
struct
sbus_dev
*
,
dma_addr_t
,
size_t
,
int
);
extern
int
sbus_map_sg
(
struct
sbus_dev
*
,
struct
scatterlist
*
,
int
,
int
);
extern
void
sbus_unmap_sg
(
struct
sbus_dev
*
,
struct
scatterlist
*
,
int
,
int
);
/* Finally, allow explicit synchronization of streamable mappings. */
extern
void
sbus_dma_sync_single
(
struct
sbus_dev
*
,
u32
,
long
,
int
);
extern
void
sbus_dma_sync_single
(
struct
sbus_dev
*
,
dma_addr_t
,
size_t
,
int
);
extern
void
sbus_dma_sync_sg
(
struct
sbus_dev
*
,
struct
scatterlist
*
,
int
,
int
);
#endif
/* !(_SPARC_SBUS_H) */
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