summaryrefslogtreecommitdiff
path: root/SOURCES
diff options
context:
space:
mode:
authorJan200101 <sentrycraft123@gmail.com>2023-02-12 18:18:07 +0100
committerJan200101 <sentrycraft123@gmail.com>2023-02-12 18:18:07 +0100
commitec08e6ce493c102c19c36814a1c54a85f6bc7ce9 (patch)
tree5511124d7e7ddee7cb3781df3d171efc3875d6b9 /SOURCES
parentc10a36b6328f6feb886478e8d79ae34cf9742ff7 (diff)
downloadkernel-fsync-ec08e6ce493c102c19c36814a1c54a85f6bc7ce9.tar.gz
kernel-fsync-ec08e6ce493c102c19c36814a1c54a85f6bc7ce9.zip
kernel 6.1.11
Diffstat (limited to 'SOURCES')
-rw-r--r--SOURCES/patch-6.1-redhat.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/SOURCES/patch-6.1-redhat.patch b/SOURCES/patch-6.1-redhat.patch
index deb7e9c..ca1b988 100644
--- a/SOURCES/patch-6.1-redhat.patch
+++ b/SOURCES/patch-6.1-redhat.patch
@@ -43,7 +43,7 @@
42 files changed, 534 insertions(+), 190 deletions(-)
diff --git a/Makefile b/Makefile
-index 6e34c942744e..cebf71e7b1bf 100644
+index e039f2af1772..5202d1936211 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -536,7 +536,7 @@ index 8d151e332584..bd29fe4ddbf3 100644
obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o
obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
-index 033aac6be7da..28f9bf73368b 100644
+index b43e5e6ddaf6..3179641e9855 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -32,6 +32,7 @@
@@ -1199,7 +1199,7 @@ index 0aaaadb02cc6..a5f68eae241a 100644
* disconnected while waiting for the lock to succeed. */
usb_lock_device(hdev);
diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 4aa1dbc7b064..acf09c081658 100644
+index 4e1bfee9675d..c9d330ff3614 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -43,6 +43,8 @@
@@ -1211,7 +1211,7 @@ index 4aa1dbc7b064..acf09c081658 100644
typedef unsigned long efi_status_t;
typedef u8 efi_bool_t;
typedef u16 efi_char16_t; /* UNICODE character */
-@@ -864,6 +866,14 @@ extern int __init efi_setup_pcdp_console(char *);
+@@ -865,6 +867,14 @@ extern int __init efi_setup_pcdp_console(char *);
#define EFI_MEM_ATTR 10 /* Did firmware publish an EFI_MEMORY_ATTRIBUTES table? */
#define EFI_MEM_NO_SOFT_RESERVE 11 /* Is the kernel configured to ignore soft reservations? */
#define EFI_PRESERVE_BS_REGIONS 12 /* Are EFI boot-services memory segments available? */
@@ -1226,7 +1226,7 @@ index 4aa1dbc7b064..acf09c081658 100644
#ifdef CONFIG_EFI
/*
-@@ -875,6 +885,8 @@ static inline bool efi_enabled(int feature)
+@@ -876,6 +886,8 @@ static inline bool efi_enabled(int feature)
}
extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused);
@@ -1235,7 +1235,7 @@ index 4aa1dbc7b064..acf09c081658 100644
bool __pure __efi_soft_reserve_enabled(void);
static inline bool __pure efi_soft_reserve_enabled(void)
-@@ -896,6 +908,8 @@ static inline bool efi_enabled(int feature)
+@@ -897,6 +909,8 @@ static inline bool efi_enabled(int feature)
static inline void
efi_reboot(enum reboot_mode reboot_mode, const char *__unused) {}
@@ -1244,7 +1244,7 @@ index 4aa1dbc7b064..acf09c081658 100644
static inline bool efi_soft_reserve_enabled(void)
{
return false;
-@@ -910,6 +924,7 @@ static inline void efi_find_mirror(void) {}
+@@ -911,6 +925,7 @@ static inline void efi_find_mirror(void) {}
#endif
extern int efi_status_to_err(efi_status_t status);
@@ -1252,7 +1252,7 @@ index 4aa1dbc7b064..acf09c081658 100644
/*
* Variable Attributes
-@@ -1135,13 +1150,6 @@ static inline bool efi_runtime_disabled(void) { return true; }
+@@ -1136,13 +1151,6 @@ static inline bool efi_runtime_disabled(void) { return true; }
extern void efi_call_virt_check_flags(unsigned long flags, const char *call);
extern unsigned long efi_call_virt_save_flags(void);