diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-07-24 05:42:34 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-07-24 05:42:34 -0400 |
| commit | 43cbd286fbba4bfb0c2ef05dc62522dfd5a2c000 (patch) | |
| tree | 7184a24f04c72987e725e50e66db530e6f618220 /lib/percpu_counter.c | |
| parent | fee4b700a4e9e446151eb5a03874ca8666323113 (diff) | |
| parent | c5ae4dca11523dff15cfb1763b64a71b805976aa (diff) | |
Merge tag 'asoc-v3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.11
A few small updates again, the sgtl5000 one fixes some newly triggered
issues due to some probe ordering changes which were introduced in the
last merge window.
Diffstat (limited to 'lib/percpu_counter.c')
| -rw-r--r-- | lib/percpu_counter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c index 1fc23a3277e1..93c5d5ecff4e 100644 --- a/lib/percpu_counter.c +++ b/lib/percpu_counter.c | |||
| @@ -158,7 +158,7 @@ static void compute_batch_value(void) | |||
| 158 | percpu_counter_batch = max(32, nr*2); | 158 | percpu_counter_batch = max(32, nr*2); |
| 159 | } | 159 | } |
| 160 | 160 | ||
| 161 | static int __cpuinit percpu_counter_hotcpu_callback(struct notifier_block *nb, | 161 | static int percpu_counter_hotcpu_callback(struct notifier_block *nb, |
| 162 | unsigned long action, void *hcpu) | 162 | unsigned long action, void *hcpu) |
| 163 | { | 163 | { |
| 164 | #ifdef CONFIG_HOTPLUG_CPU | 164 | #ifdef CONFIG_HOTPLUG_CPU |