These labels are are named in two ways normally:
- Based on what caused to jump to such labels
- Based on what we do under such labels
We follow the first naming convention today and that leads to multiple
labels for doing the same work. Fix it by switching to the second way of
naming them.
Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org>
---
Hi Rafael,
These can go in 4.3, I don't really mind :)
drivers/cpufreq/cpufreq.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index b612411655f9..b7aac8eec525 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1278,7 +1278,7 @@ static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif)
recover_policy = false;
policy = cpufreq_policy_alloc(dev);
if (!policy)
- goto nomem_out;
+ goto out_release_rwsem;
}
cpumask_copy(policy->cpus, cpumask_of(cpu));
@@ -1289,7 +1289,7 @@ static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif)
ret = cpufreq_driver->init(policy);
if (ret) {
pr_debug("initialization failed\n");
- goto err_set_policy_cpu;
+ goto out_free_policy;
}
down_write(&policy->rwsem);
@@ -1317,7 +1317,7 @@ static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif)
policy->cur = cpufreq_driver->get(policy->cpu);
if (!policy->cur) {
pr_err("%s: ->get() failed\n", __func__);
- goto err_get_freq;
+ goto out_exit_policy;
}
}
@@ -1367,7 +1367,7 @@ static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif)
if (!recover_policy) {
ret = cpufreq_add_dev_interface(policy, dev);
if (ret)
- goto err_out_unregister;
+ goto out_exit_policy;
blocking_notifier_call_chain(&cpufreq_policy_notifier_list,
CPUFREQ_CREATE_POLICY, policy);
@@ -1396,15 +1396,14 @@ static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif)
return 0;
-err_out_unregister:
-err_get_freq:
+out_exit_policy:
up_write(&policy->rwsem);
if (cpufreq_driver->exit)
cpufreq_driver->exit(policy);
-err_set_policy_cpu:
+out_free_policy:
cpufreq_policy_free(policy, recover_policy);
-nomem_out:
+out_release_rwsem:
up_read(&cpufreq_rwsem);
return ret;
--
2.4.0
Hi Linaro,
I am facing following issue while trying to port android L to arndale board :
I/art ( 2264): RelocateImage: /system/bin/patchoat
> --input-image-location=/system/framework/boot.art --output-image-file=/data/dalvik-cach6 F/libc ( 2443): No [stack] line found in "/proc/self/task/2443/maps"! F/libc ( 2443): Fatal signal 6
> (SIGABRT), code -6 in tid 2443 (patchoat) W/art ( 2702): Could not
> create image space with image file >/system/framework/boot.art.
> Attempting to fall back to imageless runningthe ART service keeps trying to relocate this and keeps failing again and again and after that kernel crashes
>37.790000] Internal error: Oops: 5 [#1] PREEMPT SMP ARM Modules linked in: CPU: 0 Tainted: G W (3.9.1 #8) [ 37.790000]
> CPU: 0 Tainted: G W (3.9.1 #8) PC is at
> __copy_to_user_std+0x4c/0x3a8 [ 37.790000] PC is at __copy_to_user_std+0x4c/0x3a8 LR is at 0x6c000000
> >[ 37.790000] LR is at 0x6c000000
I am trying to port android L to arndale using linaro code.I have downloaded vexpress 32 bit code from http://releases.linaro.org/15.05/android/reference-lcr/vexpress-tc2 having kernel version 3.10.
and replaced it's kernel and device/linaro/vexpress with kernel of arndale KK (having kernel version 3.9) and device/linaro/arndale.I have also ported GUI related changes in framework/base framework/native and libhardware directory made by linaro in KK to LL code.
Can you please help me out on this or give a direction ? Is it kernel issue or HAL or userspace issue?
Solving this can help greater developer community as we can give this code to linaro and insignal forums so that developers.
I have posted the issue in detail in http://stackoverflow.com/questions/31209977/how-to-solve-w-art-could-not-cr…
Thanks,Devarsh
Hi Thomas/Ingo,
This series migrates x86 architecture clockevent drivers to the new
set-state interface. This would enable these drivers to use new states
(like: ONESHOT_STOPPED, etc.) of a clockevent device (if required), as
the set-mode interface is marked obsolete now and wouldn't be expanded
to handle new states.
Rebased over: v4.2-rc2
Target kernel: v4.3
This has been build/boot tested by two bots for few days now.
- kernelci, http://kernelci.org/
- 0-DAY kernel test infrastructure, kbuild test robot
Viresh Kumar (5):
x86/apic: Migrate to new 'set-state' interface
x86/hpet: Migrate to new 'set-state' interface
x86/lguest/timer: Migrate to new 'set-state' interface
x86/uv/time: Migrate to new 'set-state' interface
x86/xen/time: Migrate to new 'set-state' interface
arch/x86/kernel/apic/apic.c | 86 ++++++++++--------
arch/x86/kernel/hpet.c | 198 ++++++++++++++++++++++++++---------------
arch/x86/lguest/boot.c | 24 ++---
arch/x86/platform/uv/uv_time.c | 37 +++-----
arch/x86/xen/time.c | 63 +++++--------
5 files changed, 217 insertions(+), 191 deletions(-)
--
2.4.0
Hi Guys,
This series migrates ARM clockevent drivers (present in arch/arm/
directory), to the new set-state interface. This would enable these
drivers to use new states (like: ONESHOT_STOPPED, etc.) of a clockevent
device (if required), as the set-mode interface is marked obsolete now
and wouldn't be expanded to handle new states.
Rebased over: v4.2-rc1
Following patches:
ARM/ks8695/time: Migrate to new 'set-state' interface
ARM/omap1/time: Migrate to new 'set-state' interface
must be integrated to mainline kernel via clockevents tree, because of
dependency on:
352370adb058 ("clockevents: Allow set-state callbacks to be optional")
Other patches don't have this dependency and so can be pushed via
platform specific trees if Maintainers want it that way.
This has been build/boot tested by two bots on various platforms for few
days now:
- kernelci, http://kernelci.org/
- 0-DAY kernel test infrastructure, kbuild test robot
Cc: Andrew Lunn <andrew(a)lunn.ch>
Cc: Eric Miao <eric.y.miao(a)gmail.com>
Cc: Gregory Clement <gregory.clement(a)free-electrons.com>
Cc: Greg Ungerer <gerg(a)uclinux.org>
Cc: Hans Ulli Kroll <ulli.kroll(a)googlemail.com>
Cc: Haojian Zhuang <haojian.zhuang(a)gmail.com>
Cc: Imre Kaloz <kaloz(a)openwrt.org>
Cc: Jason Cooper <jason(a)lakedaemon.net>
Cc: Kevin Hilman <khilman(a)deeprootsystems.com>
Cc: Krzysztof Halasa <khalasa(a)piap.pl>
Cc: Roland Stigge <stigge(a)antcom.de>
Cc: Santosh Shilimkar <ssantosh(a)kernel.org>
Cc: Sascha Hauer <kernel(a)pengutronix.de>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth(a)gmail.com>
Cc: Sekhar Nori <nsekhar(a)ti.com>
Cc: Shawn Guo <shawnguo(a)kernel.org>
Cc: Shiraz Hashim <shiraz.linux.kernel(a)gmail.com>
Cc: Tony Lindgren <tony(a)atomide.com>
Cc: Wan ZongShun <mcuos.com(a)gmail.com>
Viresh Kumar (18):
ARM/smp_twd: Migrate to new 'set-state' interface
ARM/cns3xxx/timer: Migrate to new 'set-state' interface
ARM/davinci/time: Migrate to new 'set-state' interface
ARM/dc21285-timer: Migrate to new 'set-state' interface
ARM/gemini/time: Migrate to new 'set-state' interface
ARM/imx/epit: Migrate to new 'set-state' interface
ARM/ixp4xx/timer: Migrate to new 'set-state' interface
ARM/ks8695/time: Migrate to new 'set-state' interface
ARM/lpc32xx/timer: Migrate to new 'set-state' interface
ARM/mmp/time: Migrate to new 'set-state' interface
ARM/netx/time: Migrate to new 'set-state' interface
ARM/omap1/time: Migrate to new 'set-state' interface
ARM/omap1/timer32: Migrate to new 'set-state' interface
ARM/omap2/timer: Migrate to new 'set-state' interface
ARM/SPEAr/time: Migrate to new 'set-state' interface
ARM/w90x900/time: Migrate to new 'set-state' interface
ARM/iop/time: Migrate to new 'set-state' interface
ARM/orion/time: Migrate to new 'set-state' interface
arch/arm/kernel/smp_twd.c | 48 +++++++++--------
arch/arm/mach-cns3xxx/core.c | 55 ++++++++++---------
arch/arm/mach-davinci/time.c | 54 ++++++++++---------
arch/arm/mach-footbridge/dc21285-timer.c | 48 ++++++++---------
arch/arm/mach-gemini/time.c | 69 ++++++++++++------------
arch/arm/mach-imx/epit.c | 67 ++++++++++++-----------
arch/arm/mach-ixp4xx/common.c | 68 +++++++++++++----------
arch/arm/mach-ks8695/time.c | 43 ++++++++-------
arch/arm/mach-lpc32xx/timer.c | 40 +++++---------
arch/arm/mach-mmp/time.c | 29 ++++------
arch/arm/mach-netx/time.c | 61 +++++++++++----------
arch/arm/mach-omap1/time.c | 35 ++++++------
arch/arm/mach-omap1/timer32k.c | 33 ++++++------
arch/arm/mach-omap2/timer.c | 48 ++++++++---------
arch/arm/mach-spear/time.c | 89 ++++++++++++++++--------------
arch/arm/mach-w90x900/time.c | 51 ++++++++++--------
arch/arm/plat-iop/time.c | 70 ++++++++++++++----------
arch/arm/plat-orion/time.c | 93 ++++++++++++++++----------------
18 files changed, 522 insertions(+), 479 deletions(-)
--
2.4.0