Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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.

+5 -2
+5 -2
arch/parisc/kernel/pci.c
··· 18 18 19 19 #include <asm/io.h> 20 20 #include <asm/system.h> 21 - #include <asm/cache.h> /* for L1_CACHE_BYTES */ 22 21 #include <asm/superio.h> 23 22 24 23 #define DEBUG_RESOURCES 0 ··· 122 123 } else { 123 124 printk(KERN_WARNING "pci_bios != NULL but init() is!\n"); 124 125 } 126 + 127 + /* Set the CLS for PCI as early as possible. */ 128 + pci_cache_line_size = pci_dfl_cache_line_size; 129 + 125 130 return 0; 126 131 } 127 132 ··· 174 171 ** upper byte is PCI_LATENCY_TIMER. 175 172 */ 176 173 pci_write_config_word(dev, PCI_CACHE_LINE_SIZE, 177 - (0x80 << 8) | (L1_CACHE_BYTES / sizeof(u32))); 174 + (0x80 << 8) | pci_cache_line_size); 178 175 } 179 176 180 177