diff --git a/abi_gki_aarch64_cuttlefish_whitelist b/abi_gki_aarch64_cuttlefish_whitelist index 461da73889f8..695404407f36 100644 --- a/abi_gki_aarch64_cuttlefish_whitelist +++ b/abi_gki_aarch64_cuttlefish_whitelist @@ -67,7 +67,6 @@ kmem_cache_free kmemdup kstrdup - kstrtoull ktime_get __list_add_valid __list_del_entry_valid @@ -77,7 +76,6 @@ memset misc_deregister misc_register - mod_timer __module_get module_layout module_put @@ -114,10 +112,6 @@ pci_unregister_driver perf_trace_buf_alloc perf_trace_run_bpf_submit - platform_device_add - platform_device_alloc - platform_device_del - platform_device_put platform_device_unregister __platform_driver_register platform_driver_unregister @@ -126,6 +120,7 @@ printk __put_cred put_device + __put_page __put_task_struct put_unused_fd queue_delayed_work_on @@ -154,7 +149,6 @@ schedule schedule_timeout schedule_timeout_uninterruptible - scnprintf seq_printf sg_init_one sg_init_table @@ -173,10 +167,8 @@ strlen strncpy strsep - strstr synchronize_irq synchronize_net - synchronize_rcu system_wq trace_define_field trace_event_buffer_commit @@ -193,7 +185,6 @@ unregister_virtio_device unregister_virtio_driver up_write - usleep_range virtio_check_driver_offered_feature virtio_config_changed virtio_max_dma_size @@ -239,6 +230,7 @@ device_find_child device_match_name platform_bus_type + strstr # required by gnss-serial.ko gnss_allocate_device @@ -259,6 +251,90 @@ serdev_device_write serdev_device_write_wakeup +# required by incrementalfs.ko + bin2hex + __break_lease + clear_inode + __close_fd + crc32_le + crypto_alloc_shash + crypto_destroy_tfm + crypto_shash_digest + d_add + d_drop + deactivate_locked_super + dentry_open + dget_parent + d_instantiate + d_make_root + dput + fget + flush_dcache_page + flush_delayed_work + free_pages + fs_kobj + fsstack_copy_attr_all + generic_file_llseek + generic_file_mmap + generic_file_read_iter + generic_file_splice_read + generic_read_dir + generic_shutdown_super + __get_free_pages + get_zeroed_page + iget5_locked + ihold + inode_init_once + inode_init_owner + iput + iterate_dir + kernel_read + kernel_write + kern_path + kobject_create_and_add + kobject_put + lockref_get + lock_rename + lookup_one_len + LZ4_decompress_safe + match_int + match_token + __msecs_to_jiffies + mutex_is_locked + notify_change + pagecache_get_page + path_get + path_put + preempt_schedule + register_filesystem + seq_puts + set_anon_super + sget + simple_getattr + simple_setattr + simple_statfs + strndup_user + sync_filesystem + sysfs_create_group + sysfs_remove_group + truncate_inode_pages + unlock_new_inode + unlock_page + unlock_rename + unregister_filesystem + user_path_at_empty + vfs_create + vfs_fallocate + vfs_getattr + vfs_getxattr + vfs_link + vfs_listxattr + vfs_mkdir + vfs_rename + vfs_rmdir + vfs_setxattr + vfs_unlink + # required by nd_virtio.ko bio_alloc_bioset bio_chain @@ -289,6 +365,10 @@ device_init_wakeup devm_rtc_allocate_device ktime_get_real_seconds + platform_device_add + platform_device_alloc + platform_device_del + platform_device_put __rtc_register_device rtc_time64_to_tm rtc_tm_to_time64 @@ -372,6 +452,7 @@ memchr_inv memremap memunmap + mod_timer of_find_property of_get_property of_property_match_string @@ -389,6 +470,7 @@ unregister_chrdev_region up_read __usecs_to_jiffies + usleep_range # required by tpm_vtpm_proxy.ko anon_inode_getfile @@ -414,6 +496,7 @@ # required by virt_wifi_sim.ko ieee80211_get_channel + kstrtoull release_firmware request_firmware @@ -658,8 +741,8 @@ netif_set_real_num_tx_queues __netif_set_xps_queue net_ratelimit + nf_conntrack_destroy __num_online_cpus - __put_page _raw_spin_trylock sched_clock skb_add_rx_frag @@ -707,6 +790,9 @@ nvdimm_bus_unregister nvdimm_pmem_region_create +# required by vmw_vsock_virtio_transport.ko + synchronize_rcu + # required by vmw_vsock_virtio_transport_common.ko bpf_trace_run10 bpf_trace_run8 diff --git a/abi_gki_aarch64_goldfish_whitelist b/abi_gki_aarch64_goldfish_whitelist index 1b2bdb8a173a..be17c303b5fe 100644 --- a/abi_gki_aarch64_goldfish_whitelist +++ b/abi_gki_aarch64_goldfish_whitelist @@ -21,6 +21,7 @@ __check_object_size __class_create class_destroy + __close_fd complete __const_udelay consume_skb @@ -56,6 +57,7 @@ eth_validate_addr event_triggers_call fd_install + fget finish_wait flush_work fput @@ -85,6 +87,7 @@ kimage_voffset __kmalloc kmalloc_caches + kmalloc_order_trace kmem_cache_alloc kmem_cache_alloc_trace kmem_cache_create @@ -92,12 +95,11 @@ kmem_cache_free kmemdup kobject_add + kobject_create_and_add kobject_init kobject_put kobject_uevent kstrdup - kstrtouint - kstrtoull ktime_get_mono_fast_ns ktime_get_raw_ts64 ktime_get_real_seconds @@ -112,7 +114,6 @@ memset misc_deregister misc_register - mod_timer module_layout module_put __msecs_to_jiffies @@ -129,10 +130,11 @@ netif_device_detach netif_tx_stop_all_queues netif_tx_wake_queue + nf_conntrack_destroy + noop_llseek nr_cpu_ids param_ops_bool param_ops_int - param_ops_uint passthru_features_check pci_disable_device pci_enable_device @@ -146,16 +148,14 @@ perf_trace_buf_alloc perf_trace_run_bpf_submit physvirt_offset - platform_device_add - platform_device_alloc - platform_device_del - platform_device_put platform_device_unregister __platform_driver_register platform_driver_unregister platform_get_irq platform_get_resource + pm_runtime_allow __pm_runtime_suspend + __pm_runtime_use_autosuspend preempt_schedule preempt_schedule_notrace prepare_to_wait_event @@ -180,7 +180,6 @@ __rcu_read_unlock refcount_dec_and_test_checked refcount_inc_checked - regcache_sync register_blkdev register_netdev register_virtio_device @@ -221,7 +220,6 @@ submit_bio sync_file_create synchronize_irq - synchronize_rcu sysfs_create_group sysfs_remove_group system_wq @@ -235,11 +233,11 @@ trace_raw_output_prep trace_seq_printf try_module_get + unlock_page unregister_blkdev unregister_netdev unregister_virtio_device unregister_virtio_driver - usleep_range vabits_actual virtio_check_driver_offered_feature virtio_config_changed @@ -303,10 +301,87 @@ __tasklet_schedule # required by goldfish_sync.ko - __close_fd dma_fence_default_wait dma_fence_free +# required by incrementalfs.ko + bin2hex + __break_lease + clear_inode + crc32_le + crypto_alloc_shash + crypto_destroy_tfm + crypto_shash_digest + d_add + d_drop + deactivate_locked_super + dentry_open + dget_parent + d_instantiate + d_make_root + down_write + dput + flush_dcache_page + flush_delayed_work + fs_kobj + fsstack_copy_attr_all + generic_file_llseek + generic_file_mmap + generic_file_read_iter + generic_file_splice_read + generic_read_dir + generic_shutdown_super + get_zeroed_page + iget5_locked + ihold + inode_init_once + inode_init_owner + iput + iterate_dir + kernel_read + kernel_write + kern_path + ktime_get + lockref_get + lock_rename + lookup_one_len + LZ4_decompress_safe + match_int + match_token + mutex_is_locked + notify_change + pagecache_get_page + path_get + path_put + __put_cred + register_filesystem + seq_puts + set_anon_super + sget + simple_getattr + simple_setattr + simple_statfs + strndup_user + strsep + sync_filesystem + truncate_inode_pages + unlock_new_inode + unlock_rename + unregister_filesystem + up_write + user_path_at_empty + vfs_create + vfs_fallocate + vfs_getattr + vfs_getxattr + vfs_link + vfs_listxattr + vfs_mkdir + vfs_rename + vfs_rmdir + vfs_setxattr + vfs_unlink + # required by mac80211_hwsim.ko alloc_netdev_mqs __cfg80211_alloc_event_skb @@ -421,7 +496,6 @@ check_disk_change __cpu_possible_mask del_timer_sync - fget file_path flush_signals flush_workqueue @@ -437,6 +511,8 @@ kobject_get kstrtobool kstrtoll + kstrtouint + kstrtoull kthread_create_on_node kthread_parkme kthread_should_park @@ -446,6 +522,7 @@ mempool_destroy mempool_kfree mempool_kmalloc + mod_timer __per_cpu_offset percpu_ref_exit percpu_ref_init @@ -468,6 +545,7 @@ submit_bh submit_bio_wait sync_blockdev + synchronize_rcu sysfs_create_link sysfs_notify sysfs_remove_link @@ -504,6 +582,10 @@ del_timer device_init_wakeup devm_rtc_allocate_device + platform_device_add + platform_device_alloc + platform_device_del + platform_device_put __rtc_register_device rtc_time64_to_tm rtc_tm_to_time64 @@ -524,7 +606,6 @@ get_device_system_crosststamp kvasprintf ns_to_timespec - pm_runtime_allow __pm_runtime_disable pm_runtime_enable pm_runtime_forbid @@ -532,9 +613,7 @@ pm_runtime_force_suspend __pm_runtime_idle pm_runtime_set_autosuspend_delay - __pm_runtime_use_autosuspend __printk_ratelimit - regcache_cache_only regcache_mark_dirty snd_card_rw_proc_new snd_component_add @@ -577,21 +656,24 @@ device_initialize dev_set_name kasprintf - kobject_create_and_add krealloc kstrtoint pm_runtime_get_if_in_use __pm_runtime_resume __pm_runtime_set_status + regcache_cache_only + regcache_sync regmap_exit __regmap_init regmap_read + regmap_update_bits_base regmap_write snd_dma_alloc_pages snd_dma_free_pages snd_pcm_format_width __sw_hweight64 timecounter_init + usleep_range # required by snd-hda-intel.ko bpf_trace_run1 @@ -607,6 +689,7 @@ pci_get_device pci_intx pci_ioremap_bar + pci_match_id pci_read_config_word pci_release_regions pci_request_regions @@ -708,11 +791,9 @@ drm_set_preferred_mode drm_universal_plane_init __get_task_comm - kmalloc_order_trace kvfree kvmalloc_node memdup_user - noop_llseek __sg_alloc_table_from_pages sg_free_table sg_next @@ -777,6 +858,7 @@ blk_status_to_errno _dev_notice kobject_uevent_env + param_ops_uint string_get_size __sysfs_match_string @@ -802,7 +884,6 @@ __register_chrdev __splice_from_pipe system_freezing_cnt - unlock_page __unregister_chrdev # required by virtio_input.ko diff --git a/arch/arm64/configs/db845c_gki.fragment b/arch/arm64/configs/db845c_gki.fragment index 9ef72fa76594..d7a407ec148b 100644 --- a/arch/arm64/configs/db845c_gki.fragment +++ b/arch/arm64/configs/db845c_gki.fragment @@ -68,3 +68,4 @@ CONFIG_INTERCONNECT_QCOM_SDM845=m CONFIG_QCOM_PDC=m CONFIG_QCOM_SCM=m CONFIG_ARM_SMMU=m +CONFIG_INCREMENTAL_FS=m diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 89ee6f5507d8..69603b6ec4ec 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -434,7 +434,6 @@ CONFIG_QUOTA=y CONFIG_QFMT_V2=y CONFIG_FUSE_FS=y CONFIG_OVERLAY_FS=y -CONFIG_INCREMENTAL_FS=y CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y diff --git a/arch/arm64/configs/hikey960_gki.fragment b/arch/arm64/configs/hikey960_gki.fragment index 6d76f4d0e0af..80ff5206aea0 100644 --- a/arch/arm64/configs/hikey960_gki.fragment +++ b/arch/arm64/configs/hikey960_gki.fragment @@ -63,3 +63,4 @@ CONFIG_MALI_PLATFORM_NAME="hisilicon" CONFIG_MALI_EXPERT=y CONFIG_MALI_PWRSOFT_765=y CONFIG_PHY_HI3660_USB=m +CONFIG_INCREMENTAL_FS=m diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index db4e30789400..84e3e24a20a8 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -371,7 +371,6 @@ CONFIG_QUOTA=y CONFIG_QFMT_V2=y CONFIG_FUSE_FS=y CONFIG_OVERLAY_FS=y -CONFIG_INCREMENTAL_FS=y CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y