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

Fix build on 6.12, fix build when CONFIG_PM_SLEEP is ON #38

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

tizbac
Copy link

@tizbac tizbac commented Dec 18, 2024

no_llseek tbsdtv/linux_media@af8890e

CONFIG_PM_SLEEP caused unused function fatal warning because it wasn't passed in the struct but still declared when CONFIG_PM_SLEEP was ON

Copy link

google-cla bot commented Dec 18, 2024

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@Crazypersonalph
Copy link

Please merge this fix - it works

@tizbac
Copy link
Author

tizbac commented Dec 21, 2024 via email

@Crazypersonalph
Copy link

Crazypersonalph commented Dec 22, 2024

I signed up for cla but no idea how to unlock that Il sab 21 dic 2024, 17:30 Alphons Joseph @.> ha scritto:

Please merge this fix - it works — Reply to this email directly, view it on GitHub <#38 (comment)>, or unsubscribe https://github.com/notifications/unsubscribe-auth/AABBV6TAH63UXSFFIBONPQL2GWJTPAVCNFSM6AAAAABT2URPR2VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDKNJYGE3DOMZTGI . You are receiving this because you authored the thread.Message ID: @.
>

I think you might need to update the check after signing. If you click on "Details" of the CLA failed check it should be at the bottom.

@chrBrd
Copy link
Contributor

chrBrd commented Dec 29, 2024

Apologies if I'm missing something here, but I think a couple of tweaks could be made to this PR.

First up, the changes to apex_driver.c appear to be redundant - there's already a guard for CONFIG_PM_SLEEP on line 1212:

#ifdef CONFIG_PM_SLEEP
        .suspend = apex_pci_suspend,
        .resume = apex_pci_resume,
#endif

Second, looking at the tags on the actual kernel commit rather than TBSDTV's fork, no_llseek was finally removed from the kernel in 6.12, so #if LINUX_VERSION_CODE >= KERNEL_VERSION(6,11,0) should either be > 6.11 or >= 6.12.

However, no_llseek was set to null in 868941b which landed in 6.0, so I think the changes to gasket_core.c could be made a little cleaner like so:

...
#if LINUX_VERSION_CODE < KERNEL_VERSION(6,0,0)
 	.llseek = no_llseek,
#endif
...

@chrBrd
Copy link
Contributor

chrBrd commented Dec 30, 2024

Just noticed #35, which is the same as the fix I suggested above and is probably a better candidate for merging than this PR, at least for the no_llseek problem.

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.

3 participants