[Linux-mips-commits]CVS: linux/drivers/char mem.c,1.2,1.3 serial.c,1.3,1.4

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv25707/drivers/char

Modified Files:
	mem.c serial.c 
Log Message:
Synced with Ralf's 2.4.8 code.



Index: mem.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/mem.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mem.c	2001/08/25 02:19:27	1.2
--- mem.c	2001/08/25 06:24:45	1.3
***************
*** 261,265 ****
  				len = PAGE_SIZE;
  			len = vread(kbuf, (char *)p, len);
! 			if (len && copy_to_user(buf, kbuf, len)) {
  				free_page((unsigned long)kbuf);
  				return -EFAULT;
--- 261,267 ----
  				len = PAGE_SIZE;
  			len = vread(kbuf, (char *)p, len);
! 			if (!len)
! 				break;
! 			if (copy_to_user(buf, kbuf, len)) {
  				free_page((unsigned long)kbuf);
  				return -EFAULT;

Index: serial.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/serial.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** serial.c	2001/08/25 02:19:27	1.3
--- serial.c	2001/08/25 06:24:45	1.4
***************
*** 3181,3184 ****
--- 3181,3187 ----
  #endif
  
+ 	/*
+ 	 *	This relies on lock_kernel() stuff so wants tidying for 2.5
+ 	 */
  	if (!tmp_buf) {
  		page = get_zeroed_page(GFP_KERNEL);
***************
*** 5455,5458 ****
--- 5458,5465 ----
  		if (state->port && check_region(state->port,8))
  			continue;
+ #ifdef CONFIG_MCA			
+ 		if ((state->flags & ASYNC_BOOT_ONLYMCA) && !MCA_bus)
+ 			continue;
+ #endif			
  		if (state->flags & ASYNC_BOOT_AUTOCONF)
  			autoconfig(state);