Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 436 → Rev 437

/shark/trunk/drivers/newpci/pci-sysfs.c
File deleted
/shark/trunk/drivers/newpci/common.c
139,7 → 139,6
 
static int __init pcibios_init(void)
{
struct cpuinfo_x86 *c = &boot_cpu_data;
 
if (!raw_pci_ops) {
printk("PCI: System does not support PCI\n");
152,10 → 151,6
* as quite a few PCI devices do not support smaller values.
*/
pci_cache_line_size = 32 >> 2;
if (c->x86 >= 6 && c->x86_vendor == X86_VENDOR_AMD)
pci_cache_line_size = 64 >> 2; /* K7 & K8 */
else if (c->x86 > 6 && c->x86_vendor == X86_VENDOR_INTEL)
pci_cache_line_size = 128 >> 2; /* P4 */
 
pcibios_resource_survey();
 
/shark/trunk/drivers/newpci/i386.c
286,8 → 286,7
vma->vm_flags |= (VM_SHM | VM_LOCKED | VM_IO);
 
prot = pgprot_val(vma->vm_page_prot);
if (boot_cpu_data.x86 > 3)
prot |= _PAGE_PCD | _PAGE_PWT;
prot |= _PAGE_PCD | _PAGE_PWT;
vma->vm_page_prot = __pgprot(prot);
 
/* Write-combine setting is ignored, it is changed via the mtrr
/shark/trunk/drivers/newpci/bus.c
101,7 → 101,6
spin_unlock(&pci_bus_lock);
 
pci_proc_attach_device(dev);
pci_create_sysfs_dev_files(dev);
 
}
 
/shark/trunk/drivers/newpci/makefile
10,7 → 10,7
 
OBJS_PATH = $(BASE)/drivers/newpci
 
OBJS = access.o bus.o names.o pci.o pci-driver.o pci-sysfs.o\
OBJS = access.o bus.o names.o pci.o pci-driver.o\
pool.o probe.o quirks.o remove.o search.o setup-res.o\
setup-irq.o setup-bus.o syscall.o i386.o common.o\
fixup.o irq.o legacy.o