diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 13:37:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 13:37:40 -0500 |
| commit | 85fe20bfd415af0a2e93bd1166533d4a6eb591ea (patch) | |
| tree | 10b0e485712859327f0c800491fb787a1859f0b6 /arch/x86/pci | |
| parent | 58f02db466900003b801bdfdeddc4d96ce42b7d5 (diff) | |
| parent | 1c5b9069e12e20d2fe883076ae0bf73966492108 (diff) | |
Merge branch 'x86-io-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-io-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Merge io.h
x86: Simplify flush_write_buffers()
x86: Clean up mem*io functions.
x86-64: Use BUILDIO in io_64.h
x86-64: Reorganize io_64.h
x86-32: Remove _local variants of in/out from io_32.h
x86-32: Move XQUAD definitions to numaq.h
Diffstat (limited to 'arch/x86/pci')
| -rw-r--r-- | arch/x86/pci/numaq_32.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/pci/numaq_32.c b/arch/x86/pci/numaq_32.c index 8eb295e116f6..8884a1c1ada6 100644 --- a/arch/x86/pci/numaq_32.c +++ b/arch/x86/pci/numaq_32.c | |||
| @@ -8,9 +8,7 @@ | |||
| 8 | #include <asm/apic.h> | 8 | #include <asm/apic.h> |
| 9 | #include <asm/mpspec.h> | 9 | #include <asm/mpspec.h> |
| 10 | #include <asm/pci_x86.h> | 10 | #include <asm/pci_x86.h> |
| 11 | 11 | #include <asm/numaq.h> | |
| 12 | #define XQUAD_PORTIO_BASE 0xfe400000 | ||
| 13 | #define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */ | ||
| 14 | 12 | ||
| 15 | #define BUS2QUAD(global) (mp_bus_id_to_node[global]) | 13 | #define BUS2QUAD(global) (mp_bus_id_to_node[global]) |
| 16 | 14 | ||
| @@ -18,8 +16,6 @@ | |||
| 18 | 16 | ||
| 19 | #define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local]) | 17 | #define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local]) |
| 20 | 18 | ||
| 21 | #define XQUAD_PORT_ADDR(port, quad) (xquad_portio + (XQUAD_PORTIO_QUAD*quad) + port) | ||
| 22 | |||
| 23 | #define PCI_CONF1_MQ_ADDRESS(bus, devfn, reg) \ | 19 | #define PCI_CONF1_MQ_ADDRESS(bus, devfn, reg) \ |
| 24 | (0x80000000 | (BUS2LOCAL(bus) << 16) | (devfn << 8) | (reg & ~3)) | 20 | (0x80000000 | (BUS2LOCAL(bus) << 16) | (devfn << 8) | (reg & ~3)) |
| 25 | 21 | ||