Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lkl: host: drop unused timer callback parameter #562

Merged
merged 2 commits into from
Feb 14, 2025

Conversation

ddiss
Copy link

@ddiss ddiss commented Feb 14, 2025

This is a rework for the host time changes in #561 . I'm happy to squash both commits into one if desired. I've not tested the nt-host.c changes so please be extra careful there.

The following changes since commit 1848ab82969c72a15959491b08f68e04935af6d1:

  Merge pull request #561 from tavip/fix-build-warnings (2025-02-14 10:36:20 +0900)

are available in the Git repository at:

  https://github.com/ddiss/linux host_timer_drop_cb_arg

for you to fetch changes up to f7bb65acf6092a5bb8b0e747294fe1bbb5b1cad3:

  lkl: host: drop unused timer parameter (2025-02-14 15:22:17 +1100)

----------------------------------------------------------------
David Disseldorp (2):
      Revert "lkl: posix: implement wrapper for timer callback"
      lkl: host: drop unused timer parameter

 arch/lkl/include/uapi/asm/host_ops.h |  4 ++--
 arch/lkl/kernel/time.c               |  4 ++--
 tools/lkl/lib/nt-host.c              |  8 +++----
 tools/lkl/lib/posix-host.c           | 42 +++++++++++++-----------------------
 4 files changed, 22 insertions(+), 36 deletions(-)

This reverts commit 648f790.

We can rework this to avoid the new alloc/free.

Signed-off-by: David Disseldorp <[email protected]>
The lkl timer IRQ doesn't use its callback parameter, so drop it from
lkl_host_ops altogether. This avoids the extra posix-host alloc/free
while still addressing the compiler warnings fixed with commit
648f790 ("lkl: posix: implement wrapper for timer callback").

Signed-off-by: David Disseldorp <[email protected]>
@ddiss ddiss force-pushed the host_timer_drop_cb_arg branch from f7bb65a to ff8f512 Compare February 14, 2025 05:21
@ddiss
Copy link
Author

ddiss commented Feb 14, 2025

v2:

  • fix some -Werror=strict-prototypes errors (do_rw() remains broken)

Copy link
Member

@tavip tavip left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks @ddiss!

I've not tested the nt-host.c changes so please be extra careful there.

Fortunately we have tests for this and they seem to pass.

@tavip tavip merged commit 4eb8d9e into lkl:master Feb 14, 2025
12 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants