Merge branch 'core/topology' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core/topology' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: cputopology: always define CPU topology information, clean up cpu topology: always define CPU topology information
This commit is contained in:
@@ -93,47 +93,27 @@ static ssize_t show_##name##_list(struct sys_device *dev, char *buf) \
|
||||
#define define_siblings_show_func(name) \
|
||||
define_siblings_show_map(name); define_siblings_show_list(name)
|
||||
|
||||
#ifdef topology_physical_package_id
|
||||
define_id_show_func(physical_package_id);
|
||||
define_one_ro(physical_package_id);
|
||||
#define ref_physical_package_id_attr &attr_physical_package_id.attr,
|
||||
#else
|
||||
#define ref_physical_package_id_attr
|
||||
#endif
|
||||
|
||||
#ifdef topology_core_id
|
||||
define_id_show_func(core_id);
|
||||
define_one_ro(core_id);
|
||||
#define ref_core_id_attr &attr_core_id.attr,
|
||||
#else
|
||||
#define ref_core_id_attr
|
||||
#endif
|
||||
|
||||
#ifdef topology_thread_siblings
|
||||
define_siblings_show_func(thread_siblings);
|
||||
define_one_ro(thread_siblings);
|
||||
define_one_ro(thread_siblings_list);
|
||||
#define ref_thread_siblings_attr \
|
||||
&attr_thread_siblings.attr, &attr_thread_siblings_list.attr,
|
||||
#else
|
||||
#define ref_thread_siblings_attr
|
||||
#endif
|
||||
|
||||
#ifdef topology_core_siblings
|
||||
define_siblings_show_func(core_siblings);
|
||||
define_one_ro(core_siblings);
|
||||
define_one_ro(core_siblings_list);
|
||||
#define ref_core_siblings_attr \
|
||||
&attr_core_siblings.attr, &attr_core_siblings_list.attr,
|
||||
#else
|
||||
#define ref_core_siblings_attr
|
||||
#endif
|
||||
|
||||
static struct attribute *default_attrs[] = {
|
||||
ref_physical_package_id_attr
|
||||
ref_core_id_attr
|
||||
ref_thread_siblings_attr
|
||||
ref_core_siblings_attr
|
||||
&attr_physical_package_id.attr,
|
||||
&attr_core_id.attr,
|
||||
&attr_thread_siblings.attr,
|
||||
&attr_thread_siblings_list.attr,
|
||||
&attr_core_siblings.attr,
|
||||
&attr_core_siblings_list.attr,
|
||||
NULL
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user