Menu
▾
▴
[LV-kern-commit] CVS: kernel-2.4/arch/vax/kernel interrupt.c,1.17,1.18 process.c,1.12,1.13 reboot.c,1.3,1.4 regdump.c,1.4,1.5 setup.c,1.13,1.14 signal.c,1.7,1.8
|
From: Andy P. <at...@us...> - 2001-09-11 19:23:41
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv21502
Modified Files:
interrupt.c process.c reboot.c regdump.c setup.c signal.c
Log Message:
Clean up compilation warnings
Index: interrupt.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/interrupt.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- interrupt.c 2001/09/06 23:39:42 1.17
+++ interrupt.c 2001/09/11 19:23:38 1.18
@@ -23,6 +23,8 @@
#include "interrupt.h" /* Local, private definitions */
+int do_signal(sigset_t *oldset, struct pt_regs *regs); /* signal.c */
+
unsigned char __attribute((__aligned__(PAGE_SIZE))) interrupt_stack[NR_CPUS][INT_STACK_SIZE];
union scb_and_device_vectors __attribute((__aligned__(PAGE_SIZE))) scb;
@@ -294,7 +296,7 @@
void arith_handler(struct pt_regs *regs, void *excep_info)
{
int code = *(unsigned int *)(excep_info);
- printk("Arithmetic Fault at PC=%8lx, %s, (code=%lx)\n",regs->pc,arith_faults[code],code);
+ printk("Arithmetic Fault at PC=%8lx, %s, (code=%x)\n",regs->pc,arith_faults[code],code);
/* FIXME: need to code up the info for user handler */
if (user_mode(regs)) {
force_sig(SIGFPE,current);
Index: process.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/process.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- process.c 2001/09/02 20:48:39 1.12
+++ process.c 2001/09/11 19:23:38 1.13
@@ -109,12 +109,6 @@
struct new_thread_stack *child_stack;
struct pt_regs *child_regs;
void *stack_top;
- pte_t *spte;
-
-// /* Place a guard page on page 3 */
-// spte=GET_SPTE_VIRT(p);
-// spte+=2;
-// set_pte(spte,pte_modify(*spte,PAGE_KRO));
/* stack top is at the end of the task_union
- take the pointer, add in the size of task_union,
Index: reboot.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/reboot.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- reboot.c 2001/07/31 17:28:26 1.3
+++ reboot.c 2001/09/11 19:23:38 1.4
@@ -17,6 +17,8 @@
#include <asm/mv.h>
#include <asm/system.h> /* For HALT */
+extern void show_cpu_regs(void);
+
void machine_halt(void)
{
if (mv->halt == NULL) {
Index: regdump.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/regdump.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- regdump.c 2001/09/01 12:21:15 1.4
+++ regdump.c 2001/09/11 19:23:38 1.5
@@ -108,7 +108,7 @@
if (i%4 == 0) {
printk(" %08lx ", (unsigned long)(p+i));
}
- if ((p+i)<PAGE_OFFSET){
+ if ((unsigned int)(p+i)<PAGE_OFFSET){
if (get_user(x, p+i)) {
printk(" --------");
} else {
Index: setup.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/setup.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- setup.c 2001/09/02 20:48:39 1.13
+++ setup.c 2001/09/11 19:23:38 1.14
@@ -68,7 +68,7 @@
* atp -- have a temporary one.
* Shouldn't we use strcpy here?
*/
- memcpy(command_line, "root=/dev/nfs nfsroot=/tftpboot/vaxroot rw debug\0",55);
+ memcpy(command_line, "root=/dev/nfs nfsroot=/home/disk_vax/vaxroot rw debug\0",55);
*cmdline_p = command_line;
/* Save unparsed command line copy for /proc/cmdline */
memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
@@ -100,7 +100,7 @@
bootmap_size = init_bootmem(0, max_pfn);
- printk("bootmap size = %8.8x\n", bootmap_size);
+ printk("bootmap size = %8.8lx\n", bootmap_size);
/* Available memory is now the region from the end of the
bootmem bitmap to the start of the kernel and from the
Index: signal.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/signal.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- signal.c 2001/09/06 23:39:42 1.7
+++ signal.c 2001/09/11 19:23:38 1.8
@@ -201,7 +201,6 @@
restore_sigcontext(struct pt_regs *regs, struct sigcontext *sc)
{
unsigned int err = 0;
- unsigned long old_usp;
/* restore the regs from &sc->regs (same as sc, since regs is first)
* (sc is already checked for VERIFY_READ since the sigframe was
@@ -449,7 +448,7 @@
regs->pc = (unsigned long) frame->retcode; /* what we enter NOW */
regs->fp = regs->sp;
- regs->sp = frame;
+ regs->sp = (unsigned int)frame;
__mtpr(frame,PR_USP); /* and into to the register, ready for REI */
#ifdef DEBUG_SIG
@@ -574,7 +573,7 @@
/* Set up registers for signal handler */
regs->pc = (unsigned long) ka->sa.sa_handler; /* what we enter NOW */
- regs->sp = frame; /* what we enter LATER */
+ regs->sp = (unsigned int)frame; /* what we enter LATER */
return;
|
