Forráskód Böngészése

Update Android 15 6.6 Fake Patches application logic in action.yml

TheWildJames 4 hónapja
szülő
commit
475247698f
1 módosított fájl, 11 hozzáadás és 9 törlés
  1. 11 9
      .github/actions/susfs/action.yml

+ 11 - 9
.github/actions/susfs/action.yml

@@ -143,20 +143,18 @@ runs:
       working-directory: ${{ github.workspace }}/kernel/common
       run: |
         echo "Applying 6.6 SUSFS fixes"
-        #if [ "${{ inputs.sublevel }}" -le "46" ]; then
-        #  echo "Applying namespace.c Android 15 6.6 Fake Patch"
-        #  sed -i '/^#include <trace\/hooks\/blk.h>$/a #include <trace/hooks/fs.h>' fs/namespace.c
-        #fi
-        if [ "${{ inputs.sublevel }}" -le "58" ]; then
-          echo "Applying task_mmu.c Android 15 6.6 Fake Patch"
-          sed -i "/int ret.*= 0, copied.*= 0;/a \\	unsigned int nr_subpages = __PAGE_SIZE / PAGE_SIZE;" fs/proc/task_mmu.c
-          sed -i "/unsigned int nr_subpages = __PAGE_SIZE \\/ PAGE_SIZE;/a \\	pagemap_entry_t *res = NULL;" fs/proc/task_mmu.c
+        if [ "${{ inputs.sublevel }}" -le "30" ]; then
+          echo "Applying taskmmu.c Android 15 6.6 Fake Patch"
+          sed -i '/smap_gather_stats(vma, &mss, last_vma_end);/a\last_vma_end = vma->vm_end;' fs/proc/task_mmu.c
         fi
-        cat fs/proc/task_mmu.c
         if [ "${{ inputs.sublevel }}" -le "92" ]; then
           echo "Applying base.c Android 15 6.6 Fake Patch"
           sed -i '/^#include <linux\/cpufreq_times.h>$/a #include <linux/dma-buf.h>' fs/proc/base.c
         fi
+        if [ "${{ inputs.sublevel }}" -le "57" ]; then
+          echo "Applying base.c Android 15 6.6 Fake Patch"
+          sed -i '/^#include <linux\/sched\/sysctl.h>$/a #include <linux/zswap.h>' mm/memory.c
+        fi
 
     - name: Apply Android 16 6.12 Fake Patches
       shell: bash
@@ -259,6 +257,10 @@ runs:
           echo "Reverting base.c Android 15 6.6 Fake Patch"
           sed -i '/^#include <linux\/dma-buf.h>$/d' fs/proc/base.c
         fi
+        if [ "${{ inputs.sublevel }}" -ge "57" ]; then
+          echo "Reverting memory.c Android 15 6.6 Fake Patch"
+          sed -i '/^#include <linux\/zswap.h>$/d' mm/memory.c
+        fi
 
     - name: Revert Android 16 6.12 Fake Patches
       shell: bash