diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 14:47:21 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 14:47:21 +0900 |
commit | 53582c4c508a95ece9f7c907edef9911c7eb79eb (patch) | |
tree | c099e9880f7bf7d60e87dfa6a19cb4e8780ec860 /arch/x86/include/asm/amd_nb.h | |
parent | 6ae1e19dbb43ff0d429a9f45087c513212686836 (diff) | |
parent | da97da73d418533187a8390cf6541f48bed653e8 (diff) | |
download | talos-op-linux-53582c4c508a95ece9f7c907edef9911c7eb79eb.tar.gz talos-op-linux-53582c4c508a95ece9f7c907edef9911c7eb79eb.zip |
Merge branch 'rmobile/sdio' into rmobile-latest
Diffstat (limited to 'arch/x86/include/asm/amd_nb.h')
-rw-r--r-- | arch/x86/include/asm/amd_nb.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/x86/include/asm/amd_nb.h b/arch/x86/include/asm/amd_nb.h index 6aee50d655d1..64dc82ee19f0 100644 --- a/arch/x86/include/asm/amd_nb.h +++ b/arch/x86/include/asm/amd_nb.h @@ -3,16 +3,27 @@ #include <linux/pci.h> +struct amd_nb_bus_dev_range { + u8 bus; + u8 dev_base; + u8 dev_limit; +}; + extern struct pci_device_id amd_nb_misc_ids[]; +extern const struct amd_nb_bus_dev_range amd_nb_bus_dev_ranges[]; struct bootnode; extern int early_is_amd_nb(u32 value); extern int amd_cache_northbridges(void); extern void amd_flush_garts(void); -extern int amd_get_nodes(struct bootnode *nodes); extern int amd_numa_init(unsigned long start_pfn, unsigned long end_pfn); extern int amd_scan_nodes(void); +#ifdef CONFIG_NUMA_EMU +extern void amd_fake_nodes(const struct bootnode *nodes, int nr_nodes); +extern void amd_get_nodes(struct bootnode *nodes); +#endif + struct amd_northbridge { struct pci_dev *misc; }; |