Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
8a3f257c
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,发现更多精彩内容 >>
提交
8a3f257c
编写于
4月 05, 2009
作者:
L
Len Brown
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'misc' into release
上级
33526a53
15065531
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
43 addition
and
26 deletion
+43
-26
MAINTAINERS
MAINTAINERS
+1
-4
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/acpi/boot.c
+1
-1
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+12
-0
drivers/acpi/dock.c
drivers/acpi/dock.c
+2
-1
drivers/acpi/pci_irq.c
drivers/acpi/pci_irq.c
+8
-8
drivers/acpi/processor_throttling.c
drivers/acpi/processor_throttling.c
+2
-4
drivers/acpi/sleep.c
drivers/acpi/sleep.c
+9
-0
drivers/platform/x86/panasonic-laptop.c
drivers/platform/x86/panasonic-laptop.c
+5
-4
drivers/platform/x86/tc1100-wmi.c
drivers/platform/x86/tc1100-wmi.c
+3
-4
未找到文件。
MAINTAINERS
浏览文件 @
8a3f257c
...
...
@@ -4291,10 +4291,7 @@ W: http://sourceforge.net/projects/tlan/
S: Maintained
TOSHIBA ACPI EXTRAS DRIVER
P: John Belmonte
M: toshiba_acpi@memebeam.org
W: http://memebeam.org/toys/ToshibaAcpiDriver
S: Maintained
S: Orphan
TOSHIBA SMM DRIVER
P: Jonathan Buzzard
...
...
arch/x86/kernel/acpi/boot.c
浏览文件 @
8a3f257c
...
...
@@ -1548,7 +1548,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
/*
* If your system is blacklisted here, but you find that acpi=force
* works for you, please contact
acpi-devel@sourceforge.net
* works for you, please contact
linux-acpi@vger.kernel.org
*/
static
struct
dmi_system_id
__initdata
acpi_dmi_table
[]
=
{
/*
...
...
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
浏览文件 @
8a3f257c
...
...
@@ -680,6 +680,18 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
perf
->
states
[
i
].
transition_latency
*
1000
;
}
/* Check for high latency (>20uS) from buggy BIOSes, like on T42 */
if
(
perf
->
control_register
.
space_id
==
ACPI_ADR_SPACE_FIXED_HARDWARE
&&
policy
->
cpuinfo
.
transition_latency
>
20
*
1000
)
{
static
int
print_once
;
policy
->
cpuinfo
.
transition_latency
=
20
*
1000
;
if
(
!
print_once
)
{
print_once
=
1
;
printk
(
KERN_INFO
"Capping off P-state tranision latency"
" at 20 uS
\n
"
);
}
}
data
->
max_freq
=
perf
->
states
[
0
].
core_frequency
*
1000
;
/* table init */
for
(
i
=
0
;
i
<
perf
->
state_count
;
i
++
)
{
...
...
drivers/acpi/dock.c
浏览文件 @
8a3f257c
...
...
@@ -1146,9 +1146,10 @@ static int __init dock_init(void)
static
void
__exit
dock_exit
(
void
)
{
struct
dock_station
*
dock_station
;
struct
dock_station
*
tmp
;
unregister_acpi_bus_notifier
(
&
dock_acpi_notifier
);
list_for_each_entry
(
dock_station
,
&
dock_stations
,
sibiling
)
list_for_each_entry
_safe
(
dock_station
,
tmp
,
&
dock_stations
,
sibiling
)
dock_remove
(
dock_station
);
}
...
...
drivers/acpi/pci_irq.c
浏览文件 @
8a3f257c
...
...
@@ -86,7 +86,7 @@ static struct acpi_prt_entry *acpi_pci_irq_find_prt_entry(struct pci_dev *dev,
}
/* http://bugzilla.kernel.org/show_bug.cgi?id=4773 */
static
struct
dmi_system_id
medion_md9580
[]
=
{
static
const
struct
dmi_system_id
medion_md9580
[]
=
{
{
.
ident
=
"Medion MD9580-F laptop"
,
.
matches
=
{
...
...
@@ -98,7 +98,7 @@ static struct dmi_system_id medion_md9580[] = {
};
/* http://bugzilla.kernel.org/show_bug.cgi?id=5044 */
static
struct
dmi_system_id
dell_optiplex
[]
=
{
static
const
struct
dmi_system_id
dell_optiplex
[]
=
{
{
.
ident
=
"Dell Optiplex GX1"
,
.
matches
=
{
...
...
@@ -110,7 +110,7 @@ static struct dmi_system_id dell_optiplex[] = {
};
/* http://bugzilla.kernel.org/show_bug.cgi?id=10138 */
static
struct
dmi_system_id
hp_t5710
[]
=
{
static
const
struct
dmi_system_id
hp_t5710
[]
=
{
{
.
ident
=
"HP t5710"
,
.
matches
=
{
...
...
@@ -123,13 +123,13 @@ static struct dmi_system_id hp_t5710[] = {
};
struct
prt_quirk
{
struct
dmi_system_id
*
system
;
const
struct
dmi_system_id
*
system
;
unsigned
int
segment
;
unsigned
int
bus
;
unsigned
int
device
;
unsigned
char
pin
;
c
har
*
source
;
/* according to BIOS */
c
har
*
actual_source
;
c
onst
char
*
source
;
/* according to BIOS */
c
onst
char
*
actual_source
;
};
#define PCI_INTX_PIN(c) (c - 'A' + 1)
...
...
@@ -139,7 +139,7 @@ struct prt_quirk {
* interrupt at the listed segment/bus/device/pin is connected to the first
* link device, but it is actually connected to the second.
*/
static
struct
prt_quirk
prt_quirks
[]
=
{
static
const
struct
prt_quirk
prt_quirks
[]
=
{
{
medion_md9580
,
0
,
0
,
9
,
PCI_INTX_PIN
(
'A'
),
"
\\
_SB_.PCI0.ISA_.LNKA"
,
"
\\
_SB_.PCI0.ISA_.LNKB"
},
...
...
@@ -155,7 +155,7 @@ static void do_prt_fixups(struct acpi_prt_entry *entry,
struct
acpi_pci_routing_table
*
prt
)
{
int
i
;
struct
prt_quirk
*
quirk
;
const
struct
prt_quirk
*
quirk
;
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
prt_quirks
);
i
++
)
{
quirk
=
&
prt_quirks
[
i
];
...
...
drivers/acpi/processor_throttling.c
浏览文件 @
8a3f257c
...
...
@@ -783,11 +783,9 @@ static int acpi_get_throttling_state(struct acpi_processor *pr,
(
struct
acpi_processor_tx_tss
*
)
&
(
pr
->
throttling
.
states_tss
[
i
]);
if
(
tx
->
control
==
value
)
break
;
return
i
;
}
if
(
i
>
pr
->
throttling
.
state_count
)
i
=
-
1
;
return
i
;
return
-
1
;
}
static
int
acpi_get_throttling_value
(
struct
acpi_processor
*
pr
,
...
...
drivers/acpi/sleep.c
浏览文件 @
8a3f257c
...
...
@@ -396,6 +396,15 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
DMI_MATCH
(
DMI_PRODUCT_NAME
,
"Satellite L300"
),
},
},
{
.
callback
=
init_old_suspend_ordering
,
.
ident
=
"Panasonic CF51-2L"
,
.
matches
=
{
DMI_MATCH
(
DMI_BOARD_VENDOR
,
"Matsushita Electric Industrial Co.,Ltd."
),
DMI_MATCH
(
DMI_BOARD_NAME
,
"CF51-2L"
),
},
},
{},
};
#endif
/* CONFIG_SUSPEND */
...
...
drivers/platform/x86/panasonic-laptop.c
浏览文件 @
8a3f257c
...
...
@@ -184,6 +184,7 @@ static const struct acpi_device_id pcc_device_ids[] = {
{
"MAT0019"
,
0
},
{
""
,
0
},
};
MODULE_DEVICE_TABLE
(
acpi
,
pcc_device_ids
);
static
struct
acpi_driver
acpi_pcc_driver
=
{
.
name
=
ACPI_PCC_DRIVER_NAME
,
...
...
@@ -366,7 +367,7 @@ static ssize_t show_numbatt(struct device *dev, struct device_attribute *attr,
if
(
!
acpi_pcc_retrieve_biosdata
(
pcc
,
pcc
->
sinf
))
return
-
EIO
;
return
s
printf
(
buf
,
"%u
\n
"
,
pcc
->
sinf
[
SINF_NUM_BATTERIES
]);
return
s
nprintf
(
buf
,
PAGE_SIZE
,
"%u
\n
"
,
pcc
->
sinf
[
SINF_NUM_BATTERIES
]);
}
static
ssize_t
show_lcdtype
(
struct
device
*
dev
,
struct
device_attribute
*
attr
,
...
...
@@ -378,7 +379,7 @@ static ssize_t show_lcdtype(struct device *dev, struct device_attribute *attr,
if
(
!
acpi_pcc_retrieve_biosdata
(
pcc
,
pcc
->
sinf
))
return
-
EIO
;
return
s
printf
(
buf
,
"%u
\n
"
,
pcc
->
sinf
[
SINF_LCD_TYPE
]);
return
s
nprintf
(
buf
,
PAGE_SIZE
,
"%u
\n
"
,
pcc
->
sinf
[
SINF_LCD_TYPE
]);
}
static
ssize_t
show_mute
(
struct
device
*
dev
,
struct
device_attribute
*
attr
,
...
...
@@ -390,7 +391,7 @@ static ssize_t show_mute(struct device *dev, struct device_attribute *attr,
if
(
!
acpi_pcc_retrieve_biosdata
(
pcc
,
pcc
->
sinf
))
return
-
EIO
;
return
s
printf
(
buf
,
"%u
\n
"
,
pcc
->
sinf
[
SINF_MUTE
]);
return
s
nprintf
(
buf
,
PAGE_SIZE
,
"%u
\n
"
,
pcc
->
sinf
[
SINF_MUTE
]);
}
static
ssize_t
show_sticky
(
struct
device
*
dev
,
struct
device_attribute
*
attr
,
...
...
@@ -402,7 +403,7 @@ static ssize_t show_sticky(struct device *dev, struct device_attribute *attr,
if
(
!
acpi_pcc_retrieve_biosdata
(
pcc
,
pcc
->
sinf
))
return
-
EIO
;
return
s
printf
(
buf
,
"%u
\n
"
,
pcc
->
sinf
[
SINF_STICKY_KEY
]);
return
s
nprintf
(
buf
,
PAGE_SIZE
,
"%u
\n
"
,
pcc
->
sinf
[
SINF_STICKY_KEY
]);
}
static
ssize_t
set_sticky
(
struct
device
*
dev
,
struct
device_attribute
*
attr
,
...
...
drivers/platform/x86/tc1100-wmi.c
浏览文件 @
8a3f257c
...
...
@@ -94,9 +94,8 @@ static int get_state(u32 *out, u8 instance)
return
-
ENODEV
;
obj
=
(
union
acpi_object
*
)
result
.
pointer
;
if
(
obj
&&
obj
->
type
==
ACPI_TYPE_BUFFER
&&
obj
->
buffer
.
length
==
sizeof
(
u32
))
{
tmp
=
*
((
u32
*
)
obj
->
buffer
.
pointer
);
if
(
obj
&&
obj
->
type
==
ACPI_TYPE_INTEGER
)
{
tmp
=
obj
->
integer
.
value
;
}
else
{
tmp
=
0
;
}
...
...
@@ -109,7 +108,7 @@ static int get_state(u32 *out, u8 instance)
*
out
=
(
tmp
==
3
)
?
1
:
0
;
return
0
;
case
TC1100_INSTANCE_JOGDIAL
:
*
out
=
(
tmp
==
1
)
?
1
:
0
;
*
out
=
(
tmp
==
1
)
?
0
:
1
;
return
0
;
default:
return
-
ENODEV
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录