Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
cc6e8e08
L
linux
项目概览
xiphi1978
/
linux
通知
2
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,发现更多精彩内容 >>
提交
cc6e8e08
编写于
10月 11, 2007
作者:
R
Ralf Baechle
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[MIPS] Remove IP27 specific structures from struct cpuinfo_mips
Signed-off-by:
N
Ralf Baechle
<
ralf@linux-mips.org
>
上级
641e97f3
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
25 addition
and
22 deletion
+25
-22
arch/mips/sgi-ip27/ip27-init.c
arch/mips/sgi-ip27/ip27-init.c
+3
-0
arch/mips/sgi-ip27/ip27-smp.c
arch/mips/sgi-ip27/ip27-smp.c
+1
-1
include/asm-mips/cpu-info.h
include/asm-mips/cpu-info.h
+0
-18
include/asm-mips/mach-ip27/topology.h
include/asm-mips/mach-ip27/topology.h
+19
-1
include/asm-mips/sn/arch.h
include/asm-mips/sn/arch.h
+2
-2
未找到文件。
arch/mips/sgi-ip27/ip27-init.c
浏览文件 @
cc6e8e08
...
...
@@ -47,6 +47,9 @@ cnodeid_t cpuid_to_compact_node[MAXCPUS];
EXPORT_SYMBOL
(
nasid_to_compact_node
);
struct
cpuinfo_ip27
sn_cpu_info
[
NR_CPUS
];
EXPORT_SYMBOL_GPL
(
sn_cpu_info
);
extern
void
pcibr_setup
(
cnodeid_t
);
extern
void
xtalk_probe_node
(
cnodeid_t
nid
);
...
...
arch/mips/sgi-ip27/ip27-smp.c
浏览文件 @
cc6e8e08
...
...
@@ -33,7 +33,7 @@ static void alloc_cpupda(cpuid_t cpu, int cpunum)
nasid_t
nasid
=
COMPACT_TO_NASID_NODEID
(
node
);
cputonasid
(
cpunum
)
=
nasid
;
cpu_data
[
cpunum
].
p_nodeid
=
node
;
sn_cpu_info
[
cpunum
].
p_nodeid
=
node
;
cputoslice
(
cpunum
)
=
get_cpu_slice
(
cpu
);
}
...
...
include/asm-mips/cpu-info.h
浏览文件 @
cc6e8e08
...
...
@@ -14,10 +14,6 @@
#include <asm/cache.h>
#ifdef CONFIG_SGI_IP27
#include <asm/sn/types.h>
#endif
/*
* Descriptor for a cache
*/
...
...
@@ -43,20 +39,6 @@ struct cache_desc {
struct
cpuinfo_mips
{
unsigned
long
udelay_val
;
unsigned
long
asid_cache
;
#if defined(CONFIG_SGI_IP27)
// cpuid_t p_cpuid; /* PROM assigned cpuid */
cnodeid_t
p_nodeid
;
/* my node ID in compact-id-space */
nasid_t
p_nasid
;
/* my node ID in numa-as-id-space */
unsigned
char
p_slice
;
/* Physical position on node board */
#endif
#if 0
unsigned long loops_per_sec;
unsigned long ipi_count;
unsigned long irq_attempt[NR_IRQS];
unsigned long smp_local_irq_count;
unsigned long prof_multiplier;
unsigned long prof_counter;
#endif
/*
* Capability and feature descriptor structure for MIPS CPU
...
...
include/asm-mips/mach-ip27/topology.h
浏览文件 @
cc6e8e08
...
...
@@ -2,9 +2,27 @@
#define _ASM_MACH_TOPOLOGY_H 1
#include <asm/sn/hub.h>
#include <asm/sn/types.h>
#include <asm/mmzone.h>
#define cpu_to_node(cpu) (cpu_data[(cpu)].p_nodeid)
struct
cpuinfo_ip27
{
// cpuid_t p_cpuid; /* PROM assigned cpuid */
cnodeid_t
p_nodeid
;
/* my node ID in compact-id-space */
nasid_t
p_nasid
;
/* my node ID in numa-as-id-space */
unsigned
char
p_slice
;
/* Physical position on node board */
#if 0
unsigned long loops_per_sec;
unsigned long ipi_count;
unsigned long irq_attempt[NR_IRQS];
unsigned long smp_local_irq_count;
unsigned long prof_multiplier;
unsigned long prof_counter;
#endif
};
extern
struct
cpuinfo_ip27
sn_cpu_info
[
NR_CPUS
];
#define cpu_to_node(cpu) (sn_cpu_info[(cpu)].p_nodeid)
#define parent_node(node) (node)
#define node_to_cpumask(node) (hub_data(node)->h_cpus)
#define node_to_first_cpu(node) (first_cpu(node_to_cpumask(node)))
...
...
include/asm-mips/sn/arch.h
浏览文件 @
cc6e8e08
...
...
@@ -19,8 +19,8 @@
typedef
u64
hubreg_t
;
#define cputonasid(cpu)
(cpu_data
[(cpu)].p_nasid)
#define cputoslice(cpu)
(cpu_data
[(cpu)].p_slice)
#define cputonasid(cpu)
(sn_cpu_info
[(cpu)].p_nasid)
#define cputoslice(cpu)
(sn_cpu_info
[(cpu)].p_slice)
#define makespnum(_nasid, _slice) \
(((_nasid) << CPUS_PER_NODE_SHFT) | (_slice))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录