[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-4e034b245133adfd006ade5d7a809c9cac4beef9@git.kernel.org>
Date: Wed, 23 Feb 2011 12:07:17 GMT
From: tip-bot for Henrik Kretzschmar <henne@...htwindheim.de>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
tglx@...utronix.de, henne@...htwindheim.de, mingo@...e.hu
Subject: [tip:x86/apic] x86: Move ioapic_irq_destination_types to apicdef.h
Commit-ID: 4e034b245133adfd006ade5d7a809c9cac4beef9
Gitweb: http://git.kernel.org/tip/4e034b245133adfd006ade5d7a809c9cac4beef9
Author: Henrik Kretzschmar <henne@...htwindheim.de>
AuthorDate: Tue, 22 Feb 2011 15:38:03 +0100
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Wed, 23 Feb 2011 11:38:44 +0100
x86: Move ioapic_irq_destination_types to apicdef.h
This enum is used by non IOAPIC code, so apicdef.h is
the best place for it.
Signed-off-by: Henrik Kretzschmar <henne@...htwindheim.de>
LKML-Reference: <1298385487-4708-1-git-send-email-henne@...htwindheim.de>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/include/asm/apicdef.h | 12 ++++++++++++
arch/x86/include/asm/io_apic.h | 11 -----------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/arch/x86/include/asm/apicdef.h b/arch/x86/include/asm/apicdef.h
index 47a30ff..d87988b 100644
--- a/arch/x86/include/asm/apicdef.h
+++ b/arch/x86/include/asm/apicdef.h
@@ -426,4 +426,16 @@ struct local_apic {
#else
#define BAD_APICID 0xFFFFu
#endif
+
+enum ioapic_irq_destination_types {
+ dest_Fixed = 0,
+ dest_LowestPrio = 1,
+ dest_SMI = 2,
+ dest__reserved_1 = 3,
+ dest_NMI = 4,
+ dest_INIT = 5,
+ dest__reserved_2 = 6,
+ dest_ExtINT = 7
+};
+
#endif /* _ASM_X86_APICDEF_H */
diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
index f327d38..e1a9b0e 100644
--- a/arch/x86/include/asm/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
@@ -63,17 +63,6 @@ union IO_APIC_reg_03 {
} __attribute__ ((packed)) bits;
};
-enum ioapic_irq_destination_types {
- dest_Fixed = 0,
- dest_LowestPrio = 1,
- dest_SMI = 2,
- dest__reserved_1 = 3,
- dest_NMI = 4,
- dest_INIT = 5,
- dest__reserved_2 = 6,
- dest_ExtINT = 7
-};
-
struct IO_APIC_route_entry {
__u32 vector : 8,
delivery_mode : 3, /* 000: FIXED
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists