Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
88d998c2
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,发现更多精彩内容 >>
提交
88d998c2
编写于
1月 16, 2009
作者:
L
Len Brown
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'misc' into release
上级
79491ca4
d08ca2ca
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
23 addition
and
10 deletion
+23
-10
arch/ia64/kernel/kprobes.c
arch/ia64/kernel/kprobes.c
+1
-1
arch/x86/kernel/kprobes.c
arch/x86/kernel/kprobes.c
+1
-1
drivers/acpi/Makefile
drivers/acpi/Makefile
+1
-1
drivers/acpi/sleep.c
drivers/acpi/sleep.c
+0
-0
drivers/misc/Makefile
drivers/misc/Makefile
+0
-1
drivers/platform/x86/Kconfig
drivers/platform/x86/Kconfig
+12
-0
drivers/platform/x86/Makefile
drivers/platform/x86/Makefile
+1
-0
drivers/platform/x86/dell-laptop.c
drivers/platform/x86/dell-laptop.c
+1
-1
drivers/platform/x86/eeepc-laptop.c
drivers/platform/x86/eeepc-laptop.c
+2
-2
include/acpi/actbl.h
include/acpi/actbl.h
+1
-1
kernel/kprobes.c
kernel/kprobes.c
+1
-1
kernel/power/Makefile
kernel/power/Makefile
+2
-1
未找到文件。
arch/ia64/kernel/kprobes.c
浏览文件 @
88d998c2
...
...
@@ -870,7 +870,7 @@ static int __kprobes pre_kprobes_handler(struct die_args *args)
return
1
;
ss_probe:
#if !defined(CONFIG_PREEMPT) || defined(CONFIG_
PM
)
#if !defined(CONFIG_PREEMPT) || defined(CONFIG_
FREEZER
)
if
(
p
->
ainsn
.
inst_flag
==
INST_FLAG_BOOSTABLE
&&
!
p
->
post_handler
)
{
/* Boost up -- we can execute copied instructions directly */
ia64_psr
(
regs
)
->
ri
=
p
->
ainsn
.
slot
;
...
...
arch/x86/kernel/kprobes.c
浏览文件 @
88d998c2
...
...
@@ -446,7 +446,7 @@ void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,
static
void
__kprobes
setup_singlestep
(
struct
kprobe
*
p
,
struct
pt_regs
*
regs
,
struct
kprobe_ctlblk
*
kcb
)
{
#if !defined(CONFIG_PREEMPT) || defined(CONFIG_
PM
)
#if !defined(CONFIG_PREEMPT) || defined(CONFIG_
FREEZER
)
if
(
p
->
ainsn
.
boostable
==
1
&&
!
p
->
post_handler
)
{
/* Boost up -- we can execute copied instructions directly */
reset_current_kprobe
();
...
...
drivers/acpi/Makefile
浏览文件 @
88d998c2
...
...
@@ -19,7 +19,7 @@ obj-y += osl.o utils.o reboot.o\
# sleep related files
obj-y
+=
wakeup.o
obj-y
+=
main
.o
obj-y
+=
sleep
.o
obj-$(CONFIG_ACPI_SLEEP)
+=
proc.o
...
...
drivers/acpi/
main
.c
→
drivers/acpi/
sleep
.c
浏览文件 @
88d998c2
文件已移动
drivers/misc/Makefile
浏览文件 @
88d998c2
...
...
@@ -10,7 +10,6 @@ obj-$(CONFIG_ATMEL_TCLIB) += atmel_tclib.o
obj-$(CONFIG_ICS932S401)
+=
ics932s401.o
obj-$(CONFIG_LKDTM)
+=
lkdtm.o
obj-$(CONFIG_TIFM_CORE)
+=
tifm_core.o
obj-$(CONFIG_DELL_LAPTOP)
+=
dell-laptop.o
obj-$(CONFIG_TIFM_7XX1)
+=
tifm_7xx1.o
obj-$(CONFIG_PHANTOM)
+=
phantom.o
obj-$(CONFIG_SGI_IOC4)
+=
ioc4.o
...
...
drivers/platform/x86/Kconfig
浏览文件 @
88d998c2
...
...
@@ -54,6 +54,18 @@ config ASUS_LAPTOP
If you have an ACPI-compatible ASUS laptop, say Y or M here.
config DELL_LAPTOP
tristate "Dell Laptop Extras (EXPERIMENTAL)"
depends on X86
depends on DCDBAS
depends on EXPERIMENTAL
depends on BACKLIGHT_CLASS_DEVICE
depends on RFKILL
default n
---help---
This driver adds support for rfkill and backlight control to Dell
laptops.
config FUJITSU_LAPTOP
tristate "Fujitsu Laptop Extras"
depends on ACPI
...
...
drivers/platform/x86/Makefile
浏览文件 @
88d998c2
...
...
@@ -6,6 +6,7 @@ obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o
obj-$(CONFIG_EEEPC_LAPTOP)
+=
eeepc-laptop.o
obj-$(CONFIG_MSI_LAPTOP)
+=
msi-laptop.o
obj-$(CONFIG_COMPAL_LAPTOP)
+=
compal-laptop.o
obj-$(CONFIG_DELL_LAPTOP)
+=
dell-laptop.o
obj-$(CONFIG_ACER_WMI)
+=
acer-wmi.o
obj-$(CONFIG_HP_WMI)
+=
hp-wmi.o
obj-$(CONFIG_TC1100_WMI)
+=
tc1100-wmi.o
...
...
drivers/
misc
/dell-laptop.c
→
drivers/
platform/x86
/dell-laptop.c
浏览文件 @
88d998c2
...
...
@@ -22,7 +22,7 @@
#include <linux/rfkill.h>
#include <linux/power_supply.h>
#include <linux/acpi.h>
#include "../firmware/dcdbas.h"
#include "../
../
firmware/dcdbas.h"
#define BRIGHTNESS_TOKEN 0x7d
...
...
drivers/platform/x86/eeepc-laptop.c
浏览文件 @
88d998c2
...
...
@@ -90,7 +90,7 @@ enum {
};
static
const
char
*
cm_getv
[]
=
{
"WLDG"
,
NULL
,
NULL
,
NULL
,
"WLDG"
,
"BTHG"
,
NULL
,
NULL
,
"CAMG"
,
NULL
,
NULL
,
NULL
,
NULL
,
"PBLG"
,
NULL
,
NULL
,
"CFVG"
,
NULL
,
NULL
,
NULL
,
...
...
@@ -99,7 +99,7 @@ static const char *cm_getv[] = {
};
static
const
char
*
cm_setv
[]
=
{
"WLDS"
,
NULL
,
NULL
,
NULL
,
"WLDS"
,
"BTHS"
,
NULL
,
NULL
,
"CAMS"
,
NULL
,
NULL
,
NULL
,
"SDSP"
,
"PBLS"
,
"HDPS"
,
NULL
,
"CFVS"
,
NULL
,
NULL
,
NULL
,
...
...
include/acpi/actbl.h
浏览文件 @
88d998c2
...
...
@@ -245,7 +245,7 @@ struct acpi_table_fadt {
#define ACPI_FADT_POWER_BUTTON (1<<4)
/* 04: Power button is handled as a generic feature */
#define ACPI_FADT_SLEEP_BUTTON (1<<5)
/* 05: Sleep button is handled as a generic feature, or not present */
#define ACPI_FADT_FIXED_RTC (1<<6)
/* 06: RTC wakeup stat not in fixed register space */
#define ACPI_FADT_S4_RTC_WAKE (1<<7)
/* 07: RTC wakeup
stat not
possible from S4 */
#define ACPI_FADT_S4_RTC_WAKE (1<<7)
/* 07: RTC wakeup possible from S4 */
#define ACPI_FADT_32BIT_TIMER (1<<8)
/* 08: tmr_val is 32 bits 0=24-bits */
#define ACPI_FADT_DOCKING_SUPPORTED (1<<9)
/* 09: Docking supported */
#define ACPI_FADT_RESET_REGISTER (1<<10)
/* 10: System reset via the FADT RESET_REG supported */
...
...
kernel/kprobes.c
浏览文件 @
88d998c2
...
...
@@ -123,7 +123,7 @@ static int collect_garbage_slots(void);
static
int
__kprobes
check_safety
(
void
)
{
int
ret
=
0
;
#if defined(CONFIG_PREEMPT) && defined(CONFIG_
PM
)
#if defined(CONFIG_PREEMPT) && defined(CONFIG_
FREEZER
)
ret
=
freeze_processes
();
if
(
ret
==
0
)
{
struct
task_struct
*
p
,
*
q
;
...
...
kernel/power/Makefile
浏览文件 @
88d998c2
...
...
@@ -4,7 +4,8 @@ EXTRA_CFLAGS += -DDEBUG
endif
obj-y
:=
main.o
obj-$(CONFIG_PM_SLEEP)
+=
process.o console.o
obj-$(CONFIG_PM_SLEEP)
+=
console.o
obj-$(CONFIG_FREEZER)
+=
process.o
obj-$(CONFIG_HIBERNATION)
+=
swsusp.o disk.o snapshot.o swap.o user.o
obj-$(CONFIG_MAGIC_SYSRQ)
+=
poweroff.o
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录