Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
529980c8
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,发现更多精彩内容 >>
提交
529980c8
编写于
9月 08, 2005
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
上级
e3e3679c
52c18fd2
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
18 addition
and
14 deletion
+18
-14
arch/i386/kernel/cpu/cpufreq/longhaul.c
arch/i386/kernel/cpu/cpufreq/longhaul.c
+2
-2
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
+10
-10
arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
+1
-1
drivers/cpufreq/cpufreq.c
drivers/cpufreq/cpufreq.c
+5
-1
未找到文件。
arch/i386/kernel/cpu/cpufreq/longhaul.c
浏览文件 @
529980c8
...
...
@@ -467,11 +467,11 @@ static void __init longhaul_setup_voltagescaling(void)
}
if
(
vrmrev
==
0
)
{
dprintk
(
"VRM 8.5
\n
"
);
dprintk
(
"VRM 8.5
\n
"
);
memcpy
(
voltage_table
,
vrm85scales
,
sizeof
(
voltage_table
));
numvscales
=
(
voltage_table
[
maxvid
]
-
voltage_table
[
minvid
])
/
25
;
}
else
{
dprintk
(
"Mobile VRM
\n
"
);
dprintk
(
"Mobile VRM
\n
"
);
memcpy
(
voltage_table
,
mobilevrmscales
,
sizeof
(
voltage_table
));
numvscales
=
(
voltage_table
[
maxvid
]
-
voltage_table
[
minvid
])
/
5
;
}
...
...
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
浏览文件 @
529980c8
...
...
@@ -259,7 +259,7 @@ static int centrino_cpu_init_table(struct cpufreq_policy *policy)
if
(
model
->
op_points
==
NULL
)
{
/* Matched a non-match */
dprintk
(
KERN_INFO
PFX
"no table support for CPU model
\"
%s
\"
:
\n
"
,
dprintk
(
KERN_INFO
PFX
"no table support for CPU model
\"
%s
\"\n
"
,
cpu
->
x86_model_id
);
#ifndef CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI
dprintk
(
KERN_INFO
PFX
"try compiling with CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI enabled
\n
"
);
...
...
@@ -402,7 +402,7 @@ static int centrino_cpu_init_acpi(struct cpufreq_policy *policy)
for
(
i
=
0
;
i
<
p
.
state_count
;
i
++
)
{
if
(
p
.
states
[
i
].
control
!=
p
.
states
[
i
].
status
)
{
dprintk
(
"Different control (%
x) and status values (%x
)
\n
"
,
dprintk
(
"Different control (%
llu) and status values (%llu
)
\n
"
,
p
.
states
[
i
].
control
,
p
.
states
[
i
].
status
);
result
=
-
EINVAL
;
goto
err_unreg
;
...
...
@@ -415,7 +415,7 @@ static int centrino_cpu_init_acpi(struct cpufreq_policy *policy)
}
if
(
p
.
states
[
i
].
core_frequency
>
p
.
states
[
0
].
core_frequency
)
{
dprintk
(
"P%u has larger frequency (%
u) than P0 (%
u), skipping
\n
"
,
i
,
dprintk
(
"P%u has larger frequency (%
llu) than P0 (%ll
u), skipping
\n
"
,
i
,
p
.
states
[
i
].
core_frequency
,
p
.
states
[
0
].
core_frequency
);
p
.
states
[
i
].
core_frequency
=
0
;
continue
;
...
...
@@ -498,13 +498,6 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
if
(
cpu
->
x86_vendor
!=
X86_VENDOR_INTEL
||
!
cpu_has
(
cpu
,
X86_FEATURE_EST
))
return
-
ENODEV
;
for
(
i
=
0
;
i
<
N_IDS
;
i
++
)
if
(
centrino_verify_cpu_id
(
cpu
,
&
cpu_ids
[
i
]))
break
;
if
(
i
!=
N_IDS
)
centrino_cpu
[
policy
->
cpu
]
=
&
cpu_ids
[
i
];
if
(
is_const_loops_cpu
(
policy
->
cpu
))
{
centrino_driver
.
flags
|=
CPUFREQ_CONST_LOOPS
;
}
...
...
@@ -513,6 +506,13 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
if
(
policy
->
cpu
!=
0
)
return
-
ENODEV
;
for
(
i
=
0
;
i
<
N_IDS
;
i
++
)
if
(
centrino_verify_cpu_id
(
cpu
,
&
cpu_ids
[
i
]))
break
;
if
(
i
!=
N_IDS
)
centrino_cpu
[
policy
->
cpu
]
=
&
cpu_ids
[
i
];
if
(
!
centrino_cpu
[
policy
->
cpu
])
{
dprintk
(
KERN_INFO
PFX
"found unsupported CPU with "
"Enhanced SpeedStep: send /proc/cpuinfo to "
...
...
arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
浏览文件 @
529980c8
...
...
@@ -99,7 +99,7 @@ static int speedstep_smi_get_freqs (unsigned int *low, unsigned int *high)
u32
function
=
GET_SPEEDSTEP_FREQS
;
if
(
!
(
ist_info
.
event
&
0xFFFF
))
{
dprintk
(
"bug #1422 -- can't read freqs from BIOS
\n
"
,
result
);
dprintk
(
"bug #1422 -- can't read freqs from BIOS
\n
"
);
return
-
ENODEV
;
}
...
...
drivers/cpufreq/cpufreq.c
浏览文件 @
529980c8
...
...
@@ -627,7 +627,7 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
ret
=
kobject_register
(
&
policy
->
kobj
);
if
(
ret
)
goto
err_out
;
goto
err_out
_driver_exit
;
/* set up files for this cpu device */
drv_attr
=
cpufreq_driver
->
attr
;
...
...
@@ -673,6 +673,10 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
kobject_unregister
(
&
policy
->
kobj
);
wait_for_completion
(
&
policy
->
kobj_unregister
);
err_out_driver_exit:
if
(
cpufreq_driver
->
exit
)
cpufreq_driver
->
exit
(
policy
);
err_out:
kfree
(
policy
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录