It is currently Fri, 23 Oct 2020 18:18:04 GMT



 
Author Message
 [2.5.74] x86_64 apic/nmi driver model conversion cleanups
Andi,

There is still cruft remaining in x86-64 from the apic/nmi
system device model conversion, including obsolete #includes
and whitespace/intendation breakage.

While non-critical from a functional standpoint, please apply
this cleanup patch.

/Mikael

--- linux-2.5.74/arch/x86_64/kernel/apic.c.~1~  2003-06-17 12:51:19.000000000 +0200
+++ linux-2.5.74/arch/x86_64/kernel/apic.c      2003-07-03 17:19:59.000000000 +0200
@@ -441,9 +441,6 @@

 #ifdef CONFIG_PM

-#include <linux/device.h>
-#include <linux/module.h>
-
 static struct {
        /* 'active' is true if the local APIC was enabled by us and
           not the BIOS; this signifies that we are also responsible
@@ -540,7 +537,6 @@
        .suspend        = lapic_suspend,
 };

-/* not static, needed by child devices */
 static struct sys_device device_lapic = {
        .id             = 0,
        .cls            = &lapic_sysclass,
--- linux-2.5.74/arch/x86_64/kernel/nmi.c.~1~   2003-07-03 12:32:44.000000000 +0200
+++ linux-2.5.74/arch/x86_64/kernel/nmi.c       2003-07-03 17:19:59.000000000 +0200
@@ -141,14 +141,14 @@
        /* tell do_nmi() and others that we're not active any more */
        nmi_watchdog = 0;
 }
+
 void enable_lapic_nmi_watchdog(void)
-  {
+{
        if (nmi_active < 0) {
                nmi_watchdog = NMI_LOCAL_APIC;
                setup_apic_nmi_watchdog();
        }
-  }
-
+}

 void disable_timer_nmi_watchdog(void)
 {
@@ -173,8 +173,6 @@

 #ifdef CONFIG_PM

-#include <linux/device.h>
-
 static int nmi_pm_active; /* nmi_active before suspend */

 static int lapic_nmi_suspend(struct sys_device *dev, u32 state)
@@ -187,7 +185,7 @@
 static int lapic_nmi_resume(struct sys_device *dev)
 {
        if (nmi_pm_active > 0)
-       enable_lapic_nmi_watchdog();
+               enable_lapic_nmi_watchdog();
        return 0;
 }

@@ -199,7 +197,7 @@

 static struct sys_device device_lapic_nmi = {
        .id             = 0,
-       .cls    = &nmi_sysclass,
+       .cls            = &nmi_sysclass,
 };

 static int __init init_lapic_nmi_sysfs(void)
--- linux-2.5.74/include/asm-x86_64/apic.h.~1~  2003-07-03 12:32:46.000000000 +0200
+++ linux-2.5.74/include/asm-x86_64/apic.h      2003-07-03 17:19:59.000000000 +0200
@@ -84,10 +84,6 @@
 extern void disable_APIC_timer(void);
 extern void enable_APIC_timer(void);

-#ifdef CONFIG_PM
-extern struct sys_device device_lapic;
-#endif
-
 extern int check_nmi_watchdog (void);

 extern unsigned int nmi_watchdog;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at   http://www.**-**.com/
Please read the FAQ at   http://www.**-**.com/



 Mon, 19 Dec 2005 17:30:12 GMT   
 [2.5.74] x86_64 apic/nmi driver model conversion cleanups

Thanks. I applied the two patches.

-Andi
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/



 Mon, 19 Dec 2005 18:40:21 GMT   
 
   [ 2 post ] 

Similar Threads

1. [2.5.74] fix x86_64 breakage on UP with modules

2. Switch APIC (+nmi, +oprofile) to driver model

3. Switch APIC (+nmi, +oprofile) to driver model

4. [2.5.71] x86-64 apic/nmi cleanups

5. Switch APIC to driver model (and make S3 sleep with APIC on)

6. (trivial 2.5.74) compilation fix drivers/mtd/mtd_blkdevs.c

7. Convert APIC to driver model: now it works with SMP

8. Convert APIC to driver model

9. Switch APIC to driver model

10. Driver model for APIC


 
Powered by phpBB © 2000, 2002, 2005, 2007 phpBB Group.
Designed by ST Software