summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-12-30 19:03:13 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2002-12-30 19:03:13 -0800
commit1ae71dcb88e24602800778f6bf4391e170d6d744 (patch)
tree71a4e82ec5cd99c2023894b16a58081a32039f5d /include
parentded3d8ea2947e687a5b476cf24930b48ffd5b8c0 (diff)
parentee0d7c25e5c9385337db9ffe4eba0a1bfde3b19f (diff)
Merge bk://linux-dj.bkbits.net/warnings
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
-rw-r--r--include/asm-i386/hw_irq.h5
-rw-r--r--include/linux/types.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/include/asm-i386/hw_irq.h b/include/asm-i386/hw_irq.h
index 70011938c229..a537cc4d233e 100644
--- a/include/asm-i386/hw_irq.h
+++ b/include/asm-i386/hw_irq.h
@@ -131,8 +131,9 @@ static inline int unregister_profile_notifier(struct notifier_block * nb)
#endif /* CONFIG_PROFILING */
-#ifdef CONFIG_X86_IO_APIC /*more of this file should probably be ifdefed SMP */
-static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) {
+#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_SMP)
+static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i)
+{
if (IO_APIC_IRQ(i))
send_IPI_self(IO_APIC_VECTOR(i));
}
diff --git a/include/linux/types.h b/include/linux/types.h
index 87985824b16e..94ceb057eb64 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -6,6 +6,8 @@
#define DECLARE_BITMAP(name,bits) \
unsigned long name[((bits)+BITS_PER_LONG-1)/BITS_PER_LONG]
+#define CLEAR_BITMAP(name,bits) \
+ memset(name, 0, ((bits)+BITS_PER_LONG-1)/8)
#endif
#include <linux/posix_types.h>