diff options
author | Nathan Scott <nathans@bruce> | 2006-01-12 13:34:47 +1100 |
---|---|---|
committer | Nathan Scott <nathans@bruce> | 2006-01-12 13:34:47 +1100 |
commit | ddae9c2ea79449beb00027cf77fca6dc489f2d15 (patch) | |
tree | 047c2d7c8d6cbb0721f017514e1d83a20e278d43 /arch/parisc/kernel/topology.c | |
parent | 0d1335b3106687d87fcfa0e4d90f2a961bd7e1db (diff) | |
parent | a4fc7ab1d065a9dd89ed0e74439ef87d4a16e980 (diff) |
Merge HEAD from oss.sgi.com:/oss/git/linux-2.6.git
Diffstat (limited to 'arch/parisc/kernel/topology.c')
-rw-r--r-- | arch/parisc/kernel/topology.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/parisc/kernel/topology.c b/arch/parisc/kernel/topology.c index ac2a4068141..3ba040050e4 100644 --- a/arch/parisc/kernel/topology.c +++ b/arch/parisc/kernel/topology.c @@ -20,8 +20,9 @@ #include <linux/init.h> #include <linux/smp.h> #include <linux/cpu.h> +#include <linux/cache.h> -static struct cpu cpu_devices[NR_CPUS]; +static struct cpu cpu_devices[NR_CPUS] __read_mostly; static int __init topology_init(void) { |