diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-24 13:08:03 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-24 13:08:03 +1000 |
| commit | 83c0e42dc836525f20e339fd8317ea3c077eaabc (patch) | |
| tree | e6e700398492ba5fa4644f0bdcd5ac40dd2f81be /include | |
| parent | e8119045698b69ccf7eb5a23d0b747f8768bbabf (diff) | |
| parent | 64751dbfeaacd10ed17a6eb5b7fa6a23a290155c (diff) | |
Merge commit 'x86-fixes/for-linus'
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/arch_hooks.h | 1 | ||||
| -rw-r--r-- | include/asm-x86/processor.h | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-x86/arch_hooks.h b/include/asm-x86/arch_hooks.h index 768aee8a04ef..6fe8f619ff51 100644 --- a/include/asm-x86/arch_hooks.h +++ b/include/asm-x86/arch_hooks.h @@ -13,7 +13,6 @@ * that can be used by the hooks */ extern void init_ISA_irqs(void); extern void apic_intr_init(void); -extern void smp_intr_init(void); extern irqreturn_t timer_interrupt(int irq, void *dev_id); /* these are the defined hooks */ diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h index e6bf92ddeb21..82342c426f43 100644 --- a/include/asm-x86/processor.h +++ b/include/asm-x86/processor.h @@ -3,9 +3,6 @@ #include <asm/processor-flags.h> -/* migration helper, for KVM - will be removed in 2.6.25: */ -#define Xgt_desc_struct desc_ptr - /* Forward declaration, a strange C thing */ struct task_struct; struct mm_struct; |