Merge pull request #3231 from TiejunChina/master-dev

update -rt to 4.14.78-rt47
This commit is contained in:
Rolf Neugebauer 2018-11-19 08:26:45 +00:00 committed by GitHub
commit 82a4b54290
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
438 changed files with 1164 additions and 1163 deletions

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.14.71-rt
image: linuxkit/kernel:4.14.78-rt
cmdline: "console=tty0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1

View File

@ -266,14 +266,14 @@ $(eval $(call kernel,4.19.2,4.19.x,$(EXTRA),$(DEBUG)))
$(eval $(call kernel,4.18.19,4.18.x,$(EXTRA),$(DEBUG)))
$(eval $(call kernel,4.14.81,4.14.x,$(EXTRA),$(DEBUG)))
$(eval $(call kernel,4.14.81,4.14.x,,-dbg))
$(eval $(call kernel,4.14.71,4.14.x,-rt,))
$(eval $(call kernel,4.14.78,4.14.x,-rt,))
$(eval $(call kernel,4.9.137,4.9.x,$(EXTRA),$(DEBUG)))
$(eval $(call kernel,4.4.163,4.4.x,$(EXTRA),$(DEBUG)))
else ifeq ($(ARCH),aarch64)
$(eval $(call kernel,4.19.2,4.19.x,$(EXTRA),$(DEBUG)))
$(eval $(call kernel,4.14.81,4.14.x,$(EXTRA),$(DEBUG)))
$(eval $(call kernel,4.14.71,4.14.x,-rt,))
$(eval $(call kernel,4.14.78,4.14.x,-rt,))
else ifeq ($(ARCH),s390x)
$(eval $(call kernel,4.19.2,4.19.x,$(EXTRA),$(DEBUG)))

View File

@ -1,4 +1,4 @@
From 7db4815d5134e2d106985f95226ff4b2b0f33cf8 Mon Sep 17 00:00:00 2001
From 674fdb01b8d7a750309b71a1d0a6a8a622c75a28 Mon Sep 17 00:00:00 2001
From: Boqun Feng <boqun.feng@gmail.com>
Date: Fri, 9 Mar 2018 14:56:28 +0800
Subject: [PATCH 001/436] rtmutex: Make rt_mutex_futex_unlock() safe for
@ -123,5 +123,5 @@ index 4ad35718f123..456750bf9c95 100644
if (postunlock)
rt_mutex_postunlock(&wake_q);
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 7dd6932742d496b40ed7403758ebc75dcac11229 Mon Sep 17 00:00:00 2001
From b771e0a81ae85e59da482ab6ead21f9a0058b481 Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Date: Tue, 19 Sep 2017 15:36:42 -0700
Subject: [PATCH 002/436] rcu: Suppress lockdep false-positive ->boost_mtx
@ -52,5 +52,5 @@ index 8b3102d22823..181e2487c8b8 100644
/*
* If this was the last task on the expedited lists,
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From ac56dff9f85e0d7130c45867803cef847839cdee Mon Sep 17 00:00:00 2001
From f2047df6a6ed3b88f3bdcc03cf0b87caf5bae087 Mon Sep 17 00:00:00 2001
From: Mikulas Patocka <mpatocka@redhat.com>
Date: Fri, 10 Nov 2017 12:29:34 -0500
Subject: [PATCH 003/436] brd: remove unused brd_mutex
@ -28,5 +28,5 @@ index 2d7178f7754e..c1cf87718c2e 100644
{
pgoff_t idx;
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 4f15498115e8126908c145a2ca312e638d5076dd Mon Sep 17 00:00:00 2001
From 6312db47a66c5e177d7c05b04b2c18a9df476a4c Mon Sep 17 00:00:00 2001
From: Christoffer Dall <christoffer.dall@linaro.org>
Date: Fri, 8 Sep 2017 07:07:13 -0700
Subject: [PATCH 004/436] KVM: arm/arm64: Remove redundant preemptible checks
@ -40,5 +40,5 @@ index d5f1d8364571..0099cce0e264 100644
}
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From d6aadcb0b395bd9ecbc561bfcbbe813b721f2832 Mon Sep 17 00:00:00 2001
From a978a7042ed34eb0bdbaec0a6d638b33a08da78e Mon Sep 17 00:00:00 2001
From: Scott Wood <swood@redhat.com>
Date: Sun, 21 Jan 2018 03:28:54 -0600
Subject: [PATCH 005/436] iommu/amd: Use raw locks on atomic context paths
@ -20,10 +20,10 @@ Signed-off-by: Joerg Roedel <jroedel@suse.de>
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 10190e361a13..ff50337fe3ba 100644
index efa6cd2500b9..131a881d033d 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -1056,9 +1056,9 @@ static int iommu_queue_command_sync(struct amd_iommu *iommu,
@@ -1062,9 +1062,9 @@ static int iommu_queue_command_sync(struct amd_iommu *iommu,
unsigned long flags;
int ret;
@ -35,7 +35,7 @@ index 10190e361a13..ff50337fe3ba 100644
return ret;
}
@@ -1084,7 +1084,7 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
@@ -1090,7 +1090,7 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
build_completion_wait(&cmd, (u64)&iommu->cmd_sem);
@ -44,7 +44,7 @@ index 10190e361a13..ff50337fe3ba 100644
iommu->cmd_sem = 0;
@@ -1095,7 +1095,7 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
@@ -1101,7 +1101,7 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
ret = wait_on_sem(&iommu->cmd_sem);
out_unlock:
@ -53,7 +53,7 @@ index 10190e361a13..ff50337fe3ba 100644
return ret;
}
@@ -3620,7 +3620,7 @@ static struct irq_remap_table *get_irq_table(u16 devid, bool ioapic)
@@ -3626,7 +3626,7 @@ static struct irq_remap_table *get_irq_table(u16 devid, bool ioapic)
goto out_unlock;
/* Initialize table spin-lock */
@ -62,7 +62,7 @@ index 10190e361a13..ff50337fe3ba 100644
if (ioapic)
/* Keep the first 32 indexes free for IOAPIC interrupts */
@@ -3679,7 +3679,7 @@ static int alloc_irq_index(u16 devid, int count)
@@ -3685,7 +3685,7 @@ static int alloc_irq_index(u16 devid, int count)
if (!table)
return -ENODEV;
@ -71,7 +71,7 @@ index 10190e361a13..ff50337fe3ba 100644
/* Scan table for free entries */
for (c = 0, index = table->min_index;
@@ -3702,7 +3702,7 @@ static int alloc_irq_index(u16 devid, int count)
@@ -3708,7 +3708,7 @@ static int alloc_irq_index(u16 devid, int count)
index = -ENOSPC;
out:
@ -80,7 +80,7 @@ index 10190e361a13..ff50337fe3ba 100644
return index;
}
@@ -3723,7 +3723,7 @@ static int modify_irte_ga(u16 devid, int index, struct irte_ga *irte,
@@ -3729,7 +3729,7 @@ static int modify_irte_ga(u16 devid, int index, struct irte_ga *irte,
if (!table)
return -ENOMEM;
@ -89,7 +89,7 @@ index 10190e361a13..ff50337fe3ba 100644
entry = (struct irte_ga *)table->table;
entry = &entry[index];
@@ -3734,7 +3734,7 @@ static int modify_irte_ga(u16 devid, int index, struct irte_ga *irte,
@@ -3740,7 +3740,7 @@ static int modify_irte_ga(u16 devid, int index, struct irte_ga *irte,
if (data)
data->ref = entry;
@ -98,7 +98,7 @@ index 10190e361a13..ff50337fe3ba 100644
iommu_flush_irt(iommu, devid);
iommu_completion_wait(iommu);
@@ -3756,9 +3756,9 @@ static int modify_irte(u16 devid, int index, union irte *irte)
@@ -3762,9 +3762,9 @@ static int modify_irte(u16 devid, int index, union irte *irte)
if (!table)
return -ENOMEM;
@ -110,7 +110,7 @@ index 10190e361a13..ff50337fe3ba 100644
iommu_flush_irt(iommu, devid);
iommu_completion_wait(iommu);
@@ -3780,9 +3780,9 @@ static void free_irte(u16 devid, int index)
@@ -3786,9 +3786,9 @@ static void free_irte(u16 devid, int index)
if (!table)
return;
@ -122,7 +122,7 @@ index 10190e361a13..ff50337fe3ba 100644
iommu_flush_irt(iommu, devid);
iommu_completion_wait(iommu);
@@ -4361,7 +4361,7 @@ int amd_iommu_update_ga(int cpu, bool is_run, void *data)
@@ -4367,7 +4367,7 @@ int amd_iommu_update_ga(int cpu, bool is_run, void *data)
if (!irt)
return -ENODEV;
@ -131,7 +131,7 @@ index 10190e361a13..ff50337fe3ba 100644
if (ref->lo.fields_vapic.guest_mode) {
if (cpu >= 0)
@@ -4370,7 +4370,7 @@ int amd_iommu_update_ga(int cpu, bool is_run, void *data)
@@ -4376,7 +4376,7 @@ int amd_iommu_update_ga(int cpu, bool is_run, void *data)
barrier();
}
@ -176,5 +176,5 @@ index f6b24c7d8b70..7521745dc2a5 100644
/* Pointer to PCI device of this IOMMU */
struct pci_dev *dev;
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From f51b70017d4d268d1dcdd19a6efd6c9b1a30752b Mon Sep 17 00:00:00 2001
From 5ad7803f55f3a755f8b29f051186009c22fa7a42 Mon Sep 17 00:00:00 2001
From: Scott Wood <swood@redhat.com>
Date: Sun, 28 Jan 2018 14:22:19 -0600
Subject: [PATCH 006/436] iommu/amd: Don't use dev_data in
@ -18,10 +18,10 @@ Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index ff50337fe3ba..388ec5e98ef5 100644
index 131a881d033d..24fc8ea4909a 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -3863,10 +3863,8 @@ static void irte_ga_set_affinity(void *entry, u16 devid, u16 index,
@@ -3869,10 +3869,8 @@ static void irte_ga_set_affinity(void *entry, u16 devid, u16 index,
u8 vector, u32 dest_apicid)
{
struct irte_ga *irte = (struct irte_ga *) entry;
@ -34,5 +34,5 @@ index ff50337fe3ba..388ec5e98ef5 100644
irte->lo.fields_remap.destination = dest_apicid;
modify_irte_ga(devid, index, irte, NULL);
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 33b2b217e709628347ea5619fc9174a642700b16 Mon Sep 17 00:00:00 2001
From 5c2b0a1fe103fff0b93456b25362ed5155748bfa Mon Sep 17 00:00:00 2001
From: Scott Wood <swood@redhat.com>
Date: Wed, 14 Feb 2018 17:36:28 -0600
Subject: [PATCH 007/436] iommu/amd: Avoid locking get_irq_table() from atomic
@ -36,10 +36,10 @@ Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 388ec5e98ef5..e42992fcebca 100644
index 24fc8ea4909a..57c873ff05fa 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -3588,7 +3588,22 @@ static void set_dte_irq_entry(u16 devid, struct irq_remap_table *table)
@@ -3594,7 +3594,22 @@ static void set_dte_irq_entry(u16 devid, struct irq_remap_table *table)
amd_iommu_dev_table[devid].data[2] = dte;
}
@ -63,7 +63,7 @@ index 388ec5e98ef5..e42992fcebca 100644
{
struct irq_remap_table *table = NULL;
struct amd_iommu *iommu;
@@ -3675,7 +3690,7 @@ static int alloc_irq_index(u16 devid, int count)
@@ -3681,7 +3696,7 @@ static int alloc_irq_index(u16 devid, int count)
if (!iommu)
return -ENODEV;
@ -72,7 +72,7 @@ index 388ec5e98ef5..e42992fcebca 100644
if (!table)
return -ENODEV;
@@ -3719,7 +3734,7 @@ static int modify_irte_ga(u16 devid, int index, struct irte_ga *irte,
@@ -3725,7 +3740,7 @@ static int modify_irte_ga(u16 devid, int index, struct irte_ga *irte,
if (iommu == NULL)
return -EINVAL;
@ -81,7 +81,7 @@ index 388ec5e98ef5..e42992fcebca 100644
if (!table)
return -ENOMEM;
@@ -3752,7 +3767,7 @@ static int modify_irte(u16 devid, int index, union irte *irte)
@@ -3758,7 +3773,7 @@ static int modify_irte(u16 devid, int index, union irte *irte)
if (iommu == NULL)
return -EINVAL;
@ -90,7 +90,7 @@ index 388ec5e98ef5..e42992fcebca 100644
if (!table)
return -ENOMEM;
@@ -3776,7 +3791,7 @@ static void free_irte(u16 devid, int index)
@@ -3782,7 +3797,7 @@ static void free_irte(u16 devid, int index)
if (iommu == NULL)
return;
@ -99,7 +99,7 @@ index 388ec5e98ef5..e42992fcebca 100644
if (!table)
return;
@@ -4094,7 +4109,7 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq,
@@ -4100,7 +4115,7 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq,
return ret;
if (info->type == X86_IRQ_ALLOC_TYPE_IOAPIC) {
@ -108,7 +108,7 @@ index 388ec5e98ef5..e42992fcebca 100644
index = info->ioapic_pin;
else
ret = -ENOMEM;
@@ -4355,7 +4370,7 @@ int amd_iommu_update_ga(int cpu, bool is_run, void *data)
@@ -4361,7 +4376,7 @@ int amd_iommu_update_ga(int cpu, bool is_run, void *data)
if (!iommu)
return -ENODEV;
@ -118,5 +118,5 @@ index 388ec5e98ef5..e42992fcebca 100644
return -ENODEV;
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 61f3bdb54c57649095506464ef0d662a224281b9 Mon Sep 17 00:00:00 2001
From e3ccd1de428bd41b16b13d3b970c0224cb0d780c Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 22 Mar 2018 16:22:34 +0100
Subject: [PATCH 008/436] iommu/amd: Turn dev_data_list into a lock less list
@ -24,7 +24,7 @@ Signed-off-by: Joerg Roedel <jroedel@suse.de>
2 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index e42992fcebca..1babecd37819 100644
index 57c873ff05fa..50b6cab604aa 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -84,8 +84,7 @@
@ -101,5 +101,5 @@ index 7521745dc2a5..16b1404da58c 100644
u16 devid; /* PCI Device ID */
u16 alias; /* Alias Device ID */
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 490281fbd2969d4e1bb622288c6102569f6faaaf Mon Sep 17 00:00:00 2001
From 0f725ee8f8b99166a5d97517c2fe00062ead13c5 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 22 Mar 2018 16:22:35 +0100
Subject: [PATCH 009/436] iommu/amd: Split domain id out of
@ -18,7 +18,7 @@ Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 1babecd37819..250b6354fae5 100644
index 50b6cab604aa..ccf9d1d08983 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -82,6 +82,7 @@
@ -29,7 +29,7 @@ index 1babecd37819..250b6354fae5 100644
/* List of all available dev_data structures */
static LLIST_HEAD(dev_data_list);
@@ -1596,29 +1597,26 @@ static void del_domain_from_list(struct protection_domain *domain)
@@ -1602,29 +1603,26 @@ static void del_domain_from_list(struct protection_domain *domain)
static u16 domain_id_alloc(void)
{
@ -64,5 +64,5 @@ index 1babecd37819..250b6354fae5 100644
#define DEFINE_FREE_PT_FN(LVL, FN) \
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 64c08365c969038dfb304ce83908a93aaa519baa Mon Sep 17 00:00:00 2001
From 423d244d388295c10057850f4baa46b22e2b7bf2 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 22 Mar 2018 16:22:36 +0100
Subject: [PATCH 010/436] iommu/amd: Split irq_lookup_table out of the
@ -22,7 +22,7 @@ Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 250b6354fae5..2cedb0caec73 100644
index ccf9d1d08983..1bb09f1e5cd1 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -83,6 +83,7 @@
@ -33,7 +33,7 @@ index 250b6354fae5..2cedb0caec73 100644
/* List of all available dev_data structures */
static LLIST_HEAD(dev_data_list);
@@ -3600,7 +3601,7 @@ static struct irq_remap_table *alloc_irq_table(u16 devid, bool ioapic)
@@ -3606,7 +3607,7 @@ static struct irq_remap_table *alloc_irq_table(u16 devid, bool ioapic)
unsigned long flags;
u16 alias;
@ -42,7 +42,7 @@ index 250b6354fae5..2cedb0caec73 100644
iommu = amd_iommu_rlookup_table[devid];
if (!iommu)
@@ -3665,7 +3666,7 @@ static struct irq_remap_table *alloc_irq_table(u16 devid, bool ioapic)
@@ -3671,7 +3672,7 @@ static struct irq_remap_table *alloc_irq_table(u16 devid, bool ioapic)
iommu_completion_wait(iommu);
out_unlock:
@ -52,5 +52,5 @@ index 250b6354fae5..2cedb0caec73 100644
return table;
}
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From e42ee86a6c0aa18a93bd28ec274622be903a11ce Mon Sep 17 00:00:00 2001
From fc4c954dfa38b6185e122f81c5036ffa1c1032fc Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 22 Mar 2018 16:22:37 +0100
Subject: [PATCH 011/436] iommu/amd: Remove the special case from
@ -21,10 +21,10 @@ Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 file changed, 20 insertions(+), 14 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 2cedb0caec73..fc23b89d2372 100644
index 1bb09f1e5cd1..f1017cf37eb3 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -3594,7 +3594,7 @@ static struct irq_remap_table *get_irq_table(u16 devid)
@@ -3600,7 +3600,7 @@ static struct irq_remap_table *get_irq_table(u16 devid)
return table;
}
@ -33,7 +33,7 @@ index 2cedb0caec73..fc23b89d2372 100644
{
struct irq_remap_table *table = NULL;
struct amd_iommu *iommu;
@@ -3628,10 +3628,6 @@ static struct irq_remap_table *alloc_irq_table(u16 devid, bool ioapic)
@@ -3634,10 +3634,6 @@ static struct irq_remap_table *alloc_irq_table(u16 devid, bool ioapic)
/* Initialize table spin-lock */
raw_spin_lock_init(&table->lock);
@ -44,7 +44,7 @@ index 2cedb0caec73..fc23b89d2372 100644
table->table = kmem_cache_alloc(amd_iommu_irq_cache, GFP_ATOMIC);
if (!table->table) {
kfree(table);
@@ -3646,12 +3642,6 @@ static struct irq_remap_table *alloc_irq_table(u16 devid, bool ioapic)
@@ -3652,12 +3648,6 @@ static struct irq_remap_table *alloc_irq_table(u16 devid, bool ioapic)
memset(table->table, 0,
(MAX_IRQS_PER_TABLE * (sizeof(u64) * 2)));
@ -57,7 +57,7 @@ index 2cedb0caec73..fc23b89d2372 100644
irq_lookup_table[devid] = table;
set_dte_irq_entry(devid, table);
@@ -3681,7 +3671,7 @@ static int alloc_irq_index(u16 devid, int count)
@@ -3687,7 +3677,7 @@ static int alloc_irq_index(u16 devid, int count)
if (!iommu)
return -ENODEV;
@ -66,7 +66,7 @@ index 2cedb0caec73..fc23b89d2372 100644
if (!table)
return -ENODEV;
@@ -4100,10 +4090,26 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq,
@@ -4106,10 +4096,26 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq,
return ret;
if (info->type == X86_IRQ_ALLOC_TYPE_IOAPIC) {
@ -96,5 +96,5 @@ index 2cedb0caec73..fc23b89d2372 100644
index = alloc_irq_index(devid, nr_irqs);
}
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From d258a9457f521a1b93c3cc3907ac14ff79559708 Mon Sep 17 00:00:00 2001
From e3d49e20f5571991178a538391f91b328de2942e Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 22 Mar 2018 16:22:38 +0100
Subject: [PATCH 012/436] iommu/amd: Use `table' instead `irt' as variable name
@ -17,10 +17,10 @@ Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index fc23b89d2372..bfda5f26ea50 100644
index f1017cf37eb3..561664b0e609 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -4353,7 +4353,7 @@ int amd_iommu_update_ga(int cpu, bool is_run, void *data)
@@ -4359,7 +4359,7 @@ int amd_iommu_update_ga(int cpu, bool is_run, void *data)
{
unsigned long flags;
struct amd_iommu *iommu;
@ -29,7 +29,7 @@ index fc23b89d2372..bfda5f26ea50 100644
struct amd_ir_data *ir_data = (struct amd_ir_data *)data;
int devid = ir_data->irq_2_irte.devid;
struct irte_ga *entry = (struct irte_ga *) ir_data->entry;
@@ -4367,11 +4367,11 @@ int amd_iommu_update_ga(int cpu, bool is_run, void *data)
@@ -4373,11 +4373,11 @@ int amd_iommu_update_ga(int cpu, bool is_run, void *data)
if (!iommu)
return -ENODEV;
@ -44,7 +44,7 @@ index fc23b89d2372..bfda5f26ea50 100644
if (ref->lo.fields_vapic.guest_mode) {
if (cpu >= 0)
@@ -4380,7 +4380,7 @@ int amd_iommu_update_ga(int cpu, bool is_run, void *data)
@@ -4386,7 +4386,7 @@ int amd_iommu_update_ga(int cpu, bool is_run, void *data)
barrier();
}
@ -54,5 +54,5 @@ index fc23b89d2372..bfda5f26ea50 100644
iommu_flush_irt(iommu, devid);
iommu_completion_wait(iommu);
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From c903281f196c92a71078d0c1d3d5c0d43a1b8911 Mon Sep 17 00:00:00 2001
From 78529f05c82263add354e44bef0e96fd7e9d7068 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 22 Mar 2018 16:22:39 +0100
Subject: [PATCH 013/436] iommu/amd: Factor out setting the remap table for a
@ -20,10 +20,10 @@ Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index bfda5f26ea50..d4eeb91afa36 100644
index 561664b0e609..473ec78ba50c 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -3594,6 +3594,14 @@ static struct irq_remap_table *get_irq_table(u16 devid)
@@ -3600,6 +3600,14 @@ static struct irq_remap_table *get_irq_table(u16 devid)
return table;
}
@ -38,7 +38,7 @@ index bfda5f26ea50..d4eeb91afa36 100644
static struct irq_remap_table *alloc_irq_table(u16 devid)
{
struct irq_remap_table *table = NULL;
@@ -3614,9 +3622,7 @@ static struct irq_remap_table *alloc_irq_table(u16 devid)
@@ -3620,9 +3628,7 @@ static struct irq_remap_table *alloc_irq_table(u16 devid)
alias = amd_iommu_alias_table[devid];
table = irq_lookup_table[alias];
if (table) {
@ -49,7 +49,7 @@ index bfda5f26ea50..d4eeb91afa36 100644
goto out;
}
@@ -3643,14 +3649,9 @@ static struct irq_remap_table *alloc_irq_table(u16 devid)
@@ -3649,14 +3655,9 @@ static struct irq_remap_table *alloc_irq_table(u16 devid)
(MAX_IRQS_PER_TABLE * (sizeof(u64) * 2)));
@ -68,5 +68,5 @@ index bfda5f26ea50..d4eeb91afa36 100644
out:
iommu_completion_wait(iommu);
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From bc4bc989f2b83c7ba8d1cedd9b2399ae0118f1ca Mon Sep 17 00:00:00 2001
From 81ee5aec46b081ed1b00a4827b562a248e0ee7af Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 22 Mar 2018 16:22:40 +0100
Subject: [PATCH 014/436] iommu/amd: Drop the lock while allocating new irq
@ -27,10 +27,10 @@ Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 file changed, 45 insertions(+), 18 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index d4eeb91afa36..8b6e515b395e 100644
index 473ec78ba50c..c9e703260324 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -3594,6 +3594,30 @@ static struct irq_remap_table *get_irq_table(u16 devid)
@@ -3600,6 +3600,30 @@ static struct irq_remap_table *get_irq_table(u16 devid)
return table;
}
@ -61,7 +61,7 @@ index d4eeb91afa36..8b6e515b395e 100644
static void set_remap_table_entry(struct amd_iommu *iommu, u16 devid,
struct irq_remap_table *table)
{
@@ -3605,6 +3629,7 @@ static void set_remap_table_entry(struct amd_iommu *iommu, u16 devid,
@@ -3611,6 +3635,7 @@ static void set_remap_table_entry(struct amd_iommu *iommu, u16 devid,
static struct irq_remap_table *alloc_irq_table(u16 devid)
{
struct irq_remap_table *table = NULL;
@ -69,7 +69,7 @@ index d4eeb91afa36..8b6e515b395e 100644
struct amd_iommu *iommu;
unsigned long flags;
u16 alias;
@@ -3623,42 +3648,44 @@ static struct irq_remap_table *alloc_irq_table(u16 devid)
@@ -3629,42 +3654,44 @@ static struct irq_remap_table *alloc_irq_table(u16 devid)
table = irq_lookup_table[alias];
if (table) {
set_remap_table_entry(iommu, devid, table);
@ -133,5 +133,5 @@ index d4eeb91afa36..8b6e515b395e 100644
}
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 4aad92ddb789710e332ad322e51ae6ef1b7e1027 Mon Sep 17 00:00:00 2001
From f89499735c61ddd6fa0fc737120053307d195daa Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 22 Mar 2018 16:22:41 +0100
Subject: [PATCH 015/436] iommu/amd: Make amd_iommu_devtable_lock a spin_lock
@ -20,7 +20,7 @@ Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 8b6e515b395e..f685026e6d9e 100644
index c9e703260324..67008031537a 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -81,7 +81,7 @@
@ -32,7 +32,7 @@ index 8b6e515b395e..f685026e6d9e 100644
static DEFINE_SPINLOCK(pd_bitmap_lock);
static DEFINE_SPINLOCK(iommu_table_lock);
@@ -2086,9 +2086,9 @@ static int attach_device(struct device *dev,
@@ -2092,9 +2092,9 @@ static int attach_device(struct device *dev,
}
skip_ats_check:
@ -44,7 +44,7 @@ index 8b6e515b395e..f685026e6d9e 100644
/*
* We might boot into a crash-kernel here. The crashed kernel
@@ -2138,9 +2138,9 @@ static void detach_device(struct device *dev)
@@ -2144,9 +2144,9 @@ static void detach_device(struct device *dev)
domain = dev_data->domain;
/* lock device table */
@ -56,7 +56,7 @@ index 8b6e515b395e..f685026e6d9e 100644
if (!dev_is_pci(dev))
return;
@@ -2804,7 +2804,7 @@ static void cleanup_domain(struct protection_domain *domain)
@@ -2810,7 +2810,7 @@ static void cleanup_domain(struct protection_domain *domain)
struct iommu_dev_data *entry;
unsigned long flags;
@ -65,7 +65,7 @@ index 8b6e515b395e..f685026e6d9e 100644
while (!list_empty(&domain->dev_list)) {
entry = list_first_entry(&domain->dev_list,
@@ -2812,7 +2812,7 @@ static void cleanup_domain(struct protection_domain *domain)
@@ -2818,7 +2818,7 @@ static void cleanup_domain(struct protection_domain *domain)
__detach_device(entry);
}
@ -75,5 +75,5 @@ index 8b6e515b395e..f685026e6d9e 100644
static void protection_domain_free(struct protection_domain *domain)
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From fcb9e23c1149e856d0b0330c5d638272847c266d Mon Sep 17 00:00:00 2001
From 3aa125f9690636faf6542e15b37ae4409bde2390 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 22 Mar 2018 16:22:42 +0100
Subject: [PATCH 016/436] iommu/amd: Return proper error code in
@ -20,10 +20,10 @@ Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index f685026e6d9e..f61c2dab5490 100644
index 67008031537a..876947fcb4c6 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -4094,7 +4094,7 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq,
@@ -4100,7 +4100,7 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq,
struct amd_ir_data *data = NULL;
struct irq_cfg *cfg;
int i, ret, devid;
@ -32,7 +32,7 @@ index f685026e6d9e..f61c2dab5490 100644
if (!info)
return -EINVAL;
@@ -4136,7 +4136,7 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq,
@@ -4142,7 +4142,7 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq,
WARN_ON(table->min_index != 32);
index = info->ioapic_pin;
} else {
@ -42,5 +42,5 @@ index f685026e6d9e..f61c2dab5490 100644
} else {
index = alloc_irq_index(devid, nr_irqs);
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 58c7c7274188d6ddaaf5fbe9138fb3f12083d8cc Mon Sep 17 00:00:00 2001
From fc8f8ce973783ece4cc7da38056fb4311f58b448 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 20 Dec 2017 17:12:50 +0100
Subject: [PATCH 017/436] timers: Use static keys for
@ -121,7 +121,7 @@ index f8e1845aa464..4ac74dff59f0 100644
DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index ea3c062e7e1c..7f924eba78da 100644
index a8fa0a896b78..67e2b79b6a9b 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -1132,7 +1132,7 @@ static inline void tick_nohz_activate(struct tick_sched *ts, int mode)
@ -283,5 +283,5 @@ index f17c76a1a05f..9b644e70b660 100644
/*
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 38088d047d673ecfbddff3cc02a15c1093abfcf0 Mon Sep 17 00:00:00 2001
From e8ee0982f127ed257ce19b4a4ab94663b5c07c13 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 20 Dec 2017 17:12:51 +0100
Subject: [PATCH 018/436] hrtimer: Correct blantanly wrong comment
@ -38,5 +38,5 @@ index 883fef2926e9..65543d31af32 100644
raw_spin_unlock(&cpu_base->lock);
trace_hrtimer_expire_entry(timer, now);
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From f9b4a04c476fab74c2e54dd5971dace93558c2e9 Mon Sep 17 00:00:00 2001
From bf8d687dc598107653ab39d2aad51f83b15a2985 Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:12:52 +0100
Subject: [PATCH 019/436] hrtimer: Fix kerneldoc for struct hrtimer_cpu_base
@ -44,5 +44,5 @@ index 79b2a8d29d8c..b3a382be8db0 100644
* @nr_retries: Total number of hrtimer interrupt retries
* @nr_hangs: Total number of hrtimer interrupt hangs
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From b682676b3ec0ca18ff4fea4e67b618e5e043d827 Mon Sep 17 00:00:00 2001
From 3f45b3cc684df54e7296b275ab4d3ab90172f705 Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:12:53 +0100
Subject: [PATCH 020/436] hrtimer: Cleanup clock argument in
@ -84,5 +84,5 @@ index 65543d31af32..790841b59433 100644
* Make the current task sleep until the given expiry time has
* elapsed. The routine will return immediately unless
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 0118c08efa3375e08717b49e5546245f6561d6ba Mon Sep 17 00:00:00 2001
From 7c110d9426bacfee7d216dda9d1919945e1f8168 Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:12:54 +0100
Subject: [PATCH 021/436] hrtimer: Fix hrtimer function description
@ -64,5 +64,5 @@ index 790841b59433..6460aa2d9b25 100644
void hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
enum hrtimer_mode mode)
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From ffdc6cac980d804fe7abaf7b9389159be7a3dc64 Mon Sep 17 00:00:00 2001
From 1d542162944f298f4387b1519916f8ea87598c78 Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:12:56 +0100
Subject: [PATCH 022/436] hrtimer: Cleanup hrtimer_mode enum
@ -47,5 +47,5 @@ index 4e6a8841dcbe..28f267cf2851 100644
/*
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 0fbbc5043b19de348d3c058d15955a94403181af Mon Sep 17 00:00:00 2001
From e2e61c339a78b7a6675f679b331b0337cdd1f3c6 Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:12:58 +0100
Subject: [PATCH 023/436] tracing/hrtimer: Print hrtimer mode in hrtimer_start
@ -117,5 +117,5 @@ index 6460aa2d9b25..476fe683e8ed 100644
}
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 48eebfef85769020e955db3ca24374296fe1e73e Mon Sep 17 00:00:00 2001
From ba2ce34398180bcdd5d8a2b7c8c8edc0bf5fd565 Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:12:59 +0100
Subject: [PATCH 024/436] hrtimer: Switch for loop to _ffs() evaluation
@ -86,5 +86,5 @@ index 476fe683e8ed..85f9335d0d60 100644
while ((node = timerqueue_getnext(&base->active))) {
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 4fecae22b5b96eabbdafa2477970e32ae49186e6 Mon Sep 17 00:00:00 2001
From f7d2f51a955845df416cec29b5b8f3d101a62edc Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:00 +0100
Subject: [PATCH 025/436] hrtimer: Store running timer in hrtimer_clock_base
@ -195,5 +195,5 @@ index 85f9335d0d60..bedfc2865901 100644
static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now)
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From b5d163478c9a5913968d6e7851788a3420e9eac9 Mon Sep 17 00:00:00 2001
From 439b902a93a050a76c5a41971d3bfff2a639991c Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:01 +0100
Subject: [PATCH 026/436] hrtimer: Make room in struct hrtimer_cpu_base
@ -35,5 +35,5 @@ index 1bae7b9f071d..56e56bcb6f0f 100644
#endif
struct hrtimer_clock_base clock_base[HRTIMER_MAX_CLOCK_BASES];
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 172f15aad07ddab73511108b1502c1000d90d1d8 Mon Sep 17 00:00:00 2001
From eed392ed4eea40dc81b0f08f5af6f9c8dd1e5c9d Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:02 +0100
Subject: [PATCH 027/436] hrtimer: Reduce conditional code (hres_active)
@ -153,5 +153,5 @@ index bedfc2865901..7e0490143275 100644
return 0;
}
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From d5170ac607094f2114fdd6c14e0083416a9f260a Mon Sep 17 00:00:00 2001
From 0cb9b38d194f0dd00e2f1ff3df007d190eadbce0 Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:03 +0100
Subject: [PATCH 028/436] hrtimer: Use accesor functions instead of direct
@ -38,5 +38,5 @@ index 7e0490143275..85882d5da523 100644
raw_spin_lock(&base->lock);
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 326d6f320310c950bd455bcfcabe0ecfc4ee367e Mon Sep 17 00:00:00 2001
From fb6cd12081ee6d86489859ab63b6074749e19863 Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:04 +0100
Subject: [PATCH 029/436] hrtimer: Make the remote enqueue check unconditional
@ -140,5 +140,5 @@ index 85882d5da523..b1016aabc73a 100644
}
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 5a92ca11caa38ffe32d7f29e5ccc38d471c8af9d Mon Sep 17 00:00:00 2001
From 4eafc2204b963f56aefd00ba6dd56281da522f9c Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:05 +0100
Subject: [PATCH 030/436] hrtimer: Make hrtimer_cpu_base.next_timer handling
@ -101,5 +101,5 @@ index b1016aabc73a..e01c2e78c032 100644
}
/*
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From c32e631587454e9343f80d77ff5b4231d9ee7dc9 Mon Sep 17 00:00:00 2001
From ecc1e9d779785cfa898061b46fa817345c6b368d Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:06 +0100
Subject: [PATCH 031/436] hrtimer: Make hrtimer_reprogramm() unconditional
@ -189,5 +189,5 @@ index e01c2e78c032..37085a13f19a 100644
* Clock realtime was set
*
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From dd4ce36a7454c59c459a450444a2e8914ded6213 Mon Sep 17 00:00:00 2001
From 48b6a0f506990ee4684b296d78e093e9ac0b7224 Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:07 +0100
Subject: [PATCH 032/436] hrtimer: Make hrtimer_force_reprogramm()
@ -107,5 +107,5 @@ index 37085a13f19a..5fd669dd46be 100644
#endif /* CONFIG_HIGH_RES_TIMERS */
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 077bf3d3f5ac279e4ddc10b07b1d5e2b94482026 Mon Sep 17 00:00:00 2001
From 0c186571c4739218332529a19a4643483cb6fe2e Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:08 +0100
Subject: [PATCH 033/436] hrtimer: Unify handling of hrtimer remove
@ -90,5 +90,5 @@ index 5fd669dd46be..ce9a3ef7a796 100644
/*
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 337756a4678c4e1267a8c3ec1748a7b422763d5a Mon Sep 17 00:00:00 2001
From 3daee0ac6328e6204b9195b261e8fadf0bc18122 Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:09 +0100
Subject: [PATCH 034/436] hrtimer: Unify handling of remote enqueue
@ -154,5 +154,5 @@ index 9b644e70b660..3b6c7e287f23 100644
static unsigned long round_jiffies_common(unsigned long j, int cpu,
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 5707aa463be1edba0dcb8913b71c0779d21923e6 Mon Sep 17 00:00:00 2001
From 303da5afe17f3813bbcc8beb64cb204c4ddde26f Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:10 +0100
Subject: [PATCH 035/436] hrtimer: Make remote enqueue decision less
@ -34,5 +34,5 @@ index 35d7d0c8c3d6..1b2866645c83 100644
static inline
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 86540f637a6359cb3e73f68e6d15414e1bd75658 Mon Sep 17 00:00:00 2001
From e29fa4fd3cfb37cae8574b3627ecf35c37d15dfb Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:11 +0100
Subject: [PATCH 036/436] hrtimer: Remove base argument from
@ -52,5 +52,5 @@ index 1b2866645c83..9030dcb3ef14 100644
unlock_hrtimer_base(timer, &flags);
}
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 4920cb2e2960150f0fe8352962d526fc14ca0aba Mon Sep 17 00:00:00 2001
From e2c098336608f18700fd9487c311fb9aeece7d92 Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:12 +0100
Subject: [PATCH 037/436] hrtimer: Split hrtimer_start_range_ns()
@ -77,5 +77,5 @@ index 9030dcb3ef14..687a8d903a18 100644
}
EXPORT_SYMBOL_GPL(hrtimer_start_range_ns);
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 4da973b0f618e921421b1b5b2fbf161a61481be5 Mon Sep 17 00:00:00 2001
From 53170efb9c386a45b5c489dc35b7e7973c132efa Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:13 +0100
Subject: [PATCH 038/436] hrtimer: Split __hrtimer_get_next_event()
@ -54,5 +54,5 @@ index 687a8d903a18..2382bc5d8e4d 100644
static inline ktime_t hrtimer_update_base(struct hrtimer_cpu_base *base)
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 868c0f3e6231a9f1ffae418b3411176e49dcf6bc Mon Sep 17 00:00:00 2001
From 45400777dc3530c3284be14e32a31609118207f8 Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:14 +0100
Subject: [PATCH 039/436] hrtimer: Use irqsave/irqrestore around
@ -147,5 +147,5 @@ index 2382bc5d8e4d..86cdc9a76911 100644
/*
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 29cdcdda3c1bdb680aac26a93d7ab0990b43bd92 Mon Sep 17 00:00:00 2001
From 3062a89af94d8d70f3c044733bc906f51e195a69 Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:15 +0100
Subject: [PATCH 040/436] hrtimer: Add clock bases and hrtimer mode for soft
@ -114,5 +114,5 @@ index 86cdc9a76911..b5121845d12c 100644
};
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 5be08d7e484f8400265d77ca7a45e6d2f04ed3ce Mon Sep 17 00:00:00 2001
From c1fd7a1a4968a24534f93a57415bf4d036d359ce Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:16 +0100
Subject: [PATCH 041/436] hrtimer: Prepare handling of hard and softirq based
@ -118,5 +118,5 @@ index b5121845d12c..9a1f2b00c847 100644
}
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 73e02e3354fc98f0eeab008de30711a76b9d41ef Mon Sep 17 00:00:00 2001
From f4779fdd37c4e7e0c42a6ab01b6154bd77ca754f Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:17 +0100
Subject: [PATCH 042/436] hrtimer: Implement support for softirq based hrtimers
@ -502,5 +502,5 @@ index 9a1f2b00c847..66d7a12d7256 100644
/**
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 1de00b17a8bb4b23243dc5930921881b4296ae6d Mon Sep 17 00:00:00 2001
From a220113cd1c9f57fc5d45e5ea5c449f6240dc2de Mon Sep 17 00:00:00 2001
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:18 +0100
Subject: [PATCH 043/436] hrtimer: Implement SOFT/HARD clock base selection
@ -57,5 +57,5 @@ index 66d7a12d7256..9947480ad731 100644
void hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
enum hrtimer_mode mode)
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From cf9e8833c01852ff74293b8c7be564c62a3d7bdd Mon Sep 17 00:00:00 2001
From f4f1acb61f5560c1db362ee697724bb4f53c0581 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 23 Nov 2017 16:39:11 +0100
Subject: [PATCH 044/436] can/bcm: Replace hrtimer_tasklet with softirq based
@ -317,5 +317,5 @@ index 13690334efa3..9cc67ac257f1 100644
/* now we can register for can_ids, if we added a new bcm_op */
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From e8cec8f5d711185cca665fd903898095defb87c8 Mon Sep 17 00:00:00 2001
From 79f0b9349f6c0c3b3fa12c824db613d1865e0502 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 23 Nov 2017 16:39:12 +0100
Subject: [PATCH 045/436] mac80211_hwsim: Replace hrtimer tasklet with softirq
@ -18,7 +18,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
1 file changed, 20 insertions(+), 24 deletions(-)
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index d686ba10fecc..4afcdee4f8e2 100644
index aafa7aa18fbd..388f6d71ba71 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -537,7 +537,7 @@ struct mac80211_hwsim_data {
@ -123,7 +123,7 @@ index d686ba10fecc..4afcdee4f8e2 100644
data->beacon_int = 0;
}
}
@@ -2725,9 +2721,9 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,
@@ -2722,9 +2718,9 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,
data->debugfs,
data, &hwsim_simulate_radar);
@ -137,5 +137,5 @@ index d686ba10fecc..4afcdee4f8e2 100644
spin_lock_bh(&hwsim_radio_lock);
list_add_tail(&data->list, &hwsim_radios);
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 696f05a4e72be05c134c56b35d031306396d5283 Mon Sep 17 00:00:00 2001
From 1c2c5ac9f860c73ffeb197a06d7cdbc138a9efad Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 23 Nov 2017 16:39:13 +0100
Subject: [PATCH 046/436] xfrm: Replace hrtimer tasklet with softirq hrtimer
@ -136,5 +136,5 @@ index 6c4ec69e11a0..77f52dc790ec 100644
}
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 64003ecdd13ffe63e322c81b7ab4a02b1284cf31 Mon Sep 17 00:00:00 2001
From fb75d95b4db545cc06f533a961e2e72a0a4a1dab Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 23 Nov 2017 16:39:14 +0100
Subject: [PATCH 047/436] softirq: Remove tasklet_hrtimer
@ -113,5 +113,5 @@ index a4c87cf27f9d..1a5dfc8dcf49 100644
{
int cpu;
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From dc8384331679e5c2fe59fcc1e2d2159de9a1f263 Mon Sep 17 00:00:00 2001
From 7328b08d4e7fc41ef5c3a97088a9aa737c57948f Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 23 Nov 2017 16:39:15 +0100
Subject: [PATCH 048/436] ALSA/dummy: Replace tasklet with softirq hrtimer
@ -101,5 +101,5 @@ index c0939a0164a6..549e014ecc0d 100644
}
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 9b4cce559093d3fdf2b3beebbe28f3adb087636b Mon Sep 17 00:00:00 2001
From 677b9236fd46765dfb19b620f9deebdc1d2109fa Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 23 Nov 2017 16:39:16 +0100
Subject: [PATCH 049/436] usb/gadget/NCM: Replace tasklet with softirq hrtimer
@ -98,5 +98,5 @@ index 45b334ceaf2e..5f24e6d3b6eb 100644
ncm_string_defs[0].id = 0;
usb_free_all_descriptors(f);
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From e33fb47723f7ecc21c6156b26303a6b002d8595e Mon Sep 17 00:00:00 2001
From 2d4d8eb116bf37ce4e85e4f0a2258d1d2be4fbf0 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 23 Nov 2017 16:39:17 +0100
Subject: [PATCH 050/436] net/mvpp2: Replace tasklet with softirq hrtimer
@ -18,10 +18,10 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
1 file changed, 25 insertions(+), 37 deletions(-)
diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c
index 529be74f609d..b1d7378b131c 100644
index 00e6f1d155a6..9c69ab2c5b07 100644
--- a/drivers/net/ethernet/marvell/mvpp2.c
+++ b/drivers/net/ethernet/marvell/mvpp2.c
@@ -830,9 +830,8 @@ struct mvpp2_pcpu_stats {
@@ -831,9 +831,8 @@ struct mvpp2_pcpu_stats {
/* Per-CPU port control */
struct mvpp2_port_pcpu {
struct hrtimer tx_done_timer;
@ -32,7 +32,7 @@ index 529be74f609d..b1d7378b131c 100644
};
struct mvpp2_queue_vector {
@@ -5954,46 +5953,34 @@ static void mvpp2_link_event(struct net_device *dev)
@@ -5955,46 +5954,34 @@ static void mvpp2_link_event(struct net_device *dev)
}
}
@ -95,7 +95,7 @@ index 529be74f609d..b1d7378b131c 100644
return HRTIMER_NORESTART;
}
@@ -6482,7 +6469,12 @@ static int mvpp2_tx(struct sk_buff *skb, struct net_device *dev)
@@ -6484,7 +6471,12 @@ static int mvpp2_tx(struct sk_buff *skb, struct net_device *dev)
txq_pcpu->count > 0) {
struct mvpp2_port_pcpu *port_pcpu = this_cpu_ptr(port->pcpu);
@ -109,7 +109,7 @@ index 529be74f609d..b1d7378b131c 100644
}
return NETDEV_TX_OK;
@@ -6871,7 +6863,6 @@ static int mvpp2_stop(struct net_device *dev)
@@ -6875,7 +6867,6 @@ static int mvpp2_stop(struct net_device *dev)
hrtimer_cancel(&port_pcpu->tx_done_timer);
port_pcpu->timer_scheduled = false;
@ -117,7 +117,7 @@ index 529be74f609d..b1d7378b131c 100644
}
}
mvpp2_cleanup_rxqs(port);
@@ -7644,13 +7635,10 @@ static int mvpp2_port_probe(struct platform_device *pdev,
@@ -7648,13 +7639,10 @@ static int mvpp2_port_probe(struct platform_device *pdev,
port_pcpu = per_cpu_ptr(port->pcpu, cpu);
hrtimer_init(&port_pcpu->tx_done_timer, CLOCK_MONOTONIC,
@ -134,5 +134,5 @@ index 529be74f609d..b1d7378b131c 100644
}
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 1e6b6353e19e85ee48e5d3266cb246584ba57937 Mon Sep 17 00:00:00 2001
From 7babc00b8520a16b16548594019656dc86d0a7db Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Wed, 9 Mar 2016 10:51:06 +0100
Subject: [PATCH 051/436] arm: at91: do not disable/enable clocks in a row
@ -93,5 +93,5 @@ index 9de47d4d2d9e..4f45be268e52 100644
.set_state_oneshot = tc_set_oneshot,
},
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From f7b15f51329f5051d329d9b8199009e24e1133fb Mon Sep 17 00:00:00 2001
From 53fb9206323ef728ea0f14902463967e270bd819 Mon Sep 17 00:00:00 2001
From: Grygorii Strashko <grygorii.strashko@ti.com>
Date: Fri, 11 Sep 2015 21:21:23 +0300
Subject: [PATCH 052/436] ARM: smp: Move clear_tasks_mm_cpumask() call to
@ -66,10 +66,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index c9a0a5299827..7e5122af96ca 100644
index e61af0600133..d8f2e77d5651 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -236,8 +236,6 @@ int __cpu_disable(void)
@@ -237,8 +237,6 @@ int __cpu_disable(void)
flush_cache_louis();
local_flush_tlb_all();
@ -78,7 +78,7 @@ index c9a0a5299827..7e5122af96ca 100644
return 0;
}
@@ -255,6 +253,7 @@ void __cpu_die(unsigned int cpu)
@@ -256,6 +254,7 @@ void __cpu_die(unsigned int cpu)
}
pr_debug("CPU%u: shutdown\n", cpu);
@ -87,5 +87,5 @@ index c9a0a5299827..7e5122af96ca 100644
* platform_cpu_kill() is generally expected to do the powering off
* and/or cutting of clocks to the dying CPU. Optionally, this may
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 508de124bbcbdf4a33aaa0d0775df688685264f5 Mon Sep 17 00:00:00 2001
From 532ea3b6e0d6a0304e93354a21e78e285e867666 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 6 Nov 2015 18:51:03 +0100
Subject: [PATCH 053/436] rtmutex: Handle non enqueued waiters gracefully
@ -33,5 +33,5 @@ index 456750bf9c95..a8119deef92e 100644
debug_rt_mutex_print_deadlock(waiter);
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 93a25b59cca9caf4f0007bd57cb5ac353abea5c7 Mon Sep 17 00:00:00 2001
From 8e75cfff66ea82d1e9ee23951d1c024eb61de40f Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Wed, 14 Sep 2016 11:52:17 +0200
Subject: [PATCH 054/436] rbtree: include rcu.h because we use it
@ -39,5 +39,5 @@ index ece43e882b56..7d012faa509a 100644
struct latch_tree_node {
struct rb_node node[2];
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From a1fad51970b3d5e06a1d1874ba4d9322a9fbea04 Mon Sep 17 00:00:00 2001
From 9189b3435be502e4f5d68f9cddc1521c061f8633 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Fri, 21 Oct 2016 10:54:50 +0200
Subject: [PATCH 055/436] rxrpc: remove unused static variables
@ -28,5 +28,5 @@ index e9f428351293..c4479afe8ae7 100644
[RXRPC_SECURITY_NONE] = &rxrpc_no_security,
#ifdef CONFIG_RXKAD
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 026fb06acfc2486138e719b73577e1f58ef46e67 Mon Sep 17 00:00:00 2001
From b3ef742bd69b1c3a8a8de92cd50a4ed847c8a704 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Wed, 4 Oct 2017 09:55:58 +0200
Subject: [PATCH 056/436] mfd: syscon: atmel-smc: include string.h
@ -24,5 +24,5 @@ index 7d77948567d7..0adbd2e796fe 100644
/**
* atmel_smc_cs_conf_init - initialize a SMC CS conf
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 63ade393ebd8b57acc65a226af3872c8bde7e9a6 Mon Sep 17 00:00:00 2001
From 1adbe37c6f82c2b4e2624aca0fafb9eca5352a29 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Mon, 4 Dec 2017 13:11:10 +0100
Subject: [PATCH 057/436] sched/swait: include wait.h
@ -37,5 +37,5 @@ index c98aaf677466..84f9745365ff 100644
/*
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 089e5ef607cf2e3fd8919fcc1bc20c73eb1ffa6d Mon Sep 17 00:00:00 2001
From 9fa0e7f0017db01e7e8c77ca1f86a566d4e5f019 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Fri, 28 Oct 2016 23:05:11 +0200
Subject: [PATCH 058/436] NFSv4: replace seqcount_t with a seqlock_t
@ -57,10 +57,10 @@ index a73144b3cb8c..0c403d280b96 100644
};
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 77c7d29fcd3b..e0a9f811f0ef 100644
index a3b67d3b1dfb..4ce6ec109c2b 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2696,7 +2696,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
@@ -2700,7 +2700,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
unsigned int seq;
int ret;
@ -69,7 +69,7 @@ index 77c7d29fcd3b..e0a9f811f0ef 100644
ret = _nfs4_proc_open(opendata);
if (ret != 0)
@@ -2734,7 +2734,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
@@ -2738,7 +2738,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
if (d_inode(dentry) == state->inode) {
nfs_inode_attach_open_context(ctx);
@ -79,7 +79,7 @@ index 77c7d29fcd3b..e0a9f811f0ef 100644
}
out:
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 45873ed92057..c487a1ca7106 100644
index e1d88bca815e..c51bcc176026 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -494,7 +494,7 @@ nfs4_alloc_state_owner(struct nfs_server *server,
@ -91,7 +91,7 @@ index 45873ed92057..c487a1ca7106 100644
mutex_init(&sp->so_delegreturn_mutex);
return sp;
}
@@ -1519,8 +1519,12 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs
@@ -1521,8 +1521,12 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs
* recovering after a network partition or a reboot from a
* server that doesn't support a grace period.
*/
@ -105,7 +105,7 @@ index 45873ed92057..c487a1ca7106 100644
restart:
list_for_each_entry(state, &sp->so_states, open_states) {
if (!test_and_clear_bit(ops->state_flag_bit, &state->flags))
@@ -1589,14 +1593,20 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs
@@ -1591,14 +1595,20 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs
spin_lock(&sp->so_lock);
goto restart;
}
@ -131,5 +131,5 @@ index 45873ed92057..c487a1ca7106 100644
}
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 91bd40494ac886787556bfe618a6ccb078a90cd0 Mon Sep 17 00:00:00 2001
From 918b1f95c559936299f3afeb0c99bddef9350051 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 21 Sep 2017 15:35:57 +0200
Subject: [PATCH 059/436] Bluetooth: avoid recursive locking in
@ -72,5 +72,5 @@ index 65d734c165bd..923e9a271872 100644
}
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From d3ae7bc61af8924ab28751f620d3d6f3118363ee Mon Sep 17 00:00:00 2001
From 6b07734ad489748df65654353084f63fdc1b8d42 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 21 Sep 2017 17:21:40 +0200
Subject: [PATCH 060/436] iommu/iova: Use raw_cpu_ptr() instead of
@ -44,5 +44,5 @@ index 33edfa794ae9..b30900025c62 100644
EXPORT_SYMBOL_GPL(queue_iova);
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 54fa8fe9050c30ee4fe01447b94c5fc9f5e933f4 Mon Sep 17 00:00:00 2001
From 7e75fe20e5269dfbf6595e6a109622fe154c9b08 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 5 Oct 2017 14:38:52 +0200
Subject: [PATCH 061/436] greybus: audio: don't inclide rwlock.h directly.
@ -32,5 +32,5 @@ index aa6508b44fab..045696ce85c7 100644
#include "audio_manager.h"
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From d874c26680c40cd40b7bc10e7ebdc6cb36e2fc45 Mon Sep 17 00:00:00 2001
From e983c7f9a2dfe6712b88f4313964bb6df1c57664 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 5 Oct 2017 14:38:52 +0200
Subject: [PATCH 062/436] xen/9pfs: don't inclide rwlock.h directly.
@ -30,5 +30,5 @@ index c10bdf63eae7..84a49f2bcfbc 100644
#include <net/9p/client.h>
#include <net/9p/transport.h>
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 6d523149511531f634b7c752df093241b19fec8b Mon Sep 17 00:00:00 2001
From 549a18db1dde0ebb994070cf7eebbd74eacbb8b2 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 30 Nov 2017 16:06:13 +0100
Subject: [PATCH 063/436] drm/i915: properly init lockdep class
@ -33,5 +33,5 @@ index c597ce277a04..c1108d3921f8 100644
INIT_LIST_HEAD(&tl->requests);
i915_syncmap_init(&tl->sync);
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 257d335c0ab27c3c55eec0752c44deabe72f3955 Mon Sep 17 00:00:00 2001
From ff9be689ee4285f992d0a120fcd18352286f8835 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 22 Dec 2017 15:51:15 +0100
Subject: [PATCH 064/436] timerqueue: Document return values of
@ -41,5 +41,5 @@ index 4a720ed4fdaf..0d54bcbc8170 100644
bool timerqueue_del(struct timerqueue_head *head, struct timerqueue_node *node)
{
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 010d7e77aed8708fb2c906404614df2b4f086943 Mon Sep 17 00:00:00 2001
From e89438fcc94141c04b9523198d6b4b313aa731b2 Mon Sep 17 00:00:00 2001
From: Allen Pais <allen.pais@oracle.com>
Date: Fri, 13 Dec 2013 09:44:41 +0530
Subject: [PATCH 065/436] sparc64: use generic rwsem spinlocks rt
@ -29,5 +29,5 @@ index 4e83f950713e..7f9d71523763 100644
config GENERIC_HWEIGHT
bool
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 9815d820d4c649226788ec669c6a149e851e794b Mon Sep 17 00:00:00 2001
From 3e2e707bda26b4126924bb1bdc59e31fd85ed8c0 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Tue, 19 Mar 2013 14:44:30 +0100
Subject: [PATCH 066/436] kernel/SRCU: provide a static initializer
@ -161,5 +161,5 @@ index a949f4f9e4d7..85ae8c0dddb4 100644
#define DEFINE_STATIC_SRCU(name) __DEFINE_SRCU(name, static)
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From ae5add3aef2583f36a068347af08ba65e5ce3abc Mon Sep 17 00:00:00 2001
From d9e85ffb300e1085555e533c5a94234132f3d57e Mon Sep 17 00:00:00 2001
From: "bigeasy@linutronix.de" <bigeasy@linutronix.de>
Date: Fri, 23 Mar 2018 18:17:36 +0100
Subject: [PATCH 067/436] target: drop spin_lock_assert() + irqs_disabled()
@ -64,5 +64,5 @@ index 0d0be7d8b9d6..f652e58e2988 100644
return 0;
/*
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 347101debb55e25b088cfecdfdf27a75fca2a066 Mon Sep 17 00:00:00 2001
From 81f67130348c1a4e4b2fdbc3840738151370a036 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Tue, 4 Apr 2017 12:50:16 +0200
Subject: [PATCH 068/436] kernel: sched: Provide a pointer to the valid CPU
@ -613,10 +613,10 @@ index b2589c7e9439..7be1f4421cb8 100644
!dl_task(task) ||
!task_on_rq_queued(task))) {
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 0cc7098c6dfd..4388c2b26f70 100644
index b2d699f28304..a2421b2564b9 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -1596,7 +1596,7 @@ static void task_numa_compare(struct task_numa_env *env,
@@ -1598,7 +1598,7 @@ static void task_numa_compare(struct task_numa_env *env,
*/
if (cur) {
/* Skip this swap candidate if cannot move to the source cpu */
@ -625,7 +625,7 @@ index 0cc7098c6dfd..4388c2b26f70 100644
goto unlock;
/*
@@ -1706,7 +1706,7 @@ static void task_numa_find_cpu(struct task_numa_env *env,
@@ -1708,7 +1708,7 @@ static void task_numa_find_cpu(struct task_numa_env *env,
for_each_cpu(cpu, cpumask_of_node(env->dst_nid)) {
/* Skip this CPU if the source task cannot migrate */
@ -634,7 +634,7 @@ index 0cc7098c6dfd..4388c2b26f70 100644
continue;
env->dst_cpu = cpu;
@@ -5475,7 +5475,7 @@ find_idlest_group(struct sched_domain *sd, struct task_struct *p,
@@ -5477,7 +5477,7 @@ find_idlest_group(struct sched_domain *sd, struct task_struct *p,
/* Skip over this group if it has no CPUs allowed */
if (!cpumask_intersects(sched_group_span(group),
@ -643,7 +643,7 @@ index 0cc7098c6dfd..4388c2b26f70 100644
continue;
local_group = cpumask_test_cpu(this_cpu,
@@ -5595,7 +5595,7 @@ find_idlest_cpu(struct sched_group *group, struct task_struct *p, int this_cpu)
@@ -5597,7 +5597,7 @@ find_idlest_cpu(struct sched_group *group, struct task_struct *p, int this_cpu)
return cpumask_first(sched_group_span(group));
/* Traverse only the allowed CPUs */
@ -652,7 +652,7 @@ index 0cc7098c6dfd..4388c2b26f70 100644
if (idle_cpu(i)) {
struct rq *rq = cpu_rq(i);
struct cpuidle_state *idle = idle_get_state(rq);
@@ -5698,7 +5698,7 @@ static int select_idle_core(struct task_struct *p, struct sched_domain *sd, int
@@ -5700,7 +5700,7 @@ static int select_idle_core(struct task_struct *p, struct sched_domain *sd, int
if (!test_idle_cores(target, false))
return -1;
@ -661,7 +661,7 @@ index 0cc7098c6dfd..4388c2b26f70 100644
for_each_cpu_wrap(core, cpus, target) {
bool idle = true;
@@ -5732,7 +5732,7 @@ static int select_idle_smt(struct task_struct *p, struct sched_domain *sd, int t
@@ -5734,7 +5734,7 @@ static int select_idle_smt(struct task_struct *p, struct sched_domain *sd, int t
return -1;
for_each_cpu(cpu, cpu_smt_mask(target)) {
@ -670,7 +670,7 @@ index 0cc7098c6dfd..4388c2b26f70 100644
continue;
if (idle_cpu(cpu))
return cpu;
@@ -5795,7 +5795,7 @@ static int select_idle_cpu(struct task_struct *p, struct sched_domain *sd, int t
@@ -5797,7 +5797,7 @@ static int select_idle_cpu(struct task_struct *p, struct sched_domain *sd, int t
for_each_cpu_wrap(cpu, sched_domain_span(sd), target) {
if (!--nr)
return -1;
@ -679,7 +679,7 @@ index 0cc7098c6dfd..4388c2b26f70 100644
continue;
if (idle_cpu(cpu))
break;
@@ -5950,7 +5950,7 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f
@@ -5952,7 +5952,7 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f
if (sd_flag & SD_BALANCE_WAKE) {
record_wakee(p);
want_affine = !wake_wide(p) && !wake_cap(p, cpu, prev_cpu)
@ -688,7 +688,7 @@ index 0cc7098c6dfd..4388c2b26f70 100644
}
rcu_read_lock();
@@ -6699,14 +6699,14 @@ int can_migrate_task(struct task_struct *p, struct lb_env *env)
@@ -6701,14 +6701,14 @@ int can_migrate_task(struct task_struct *p, struct lb_env *env)
/*
* We do not migrate tasks that are:
* 1) throttled_lb_pair, or
@ -705,7 +705,7 @@ index 0cc7098c6dfd..4388c2b26f70 100644
int cpu;
schedstat_inc(p->se.statistics.nr_failed_migrations_affine);
@@ -6726,7 +6726,7 @@ int can_migrate_task(struct task_struct *p, struct lb_env *env)
@@ -6728,7 +6728,7 @@ int can_migrate_task(struct task_struct *p, struct lb_env *env)
/* Prevent to re-select dst_cpu via env's cpus */
for_each_cpu_and(cpu, env->dst_grpmask, env->cpus) {
@ -714,7 +714,7 @@ index 0cc7098c6dfd..4388c2b26f70 100644
env->flags |= LBF_DST_PINNED;
env->new_dst_cpu = cpu;
break;
@@ -7295,7 +7295,7 @@ check_cpu_capacity(struct rq *rq, struct sched_domain *sd)
@@ -7297,7 +7297,7 @@ check_cpu_capacity(struct rq *rq, struct sched_domain *sd)
/*
* Group imbalance indicates (and tries to solve) the problem where balancing
@ -723,7 +723,7 @@ index 0cc7098c6dfd..4388c2b26f70 100644
*
* Imagine a situation of two groups of 4 cpus each and 4 tasks each with a
* cpumask covering 1 cpu of the first group and 3 cpus of the second group.
@@ -7871,7 +7871,7 @@ static struct sched_group *find_busiest_group(struct lb_env *env)
@@ -7873,7 +7873,7 @@ static struct sched_group *find_busiest_group(struct lb_env *env)
/*
* If the busiest group is imbalanced the below checks don't
* work because they assume all things are equal, which typically
@ -732,7 +732,7 @@ index 0cc7098c6dfd..4388c2b26f70 100644
*/
if (busiest->group_type == group_imbalanced)
goto force_balance;
@@ -8263,7 +8263,7 @@ static int load_balance(int this_cpu, struct rq *this_rq,
@@ -8265,7 +8265,7 @@ static int load_balance(int this_cpu, struct rq *this_rq,
* if the curr task on busiest cpu can't be
* moved to this_cpu
*/
@ -803,5 +803,5 @@ index 5522692100ba..8b4be8e1802a 100644
trace_foo_with_template_simple("HELLO", cnt);
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 57f95402e515398dc1cb6c73c3cd72e4511f5543 Mon Sep 17 00:00:00 2001
From 9c81f3c12b1ebc71818160d0bd10a3be7027b52a Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Sat, 27 May 2017 19:02:06 +0200
Subject: [PATCH 069/436] kernel/sched/core: add migrate_disable()
@ -261,5 +261,5 @@ index 2f93e4a2d9f6..3108da1ee253 100644
#undef PN
#undef __PN
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 990033cdd2cadcdf24ccda42457ff96031f70cdb Mon Sep 17 00:00:00 2001
From 00c9e3285ff96ec493c5afb0408063fd130792a4 Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Date: Thu, 21 Sep 2017 16:22:49 -0400
Subject: [PATCH 070/436] tracing: Reverse the order of trace_types_lock and
@ -195,5 +195,5 @@ index d53268a4e167..1b87157edbff 100644
}
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 4640032fbb9a1b85f3b35972cca81b60c40fe474 Mon Sep 17 00:00:00 2001
From 8c82729cb3bf984e8257bf7843a37d19e803edf0 Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Date: Fri, 22 Sep 2017 16:59:02 -0400
Subject: [PATCH 071/436] ring-buffer: Rewrite trace_recursive_(un)lock() to be
@ -28,10 +28,10 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
1 file changed, 17 insertions(+), 47 deletions(-)
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index fd7809004297..c3b6b47fd44a 100644
index a1d5e0949dcf..ade8493cb69f 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -2545,61 +2545,29 @@ rb_wakeups(struct ring_buffer *buffer, struct ring_buffer_per_cpu *cpu_buffer)
@@ -2547,61 +2547,29 @@ rb_wakeups(struct ring_buffer *buffer, struct ring_buffer_per_cpu *cpu_buffer)
* The lock and unlock are done within a preempt disable section.
* The current_context per_cpu variable can only be modified
* by the current task between lock and unlock. But it can
@ -107,7 +107,7 @@ index fd7809004297..c3b6b47fd44a 100644
return 0;
}
@@ -2607,7 +2575,9 @@ trace_recursive_lock(struct ring_buffer_per_cpu *cpu_buffer)
@@ -2609,7 +2577,9 @@ trace_recursive_lock(struct ring_buffer_per_cpu *cpu_buffer)
static __always_inline void
trace_recursive_unlock(struct ring_buffer_per_cpu *cpu_buffer)
{
@ -119,5 +119,5 @@ index fd7809004297..c3b6b47fd44a 100644
/**
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 64ecbc2f8fd6f506d936c801a7d7d6a2fef52d82 Mon Sep 17 00:00:00 2001
From 4d5bd2bc8c1046d6b64b98bf080b9e73d5eb8eb9 Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Fri, 22 Sep 2017 14:58:18 -0500
Subject: [PATCH 072/436] tracing: Remove lookups from tracing_map hitcount
@ -32,5 +32,5 @@ index 305039b122fa..07e75344725b 100644
}
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From f8f8e42333ac0355c2675bbe6c4d0135678f6535 Mon Sep 17 00:00:00 2001
From 75fce04d9c189d3ca0939a2fb9222148294ab580 Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Fri, 22 Sep 2017 14:58:19 -0500
Subject: [PATCH 073/436] tracing: Increase tracing map KEYS_MAX size
@ -30,5 +30,5 @@ index ab0ca77331d0..5b5bbf8ae550 100644
#define TRACING_MAP_FIELDS_MAX (TRACING_MAP_KEYS_MAX + \
TRACING_MAP_VALS_MAX)
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 8acdd6d55c9e80699e749a79790d94a2db6e757c Mon Sep 17 00:00:00 2001
From 6d46ff947e3770ca06a31bed2994e949d53157d9 Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Fri, 22 Sep 2017 14:58:20 -0500
Subject: [PATCH 074/436] tracing: Make traceprobe parsing code reusable
@ -333,5 +333,5 @@ index ea0d90a31fc9..2ccfbb8efeb2 100644
static const struct file_operations uprobe_events_ops = {
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From b008f71fa3fe8acb1142f561d3b0485a13d159a5 Mon Sep 17 00:00:00 2001
From 13692285738a6e8ea3912bf8fb04efe496c4f867 Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Fri, 22 Sep 2017 14:58:21 -0500
Subject: [PATCH 075/436] tracing: Clean up hist_field_flags enum
@ -49,5 +49,5 @@ index 7eb975a2d0e1..4f6b6406d6ec 100644
struct hist_trigger_attrs {
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From fdf53562d8cca6ed1b310fc06fcec32ad8dc9e45 Mon Sep 17 00:00:00 2001
From 098486e3e0b23f387a8ae56146af524a899df61b Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Fri, 22 Sep 2017 14:58:22 -0500
Subject: [PATCH 076/436] tracing: Add hist_field_name() accessor
@ -180,5 +180,5 @@ index 4f6b6406d6ec..4dc39e3efb21 100644
const char *flags_str = get_hist_field_flags(hist_field);
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From dcc03e9cd88c63b47c7b7e8fef52cd2d84085ef0 Mon Sep 17 00:00:00 2001
From 63287a6a1890a9ff59794d32ebe66ae2e211d067 Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Fri, 22 Sep 2017 14:58:23 -0500
Subject: [PATCH 077/436] tracing: Reimplement log2
@ -120,5 +120,5 @@ index 4dc39e3efb21..4eddc1933079 100644
}
}
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 98d7854c84a951f48716262fa16cff392dce9a23 Mon Sep 17 00:00:00 2001
From d27f2714b35489b3fd0f42402c6f9438c0a51a0c Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Mon, 15 Jan 2018 20:51:35 -0600
Subject: [PATCH 078/436] tracing: Move hist trigger Documentation to
@ -3150,5 +3150,5 @@ index 000000000000..b2145f44b190
+ Entries: 7
+ Dropped: 0
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 28d4e828b8756fe16b2cebb58a54014f7de0c441 Mon Sep 17 00:00:00 2001
From 733d0f3dab66164d9b7fd1c8148d74596a28a0b7 Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Mon, 15 Jan 2018 20:51:36 -0600
Subject: [PATCH 079/436] tracing: Add Documentation for log2 modifier
@ -29,5 +29,5 @@ index b2145f44b190..a4143f04a097 100644
Note that in general the semantics of a given field aren't
interpreted when applying a modifier to it, but there are some
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 0b5d29b5fc70e3909ca24b686fd65fb898f23fae Mon Sep 17 00:00:00 2001
From aac90d8553f5912b8aa747cfeff416b182001c75 Mon Sep 17 00:00:00 2001
From: Vedang Patel <vedang.patel@intel.com>
Date: Mon, 15 Jan 2018 20:51:37 -0600
Subject: [PATCH 080/436] tracing: Add support to detect and avoid duplicates
@ -120,5 +120,5 @@ index 07e75344725b..b30f3439f27f 100644
}
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 4d7f182a1f16bcc40a8427cdfd76975bec8f7801 Mon Sep 17 00:00:00 2001
From 5f47ca5ca3a4eafc8400b2796acc4489868826fc Mon Sep 17 00:00:00 2001
From: Vedang Patel <vedang.patel@intel.com>
Date: Mon, 15 Jan 2018 20:51:38 -0600
Subject: [PATCH 081/436] tracing: Remove code which merges duplicates
@ -198,5 +198,5 @@ index 5b5bbf8ae550..de57887c0670 100644
void (*elt_clear)(struct tracing_map_elt *elt);
void (*elt_init)(struct tracing_map_elt *elt);
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From bbe92ec8c4769f61acd94dedbc739994cc1a6678 Mon Sep 17 00:00:00 2001
From ee8bdcca86ef3ea7c60a9826f0dbee38c9982d88 Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Mon, 15 Jan 2018 20:51:39 -0600
Subject: [PATCH 082/436] ring-buffer: Add interface for setting absolute time
@ -39,7 +39,7 @@ index 5caa062a02b2..adffb56bae8f 100644
size_t ring_buffer_page_len(void *page);
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index c3b6b47fd44a..dc6f47802d02 100644
index ade8493cb69f..c74b329879ad 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -488,6 +488,7 @@ struct ring_buffer {
@ -140,5 +140,5 @@ index 221591636530..0506c4cdfeba 100644
* The global tracer (top) should be the first trace array added,
* but we check the flag anyway.
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 74cb1bc561fd6f88c30b9bd5a36c71f79c972d0c Mon Sep 17 00:00:00 2001
From 629df73315953d7bd9915a582fd29a6ae031ae30 Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Mon, 15 Jan 2018 20:51:40 -0600
Subject: [PATCH 083/436] ring-buffer: Redefine the unimplemented
@ -68,7 +68,7 @@ index adffb56bae8f..6c2a6b3f3c6d 100644
/*
* ring_buffer_discard_commit will remove an event that has not
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index dc6f47802d02..a9cb4359c280 100644
index c74b329879ad..197617001c0b 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -41,6 +41,8 @@ int ring_buffer_print_entry_header(struct trace_seq *s)
@ -152,7 +152,7 @@ index dc6f47802d02..a9cb4359c280 100644
/* Flag when events were overwritten */
#define RB_MISSED_EVENTS (1 << 31)
/* Missed count stored at end */
@@ -2228,12 +2254,15 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
@@ -2230,12 +2256,15 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
/* Slow path, do not inline */
static noinline struct ring_buffer_event *
@ -172,7 +172,7 @@ index dc6f47802d02..a9cb4359c280 100644
event->time_delta = delta & TS_MASK;
event->array[0] = delta >> TS_SHIFT;
} else {
@@ -2276,7 +2305,9 @@ rb_update_event(struct ring_buffer_per_cpu *cpu_buffer,
@@ -2278,7 +2307,9 @@ rb_update_event(struct ring_buffer_per_cpu *cpu_buffer,
* add it to the start of the resevered space.
*/
if (unlikely(info->add_timestamp)) {
@ -183,7 +183,7 @@ index dc6f47802d02..a9cb4359c280 100644
length -= RB_LEN_TIME_EXTEND;
delta = 0;
}
@@ -2464,7 +2495,7 @@ static __always_inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer
@@ -2466,7 +2497,7 @@ static __always_inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer
static inline void rb_event_discard(struct ring_buffer_event *event)
{
@ -192,7 +192,7 @@ index dc6f47802d02..a9cb4359c280 100644
event = skip_time_extend(event);
/* array[0] holds the actual length for the discarded event */
@@ -2508,10 +2539,11 @@ rb_update_write_stamp(struct ring_buffer_per_cpu *cpu_buffer,
@@ -2510,10 +2541,11 @@ rb_update_write_stamp(struct ring_buffer_per_cpu *cpu_buffer,
cpu_buffer->write_stamp =
cpu_buffer->commit_page->page->time_stamp;
else if (event->type_len == RINGBUF_TYPE_TIME_EXTEND) {
@ -207,7 +207,7 @@ index dc6f47802d02..a9cb4359c280 100644
} else
cpu_buffer->write_stamp += event->time_delta;
}
@@ -2664,7 +2696,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
@@ -2666,7 +2698,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
* If this is the first commit on the page, then it has the same
* timestamp as the page itself.
*/
@ -216,7 +216,7 @@ index dc6f47802d02..a9cb4359c280 100644
info->delta = 0;
/* See if we shot pass the end of this buffer page */
@@ -2741,8 +2773,11 @@ rb_reserve_next_event(struct ring_buffer *buffer,
@@ -2743,8 +2775,11 @@ rb_reserve_next_event(struct ring_buffer *buffer,
/* make sure this diff is calculated here */
barrier();
@ -230,7 +230,7 @@ index dc6f47802d02..a9cb4359c280 100644
info.delta = diff;
if (unlikely(test_time_stamp(info.delta)))
rb_handle_timestamp(cpu_buffer, &info);
@@ -3440,14 +3475,13 @@ rb_update_read_stamp(struct ring_buffer_per_cpu *cpu_buffer,
@@ -3442,14 +3477,13 @@ rb_update_read_stamp(struct ring_buffer_per_cpu *cpu_buffer,
return;
case RINGBUF_TYPE_TIME_EXTEND:
@ -248,7 +248,7 @@ index dc6f47802d02..a9cb4359c280 100644
return;
case RINGBUF_TYPE_DATA:
@@ -3471,14 +3505,13 @@ rb_update_iter_read_stamp(struct ring_buffer_iter *iter,
@@ -3473,14 +3507,13 @@ rb_update_iter_read_stamp(struct ring_buffer_iter *iter,
return;
case RINGBUF_TYPE_TIME_EXTEND:
@ -266,7 +266,7 @@ index dc6f47802d02..a9cb4359c280 100644
return;
case RINGBUF_TYPE_DATA:
@@ -3702,6 +3735,8 @@ rb_buffer_peek(struct ring_buffer_per_cpu *cpu_buffer, u64 *ts,
@@ -3704,6 +3737,8 @@ rb_buffer_peek(struct ring_buffer_per_cpu *cpu_buffer, u64 *ts,
struct buffer_page *reader;
int nr_loops = 0;
@ -275,7 +275,7 @@ index dc6f47802d02..a9cb4359c280 100644
again:
/*
* We repeat when a time extend is encountered.
@@ -3738,12 +3773,17 @@ rb_buffer_peek(struct ring_buffer_per_cpu *cpu_buffer, u64 *ts,
@@ -3740,12 +3775,17 @@ rb_buffer_peek(struct ring_buffer_per_cpu *cpu_buffer, u64 *ts,
goto again;
case RINGBUF_TYPE_TIME_STAMP:
@ -295,7 +295,7 @@ index dc6f47802d02..a9cb4359c280 100644
*ts = cpu_buffer->read_stamp + event->time_delta;
ring_buffer_normalize_time_stamp(cpu_buffer->buffer,
cpu_buffer->cpu, ts);
@@ -3768,6 +3808,9 @@ rb_iter_peek(struct ring_buffer_iter *iter, u64 *ts)
@@ -3770,6 +3810,9 @@ rb_iter_peek(struct ring_buffer_iter *iter, u64 *ts)
struct ring_buffer_event *event;
int nr_loops = 0;
@ -305,7 +305,7 @@ index dc6f47802d02..a9cb4359c280 100644
cpu_buffer = iter->cpu_buffer;
buffer = cpu_buffer->buffer;
@@ -3820,12 +3863,17 @@ rb_iter_peek(struct ring_buffer_iter *iter, u64 *ts)
@@ -3822,12 +3865,17 @@ rb_iter_peek(struct ring_buffer_iter *iter, u64 *ts)
goto again;
case RINGBUF_TYPE_TIME_STAMP:
@ -326,5 +326,5 @@ index dc6f47802d02..a9cb4359c280 100644
ring_buffer_normalize_time_stamp(buffer,
cpu_buffer->cpu, ts);
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 2b2a746d15921b1ed320b025d4bf6c1221e4e460 Mon Sep 17 00:00:00 2001
From 3dfea406486d3099fe0bfa0e357544a9def75e5b Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Mon, 15 Jan 2018 20:51:41 -0600
Subject: [PATCH 084/436] tracing: Add timestamp_mode trace file
@ -141,5 +141,5 @@ index ffb67272b642..c358cae7461f 100644
#if defined(CONFIG_TRACER_MAX_TRACE) || defined(CONFIG_HWLAT_TRACER)
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From e72ce81313743863730c6df969d034b2dd036a93 Mon Sep 17 00:00:00 2001
From 6755f8741feecbfa6e028adc2c8d4b97b2853521 Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Mon, 15 Jan 2018 20:51:42 -0600
Subject: [PATCH 085/436] tracing: Give event triggers access to
@ -312,5 +312,5 @@ index 43254c5e7e16..4c269f2e00a4 100644
int event_enable_trigger_print(struct seq_file *m,
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 37e8a2ddbcd7e30f65512f71ac3c0b6420fb1af4 Mon Sep 17 00:00:00 2001
From c62050d8381247c03f707df8de2bdbe903992fab Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Mon, 15 Jan 2018 20:51:43 -0600
Subject: [PATCH 086/436] tracing: Add ring buffer event param to hist field
@ -145,5 +145,5 @@ index 77079c79b6d4..9126be52ff4d 100644
static void hist_trigger_stacktrace_print(struct seq_file *m,
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 09ea7ab2ecccaed453749327e2220ea1d58a73e9 Mon Sep 17 00:00:00 2001
From f2e4dce83b688c63ff2b5ed7efbc9bfa9f05fc57 Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Mon, 15 Jan 2018 20:51:44 -0600
Subject: [PATCH 087/436] tracing: Break out hist trigger assignment parsing
@ -114,5 +114,5 @@ index 9126be52ff4d..4935290fd1e8 100644
goto free;
}
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From dd9c0a9f392182e65dcd82c6f577bbd4d66f4acc Mon Sep 17 00:00:00 2001
From eccca881d4b64cf4fd9054e85af98b6d1d5d66db Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Mon, 15 Jan 2018 20:51:45 -0600
Subject: [PATCH 088/436] tracing: Add hist trigger timestamp support
@ -248,5 +248,5 @@ index 4935290fd1e8..cd80bca34cec 100644
test->ops->free(test->ops, test);
}
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 4e567b5b432eae07dcd30dd2311ecb587e243d7e Mon Sep 17 00:00:00 2001
From 1b98b074afb138a1291a7da41c0ce3e37da1b75d Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Mon, 15 Jan 2018 20:51:46 -0600
Subject: [PATCH 089/436] tracing: Add per-element variable support to
@ -228,5 +228,5 @@ index de57887c0670..053eb92b2d31 100644
unsigned int i,
unsigned int key_offset,
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 1416d170806a9362bb5ffd4f428893bb25ad3f2f Mon Sep 17 00:00:00 2001
From 303b4c99bdb6bdbb51279511fd64a73525ac260d Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Mon, 15 Jan 2018 20:51:47 -0600
Subject: [PATCH 090/436] tracing: Add hist_data member to hist_field
@ -84,5 +84,5 @@ index cd80bca34cec..ec58902145e9 100644
ret = -ENOMEM;
goto out;
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 81bd3310894eaa928be2d3c476e7827cee10fbc4 Mon Sep 17 00:00:00 2001
From 56d66cbe3f238bae410364f173b9bf467b93c8b2 Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Mon, 15 Jan 2018 20:51:48 -0600
Subject: [PATCH 091/436] tracing: Add usecs modifier for hist trigger
@ -166,5 +166,5 @@ index ec58902145e9..6d268e25d051 100644
return flags_str;
}
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From a5ab43e5b183dba9a93b0ef504bca4110d399546 Mon Sep 17 00:00:00 2001
From a149e89bc2e9c39a3faa92f63a91a1b64f05020e Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Mon, 15 Jan 2018 20:51:49 -0600
Subject: [PATCH 092/436] tracing: Add variable support to hist triggers
@ -784,5 +784,5 @@ index 6d268e25d051..b4301542bb4a 100644
ret = 0;
goto out_free;
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 21bba4cd569aac8f28019dc244353d4dad2421f1 Mon Sep 17 00:00:00 2001
From d2782b77fdc5d9f238ba186f8c408a9cd5f75576 Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Mon, 15 Jan 2018 20:51:50 -0600
Subject: [PATCH 093/436] tracing: Account for variables in named trigger
@ -47,5 +47,5 @@ index b4301542bb4a..68ff2491edd0 100644
for (i = 0; i < hist_data->n_sort_keys; i++) {
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 554e1835cbcbda85d19b7f3a766bc59eb226c5c4 Mon Sep 17 00:00:00 2001
From 0323a396cb4b6da8c82e5b88603ffdb5e2139cb4 Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Mon, 15 Jan 2018 20:51:51 -0600
Subject: [PATCH 094/436] tracing: Move get_hist_field_flags()
@ -79,5 +79,5 @@ index 68ff2491edd0..c6c24d6d2be8 100644
{
const char *field_name = hist_field_name(hist_field, 0);
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 63c4765ded6dd1c2421b9f82c8e3ca55f708dfbf Mon Sep 17 00:00:00 2001
From abe8b5676b0a285193017fdd3ef7074af9cf9144 Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Mon, 15 Jan 2018 20:51:52 -0600
Subject: [PATCH 095/436] tracing: Add simple expression support to hist
@ -630,5 +630,5 @@ index c6c24d6d2be8..d2f01f3f26e1 100644
if (hist_data->fields[i]->flags & HIST_FIELD_FL_HEX) {
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 4f3e76bd3081f635b560189c3e2ec27a11c0b9e8 Mon Sep 17 00:00:00 2001
From 1fa62aedf355bf31958cfd401a0a1185e009e0c5 Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Mon, 15 Jan 2018 20:51:53 -0600
Subject: [PATCH 096/436] tracing: Generalize per-element hist trigger data
@ -160,5 +160,5 @@ index d2f01f3f26e1..893f65ce31a5 100644
uval = *(u64 *)(key + key_field->offset);
seq_printf(m, "%s: %-16s[%10llu]", field_name,
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 67873b4ec50b9aa27425e8c7aa0e76a223aba669 Mon Sep 17 00:00:00 2001
From 6b074ce3e9421503cffe9170fd52b3b7cbc7252a Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Mon, 15 Jan 2018 20:51:54 -0600
Subject: [PATCH 097/436] tracing: Pass tracing_map_elt to hist_field accessor
@ -227,5 +227,5 @@ index 893f65ce31a5..becf37b2b0da 100644
key = (void *)(unsigned long)field_contents;
use_compound_key = true;
--
2.18.0
2.19.1

View File

@ -1,4 +1,4 @@
From 828254c5b8e4253c9b9190e021078fda82528efe Mon Sep 17 00:00:00 2001
From 6cb2467eeb17c39e6c2ba5423d6ed8331d5575d4 Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Mon, 15 Jan 2018 20:51:55 -0600
Subject: [PATCH 098/436] tracing: Add hist_field 'type' field
@ -119,5 +119,5 @@ index becf37b2b0da..6e60cb794dcd 100644
switch (field_op) {
case FIELD_OP_MINUS:
--
2.18.0
2.19.1

Some files were not shown because too many files have changed in this diff Show More