Skip to content

Backport #107 to 6.18-lts: Drivers: hv: give hyperv_remove_xen_vmbus_irq() its asm-generic declaration and stub - #116

Open
edera-rebase-app[bot] wants to merge 1 commit into
edera/6.18-ltsfrom
backport/edera-6.18-lts/pr-107
Open

edera-rebase-app[bot] wants to merge 1 commit into
edera/6.18-ltsfrom
backport/edera-6.18-lts/pr-107

Conversation

@edera-rebase-app

Copy link
Copy Markdown

Backport of #107 from edera/mainline to edera/6.18-lts (c20f0c9b497c), prepared by Claude. Run log.

Merge with Rebase and merge, so edera/6.18-lts stays linear.

Independent checks

Builds: success (x86_64 and arm64 vmlinux with the Edera features built in).

LTS tip before c20f0c9b497c
LTS tip after 5f36d8f45d3f
Commits requested 1
  • New branch fast-forwards the LTS tip.
  • Backported commits are linear.
  • All 1 requested commits backported in order, each with its source's subject and identical +/- lines.

Claude's report

Claude left no report (backport step: success).

The x86_64 build is still compiling. I'll continue when the build notifications come in.

…ration and stub

Commit 2e155d6 ("drivers: hv: tear down the Xen VMBus interrupt
bridge on unwind") added hyperv_remove_xen_vmbus_irq() to the x86 copy
of the nested-on-Xen block in asm/mshyperv.h only.  The asm-generic copy
that other architectures use, arm64 among them, neither declares it nor
stubs it, and vmbus_drv.c calls it unconditionally, so an arm64 kernel
with CONFIG_HYPERV fails to compile.  The nightly arm64 build does not
enable HYPERV, which is why it did not catch this.

Add the declaration and the empty stub to the asm-generic block, next to
hyperv_setup_xen_vmbus_irq(), so the two copies match again.

Signed-off-by: Ariadne Conill <ariadne@ariadne.space>
(cherry picked from commit 9e1fa61)
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.

1 participant