diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-24 10:51:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-24 10:51:21 -0800 |
| commit | 1e6c5c4e4c98af5f9e905b860f4536dcc8e92402 (patch) | |
| tree | a556273ceeded366a3343b078943aa4f11c4a9fa | |
| parent | 46fe24389a44527377077e3ff52206709f0387af (diff) | |
| parent | 5fd4514bb351b5ecb0da3692fff70741e5ed200c (diff) | |
| download | blackbird-op-linux-1e6c5c4e4c98af5f9e905b860f4536dcc8e92402.tar.gz blackbird-op-linux-1e6c5c4e4c98af5f9e905b860f4536dcc8e92402.zip | |
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
parisc: Set PCI CLS early in boot.
| -rw-r--r-- | arch/parisc/kernel/pci.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/parisc/kernel/pci.c b/arch/parisc/kernel/pci.c index f7064abc3bb6..9e74bfe071dc 100644 --- a/arch/parisc/kernel/pci.c +++ b/arch/parisc/kernel/pci.c @@ -18,7 +18,6 @@ #include <asm/io.h> #include <asm/system.h> -#include <asm/cache.h> /* for L1_CACHE_BYTES */ #include <asm/superio.h> #define DEBUG_RESOURCES 0 @@ -123,6 +122,10 @@ static int __init pcibios_init(void) } else { printk(KERN_WARNING "pci_bios != NULL but init() is!\n"); } + + /* Set the CLS for PCI as early as possible. */ + pci_cache_line_size = pci_dfl_cache_line_size; + return 0; } @@ -171,7 +174,7 @@ void pcibios_set_master(struct pci_dev *dev) ** upper byte is PCI_LATENCY_TIMER. */ pci_write_config_word(dev, PCI_CACHE_LINE_SIZE, - (0x80 << 8) | (L1_CACHE_BYTES / sizeof(u32))); + (0x80 << 8) | pci_cache_line_size); } |
