Menu
▾
▴
linux-vax-kern-commit — Notifications of CVS commits to kernel 2.4 source tree
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(6) |
Sep
(2) |
Oct
(43) |
Nov
(4) |
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(78) |
Feb
(97) |
Mar
(29) |
Apr
(2) |
May
(22) |
Jun
(38) |
Jul
(11) |
Aug
(27) |
Sep
(40) |
Oct
(2) |
Nov
(17) |
Dec
(8) |
| 2002 |
Jan
|
Feb
(2) |
Mar
(1) |
Apr
(480) |
May
(456) |
Jun
(12) |
Jul
|
Aug
(1) |
Sep
|
Oct
(18) |
Nov
(3) |
Dec
(6) |
| 2003 |
Jan
|
Feb
(18) |
Mar
(1) |
Apr
|
May
(6) |
Jun
(147) |
Jul
(7) |
Aug
(3) |
Sep
(235) |
Oct
(10) |
Nov
(2) |
Dec
(1) |
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ben...@id...> - 2004-05-22 12:32:24
|
Dear Open Source developer I am doing a research project on "Fun and Software Development" in which I kindly invite you to participate. You will find the online survey under http://fasd.ethz.ch/qsf/. The questionnaire consists of 53 questions and you will need about 15 minutes to complete it. With the FASD project (Fun and Software Development) we want to define the motivational significance of fun when software developers decide to engage in Open Source projects. What is special about our research project is that a similar survey is planned with software developers in commercial firms. This procedure allows the immediate comparison between the involved individuals and the conditions of production of these two development models. Thus we hope to obtain substantial new insights to the phenomenon of Open Source Development. With many thanks for your participation, Benno Luthiger PS: The results of the survey will be published under http://www.isu.unizh.ch/fuehrung/blprojects/FASD/. We have set up the mailing list fa...@we... for this study. Please see http://fasd.ethz.ch/qsf/mailinglist_en.html for registration to this mailing list. _______________________________________________________________________ Benno Luthiger Swiss Federal Institute of Technology Zurich 8092 Zurich Mail: benno.luthiger(at)id.ethz.ch _______________________________________________________________________ |
|
From: <ai...@us...> - 2003-12-10 10:42:33
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv3805/kernel
Modified Files:
cpu_ka410.c
Log Message:
incorrect address for serial base
Index: cpu_ka410.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_ka410.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cpu_ka410.c 3 Oct 2003 09:13:24 -0000 1.5
+++ cpu_ka410.c 10 Dec 2003 10:42:29 -0000 1.6
@@ -62,7 +62,7 @@
void ka410_post_vm_init(void)
{
#ifdef CONFIG_DZ
- init_dz11_console(0x200A000, 3);
+ init_dz11_console(0x200A0000, 3);
dz_serial_console_init(0,0);
#endif
|
|
From: <ke...@us...> - 2003-11-02 00:17:09
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/video
In directory sc8-pr-cvs1:/tmp/cvs-serv30350/drivers/video
Modified Files:
Config.in Makefile fbcon-mfb.c fbmem.c
Added Files:
smgfb.c
Log Message:
Kaj-Michael Lang: Driver for SMG framebuffer
--- NEW FILE: smgfb.c ---
/*
* A driver for the KA42 mono framebuffer.
* Ideas from vmono and other fb drivers, address, size and command info from NetBSD.
* Thanks to all of them.
*
* Copyright 2003 Kaj-Michael Lang <mi...@ta...>
*
*/
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/fb.h>
#include <video/fbcon.h>
#include <video/fbcon-mfb.h>
#include <asm/io.h>
#define smg_DRV_VERSION "0.01"
/*
* Where are we, and what is our size
*
*/
#define smg_FB_PHYS_ADDR 0x30000000
#define smg_FB_SIZE 0x20000
#define smg_X_SIZE 1024
#define smg_Y_SIZE 864
/*
* Cursors stuff, from netbsd.
*
*/
#define smg_CUR_BASE 0x200f0000
#define smg_CUR_SIZE 0x08
#define smg_CUR_CMD 00
#define smg_CUR_XPOS 04
#define smg_CUR_YPOS 08
#define smg_CUR_XMIN_1 12
#define smg_CUR_XMAX_1 16
#define smg_CUR_YMIN_1 20
#define smg_CUR_YMAX_1 24
#define smg_CUR_XMIN_2 28
#define smg_CUR_XMAX_2 32
#define smg_CUR_YMIN_2 36
#define smg_CUR_YMAX_2 40
#define smg_CUR_LOAD 44
#define smg_CUR_CMD_TEST 0x8000
#define smg_CUR_CMD_HSHI 0x4000
#define smg_CUR_CMD_VBHI 0x2000
#define smg_CUR_CMD_LODSA 0x1000
#define smg_CUR_CMD_FORG2 0x0800
#define smg_CUR_CMD_ENRG2 0x0400
#define smg_CUR_CMD_FORG1 0x0200
#define smg_CUR_CMD_ENRG1 0x0100
#define smg_CUR_CMD_XHWID 0x0080
#define smg_CUR_CMD_XHCL1 0x0040
#define smg_CUR_CMD_XHCLP 0x0020
#define smg_CUR_CMD_XHAIR 0x0010
#define smg_CUR_CMD_FOPB 0x0008
#define smg_CUR_CMD_ENPB 0x0004
#define smg_CUR_CMD_FOPA 0x0002
#define smg_CUR_CMD_ENPA 0x0001
struct smg_par {
int xres;
int yres;
int bpp;
};
/* Pointer to our memory */
char *smgfb_mem;
/* Cursor information, do we need more than this ?? */
struct smg_cur_info {
char *mem;
int x;
int y;
};
static int currcon=0;
static struct display disp;
static struct fb_info fb_info;
static struct fb_fix_screeninfo fb_fix;
static struct fb_var_screeninfo fb_var;
static struct smg_cur_info smg_cur_info;
static int smgfb_get_fix(struct fb_fix_screeninfo *fix, int con, struct fb_info *info);
static int smgfb_get_var(struct fb_var_screeninfo *var, int con, struct fb_info *info);
static int smgfb_set_var(struct fb_var_screeninfo *var, int con, struct fb_info *info);
static int smgfb_get_cmap(struct fb_cmap *cmap, int kspc, int con, struct fb_info *info);
static int smgfb_set_cmap(struct fb_cmap *cmap, int kspc, int con, struct fb_info *info);
static int smgfb_blank(int blank, struct fb_info *info);
static int smgfb_con_switch(int con, struct fb_info *info);
static int smgfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, u_int transp, struct fb_info *fbinfo);
static int smgfb_getcolreg(u_int regno, u_int *red, u_int *green, u_int *blue, u_int *transp, struct fb_info *fbinfo);
static struct fb_ops smg_ops = {
owner: THIS_MODULE,
fb_open: NULL,
fb_release: NULL,
fb_get_fix: smgfb_get_fix,
fb_get_var: smgfb_get_var,
fb_set_var: smgfb_set_var,
fb_get_cmap: smgfb_get_cmap,
fb_set_cmap: smgfb_set_cmap,
fb_ioctl: NULL,
};
static int smgfb_get_fix(struct fb_fix_screeninfo *fix, int con, struct fb_info *info)
{
memcpy(fix, &fb_fix, sizeof(fb_fix));
return 0;
}
static int smgfb_get_var(struct fb_var_screeninfo *var, int con, struct fb_info *info)
{
memcpy(var, &fb_var, sizeof(fb_var));
return 0;
}
static int smgfb_set_var(struct fb_var_screeninfo *var, int con, struct fb_info *info)
{
return 0;
}
static int smgfb_get_cmap(struct fb_cmap *cmap, int kspc, int con, struct fb_info *info)
{
return fb_get_cmap(cmap, kspc, smgfb_getcolreg, info);
}
static int smgfb_set_cmap(struct fb_cmap *cmap, int kspc, int con, struct fb_info *info)
{
return fb_set_cmap(cmap, kspc, smgfb_setcolreg, info);
}
static int smgfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, u_int transp, struct fb_info *fbinfo)
{
/* Do the same as hgafb */
printk("smgfb: setcolreg\n");
if (regno > 1)
return 1;
return 0;
}
static int smgfb_getcolreg(u_int regno, u_int *red, u_int *green, u_int *blue, u_int *transp, struct fb_info *fbinfo)
{
/* Do the same as hgafb */
printk("smgfb: getcolreg\n");
if (regno == 0) {
*red = *green = *blue = 0x0000;
*transp = 0;
} else if (regno == 1) {
*red = *green = *blue = 0xaaaa;
*transp = 0;
} else
return 1;
return 0;
}
static int smgfb_blank(int blank, struct fb_info *info)
{
memset(smgfb_mem, 0, smg_FB_SIZE);
return 1;
}
static int smgfb_con_switch(int con, struct fb_info *info)
{
currcon=con;
return 0;
}
static void smg_cursorcmd(int cmd_addr, char cmd) {
smg_cur_info.mem[cmd_addr]=cmd;
}
/*
* Initialization code
*/
static int __init smgfb_probe(volatile unsigned char *smg_fb_mem)
{
/* Assume we have a smg.. for now.. */
printk("smgfb: found smg\n");
return 1;
}
static void __init smgfb_reset(void)
{
printk("smgfb: reset\n");
/* What here ? */
}
static int __init smgfb_map_cursor()
{
printk("smgfb: Trying to map hw cursor\n");
smg_cur_info.mem = ioremap(smg_CUR_BASE, smg_CUR_SIZE );
if (smg_cur_info.mem== NULL)
return 1;
return 0;
}
static int __init smgfb_map_fbmem()
{
printk("smgfb: Trying to map framebuffer\n");
smgfb_mem = ioremap(smg_FB_PHYS_ADDR, smg_FB_SIZE );
if (smgfb_mem == NULL)
return 1;
return 0;
}
int __init smgfb_init(void)
{
printk("smgfb: VAXstation mono framebuffer driver, version %s\n", smg_DRV_VERSION);
if (smgfb_map_fbmem() != 0) {
printk("smgfb: Unable to map framebuffer!\n");
return -ENODEV;
} else {
/* <blink /> */
memset(smgfb_mem, 0, smg_FB_SIZE);
memset(smgfb_mem, 255, smg_FB_SIZE);
memset(smgfb_mem, 0, smg_FB_SIZE);
}
/* Just map the hw cursor, need to implement support someday... */
if (smgfb_map_cursor(&fb_info) != 0) {
printk("smgfb: Unable to map hardware cursor, disabling hardware cursor support.\n");
} else {
printk("smgfb: Mapped hardware cursor\n");
}
if (smgfb_probe(smgfb_mem) == 0)
return -ENODEV;
smgfb_reset();
memset(&fb_fix, 0, sizeof(struct fb_fix_screeninfo));
strcpy(fb_fix.id, "smg");
fb_fix.type = FB_TYPE_PACKED_PIXELS;
fb_fix.type_aux = 0;
fb_fix.visual = FB_VISUAL_MONO10;
fb_fix.line_length = 128;
fb_fix.smem_start = *smgfb_mem;
fb_fix.smem_len = smg_FB_SIZE;
fb_fix.mmio_start = smg_FB_PHYS_ADDR;
fb_fix.mmio_len = smg_FB_SIZE;
fb_fix.xpanstep = 0;
fb_fix.ypanstep = 0;
fb_fix.ywrapstep = 0;
fb_fix.accel = FB_ACCEL_NONE;
fb_var.yres=smg_Y_SIZE;
fb_var.xres=smg_X_SIZE;
fb_var.yres_virtual=smg_Y_SIZE;
fb_var.xres_virtual=smg_X_SIZE;
fb_var.bits_per_pixel=1;
fb_var.grayscale=0;
fb_var.nonstd=0;
fb_var.activate=0;
fb_var.height=-1;
fb_var.width=-1;
fb_var.accel_flags=0;
disp.var=fb_var;
disp.cmap.start = 0;
disp.cmap.len = 0;
disp.cmap.red = disp.cmap.green = disp.cmap.blue = disp.cmap.transp = NULL;
disp.visual = fb_fix.visual;
disp.type = fb_fix.type;
disp.type_aux = fb_fix.type_aux;
disp.ypanstep = 0;
disp.ywrapstep = 0;
disp.line_length = fb_fix.line_length;
disp.can_soft_blank = 0;
disp.inverse = 0;
#ifdef FBCON_HAS_MFB
disp.dispsw = &fbcon_mfb;
#else
disp.dispsw = &fbcon_dummy;
#endif
disp.scrollmode = SCROLL_YREDRAW;
disp.var.activate = FB_ACTIVATE_NOW;
disp.screen_base = (char *)smgfb_mem;
strcpy(fb_info.modename, fb_fix.id);
fb_info.node = -1;
fb_info.fbops = &smg_ops;
fb_info.disp = &disp;
fb_info.fontname[0] = '\0';
fb_info.changevar = NULL;
fb_info.switch_con = smgfb_con_switch;
fb_info.updatevar = fbgen_update_var;
fb_info.blank = fbgen_blank;
fb_info.flags = FBINFO_FLAG_DEFAULT;
fb_info.screen_base = (char *)smgfb_mem;
if (register_framebuffer(&fb_info) < 0) {
printk("smgfb: unable to register framebuffer!\n");
return -ENODEV;
}
printk(KERN_INFO "fb%d: %s frame buffer device\n", GET_FB_IDX(fb_info.node), fb_info.modename);
MOD_INC_USE_COUNT;
return 0;
}
int __init smgfb_setup(char *options)
{
return 0;
}
#ifdef MODULE
int init_module(void)
{
return smgfb_init();
}
void cleanup_module(void)
{
smgfb_cleanup(&fb_info);
}
MODULE_AUTHOR("Kaj-Michael Lang (mi...@ta...)");
MODULE_DESCRIPTION("FBDev driver for VAXstation b/w framebuffer");
MODULE_LICENSE("GPL");
#endif /* MODULE */
Index: Config.in
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/video/Config.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Config.in 27 Sep 2003 13:11:58 -0000 1.8
+++ Config.in 2 Nov 2003 00:17:06 -0000 1.9
@@ -227,6 +227,7 @@
fi
if [ "$ARCH" = "vax" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then
bool ' VXT2000 monochrome framebuffer support (EXPERIMENTAL)' CONFIG_FB_VMONO
+ bool ' VS3100 monochrome framebuffer support (EXPERIMENTAL)' CONFIG_FB_SMG
fi
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
tristate ' Virtual Frame Buffer support (ONLY FOR TESTING!) (EXPERIMENTAL)' CONFIG_FB_VIRTUAL
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/video/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile 27 Sep 2003 13:11:58 -0000 1.8
+++ Makefile 2 Nov 2003 00:17:06 -0000 1.9
@@ -87,6 +87,7 @@
obj-$(CONFIG_FB_TX3912) += tx3912fb.o
obj-$(CONFIG_FB_AU1100) += au1100fb.o fbgen.o
obj-$(CONFIG_FB_VMONO) += vmonofb.o fbgen.o
+obj-$(CONFIG_FB_SMG) += smgfb.o fbgen.o
subdir-$(CONFIG_STI_CONSOLE) += sti
ifeq ($(CONFIG_STI_CONSOLE),y)
Index: fbcon-mfb.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/video/fbcon-mfb.c,v
retrieving revision 1.1.1.2
retrieving revision 1.3
diff -u -d -r1.1.1.2 -r1.3
--- fbcon-mfb.c 20 Sep 2003 19:08:40 -0000 1.1.1.2
+++ fbcon-mfb.c 2 Nov 2003 00:17:06 -0000 1.3
@@ -19,6 +19,16 @@
#include <video/fbcon-mfb.h>
+#ifdef CONFIG_FB_SMG
+static inline u8 swap_byte(u8 in)
+{
+ in = ((in & 0xf0) >> 4) | ((in & 0x0f) << 4);
+ in = ((in & 0xcc) >> 2) | ((in & 0x33) << 2);
+ in = ((in & 0xaa) >> 1) | ((in & 0x55) << 1);
+ return in;
+}
+#endif
+
/*
* Monochrome
*/
@@ -97,7 +107,11 @@
underl = attr_underline(p,c);
for (rows = fontheight(p); rows--; dest += p->next_line) {
+#ifdef CONFIG_FB_SMG
+ d = swap_byte(*cdat++);
+#else
d = *cdat++;
+#endif
if (underl && !rows)
d = 0xff;
else if (bold)
@@ -127,7 +141,11 @@
dest = dest0++;
cdat = p->fontdata+c*fontheight(p);
for (rows = fontheight(p); rows--; dest += p->next_line) {
- d = *cdat++;
+#ifdef CONFIG_FB_SMG
+ d = swap_byte(*cdat++);
+#else
+ d = *cdat++;
+#endif
if (underl && !rows)
d = 0xff;
else if (bold)
Index: fbmem.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/video/fbmem.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- fbmem.c 27 Sep 2003 13:11:58 -0000 1.9
+++ fbmem.c 2 Nov 2003 00:17:06 -0000 1.10
@@ -144,6 +144,8 @@
extern int sstfb_setup(char*);
extern int vmonofb_init(void);
extern int vmonofb_setup(char*);
+extern int smgfb_init(void);
+extern int smgfb_setup(char*);
static struct {
const char *name;
@@ -329,6 +331,9 @@
#endif
#ifdef CONFIG_FB_VMONO
{ "vmono", vmonofb_init, vmonofb_setup },
+#endif
+#ifdef CONFIG_FB_SMG
+ { "smg", smgfb_init, smgfb_setup },
#endif
/*
|
|
From: <ke...@us...> - 2003-11-02 00:17:09
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel In directory sc8-pr-cvs1:/tmp/cvs-serv30350/arch/vax/kernel Modified Files: setup.c Log Message: Kaj-Michael Lang: Driver for SMG framebuffer Index: setup.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/setup.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- setup.c 2 Aug 2003 23:44:46 -0000 1.19 +++ setup.c 2 Nov 2003 00:17:06 -0000 1.20 @@ -182,7 +182,7 @@ #ifdef CONFIG_FB /* we need a dummy console up at cons_init time, otherwise there'll be no VT's allocated for the real fbdev console to later take over */ - /* conswitchp = &dummy_con; */ + conswitchp = &dummy_con; #endif } |
|
From: <ke...@us...> - 2003-10-25 15:29:17
|
Update of /cvsroot/linux-vax/kernel-2.4/init In directory sc8-pr-cvs1:/tmp/cvs-serv31989 Modified Files: main.c Log Message: Kaj-Michael Lang: This fixes vax device init, the call to vax_dev_init was lost in the latest kernel source merge. Index: main.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/init/main.c,v retrieving revision 1.1.1.4 retrieving revision 1.6 diff -u -d -r1.1.1.4 -r1.6 --- main.c 27 Sep 2003 11:18:32 -0000 1.1.1.4 +++ main.c 25 Oct 2003 15:23:25 -0000 1.6 @@ -105,6 +105,10 @@ extern void tc_init(void); #endif +#ifdef CONFIG_VAX +extern void vax_dev_init(void); +#endif + extern void ecard_init(void); #if defined(CONFIG_SYSVIPC) @@ -528,6 +532,10 @@ #ifdef CONFIG_TC tc_init(); #endif +#ifdef CONFIG_VAX + vax_dev_init(); +#endif + /* Networking initialization needs a process context */ sock_init(); |
|
From: <ai...@us...> - 2003-10-07 10:09:13
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/char In directory sc8-pr-cvs1:/tmp/cvs-serv28804 Modified Files: dz.c Log Message: change to CONFIG_SERIAL_CONSOLE Index: dz.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/dz.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- dz.c 29 Sep 2003 23:42:34 -0000 1.18 +++ dz.c 7 Oct 2003 10:09:04 -0000 1.19 @@ -1465,7 +1465,7 @@ } /* reset the chip */ -#ifndef CONFIG_SERIAL_DEC_CONSOLE +#ifndef CONFIG_SERIAL_CONSOLE dz_out(info, DZ_CSR, DZ_CLR); while ((tmp = dz_in(info, DZ_CSR)) & DZ_CLR); iob(); |
|
From: <ai...@us...> - 2003-10-05 07:54:51
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv22224
Modified Files:
syscall.c entry.S
Log Message:
add syscall tracing
Index: syscall.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/syscall.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- syscall.c 12 Feb 2003 02:37:33 -0000 1.11
+++ syscall.c 5 Oct 2003 07:54:43 -0000 1.12
@@ -31,6 +31,7 @@
Later we'll probably re-write this in asm. */
extern unsigned long *sys_call_table[256];
+extern void syscall_trace(void);
void syscall_handler(struct pt_regs *regs, void *excep_info)
{
@@ -38,6 +39,9 @@
unsigned int *user_ap;
unsigned int nr_args;
+ if (current->ptrace & PT_TRACESYS)
+ syscall_trace();
+
chmk_arg = *(unsigned int *)(excep_info);
if (chmk_arg >= NR_syscalls) {
@@ -119,7 +123,8 @@
: "r0","r1","r2","r3","r4","r5" /* clobbers*/ );
// printk("syscall %d returned %ld (0x%08lx)\n", chmk_arg, regs->r0, regs->r0);
-
+ if (current->ptrace & PT_TRACESYS)
+ syscall_trace();
return;
}
Index: entry.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/entry.S,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- entry.S 3 Oct 2003 11:47:06 -0000 1.10
+++ entry.S 5 Oct 2003 07:54:43 -0000 1.11
@@ -11,6 +11,8 @@
#include <linux/sys.h>
#include <asm/mtpr.h>
+tsk_ptrace = 24
+
/* irqvec_handler is the generic handler for all interrupts and
exceptions for which a driver (or other code) has registered
a handler. Except machine checks. We are responsible for
@@ -199,7 +201,16 @@
that we just scheduled away from on this CPU). */
pushl %r0
calls $1, schedule_tail
+ mfpr $0, %r0
+ bicl2 $0x00001fff,%r0
+ movl tsk_ptrace(%r0), %r0
+ cmpl $0x02, %r0
+ bneq tracesys_exit
brb ret_from_syscall
+
+tracesys_exit:
+ calls $0, syscall_trace
+ brb ret_from_syscall
/* irqvec_stray is the generic handler for all exceptions and interrupts
for which there is no registered handler. We just save all registers,
|
|
From: <ai...@us...> - 2003-10-05 07:54:08
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv22142
Modified Files:
interrupt.c
Log Message:
interrupts stats patch for 2.4
Index: interrupt.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/interrupt.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- interrupt.c 3 Oct 2003 11:49:57 -0000 1.29
+++ interrupt.c 5 Oct 2003 07:54:01 -0000 1.30
@@ -444,6 +444,7 @@
action = &vec->action;
vec_num = vec->vec_num;
+ kstat.irqs[smp_processor_id()][vec_num]++;
status |= action->flags;
action->handler(vec_num, action->dev_id, regs);
@@ -485,6 +486,7 @@
static inline void do_exception(struct pt_regs *regs, struct irqvector *vec, void *excep_info)
{
+ kstat.irqs[smp_processor_id()][vec->vec_num]++;
vec->excep_handler(regs, excep_info);
}
@@ -852,7 +854,7 @@
if (vector->action.name == NULL)
len += sprintf(buf+len, "%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);
+ len += sprintf(buf+len, "%4d: %8d %s\n", vector->vec_num, kstat.irqs[smp_processor_id()][vector->vec_num], vector->action.name);
}
}
return len;
|
|
From: <ai...@us...> - 2003-10-04 11:51:11
|
Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax
In directory sc8-pr-cvs1:/tmp/cvs-serv25895/include/asm-vax
Modified Files:
system.h
Log Message:
fix set_mb to not use xchg.. should've been tracking 2.5 doh :-(
Index: system.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/system.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- system.h 27 Sep 2003 13:12:04 -0000 1.6
+++ system.h 4 Oct 2003 11:51:05 -0000 1.7
@@ -59,7 +59,7 @@
#define mb() __asm__ __volatile__("": : :"memory")
#define rmb() mb()
#define wmb() mb()
-#define set_mb(var, value) do { xchg(&var, value); } while (0)
+#define set_mb(var, value) do { var = value; barrier(); } while (0)
#define set_wmb(var, value) do { var = value; wmb(); } while (0)
#define smp_mb() mb()
#define smp_rmb() rmb()
|
|
From: <ai...@us...> - 2003-10-03 11:50:00
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv27287
Modified Files:
interrupt.c
Log Message:
remove warnings
Index: interrupt.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/interrupt.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- interrupt.c 27 Sep 2003 07:43:26 -0000 1.28
+++ interrupt.c 3 Oct 2003 11:49:57 -0000 1.29
@@ -285,7 +285,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;
}
@@ -315,7 +315,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;
}
|
|
From: <ai...@us...> - 2003-10-03 11:47:09
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv26634
Modified Files:
process.c entry.S
Log Message:
backport Kenns ret_from_fork from 2.5
Index: process.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/process.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- process.c 27 Sep 2003 09:24:03 -0000 1.23
+++ process.c 3 Oct 2003 11:47:06 -0000 1.24
@@ -58,7 +58,13 @@
/* Get phys address of next process pcb */
pcbb = virt_to_phys(&next->thread.pcb);
-
+
+ /* When 'next' starts running, R0 will hold the task pointer
+ for the process we just switched away from. This will end
+ up in R0 at ret_from_fork, for new processes and will be
+ the return value from this function for existing processes */
+ next->thread.pcb.r0 = (unsigned long) prev;
+
/* svpctx should deal with writing the stuff into *prev */
asm(" movl %1, %%r11 \n"
@@ -102,7 +108,7 @@
};
/* Defined in entry.S */
-extern void ret_from_syscall(void);
+extern void ret_from_fork(void);
int copy_thread(int unused1, unsigned long clone_flags, unsigned long usp,
unsigned long unused2,
@@ -111,7 +117,7 @@
struct new_thread_stack *child_stack;
struct pt_regs *child_regs;
void *stack_top;
-
+
/* stack top is at the end of the task_union
- take the pointer, add in the size of task_union,
and then drop by a longword to keep it within the
@@ -124,7 +130,7 @@
#ifdef VAX_PROCESS_DEBUG
printk("copy_thread: pid %d, task 0x%08lx, kstack_top 0x%8lx, usp 0x%08lx, ksp 0x%08lx\n",
- p->pid, (unsigned long)p, stack_top, usp, child_stack);
+ p->pid, (unsigned long)p, stack_top, usp, child_stack);
#endif
child_regs = &child_stack->regs;
@@ -137,10 +143,17 @@
p->thread.pcb.ksp = (unsigned long)child_stack;
p->thread.pcb.usp = usp;
- p->thread.pcb.pc = (unsigned long)ret_from_syscall;
+ p->thread.pcb.pc = (unsigned long)ret_from_fork;
p->thread.pcb.psl = __psl;
-
+ /* New thread must start with IPL 31 to prevent any interrupts
+ from occuring between the time it is first scheduled (in __switch_to
+ above) and when ret_from_fork calls schedule_tail(). If an
+ interrupt comes in during this time, schedule() might get called
+ from do_irq_excep() before schedule_tail() has released the
+ runqueue lock (in finish_task_switch) */
+ p->thread.pcb.psl.ipl = 31;
+
/* We could speed this up by loading the register values into
the PCB and start the new thread just before the REI in
entry.S, letting the regular context switching load the
Index: entry.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/entry.S,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- entry.S 12 Feb 2003 02:37:33 -0000 1.9
+++ entry.S 3 Oct 2003 11:47:06 -0000 1.10
@@ -191,7 +191,16 @@
movl (%sp)+, %r0
rei
-
+
+ .globl ret_from_fork
+ret_from_fork:
+ /* A newly-created thread starts here when it is first
+ scheduled. R0 will contain the previous task (the one
+ that we just scheduled away from on this CPU). */
+ pushl %r0
+ calls $1, schedule_tail
+ brb ret_from_syscall
+
/* irqvec_stray is the generic handler for all exceptions and interrupts
for which there is no registered handler. We just save all registers,
and call unhandled_exception(), passing it the return address saved
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv28509
Modified Files:
cpu_ka410.c cpu_ka42.c cpu_ka43.c cpu_ka630.c cpu_ka640.c
cpu_ka660.c cpu_vxt.c
Log Message:
fix up CPU types
Index: cpu_ka410.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_ka410.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cpu_ka410.c 26 Oct 2002 10:51:44 -0000 1.4
+++ cpu_ka410.c 3 Oct 2003 09:13:24 -0000 1.5
@@ -47,7 +47,8 @@
ka410_cpu_type_str,
ka4x_clock_init, /* dallas rtc init */
- NULL /* clock base */
+ NULL, /* clock base */
+ MV_CPU_KA410
}
};
Index: cpu_ka42.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_ka42.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- cpu_ka42.c 26 Oct 2002 10:51:44 -0000 1.8
+++ cpu_ka42.c 3 Oct 2003 09:13:24 -0000 1.9
@@ -51,7 +51,8 @@
ka42_cpu_type_str,
ka4x_clock_init, /* dallas rtc init */
- NULL /* clock base */
+ NULL, /* clock base */
+ MV_CPU_KA42
},
0 /* System ID Extension from ROM */
};
Index: cpu_ka43.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_ka43.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- cpu_ka43.c 26 Oct 2002 10:51:44 -0000 1.9
+++ cpu_ka43.c 3 Oct 2003 09:13:24 -0000 1.10
@@ -76,8 +76,8 @@
ka43_cpu_type_str,
ka4x_clock_init, /* dallas rtc init */
- NULL /* clock base */
-
+ NULL, /* clock base */
+ MV_CPU_KA43
},
0 /* System ID Extension from ROM */
};
Index: cpu_ka630.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_ka630.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cpu_ka630.c 25 Apr 2002 08:46:20 -0000 1.3
+++ cpu_ka630.c 3 Oct 2003 09:13:24 -0000 1.4
@@ -46,7 +46,8 @@
ka630_cpu_type_str,
generic_clock_init,
- NULL
+ NULL,
+ MV_CPU_KA630
}
};
Index: cpu_ka640.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_ka640.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cpu_ka640.c 25 Apr 2002 08:46:20 -0000 1.3
+++ cpu_ka640.c 3 Oct 2003 09:13:24 -0000 1.4
@@ -47,7 +47,8 @@
ka640_cpu_type_str,
generic_clock_init,
- NULL
+ NULL,
+ MV_CPU_KA640
},
0 /* System ID Extension from ROM */
Index: cpu_ka660.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_ka660.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cpu_ka660.c 25 Apr 2002 08:46:20 -0000 1.3
+++ cpu_ka660.c 3 Oct 2003 09:13:24 -0000 1.4
@@ -51,7 +51,8 @@
ka660_cpu_type_str,
generic_clock_init,
- NULL
+ NULL,
+ MV_CPU_KA660
}
};
Index: cpu_vxt.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_vxt.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cpu_vxt.c 29 May 2002 03:37:40 -0000 1.6
+++ cpu_vxt.c 3 Oct 2003 09:13:24 -0000 1.7
@@ -63,7 +63,8 @@
vxt_cpu_type_str,
generic_clock_init,
- NULL
+ NULL,
+ MV_CPU_VXT
}
};
|
|
From: <ai...@us...> - 2003-10-03 09:12:35
|
Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax
In directory sc8-pr-cvs1:/tmp/cvs-serv28342/include/asm-vax
Modified Files:
mv.h
Log Message:
add rest of CPU types
Index: mv.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/mv.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mv.h 12 Feb 2003 02:37:33 -0000 1.5
+++ mv.h 3 Oct 2003 09:12:26 -0000 1.6
@@ -46,9 +46,16 @@
various VAX architectures, specifically for loading correct base addresses
and interrupt settings */
#define MV_CPU_GENERIC 0
+#define MV_CPU_KA42 42
+#define MV_CPU_KA43 43
#define MV_CPU_KA46 46
#define MV_CPU_KA55 55
+#define MV_CPU_KA410 410
+#define MV_CPU_KA630 630
+#define MV_CPU_KA640 640
#define MV_CPU_KA650 650
+#define MV_CPU_KA660 660
+#define MV_CPU_VXT 2000
#endif /* !__ASSEMBLY__ */
|
|
From: <ai...@us...> - 2003-10-03 06:19:49
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/net In directory sc8-pr-cvs1:/tmp/cvs-serv29748 Modified Files: Makefile Log Message: merge to 2.4.22 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Makefile 10 Jun 2003 01:46:31 -0000 1.6 +++ Makefile 3 Oct 2003 06:19:41 -0000 1.7 @@ -25,6 +25,16 @@ obj-y += tulip/tulip.o endif +obj-$(CONFIG_OCP_NET) += ibm_emac/ocp.o + +ifeq ($(CONFIG_E1000),y) + obj-y += e1000/e1000.o +endif + +ifeq ($(CONFIG_BONDING),y) + obj-y += bonding/bonding.o +endif + ifeq ($(CONFIG_ISDN_PPP),y) obj-$(CONFIG_ISDN) += slhc.o endif @@ -32,14 +42,18 @@ subdir-$(CONFIG_NET_PCMCIA) += pcmcia subdir-$(CONFIG_NET_WIRELESS) += wireless subdir-$(CONFIG_TULIP) += tulip +subdir-$(CONFIG_OCP_NET) += ibm_emac subdir-$(CONFIG_IRDA) += irda subdir-$(CONFIG_TR) += tokenring subdir-$(CONFIG_WAN) += wan subdir-$(CONFIG_NET_FC) += fc subdir-$(CONFIG_ARCNET) += arcnet -subdir-$(CONFIG_APPLETALK) += appletalk +subdir-$(CONFIG_DEV_APPLETALK) += appletalk subdir-$(CONFIG_SK98LIN) += sk98lin subdir-$(CONFIG_SKFP) += skfp +subdir-$(CONFIG_E100) += e100 +subdir-$(CONFIG_E1000) += e1000 +subdir-$(CONFIG_BONDING) += bonding # # link order important here @@ -64,6 +78,7 @@ obj-$(CONFIG_DGRS) += dgrs.o obj-$(CONFIG_RCPCI) += rcpci.o obj-$(CONFIG_VORTEX) += 3c59x.o mii.o +obj-$(CONFIG_TYPHOON) += typhoon.o obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o obj-$(CONFIG_PCNET32) += pcnet32.o mii.o obj-$(CONFIG_EEPRO100) += eepro100.o mii.o @@ -78,6 +93,12 @@ obj-$(CONFIG_NS83820) += ns83820.o obj-$(CONFIG_STNIC) += stnic.o 8390.o obj-$(CONFIG_FEALNX) += fealnx.o mii.o +obj-$(CONFIG_TC35815) += tc35815.o +obj-$(CONFIG_TIGON3) += tg3.o + +ifeq ($(CONFIG_E100),y) + obj-y += e100/e100.o +endif ifeq ($(CONFIG_SK98LIN),y) obj-y += sk98lin/sk98lin.o @@ -88,7 +109,7 @@ endif obj-$(CONFIG_VIA_RHINE) += via-rhine.o mii.o -obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o +obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o mii.o # # end link order section @@ -101,13 +122,13 @@ obj-$(CONFIG_AIRONET4500_CS) += aironet4500_proc.o obj-$(CONFIG_WINBOND_840) += winbond-840.o mii.o -obj-$(CONFIG_SUNDANCE) += sundance.o -obj-$(CONFIG_HAMACHI) += hamachi.o +obj-$(CONFIG_SUNDANCE) += sundance.o mii.o +obj-$(CONFIG_HAMACHI) += hamachi.o mii.o obj-$(CONFIG_NET) += Space.o setup.o net_init.o loopback.o obj-$(CONFIG_SEEQ8005) += seeq8005.o obj-$(CONFIG_ETHERTAP) += ethertap.o obj-$(CONFIG_NET_SB1000) += sb1000.o -obj-$(CONFIG_MAC8390) += daynaport.o 8390.o +obj-$(CONFIG_MAC8390) += mac8390.o 8390.o obj-$(CONFIG_APNE) += apne.o 8390.o obj-$(CONFIG_PCMCIA_PCNET) += 8390.o obj-$(CONFIG_SHAPER) += shaper.o @@ -129,6 +150,8 @@ obj-$(CONFIG_ES3210) += es3210.o 8390.o obj-$(CONFIG_LNE390) += lne390.o 8390.o obj-$(CONFIG_NE3210) += ne3210.o 8390.o +obj-$(CONFIG_NET_SB1250_MAC) += sb1250-mac.o +obj-$(CONFIG_B44) += b44.o obj-$(CONFIG_PPP) += ppp_generic.o slhc.o obj-$(CONFIG_PPP_ASYNC) += ppp_async.o @@ -144,14 +167,15 @@ obj-$(CONFIG_STRIP) += strip.o obj-$(CONFIG_DUMMY) += dummy.o -obj-$(CONFIG_BONDING) += bonding.o obj-$(CONFIG_DE600) += de600.o obj-$(CONFIG_DE620) += de620.o obj-$(CONFIG_AT1500) += lance.o obj-$(CONFIG_LANCE) += lance.o +obj-$(CONFIG_SUN3_82586) += sun3_82586.o obj-$(CONFIG_SUN3LANCE) += sun3lance.o obj-$(CONFIG_DEFXX) += defxx.o obj-$(CONFIG_SGISEEQ) += sgiseeq.o +obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o obj-$(CONFIG_AT1700) += at1700.o obj-$(CONFIG_FMV18X) += fmv18x.o obj-$(CONFIG_EL1) += 3c501.o @@ -207,11 +231,18 @@ obj-$(CONFIG_HYDRA) += hydra.o 8390.o obj-$(CONFIG_ARIADNE) += ariadne.o obj-$(CONFIG_CS89x0) += cs89x0.o +obj-$(CONFIG_ARM_CIRRUS) += cirrus.o obj-$(CONFIG_MACSONIC) += macsonic.o obj-$(CONFIG_MACMACE) += macmace.o obj-$(CONFIG_MAC89x0) += mac89x0.o obj-$(CONFIG_TUN) += tun.o +obj-$(CONFIG_ETHER00) +=ether00.o obj-$(CONFIG_DL2K) += dl2k.o +obj-$(CONFIG_R8169) += r8169.o +obj-$(CONFIG_AMD8111_ETH) += amd8111e.o mii.o + +# non-drivers/net drivers who want mii lib +obj-$(CONFIG_PCMCIA_SMC91C92) += mii.o ifeq ($(CONFIG_ARCH_ACORN),y) mod-subdirs += ../acorn/net |
|
From: <ai...@us...> - 2003-09-29 23:42:38
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/char In directory sc8-pr-cvs1:/tmp/cvs-serv15069/drivers/char Modified Files: dz.c Log Message: second part of previous fix Index: dz.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/dz.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- dz.c 29 Sep 2003 23:40:59 -0000 1.17 +++ dz.c 29 Sep 2003 23:42:34 -0000 1.18 @@ -1400,9 +1400,9 @@ */ callout_driver = serial_driver; #if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS)) - callout_driver.name = "cua"; -#else callout_driver.name = "cua/%d"; +#else + callout_driver.name = "cua"; #endif callout_driver.major = TTYAUX_MAJOR; callout_driver.subtype = SERIAL_TYPE_CALLOUT; |
|
From: <ai...@us...> - 2003-09-29 23:41:03
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/char In directory sc8-pr-cvs1:/tmp/cvs-serv14487/drivers/char Modified Files: dz.c Log Message: make devfs work again for dz.c (from Kaj-Michael Lang) Index: dz.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/dz.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- dz.c 28 Sep 2003 04:46:21 -0000 1.16 +++ dz.c 29 Sep 2003 23:40:59 -0000 1.17 @@ -1358,15 +1358,11 @@ memset(&serial_driver, 0, sizeof(struct tty_driver)); serial_driver.magic = TTY_DRIVER_MAGIC; -#ifdef CONFIG_VAX - serial_driver.name = "ttyS"; -#else #if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS)) serial_driver.name = "ttyS"; #else serial_driver.name = "tts/%d"; #endif -#endif /* config_vax */ serial_driver.major = TTY_MAJOR; serial_driver.minor_start = 64; serial_driver.num = DZ_NB_PORT; |
|
From: <ai...@us...> - 2003-09-29 23:27:35
|
Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax
In directory sc8-pr-cvs1:/tmp/cvs-serv11907/include/asm-vax
Added Files:
kmap_types.h
Log Message:
DA: add crypto/lib to config and make crypto build
--- NEW FILE: kmap_types.h ---
#ifndef _ASM_KMAP_TYPES_H
#define _ASM_KMAP_TYPES_H
enum km_type {
KM_BOUNCE_READ,
KM_SKB_SUNRPC_DATA,
KM_SKB_DATA_SOFTIRQ,
KM_USER0,
KM_USER1,
KM_BH_IRQ,
KM_SOFTIRQ0,
KM_SOFTIRQ1,
KM_TYPE_NR
};
#endif
|
|
From: <ai...@us...> - 2003-09-29 23:27:34
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/vax In directory sc8-pr-cvs1:/tmp/cvs-serv11907/arch/vax Modified Files: config.in Log Message: DA: add crypto/lib to config and make crypto build Index: config.in =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/config.in,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- config.in 31 Jul 2003 19:18:57 -0000 1.17 +++ config.in 29 Sep 2003 23:27:30 -0000 1.18 @@ -192,3 +192,5 @@ endmenu +source crypto/Config.in +source lib/Config.in |
|
From: <ai...@us...> - 2003-09-29 15:36:38
|
Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax In directory sc8-pr-cvs1:/tmp/cvs-serv10789/asm-vax Modified Files: pci.h Log Message: DA: fix dump pci header Index: pci.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/pci.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pci.h 9 Apr 2002 12:33:20 -0000 1.1 +++ pci.h 29 Sep 2003 11:25:09 -0000 1.2 @@ -10,4 +10,6 @@ * atp Mar 2002 */ +#define PCI_DMA_BUS_IS_PHYS (0) + #endif |
|
From: <ai...@us...> - 2003-09-28 04:46:34
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv27852
Modified Files:
dz.c
Log Message:
fix up merges for dz.c
Index: dz.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/dz.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- dz.c 27 Sep 2003 13:11:56 -0000 1.15
+++ dz.c 28 Sep 2003 04:46:21 -0000 1.16
@@ -21,7 +21,7 @@
* [07-SEP-99] Bugfixes
*/
-#define DEBUG_DZ 1
+/*#define DEBUG_DZ 1*/
#include <linux/config.h>
#include <linux/version.h>
@@ -46,6 +46,7 @@
#include <linux/fs.h>
#ifdef CONFIG_VAX
+#include <linux/ioport.h>
#include <asm/mv.h>
#include <asm/vsa.h>
#include <asm/dz11.h>
@@ -53,6 +54,7 @@
#define SERIAL_TX 0xB1 /* FIXME: this is wrong */
#define SERIAL SERIAL_RX
volatile struct dz11_regs *dz11_addr;
+#define iob() do { } while (0)
#else
#include <asm/bootinfo.h>
#include <asm/dec/interrupts.h>
@@ -91,6 +93,8 @@
prom_printf("%c", *s++);
}
}
+#else
+#define debug_console(s, count) do { } while (0)
#endif
/*
@@ -1421,6 +1425,7 @@
#ifdef CONFIG_VAX
info->port = (unsigned long) dz11_addr;
+#else
if (mips_machtype == MACH_DS23100 ||
mips_machtype == MACH_DS5100)
info->port = (unsigned long) KN01_DZ11_BASE;
|
|
From: <ai...@us...> - 2003-09-28 04:41:55
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/char In directory sc8-pr-cvs1:/tmp/cvs-serv27317 Modified Files: dz.h Log Message: Merge 2.4.22 bring back on main line Index: dz.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/dz.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- dz.h 17 Jun 2001 11:43:44 -0000 1.4 +++ dz.h 28 Sep 2003 04:41:46 -0000 1.5 @@ -12,6 +12,7 @@ #include <linux/config.h> +#define SERIAL_MAGIC 0x5301 /* * Definitions for the Control and Status Received. */ |
|
From: <ai...@us...> - 2003-09-27 13:12:41
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/video
In directory sc8-pr-cvs1:/tmp/cvs-serv3030/drivers/video
Modified Files:
Config.in Makefile fbmem.c
Log Message:
merge 2.4.22
Index: Config.in
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/video/Config.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Config.in 27 Sep 2003 09:21:18 -0000 1.7
+++ Config.in 27 Sep 2003 13:11:58 -0000 1.8
@@ -172,7 +172,7 @@
bool ' Use CRT on Pb1100 ' CONFIG_PB1500_CRT
bool ' Use TFT Panel on Pb1100 ' CONFIG_PB1500_TFT
fi
- if [ "$CONFIG_MIPS_PB1100" = "y" ]; then
+ if [ "$CONFIG_SOC_AU1100" = "y" ]; then
bool ' Au1100 LCD Driver' CONFIG_FB_AU1100
fi
fi
@@ -220,7 +220,7 @@
if [ "$CONFIG_DECSTATION" = "y" ]; then
dep_bool ' PMAG-BA TURBOchannel framebuffer support' CONFIG_FB_PMAG_BA $CONFIG_TC
dep_bool ' PMAGB-B TURBOchannel framebuffer support' CONFIG_FB_PMAGB_B $CONFIG_TC
- bool ' Maxine (Personal DECstation) onboard framebuffer support' CONFIG_FB_MAXINE
+ dep_bool ' Maxine (Personal DECstation) onboard framebuffer support' CONFIG_FB_MAXINE $CONFIG_TC
fi
if [ "$CONFIG_NINO" = "y" ]; then
bool ' TMPTX3912/PR31700 frame buffer support' CONFIG_FB_TX3912
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/video/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile 27 Sep 2003 09:21:19 -0000 1.7
+++ Makefile 27 Sep 2003 13:11:58 -0000 1.8
@@ -130,6 +130,7 @@
obj-$(CONFIG_FB_VIRTUAL) += vfb.o
obj-$(CONFIG_FB_HIT) += hitfb.o fbgen.o
obj-$(CONFIG_FB_E1355) += epson1355fb.o fbgen.o
+obj-$(CONFIG_FB_E1356) += epson1356fb.o
obj-$(CONFIG_FB_PVR2) += pvr2fb.o
obj-$(CONFIG_FB_VOODOO1) += sstfb.o
Index: fbmem.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/video/fbmem.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fbmem.c 27 Sep 2003 09:21:19 -0000 1.8
+++ fbmem.c 27 Sep 2003 13:11:58 -0000 1.9
@@ -134,6 +134,8 @@
extern int intelfb_setup(char*);
extern int e1355fb_init(void);
extern int e1355fb_setup(char*);
+extern int e1356fb_init(void);
+extern int e1356fb_setup(char*);
extern int au1100fb_init(void);
extern int au1100fb_setup(char*);
extern int pvr2fb_init(void);
@@ -306,6 +308,9 @@
#endif
#ifdef CONFIG_FB_E1355
{ "e1355fb", e1355fb_init, e1355fb_setup },
+#endif
+#ifdef CONFIG_FB_E1356
+ { "e1356fb", e1356fb_init, e1356fb_setup },
#endif
#ifdef CONFIG_FB_PVR2
{ "pvr2", pvr2fb_init, pvr2fb_setup },
|
|
From: <ai...@us...> - 2003-09-27 13:12:41
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv3030/drivers/char
Modified Files:
Makefile dz.c tty_io.c
Log Message:
merge 2.4.22
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile 27 Sep 2003 09:21:13 -0000 1.9
+++ Makefile 27 Sep 2003 13:11:56 -0000 1.10
@@ -252,6 +252,7 @@
obj-$(CONFIG_INTEL_RNG) += i810_rng.o
obj-$(CONFIG_AMD_RNG) += amd768_rng.o
obj-$(CONFIG_AMD_PM768) += amd76x_pm.o
+obj-$(CONFIG_BRIQ_PANEL) += briq_panel.o
obj-$(CONFIG_ITE_GPIO) += ite_gpio.o
obj-$(CONFIG_AU1000_GPIO) += au1000_gpio.o
Index: dz.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/dz.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- dz.c 21 Sep 2003 13:12:30 -0000 1.14
+++ dz.c 27 Sep 2003 13:11:56 -0000 1.15
@@ -36,45 +36,38 @@
#include <linux/param.h>
#include <linux/tqueue.h>
#include <linux/interrupt.h>
-#include <linux/serial.h>
-#include <linux/serialP.h>
-#ifdef CONFIG_VAX
-#define SERIAL_RX 0xB0 /* FIXME: this is wrong */
-#define SERIAL_TX 0xB1 /* FIXME: this is wrong */
-#define SERIAL SERIAL_RX
-#define wbflush() do{}while(0)
-#else
-#include <asm-mips/wbflush.h>
-#include <asm/dec/interrupts.h> /* for definition of SERIAL */
-#endif
#include <linux/console.h>
#include <linux/tty.h>
#include <linux/tty_flip.h>
-#include <asm/uaccess.h>
-#include <asm/irq.h>
+#include <linux/serial.h>
+
+#include <linux/ptrace.h>
+#include <linux/fs.h>
#ifdef CONFIG_VAX
#include <asm/mv.h>
#include <asm/vsa.h>
#include <asm/dz11.h>
+#define SERIAL_RX 0xB0 /* FIXME: this is wrong */
+#define SERIAL_TX 0xB1 /* FIXME: this is wrong */
+#define SERIAL SERIAL_RX
volatile struct dz11_regs *dz11_addr;
#else
-#include <asm/dec/machtype.h>
+#include <asm/bootinfo.h>
+#include <asm/dec/interrupts.h>
#include <asm/dec/kn01.h>
#include <asm/dec/kn02.h>
-#include <asm/bootinfo.h>
+#include <asm/dec/machtype.h>
+#include <asm/dec/prom.h>
+#define SERIAL dec_interrupt[DEC_IRQ_DZ11]
#endif
-
-#include <linux/ptrace.h>
-#include <linux/fs.h>
-#include <asm/bootinfo.h>
+#include <asm/irq.h>
+#include <asm/system.h>
+#include <asm/uaccess.h>
#define CONSOLE_LINE (3) /* for definition of struct console */
-extern int (*prom_printf) (char *,...);
-#endif
-
#include "dz.h"
#define DZ_INTR_DEBUG 1
@@ -229,13 +222,12 @@
if (!(status & DZ_DVAL))
goto ignore_char;
-
ch = UCHAR(status); /* grab the char */
#if 0
if (info->is_console) {
if (ch == 0)
- return; /* it's a break ... */
+ return; /* it's a break ... */
}
#endif
@@ -1472,10 +1464,10 @@
}
/* reset the chip */
-#ifndef CONFIG_SERIAL_CONSOLE
+#ifndef CONFIG_SERIAL_DEC_CONSOLE
dz_out(info, DZ_CSR, DZ_CLR);
while ((tmp = dz_in(info, DZ_CSR)) & DZ_CLR);
- wbflush();
+ iob();
/* enable scanning */
dz_out(info, DZ_CSR, DZ_MSE);
@@ -1711,12 +1703,12 @@
static struct console dz_sercons =
{
- name: "ttyS",
- write: dz_console_print,
- device: dz_console_device,
- setup: dz_console_setup,
- flags: CON_CONSDEV | CON_PRINTBUFFER,
- index: CONSOLE_LINE,
+ .name = "ttyS",
+ .write = dz_console_print,
+ .device = dz_console_device,
+ .setup = dz_console_setup,
+ .flags = CON_CONSDEV | CON_PRINTBUFFER,
+ .index = CONSOLE_LINE,
};
void __init dz_serial_console_init(void)
@@ -1724,6 +1716,6 @@
register_console(&dz_sercons);
}
-#endif /* CONFIG_SERIAL_CONSOLE */
+#endif /* CONFIG_SERIAL_DEC_CONSOLE */
MODULE_LICENSE("GPL");
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/tty_io.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- tty_io.c 27 Sep 2003 09:21:13 -0000 1.12
+++ tty_io.c 27 Sep 2003 13:11:56 -0000 1.13
@@ -142,6 +142,7 @@
extern int serial167_init(void);
extern long serial167_console_init(void);
extern void console_8xx_init(void);
+extern void au1x00_serial_console_init(void);
extern int rs_8xx_init(void);
extern void mac_scc_console_init(void);
extern void hwc_console_init(void);
@@ -154,10 +155,14 @@
extern void sa1100_rs_console_init(void);
extern void sgi_serial_console_init(void);
extern void sci_console_init(void);
+extern void dec_serial_console_init(void);
extern void tx3912_console_init(void);
extern void tx3912_rs_init(void);
extern void txx927_console_init(void);
+extern void txx9_rs_init(void);
+extern void txx9_serial_console_init(void);
extern void sb1250_serial_console_init(void);
+extern void arc_console_init(void);
#ifndef MIN
#define MIN(a,b) ((a) < (b) ? (a) : (b))
@@ -2235,8 +2240,8 @@
#ifdef CONFIG_VT
con_init();
#endif
-#ifdef CONFIG_AU1000_SERIAL_CONSOLE
- au1000_serial_console_init();
+#ifdef CONFIG_AU1X00_SERIAL_CONSOLE
+ au1x00_serial_console_init();
#endif
#ifdef CONFIG_SERIAL_CONSOLE
#if (defined(CONFIG_8xx) || defined(CONFIG_8260))
@@ -2253,9 +2258,6 @@
#elif defined(CONFIG_SERIAL)
serial_console_init();
#endif /* CONFIG_8xx */
-#ifdef CONFIG_SGI_SERIAL
- sgi_serial_console_init();
-#endif
#if defined(CONFIG_MVME162_SCC) || defined(CONFIG_BVME6000_SCC) || defined(CONFIG_MVME147_SCC)
vme_scc_console_init();
#endif
@@ -2266,6 +2268,9 @@
sci_console_init();
#endif
#endif
+#ifdef CONFIG_SERIAL_DEC_CONSOLE
+ dec_serial_console_init();
+#endif
#ifdef CONFIG_TN3270_CONSOLE
tub3270_con_init();
#endif
@@ -2296,8 +2301,14 @@
#ifdef CONFIG_TXX927_SERIAL_CONSOLE
txx927_console_init();
#endif
+#ifdef CONFIG_SERIAL_TXX9_CONSOLE
+ txx9_serial_console_init();
+#endif
#ifdef CONFIG_SIBYTE_SB1250_DUART_CONSOLE
sb1250_serial_console_init();
+#endif
+#ifdef CONFIG_IP22_SERIAL
+ sgi_serial_console_init();
#endif
}
|
|
From: <ai...@us...> - 2003-09-27 13:12:41
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/scsi
In directory sc8-pr-cvs1:/tmp/cvs-serv3030/drivers/scsi
Modified Files:
Makefile scsi_ioctl.c
Log Message:
merge 2.4.22
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/scsi/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile 27 Sep 2003 09:21:17 -0000 1.9
+++ Makefile 27 Sep 2003 13:11:56 -0000 1.10
@@ -26,7 +26,7 @@
subdir-$(CONFIG_SCSI_AACRAID) += aacraid
subdir-$(CONFIG_SCSI_AIC7XXX) += aic7xxx
-subdir-$(CONFIG_SCSI_AIC79XX) += aic79xx
+subdir-$(CONFIG_SCSI_AIC79XX) += aic7xxx
subdir-$(CONFIG_PCMCIA) += pcmcia
obj-$(CONFIG_SCSI) += scsi_mod.o
@@ -71,7 +71,7 @@
obj-$(CONFIG_SCSI_AIC7XXX) += aic7xxx/aic7xxx.o
endif
ifeq ($(CONFIG_SCSI_AIC79XX),y)
- obj-$(CONFIG_SCSI_AIC79XX) += aic79xx/aic79xx.o
+ obj-$(CONFIG_SCSI_AIC79XX) += aic7xxx/aic79xx.o
endif
obj-$(CONFIG_SCSI_AIC7XXX_OLD) += aic7xxx_old.o
obj-$(CONFIG_SCSI_IPS) += ips.o
Index: scsi_ioctl.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/scsi/scsi_ioctl.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- scsi_ioctl.c 21 Sep 2003 13:12:30 -0000 1.3
+++ scsi_ioctl.c 27 Sep 2003 13:11:56 -0000 1.4
@@ -279,6 +279,7 @@
cmd[1] = (cmd[1] & 0x1f) | (dev->lun << 5);
switch (opcode) {
+ case SEND_DIAGNOSTIC:
case FORMAT_UNIT:
timeout = FORMAT_UNIT_TIMEOUT;
retries = 1;
|
|
From: <ai...@us...> - 2003-09-27 13:12:41
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/ide In directory sc8-pr-cvs1:/tmp/cvs-serv3030/drivers/ide Added Files: ide-sibyte.c Log Message: merge 2.4.22 |