Snap for 12508178 from 4981f05faf3655ebaf696d08ec100cb349113cef to android14-gs-pixel-6.1-25Q1-release
Change-Id: Idd91a3e75dc12f67920e58b7b95d93a8ecf93a97
Signed-off-by: Coastguard Worker <[email protected]>
diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 89b8274..998bdf9 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -313949,14 +313949,6 @@
parameter_id: 0x2af63e7f
}
function {
- id: 0x9182c85e
- return_type_id: 0x6720d32f
- parameter_id: 0x33756485
- parameter_id: 0x33756485
- parameter_id: 0x4585663f
- parameter_id: 0xf1a6dfed
-}
-function {
id: 0x9183d422
return_type_id: 0x6720d32f
parameter_id: 0x32a623d7
@@ -354821,15 +354813,6 @@
full_name: "alloc_chrdev_region"
}
elf_symbol {
- id: 0x962c959a
- name: "alloc_contig_range"
- is_defined: true
- symbol_type: FUNCTION
- crc: 0x73abb180
- type_id: 0x9182c85e
- full_name: "alloc_contig_range"
-}
-elf_symbol {
id: 0xdeecf7a4
name: "alloc_etherdev_mqs"
is_defined: true
@@ -372579,15 +372562,6 @@
full_name: "free_candev"
}
elf_symbol {
- id: 0x557c88ae
- name: "free_contig_range"
- is_defined: true
- symbol_type: FUNCTION
- crc: 0x10e6f74a
- type_id: 0x1c88dd20
- full_name: "free_contig_range"
-}
-elf_symbol {
id: 0x9b815cdc
name: "free_io_pgtable_ops"
is_defined: true
@@ -415884,7 +415858,6 @@
symbol_id: 0xf86dd29a
symbol_id: 0xbc8c457a
symbol_id: 0xc8c5af1c
- symbol_id: 0x962c959a
symbol_id: 0xdeecf7a4
symbol_id: 0xeba70df6
symbol_id: 0x82a5f160
@@ -417856,7 +417829,6 @@
symbol_id: 0x942400d1
symbol_id: 0x0513219e
symbol_id: 0x1b00ff86
- symbol_id: 0x557c88ae
symbol_id: 0x9b815cdc
symbol_id: 0x25649749
symbol_id: 0x998ad938
diff --git a/android/abi_gki_aarch64_mtk b/android/abi_gki_aarch64_mtk
index adcc1c5..ec31013 100644
--- a/android/abi_gki_aarch64_mtk
+++ b/android/abi_gki_aarch64_mtk
@@ -17,7 +17,6 @@
alarm_start_relative
alarm_try_to_cancel
alloc_chrdev_region
- alloc_contig_range
alloc_etherdev_mqs
alloc_io_pgtable_ops
alloc_netdev_mqs
@@ -965,7 +964,6 @@
frame_vector_destroy
frame_vector_to_pages
frame_vector_to_pfns
- free_contig_range
free_io_pgtable_ops
free_irq
free_netdev
diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
index e22ec44..2cfc424 100644
--- a/arch/arm64/include/asm/barrier.h
+++ b/arch/arm64/include/asm/barrier.h
@@ -38,10 +38,6 @@
*/
#define dgh() asm volatile("hint #6" : : : "memory")
-#define spec_bar() asm volatile(ALTERNATIVE("dsb nsh\nisb\n", \
- SB_BARRIER_INSN"nop\n", \
- ARM64_HAS_SB))
-
#ifdef CONFIG_ARM64_PSEUDO_NMI
#define pmr_sync() \
do { \
diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h
index 69e36de..29fe8b5 100644
--- a/arch/arm64/include/asm/cputype.h
+++ b/arch/arm64/include/asm/cputype.h
@@ -86,8 +86,6 @@
#define ARM_CPU_PART_NEOVERSE_N2 0xD49
#define ARM_CPU_PART_CORTEX_A78C 0xD4B
#define ARM_CPU_PART_NEOVERSE_V2 0xD4F
-#define ARM_CPU_PART_CORTEX_X4 0xD82
-#define ARM_CPU_PART_NEOVERSE_V3 0xD84
#define APM_CPU_PART_XGENE 0x000
#define APM_CPU_VAR_POTENZA 0x00
@@ -155,8 +153,6 @@
#define MIDR_NEOVERSE_N2 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_N2)
#define MIDR_CORTEX_A78C MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A78C)
#define MIDR_NEOVERSE_V2 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_V2)
-#define MIDR_CORTEX_X4 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X4)
-#define MIDR_NEOVERSE_V3 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_V3)
#define MIDR_THUNDERX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX)
#define MIDR_THUNDERX_81XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_81XX)
#define MIDR_THUNDERX_83XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_83XX)
