Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
8f28afac
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8f28afac
编写于
1月 17, 2006
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
上级
c6b3feaf
4f3f2f6f
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
23 addition
and
26 deletion
+23
-26
arch/sparc/mm/iommu.c
arch/sparc/mm/iommu.c
+6
-7
arch/sparc64/kernel/time.c
arch/sparc64/kernel/time.c
+11
-11
drivers/video/sbuslib.c
drivers/video/sbuslib.c
+3
-6
drivers/video/sbuslib.h
drivers/video/sbuslib.h
+1
-1
sound/sparc/cs4231.c
sound/sparc/cs4231.c
+2
-1
未找到文件。
arch/sparc/mm/iommu.c
浏览文件 @
8f28afac
...
...
@@ -295,8 +295,7 @@ static void iommu_release_one(u32 busa, int npages, struct sbus_bus *sbus)
int
ioptex
;
int
i
;
if
(
busa
<
iommu
->
start
)
BUG
();
BUG_ON
(
busa
<
iommu
->
start
);
ioptex
=
(
busa
-
iommu
->
start
)
>>
PAGE_SHIFT
;
for
(
i
=
0
;
i
<
npages
;
i
++
)
{
iopte_val
(
iommu
->
page_table
[
ioptex
+
i
])
=
0
;
...
...
@@ -340,9 +339,9 @@ static int iommu_map_dma_area(dma_addr_t *pba, unsigned long va,
iopte_t
*
first
;
int
ioptex
;
if
((
va
&
~
PAGE_MASK
)
!=
0
)
BUG
(
);
if
((
addr
&
~
PAGE_MASK
)
!=
0
)
BUG
(
);
if
((
len
&
~
PAGE_MASK
)
!=
0
)
BUG
(
);
BUG_ON
((
va
&
~
PAGE_MASK
)
!=
0
);
BUG_ON
((
addr
&
~
PAGE_MASK
)
!=
0
);
BUG_ON
((
len
&
~
PAGE_MASK
)
!=
0
);
/* page color = physical address */
ioptex
=
bit_map_string_get
(
&
iommu
->
usemap
,
len
>>
PAGE_SHIFT
,
...
...
@@ -405,8 +404,8 @@ static void iommu_unmap_dma_area(unsigned long busa, int len)
unsigned
long
end
;
int
ioptex
=
(
busa
-
iommu
->
start
)
>>
PAGE_SHIFT
;
if
((
busa
&
~
PAGE_MASK
)
!=
0
)
BUG
(
);
if
((
len
&
~
PAGE_MASK
)
!=
0
)
BUG
(
);
BUG_ON
((
busa
&
~
PAGE_MASK
)
!=
0
);
BUG_ON
((
len
&
~
PAGE_MASK
)
!=
0
);
iopte
+=
ioptex
;
end
=
busa
+
len
;
...
...
arch/sparc64/kernel/time.c
浏览文件 @
8f28afac
...
...
@@ -280,9 +280,9 @@ static struct sparc64_tick_ops stick_operations __read_mostly = {
* Since STICK is constantly updating, we have to access it carefully.
*
* The sequence we use to read is:
* 1) read
low
* 2) read
high
* 3) read
low again, if it rolled over increment high by 1
* 1) read
high
* 2) read
low
* 3) read
high again, if it rolled re-read both low and high again.
*
* Writing STICK safely is also tricky:
* 1) write low to zero
...
...
@@ -295,18 +295,18 @@ static struct sparc64_tick_ops stick_operations __read_mostly = {
static
unsigned
long
__hbird_read_stick
(
void
)
{
unsigned
long
ret
,
tmp1
,
tmp2
,
tmp3
;
unsigned
long
addr
=
HBIRD_STICK_ADDR
;
unsigned
long
addr
=
HBIRD_STICK_ADDR
+
8
;
__asm__
__volatile__
(
"ldxa [%1] %5, %2
\n\t
"
"add %1, 0x8, %1
\n\t
"
"ldxa [%1] %5, %3
\n\t
"
__asm__
__volatile__
(
"ldxa [%1] %5, %2
\n
"
"1:
\n\t
"
"sub %1, 0x8, %1
\n\t
"
"ldxa [%1] %5, %3
\n\t
"
"add %1, 0x8, %1
\n\t
"
"ldxa [%1] %5, %4
\n\t
"
"cmp %4, %2
\n\t
"
"blu,a,pn %%xcc, 1f
\n\t
"
" add %3, 1, %3
\n
"
"1:
\n\t
"
"sllx %3, 32, %3
\n\t
"
"bne,a,pn %%xcc, 1b
\n\t
"
" mov %4, %2
\n\t
"
"sllx %4, 32, %4
\n\t
"
"or %3, %4, %0
\n\t
"
:
"=&r"
(
ret
),
"=&r"
(
addr
),
"=&r"
(
tmp1
),
"=&r"
(
tmp2
),
"=&r"
(
tmp3
)
...
...
drivers/video/sbuslib.c
浏览文件 @
8f28afac
...
...
@@ -199,8 +199,7 @@ struct fbcmap32 {
#define FBIOPUTCMAP32 _IOW('F', 3, struct fbcmap32)
#define FBIOGETCMAP32 _IOW('F', 4, struct fbcmap32)
static
int
fbiogetputcmap
(
struct
file
*
file
,
struct
fb_info
*
info
,
unsigned
int
cmd
,
unsigned
long
arg
)
static
int
fbiogetputcmap
(
struct
fb_info
*
info
,
unsigned
int
cmd
,
unsigned
long
arg
)
{
struct
fbcmap32
__user
*
argp
=
(
void
__user
*
)
arg
;
struct
fbcmap
__user
*
p
=
compat_alloc_user_space
(
sizeof
(
*
p
));
...
...
@@ -236,8 +235,7 @@ struct fbcursor32 {
#define FBIOSCURSOR32 _IOW('F', 24, struct fbcursor32)
#define FBIOGCURSOR32 _IOW('F', 25, struct fbcursor32)
static
int
fbiogscursor
(
struct
file
*
file
,
struct
fb_info
*
info
,
unsigned
long
arg
)
static
int
fbiogscursor
(
struct
fb_info
*
info
,
unsigned
long
arg
)
{
struct
fbcursor
__user
*
p
=
compat_alloc_user_space
(
sizeof
(
*
p
));
struct
fbcursor32
__user
*
argp
=
(
void
__user
*
)
arg
;
...
...
@@ -263,8 +261,7 @@ static int fbiogscursor(struct file *file, struct fb_info *info,
return
info
->
fbops
->
fb_ioctl
(
info
,
FBIOSCURSOR
,
(
unsigned
long
)
p
);
}
long
sbusfb_compat_ioctl
(
struct
fb_info
*
info
,
unsigned
int
cmd
,
unsigned
long
arg
)
int
sbusfb_compat_ioctl
(
struct
fb_info
*
info
,
unsigned
int
cmd
,
unsigned
long
arg
)
{
switch
(
cmd
)
{
case
FBIOGTYPE
:
...
...
drivers/video/sbuslib.h
浏览文件 @
8f28afac
...
...
@@ -20,7 +20,7 @@ extern int sbusfb_mmap_helper(struct sbus_mmap_map *map,
int
sbusfb_ioctl_helper
(
unsigned
long
cmd
,
unsigned
long
arg
,
struct
fb_info
*
info
,
int
type
,
int
fb_depth
,
unsigned
long
fb_size
);
long
sbusfb_compat_ioctl
(
struct
fb_info
*
info
,
unsigned
int
cmd
,
int
sbusfb_compat_ioctl
(
struct
fb_info
*
info
,
unsigned
int
cmd
,
unsigned
long
arg
);
#endif
/* _SBUSLIB_H */
sound/sparc/cs4231.c
浏览文件 @
8f28afac
...
...
@@ -69,13 +69,14 @@ struct sbus_dma_info {
};
#endif
struct
snd_cs4231
;
struct
cs4231_dma_control
{
void
(
*
prepare
)(
struct
cs4231_dma_control
*
dma_cont
,
int
dir
);
void
(
*
enable
)(
struct
cs4231_dma_control
*
dma_cont
,
int
on
);
int
(
*
request
)(
struct
cs4231_dma_control
*
dma_cont
,
dma_addr_t
bus_addr
,
size_t
len
);
unsigned
int
(
*
address
)(
struct
cs4231_dma_control
*
dma_cont
);
void
(
*
reset
)(
struct
snd_cs4231
*
chip
);
void
(
*
preallocate
)(
struct
snd_cs4231
*
chip
,
struct
snd_
snd_
pcm
*
pcm
);
void
(
*
preallocate
)(
struct
snd_cs4231
*
chip
,
struct
snd_pcm
*
pcm
);
#ifdef EBUS_SUPPORT
struct
ebus_dma_info
ebus_info
;
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录