diff --git a/repos/dde_linux/lib/import/import-virt_lx_emul.mk b/repos/dde_linux/lib/import/import-virt_lx_emul.mk index bc5a953294..a06f12e756 100644 --- a/repos/dde_linux/lib/import/import-virt_lx_emul.mk +++ b/repos/dde_linux/lib/import/import-virt_lx_emul.mk @@ -1,6 +1,6 @@ LIBS += virt_linux_generated -LX_SRC_DIR := $(call select_from_ports,legacy_linux)/src/linux +LX_SRC_DIR := $(call select_from_ports,linux)/src/linux ifeq ($(wildcard $(LX_SRC_DIR)),) LX_SRC_DIR := $(call select_from_repositories,src/linux) endif diff --git a/repos/dde_linux/lib/mk/virt_linux_generated.inc b/repos/dde_linux/lib/mk/virt_linux_generated.inc index b9ff8b9326..e5beb64f55 100644 --- a/repos/dde_linux/lib/mk/virt_linux_generated.inc +++ b/repos/dde_linux/lib/mk/virt_linux_generated.inc @@ -1,6 +1,6 @@ CUSTOM_TARGET_DEPS := kernel_build.phony -LX_DIR := $(call select_from_ports,legacy_linux)/src/linux +LX_DIR := $(call select_from_ports,linux)/src/linux PWD := $(shell pwd) LX_MK_ARGS = ARCH=$(LINUX_ARCH) CROSS_COMPILE=$(CROSS_DEV_PREFIX) diff --git a/repos/dde_linux/recipes/api/virt_linux/content.mk b/repos/dde_linux/recipes/api/virt_linux/content.mk index 98d1ca0c97..29e27da5e2 100644 --- a/repos/dde_linux/recipes/api/virt_linux/content.mk +++ b/repos/dde_linux/recipes/api/virt_linux/content.mk @@ -36,7 +36,7 @@ $(MIRRORED_FROM_REP_DIR): # Content from the Linux source tree # -PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/legacy_linux) +PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/linux) LX_REL_DIR := src/linux LX_ABS_DIR := $(addsuffix /$(LX_REL_DIR),$(PORT_DIR)) diff --git a/repos/dde_linux/recipes/src/usb_hid/content.mk b/repos/dde_linux/recipes/src/usb_hid/content.mk index d1d260ee26..ad75312935 100644 --- a/repos/dde_linux/recipes/src/usb_hid/content.mk +++ b/repos/dde_linux/recipes/src/usb_hid/content.mk @@ -4,7 +4,7 @@ content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_REP_DIR): $(mirror_from_rep_dir) -PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/legacy_linux) +PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/linux) content: LICENSE LICENSE: diff --git a/repos/dde_linux/recipes/src/usb_net/content.mk b/repos/dde_linux/recipes/src/usb_net/content.mk index 048cc128bd..21135806b1 100644 --- a/repos/dde_linux/recipes/src/usb_net/content.mk +++ b/repos/dde_linux/recipes/src/usb_net/content.mk @@ -4,7 +4,7 @@ content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_REP_DIR): $(mirror_from_rep_dir) -PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/legacy_linux) +PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/linux) content: LICENSE LICENSE: diff --git a/repos/dde_linux/recipes/src/vfs_lxip/content.mk b/repos/dde_linux/recipes/src/vfs_lxip/content.mk index 466039e6f0..e90ef5e264 100644 --- a/repos/dde_linux/recipes/src/vfs_lxip/content.mk +++ b/repos/dde_linux/recipes/src/vfs_lxip/content.mk @@ -11,7 +11,7 @@ content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_REP_DIR): $(mirror_from_rep_dir) -PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/legacy_linux) +PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/linux) content: LICENSE LICENSE: diff --git a/repos/dde_linux/src/include/virt_linux/spec/arm_v6/lx_emul/initcall_order.h b/repos/dde_linux/src/include/virt_linux/spec/arm_v6/lx_emul/initcall_order.h index ee5eabd2a8..52766a1c15 100644 --- a/repos/dde_linux/src/include/virt_linux/spec/arm_v6/lx_emul/initcall_order.h +++ b/repos/dde_linux/src/include/virt_linux/spec/arm_v6/lx_emul/initcall_order.h @@ -1,7 +1,7 @@ /* * \brief Array defining order of Linux Kernel initcalls * \author Automatically generated file - do no edit - * \date 2024-02-05 + * \date 2024-06-28 */ #pragma once @@ -61,6 +61,7 @@ static const char * lx_emul_initcall_order[] = { "__initcall_init_reserve_notifier4", "__initcall_init_admin_reserve4", "__initcall_init_user_reserve4", + "__initcall_sha3_generic_mod_init4", "__initcall_aes_init4", "__initcall_prng_mod_init4", "__initcall_misc_init4", @@ -74,6 +75,7 @@ static const char * lx_emul_initcall_order[] = { "__initcall_net_dev_init4", "__initcall_neigh_init4", "__initcall_fib_notifier_init4", + "__initcall_netdev_genl_init4", "__initcall_ethnl_init4", "__initcall_nexthop_init4", "__initcall_vsprintf_init_hashval4", @@ -164,6 +166,9 @@ static const char * lx_emul_initcall_order[] = { "__initcall_pci_sysfs_init7", "__initcall_sync_state_resume_initcall7", "__initcall_deferred_probe_initcall7", + "__initcall_init_subsystem7", + "__initcall_bpf_kfunc_init7", + "__initcall_xdp_metadata_init7", "__initcall_tcp_congestion_default7", "__initcall_udp_tunnel_nic_init_module7", "__initcall_ip_auto_config7", diff --git a/repos/dde_linux/src/include/virt_linux/spec/arm_v7/lx_emul/initcall_order.h b/repos/dde_linux/src/include/virt_linux/spec/arm_v7/lx_emul/initcall_order.h index 06abaf2673..e2113d64c3 100644 --- a/repos/dde_linux/src/include/virt_linux/spec/arm_v7/lx_emul/initcall_order.h +++ b/repos/dde_linux/src/include/virt_linux/spec/arm_v7/lx_emul/initcall_order.h @@ -1,7 +1,7 @@ /* * \brief Array defining order of Linux Kernel initcalls * \author Automatically generated file - do no edit - * \date 2024-02-05 + * \date 2024-06-28 */ #pragma once @@ -19,7 +19,6 @@ static const char * lx_emul_initcall_order[] = { "__initcall_ptrace_break_init1", "__initcall_v6_userpage_init1", "__initcall_ksysfs_init1", - "__initcall_rcu_set_runtime_mode1", "__initcall_init_jiffies_clocksource1", "__initcall_init_elf_binfmt1", "__initcall_virtio_init1", @@ -53,6 +52,7 @@ static const char * lx_emul_initcall_order[] = { "__initcall_init_reserve_notifier4", "__initcall_init_admin_reserve4", "__initcall_init_user_reserve4", + "__initcall_sha3_generic_mod_init4", "__initcall_aes_init4", "__initcall_prng_mod_init4", "__initcall_misc_init4", @@ -65,6 +65,7 @@ static const char * lx_emul_initcall_order[] = { "__initcall_net_dev_init4", "__initcall_neigh_init4", "__initcall_fib_notifier_init4", + "__initcall_netdev_genl_init4", "__initcall_ethnl_init4", "__initcall_nexthop_init4", "__initcall_vsprintf_init_hashval4", @@ -152,6 +153,9 @@ static const char * lx_emul_initcall_order[] = { "__initcall_pci_sysfs_init7", "__initcall_sync_state_resume_initcall7", "__initcall_deferred_probe_initcall7", + "__initcall_init_subsystem7", + "__initcall_bpf_kfunc_init7", + "__initcall_xdp_metadata_init7", "__initcall_tcp_congestion_default7", "__initcall_udp_tunnel_nic_init_module7", "__initcall_ip_auto_config7", diff --git a/repos/dde_linux/src/include/virt_linux/spec/arm_v8/lx_emul/initcall_order.h b/repos/dde_linux/src/include/virt_linux/spec/arm_v8/lx_emul/initcall_order.h index 630351cbeb..59819d9ef4 100644 --- a/repos/dde_linux/src/include/virt_linux/spec/arm_v8/lx_emul/initcall_order.h +++ b/repos/dde_linux/src/include/virt_linux/spec/arm_v8/lx_emul/initcall_order.h @@ -1,7 +1,7 @@ /* * \brief Array defining order of Linux Kernel initcalls * \author Automatically generated file - do no edit - * \date 2024-02-05 + * \date 2024-06-28 */ #pragma once @@ -25,7 +25,6 @@ static const char * lx_emul_initcall_order[] = { "__initcall_pci_realloc_setup_params0", "__initcall_inet_frag_wq_init0", "__initcall_fpsimd_init1", - "__initcall_enable_mrs_emulation1", "__initcall_init_amu_fie1", "__initcall_ksysfs_init1", "__initcall_rcu_set_runtime_mode1", @@ -65,6 +64,7 @@ static const char * lx_emul_initcall_order[] = { "__initcall_init_user_reserve4", "__initcall_init_admin_reserve4", "__initcall_init_reserve_notifier4", + "__initcall_sha3_generic_mod_init4", "__initcall_aes_init4", "__initcall_prng_mod_init4", "__initcall_misc_init4", @@ -78,6 +78,7 @@ static const char * lx_emul_initcall_order[] = { "__initcall_net_dev_init4", "__initcall_neigh_init4", "__initcall_fib_notifier_init4", + "__initcall_netdev_genl_init4", "__initcall_ethnl_init4", "__initcall_nexthop_init4", "__initcall_vsprintf_init_hashval4", @@ -166,6 +167,7 @@ static const char * lx_emul_initcall_order[] = { "__initcall_inet_diag_init6", "__initcall_tcp_diag_init6", "__initcall_cubictcp_register6", + "__initcall_check_mmu_enabled_at_boot6s", "__initcall_printk_late_init7", "__initcall_check_early_ioremap_leak7", "__initcall_crypto_algapi_init7", @@ -173,6 +175,9 @@ static const char * lx_emul_initcall_order[] = { "__initcall_pci_sysfs_init7", "__initcall_sync_state_resume_initcall7", "__initcall_deferred_probe_initcall7", + "__initcall_bpf_kfunc_init7", + "__initcall_init_subsystem7", + "__initcall_xdp_metadata_init7", "__initcall_tcp_congestion_default7", "__initcall_udp_tunnel_nic_init_module7", "__initcall_ip_auto_config7", diff --git a/repos/dde_linux/src/include/virt_linux/spec/x86_32/lx_emul/initcall_order.h b/repos/dde_linux/src/include/virt_linux/spec/x86_32/lx_emul/initcall_order.h index eb5aadbb90..40b19bbc09 100644 --- a/repos/dde_linux/src/include/virt_linux/spec/x86_32/lx_emul/initcall_order.h +++ b/repos/dde_linux/src/include/virt_linux/spec/x86_32/lx_emul/initcall_order.h @@ -1,7 +1,7 @@ /* * \brief Array defining order of Linux Kernel initcalls * \author Automatically generated file - do no edit - * \date 2024-02-05 + * \date 2024-06-28 */ #pragma once @@ -10,7 +10,10 @@ static const char * lx_emul_initcall_order[] = { "__initcall_init_hw_perf_eventsearly", "__initcall_start", "__initcall_do_init_real_modeearly", + "__initcall_init_sigframe_sizeearly", + "__initcall_cache_ap_registerearly", "__initcall_bp_init_aperfmperfearly", + "__initcall_smp_init_primary_thread_maskearly", "__initcall_register_nmi_cpu_backtrace_handlerearly", "__initcall_spawn_ksoftirqdearly", "__initcall_migration_initearly", @@ -53,6 +56,7 @@ static const char * lx_emul_initcall_order[] = { "__initcall_init_pit_clocksource3", "__initcall_intel_pconfig_init3", "__initcall_pci_arch_init3", + "__initcall_init_vdso_image_324", "__initcall_fixup_ht_bug4", "__initcall_topology_init4", "__initcall_uid_cache_init4", @@ -63,6 +67,7 @@ static const char * lx_emul_initcall_order[] = { "__initcall_init_user_reserve4", "__initcall_init_admin_reserve4", "__initcall_init_reserve_notifier4", + "__initcall_sha3_generic_mod_init4", "__initcall_aes_init4", "__initcall_prng_mod_init4", "__initcall_misc_init4", @@ -75,11 +80,13 @@ static const char * lx_emul_initcall_order[] = { "__initcall_net_dev_init4", "__initcall_neigh_init4", "__initcall_fib_notifier_init4", + "__initcall_netdev_genl_init4", "__initcall_ethnl_init4", "__initcall_nexthop_init4", "__initcall_pci_subsys_init4", "__initcall_vsprintf_init_hashval4", "__initcall_nmi_warning_debugfs5", + "__initcall_save_microcode_in_initrd5", "__initcall_init_amd_nbs5", "__initcall_iomem_init_inode5", "__initcall_clocksource_done_booting5", @@ -137,6 +144,7 @@ static const char * lx_emul_initcall_order[] = { "__initcall_blackhole_netdev_init6", "__initcall_phylink_init6", "__initcall_phy_module_init6", + "__initcall_phy_module_init6", "__initcall_virtio_net_driver_init6", "__initcall_asix_driver_init6", "__initcall_ax88179_178a_driver_init6", @@ -168,6 +176,7 @@ static const char * lx_emul_initcall_order[] = { "__initcall_inet_diag_init6", "__initcall_tcp_diag_init6", "__initcall_cubictcp_register6", + "__initcall_microcode_init7", "__initcall_start_sync_check_timer7", "__initcall_update_mp_table7", "__initcall_lapic_insert_resource7", @@ -182,6 +191,9 @@ static const char * lx_emul_initcall_order[] = { "__initcall_pci_sysfs_init7", "__initcall_sync_state_resume_initcall7", "__initcall_deferred_probe_initcall7", + "__initcall_bpf_kfunc_init7", + "__initcall_init_subsystem7", + "__initcall_xdp_metadata_init7", "__initcall_tcp_congestion_default7", "__initcall_udp_tunnel_nic_init_module7", "__initcall_ip_auto_config7", diff --git a/repos/dde_linux/src/include/virt_linux/spec/x86_64/lx_emul/initcall_order.h b/repos/dde_linux/src/include/virt_linux/spec/x86_64/lx_emul/initcall_order.h index d479208037..067a9df807 100644 --- a/repos/dde_linux/src/include/virt_linux/spec/x86_64/lx_emul/initcall_order.h +++ b/repos/dde_linux/src/include/virt_linux/spec/x86_64/lx_emul/initcall_order.h @@ -1,7 +1,7 @@ /* * \brief Array defining order of Linux Kernel initcalls * \author Automatically generated file - do no edit - * \date 2024-02-05 + * \date 2024-06-27 */ #pragma once @@ -10,7 +10,10 @@ static const char * lx_emul_initcall_order[] = { "__initcall_init_hw_perf_eventsearly", "__initcall_start", "__initcall_do_init_real_modeearly", + "__initcall_init_sigframe_sizeearly", + "__initcall_cache_ap_registerearly", "__initcall_bp_init_aperfmperfearly", + "__initcall_smp_init_primary_thread_maskearly", "__initcall_register_nmi_cpu_backtrace_handlerearly", "__initcall_spawn_ksoftirqdearly", "__initcall_migration_initearly", @@ -54,9 +57,10 @@ static const char * lx_emul_initcall_order[] = { "__initcall_xfd_update_static_branch3", "__initcall_intel_pconfig_init3", "__initcall_pci_arch_init3", - "__initcall_init_vdso4", + "__initcall_init_vdso_image_644", "__initcall_fixup_ht_bug4", "__initcall_topology_init4", + "__initcall_blake2s_mod_init4", "__initcall_uid_cache_init4", "__initcall_user_namespace_sysctl_init4", "__initcall_oom_init4", @@ -65,6 +69,7 @@ static const char * lx_emul_initcall_order[] = { "__initcall_init_user_reserve4", "__initcall_init_admin_reserve4", "__initcall_init_reserve_notifier4", + "__initcall_sha3_generic_mod_init4", "__initcall_aes_init4", "__initcall_prng_mod_init4", "__initcall_misc_init4", @@ -77,11 +82,13 @@ static const char * lx_emul_initcall_order[] = { "__initcall_net_dev_init4", "__initcall_neigh_init4", "__initcall_fib_notifier_init4", + "__initcall_netdev_genl_init4", "__initcall_ethnl_init4", "__initcall_nexthop_init4", "__initcall_pci_subsys_init4", "__initcall_vsprintf_init_hashval4", "__initcall_nmi_warning_debugfs5", + "__initcall_save_microcode_in_initrd5", "__initcall_hpet_late_init5", "__initcall_init_amd_nbs5", "__initcall_iomem_init_inode5", @@ -111,7 +118,6 @@ static const char * lx_emul_initcall_order[] = { "__initcall_umwait_init6", "__initcall_ioapic_init_ops6", "__initcall_chacha_simd_mod_init6", - "__initcall_blake2s_mod_init6", "__initcall_poly1305_simd_mod_init6", "__initcall_curve25519_mod_init6", "__initcall_timekeeping_init_ops6", @@ -142,6 +148,7 @@ static const char * lx_emul_initcall_order[] = { "__initcall_blackhole_netdev_init6", "__initcall_phylink_init6", "__initcall_phy_module_init6", + "__initcall_phy_module_init6", "__initcall_virtio_net_driver_init6", "__initcall_asix_driver_init6", "__initcall_ax88179_178a_driver_init6", @@ -173,6 +180,7 @@ static const char * lx_emul_initcall_order[] = { "__initcall_inet_diag_init6", "__initcall_tcp_diag_init6", "__initcall_cubictcp_register6", + "__initcall_microcode_init7", "__initcall_start_sync_check_timer7", "__initcall_update_mp_table7", "__initcall_lapic_insert_resource7", @@ -187,6 +195,9 @@ static const char * lx_emul_initcall_order[] = { "__initcall_pci_sysfs_init7", "__initcall_sync_state_resume_initcall7", "__initcall_deferred_probe_initcall7", + "__initcall_bpf_kfunc_init7", + "__initcall_init_subsystem7", + "__initcall_xdp_metadata_init7", "__initcall_tcp_congestion_default7", "__initcall_udp_tunnel_nic_init_module7", "__initcall_ip_auto_config7", diff --git a/repos/dde_linux/src/lib/lx_emul/virt/common_dummies.c b/repos/dde_linux/src/lib/lx_emul/virt/common_dummies.c index 74722275e1..0dfd7efbbf 100644 --- a/repos/dde_linux/src/lib/lx_emul/virt/common_dummies.c +++ b/repos/dde_linux/src/lib/lx_emul/virt/common_dummies.c @@ -13,6 +13,15 @@ #include +#if defined(__x86_64__) || defined(__i386__) +#include +unsigned long __end_init_task[0]; + +#include +DEFINE_PER_CPU(struct pcpu_hot, pcpu_hot); +#endif + + #include char __start_rodata[] = {}; diff --git a/repos/dde_linux/src/lib/virt_linux_generated/dep.list b/repos/dde_linux/src/lib/virt_linux_generated/dep.list index b0f733aa39..19df44d3fc 100644 --- a/repos/dde_linux/src/lib/virt_linux_generated/dep.list +++ b/repos/dde_linux/src/lib/virt_linux_generated/dep.list @@ -3,6 +3,7 @@ Makefile arch/arm/Makefile arch/arm/include/asm/Kbuild arch/arm/include/asm/archrandom.h +arch/arm/include/asm/arm_pmuv3.h arch/arm/include/asm/atomic.h arch/arm/include/asm/auxvec.h arch/arm/include/asm/barrier.h @@ -67,6 +68,7 @@ arch/arm/include/asm/thread_info.h arch/arm/include/asm/timex.h arch/arm/include/asm/tlbflush.h arch/arm/include/asm/topology.h +arch/arm/include/asm/traps.h arch/arm/include/asm/uaccess.h arch/arm/include/asm/ucontext.h arch/arm/include/asm/unified.h @@ -106,6 +108,7 @@ arch/arm64/include/asm/alternative.h arch/arm64/include/asm/arch_gicv3.h arch/arm64/include/asm/arch_timer.h arch/arm64/include/asm/archrandom.h +arch/arm64/include/asm/arm_pmuv3.h arch/arm64/include/asm/asm-bug.h arch/arm64/include/asm/asm-extable.h arch/arm64/include/asm/asm-offsets.h @@ -194,6 +197,7 @@ arch/arm64/include/asm/syscall_wrapper.h arch/arm64/include/asm/sysreg.h arch/arm64/include/asm/thread_info.h arch/arm64/include/asm/timex.h +arch/arm64/include/asm/tlbbatch.h arch/arm64/include/asm/tlbflush.h arch/arm64/include/asm/topology.h arch/arm64/include/asm/uaccess.h @@ -260,6 +264,7 @@ arch/x86/include/asm/compat.h arch/x86/include/asm/cpu_entry_area.h arch/x86/include/asm/cpufeature.h arch/x86/include/asm/cpufeatures.h +arch/x86/include/asm/cpuid.h arch/x86/include/asm/cpumask.h arch/x86/include/asm/current.h arch/x86/include/asm/desc.h @@ -307,6 +312,8 @@ arch/x86/include/asm/page_64.h arch/x86/include/asm/page_64_types.h arch/x86/include/asm/page_types.h arch/x86/include/asm/paravirt.h +arch/x86/include/asm/paravirt.h +arch/x86/include/asm/paravirt_types.h arch/x86/include/asm/percpu.h arch/x86/include/asm/pgtable-2level.h arch/x86/include/asm/pgtable-2level_types.h @@ -336,6 +343,7 @@ arch/x86/include/asm/segment.h arch/x86/include/asm/shared/msr.h arch/x86/include/asm/shared/tdx.h arch/x86/include/asm/shmparam.h +arch/x86/include/asm/shstk.h arch/x86/include/asm/sigframe.h arch/x86/include/asm/signal.h arch/x86/include/asm/smap.h @@ -511,6 +519,9 @@ include/asm-generic/unaligned.h include/asm-generic/user.h include/asm-generic/vmlinux.lds.h include/clocksource/arm_arch_timer.h +include/crypto/aria.h +include/crypto/utils.h +include/kunit/test-bug.h include/kvm/arm_arch_timer.h include/kvm/arm_pmu.h include/kvm/arm_vgic.h @@ -520,6 +531,7 @@ include/linux/alarmtimer.h include/linux/align.h include/linux/apm_bios.h include/linux/arch_topology.h +include/linux/args.h include/linux/arm-smccc.h include/linux/arm_sdei.h include/linux/assoc_array.h @@ -551,6 +563,7 @@ include/linux/cc_platform.h include/linux/cdev.h include/linux/cgroup-defs.h include/linux/cgroup.h +include/linux/cleanup.h include/linux/clocksource.h include/linux/clocksource_ids.h include/linux/compat.h @@ -567,6 +580,7 @@ include/linux/context_tracking_irq.h include/linux/context_tracking_state.h include/linux/cper.h include/linux/cpu.h +include/linux/cpu_smt.h include/linux/cpuhotplug.h include/linux/cpumask.h include/linux/crash_core.h @@ -587,6 +601,7 @@ include/linux/dma-mapping.h include/linux/dqblk_qtree.h include/linux/dqblk_v1.h include/linux/dqblk_v2.h +include/linux/dynamic_debug.h include/linux/edd.h include/linux/efi.h include/linux/elf.h @@ -617,6 +632,7 @@ include/linux/gpio/consumer.h include/linux/hardirq.h include/linux/hash.h include/linux/hashtable.h +include/linux/hex.h include/linux/highmem-internal.h include/linux/highmem.h include/linux/highuid.h @@ -632,7 +648,6 @@ include/linux/instrumented.h include/linux/interrupt.h include/linux/interval_tree.h include/linux/io.h -include/linux/ioasid.h include/linux/iocontext.h include/linux/ioport.h include/linux/ioprio.h @@ -693,6 +708,7 @@ include/linux/linkage.h include/linux/list.h include/linux/list_bl.h include/linux/list_lru.h +include/linux/livepatch_sched.h include/linux/llist.h include/linux/local_lock.h include/linux/local_lock_internal.h @@ -720,10 +736,12 @@ include/linux/mmzone.h include/linux/mnt_idmapping.h include/linux/mod_devicetable.h include/linux/module.h +include/linux/module_symbol.h include/linux/moduleparam.h include/linux/mount.h include/linux/msi.h include/linux/mutex.h +include/linux/net_tstamp.h include/linux/nfs_fs_i.h include/linux/node.h include/linux/nodemask.h @@ -734,6 +752,7 @@ include/linux/nsproxy.h include/linux/numa.h include/linux/nvmem-provider.h include/linux/objtool.h +include/linux/objtool_types.h include/linux/of.h include/linux/once.h include/linux/once_lite.h @@ -754,6 +773,7 @@ include/linux/percpu-refcount.h include/linux/percpu-rwsem.h include/linux/percpu.h include/linux/percpu_counter.h +include/linux/perf/arm_pmuv3.h include/linux/perf_event.h include/linux/perf_regs.h include/linux/personality.h @@ -794,6 +814,7 @@ include/linux/rculist.h include/linux/rculist_bl.h include/linux/rcupdate.h include/linux/rcupdate_wait.h +include/linux/rcuref.h include/linux/rcutiny.h include/linux/rcutree.h include/linux/rcuwait.h @@ -851,6 +872,7 @@ include/linux/spinlock_types.h include/linux/spinlock_types_raw.h include/linux/spinlock_types_up.h include/linux/spinlock_up.h +include/linux/sprintf.h include/linux/srcu.h include/linux/srcutiny.h include/linux/srcutree.h @@ -863,6 +885,7 @@ include/linux/static_key.h include/linux/stdarg.h include/linux/stddef.h include/linux/string.h +include/linux/string_choices.h include/linux/string_helpers.h include/linux/stringhash.h include/linux/stringify.h @@ -956,6 +979,7 @@ include/uapi/linux/edd.h include/uapi/linux/elf-em.h include/uapi/linux/elf.h include/uapi/linux/errno.h +include/uapi/linux/eventfd.h include/uapi/linux/eventpoll.h include/uapi/linux/fcntl.h include/uapi/linux/fs.h @@ -973,6 +997,8 @@ include/uapi/linux/kvm_para.h include/uapi/linux/libc-compat.h include/uapi/linux/limits.h include/uapi/linux/magic.h +include/uapi/linux/mei.h +include/uapi/linux/mei_uuid.h include/uapi/linux/mempolicy.h include/uapi/linux/openat2.h include/uapi/linux/param.h @@ -1035,6 +1061,7 @@ kernel/rcu/srcutiny.c kernel/time/timeconst.bc lib/ctype.c lib/gen_crc32table.c +lib/radix-tree.h lib/rbtree.c lib/string.c lib/vdso/Makefile @@ -1045,6 +1072,7 @@ scripts/Makefile scripts/Makefile.asm-generic scripts/Makefile.build scripts/Makefile.compiler +scripts/Makefile.defconf scripts/Makefile.extrawarn scripts/Makefile.host scripts/Makefile.lib @@ -1053,7 +1081,6 @@ scripts/basic/Makefile scripts/basic/fixdep.c scripts/cc-can-link.sh scripts/cc-version.sh -scripts/check-local-export scripts/checksyscalls.sh scripts/config scripts/dtc/Makefile @@ -1118,6 +1145,7 @@ scripts/mod/mk_elfconfig.c scripts/mod/modpost.c scripts/mod/modpost.h scripts/mod/sumversion.c +scripts/mod/symsearch.c scripts/pahole-flags.sh scripts/pahole-version.sh scripts/remove-stale-files @@ -1176,7 +1204,7 @@ tools/include/linux/kernel.h tools/include/linux/list.h tools/include/linux/log2.h tools/include/linux/math.h -tools/include/linux/objtool.h +tools/include/linux/objtool_types.h tools/include/linux/poison.h tools/include/linux/rbtree.h tools/include/linux/rbtree_augmented.h @@ -1202,7 +1230,6 @@ tools/objtool/arch/x86/include tools/objtool/arch/x86/include/arch tools/objtool/arch/x86/include/arch/cfi_regs.h tools/objtool/arch/x86/include/arch/elf.h -tools/objtool/arch/x86/include/arch/endianness.h tools/objtool/arch/x86/include/arch/special.h tools/objtool/arch/x86/special.c tools/objtool/builtin-check.c diff --git a/repos/dde_linux/src/test/driver_time/target.inc b/repos/dde_linux/src/test/driver_time/target.inc index d5879a1aa6..64646f01a9 100644 --- a/repos/dde_linux/src/test/driver_time/target.inc +++ b/repos/dde_linux/src/test/driver_time/target.inc @@ -10,7 +10,7 @@ SRC_CC += lx_emul/random.cc vpath %.c $(PRG_DIR)/../.. vpath %.cc $(PRG_DIR)/../.. -LX_SRC_DIR := $(call select_from_ports,legacy_linux)/src/linux +LX_SRC_DIR := $(call select_from_ports,linux)/src/linux ifeq ($(wildcard $(LX_SRC_DIR)),) LX_SRC_DIR := $(call select_from_repositories,src/linux) endif diff --git a/repos/dde_linux/src/virt_linux/arm_v6/target.mk b/repos/dde_linux/src/virt_linux/arm_v6/target.mk index 0935aada33..2afd1af11d 100644 --- a/repos/dde_linux/src/virt_linux/arm_v6/target.mk +++ b/repos/dde_linux/src/virt_linux/arm_v6/target.mk @@ -3,7 +3,7 @@ REQUIRES := arm_v6 CUSTOM_TARGET_DEPS := kernel_build.phony -LX_DIR := $(call select_from_ports,legacy_linux)/src/linux +LX_DIR := $(call select_from_ports,linux)/src/linux PWD := $(shell pwd) # options for Linux kernel build to not depend on current time, user and host diff --git a/repos/dde_linux/src/virt_linux/arm_v7/target.mk b/repos/dde_linux/src/virt_linux/arm_v7/target.mk index 7b035ef88e..10734fab4f 100644 --- a/repos/dde_linux/src/virt_linux/arm_v7/target.mk +++ b/repos/dde_linux/src/virt_linux/arm_v7/target.mk @@ -3,7 +3,7 @@ REQUIRES := arm_v7 CUSTOM_TARGET_DEPS := kernel_build.phony -LX_DIR := $(call select_from_ports,legacy_linux)/src/linux +LX_DIR := $(call select_from_ports,linux)/src/linux PWD := $(shell pwd) # options for Linux kernel build to not depend on current time, user and host diff --git a/repos/dde_linux/src/virt_linux/arm_v8/target.mk b/repos/dde_linux/src/virt_linux/arm_v8/target.mk index cbd8a5662a..82c25931bd 100644 --- a/repos/dde_linux/src/virt_linux/arm_v8/target.mk +++ b/repos/dde_linux/src/virt_linux/arm_v8/target.mk @@ -3,7 +3,7 @@ REQUIRES := arm_v8 CUSTOM_TARGET_DEPS := kernel_build.phony -LX_DIR := $(call select_from_ports,legacy_linux)/src/linux +LX_DIR := $(call select_from_ports,linux)/src/linux PWD := $(shell pwd) # options for Linux kernel build to not depend on current time, user and host diff --git a/repos/dde_linux/src/virt_linux/x86_32/target.mk b/repos/dde_linux/src/virt_linux/x86_32/target.mk index b3a91bff18..7c0436870e 100644 --- a/repos/dde_linux/src/virt_linux/x86_32/target.mk +++ b/repos/dde_linux/src/virt_linux/x86_32/target.mk @@ -3,7 +3,7 @@ REQUIRES := x86_32 CUSTOM_TARGET_DEPS := kernel_build.phony -LX_DIR := $(call select_from_ports,legacy_linux)/src/linux +LX_DIR := $(call select_from_ports,linux)/src/linux PWD := $(shell pwd) # options for Linux kernel build to not depend on current time, user and host diff --git a/repos/dde_linux/src/virt_linux/x86_64/target.mk b/repos/dde_linux/src/virt_linux/x86_64/target.mk index 2e57c62246..c07acd5681 100644 --- a/repos/dde_linux/src/virt_linux/x86_64/target.mk +++ b/repos/dde_linux/src/virt_linux/x86_64/target.mk @@ -3,7 +3,7 @@ REQUIRES := x86_64 CUSTOM_TARGET_DEPS := kernel_build.phony -LX_DIR := $(call select_from_ports,legacy_linux)/src/linux +LX_DIR := $(call select_from_ports,linux)/src/linux PWD := $(shell pwd) # options for Linux kernel build to not depend on current time, user and host