xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'irq/urgent' into irq/core

Browse Source 
Merge urgent fixes so pending patches for 4.9 can be applied.
This commit is contained in:
Thomas Gleixner
2016-09-20 23:20:32 +02:00
parent 0a30d69195 e875bd66df
commit 464b5847e6
262 changed files with 2549 additions and 1644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/base/power/runtime.c
View File

@@ -419,7 +419,7 @@ static int rpm_suspend(struct device *dev, int rpmflags)
struct device *parent = NULL;
int retval;
trace_rpm_suspend(dev, rpmflags);
trace_rpm_suspend_rcuidle(dev, rpmflags);
repeat:
retval = rpm_check_suspend_allowed(dev);
@@ -549,7 +549,7 @@ static int rpm_suspend(struct device *dev, int rpmflags)
}
out:
trace_rpm_return_int(dev, _THIS_IP_, retval);
trace_rpm_return_int_rcuidle(dev, _THIS_IP_, retval);
return retval;