Quentin Perret 21bd85cd95 Merge remote-tracking branch 'android-4.9' into 'android-4.9-eas-dev' ...

Fixed merge conflicts caused by 8a174b4749 ("sched/fair: prevent
possible infinite loop in sched_group_energy)

Change-Id: Iba35631a213b88f6361838f28573af3407568919
Signed-off-by: Quentin Perret <quentin.perret@arm.com>

2018-02-22 18:04:18 +00:00

..

9p.h

…

android_fs_template.h

ANDROID: Replace spaces by '_' for some android filesystem tracepoints.

2017-03-13 21:12:37 +00:00

android_fs.h

ANDROID: Refactor fs readpage/write tracepoints.

2017-02-10 14:28:25 -08:00

asoc.h

ASoC: trace: fix printing jack name

2016-02-26 10:52:48 +09:00

bcache.h

block: rename bio bi_rw to bi_opf

2016-08-07 14:41:02 -06:00

block.h

block: rename bio bi_rw to bi_opf

2016-08-07 14:41:02 -06:00

btrfs.h

btrfs: fix crash when tracepoint arguments are freed by wq callbacks

2017-01-19 20:18:02 +01:00

cgroup.h

cgroup: add tracepoints for basic operations

2016-08-10 11:23:44 -04:00

clk.h

…

cma.h

…

compaction.h

mm, compaction: rename COMPACT_PARTIAL to COMPACT_SUCCESS

2016-10-07 18:46:27 -07:00

context_tracking.h

…

cpufreq_interactive.h

FROMLIST: cpufreq: Add android's 'interactive' governor

2017-01-31 10:47:32 -08:00

cpufreq_sched.h

ANDROID: sched/cpufreq_sched: add trace events

2017-01-31 10:46:32 -08:00

cpuhp.h

cpu/hotplug: Add multi instance support

2016-09-02 20:05:05 +02:00

devlink.h

devlink: fix trace format string

2016-07-14 22:16:05 -07:00

ext4.h

don't bother with ->d_inode->i_sb - it's always equal to ->d_sb

2016-04-10 17:11:51 -04:00

f2fs.h

f2fs: updates on 4.15-rc1

2017-11-27 13:07:10 -08:00

fence.h

tracing/dma-buf/fence: Fix timeline str value on fence_annotate_wait_on

2016-01-25 11:03:17 -05:00

fib6.h

ipv6, trace: fix tos reporting on fib6_table_lookup

2016-03-20 13:44:34 -04:00

fib.h

…

filelock.h

locks: sprinkle some tracepoints around the file locking code

2016-01-08 11:38:13 -05:00

filemap.h

…

gpio.h

…

gpu.h

ANDROID: trace/events: fix gpu event timestamp formatting

2017-01-27 13:51:41 -08:00

host1x.h

…

hswadsp.h

…

huge_memory.h

mm, thp: convert from optimistic swapin collapsing to conservative

2016-07-26 16:19:19 -07:00

i2c.h

…

intel_ish.h

HID: intel-ish-hid: ipc layer

2016-08-17 11:13:07 +02:00

intel-sst.h

…

iommu.h

…

ipi.h

…

irq.h

irq: Fix typo in tracepoint.xml

2016-09-29 10:03:38 +02:00

jbd2.h

…

kmem.h

Merge tag 'trace-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

2016-03-24 10:52:25 -07:00

kvm.h

KVM: Fix stack-out-of-bounds read in write_mmio

2018-01-17 09:38:49 +01:00

libata.h

ata: Handle ATA NCQ NO-DATA commands correctly

2016-07-15 08:08:13 -04:00

lock.h

…

mce.h

x86/mce/AMD: Save MCA_IPID in MCE struct on SMCA systems

2016-09-13 15:23:12 +02:00

migrate.h

…

mmc.h

mmc: core: Provide tracepoints for request processing

2016-05-02 10:33:11 +02:00

mmflags.h

mm, thp: remove __GFP_NORETRY from khugepaged and madvised allocations

2016-07-28 16:07:41 -07:00

module.h

…

napi.h

net: fixup for tracepoint napi:napi_poll

2016-07-15 15:55:01 -07:00

net.h

ANDROID: trace: net: use %pK for kernel pointers

2017-01-27 13:56:00 -08:00

nilfs2.h

…

nmi.h

…

oom.h

…

page_isolation.h

mm/page_isolation: fix tracepoint to mirror check function behavior

2016-04-01 17:03:37 -05:00

page_ref.h

mm/page_ref: add tracepoint to track down page reference manipulation

2016-03-17 15:09:34 -07:00

pagemap.h

…

power_cpu_migrate.h

…

power.h

ANDROID: DEBUG: sched,cpufreq: add cpu_capacity change tracepoint

2017-01-31 10:46:44 -08:00

preemptirq.h

FROMLIST: tracing: Add support for preempt and irq enable/disable events

2017-10-06 16:20:25 -07:00

printk.h

printk, tracing: Avoiding unneeded blank lines

2016-07-15 15:52:41 -04:00

random.h

…

rcu.h

rcu: Enforce expedited-GP fairness via funnel wait queue

2016-03-31 13:34:08 -07:00

regulator.h

…

rpm.h

…

rxrpc.h

rxrpc: Keep the call timeouts as ktimes rather than jiffies

2016-09-30 14:40:11 +01:00

sched.h

sched/fair: remove energy_diff tracepoint in preparation to re-factoring

2018-01-08 15:54:55 +00:00

scsi.h

scsi-trace: define ZBC_IN and ZBC_OUT

2016-04-11 16:57:09 -04:00

signal.h

…

skb.h

…

sock.h

…

spi.h

…

spmi.h

…

sunrpc.h

SUNRPC: Fix tracepoint storage issues with svc_recv and svc_rqst_status

2017-11-30 08:39:07 +00:00

sunvnet.h

sunvnet: Add support for perf LDC event tracing

2016-02-07 14:13:05 -05:00

swiotlb.h

swiotlb: Add swiotlb=noforce debug option

2017-01-26 08:24:44 +01:00

syscalls.h

tracing: Add #undef to fix compile error

2017-03-18 19:14:29 +08:00

target.h

…

task.h

…

thermal_power_allocator.h

…

thermal.h

thermal: trace: migrating thermal traces to use TRACE_DEFINE_ENUM() macros

2016-03-15 07:51:40 +08:00

thp.h

…

timer.h

tracing: Fix tick_stop tracepoint symbols for user export

2016-08-09 09:51:23 -04:00

tlb.h

tracing: Remove duplicate checks for online CPUs

2016-03-08 11:19:28 -05:00

udp.h

…

v4l2.h

[media] media: videobuf2: Move timestamp to vb2_buffer

2015-12-18 13:53:31 -02:00

vb2.h

[media] media: videobuf2: Move timestamp to vb2_buffer

2015-12-18 13:53:31 -02:00

vmscan.h

mm, vmscan: add classzone information to tracepoints

2016-07-28 16:07:41 -07:00

vsock_virtio_transport_common.h

VSOCK: Introduce virtio_vsock_common.ko

2016-08-02 02:57:29 +03:00

workqueue.h

…

writeback.h

mm: move vmscan writes and file write accounting to the node

2016-07-28 16:07:41 -07:00

xen.h

…