diff --git a/projects/Generic/devices/x11/patches/linux/linux-revert-acpi-bus-get-device-5-18.patch b/projects/Generic/devices/x11/patches/linux/linux-revert-acpi-bus-get-device-5-18.patch deleted file mode 100644 index 13365ed878..0000000000 --- a/projects/Generic/devices/x11/patches/linux/linux-revert-acpi-bus-get-device-5-18.patch +++ /dev/null @@ -1,56 +0,0 @@ -From ac2a3feefad549814f5e7cca30be07a255c8494a Mon Sep 17 00:00:00 2001 -From: "Rafael J. Wysocki" -Date: Tue, 5 Apr 2022 19:49:26 +0200 -Subject: Revert ACPI: bus: Eliminate acpi_bus_get_device() - -Revert d017a3167bcb76caedf2b444645bf4db75f775a5 - - Replace the last instance of acpi_bus_get_device(), added recently - by commit 87e59b36e5e2 ("spi: Support selection of the index of the - ACPI Spi Resource before alloc"), with acpi_fetch_acpi_dev() and - finally drop acpi_bus_get_device() that has no more users. - ---- - drivers/acpi/scan.c | 13 +++++++++++++ - include/acpi/acpi_bus.h | 1 + - 2 files changed, 14 insertions(+) - -diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 9efbfe087de76..762b61f67e6c6 100644 ---- a/drivers/acpi/scan.c -+++ b/drivers/acpi/scan.c -@@ -588,6 +588,19 @@ static struct acpi_device *handle_to_device(acpi_handle handle, - return adev; - } - -+int acpi_bus_get_device(acpi_handle handle, struct acpi_device **device) -+{ -+ if (!device) -+ return -EINVAL; -+ -+ *device = handle_to_device(handle, NULL); -+ if (!*device) -+ return -ENODEV; -+ -+ return 0; -+} -+EXPORT_SYMBOL(acpi_bus_get_device); -+ - /** - * acpi_fetch_acpi_dev - Retrieve ACPI device object. - * @handle: ACPI handle associated with the requested ACPI device object. -diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h -index 3f7f01f038690..c4b78c21d7930 100644 ---- a/include/acpi/acpi_bus.h -+++ b/include/acpi/acpi_bus.h -@@ -509,6 +509,7 @@ extern int unregister_acpi_notifier(struct notifier_block *); - * External Functions - */ - -+int acpi_bus_get_device(acpi_handle handle, struct acpi_device **device); - struct acpi_device *acpi_fetch_acpi_dev(acpi_handle handle); - acpi_status acpi_bus_get_status_handle(acpi_handle handle, - unsigned long long *sta); --- -cgit 1.2.3-1.el7 - diff --git a/projects/Generic/devices/x11/patches/linux/linux-revert-fbdev--Make-registered-fb---private-to-fbmem-6-1.patch b/projects/Generic/devices/x11/patches/linux/linux-revert-fbdev--Make-registered-fb---private-to-fbmem-6-1.patch deleted file mode 100644 index 942938b5fb..0000000000 --- a/projects/Generic/devices/x11/patches/linux/linux-revert-fbdev--Make-registered-fb---private-to-fbmem-6-1.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit b6fa3778e84c9d2f6d9511189ba16078b6c37196 -Author: Rudi Heitbaum -Date: Mon Oct 17 11:40:02 2022 +0000 - - Revert "fbdev: Make registered_fb[] private to fbmem.c" - - This reverts commit 5727dcfd8486399c40e39d2c08fe36fedab29d99. - -diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c -index 1e70d8c67653..6ae1c5fa19f9 100644 ---- a/drivers/video/fbdev/core/fbmem.c -+++ b/drivers/video/fbdev/core/fbmem.c -@@ -30,10 +30,10 @@ - - DEFINE_MUTEX(registration_lock); - struct fb_info *registered_fb[FB_MAX] __read_mostly; -+EXPORT_SYMBOL(registered_fb); -+ - int num_registered_fb __read_mostly; --#define for_each_registered_fb(i) \ -- for (i = 0; i < FB_MAX; i++) \ -- if (!registered_fb[i]) {} else -+EXPORT_SYMBOL(num_registered_fb); - - struct fb_info *get_fb_info(unsigned int idx) - { -diff --git a/include/linux/fb.h b/include/linux/fb.h -index 0aff76bcbb00..453c3b2b6b8e 100644 ---- a/include/linux/fb.h -+++ b/include/linux/fb.h -@@ -610,6 +610,13 @@ extern int fb_get_color_depth(struct fb_var_screeninfo *var, - extern int fb_get_options(const char *name, char **option); - extern int fb_new_modelist(struct fb_info *info); - -+extern struct fb_info *registered_fb[FB_MAX]; -+extern int num_registered_fb; -+ -+#define for_each_registered_fb(i) \ -+ for (i = 0; i < FB_MAX; i++) \ -+ if (!registered_fb[i]) {} else -+ - static inline void lock_fb_info(struct fb_info *info) - { - mutex_lock(&info->lock);