Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
28247644
L
linux
项目概览
Linux-御风守护者
/
linux
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
28247644
编写于
12月 14, 2005
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
上级
1542272a
c7868048
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
20 addition
and
5 deletion
+20
-5
arch/arm/kernel/module.c
arch/arm/kernel/module.c
+2
-0
arch/arm/mach-pxa/pm.c
arch/arm/mach-pxa/pm.c
+5
-4
arch/ia64/kernel/process.c
arch/ia64/kernel/process.c
+2
-0
drivers/mmc/mmc.c
drivers/mmc/mmc.c
+9
-1
include/asm-arm/elf.h
include/asm-arm/elf.h
+2
-0
未找到文件。
arch/arm/kernel/module.c
浏览文件 @
28247644
...
...
@@ -101,6 +101,8 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
break
;
case
R_ARM_PC24
:
case
R_ARM_CALL
:
case
R_ARM_JUMP24
:
offset
=
(
*
(
u32
*
)
loc
&
0x00ffffff
)
<<
2
;
if
(
offset
&
0x02000000
)
offset
-=
0x04000000
;
...
...
arch/arm/mach-pxa/pm.c
浏览文件 @
28247644
...
...
@@ -155,19 +155,20 @@ int pxa_pm_enter(suspend_state_t state)
PSPR
=
0
;
/* restore registers */
RESTORE_GPLEVEL
(
0
);
RESTORE_GPLEVEL
(
1
);
RESTORE_GPLEVEL
(
2
);
RESTORE
(
GPDR0
);
RESTORE
(
GPDR1
);
RESTORE
(
GPDR2
);
RESTORE
(
GAFR0_L
);
RESTORE
(
GAFR0_U
);
RESTORE
(
GAFR1_L
);
RESTORE
(
GAFR1_U
);
RESTORE
(
GAFR2_L
);
RESTORE
(
GAFR2_U
);
RESTORE_GPLEVEL
(
0
);
RESTORE_GPLEVEL
(
1
);
RESTORE_GPLEVEL
(
2
);
RESTORE
(
GPDR0
);
RESTORE
(
GPDR1
);
RESTORE
(
GPDR2
);
RESTORE
(
GRER0
);
RESTORE
(
GRER1
);
RESTORE
(
GRER2
);
RESTORE
(
GFER0
);
RESTORE
(
GFER1
);
RESTORE
(
GFER2
);
RESTORE
(
PGSR0
);
RESTORE
(
PGSR1
);
RESTORE
(
PGSR2
);
#ifdef CONFIG_PXA27x
RESTORE
(
MDREFR
);
RESTORE
(
GAFR3_L
);
RESTORE
(
GAFR3_U
);
RESTORE_GPLEVEL
(
3
);
RESTORE
(
GPDR3
);
RESTORE
(
GRER3
);
RESTORE
(
GFER3
);
RESTORE
(
PGSR3
);
RESTORE_GPLEVEL
(
3
);
RESTORE
(
GPDR3
);
RESTORE
(
GAFR3_L
);
RESTORE
(
GAFR3_U
);
RESTORE
(
GRER3
);
RESTORE
(
GFER3
);
RESTORE
(
PGSR3
);
RESTORE
(
PWER
);
RESTORE
(
PCFR
);
RESTORE
(
PRER
);
RESTORE
(
PFER
);
RESTORE
(
PKWR
);
#endif
...
...
arch/ia64/kernel/process.c
浏览文件 @
28247644
...
...
@@ -721,11 +721,13 @@ flush_thread (void)
/* drop floating-point and debug-register state if it exists: */
current
->
thread
.
flags
&=
~
(
IA64_THREAD_FPH_VALID
|
IA64_THREAD_DBG_VALID
);
ia64_drop_fpu
(
current
);
#ifdef CONFIG_IA32_SUPPORT
if
(
IS_IA32_PROCESS
(
ia64_task_regs
(
current
)))
{
ia32_drop_partial_page_list
(
current
);
current
->
thread
.
task_size
=
IA32_PAGE_OFFSET
;
set_fs
(
USER_DS
);
}
#endif
}
/*
...
...
drivers/mmc/mmc.c
浏览文件 @
28247644
...
...
@@ -679,7 +679,15 @@ static void mmc_idle_cards(struct mmc_host *host)
}
/*
* Apply power to the MMC stack.
* Apply power to the MMC stack. This is a two-stage process.
* First, we enable power to the card without the clock running.
* We then wait a bit for the power to stabilise. Finally,
* enable the bus drivers and clock to the card.
*
* We must _NOT_ enable the clock prior to power stablising.
*
* If a host does all the power sequencing itself, ignore the
* initial MMC_POWER_UP stage.
*/
static
void
mmc_power_up
(
struct
mmc_host
*
host
)
{
...
...
include/asm-arm/elf.h
浏览文件 @
28247644
...
...
@@ -22,6 +22,8 @@ typedef unsigned long elf_freg_t[3];
#define R_ARM_NONE 0
#define R_ARM_PC24 1
#define R_ARM_ABS32 2
#define R_ARM_CALL 28
#define R_ARM_JUMP24 29
#define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t))
typedef
elf_greg_t
elf_gregset_t
[
ELF_NGREG
];
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录