Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
d5d74efb
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,发现更多精彩内容 >>
提交
d5d74efb
编写于
12月 20, 2005
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
上级
fc7e1310
5a1244e9
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
30 addition
and
24 deletion
+30
-24
arch/powerpc/configs/cell_defconfig
arch/powerpc/configs/cell_defconfig
+4
-3
arch/powerpc/configs/g5_defconfig
arch/powerpc/configs/g5_defconfig
+5
-4
arch/powerpc/configs/iseries_defconfig
arch/powerpc/configs/iseries_defconfig
+4
-3
arch/powerpc/configs/maple_defconfig
arch/powerpc/configs/maple_defconfig
+5
-5
arch/powerpc/configs/ppc64_defconfig
arch/powerpc/configs/ppc64_defconfig
+4
-3
arch/powerpc/configs/pseries_defconfig
arch/powerpc/configs/pseries_defconfig
+4
-3
arch/powerpc/kernel/entry_64.S
arch/powerpc/kernel/entry_64.S
+2
-2
arch/ppc/platforms/85xx/mpc85xx_cds_common.c
arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+2
-1
未找到文件。
arch/powerpc/configs/cell_defconfig
浏览文件 @
d5d74efb
#
#
# Automatically generated make config: don't edit
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.15-rc
1
# Linux kernel version: 2.6.15-rc
5
# Tue
Nov 15 14:36:20
2005
# Tue
Dec 20 15:59:26
2005
#
#
CONFIG_PPC64=y
CONFIG_PPC64=y
CONFIG_64BIT=y
CONFIG_64BIT=y
...
@@ -53,6 +53,7 @@ CONFIG_KOBJECT_UEVENT=y
...
@@ -53,6 +53,7 @@ CONFIG_KOBJECT_UEVENT=y
# CONFIG_IKCONFIG is not set
# CONFIG_IKCONFIG is not set
# CONFIG_CPUSETS is not set
# CONFIG_CPUSETS is not set
CONFIG_INITRAMFS_SOURCE=""
CONFIG_INITRAMFS_SOURCE=""
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_EMBEDDED is not set
# CONFIG_EMBEDDED is not set
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
# CONFIG_KALLSYMS_ALL is not set
...
@@ -151,7 +152,7 @@ CONFIG_FLATMEM_MANUAL=y
...
@@ -151,7 +152,7 @@ CONFIG_FLATMEM_MANUAL=y
CONFIG_FLATMEM=y
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_FLAT_NODE_MEM_MAP=y
# CONFIG_SPARSEMEM_STATIC is not set
# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SPLIT_PTLOCK_CPUS=4
096
CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_PPC_64K_PAGES is not set
# CONFIG_PPC_64K_PAGES is not set
CONFIG_SCHED_SMT=y
CONFIG_SCHED_SMT=y
CONFIG_PROC_DEVICETREE=y
CONFIG_PROC_DEVICETREE=y
...
...
arch/powerpc/configs/g5_defconfig
浏览文件 @
d5d74efb
#
#
# Automatically generated make config: don't edit
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.15-rc
1
# Linux kernel version: 2.6.15-rc
5
# Tue
Nov 15 14:39:2
0 2005
# Tue
Dec 20 15:59:3
0 2005
#
#
CONFIG_PPC64=y
CONFIG_PPC64=y
CONFIG_64BIT=y
CONFIG_64BIT=y
...
@@ -53,6 +53,7 @@ CONFIG_IKCONFIG=y
...
@@ -53,6 +53,7 @@ CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_IKCONFIG_PROC=y
# CONFIG_CPUSETS is not set
# CONFIG_CPUSETS is not set
CONFIG_INITRAMFS_SOURCE=""
CONFIG_INITRAMFS_SOURCE=""
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_EMBEDDED is not set
# CONFIG_EMBEDDED is not set
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
# CONFIG_KALLSYMS_ALL is not set
...
@@ -162,7 +163,7 @@ CONFIG_FLATMEM_MANUAL=y
...
@@ -162,7 +163,7 @@ CONFIG_FLATMEM_MANUAL=y
CONFIG_FLATMEM=y
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_FLAT_NODE_MEM_MAP=y
# CONFIG_SPARSEMEM_STATIC is not set
# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SPLIT_PTLOCK_CPUS=4
096
CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_PPC_64K_PAGES is not set
# CONFIG_PPC_64K_PAGES is not set
# CONFIG_SCHED_SMT is not set
# CONFIG_SCHED_SMT is not set
CONFIG_PROC_DEVICETREE=y
CONFIG_PROC_DEVICETREE=y
...
@@ -1203,6 +1204,7 @@ CONFIG_USB_MON=y
...
@@ -1203,6 +1204,7 @@ CONFIG_USB_MON=y
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_GENERIC=y
# CONFIG_USB_SERIAL_AIRPRIME is not set
# CONFIG_USB_SERIAL_AIRPRIME is not set
# CONFIG_USB_SERIAL_ANYDATA is not set
CONFIG_USB_SERIAL_BELKIN=m
CONFIG_USB_SERIAL_BELKIN=m
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CP2101 is not set
# CONFIG_USB_SERIAL_CP2101 is not set
...
@@ -1233,7 +1235,6 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
...
@@ -1233,7 +1235,6 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_NOKIA_DKU2 is not set
CONFIG_USB_SERIAL_PL2303=m
CONFIG_USB_SERIAL_PL2303=m
# CONFIG_USB_SERIAL_HP4X is not set
# CONFIG_USB_SERIAL_HP4X is not set
CONFIG_USB_SERIAL_SAFE=m
CONFIG_USB_SERIAL_SAFE=m
...
...
arch/powerpc/configs/iseries_defconfig
浏览文件 @
d5d74efb
#
#
# Automatically generated make config: don't edit
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.15-rc
1
# Linux kernel version: 2.6.15-rc
5
# Tue
Nov 15 14:38:09
2005
# Tue
Dec 20 15:59:32
2005
#
#
CONFIG_PPC64=y
CONFIG_PPC64=y
CONFIG_64BIT=y
CONFIG_64BIT=y
...
@@ -55,6 +55,7 @@ CONFIG_IKCONFIG=y
...
@@ -55,6 +55,7 @@ CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_IKCONFIG_PROC=y
# CONFIG_CPUSETS is not set
# CONFIG_CPUSETS is not set
CONFIG_INITRAMFS_SOURCE=""
CONFIG_INITRAMFS_SOURCE=""
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_EMBEDDED is not set
# CONFIG_EMBEDDED is not set
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
# CONFIG_KALLSYMS_ALL is not set
...
@@ -144,7 +145,7 @@ CONFIG_FLATMEM_MANUAL=y
...
@@ -144,7 +145,7 @@ CONFIG_FLATMEM_MANUAL=y
CONFIG_FLATMEM=y
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_FLAT_NODE_MEM_MAP=y
# CONFIG_SPARSEMEM_STATIC is not set
# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SPLIT_PTLOCK_CPUS=4
096
CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_PPC_64K_PAGES is not set
# CONFIG_PPC_64K_PAGES is not set
# CONFIG_SCHED_SMT is not set
# CONFIG_SCHED_SMT is not set
CONFIG_PROC_DEVICETREE=y
CONFIG_PROC_DEVICETREE=y
...
...
arch/powerpc/configs/maple_defconfig
浏览文件 @
d5d74efb
#
#
# Automatically generated make config: don't edit
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.15-rc
1
# Linux kernel version: 2.6.15-rc
5
# Tue
Nov 15 14:38:58
2005
# Tue
Dec 20 15:59:36
2005
#
#
CONFIG_PPC64=y
CONFIG_PPC64=y
CONFIG_64BIT=y
CONFIG_64BIT=y
...
@@ -53,6 +53,7 @@ CONFIG_IKCONFIG=y
...
@@ -53,6 +53,7 @@ CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_IKCONFIG_PROC=y
# CONFIG_CPUSETS is not set
# CONFIG_CPUSETS is not set
CONFIG_INITRAMFS_SOURCE=""
CONFIG_INITRAMFS_SOURCE=""
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_EMBEDDED is not set
# CONFIG_EMBEDDED is not set
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
CONFIG_KALLSYMS_ALL=y
...
@@ -149,7 +150,7 @@ CONFIG_FLATMEM_MANUAL=y
...
@@ -149,7 +150,7 @@ CONFIG_FLATMEM_MANUAL=y
CONFIG_FLATMEM=y
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_FLAT_NODE_MEM_MAP=y
# CONFIG_SPARSEMEM_STATIC is not set
# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SPLIT_PTLOCK_CPUS=4
096
CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_PPC_64K_PAGES is not set
# CONFIG_PPC_64K_PAGES is not set
# CONFIG_SCHED_SMT is not set
# CONFIG_SCHED_SMT is not set
CONFIG_PROC_DEVICETREE=y
CONFIG_PROC_DEVICETREE=y
...
@@ -242,7 +243,6 @@ CONFIG_TCP_CONG_BIC=y
...
@@ -242,7 +243,6 @@ CONFIG_TCP_CONG_BIC=y
# QoS and/or fair queueing
# QoS and/or fair queueing
#
#
# CONFIG_NET_SCHED is not set
# CONFIG_NET_SCHED is not set
# CONFIG_NET_CLS_ROUTE is not set
#
#
# Network testing
# Network testing
...
@@ -794,6 +794,7 @@ CONFIG_USB_SERIAL=y
...
@@ -794,6 +794,7 @@ CONFIG_USB_SERIAL=y
# CONFIG_USB_SERIAL_CONSOLE is not set
# CONFIG_USB_SERIAL_CONSOLE is not set
CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_GENERIC=y
# CONFIG_USB_SERIAL_AIRPRIME is not set
# CONFIG_USB_SERIAL_AIRPRIME is not set
# CONFIG_USB_SERIAL_ANYDATA is not set
# CONFIG_USB_SERIAL_BELKIN is not set
# CONFIG_USB_SERIAL_BELKIN is not set
# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
# CONFIG_USB_SERIAL_CP2101 is not set
# CONFIG_USB_SERIAL_CP2101 is not set
...
@@ -824,7 +825,6 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
...
@@ -824,7 +825,6 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
# CONFIG_USB_SERIAL_KLSI is not set
# CONFIG_USB_SERIAL_KLSI is not set
# CONFIG_USB_SERIAL_KOBIL_SCT is not set
# CONFIG_USB_SERIAL_KOBIL_SCT is not set
# CONFIG_USB_SERIAL_MCT_U232 is not set
# CONFIG_USB_SERIAL_MCT_U232 is not set
# CONFIG_USB_SERIAL_NOKIA_DKU2 is not set
# CONFIG_USB_SERIAL_PL2303 is not set
# CONFIG_USB_SERIAL_PL2303 is not set
# CONFIG_USB_SERIAL_HP4X is not set
# CONFIG_USB_SERIAL_HP4X is not set
# CONFIG_USB_SERIAL_SAFE is not set
# CONFIG_USB_SERIAL_SAFE is not set
...
...
arch/powerpc/configs/ppc64_defconfig
浏览文件 @
d5d74efb
#
#
# Automatically generated make config: don't edit
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.15-rc
1
# Linux kernel version: 2.6.15-rc
5
#
Fri Nov 18 16:23:24
2005
#
Tue Dec 20 15:59:38
2005
#
#
CONFIG_PPC64=y
CONFIG_PPC64=y
CONFIG_64BIT=y
CONFIG_64BIT=y
...
@@ -54,6 +54,7 @@ CONFIG_IKCONFIG=y
...
@@ -54,6 +54,7 @@ CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_IKCONFIG_PROC=y
CONFIG_CPUSETS=y
CONFIG_CPUSETS=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_INITRAMFS_SOURCE=""
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_EMBEDDED is not set
# CONFIG_EMBEDDED is not set
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
CONFIG_KALLSYMS_ALL=y
...
@@ -176,7 +177,7 @@ CONFIG_HAVE_MEMORY_PRESENT=y
...
@@ -176,7 +177,7 @@ CONFIG_HAVE_MEMORY_PRESENT=y
# CONFIG_SPARSEMEM_STATIC is not set
# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SPARSEMEM_EXTREME=y
CONFIG_SPARSEMEM_EXTREME=y
# CONFIG_MEMORY_HOTPLUG is not set
# CONFIG_MEMORY_HOTPLUG is not set
CONFIG_SPLIT_PTLOCK_CPUS=4
096
CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_PPC_64K_PAGES is not set
# CONFIG_PPC_64K_PAGES is not set
# CONFIG_SCHED_SMT is not set
# CONFIG_SCHED_SMT is not set
CONFIG_PROC_DEVICETREE=y
CONFIG_PROC_DEVICETREE=y
...
...
arch/powerpc/configs/pseries_defconfig
浏览文件 @
d5d74efb
#
#
# Automatically generated make config: don't edit
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.15-rc
1
# Linux kernel version: 2.6.15-rc
5
# Tue
Nov 15 14:36:55
2005
# Tue
Dec 20 15:59:40
2005
#
#
CONFIG_PPC64=y
CONFIG_PPC64=y
CONFIG_64BIT=y
CONFIG_64BIT=y
...
@@ -55,6 +55,7 @@ CONFIG_IKCONFIG=y
...
@@ -55,6 +55,7 @@ CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_IKCONFIG_PROC=y
CONFIG_CPUSETS=y
CONFIG_CPUSETS=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_INITRAMFS_SOURCE=""
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_EMBEDDED is not set
# CONFIG_EMBEDDED is not set
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
CONFIG_KALLSYMS_ALL=y
...
@@ -163,7 +164,7 @@ CONFIG_HAVE_MEMORY_PRESENT=y
...
@@ -163,7 +164,7 @@ CONFIG_HAVE_MEMORY_PRESENT=y
# CONFIG_SPARSEMEM_STATIC is not set
# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SPARSEMEM_EXTREME=y
CONFIG_SPARSEMEM_EXTREME=y
# CONFIG_MEMORY_HOTPLUG is not set
# CONFIG_MEMORY_HOTPLUG is not set
CONFIG_SPLIT_PTLOCK_CPUS=4
096
CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
# CONFIG_PPC_64K_PAGES is not set
# CONFIG_PPC_64K_PAGES is not set
CONFIG_SCHED_SMT=y
CONFIG_SCHED_SMT=y
...
...
arch/powerpc/kernel/entry_64.S
浏览文件 @
d5d74efb
...
@@ -183,8 +183,8 @@ syscall_exit_trace_cont:
...
@@ -183,8 +183,8 @@ syscall_exit_trace_cont:
ld
r13
,
GPR13
(
r1
)
/*
returning
to
usermode
*/
ld
r13
,
GPR13
(
r1
)
/*
returning
to
usermode
*/
1
:
ld
r2
,
GPR2
(
r1
)
1
:
ld
r2
,
GPR2
(
r1
)
li
r12
,
MSR_RI
li
r12
,
MSR_RI
andc
r1
0
,
r10
,
r12
andc
r1
1
,
r10
,
r12
mtmsrd
r1
0
,
1
/*
clear
MSR
.
RI
*/
mtmsrd
r1
1
,
1
/*
clear
MSR
.
RI
*/
ld
r1
,
GPR1
(
r1
)
ld
r1
,
GPR1
(
r1
)
mtlr
r4
mtlr
r4
mtcr
r5
mtcr
r5
...
...
arch/ppc/platforms/85xx/mpc85xx_cds_common.c
浏览文件 @
d5d74efb
...
@@ -130,10 +130,11 @@ mpc85xx_cds_show_cpuinfo(struct seq_file *m)
...
@@ -130,10 +130,11 @@ mpc85xx_cds_show_cpuinfo(struct seq_file *m)
}
}
#ifdef CONFIG_CPM2
#ifdef CONFIG_CPM2
static
void
cpm2_cascade
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
)
static
irqreturn_t
cpm2_cascade
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
)
{
{
while
((
irq
=
cpm2_get_irq
(
regs
))
>=
0
)
while
((
irq
=
cpm2_get_irq
(
regs
))
>=
0
)
__do_IRQ
(
irq
,
regs
);
__do_IRQ
(
irq
,
regs
);
return
IRQ_HANDLED
;
}
}
static
struct
irqaction
cpm2_irqaction
=
{
static
struct
irqaction
cpm2_irqaction
=
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录