[xtensa-cvscommit] linux/arch/xtensa/kernel ptrace.c,1.5,1.6

[<jgr...@us...>]

Update of /cvsroot/xtensa/linux/arch/xtensa/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv3249/arch/xtensa/kernel

Modified Files:
	ptrace.c 
Log Message:
Restore old ptrace interface; strace application still needs it.


Index: ptrace.c
===================================================================
RCS file: /cvsroot/xtensa/linux/arch/xtensa/kernel/ptrace.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ptrace.c	25 Jan 2003 03:12:45 -0000	1.5
--- ptrace.c	28 Jan 2003 23:52:23 -0000	1.6
***************
*** 35,42 ****
  
  
! #if 0
  
  /* XTFIXME: Removed in favor of the PTRACE_GETUSER interface.  Delete
   * after some time.  [JET, 24 Jan 2003] */
  
  /* Given a valid wb and ws, find the first valid "pane" */
--- 35,43 ----
  
  
! #if 1
  
  /* XTFIXME: Removed in favor of the PTRACE_GETUSER interface.  Delete
   * after some time.  [JET, 24 Jan 2003] */
+ /* Still needed for strace.  [jgreen, 28 Jan 2003] */
  
  /* Given a valid wb and ws, find the first valid "pane" */
***************
*** 59,63 ****
  }
  
! #endif /* if 0 */	
  
  /*
--- 60,64 ----
  }
  
! #endif /* if 1 */	
  
  /*
***************
*** 135,146 ****
  		}
  
! #if 0
  
  /* XTFIXME: Removed in favor of the PTRACE_GETUSER interface.  Delete
   * after some time.  [JET, 24 Jan 2003] */
  
  	/* Read the word at location addr in the USER area.  */
  	case PTRACE_PEEKUSR: {
  		struct pt_regs *regs;
  		unsigned long tmp;
  
--- 136,149 ----
  		}
  
! #if 1
  
  /* XTFIXME: Removed in favor of the PTRACE_GETUSER interface.  Delete
   * after some time.  [JET, 24 Jan 2003] */
+ /* Still needed for strace.  [jgreen, 28 Jan 2003] */
  
  	/* Read the word at location addr in the USER area.  */
  	case PTRACE_PEEKUSR: {
  		struct pt_regs *regs;
+ 		int ar_reg, a_reg, first_pane;
  		unsigned long tmp;
  
***************
*** 231,235 ****
  		}
  
! #endif /* if 0 */
  
  	case PTRACE_POKETEXT: /* write the word at location addr. */
--- 234,238 ----
  		}
  
! #endif /* if 1 */
  
  	case PTRACE_POKETEXT: /* write the word at location addr. */
***************
*** 244,254 ****
  
  
! #if 0
  
  /* XTFIXME: Removed in favor of the PTRACE_GETUSER interface.  Delete
   * after some time.  [JET, 24 Jan 2003] */
  
  	case PTRACE_POKEUSR: {
  		struct pt_regs *regs;
  		unsigned long tmp;
  		res = 0;
--- 247,259 ----
  
  
! #if 1
  
  /* XTFIXME: Removed in favor of the PTRACE_GETUSER interface.  Delete
   * after some time.  [JET, 24 Jan 2003] */
+ /* Still needed for strace.  [jgreen, 28 Jan 2003] */
  
  	case PTRACE_POKEUSR: {
  		struct pt_regs *regs;
+ 		int ar_reg, a_reg, first_pane;
  		unsigned long tmp;
  		res = 0;
***************
*** 300,304 ****
  		}
  
! #endif /* if 0 */
  
  	case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */
--- 305,309 ----
  		}
  
! #endif /* if 1 */
  
  	case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */