Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax
In directory sc8-pr-cvs1:/tmp/cvs-serv12885/include/asm-vax
Modified Files:
ptrace.h timex.h
Log Message:
merge 2.4.20
Index: ptrace.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/ptrace.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ptrace.h 23 Feb 2003 23:56:21 -0000 1.5
+++ ptrace.h 27 Sep 2003 07:43:31 -0000 1.6
@@ -87,7 +87,7 @@
extern void show_regs(struct pt_regs *);
extern void show_cpu_regs(void);
extern void dump_cur_regs(unsigned int frames);
-extern void dump_stack(unsigned int frames);
+extern void vax_dump_stack(unsigned int frames);
#define DUMP_STACK_CURRENT 0
#define DUMP_STACK_CALLER 1
Index: timex.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/timex.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- timex.h 17 Jan 2001 16:18:52 -0000 1.1
+++ timex.h 27 Sep 2003 07:43:31 -0000 1.2
@@ -22,4 +22,7 @@
return 0;
}
+#define vxtime_lock() do {} while (0)
+#define vxtime_unlock() do {} while (0)
+
#endif /* ASM_VAX_TIMEX_H */
|
