[2.5.74] x86_64 apic/nmi driver model conversion cleanups

[2.5.74] x86_64 apic/nmi driver model conversion cleanups

Post by Mikael Pettersso » Fri, 04 Jul 2003 18:30:12



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

 #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

        .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

        /* 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)

 #ifdef CONFIG_PM

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


 static int lapic_nmi_resume(struct sys_device *dev)
 {
        if (nmi_pm_active > 0)
-       enable_lapic_nmi_watchdog();
+               enable_lapic_nmi_watchdog();
        return 0;
 }

 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

 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

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

 
 
 

[2.5.74] x86_64 apic/nmi driver model conversion cleanups

Post by Andi Klee » Fri, 04 Jul 2003 19:40:21


Thanks. I applied the two patches.

-Andi
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

 
 
 

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

Andi,

2.5.74 added EXPORT_SYMBOL for two TLB flushing procedures.
These aren't real procedures on UP, so the EXPORT_SYMBOLs must
be under #ifdef CONFIG_SMP, just like they are on i386. The
patch below fixes this. Please apply.

Without this patch you get a compile error on x86_64 if you've
configured for UP with modules.

/Mikael

--- linux-2.5.74/arch/x86_64/kernel/x8664_ksyms.c.~1~   2003-07-03 12:32:44.000000000 +0200

 EXPORT_SYMBOL(synchronize_irq);
 EXPORT_SYMBOL(smp_call_function);
+
+EXPORT_SYMBOL(flush_tlb_page);
+EXPORT_SYMBOL_GPL(flush_tlb_all);
 #endif


 #endif

 EXPORT_SYMBOL(clear_page);
-
-EXPORT_SYMBOL(flush_tlb_page);
-EXPORT_SYMBOL_GPL(flush_tlb_all);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

2. Asynchronous Sockets

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

4. Extending Swap Space to Include an Ordinary File on SVR3

5. 2.5.74 does not boot with TCQ: Unable to handle NULL pointer dereference

6. yamm

7. 2.5.74 synclink_cs.c

8. Is DCOM on Linux heresy

9. 2.5.74 synclink.c

10. 2.5.74: ALSA lockups, and ACPI, IRQ routing

11. 2.5.74 xattr fixes

12. cdrom problems in 2.5.74

13. [ANNOUNCE] kexec for 2.5.74 available