summaryrefslogtreecommitdiff
path: root/android-mainline/ANDROID-irqchip-Add-IRQChip-related-vendor-hooks.patch
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-01-30 11:49:32 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-01-30 11:49:32 +0000
commit5de992082bdd145349c27a08b9f3cd790b0de472 (patch)
tree95eca457ce33ef495878f5b0e0ad9b8402aadfca /android-mainline/ANDROID-irqchip-Add-IRQChip-related-vendor-hooks.patch
parent4348e70ef1627d02b4725969f0396ac4edf40038 (diff)
parent74cf2d4b4d963b7519a281d358d1453503bd00da (diff)
downloadcommon-patches-5de992082bdd145349c27a08b9f3cd790b0de472.tar.gz
Merge changes I7e8ab57e,I105900f4,I82b71d9c,Iaf936ad1,I6983bf67, ... into main
* changes: aosp/android-mainline: update series (rebase onto v6.7-rc4) aosp/android-mainline: update series aosp/android-mainline: update series (rebase onto v6.7-rc3) aosp/android-mainline: update series (rebase onto v6.7-rc2) aosp/android-mainline: update series aosp/android-mainline: update series (rebase onto v6.6-15119-g7f851936a0ca4) aosp/android-mainline: update series aosp/android-mainline: update series (rebase onto v6.6-15100-gc9d01179e185f) aosp/android-mainline: update series (rebase onto v6.6-15029-gbe3ca57cfb777) aosp/android-mainline: update series aosp/android-mainline: update series aosp/android-mainline: update series (rebase onto v6.6-13985-gd934aef6bb9ec) aosp/android-mainline: update series (rebase onto v6.6-13255-gb06f58ad8e8c4) aosp/android-mainline: update series (rebase onto v6.6-13233-gd99b91a99be43) aosp/android-mainline: update series (rebase onto v6.6-12893-ge392ea4d4d008) aosp/android-mainline: update series (rebase onto v6.6-12401-g8f6f76a6a29f3) aosp/android-mainline: update series aosp/android-mainline: update series aosp/android-mainline: update series (rebase onto v6.6-11928-gbc3012f4e3a97) aosp/android-mainline: update series (rebase onto v6.6-11644-g6803bd7956ca8) aosp/android-mainline: update series (rebase onto v6.6-11432-g43468456c95b9) aosp/android-mainline: update series (rebase onto v6.6-11379-g6ed92e559a2ea) aosp/android-mainline: update series (rebase onto v6.6-11236-g90a300dc0553c) aosp/android-mainline: update series aosp/android-mainline: update series (rebase onto v6.6-11104-gedd8e84ae9514) aosp/android-mainline: update series
Diffstat (limited to 'android-mainline/ANDROID-irqchip-Add-IRQChip-related-vendor-hooks.patch')
-rw-r--r--android-mainline/ANDROID-irqchip-Add-IRQChip-related-vendor-hooks.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/android-mainline/ANDROID-irqchip-Add-IRQChip-related-vendor-hooks.patch b/android-mainline/ANDROID-irqchip-Add-IRQChip-related-vendor-hooks.patch
index 91d8eae6..b406fe08 100644
--- a/android-mainline/ANDROID-irqchip-Add-IRQChip-related-vendor-hooks.patch
+++ b/android-mainline/ANDROID-irqchip-Add-IRQChip-related-vendor-hooks.patch
@@ -53,7 +53,7 @@ diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
#include <linux/irqchip.h>
#include <linux/irqchip/arm-gic-common.h>
-@@ -969,11 +970,15 @@ static void __init gic_dist_init(void)
+@@ -968,11 +969,15 @@ static void __init gic_dist_init(void)
* enabled.
*/
affinity = gic_cpu_to_affinity(smp_processor_id());
@@ -71,7 +71,7 @@ diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
}
static int gic_iterate_rdists(int (*fn)(struct redist_region *, void __iomem *))
-@@ -1437,6 +1442,9 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val,
+@@ -1436,6 +1441,9 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val,
reg = gic_dist_base(d) + offset + (index * 8);
val = gic_cpu_to_affinity(cpu);