diff options
| author |   José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
|---|---|---|
| committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
| commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
| tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/tools/power/cpupower/debug | |
| parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) | |
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.
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 <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/tools/power/cpupower/debug')
| -rw-r--r-- | kernel/tools/power/cpupower/debug/i386/dump_psb.c | 2 | ||||
| -rw-r--r-- | kernel/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/tools/power/cpupower/debug/i386/dump_psb.c b/kernel/tools/power/cpupower/debug/i386/dump_psb.c index 8d6a47514..2c768cf70 100644 --- a/kernel/tools/power/cpupower/debug/i386/dump_psb.c +++ b/kernel/tools/power/cpupower/debug/i386/dump_psb.c @@ -134,7 +134,7 @@ next_one: } static struct option info_opts[] = { - {.name = "numpst", .has_arg=no_argument, .flag=NULL, .val='n'}, + {"numpst", no_argument, NULL, 'n'}, }; void print_help(void) diff --git a/kernel/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c b/kernel/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c index 5224ee5b3..6ff8383f2 100644 --- a/kernel/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c +++ b/kernel/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c @@ -81,11 +81,11 @@ static int __init cpufreq_test_tsc(void) printk(KERN_DEBUG "start--> \n"); then = read_pmtmr(); - rdtscll(then_tsc); + then_tsc = rdtsc(); for (i=0;i<20;i++) { mdelay(100); now = read_pmtmr(); - rdtscll(now_tsc); + now_tsc = rdtsc(); diff = (now - then) & 0xFFFFFF; diff_tsc = now_tsc - then_tsc; printk(KERN_DEBUG "t1: %08u t2: %08u diff_pmtmr: %08u diff_tsc: %016llu\n", then, now, diff, diff_tsc); |