diff options
| author | Laura Abbott <labbott@redhat.com> | 2019-10-07 14:01:05 -0400 |
|---|---|---|
| committer | Laura Abbott <labbott@redhat.com> | 2019-10-07 14:08:24 -0400 |
| commit | 1bbfa3a13cfbec603fd4963b9eeb0974255be87f (patch) | |
| tree | dd0f327dd7ea9ba1f6ce43fbef036d2ce85f018b | |
| parent | 7d533eb54e1775a68ece702ba1af1f0ef9d17017 (diff) | |
| download | kernel-1bbfa3a13cfbec603fd4963b9eeb0974255be87f.tar.gz kernel-1bbfa3a13cfbec603fd4963b9eeb0974255be87f.tar.xz kernel-1bbfa3a13cfbec603fd4963b9eeb0974255be87f.zip | |
Drop custom patch for i8042
Fedora has been carrying this patch for a very long time as
a workaround for MacBook Airs1,1. We've also gotten smarter
about detection (see d79e141c1c6e ("Input: i8042 - Trust
firmware a bit more when probing on X86")) so let's try
dropping this.
| -rw-r--r-- | disable-i8042-check-on-apple-mac.patch | 62 | ||||
| -rw-r--r-- | kernel.spec | 2 |
2 files changed, 0 insertions, 64 deletions
diff --git a/disable-i8042-check-on-apple-mac.patch b/disable-i8042-check-on-apple-mac.patch deleted file mode 100644 index e75028da2..000000000 --- a/disable-i8042-check-on-apple-mac.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 31e64826785b5bafef7a6361516c060be2bca253 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Thu, 20 May 2010 10:30:31 -0400 -Subject: [PATCH] disable i8042 check on apple mac - -As those computers never had any i8042 controllers, and the -current lookup code could potentially lock up/hang/wait for -timeout for long periods of time. - -Fixes intermittent hangs on boot on a MacbookAir1,1 - -Bugzilla: N/A -Upstream-status: http://lkml.indiana.edu/hypermail/linux/kernel/1005.0/00938.html (and pinged on Dec 17, 2013) - -Signed-off-by: Bastien Nocera <hadess@hadess.net> ---- - drivers/input/serio/i8042.c | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) - -diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c -index c9c98f0ab284..5137185e14a9 100644 ---- a/drivers/input/serio/i8042.c -+++ b/drivers/input/serio/i8042.c -@@ -1540,6 +1540,22 @@ static struct notifier_block i8042_kbd_bind_notifier_block = { - .notifier_call = i8042_kbd_bind_notifier, - }; - -+#ifdef CONFIG_DMI -+static struct dmi_system_id __initdata dmi_system_table[] = { -+ { -+ .matches = { -+ DMI_MATCH(DMI_BIOS_VENDOR, "Apple Computer, Inc.") -+ }, -+ }, -+ { -+ .matches = { -+ DMI_MATCH(DMI_BIOS_VENDOR, "Apple Inc.") -+ }, -+ }, -+ {} -+}; -+#endif /*CONFIG_DMI*/ -+ - static int __init i8042_init(void) - { - struct platform_device *pdev; -@@ -1547,6 +1563,12 @@ static int __init i8042_init(void) - - dbg_init(); - -+#ifdef CONFIG_DMI -+ /* Intel Apple Macs never have an i8042 controller */ -+ if (dmi_check_system(dmi_system_table) > 0) -+ return -ENODEV; -+#endif /*CONFIG_DMI*/ -+ - err = i8042_platform_init(); - if (err) - return err; --- -2.4.3 - diff --git a/kernel.spec b/kernel.spec index 39c56a219..1f489e2d6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -504,8 +504,6 @@ Patch200: 0001-Make-get_cert_list-not-complain-about-cert-lists-tha.patch Patch201: 0002-Add-efi_status_to_str-and-rework-efi_status_to_err.patch Patch202: 0003-Make-get_cert_list-use-efi_status_to_str-to-print-er.patch -Patch203: disable-i8042-check-on-apple-mac.patch - Patch204: efi-secureboot.patch Patch205: lift-lockdown-sysrq.patch |