From dd0140f82e4ea4781918f30c9ba3dc196b62e664 Mon Sep 17 00:00:00 2001
From: Sebastian Sumpf <sebastian.sumpf@genode-labs.com>
Date: Wed, 31 Jul 2024 15:18:57 +0200
Subject: [PATCH] pc: use linux 6.6.47

Issue #5264
---
 repos/pc/lib/import/import-pc_lx_emul.mk      |  2 +-
 repos/pc/lib/mk/pc_linux_generated.inc        |  2 +-
 repos/pc/recipes/api/pc_linux/content.mk      |  3 +-
 repos/pc/recipes/src/pc_intel_fb/content.mk   |  2 +-
 repos/pc/recipes/src/pc_nic/content.mk        |  2 +-
 repos/pc/recipes/src/pc_usb_host/content.mk   |  2 +-
 .../src/driver/framebuffer/intel/pc/dep.list  |  9 --
 .../intel/pc/spec/x86_32/source.list          |  4 -
 .../intel/pc/spec/x86_64/source.list          |  4 -
 .../driver/framebuffer/intel/pc/target.inc    |  2 +-
 repos/pc/src/include/lx_emul/initcall_order.h | 22 ++++-
 repos/pc/src/lib/pc/lx_emul/common_dummies.c  | 88 +++++++++++++++++++
 repos/pc/src/lib/pc/lx_emul/dep.list          | 32 ++++++-
 .../shadow/drivers/acpi/device_sysfs.c        |  2 +-
 .../src/lib/pc_wifi/spec/x86_32/source.list   |  2 +-
 .../src/lib/pc_wifi/spec/x86_64/source.list   |  2 +-
 repos/pc/src/pc_linux/x86_32/target.mk        |  2 +-
 repos/pc/src/pc_linux/x86_64/target.mk        |  2 +-
 18 files changed, 146 insertions(+), 38 deletions(-)

diff --git a/repos/pc/lib/import/import-pc_lx_emul.mk b/repos/pc/lib/import/import-pc_lx_emul.mk
index 3b031e0bc7..23a99fefc6 100644
--- a/repos/pc/lib/import/import-pc_lx_emul.mk
+++ b/repos/pc/lib/import/import-pc_lx_emul.mk
@@ -1,6 +1,6 @@
 LIBS += pc_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/pc/lib/mk/pc_linux_generated.inc b/repos/pc/lib/mk/pc_linux_generated.inc
index f440999ba0..46e6517db0 100644
--- a/repos/pc/lib/mk/pc_linux_generated.inc
+++ b/repos/pc/lib/mk/pc_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/pc/recipes/api/pc_linux/content.mk b/repos/pc/recipes/api/pc_linux/content.mk
index 2003209b7e..9624cf848b 100644
--- a/repos/pc/recipes/api/pc_linux/content.mk
+++ b/repos/pc/recipes/api/pc_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))
 
@@ -87,7 +87,6 @@ LX_FILES += Kbuild \
             scripts/basic/Makefile \
             scripts/basic/fixdep.c \
             scripts/cc-version.sh \
-            scripts/check-local-export \
             scripts/checksyscalls.sh \
             scripts/config \
             scripts/dtc \
diff --git a/repos/pc/recipes/src/pc_intel_fb/content.mk b/repos/pc/recipes/src/pc_intel_fb/content.mk
index 7ece96a019..a5ccba775b 100644
--- a/repos/pc/recipes/src/pc_intel_fb/content.mk
+++ b/repos/pc/recipes/src/pc_intel_fb/content.mk
@@ -4,7 +4,7 @@ MIRROR_FROM_REP_DIR := src/driver/framebuffer/intel/pc \
 
 content: $(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)
 
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
diff --git a/repos/pc/recipes/src/pc_nic/content.mk b/repos/pc/recipes/src/pc_nic/content.mk
index 8fb79f5488..5b097b8cdc 100644
--- a/repos/pc/recipes/src/pc_nic/content.mk
+++ b/repos/pc/recipes/src/pc_nic/content.mk
@@ -13,7 +13,7 @@ $(MIRROR_FROM_REP_DIR):
 #	mkdir -p $(dir $@)
 #	cp -r $(GENODE_DIR)/repos/os/$@ $@
 
-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/pc/recipes/src/pc_usb_host/content.mk b/repos/pc/recipes/src/pc_usb_host/content.mk
index 77e0c6b126..9ba7272d45 100644
--- a/repos/pc/recipes/src/pc_usb_host/content.mk
+++ b/repos/pc/recipes/src/pc_usb_host/content.mk
@@ -12,7 +12,7 @@ $(MIRROR_FROM_OS_DIR):
 	mkdir -p $(dir $@)
 	cp -r $(GENODE_DIR)/repos/os/$@ $@
 
-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/pc/src/driver/framebuffer/intel/pc/dep.list b/repos/pc/src/driver/framebuffer/intel/pc/dep.list
index 0b40fdb2e5..e3dfb1e67f 100644
--- a/repos/pc/src/driver/framebuffer/intel/pc/dep.list
+++ b/repos/pc/src/driver/framebuffer/intel/pc/dep.list
@@ -103,7 +103,6 @@ drivers/gpu/drm/i915/display/intel_snps_phy.h
 drivers/gpu/drm/i915/display/intel_snps_phy_regs.h
 drivers/gpu/drm/i915/display/intel_sprite.h
 drivers/gpu/drm/i915/display/intel_tc.h
-drivers/gpu/drm/i915/display/intel_tc_phy_regs.h
 drivers/gpu/drm/i915/display/intel_tv.h
 drivers/gpu/drm/i915/display/intel_vbt_defs.h
 drivers/gpu/drm/i915/display/intel_vdsc.h
@@ -254,22 +253,17 @@ drivers/gpu/drm/i915/i915_vma.h
 drivers/gpu/drm/i915/i915_vma_resource.h
 drivers/gpu/drm/i915/i915_vma_types.h
 drivers/gpu/drm/i915/intel_device_info.h
-drivers/gpu/drm/i915/intel_dram.h
 drivers/gpu/drm/i915/intel_gvt.h
 drivers/gpu/drm/i915/intel_mchbar_regs.h
 drivers/gpu/drm/i915/intel_memory_region.h
-drivers/gpu/drm/i915/intel_pch.h
 drivers/gpu/drm/i915/intel_pci_config.h
 drivers/gpu/drm/i915/intel_pcode.h
-drivers/gpu/drm/i915/intel_pm.h
-drivers/gpu/drm/i915/intel_pm_types.h
 drivers/gpu/drm/i915/intel_region_ttm.h
 drivers/gpu/drm/i915/intel_runtime_pm.h
 drivers/gpu/drm/i915/intel_sbi.h
 drivers/gpu/drm/i915/intel_step.h
 drivers/gpu/drm/i915/intel_uncore.h
 drivers/gpu/drm/i915/intel_wakeref.h
-drivers/gpu/drm/i915/intel_wopcm.h
 drivers/gpu/drm/i915/pxp/intel_pxp.h
 drivers/gpu/drm/i915/pxp/intel_pxp_pm.h
 drivers/gpu/drm/i915/pxp/intel_pxp_types.h
@@ -356,12 +350,9 @@ include/drm/drm_vma_manager.h
 include/drm/drm_writeback.h
 include/drm/i915_component.h
 include/drm/i915_drm.h
-include/drm/i915_mei_hdcp_interface.h
 include/drm/i915_pciids.h
 include/drm/intel-gtt.h
 include/drm/intel_lpe_audio.h
-include/drm/ttm/ttm_bo_api.h
-include/drm/ttm/ttm_bo_driver.h
 include/drm/ttm/ttm_caching.h
 include/drm/ttm/ttm_device.h
 include/drm/ttm/ttm_kmap_iter.h
diff --git a/repos/pc/src/driver/framebuffer/intel/pc/spec/x86_32/source.list b/repos/pc/src/driver/framebuffer/intel/pc/spec/x86_32/source.list
index d07fc6c26e..c2fdd40c1b 100644
--- a/repos/pc/src/driver/framebuffer/intel/pc/spec/x86_32/source.list
+++ b/repos/pc/src/driver/framebuffer/intel/pc/spec/x86_32/source.list
@@ -197,18 +197,14 @@ drivers/gpu/drm/i915/i915_utils.c
 drivers/gpu/drm/i915/i915_vma.c
 drivers/gpu/drm/i915/i915_vma_resource.c
 drivers/gpu/drm/i915/intel_device_info.c
-drivers/gpu/drm/i915/intel_dram.c
 drivers/gpu/drm/i915/intel_memory_region.c
-drivers/gpu/drm/i915/intel_pch.c
 drivers/gpu/drm/i915/intel_pcode.c
-drivers/gpu/drm/i915/intel_pm.c
 drivers/gpu/drm/i915/intel_region_ttm.c
 drivers/gpu/drm/i915/intel_runtime_pm.c
 drivers/gpu/drm/i915/intel_sbi.c
 drivers/gpu/drm/i915/intel_step.c
 drivers/gpu/drm/i915/intel_uncore.c
 drivers/gpu/drm/i915/intel_wakeref.c
-drivers/gpu/drm/i915/intel_wopcm.c
 drivers/gpu/drm/i915/vlv_sideband.c
 drivers/gpu/drm/i915/vlv_suspend.c
 drivers/gpu/drm/ttm/ttm_bo.c
diff --git a/repos/pc/src/driver/framebuffer/intel/pc/spec/x86_64/source.list b/repos/pc/src/driver/framebuffer/intel/pc/spec/x86_64/source.list
index a08dd7fbd4..634b63ebf8 100644
--- a/repos/pc/src/driver/framebuffer/intel/pc/spec/x86_64/source.list
+++ b/repos/pc/src/driver/framebuffer/intel/pc/spec/x86_64/source.list
@@ -200,18 +200,14 @@ drivers/gpu/drm/i915/i915_utils.c
 drivers/gpu/drm/i915/i915_vma.c
 drivers/gpu/drm/i915/i915_vma_resource.c
 drivers/gpu/drm/i915/intel_device_info.c
-drivers/gpu/drm/i915/intel_dram.c
 drivers/gpu/drm/i915/intel_memory_region.c
-drivers/gpu/drm/i915/intel_pch.c
 drivers/gpu/drm/i915/intel_pcode.c
-drivers/gpu/drm/i915/intel_pm.c
 drivers/gpu/drm/i915/intel_region_ttm.c
 drivers/gpu/drm/i915/intel_runtime_pm.c
 drivers/gpu/drm/i915/intel_sbi.c
 drivers/gpu/drm/i915/intel_step.c
 drivers/gpu/drm/i915/intel_uncore.c
 drivers/gpu/drm/i915/intel_wakeref.c
-drivers/gpu/drm/i915/intel_wopcm.c
 drivers/gpu/drm/i915/vlv_sideband.c
 drivers/gpu/drm/i915/vlv_suspend.c
 drivers/gpu/drm/ttm/ttm_bo.c
diff --git a/repos/pc/src/driver/framebuffer/intel/pc/target.inc b/repos/pc/src/driver/framebuffer/intel/pc/target.inc
index 37ad1f9647..93004a960f 100644
--- a/repos/pc/src/driver/framebuffer/intel/pc/target.inc
+++ b/repos/pc/src/driver/framebuffer/intel/pc/target.inc
@@ -28,7 +28,7 @@ vpath %.cc $(REL_PRG_DIR)
 vpath %.c  $(REP_DIR)/src/lib/pc
 vpath %.cc $(REP_DIR)/src/lib/pc
 
-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/pc/src/include/lx_emul/initcall_order.h b/repos/pc/src/include/lx_emul/initcall_order.h
index 6c6d6c6058..f8a5ee92da 100644
--- a/repos/pc/src/include/lx_emul/initcall_order.h
+++ b/repos/pc/src/include/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   2023-11-02
+ * \date   2024-07-31
  */
 
 #pragma once
@@ -10,9 +10,14 @@ 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_init_signal_sysctlsearly",
+	"__initcall_init_umh_sysctlsearly",
 	"__initcall_migration_initearly",
 	"__initcall_srcu_bootup_announceearly",
 	"__initcall_rcu_spawn_gp_kthreadearly",
@@ -23,6 +28,8 @@ static const char * lx_emul_initcall_order[] = {
 	"__initcall_static_call_initearly",
 	"__initcall_init_zero_pfnearly",
 	"__initcall_init_fs_inode_sysctlsearly",
+	"__initcall_init_fs_sysctlsearly",
+	"__initcall_init_security_keys_sysctlsearly",
 	"__initcall_efi_memreserve_root_initearly",
 	"__initcall_efi_earlycon_remap_fbearly",
 	"__initcall_init_mmap_min_addr0",
@@ -77,9 +84,10 @@ static const char * lx_emul_initcall_order[] = {
 	"__initcall_kcmp_cookies_init3",
 	"__initcall_cryptomgr_init3",
 	"__initcall_acpi_pci_init3",
+	"__initcall_serial_base_init3",
 	"__initcall_iommu_dma_init3",
 	"__initcall_pci_arch_init3",
-	"__initcall_init_vdso4",
+	"__initcall_init_vdso_image_644",
 	"__initcall_fixup_ht_bug4",
 	"__initcall_topology_init4",
 	"__initcall_uid_cache_init4",
@@ -124,6 +132,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_ieee80211_init4",
 	"__initcall_rfkill_init4",
@@ -131,6 +140,7 @@ static const char * lx_emul_initcall_order[] = {
 	"__initcall_vsprintf_init_hashval4",
 	"__initcall_acpi_wmi_init4s",
 	"__initcall_nmi_warning_debugfs5",
+	"__initcall_save_microcode_in_initrd5",
 	"__initcall_hpet_late_init5",
 	"__initcall_init_amd_nbs5",
 	"__initcall_iomem_init_inode5",
@@ -198,7 +208,6 @@ static const char * lx_emul_initcall_order[] = {
 	"__initcall_mm_compute_batch_init6",
 	"__initcall_workingset_init6",
 	"__initcall_proc_vmalloc_init6",
-	"__initcall_slab_sysfs_init6",
 	"__initcall_fcntl_init6",
 	"__initcall_proc_filesystems_init6",
 	"__initcall_start_dirtytime_writeback6",
@@ -300,10 +309,12 @@ static const char * lx_emul_initcall_order[] = {
 	"__initcall_snd_sof_pci_intel_skl_driver_init6",
 	"__initcall_snd_sof_pci_intel_tgl_driver_init6",
 	"__initcall_snd_sof_pci_intel_mtl_driver_init6",
+	"__initcall_snd_sof_pci_intel_lnl_driver_init6",
 	"__initcall_sock_diag_init6",
 	"__initcall_packet_init6",
 	"__initcall_kernel_do_mounts_initrd_sysctls_init7",
 	"__initcall_sld_mitigate_sysctl_init7",
+	"__initcall_microcode_init7",
 	"__initcall_hpet_insert_resource7",
 	"__initcall_start_sync_check_timer7",
 	"__initcall_update_mp_table7",
@@ -315,13 +326,13 @@ static const char * lx_emul_initcall_order[] = {
 	"__initcall_kernel_panic_sysfs_init7",
 	"__initcall_kernel_exit_sysctls_init7",
 	"__initcall_kernel_exit_sysfs_init7",
+	"__initcall_param_sysfs_builtin_init7",
 	"__initcall_reboot_ksysfs_init7",
 	"__initcall_sched_core_sysctl_init7",
 	"__initcall_sched_fair_sysctl_init7",
 	"__initcall_sched_rt_sysctl_init7",
 	"__initcall_sched_dl_sysctl_init7",
 	"__initcall_sched_clock_init_late7",
-	"__initcall_sched_init_debug7",
 	"__initcall_cpu_latency_qos_init7",
 	"__initcall_printk_late_init7",
 	"__initcall_load_system_certificate_list7",
@@ -335,6 +346,9 @@ static const char * lx_emul_initcall_order[] = {
 	"__initcall_deferred_probe_initcall7",
 	"__initcall_efi_shutdown_init7",
 	"__initcall_efi_earlycon_unmap_fb7",
+	"__initcall_bpf_kfunc_init7",
+	"__initcall_init_subsystem7",
+	"__initcall_xdp_metadata_init7",
 	"__initcall_regulatory_init_db7",
 	"__initcall_pci_mmcfg_late_insert_resources7",
 	"__initcall_acpi_gpio_handle_deferred_request_irqs7s",
diff --git a/repos/pc/src/lib/pc/lx_emul/common_dummies.c b/repos/pc/src/lib/pc/lx_emul/common_dummies.c
index df3218ee4d..d3c23a0bf6 100644
--- a/repos/pc/src/lib/pc/lx_emul/common_dummies.c
+++ b/repos/pc/src/lib/pc/lx_emul/common_dummies.c
@@ -14,6 +14,12 @@
 #include <lx_emul.h>
 
 
+#include <asm/processor.h>
+unsigned long __end_init_task[0];
+
+#include <asm/current.h>
+DEFINE_PER_CPU(struct pcpu_hot, pcpu_hot);
+
 /* arch/x86/kernel/head64.c */
 unsigned long vmalloc_base;
 
@@ -47,6 +53,12 @@ const struct trace_print_flags vmaflag_names[]  = { {0,NULL}};
 const struct trace_print_flags pageflag_names[] = { {0,NULL}};
 
 
+/* mm/debug.c */
+const struct trace_print_flags pagetype_names[] = {
+	{0, NULL}
+};
+
+
 #include <asm/processor.h>
 
 /*
@@ -64,6 +76,10 @@ struct cpuinfo_x86 boot_cpu_data =
 unsigned long init_stack[THREAD_SIZE / sizeof(unsigned long)];
 
 
+/* kernel/sched/sched.h */
+bool sched_smp_initialized = true;
+
+
 /*
  * Generate_dummies.c will otherwise pull in <linux/rcutree.h>
  * that clashes with rcutiny.h.
@@ -387,3 +403,75 @@ DEFINE_PER_CPU(bool, hardirq_stack_inuse);
 
 DEFINE_PER_CPU_READ_MOSTLY(struct cpuinfo_x86, cpu_info);
 EXPORT_PER_CPU_SYMBOL(cpu_info);
+
+
+struct dl_bw;
+void init_dl_bw(struct dl_bw *dl_b)
+{
+	lx_emul_trace_and_stop(__func__);
+}
+
+struct irq_work;
+extern void rto_push_irq_work_func(struct irq_work *work);
+void rto_push_irq_work_func(struct irq_work *work)
+{
+	lx_emul_trace_and_stop(__func__);
+}
+
+
+/* kernel/sched/cpudeadline.h */
+struct cpudl;
+int  cpudl_init(struct cpudl *cp)
+{
+	lx_emul_trace_and_stop(__func__);
+	return -1;
+}
+
+
+void cpudl_cleanup(struct cpudl *cp)
+{
+	lx_emul_trace_and_stop(__func__);
+}
+
+
+/* include/linux/sched/topology.h */
+int arch_asym_cpu_priority(int cpu)
+{
+	lx_emul_trace_and_stop(__func__);
+	return 0;
+}
+
+
+#include <linux/swiotlb.h>
+
+void swiotlb_dev_init(struct device * dev)
+{
+	lx_emul_trace(__func__);
+}
+
+
+bool is_swiotlb_allocated(void)
+{
+	lx_emul_trace(__func__);
+	return false;
+}
+
+
+#include <linux/random.h>
+
+int __cold execute_with_initialized_rng(struct notifier_block * nb)
+{
+	lx_emul_trace(__func__);
+	return 0;
+}
+
+
+#include <linux/sysctl.h>
+
+struct ctl_table_header *register_sysctl_sz(const char *path, struct ctl_table *table,
+                                            size_t table_size)
+{
+	lx_emul_trace(__func__);
+	return NULL;
+}
+
diff --git a/repos/pc/src/lib/pc/lx_emul/dep.list b/repos/pc/src/lib/pc/lx_emul/dep.list
index 6bf4398773..27cb010c1a 100644
--- a/repos/pc/src/lib/pc/lx_emul/dep.list
+++ b/repos/pc/src/lib/pc/lx_emul/dep.list
@@ -19,6 +19,7 @@ arch/x86/include/asm/cpu.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/delay.h
 arch/x86/include/asm/desc.h
@@ -38,6 +39,7 @@ arch/x86/include/asm/fpu/api.h
 arch/x86/include/asm/fpu/types.h
 arch/x86/include/asm/fsgsbase.h
 arch/x86/include/asm/ftrace.h
+arch/x86/include/asm/gsseg.h
 arch/x86/include/asm/hardirq.h
 arch/x86/include/asm/hw_breakpoint.h
 arch/x86/include/asm/hw_irq.h
@@ -72,6 +74,8 @@ arch/x86/include/asm/numa.h
 arch/x86/include/asm/orc_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/pci.h
 arch/x86/include/asm/percpu.h
 arch/x86/include/asm/perf_event.h
@@ -90,6 +94,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/signal.h
 arch/x86/include/asm/smap.h
 arch/x86/include/asm/smp.h
@@ -120,6 +125,7 @@ arch/x86/include/asm/vmalloc.h
 arch/x86/include/asm/vmxfeatures.h
 arch/x86/include/asm/word-at-a-time.h
 arch/x86/include/asm/x86_init.h
+arch/x86/include/asm/xen/hypervisor.h
 arch/x86/include/uapi/asm/auxvec.h
 arch/x86/include/uapi/asm/bitsperlong.h
 arch/x86/include/uapi/asm/bootparam.h
@@ -166,7 +172,6 @@ include/acpi/actbl1.h
 include/acpi/actbl2.h
 include/acpi/actbl3.h
 include/acpi/actypes.h
-include/acpi/pdc_intel.h
 include/acpi/platform/acenv.h
 include/acpi/platform/acenvex.h
 include/acpi/platform/acgcc.h
@@ -193,7 +198,6 @@ include/asm-generic/error-injection.h
 include/asm-generic/export.h
 include/asm-generic/fixmap.h
 include/asm-generic/getorder.h
-include/asm-generic/gpio.h
 include/asm-generic/int-ll64.h
 include/asm-generic/io.h
 include/asm-generic/ioctl.h
@@ -217,8 +221,11 @@ include/asm-generic/rwonce.h
 include/asm-generic/sections.h
 include/asm-generic/topology.h
 include/asm-generic/unaligned.h
+include/crypto/aria.h
+include/crypto/utils.h
 include/kunit/assert.h
 include/kunit/resource.h
+include/kunit/test-bug.h
 include/kunit/test.h
 include/kunit/try-catch.h
 include/linux/acpi.h
@@ -226,6 +233,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/assoc_array.h
 include/linux/async.h
 include/linux/atomic.h
@@ -262,6 +270,7 @@ include/linux/cdev.h
 include/linux/cgroup-defs.h
 include/linux/cgroup.h
 include/linux/cgroup_api.h
+include/linux/cleanup.h
 include/linux/clk-provider.h
 include/linux/clk.h
 include/linux/clk/clk-conf.h
@@ -286,6 +295,7 @@ include/linux/context_tracking.h
 include/linux/context_tracking_irq.h
 include/linux/context_tracking_state.h
 include/linux/cpu.h
+include/linux/cpu_smt.h
 include/linux/cpufreq.h
 include/linux/cpuhotplug.h
 include/linux/cpumask.h
@@ -352,6 +362,7 @@ include/linux/hardirq.h
 include/linux/hash.h
 include/linux/hashtable.h
 include/linux/hashtable_api.h
+include/linux/hex.h
 include/linux/highmem-internal.h
 include/linux/highmem.h
 include/linux/highuid.h
@@ -374,7 +385,6 @@ include/linux/instrumentation.h
 include/linux/instrumented.h
 include/linux/interrupt.h
 include/linux/io.h
-include/linux/ioasid.h
 include/linux/iocontext.h
 include/linux/iommu.h
 include/linux/iopoll.h
@@ -387,6 +397,7 @@ include/linux/irq_work.h
 include/linux/irqchip.h
 include/linux/irqdesc.h
 include/linux/irqdomain.h
+include/linux/irqdomain_defs.h
 include/linux/irqflags.h
 include/linux/irqhandler.h
 include/linux/irqnr.h
@@ -442,6 +453,7 @@ include/linux/list_lru.h
 include/linux/list_nulls.h
 include/linux/list_sort.h
 include/linux/livepatch.h
+include/linux/livepatch_sched.h
 include/linux/llist.h
 include/linux/local_lock.h
 include/linux/local_lock_internal.h
@@ -478,9 +490,11 @@ 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/msi_api.h
 include/linux/mutex.h
 include/linux/mutex_api.h
 include/linux/net.h
@@ -500,6 +514,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/of_address.h
 include/linux/of_clk.h
@@ -583,6 +598,7 @@ include/linux/rculist.h
 include/linux/rculist_bl.h
 include/linux/rculist_nulls.h
 include/linux/rcupdate.h
+include/linux/rcuref.h
 include/linux/rcutree.h
 include/linux/rcuwait.h
 include/linux/reboot.h
@@ -670,6 +686,7 @@ include/linux/spinlock_api_smp.h
 include/linux/spinlock_types.h
 include/linux/spinlock_types_raw.h
 include/linux/splice.h
+include/linux/sprintf.h
 include/linux/srcu.h
 include/linux/srcutree.h
 include/linux/stackdepot.h
@@ -682,6 +699,7 @@ include/linux/stdarg.h
 include/linux/stddef.h
 include/linux/stop_machine.h
 include/linux/string.h
+include/linux/string_choices.h
 include/linux/string_helpers.h
 include/linux/stringhash.h
 include/linux/stringify.h
@@ -762,6 +780,7 @@ include/linux/ww_mutex.h
 include/linux/xarray.h
 include/net/addrconf.h
 include/net/checksum.h
+include/net/dropreason-core.h
 include/net/dropreason.h
 include/net/dst.h
 include/net/dst_ops.h
@@ -802,7 +821,6 @@ include/net/netns/unix.h
 include/net/netns/xdp.h
 include/net/netns/xfrm.h
 include/net/netprio_cgroup.h
-include/net/page_pool.h
 include/net/request_sock.h
 include/net/rtnetlink.h
 include/net/scm.h
@@ -816,6 +834,7 @@ include/trace/events/error_report.h
 include/trace/events/irq.h
 include/trace/events/kmem.h
 include/trace/events/lock.h
+include/trace/events/maple_tree.h
 include/trace/events/mmflags.h
 include/trace/events/power.h
 include/trace/events/sched.h
@@ -865,6 +884,7 @@ include/uapi/linux/elf-em.h
 include/uapi/linux/elf.h
 include/uapi/linux/errno.h
 include/uapi/linux/ethtool.h
+include/uapi/linux/eventfd.h
 include/uapi/linux/eventpoll.h
 include/uapi/linux/fcntl.h
 include/uapi/linux/fib_rules.h
@@ -895,6 +915,8 @@ include/uapi/linux/limits.h
 include/uapi/linux/magic.h
 include/uapi/linux/major.h
 include/uapi/linux/mdio.h
+include/uapi/linux/mei.h
+include/uapi/linux/mei_uuid.h
 include/uapi/linux/membarrier.h
 include/uapi/linux/mempolicy.h
 include/uapi/linux/mii.h
@@ -902,6 +924,7 @@ include/uapi/linux/mman.h
 include/uapi/linux/neighbour.h
 include/uapi/linux/net.h
 include/uapi/linux/net_tstamp.h
+include/uapi/linux/netdev.h
 include/uapi/linux/netdevice.h
 include/uapi/linux/netfilter.h
 include/uapi/linux/netfilter/nf_tables.h
@@ -1005,6 +1028,7 @@ kernel/time/timekeeping_internal.h
 kernel/workqueue_internal.h
 lib/crc32defs.h
 lib/kstrtox.h
+lib/radix-tree.h
 mm/internal.h
 mm/slab.h
 mm/swap.h
diff --git a/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/device_sysfs.c b/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/device_sysfs.c
index 1aa0684db9..f611c4f9e2 100644
--- a/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/device_sysfs.c
+++ b/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/device_sysfs.c
@@ -16,7 +16,7 @@
 #include <linux/acpi.h>
 
 
-int acpi_device_uevent_modalias(struct device *dev, struct kobj_uevent_env *event)
+int acpi_device_uevent_modalias(const struct device *dev, struct kobj_uevent_env *event)
 {
 	lx_emul_trace(__func__);
 	return -1;
diff --git a/repos/pc/src/lib/pc_wifi/spec/x86_32/source.list b/repos/pc/src/lib/pc_wifi/spec/x86_32/source.list
index e7d61316a5..cd9ad097ce 100644
--- a/repos/pc/src/lib/pc_wifi/spec/x86_32/source.list
+++ b/repos/pc/src/lib/pc_wifi/spec/x86_32/source.list
@@ -16,7 +16,6 @@ crypto/crypto_null.c
 crypto/ctr.c
 crypto/gcm.c
 crypto/geniv.c
-crypto/gf128mul.c
 crypto/ghash-generic.c
 crypto/hash_info.c
 crypto/kpp.c
@@ -186,6 +185,7 @@ lib/bitmap.c
 lib/bsearch.c
 lib/crc32.c
 lib/crypto/aes.c
+lib/crypto/gf128mul.c
 lib/crypto/memneq.c
 lib/ctype.c
 lib/debug_locks.c
diff --git a/repos/pc/src/lib/pc_wifi/spec/x86_64/source.list b/repos/pc/src/lib/pc_wifi/spec/x86_64/source.list
index 870b26952b..1c950262ef 100644
--- a/repos/pc/src/lib/pc_wifi/spec/x86_64/source.list
+++ b/repos/pc/src/lib/pc_wifi/spec/x86_64/source.list
@@ -17,7 +17,6 @@ crypto/crypto_null.c
 crypto/ctr.c
 crypto/gcm.c
 crypto/geniv.c
-crypto/gf128mul.c
 crypto/ghash-generic.c
 crypto/hash_info.c
 crypto/kpp.c
@@ -231,6 +230,7 @@ lib/bitmap.c
 lib/bsearch.c
 lib/crc32.c
 lib/crypto/aes.c
+lib/crypto/gf128mul.c
 lib/crypto/memneq.c
 lib/ctype.c
 lib/debug_locks.c
diff --git a/repos/pc/src/pc_linux/x86_32/target.mk b/repos/pc/src/pc_linux/x86_32/target.mk
index 5ec8116917..f26c773999 100644
--- a/repos/pc/src/pc_linux/x86_32/target.mk
+++ b/repos/pc/src/pc_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/pc/src/pc_linux/x86_64/target.mk b/repos/pc/src/pc_linux/x86_64/target.mk
index 5cae66e33f..7e863fd559 100644
--- a/repos/pc/src/pc_linux/x86_64/target.mk
+++ b/repos/pc/src/pc_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