Messages in this thread Patch in this message | ![/](/images/icornerl.gif) | | Subject | [PATCH][v850] Rename the (v850-specific) macro PT_SYSCALL to PT_CUR_SYSCALL | Date | Tue, 25 Mar 2003 11:56:57 +0900 (JST) | From | (Miles Bader) |
| |
This avoids a conflict with the more generic definition of PT_SYSCALL.
diff -ruN -X../cludes linux-2.5.66-moo.orig/arch/v850/kernel/entry.S linux-2.5.66-moo/arch/v850/kernel/entry.S --- linux-2.5.66-moo.orig/arch/v850/kernel/entry.S 2003-02-25 10:44:59.000000000 +0900 +++ linux-2.5.66-moo/arch/v850/kernel/entry.S 2003-03-25 10:37:52.000000000 +0900 @@ -231,7 +231,7 @@ st.b r19, KM; \ GET_CURRENT_TASK(CURRENT_TASK); /* Fetch the current task pointer. */ \ /* Save away the syscall number. */ \ - sst.w syscall_num, PTO+PT_SYSCALL[ep] + sst.w syscall_num, PTO+PT_CUR_SYSCALL[ep] /* Save register state not normally saved by PUSH_STATE for TYPE. */ diff -ruN -X../cludes linux-2.5.66-moo.orig/include/asm-v850/ptrace.h linux-2.5.66-moo/include/asm-v850/ptrace.h --- linux-2.5.66-moo.orig/include/asm-v850/ptrace.h 2002-11-05 11:25:32.000000000 +0900 +++ linux-2.5.66-moo/include/asm-v850/ptrace.h 2003-03-25 10:37:52.000000000 +0900 @@ -1,8 +1,8 @@ /* * include/asm-v850/ptrace.h -- Access to CPU registers * - * Copyright (C) 2001,02 NEC Corporation - * Copyright (C) 2001,02 Miles Bader <miles@gnu.org> + * Copyright (C) 2001,02,03 NEC Corporation + * Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org> * * This file is subject to the terms and conditions of the GNU General * Public License. See the file COPYING in the main directory of this @@ -102,7 +102,9 @@ #define PT_CTBP ((NUM_GPRS + 4) * _PT_REG_SIZE) #define PT_KERNEL_MODE ((NUM_GPRS + 5) * _PT_REG_SIZE) -#define PT_SYSCALL PT_GPR(0) +/* Where the current syscall number is stashed; obviously only valid in + the kernel! */ +#define PT_CUR_SYSCALL PT_GPR(0) /* Size of struct pt_regs, including alignment. */ #define PT_SIZE ((NUM_GPRS + 6) * _PT_REG_SIZE) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| ![\](/images/icornerr.gif) |