diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-08-27 08:22:20 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-08-27 08:22:20 +0200 |
| commit | 93bb70e0c00f1be4cc857e4d8375c44058cce71e (patch) | |
| tree | 7b6a11844e00b3f4bf8281c7a799e61494220819 /arch/arm/kernel/topology.c | |
| parent | gma500: Fix frequency detection (diff) | |
| parent | Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-93bb70e0c00f1be4cc857e4d8375c44058cce71e.tar.xz linux-93bb70e0c00f1be4cc857e4d8375c44058cce71e.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
There was some merge conflicts in -next and they weren't so pretty, so
backmerge now to avoid them.
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_modes.c
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; |