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.

Sign up for GitHub

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

Backport to RHEL 9.5 #147

Merged
merged 3 commits into from
Nov 26, 2024
Merged

Backport to RHEL 9.5 #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db1055d
backport: avoid duplicate definition of spi_get_chipselect() with RHE…
pcolberg Nov 25, 2024
2bd85d5
backport: drop extra argument to eventfd_signal() with RHEL 9.5
pcolberg Nov 25, 2024
bbe8196
backport: use vm_flags_clear() with RHEL 9.5
pcolberg Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/fpga/dfl-cxl-cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ static long cxl_cache_set_region_read_only(struct dfl_cxl_cache *cxl_cache,

/* Mark the pages as non-cached and write-protected. */
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && RHEL_RELEASE_CODE < 0x905
vma->vm_flags &= ~VM_WRITE;
#else
vm_flags_clear(vma, VM_WRITE);
Expand Down
2 changes: 1 addition & 1 deletion include/linux/eventfd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <linux/version.h>
#include_next <linux/eventfd.h>

#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 8, 0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 8, 0) && RHEL_RELEASE_CODE < 0x905
/* Before commit 3652117f8548 ("eventfd: simplify eventfd_signal()")
* eventfd_signal() received an extra argument @n that was always 1.
*/
Expand Down
7 changes: 4 additions & 3 deletions include/linux/spi/spi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@
#include <linux/version.h>
#include_next <linux/spi/spi.h>

#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && \
(LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 71) || \
LINUX_VERSION_CODE >= KERNEL_VERSION(6, 2, 0))
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && \
(LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 71) || \
LINUX_VERSION_CODE >= KERNEL_VERSION(6, 2, 0)) && \
RHEL_RELEASE_CODE < 0x905
/* spi_get_chipselect() was introduced in commit 303feb3cc06a ("spi: Add APIs
* in spi core to set/get spi->chip_select and spi->cs_gpiod").
*/
Expand Down