b13d3720ec
Due to changeset ba84be2338
("remove
linux/hardirq.h from asm-generic/local.h") the sparc64 build started
failing on drivers/base/topology.c:
drivers/base/topology.c: In function ‘show_physical_package_id’:
drivers/base/topology.c:103: error: implicit declaration of function ‘cpu_data’
drivers/base/topology.c:103: error: request for member ‘proc_id’ in something not a structure or union
drivers/base/topology.c: In function ‘show_core_id’:
drivers/base/topology.c:106: error: request for member ‘core_id’ in something not a structure or union
Adding the obvious fix of including asm/cpudata.h into asm/topology.h on
sparc64 doesn't fix it, in fact it makes things worse because of the
header file dependency chain:
linux/gfp.h --> linux/mmzone.h --> linux/topology.h -->
asm/topology.h --> asm/cpudata.h --> linux/percpu.h -->
linux/slab.h
which results in:
include/linux/slub_def.h: In function ‘kmalloc_large’:
include/linux/slub_def.h:209: error: implicit declaration of function ‘__get_free_pages’
include/linux/slub_def.h:209: error: ‘__GFP_COMP’ undeclared (first use in this function)
include/linux/slub_def.h:209: error: (Each undeclared identifier is reported only once
include/linux/slub_def.h:209: error: for each function it appears in.)
include/linux/slub_def.h:209: warning: cast to pointer from integer of different size
The simplest thing to do is to add yet another one-off hack like parts
of the guilty changeset did, by putting an explicit linux/hardirq.h
include into drivers/base/topology.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
184 lines
4.8 KiB
C
184 lines
4.8 KiB
C
/*
|
|
* driver/base/topology.c - Populate sysfs with cpu topology information
|
|
*
|
|
* Written by: Zhang Yanmin, Intel Corporation
|
|
*
|
|
* Copyright (C) 2006, Intel Corp.
|
|
*
|
|
* All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
|
|
* NON INFRINGEMENT. See the GNU General Public License for more
|
|
* details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*
|
|
*/
|
|
#include <linux/sysdev.h>
|
|
#include <linux/init.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/cpu.h>
|
|
#include <linux/module.h>
|
|
#include <linux/hardirq.h>
|
|
#include <linux/topology.h>
|
|
|
|
#define define_one_ro(_name) \
|
|
static SYSDEV_ATTR(_name, 0444, show_##_name, NULL)
|
|
|
|
#define define_id_show_func(name) \
|
|
static ssize_t show_##name(struct sys_device *dev, \
|
|
struct sysdev_attribute *attr, char *buf) \
|
|
{ \
|
|
unsigned int cpu = dev->id; \
|
|
return sprintf(buf, "%d\n", topology_##name(cpu)); \
|
|
}
|
|
|
|
#if defined(topology_thread_siblings) || defined(topology_core_siblings)
|
|
static ssize_t show_cpumap(int type, cpumask_t *mask, char *buf)
|
|
{
|
|
ptrdiff_t len = PTR_ALIGN(buf + PAGE_SIZE - 1, PAGE_SIZE) - buf;
|
|
int n = 0;
|
|
|
|
if (len > 1) {
|
|
n = type?
|
|
cpulist_scnprintf(buf, len-2, mask) :
|
|
cpumask_scnprintf(buf, len-2, mask);
|
|
buf[n++] = '\n';
|
|
buf[n] = '\0';
|
|
}
|
|
return n;
|
|
}
|
|
#endif
|
|
|
|
#ifdef arch_provides_topology_pointers
|
|
#define define_siblings_show_map(name) \
|
|
static ssize_t show_##name(struct sys_device *dev, \
|
|
struct sysdev_attribute *attr, char *buf) \
|
|
{ \
|
|
unsigned int cpu = dev->id; \
|
|
return show_cpumap(0, &(topology_##name(cpu)), buf); \
|
|
}
|
|
|
|
#define define_siblings_show_list(name) \
|
|
static ssize_t show_##name##_list(struct sys_device *dev, \
|
|
struct sysdev_attribute *attr, \
|
|
char *buf) \
|
|
{ \
|
|
unsigned int cpu = dev->id; \
|
|
return show_cpumap(1, &(topology_##name(cpu)), buf); \
|
|
}
|
|
|
|
#else
|
|
#define define_siblings_show_map(name) \
|
|
static ssize_t show_##name(struct sys_device *dev, \
|
|
struct sysdev_attribute *attr, char *buf) \
|
|
{ \
|
|
unsigned int cpu = dev->id; \
|
|
cpumask_t mask = topology_##name(cpu); \
|
|
return show_cpumap(0, &mask, buf); \
|
|
}
|
|
|
|
#define define_siblings_show_list(name) \
|
|
static ssize_t show_##name##_list(struct sys_device *dev, \
|
|
struct sysdev_attribute *attr, \
|
|
char *buf) \
|
|
{ \
|
|
unsigned int cpu = dev->id; \
|
|
cpumask_t mask = topology_##name(cpu); \
|
|
return show_cpumap(1, &mask, buf); \
|
|
}
|
|
#endif
|
|
|
|
#define define_siblings_show_func(name) \
|
|
define_siblings_show_map(name); define_siblings_show_list(name)
|
|
|
|
define_id_show_func(physical_package_id);
|
|
define_one_ro(physical_package_id);
|
|
|
|
define_id_show_func(core_id);
|
|
define_one_ro(core_id);
|
|
|
|
define_siblings_show_func(thread_siblings);
|
|
define_one_ro(thread_siblings);
|
|
define_one_ro(thread_siblings_list);
|
|
|
|
define_siblings_show_func(core_siblings);
|
|
define_one_ro(core_siblings);
|
|
define_one_ro(core_siblings_list);
|
|
|
|
static struct attribute *default_attrs[] = {
|
|
&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
|
|
};
|
|
|
|
static struct attribute_group topology_attr_group = {
|
|
.attrs = default_attrs,
|
|
.name = "topology"
|
|
};
|
|
|
|
/* Add/Remove cpu_topology interface for CPU device */
|
|
static int __cpuinit topology_add_dev(unsigned int cpu)
|
|
{
|
|
struct sys_device *sys_dev = get_cpu_sysdev(cpu);
|
|
|
|
return sysfs_create_group(&sys_dev->kobj, &topology_attr_group);
|
|
}
|
|
|
|
static void __cpuinit topology_remove_dev(unsigned int cpu)
|
|
{
|
|
struct sys_device *sys_dev = get_cpu_sysdev(cpu);
|
|
|
|
sysfs_remove_group(&sys_dev->kobj, &topology_attr_group);
|
|
}
|
|
|
|
static int __cpuinit topology_cpu_callback(struct notifier_block *nfb,
|
|
unsigned long action, void *hcpu)
|
|
{
|
|
unsigned int cpu = (unsigned long)hcpu;
|
|
int rc = 0;
|
|
|
|
switch (action) {
|
|
case CPU_UP_PREPARE:
|
|
case CPU_UP_PREPARE_FROZEN:
|
|
rc = topology_add_dev(cpu);
|
|
break;
|
|
case CPU_UP_CANCELED:
|
|
case CPU_UP_CANCELED_FROZEN:
|
|
case CPU_DEAD:
|
|
case CPU_DEAD_FROZEN:
|
|
topology_remove_dev(cpu);
|
|
break;
|
|
}
|
|
return rc ? NOTIFY_BAD : NOTIFY_OK;
|
|
}
|
|
|
|
static int __cpuinit topology_sysfs_init(void)
|
|
{
|
|
int cpu;
|
|
int rc;
|
|
|
|
for_each_online_cpu(cpu) {
|
|
rc = topology_add_dev(cpu);
|
|
if (rc)
|
|
return rc;
|
|
}
|
|
hotcpu_notifier(topology_cpu_callback, 0);
|
|
|
|
return 0;
|
|
}
|
|
|
|
device_initcall(topology_sysfs_init);
|