From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- kernel/drivers/misc/hwlat_detector.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'kernel/drivers/misc/hwlat_detector.c') diff --git a/kernel/drivers/misc/hwlat_detector.c b/kernel/drivers/misc/hwlat_detector.c index 2429c4331..52f5ad5fd 100644 --- a/kernel/drivers/misc/hwlat_detector.c +++ b/kernel/drivers/misc/hwlat_detector.c @@ -616,7 +616,7 @@ static ssize_t debug_enable_fwrite(struct file *filp, buf[sizeof(buf)-1] = '\0'; /* just in case */ err = kstrtoul(buf, 10, &val); - if (0 != err) + if (err) return -EINVAL; if (val) { @@ -921,7 +921,7 @@ static ssize_t debug_width_fwrite(struct file *filp, buf[U64STR_SIZE-1] = '\0'; /* just in case */ err = kstrtoull(buf, 10, &val); - if (0 != err) + if (err) return -EINVAL; mutex_lock(&data.lock); @@ -1005,7 +1005,7 @@ static ssize_t debug_window_fwrite(struct file *filp, buf[U64STR_SIZE-1] = '\0'; /* just in case */ err = kstrtoull(buf, 10, &val); - if (0 != err) + if (err) return -EINVAL; mutex_lock(&data.lock); @@ -1198,11 +1198,11 @@ static int detector_init(void) pr_info(BANNER "version %s\n", VERSION); ret = init_stats(); - if (0 != ret) + if (ret) goto out; ret = init_debugfs(); - if (0 != ret) + if (ret) goto err_stats; if (enabled) -- cgit 1.2.3-korg