|
From: Kenn H. <ke...@us...> - 2002-05-31 01:58:44
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv7433/arch/vax/kernel
Modified Files:
cpu_ka43.c init_task.c interrupt.c setup.c signal.c
Log Message:
Merge with Linux 2.5.1.
Index: cpu_ka43.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka43.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cpu_ka43.c 20 May 2002 01:09:49 -0000 1.5
+++ cpu_ka43.c 31 May 2002 01:58:38 -0000 1.6
@@ -30,6 +30,7 @@
void ka43_pre_vm_init(void);
void ka43_post_vm_init(void);
+void ka43_cache_reset(void);
void ka43_cache_disable(volatile unsigned int *creg_addr);
void ka43_cache_clear(volatile unsigned int *ctag_addr);
void ka43_cache_enable(volatile unsigned int *creg_addr);
@@ -109,10 +110,7 @@
/*
* Resetting the cache involves disabling it, then clear it and enable again.
*/
- ka43_cache_disable(ka43_creg_addr);
- ka43_cache_clear(ka43_ctag_addr);
- ka43_cache_enable(ka43_creg_addr);
-
+ ka43_cache_reset();
}
void ka43_cache_disable(volatile unsigned int *creg_addr)
@@ -152,13 +150,13 @@
/* enable primary cache */
__mtpr(KA43_PCS_FLUSH | KA43_PCS_REFRESH, PR_PCSTS); /* flush */
- __mtpr(KA43_PCS_ENABLE | KA43_PCS_REFRESH, PR_PCSTS); /* enable */
/* enable secondary cache */
*creg_addr = KA43_SESR_CENB;
for (i=0; i<128*1024; i++) {
val += membase[i];
}
+ __mtpr(KA43_PCS_ENABLE | KA43_PCS_REFRESH, PR_PCSTS); /* enable */
}
void ka43_cache_reset(void)
Index: init_task.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/init_task.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- init_task.c 20 May 2002 00:33:33 -0000 1.3
+++ init_task.c 31 May 2002 01:58:38 -0000 1.4
@@ -10,7 +10,6 @@
/* This is copied from i386 for now. I don't know what we'll
need to change yet. KPH 2000-04-25 */
-static struct vm_area_struct init_mmap = INIT_MMAP;
static struct fs_struct init_fs = INIT_FS;
static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS;
Index: interrupt.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/interrupt.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- interrupt.c 20 May 2002 00:33:33 -0000 1.4
+++ interrupt.c 31 May 2002 01:58:38 -0000 1.5
@@ -19,6 +19,7 @@
#include <linux/mm.h>
#include <linux/string.h>
#include <linux/kernel_stat.h>
+#include <linux/seq_file.h>
#include <asm/pgalloc.h>
#include <asm/scb.h>
@@ -280,7 +281,7 @@
info.si_signo = SIGTRAP;
info.si_errno = 0;
info.si_code = TRAP_BRKPT;
- info.si_addr = regs->pc;
+ info.si_addr = (void *)(regs->pc);
force_sig_info(SIGTRAP,&info,current);
return;
}
@@ -310,7 +311,7 @@
info.si_signo = SIGTRAP;
info.si_errno = 0;
info.si_code = TRAP_BRKPT;
- info.si_addr = regs->pc;
+ info.si_addr = (void *)(regs->pc);
force_sig_info(SIGTRAP,&info,current);
return;
}
@@ -820,9 +821,9 @@
return retval;
}
-int get_irq_list(char *buf)
+int show_interrupts(struct seq_file *p, void *v)
{
- int i, len=0;
+ int i;
struct irqvector *vector;
unsigned char *inside_vec;
@@ -841,12 +842,12 @@
vector = (struct irqvector *)(inside_vec -
offsetof(struct irqvector, inst_jsb));
if (vector->action.name == NULL)
- len += sprintf(buf+len, "%4d: %8d no interrupt vector name\n", vector->vec_num, 0);
+ seq_printf(p, "%4d: %8d no interrupt vector name\n", vector->vec_num, 0);
else
- len += sprintf(buf+len, "%4d: %8d %s\n", vector->vec_num, 0, vector->action.name);
+ seq_printf(p, "%4d: %8d %s\n", vector->vec_num, 0, vector->action.name);
}
}
- return len;
+ return 0;
}
/* empty for now. See arch/i386/kernel/irq.c for what this should do */
Index: setup.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/setup.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- setup.c 20 May 2002 00:33:33 -0000 1.4
+++ setup.c 31 May 2002 01:58:38 -0000 1.5
@@ -40,8 +40,6 @@
*/
static int show_cpuinfo(struct seq_file *m, void *v)
{
- int len;
-
seq_printf(m, "cpu\t\t\t: VAX\n"
"cpu type\t\t: %s\n"
"cpu sidex\t\t: %d\n"
Index: signal.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/signal.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- signal.c 20 May 2002 00:33:33 -0000 1.3
+++ signal.c 31 May 2002 01:58:38 -0000 1.4
@@ -27,6 +27,7 @@
#include <linux/ptrace.h>
#include <linux/unistd.h>
#include <linux/stddef.h>
+#include <linux/tty.h>
#include <asm/processor.h>
#include <asm/ucontext.h>
|