diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-22 23:21:38 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-22 23:21:38 +0200 |
| commit | 1304a7343b30fc4f16045412efdbb4179a3d9255 (patch) | |
| tree | 83d667ac4f62e30f70305ce4cc7e030e3465f92e /arch/arm/kernel/topology.c | |
| parent | team: add support for non-ethernet devices (diff) | |
| parent | Merge branch 'akpm' (Andrew's patch-bomb) (diff) | |
| download | linux-1304a7343b30fc4f16045412efdbb4179a3d9255.tar.xz linux-1304a7343b30fc4f16045412efdbb4179a3d9255.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/arm/kernel/topology.c')
| -rw-r--r-- | arch/arm/kernel/topology.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index 198b08456e90..26c12c6440fc 100644 --- a/arch/arm/kernel/topology.c +++ b/arch/arm/kernel/topology.c @@ -321,7 +321,7 @@ void store_cpu_topology(unsigned int cpuid) * init_cpu_topology is called at boot when only one cpu is running * which prevent simultaneous write access to cpu_topology array */ -void init_cpu_topology(void) +void __init init_cpu_topology(void) { unsigned int cpu; |