Merge branch 'android15-6.6' into android15-6.6-lts

Catch up on some more commits that landed in android15-6.6.  Changes
included here are:

* a9ad33c ANDROID: Update the ABI with dump_tasks
* 9c79e4c ANDROID: mm: export dump_tasks symbol.
* f67eff4 ANDROID: virt: gunyah: Sync on last folio in reclaim

Change-Id: Iad0c2dcac1b9a94de5c3a023762c4415f6a15c72
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Author: gregkh

android/abi_gki_aarch64.stg

@@ -314642,6 +314642,11 @@ function {
   parameter_id: 0x3e10b518
   parameter_id: 0x0bb0c019
 }
+function {
+  id: 0x1f821b4c
+  return_type_id: 0x48b5725f
+  parameter_id: 0x3c692b7e
+}
 function {
   id: 0x1f835b6f
   return_type_id: 0x48b5725f
@@ -384434,6 +384439,15 @@ elf_symbol {
   type_id: 0x10985193
   full_name: "dump_stack"
 }
+elf_symbol {
+  id: 0x652fbf96
+  name: "dump_tasks"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x4308a91f
+  type_id: 0x1f821b4c
+  full_name: "dump_tasks"
+}
 elf_symbol {
   id: 0xe5d449a3
   name: "dup_iter"
@@ -431304,6 +431318,7 @@ interface {
   symbol_id: 0xded28924
   symbol_id: 0xcb93fb69
   symbol_id: 0xe3421d56
+  symbol_id: 0x652fbf96
   symbol_id: 0xe5d449a3
   symbol_id: 0xda364c85
   symbol_id: 0x68e0756b

android/abi_gki_aarch64_pixel

@@ -812,6 +812,7 @@
   drop_reasons_unregister_subsys
   dump_backtrace
   dump_stack
+  dump_tasks
   dw_handle_msi_irq
   dw_pcie_find_capability
   dw_pcie_host_init

drivers/virt/gunyah/vm_mgr_mem.c

@@ -329,7 +329,7 @@ int gunyah_vm_reclaim_range(struct gunyah_vm *ghvm, u64 gfn, u64 nr)
 	mt_for_each(&ghvm->mm, entry, next, gfn + nr) {
 		folio = xa_untag_pointer(entry);
 		g = next;
-		sync = !!mt_find_after(&ghvm->mm, &g, gfn + nr);
+		sync = !mt_find_after(&ghvm->mm, &g, gfn + nr);
 
 		g = next - folio_nr_pages(folio);
 		folio_get(folio);

mm/oom_kill.c

@@ -423,7 +423,7 @@ static int dump_task(struct task_struct *p, void *arg)
  * State information includes task's pid, uid, tgid, vm size, rss,
  * pgtables_bytes, swapents, oom_score_adj value, and name.
  */
-static void dump_tasks(struct oom_control *oc)
+void dump_tasks(struct oom_control *oc)
 {
 	pr_info("Tasks state (memory values in pages):\n");
 	pr_info("[  pid  ]   uid  tgid total_vm      rss pgtables_bytes swapents oom_score_adj name\n");
@@ -439,6 +439,7 @@ static void dump_tasks(struct oom_control *oc)
 		rcu_read_unlock();
 	}
 }
+EXPORT_SYMBOL_GPL(dump_tasks);
 
 static void dump_oom_summary(struct oom_control *oc, struct task_struct *victim)
 {