diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-04 13:19:05 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-04 13:19:05 -0700 |
| commit | 6a33fc8cacfc7fac829c72bd321868be7e72f609 (patch) | |
| tree | ca8572f214a30c4743b731b4ab2809a980b78369 /kernel/rcutorture.c | |
| parent | 3bd957978bb50390bb07678bc4c125989e9a81a2 (diff) | |
| parent | 2746a7c272a3242f919fa2fd5a5f2d9f8a41173a (diff) | |
| download | linux-rt-6a33fc8cacfc7fac829c72bd321868be7e72f609.tar.gz | |
Merge tag 'fixes-non-3.12' of git://git.infradead.org/linux-mvebu into next/fixes-non-critical
From Jason Cooper:
mvebu fixes-non-critical for v3.12
- dove
- fix section mismatch (all callers are already _init, so it's just a space
issue)
* tag 'fixes-non-3.12' of git://git.infradead.org/linux-mvebu:
ARM: dove: fix missing __init section of dove_mpp_gpio_mode
+ Linux 3.11-rc2
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'kernel/rcutorture.c')
| -rw-r--r-- | kernel/rcutorture.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c index b1fa5510388d..f4871e52c546 100644 --- a/kernel/rcutorture.c +++ b/kernel/rcutorture.c @@ -1476,7 +1476,7 @@ rcu_torture_shutdown(void *arg) * Execute random CPU-hotplug operations at the interval specified * by the onoff_interval. */ -static int __cpuinit +static int rcu_torture_onoff(void *arg) { int cpu; @@ -1558,7 +1558,7 @@ rcu_torture_onoff(void *arg) return 0; } -static int __cpuinit +static int rcu_torture_onoff_init(void) { int ret; @@ -1601,7 +1601,7 @@ static void rcu_torture_onoff_cleanup(void) * CPU-stall kthread. It waits as specified by stall_cpu_holdoff, then * induces a CPU stall for the time specified by stall_cpu. */ -static int __cpuinit rcu_torture_stall(void *args) +static int rcu_torture_stall(void *args) { unsigned long stop_at; |