diff options
| author | jhb <jhb@FreeBSD.org> | 2011-07-16 14:05:34 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2011-07-16 14:05:34 +0000 |
| commit | 0710dab3a6340960c8d895c456dc27233bcf8ebb (patch) | |
| tree | d66bf0631e2921ca414cf34202bdbfc63ba70749 /sys/x86 | |
| parent | 6c43b96bf23c58fd22e7c13483353b1d9befa244 (diff) | |
| download | FreeBSD-src-0710dab3a6340960c8d895c456dc27233bcf8ebb.zip FreeBSD-src-0710dab3a6340960c8d895c456dc27233bcf8ebb.tar.gz | |
Fix build when NEW_PCIB is not defined.
Submitted by: gcooper (partially)
Pointy hat to: jhb
Diffstat (limited to 'sys/x86')
| -rw-r--r-- | sys/x86/include/mptable.h | 4 | ||||
| -rw-r--r-- | sys/x86/x86/mptable.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/sys/x86/include/mptable.h b/sys/x86/include/mptable.h index 08fc927..85a21c9 100644 --- a/sys/x86/include/mptable.h +++ b/sys/x86/include/mptable.h @@ -191,13 +191,15 @@ typedef struct BASETABLE_ENTRY { } basetable_entry; #ifdef _KERNEL -#ifdef NEW_PCIB struct mptable_hostb_softc { +#ifdef NEW_PCIB struct pcib_host_resources sc_host_res; int sc_decodes_vga_io; int sc_decodes_isa_io; +#endif }; +#ifdef NEW_PCIB void mptable_pci_host_res_init(device_t pcib); #endif int mptable_pci_probe_table(int bus); diff --git a/sys/x86/x86/mptable.c b/sys/x86/x86/mptable.c index 8dcd9ad..fe520eb 100644 --- a/sys/x86/x86/mptable.c +++ b/sys/x86/x86/mptable.c @@ -192,8 +192,10 @@ static void mptable_probe_cpus_handler(u_char *entry, void *arg __unused); static void mptable_register(void *dummy); static int mptable_setup_local(void); static int mptable_setup_io(void); +#ifdef NEW_PCIB static void mptable_walk_extended_table( mptable_extended_entry_handler *handler, void *arg); +#endif static void mptable_walk_table(mptable_entry_handler *handler, void *arg); static int search_for_sig(u_int32_t target, int count); @@ -437,6 +439,7 @@ mptable_walk_table(mptable_entry_handler *handler, void *arg) } } +#ifdef NEW_PCIB /* * Call the handler routine for each entry in the MP config extended * table. @@ -455,6 +458,7 @@ mptable_walk_extended_table(mptable_extended_entry_handler *handler, void *arg) entry = (ext_entry_ptr)((char *)entry + entry->length); } } +#endif static void mptable_probe_cpus_handler(u_char *entry, void *arg) |
