[PATCH 1/2] x86: Fix reboot issue for Dell Optiplex 990 V2

[PATCH 1/2] x86: Fix reboot issue for Dell Optiplex 990 V2

[Thomas Renninger]

This was the only (reboot=p) option that worked for this desktop.
Default does not reboot as well.

V2: Remove copy and paste left over from another machine

CC: Ismail Donmez <idoenmez@suse.de>
CC: stable@kernel.org
Signed-off-by: Thomas Renninger <trenn@suse.de>
---
 arch/x86/kernel/reboot.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index e334be1..a6875b1 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -443,6 +443,15 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6420"),
 		},
 	},
+	{	/* Handle problems with rebooting on the Latitude E6420. */
+		.callback = set_pci_reboot,
+		.ident = "Dell Optiplex 990",
+		.matches = {
+			/* Found in BIOS version A06 */
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 990"),
+		},
+	},
 	{ }
 };
 
-- 
1.7.6.1

[PATCH 2/2] X86 apic: Make enable_IR static

[Thomas Renninger]

It's not used anywhere else.


Signed-off-by: Thomas Renninger <trenn@suse.de>
---
 arch/x86/kernel/apic/apic.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index a2fd72e..4a5bccb 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1435,7 +1435,7 @@ void enable_x2apic(void)
 }
 #endif /* CONFIG_X86_X2APIC */
 
-int __init enable_IR(void)
+static int __init enable_IR(void)
 {
 #ifdef CONFIG_IRQ_REMAP
 	if (!intr_remapping_supported()) {
-- 
1.7.6.1

Re: [PATCH 1/2] x86: Fix reboot issue for Dell Optiplex 990 V2

[Thomas Renninger]

On Friday 04 November 2011 03:24:30 Thomas Renninger wrote:
> This was the only (reboot=p) option that worked for this desktop.
> Default does not reboot as well.
> 
> V2: Remove copy and paste left over from another machine
> 
> CC: Ismail Donmez <idoenmez@suse.de>
> CC: stable@kernel.org
> Signed-off-by: Thomas Renninger <trenn@suse.de>
> ---
>  arch/x86/kernel/reboot.c |    9 +++++++++
>  1 files changed, 9 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
> index e334be1..a6875b1 100644
> --- a/arch/x86/kernel/reboot.c
> +++ b/arch/x86/kernel/reboot.c
> @@ -443,6 +443,15 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = {
>  			DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6420"),
>  		},
>  	},
> +	{	/* Handle problems with rebooting on the Latitude E6420. */
Arghh, I forgot guilt refresh.
I'll resend...

   Thomas