patch-2.4.0-test9 linux/arch/sparc/kernel/pcic.c

• Lines: 34
• Date: Tue Oct 3 09:24:41 2000
• Orig file: v2.4.0-test8/linux/arch/sparc/kernel/pcic.c
• Orig date: Thu Sep 7 08:32:00 2000

diff -u --recursive --new-file v2.4.0-test8/linux/arch/sparc/kernel/pcic.c linux/arch/sparc/kernel/pcic.c
@@ -1,4 +1,4 @@
-/* $Id: pcic.c,v 1.17 2000/09/05 06:49:44 anton Exp $
+/* $Id: pcic.c,v 1.18 2000/09/25 06:09:12 anton Exp $
  * pcic.c: Sparc/PCI controller support
  *
  * Copyright (C) 1998 V. Roganov and G. Raiko
@@ -35,11 +35,6 @@
 
 #ifndef CONFIG_PCI
 
-int pcibios_present(void)
-{
-	return 0;
-}
-
 asmlinkage int sys_pciconfig_read(unsigned long bus,
 				  unsigned long dfn,
 				  unsigned long off,
@@ -976,7 +971,6 @@
 	if(!suser())
 		return -EPERM;
 
-	lock_kernel();
 	switch(len) {
 	case 1:
 		err = get_user(ubyte, (unsigned char *)buf);
@@ -1004,7 +998,6 @@
 		break;
 
 	};
-	unlock_kernel();
 
 	return err;
 }