diff options
| author | Renato Botelho <renato@netgate.com> | 2016-09-12 14:46:47 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-09-12 14:46:47 -0300 |
| commit | 710146e9ac46d798c3f15a8830f48e94bad137a5 (patch) | |
| tree | cbebe7a1c7a2faa1c2c3936972eca1134635b2b9 /sys/i386 | |
| parent | 39fd693a18f8ef73b1268f2321393d5ca6101e89 (diff) | |
| parent | 5986af9d01080d549cde638c5af2bef5fd977207 (diff) | |
| download | FreeBSD-src-710146e9ac46d798c3f15a8830f48e94bad137a5.zip FreeBSD-src-710146e9ac46d798c3f15a8830f48e94bad137a5.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/include/intr_machdep.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/i386/include/intr_machdep.h b/sys/i386/include/intr_machdep.h index b71bbb6..5af8cce 100644 --- a/sys/i386/include/intr_machdep.h +++ b/sys/i386/include/intr_machdep.h @@ -140,8 +140,9 @@ struct trapframe; extern struct mtx icu_lock; extern int elcr_found; - +#ifdef SMP extern int msix_disable_migration; +#endif #ifndef DEV_ATPIC void atpic_reset(void); |
