patch-2.4.0-test9 linux/arch/sparc64/kernel/pci.c

Next file: linux/arch/sparc64/kernel/pci_psycho.c
Previous file: linux/arch/sparc64/kernel/irq.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test8/linux/arch/sparc64/kernel/pci.c linux/arch/sparc64/kernel/pci.c
@@ -24,7 +24,6 @@
 
 #ifndef CONFIG_PCI
 /* A "nop" PCI implementation. */
-int pcibios_present(void) { return 0; }
 asmlinkage int sys_pciconfig_read(unsigned long bus, unsigned long dfn,
 				  unsigned long off, unsigned long len,
 				  unsigned char *buf)
@@ -316,7 +315,6 @@
 		goto out;
 	}
 
-	lock_kernel();
 	switch(len) {
 	case 1:
 		err = get_user(byte, (u8 *)buf);
@@ -344,7 +342,6 @@
 		break;
 
 	};
-	unlock_kernel();
 
 out:
 	return err;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)