Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06f012f2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android11-5.4' into branch 'android11-5.4-lts' 



Sync up with android11-5.4 for the following commits:

3970bc62 UPSTREAM: Revert "net: af_key: add check for pfkey_broadcast in function pfkey_process"
6b9c39b9 Merge tag 'android11-5.4.197_r00' into 'android11-5.4'
9b75ceec FROMGIT: arm64: fix oops in concurrently setting insn_emulation sysctls
a25d82d6 ANDROID: abi_gki_aarch64_qcom: Add vmemdup_user to qcom symbol list
0cb7b914 ANDROID: GKI: update Sony KMI symbol list
8828cbe3 UPSTREAM: mm: fix misplaced unlock_page in do_wp_page()
e791f407 BACKPORT: mm: do_wp_page() simplification
fb8e4568 UPSTREAM: mm/ksm: Remove reuse_ksm_page()

Update the .xml file with the new symbols being tracked:

Leaf changes summary: 1 artifact changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 1 Added function
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable

1 Added function:

  [A] 'function void input_set_timestamp(input_dev*, ktime_t)'

Change-Id: I01a49bc65a901bc21cffb676c45e985eec92fda5
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents d3891851 3970bc62

android/abi_gki_aarch64.xml

+60 −54
Original line number Diff line number Diff line
@@ -2160,6 +2160,7 @@ 
      <elf-symbol name='input_scancode_to_scalar' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x2c256e1f'/>

      <elf-symbol name='input_set_abs_params' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x6e3c49fc'/>

      <elf-symbol name='input_set_capability' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4c9b4f5e'/>

      <elf-symbol name='input_set_timestamp' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd1ee3aa9'/>

      <elf-symbol name='input_unregister_device' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x111434e5'/>

      <elf-symbol name='input_unregister_handle' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x83aeb203'/>

      <elf-symbol name='input_unregister_handler' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x64bf8e28'/>
@@ -81067,6 +81068,11 @@ 
        <parameter type-id='74b427eb' name='dev' filepath='drivers/input/input.c' line='2281' column='1'/>

        <return type-id='48b5725f'/>

      </function-decl>

      <function-decl name='input_set_timestamp' mangled-name='input_set_timestamp' filepath='drivers/input/input.c' line='1955' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='input_set_timestamp'>

        <parameter type-id='74b427eb' name='dev' filepath='drivers/input/input.c' line='1955' column='1'/>

        <parameter type-id='fbc017ef' name='timestamp' filepath='drivers/input/input.c' line='1955' column='1'/>

        <return type-id='48b5725f'/>

      </function-decl>

      <function-decl name='input_set_capability' mangled-name='input_set_capability' filepath='drivers/input/input.c' line='1990' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='input_set_capability'>

        <parameter type-id='74b427eb' name='dev' filepath='drivers/input/input.c' line='1990' column='1'/>

        <parameter type-id='f0981eeb' name='type' filepath='drivers/input/input.c' line='1990' column='1'/>
@@ -122772,13 +122778,13 @@ 
      <pointer-type-def type-id='eca93177' size-in-bits='64' id='5d33005f'/>

      <pointer-type-def type-id='57bfbe05' size-in-bits='64' id='09dbca85'/>

      <pointer-type-def type-id='345f1a5f' size-in-bits='64' id='2227a3ab'/>

      <function-decl name='typec_register_port' mangled-name='typec_register_port' filepath='drivers/usb/typec/class.c' line='1544' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='typec_register_port'>

        <parameter type-id='fa0b179b' name='parent' filepath='drivers/usb/typec/class.c' line='1544' column='1'/>

        <parameter type-id='287e28ea' name='cap' filepath='drivers/usb/typec/class.c' line='1545' column='1'/>

      <function-decl name='typec_register_port' mangled-name='typec_register_port' filepath='drivers/usb/typec/class.c' line='1545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='typec_register_port'>

        <parameter type-id='fa0b179b' name='parent' filepath='drivers/usb/typec/class.c' line='1545' column='1'/>

        <parameter type-id='287e28ea' name='cap' filepath='drivers/usb/typec/class.c' line='1546' column='1'/>

        <return type-id='b977ca56'/>

      </function-decl>

      <function-decl name='typec_unregister_port' mangled-name='typec_unregister_port' filepath='drivers/usb/typec/class.c' line='1646' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='typec_unregister_port'>

        <parameter type-id='b977ca56' name='port' filepath='drivers/usb/typec/class.c' line='1646' column='1'/>

      <function-decl name='typec_unregister_port' mangled-name='typec_unregister_port' filepath='drivers/usb/typec/class.c' line='1647' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='typec_unregister_port'>

        <parameter type-id='b977ca56' name='port' filepath='drivers/usb/typec/class.c' line='1647' column='1'/>

        <return type-id='48b5725f'/>

      </function-decl>

      <function-decl name='typec_unregister_partner' mangled-name='typec_unregister_partner' filepath='drivers/usb/typec/class.c' line='693' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='typec_unregister_partner'>
@@ -122804,14 +122810,14 @@ 
        <parameter type-id='44ea1984' name='opmode' filepath='drivers/usb/typec/class.c' line='1370' column='1'/>

        <return type-id='48b5725f'/>

      </function-decl>

      <function-decl name='typec_set_orientation' mangled-name='typec_set_orientation' filepath='drivers/usb/typec/class.c' line='1449' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='typec_set_orientation'>

        <parameter type-id='b977ca56' name='port' filepath='drivers/usb/typec/class.c' line='1449' column='1'/>

        <parameter type-id='131b0a9c' name='orientation' filepath='drivers/usb/typec/class.c' line='1450' column='1'/>

      <function-decl name='typec_set_orientation' mangled-name='typec_set_orientation' filepath='drivers/usb/typec/class.c' line='1450' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='typec_set_orientation'>

        <parameter type-id='b977ca56' name='port' filepath='drivers/usb/typec/class.c' line='1450' column='1'/>

        <parameter type-id='131b0a9c' name='orientation' filepath='drivers/usb/typec/class.c' line='1451' column='1'/>

        <return type-id='95e97e5e'/>

      </function-decl>

      <function-decl name='typec_set_mode' mangled-name='typec_set_mode' filepath='drivers/usb/typec/class.c' line='1486' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='typec_set_mode'>

        <parameter type-id='b977ca56' name='port' filepath='drivers/usb/typec/class.c' line='1486' column='1'/>

        <parameter type-id='95e97e5e' name='mode' filepath='drivers/usb/typec/class.c' line='1486' column='1'/>

      <function-decl name='typec_set_mode' mangled-name='typec_set_mode' filepath='drivers/usb/typec/class.c' line='1487' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='typec_set_mode'>

        <parameter type-id='b977ca56' name='port' filepath='drivers/usb/typec/class.c' line='1487' column='1'/>

        <parameter type-id='95e97e5e' name='mode' filepath='drivers/usb/typec/class.c' line='1487' column='1'/>

        <return type-id='95e97e5e'/>

      </function-decl>

      <function-decl name='typec_set_data_role' mangled-name='typec_set_data_role' filepath='drivers/usb/typec/class.c' line='1306' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='typec_set_data_role'>
@@ -122824,9 +122830,9 @@ 
        <parameter type-id='a5263fbd' name='desc' filepath='drivers/usb/typec/class.c' line='649' column='1'/>

        <return type-id='33ca4bbb'/>

      </function-decl>

      <function-decl name='typec_port_register_altmode' mangled-name='typec_port_register_altmode' filepath='drivers/usb/typec/class.c' line='1515' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='typec_port_register_altmode'>

        <parameter type-id='b977ca56' name='port' filepath='drivers/usb/typec/class.c' line='1515' column='1'/>

        <parameter type-id='064c3738' name='desc' filepath='drivers/usb/typec/class.c' line='1516' column='1'/>

      <function-decl name='typec_port_register_altmode' mangled-name='typec_port_register_altmode' filepath='drivers/usb/typec/class.c' line='1516' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='typec_port_register_altmode'>

        <parameter type-id='b977ca56' name='port' filepath='drivers/usb/typec/class.c' line='1516' column='1'/>

        <parameter type-id='064c3738' name='desc' filepath='drivers/usb/typec/class.c' line='1517' column='1'/>

        <return type-id='02913b69'/>

      </function-decl>

      <function-decl name='typec_altmode_update_active' mangled-name='typec_altmode_update_active' filepath='drivers/usb/typec/class.c' line='280' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='typec_altmode_update_active'>
@@ -122843,20 +122849,20 @@ 
        <parameter type-id='064c3738' name='desc' filepath='drivers/usb/typec/class.c' line='633' column='1'/>

        <return type-id='02913b69'/>

      </function-decl>

      <function-decl name='typec_get_drvdata' mangled-name='typec_get_drvdata' filepath='drivers/usb/typec/class.c' line='1498' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='typec_get_drvdata'>

        <parameter type-id='b977ca56' name='port' filepath='drivers/usb/typec/class.c' line='1498' column='1'/>

      <function-decl name='typec_get_drvdata' mangled-name='typec_get_drvdata' filepath='drivers/usb/typec/class.c' line='1499' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='typec_get_drvdata'>

        <parameter type-id='b977ca56' name='port' filepath='drivers/usb/typec/class.c' line='1499' column='1'/>

        <return type-id='eaa32e2f'/>

      </function-decl>

      <function-decl name='typec_find_power_role' mangled-name='typec_find_power_role' filepath='drivers/usb/typec/class.c' line='1418' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='typec_find_power_role'>

        <parameter type-id='80f4b756' name='name' filepath='drivers/usb/typec/class.c' line='1418' column='1'/>

      <function-decl name='typec_find_power_role' mangled-name='typec_find_power_role' filepath='drivers/usb/typec/class.c' line='1419' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='typec_find_power_role'>

        <parameter type-id='80f4b756' name='name' filepath='drivers/usb/typec/class.c' line='1419' column='1'/>

        <return type-id='95e97e5e'/>

      </function-decl>

      <function-decl name='typec_find_port_power_role' mangled-name='typec_find_port_power_role' filepath='drivers/usb/typec/class.c' line='1403' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='typec_find_port_power_role'>

        <parameter type-id='80f4b756' name='name' filepath='drivers/usb/typec/class.c' line='1403' column='1'/>

      <function-decl name='typec_find_port_power_role' mangled-name='typec_find_port_power_role' filepath='drivers/usb/typec/class.c' line='1404' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='typec_find_port_power_role'>

        <parameter type-id='80f4b756' name='name' filepath='drivers/usb/typec/class.c' line='1404' column='1'/>

        <return type-id='95e97e5e'/>

      </function-decl>

      <function-decl name='typec_find_port_data_role' mangled-name='typec_find_port_data_role' filepath='drivers/usb/typec/class.c' line='1432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='typec_find_port_data_role'>

        <parameter type-id='80f4b756' name='name' filepath='drivers/usb/typec/class.c' line='1432' column='1'/>

      <function-decl name='typec_find_port_data_role' mangled-name='typec_find_port_data_role' filepath='drivers/usb/typec/class.c' line='1433' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='typec_find_port_data_role'>

        <parameter type-id='80f4b756' name='name' filepath='drivers/usb/typec/class.c' line='1433' column='1'/>

        <return type-id='95e97e5e'/>

      </function-decl>

      <function-type size-in-bits='64' id='db2d72d5'>
@@ -151230,7 +151236,7 @@ 
          <var-decl name='cpumask' type-id='c99b5ecd' visibility='default' filepath='kernel/sched/sched.h' line='1413' column='1'/>

        </data-member>

      </class-decl>

      <union-decl name='__anonymous_union__7' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/sched/topology.h' line='132' column='1' id='52c6c1a9'>

      <union-decl name='__anonymous_union__1' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/sched/topology.h' line='132' column='1' id='52c6c1a9'>

        <data-member access='public'>

          <var-decl name='private' type-id='eaa32e2f' visibility='default' filepath='include/linux/sched/topology.h' line='133' column='1'/>

        </data-member>
@@ -152004,12 +152010,12 @@ 
      <var-decl name='overflowgid' type-id='95e97e5e' mangled-name='overflowgid' visibility='default' filepath='kernel/sys.c' line='138' column='1' elf-symbol-id='overflowgid'/>

    </abi-instr>

    <abi-instr address-size='64' path='kernel/sysctl.c' language='LANG_C89'>

      <function-decl name='proc_dointvec' mangled-name='proc_dointvec' filepath='kernel/sysctl.c' line='2616' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='proc_dointvec'>

        <parameter type-id='631dc3c1' name='table' filepath='kernel/sysctl.c' line='2616' column='1'/>

        <parameter type-id='95e97e5e' name='write' filepath='kernel/sysctl.c' line='2616' column='1'/>

        <parameter type-id='eaa32e2f' name='buffer' filepath='kernel/sysctl.c' line='2617' column='1'/>

        <parameter type-id='78c01427' name='lenp' filepath='kernel/sysctl.c' line='2617' column='1'/>

        <parameter type-id='b53e8dbb' name='ppos' filepath='kernel/sysctl.c' line='2617' column='1'/>

      <function-decl name='proc_dointvec' mangled-name='proc_dointvec' filepath='kernel/sysctl.c' line='2618' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='proc_dointvec'>

        <parameter type-id='631dc3c1' name='table' filepath='kernel/sysctl.c' line='2618' column='1'/>

        <parameter type-id='95e97e5e' name='write' filepath='kernel/sysctl.c' line='2618' column='1'/>

        <parameter type-id='eaa32e2f' name='buffer' filepath='kernel/sysctl.c' line='2619' column='1'/>

        <parameter type-id='78c01427' name='lenp' filepath='kernel/sysctl.c' line='2619' column='1'/>

        <parameter type-id='b53e8dbb' name='ppos' filepath='kernel/sysctl.c' line='2619' column='1'/>

        <return type-id='95e97e5e'/>

      </function-decl>

    </abi-instr>
@@ -157049,8 +157055,8 @@ 
        <parameter type-id='f0981eeb' name='id' filepath='lib/idr.c' line='485' column='1'/>

        <return type-id='48b5725f'/>

      </function-decl>

      <function-decl name='ida_destroy' mangled-name='ida_destroy' filepath='lib/idr.c' line='537' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ida_destroy'>

        <parameter type-id='a9e764bb' name='ida' filepath='lib/idr.c' line='537' column='1'/>

      <function-decl name='ida_destroy' mangled-name='ida_destroy' filepath='lib/idr.c' line='538' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ida_destroy'>

        <parameter type-id='a9e764bb' name='ida' filepath='lib/idr.c' line='538' column='1'/>

        <return type-id='48b5725f'/>

      </function-decl>

      <function-decl name='idr_alloc_cyclic' mangled-name='idr_alloc_cyclic' filepath='lib/idr.c' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='idr_alloc_cyclic'>
@@ -159185,11 +159191,11 @@ 
        <parameter type-id='02f11ed4' name='page' filepath='mm/memory.c' line='1540' column='1'/>

        <return type-id='95e97e5e'/>

      </function-decl>

      <function-decl name='unmap_mapping_range' mangled-name='unmap_mapping_range' filepath='mm/memory.c' line='2891' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unmap_mapping_range'>

        <parameter type-id='f57039f0' name='mapping' filepath='mm/memory.c' line='2891' column='1'/>

        <parameter type-id='bf352dfe' name='holebegin' filepath='mm/memory.c' line='2892' column='1'/>

        <parameter type-id='bf352dfe' name='holelen' filepath='mm/memory.c' line='2892' column='1'/>

        <parameter type-id='95e97e5e' name='even_cows' filepath='mm/memory.c' line='2892' column='1'/>

      <function-decl name='unmap_mapping_range' mangled-name='unmap_mapping_range' filepath='mm/memory.c' line='2867' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unmap_mapping_range'>

        <parameter type-id='f57039f0' name='mapping' filepath='mm/memory.c' line='2867' column='1'/>

        <parameter type-id='bf352dfe' name='holebegin' filepath='mm/memory.c' line='2868' column='1'/>

        <parameter type-id='bf352dfe' name='holelen' filepath='mm/memory.c' line='2868' column='1'/>

        <parameter type-id='95e97e5e' name='even_cows' filepath='mm/memory.c' line='2868' column='1'/>

        <return type-id='48b5725f'/>

      </function-decl>

    </abi-instr>
@@ -161279,8 +161285,8 @@ 
      </class-decl>

      <pointer-type-def type-id='175944cd' size-in-bits='64' id='38ed603d'/>

      <pointer-type-def type-id='eb0d6f26' size-in-bits='64' id='8e35a44c'/>

      <function-decl name='bpf_warn_invalid_xdp_action' mangled-name='bpf_warn_invalid_xdp_action' filepath='net/core/filter.c' line='6957' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_warn_invalid_xdp_action'>

        <parameter type-id='19c2251e' name='act' filepath='net/core/filter.c' line='6957' column='1'/>

      <function-decl name='bpf_warn_invalid_xdp_action' mangled-name='bpf_warn_invalid_xdp_action' filepath='net/core/filter.c' line='6956' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_warn_invalid_xdp_action'>

        <parameter type-id='19c2251e' name='act' filepath='net/core/filter.c' line='6956' column='1'/>

        <return type-id='48b5725f'/>

      </function-decl>

      <function-decl name='bpf_prog_destroy' mangled-name='bpf_prog_destroy' filepath='net/core/filter.c' line='1426' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_prog_destroy'>
@@ -166867,19 +166873,19 @@ 
      <pointer-type-def type-id='ff37489f' size-in-bits='64' id='790774ef'/>

      <pointer-type-def type-id='bb1a67f7' size-in-bits='64' id='5afbd3c3'/>

      <pointer-type-def type-id='0a042b05' size-in-bits='64' id='82398c35'/>

      <function-decl name='ipv6_dev_get_saddr' mangled-name='ipv6_dev_get_saddr' filepath='net/ipv6/addrconf.c' line='1755' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ipv6_dev_get_saddr'>

        <parameter type-id='a2bff676' name='net' filepath='net/ipv6/addrconf.c' line='1755' column='1'/>

        <parameter type-id='2ce52478' name='dst_dev' filepath='net/ipv6/addrconf.c' line='1755' column='1'/>

        <parameter type-id='fea9c20b' name='daddr' filepath='net/ipv6/addrconf.c' line='1756' column='1'/>

        <parameter type-id='f0981eeb' name='prefs' filepath='net/ipv6/addrconf.c' line='1756' column='1'/>

        <parameter type-id='ed512028' name='saddr' filepath='net/ipv6/addrconf.c' line='1757' column='1'/>

      <function-decl name='ipv6_dev_get_saddr' mangled-name='ipv6_dev_get_saddr' filepath='net/ipv6/addrconf.c' line='1751' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ipv6_dev_get_saddr'>

        <parameter type-id='a2bff676' name='net' filepath='net/ipv6/addrconf.c' line='1751' column='1'/>

        <parameter type-id='2ce52478' name='dst_dev' filepath='net/ipv6/addrconf.c' line='1751' column='1'/>

        <parameter type-id='fea9c20b' name='daddr' filepath='net/ipv6/addrconf.c' line='1752' column='1'/>

        <parameter type-id='f0981eeb' name='prefs' filepath='net/ipv6/addrconf.c' line='1752' column='1'/>

        <parameter type-id='ed512028' name='saddr' filepath='net/ipv6/addrconf.c' line='1753' column='1'/>

        <return type-id='95e97e5e'/>

      </function-decl>

      <function-decl name='ipv6_chk_addr' mangled-name='ipv6_chk_addr' filepath='net/ipv6/addrconf.c' line='1901' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ipv6_chk_addr'>

        <parameter type-id='a2bff676' name='net' filepath='net/ipv6/addrconf.c' line='1901' column='1'/>

        <parameter type-id='fea9c20b' name='addr' filepath='net/ipv6/addrconf.c' line='1901' column='1'/>

        <parameter type-id='2ce52478' name='dev' filepath='net/ipv6/addrconf.c' line='1902' column='1'/>

        <parameter type-id='95e97e5e' name='strict' filepath='net/ipv6/addrconf.c' line='1902' column='1'/>

      <function-decl name='ipv6_chk_addr' mangled-name='ipv6_chk_addr' filepath='net/ipv6/addrconf.c' line='1897' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ipv6_chk_addr'>

        <parameter type-id='a2bff676' name='net' filepath='net/ipv6/addrconf.c' line='1897' column='1'/>

        <parameter type-id='fea9c20b' name='addr' filepath='net/ipv6/addrconf.c' line='1897' column='1'/>

        <parameter type-id='2ce52478' name='dev' filepath='net/ipv6/addrconf.c' line='1898' column='1'/>

        <parameter type-id='95e97e5e' name='strict' filepath='net/ipv6/addrconf.c' line='1898' column='1'/>

        <return type-id='95e97e5e'/>

      </function-decl>

      <function-type size-in-bits='64' id='bb1a67f7'>
@@ -172482,11 +172488,11 @@ 
      </function-type>

    </abi-instr>

    <abi-instr address-size='64' path='net/sched/act_api.c' language='LANG_C89'>

      <function-decl name='tcf_action_exec' mangled-name='tcf_action_exec' filepath='net/sched/act_api.c' line='641' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tcf_action_exec'>

        <parameter type-id='0fbf3cfd' name='skb' filepath='net/sched/act_api.c' line='641' column='1'/>

        <parameter type-id='981420b7' name='actions' filepath='net/sched/act_api.c' line='641' column='1'/>

        <parameter type-id='95e97e5e' name='nr_actions' filepath='net/sched/act_api.c' line='642' column='1'/>

        <parameter type-id='e638cd0c' name='res' filepath='net/sched/act_api.c' line='642' column='1'/>

      <function-decl name='tcf_action_exec' mangled-name='tcf_action_exec' filepath='net/sched/act_api.c' line='647' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tcf_action_exec'>

        <parameter type-id='0fbf3cfd' name='skb' filepath='net/sched/act_api.c' line='647' column='1'/>

        <parameter type-id='981420b7' name='actions' filepath='net/sched/act_api.c' line='647' column='1'/>

        <parameter type-id='95e97e5e' name='nr_actions' filepath='net/sched/act_api.c' line='648' column='1'/>

        <parameter type-id='e638cd0c' name='res' filepath='net/sched/act_api.c' line='648' column='1'/>

        <return type-id='95e97e5e'/>

      </function-decl>

      <pointer-type-def type-id='3f646ae7' size-in-bits='64' id='981420b7'/>

android/abi_gki_aarch64_qcom

+1 −0
Original line number Diff line number Diff line
@@ -2868,6 +2868,7 @@ 
  vmalloc_to_page

  vmalloc_user

  vmap

  vmemdup_user

  vmemmap

  vmf_insert_mixed

  vmf_insert_pfn

android/abi_gki_aarch64_sony

+3 −0
Original line number Diff line number Diff line
@@ -158,3 +158,6 @@ 


# required by ledtrig_transient.ko

  led_set_brightness_nosleep



# required by sec_touchscreen.ko

  input_set_timestamp

arch/arm64/kernel/armv8_deprecated.c

+5 −4
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ struct insn_emulation { 
static LIST_HEAD(insn_emulation);

static int nr_insn_emulated __initdata;

static DEFINE_RAW_SPINLOCK(insn_emulation_lock);

static DEFINE_MUTEX(insn_emulation_mutex);



static void register_emulation_hooks(struct insn_emulation_ops *ops)

{
@@ -207,10 +208,10 @@ static int emulation_proc_handler(struct ctl_table *table, int write, 
				  loff_t *ppos)

{

	int ret = 0;

	struct insn_emulation *insn = (struct insn_emulation *) table->data;

	struct insn_emulation *insn = container_of(table->data, struct insn_emulation, current_mode);

	enum insn_emulation_mode prev_mode = insn->current_mode;



	table->data = &insn->current_mode;

	mutex_lock(&insn_emulation_mutex);

	ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);



	if (ret || !write || prev_mode == insn->current_mode)
@@ -223,7 +224,7 @@ static int emulation_proc_handler(struct ctl_table *table, int write, 
		update_insn_emulation_mode(insn, INSN_UNDEF);

	}

ret:

	table->data = insn;

	mutex_unlock(&insn_emulation_mutex);

	return ret;

}
@@ -247,7 +248,7 @@ static void __init register_insn_emulation_sysctl(void) 
		sysctl->maxlen = sizeof(int);



		sysctl->procname = insn->ops->name;

		sysctl->data = insn;

		sysctl->data = &insn->current_mode;

		sysctl->extra1 = &insn->min;

		sysctl->extra2 = &insn->max;

		sysctl->proc_handler = emulation_proc_handler;

include/linux/ksm.h

+0 −7
Original line number Diff line number Diff line
@@ -53,8 +53,6 @@ struct page *ksm_might_need_to_copy(struct page *page, 


void rmap_walk_ksm(struct page *page, struct rmap_walk_control *rwc);

void ksm_migrate_page(struct page *newpage, struct page *oldpage);

bool reuse_ksm_page(struct page *page,

			struct vm_area_struct *vma, unsigned long address);



#else  /* !CONFIG_KSM */
@@ -88,11 +86,6 @@ static inline void rmap_walk_ksm(struct page *page, 
static inline void ksm_migrate_page(struct page *newpage, struct page *oldpage)

{

}

static inline bool reuse_ksm_page(struct page *page,

			struct vm_area_struct *vma, unsigned long address)

{

	return false;

}

#endif /* CONFIG_MMU */

#endif /* !CONFIG_KSM */