Changeset f2cb80a in mainline

Timestamp:

2024-02-23T17:57:23Z (2 months ago)

Author:

GitHub <noreply@…>

Children:

192019f

Parents:

86f862c (diff), 90ba06c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-02-23 17:57:23)

git-committer:

GitHub <noreply@…> (2024-02-23 17:57:23)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

Files:

• kernel/arch/amd64/_link.ld.in (modified) (view diffs)
• kernel/arch/amd64/include/arch/mm/page.h (modified) (view diffs)
• kernel/arch/amd64/include/arch/mm/pat.h (moved) (moved from uspace/lib/c/arch/amd64/include/libarch/stackarg.h ) (view diffs)
• kernel/arch/amd64/src/amd64.c (modified) (view diffs)
• kernel/arch/arm32/_link.ld.in (modified) (view diffs)
• kernel/arch/arm64/_link.ld.in (modified) (view diffs)
• kernel/arch/arm64/src/interrupt.c (modified) (view diffs)
• kernel/arch/ia32/_link.ld.in (modified) (view diffs)
• kernel/arch/ia32/include/arch/mm/page.h (modified) (view diffs)
• kernel/arch/ia32/include/arch/mm/pat.h (added)
• kernel/arch/ia32/src/ia32.c (modified) (view diffs)
• kernel/arch/ia64/_link.ld.in (modified) (view diffs)
• kernel/arch/ia64/src/drivers/it.c (modified) (view diffs)
• kernel/arch/ia64/src/drivers/ski.c (modified) (view diffs)
• kernel/arch/mips32/_link.ld.in (modified) (view diffs)
• kernel/arch/mips32/src/interrupt.c (modified) (view diffs)
• kernel/arch/ppc32/_link.ld.in (modified) (view diffs)
• kernel/arch/riscv64/_link.ld.in (modified) (view diffs)
• kernel/arch/sparc64/_link.ld.in (modified) (view diffs)
• kernel/arch/sparc64/src/drivers/niagara.c (modified) (view diffs)
• kernel/arch/sparc64/src/drivers/tick.c (modified) (view diffs)
• kernel/arch/sparc64/src/proc/sun4u/scheduler.c (modified) (view diffs)
• kernel/arch/sparc64/src/proc/sun4v/scheduler.c (modified) (view diffs)
• kernel/genarch/src/fb/fb.c (modified) (view diffs)
• kernel/genarch/src/kbrd/kbrd.c (modified) (view diffs)
• kernel/genarch/src/kbrd/kbrd_at.c (modified) (view diffs)
• kernel/genarch/src/srln/srln.c (modified) (view diffs)
• kernel/generic/include/atomic.h (modified) (view diffs)
• kernel/generic/include/context.h (modified) (view diffs)
• kernel/generic/include/cpu.h (modified) (view diffs)
• kernel/generic/include/lib/refcount.h (modified) (view diffs)
• kernel/generic/include/mm/mm.h (modified) (view diffs)
• kernel/generic/include/proc/scheduler.h (modified) (view diffs)
• kernel/generic/include/proc/task.h (modified) (view diffs)
• kernel/generic/include/proc/thread.h (modified) (view diffs)
• kernel/generic/meson.build (modified) (view diffs)
• kernel/generic/src/console/cmd.c (modified) (view diffs)
• kernel/generic/src/cpu/cpu.c (modified) (view diffs)
• kernel/generic/src/ddi/ddi.c (modified) (view diffs)
• kernel/generic/src/interrupt/interrupt.c (modified) (view diffs)
• kernel/generic/src/ipc/ipc.c (modified) (view diffs)
• kernel/generic/src/ipc/kbox.c (modified) (view diffs)
• kernel/generic/src/main/kinit.c (modified) (view diffs)
• kernel/generic/src/main/main.c (modified) (view diffs)
• kernel/generic/src/preempt/preemption.c (deleted)
• kernel/generic/src/proc/program.c (modified) (view diffs)
• kernel/generic/src/proc/scheduler.c (modified) (view diffs)
• kernel/generic/src/proc/task.c (modified) (view diffs)
• kernel/generic/src/proc/thread.c (modified) (view diffs)
• kernel/generic/src/security/perm.c (modified) (view diffs)
• kernel/generic/src/syscall/syscall.c (modified) (view diffs)
• kernel/generic/src/sysinfo/stats.c (modified) (view diffs)
• kernel/generic/src/time/clock.c (modified) (view diffs)
• kernel/generic/src/time/timeout.c (modified) (view diffs)
• kernel/generic/src/udebug/udebug_ops.c (modified) (view diffs)
• kernel/test/mm/falloc2.c (modified) (view diffs)
• kernel/test/mm/slab1.c (modified) (view diffs)
• kernel/test/mm/slab2.c (modified) (view diffs)
• kernel/test/synch/semaphore1.c (modified) (view diffs)
• kernel/test/synch/semaphore2.c (modified) (view diffs)
• kernel/test/thread/thread1.c (modified) (view diffs)
• meson.build (modified) (view diffs)
• meson/part/exports/copy-export.sh (added)
• meson/part/exports/meson.build (modified) (view diffs)
• tools/xcw/bin/helenos-pkg-config (modified) (view diffs)
• uspace/app/display-cfg/main.c (modified) (view diffs)
• uspace/app/taskbar-cfg/smeedit.c (modified) (view diffs)
• uspace/app/taskbar-cfg/startmenu.c (modified) (view diffs)
• uspace/app/taskbar-cfg/startmenu.h (modified) (view diffs)
• uspace/app/taskbar-cfg/types/smeedit.h (modified) (view diffs)
• uspace/app/taskbar-cfg/types/startmenu.h (modified) (view diffs)
• uspace/app/taskbar/taskbar.sif (modified) (view diffs)
• uspace/app/taskbar/tbsmenu.c (modified) (view diffs)
• uspace/app/taskbar/tbsmenu.h (modified) (view diffs)
• uspace/app/taskbar/types/tbsmenu.h (modified) (view diffs)
• uspace/lib/c/meson.build (modified) (view diffs)
• uspace/lib/clui/include/nchoice.h (moved) (moved from uspace/lib/clui/nchoice.h ) (view diffs)
• uspace/lib/clui/include/tinput.h (moved) (moved from uspace/lib/clui/tinput.h ) (view diffs)
• uspace/lib/clui/meson.build (modified) (view diffs)
• uspace/lib/clui/src/nchoice.c (moved) (moved from uspace/lib/clui/nchoice.c ) (view diffs)
• uspace/lib/clui/src/tinput.c (moved) (moved from uspace/lib/clui/tinput.c ) (view diffs)
• uspace/lib/meson.build (modified) (view diffs)
• uspace/lib/posix/meson.build (modified) (view diffs)
• uspace/lib/tbarcfg/include/tbarcfg/tbarcfg.h (modified) (view diffs)
• uspace/lib/tbarcfg/private/tbarcfg.h (modified) (view diffs)
• uspace/lib/tbarcfg/src/tbarcfg.c (modified) (view diffs)
• uspace/lib/tbarcfg/test/tbarcfg.c (modified) (view diffs)
• uspace/lib/ui/include/ui/checkbox.h (modified) (view diffs)
• uspace/lib/ui/include/ui/list.h (modified) (view diffs)
• uspace/lib/ui/src/checkbox.c (modified) (view diffs)
• uspace/lib/ui/src/list.c (modified) (view diffs)
• uspace/lib/ui/test/checkbox.c (modified) (view diffs)
• uspace/lib/ui/test/list.c (modified) (view diffs)