Menu
▾
▴
linux-vax-k25-commit — Notifications of CVS commits to kernel 2.5 tree
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(11) |
Jun
(66) |
Jul
(16) |
Aug
(2) |
Sep
(7) |
Oct
(17) |
Nov
(1) |
Dec
(220) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(154) |
Feb
(167) |
Mar
(159) |
Apr
(172) |
May
(35) |
Jun
(58) |
Jul
(97) |
Aug
(285) |
Sep
(139) |
Oct
(252) |
Nov
(8) |
Dec
(3) |
| 2004 |
Jan
(13) |
Feb
(159) |
Mar
(136) |
Apr
(33) |
May
(50) |
Jun
(42) |
Jul
(140) |
Aug
(42) |
Sep
(199) |
Oct
(31) |
Nov
(55) |
Dec
|
| 2005 |
Jan
|
Feb
(12) |
Mar
(214) |
Apr
(119) |
May
(21) |
Jun
(2) |
Jul
(127) |
Aug
(10) |
Sep
(3) |
Oct
(24) |
Nov
(1) |
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(45) |
May
(13) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(5) |
Nov
(26) |
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(35) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
|
From: Kenn H. <ke...@us...> - 2002-06-01 18:49:52
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/acpi/executer In directory usw-pr-cvs1:/tmp/cvs-serv4399/drivers/acpi/executer Added Files: .cvsignore Log Message: Added a bunch of .cvsignore files for new directories and fixed up a couple of existing ones --- NEW FILE --- *.a.flags *.o.flags .depend *.lst |
|
From: Kenn H. <ke...@us...> - 2002-06-01 18:49:51
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi/dpt In directory usw-pr-cvs1:/tmp/cvs-serv4399/drivers/scsi/dpt Added Files: .cvsignore Log Message: Added a bunch of .cvsignore files for new directories and fixed up a couple of existing ones --- NEW FILE --- *.a.flags *.o.flags .depend *.lst |
|
From: Kenn H. <ke...@us...> - 2002-06-01 18:49:51
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/acpi/ospm/include In directory usw-pr-cvs1:/tmp/cvs-serv4399/drivers/acpi/ospm/include Added Files: .cvsignore Log Message: Added a bunch of .cvsignore files for new directories and fixed up a couple of existing ones --- NEW FILE --- *.a.flags *.o.flags .depend *.lst |
|
From: Kenn H. <ke...@us...> - 2002-06-01 18:49:51
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/acpi/ospm/system In directory usw-pr-cvs1:/tmp/cvs-serv4399/drivers/acpi/ospm/system Added Files: .cvsignore Log Message: Added a bunch of .cvsignore files for new directories and fixed up a couple of existing ones --- NEW FILE --- *.a.flags *.o.flags .depend *.lst |
|
From: Kenn H. <ke...@us...> - 2002-06-01 18:49:51
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/acpi/ospm/busmgr In directory usw-pr-cvs1:/tmp/cvs-serv4399/drivers/acpi/ospm/busmgr Added Files: .cvsignore Log Message: Added a bunch of .cvsignore files for new directories and fixed up a couple of existing ones --- NEW FILE --- *.a.flags *.o.flags .depend *.lst |
|
From: Kenn H. <ke...@us...> - 2002-06-01 18:49:51
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/acpi/ospm/battery In directory usw-pr-cvs1:/tmp/cvs-serv4399/drivers/acpi/ospm/battery Added Files: .cvsignore Log Message: Added a bunch of .cvsignore files for new directories and fixed up a couple of existing ones --- NEW FILE --- *.a.flags *.o.flags .depend *.lst |
|
From: Kenn H. <ke...@us...> - 2002-06-01 18:49:50
|
Update of /cvsroot/linux-vax/kernel-2.5/fs/jffs2 In directory usw-pr-cvs1:/tmp/cvs-serv4399/fs/jffs2 Added Files: .cvsignore Log Message: Added a bunch of .cvsignore files for new directories and fixed up a couple of existing ones --- NEW FILE --- *.a.flags *.o.flags .depend *.lst |
|
From: Kenn H. <ke...@us...> - 2002-06-01 18:49:50
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/char/mwave In directory usw-pr-cvs1:/tmp/cvs-serv4399/drivers/char/mwave Added Files: .cvsignore Log Message: Added a bunch of .cvsignore files for new directories and fixed up a couple of existing ones --- NEW FILE --- *.a.flags *.o.flags .depend *.lst |
|
From: Kenn H. <ke...@us...> - 2002-06-01 18:49:50
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/acpi/ospm/button In directory usw-pr-cvs1:/tmp/cvs-serv4399/drivers/acpi/ospm/button Added Files: .cvsignore Log Message: Added a bunch of .cvsignore files for new directories and fixed up a couple of existing ones --- NEW FILE --- *.a.flags *.o.flags .depend *.lst |
|
From: Kenn H. <ke...@us...> - 2002-06-01 18:49:49
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/message/i2o In directory usw-pr-cvs1:/tmp/cvs-serv4399/drivers/message/i2o Added Files: .cvsignore Log Message: Added a bunch of .cvsignore files for new directories and fixed up a couple of existing ones --- NEW FILE --- *.a.flags *.o.flags .depend *.lst |
|
From: Kenn H. <ke...@us...> - 2002-06-01 18:49:49
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/net/wireless In directory usw-pr-cvs1:/tmp/cvs-serv4399/drivers/net/wireless Added Files: .cvsignore Log Message: Added a bunch of .cvsignore files for new directories and fixed up a couple of existing ones --- NEW FILE --- *.a.flags *.o.flags .depend *.lst |
|
From: Kenn H. <ke...@us...> - 2002-06-01 18:49:49
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/mtd/nand In directory usw-pr-cvs1:/tmp/cvs-serv4399/drivers/mtd/nand Added Files: .cvsignore Log Message: Added a bunch of .cvsignore files for new directories and fixed up a couple of existing ones --- NEW FILE --- *.a.flags *.o.flags .depend *.lst |
|
From: Kenn H. <ke...@us...> - 2002-06-01 18:49:49
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/acpi/kdb In directory usw-pr-cvs1:/tmp/cvs-serv4399/drivers/acpi/kdb Added Files: .cvsignore Log Message: Added a bunch of .cvsignore files for new directories and fixed up a couple of existing ones --- NEW FILE --- *.a.flags *.o.flags .depend *.lst |
|
From: Kenn H. <ke...@us...> - 2002-06-01 18:49:49
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/acpi/utilities In directory usw-pr-cvs1:/tmp/cvs-serv4399/drivers/acpi/utilities Added Files: .cvsignore Log Message: Added a bunch of .cvsignore files for new directories and fixed up a couple of existing ones --- NEW FILE --- *.a.flags *.o.flags .depend *.lst |
|
From: Kenn H. <ke...@us...> - 2002-06-01 18:49:48
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/acpi/ospm In directory usw-pr-cvs1:/tmp/cvs-serv4399/drivers/acpi/ospm Added Files: .cvsignore Log Message: Added a bunch of .cvsignore files for new directories and fixed up a couple of existing ones --- NEW FILE --- *.a.flags *.o.flags .depend *.lst |
|
From: Kenn H. <ke...@us...> - 2002-06-01 18:49:47
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/acpi/include/platform In directory usw-pr-cvs1:/tmp/cvs-serv4399/drivers/acpi/include/platform Added Files: .cvsignore Log Message: Added a bunch of .cvsignore files for new directories and fixed up a couple of existing ones --- NEW FILE --- *.a.flags *.o.flags .depend *.lst |
|
From: Kenn H. <ke...@us...> - 2002-05-31 01:58:44
|
Update of /cvsroot/linux-vax/kernel-2.5 In directory usw-pr-cvs1:/tmp/cvs-serv7433 Modified Files: Makefile Log Message: Merge with Linux 2.5.1. Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 20 May 2002 00:33:29 -0000 1.2 +++ Makefile 31 May 2002 01:58:38 -0000 1.3 @@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 5 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) @@ -260,8 +260,8 @@ boot: vmlinux @$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" -C arch/$(ARCH)/boot -vmlinux: include/linux/version.h $(CONFIGURATION) init/main.o init/version.o linuxsubdirs - $(LD) $(LINKFLAGS) $(HEAD) init/main.o init/version.o \ +vmlinux: include/linux/version.h $(CONFIGURATION) init/main.o init/version.o init/do_mounts.o linuxsubdirs + $(LD) $(LINKFLAGS) $(HEAD) init/main.o init/version.o init/do_mounts.o \ --start-group \ $(CORE_FILES) \ $(DRIVERS) \ @@ -340,7 +340,10 @@ # optimizes less when we use -g (even though -O1 is in CFLAGS). This isn't supposed # to happen... init/main.o: init/main.c include/config/MARKER - $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -c -o $*.o $< -Wa,-adnhls=$*.lst # -g + $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -c -o $*.o $< -Wa,-adnhls=$*.lst + +init/do_mounts.o: init/do_mounts.c include/config/MARKER + $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -c -o $*.o $< -Wa,-adnhls=$*.lst fs lib mm ipc kernel drivers net: dummy $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" $(subst $@, _dir_$@, $@) |
|
From: Kenn H. <ke...@us...> - 2002-05-31 01:58:44
|
Update of /cvsroot/linux-vax/kernel-2.5/init
In directory usw-pr-cvs1:/tmp/cvs-serv7433/init
Modified Files:
main.c
Log Message:
Merge with Linux 2.5.1.
Index: main.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/init/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- main.c 20 May 2002 00:33:39 -0000 1.2
+++ main.c 31 May 2002 01:58:39 -0000 1.3
@@ -31,6 +31,8 @@
#include <asm/io.h>
#include <asm/bugs.h>
+#include <linux/device.h>
+
#if defined(CONFIG_ARCH_S390)
#include <asm/s390mach.h>
#include <asm/ccwcache.h>
@@ -122,17 +124,10 @@
int rows, cols;
-#ifdef CONFIG_BLK_DEV_INITRD
-unsigned int real_root_dev; /* do_proc_dointvec cannot handle kdev_t */
-#endif
-
-int root_mountflags = MS_RDONLY;
char *execute_command;
-char root_device_name[64];
-
static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
-static char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
+char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
static int __init profile_setup(char *str)
{
@@ -143,175 +138,6 @@
__setup("profile=", profile_setup);
-
-static struct dev_name_struct {
- const char *name;
- const int num;
-} root_dev_names[] __initdata = {
- { "nfs", 0x00ff },
- { "hda", 0x0300 },
- { "hdb", 0x0340 },
- { "loop", 0x0700 },
- { "hdc", 0x1600 },
- { "hdd", 0x1640 },
- { "hde", 0x2100 },
- { "hdf", 0x2140 },
- { "hdg", 0x2200 },
- { "hdh", 0x2240 },
- { "hdi", 0x3800 },
- { "hdj", 0x3840 },
- { "hdk", 0x3900 },
- { "hdl", 0x3940 },
- { "hdm", 0x5800 },
- { "hdn", 0x5840 },
- { "hdo", 0x5900 },
- { "hdp", 0x5940 },
- { "hdq", 0x5A00 },
- { "hdr", 0x5A40 },
- { "hds", 0x5B00 },
- { "hdt", 0x5B40 },
- { "sda", 0x0800 },
- { "sdb", 0x0810 },
- { "sdc", 0x0820 },
- { "sdd", 0x0830 },
- { "sde", 0x0840 },
- { "sdf", 0x0850 },
- { "sdg", 0x0860 },
- { "sdh", 0x0870 },
- { "sdi", 0x0880 },
- { "sdj", 0x0890 },
- { "sdk", 0x08a0 },
- { "sdl", 0x08b0 },
- { "sdm", 0x08c0 },
- { "sdn", 0x08d0 },
- { "sdo", 0x08e0 },
- { "sdp", 0x08f0 },
- { "ada", 0x1c00 },
- { "adb", 0x1c10 },
- { "adc", 0x1c20 },
- { "add", 0x1c30 },
- { "ade", 0x1c40 },
- { "fd", 0x0200 },
- { "md", 0x0900 },
- { "xda", 0x0d00 },
- { "xdb", 0x0d40 },
- { "ram", 0x0100 },
- { "scd", 0x0b00 },
- { "mcd", 0x1700 },
- { "cdu535", 0x1800 },
- { "sonycd", 0x1800 },
- { "aztcd", 0x1d00 },
- { "cm206cd", 0x2000 },
- { "gscd", 0x1000 },
- { "sbpcd", 0x1900 },
- { "eda", 0x2400 },
- { "edb", 0x2440 },
- { "pda", 0x2d00 },
- { "pdb", 0x2d10 },
- { "pdc", 0x2d20 },
- { "pdd", 0x2d30 },
- { "pcd", 0x2e00 },
- { "pf", 0x2f00 },
- { "apblock", APBLOCK_MAJOR << 8},
- { "ddv", DDV_MAJOR << 8},
- { "jsfd", JSFD_MAJOR << 8},
-#if defined(CONFIG_ARCH_S390)
- { "dasda", (DASD_MAJOR << MINORBITS) },
- { "dasdb", (DASD_MAJOR << MINORBITS) + (1 << 2) },
- { "dasdc", (DASD_MAJOR << MINORBITS) + (2 << 2) },
- { "dasdd", (DASD_MAJOR << MINORBITS) + (3 << 2) },
- { "dasde", (DASD_MAJOR << MINORBITS) + (4 << 2) },
- { "dasdf", (DASD_MAJOR << MINORBITS) + (5 << 2) },
- { "dasdg", (DASD_MAJOR << MINORBITS) + (6 << 2) },
- { "dasdh", (DASD_MAJOR << MINORBITS) + (7 << 2) },
-#endif
-#if defined(CONFIG_BLK_CPQ_DA) || defined(CONFIG_BLK_CPQ_DA_MODULE)
- { "ida/c0d0p",0x4800 },
- { "ida/c0d1p",0x4810 },
- { "ida/c0d2p",0x4820 },
- { "ida/c0d3p",0x4830 },
- { "ida/c0d4p",0x4840 },
- { "ida/c0d5p",0x4850 },
- { "ida/c0d6p",0x4860 },
- { "ida/c0d7p",0x4870 },
- { "ida/c0d8p",0x4880 },
- { "ida/c0d9p",0x4890 },
- { "ida/c0d10p",0x48A0 },
- { "ida/c0d11p",0x48B0 },
- { "ida/c0d12p",0x48C0 },
- { "ida/c0d13p",0x48D0 },
- { "ida/c0d14p",0x48E0 },
- { "ida/c0d15p",0x48F0 },
-#endif
-#if defined(CONFIG_BLK_CPQ_CISS_DA) || defined(CONFIG_BLK_CPQ_CISS_DA_MODULE)
- { "cciss/c0d0p",0x6800 },
- { "cciss/c0d1p",0x6810 },
- { "cciss/c0d2p",0x6820 },
- { "cciss/c0d3p",0x6830 },
- { "cciss/c0d4p",0x6840 },
- { "cciss/c0d5p",0x6850 },
- { "cciss/c0d6p",0x6860 },
- { "cciss/c0d7p",0x6870 },
- { "cciss/c0d8p",0x6880 },
- { "cciss/c0d9p",0x6890 },
- { "cciss/c0d10p",0x68A0 },
- { "cciss/c0d11p",0x68B0 },
- { "cciss/c0d12p",0x68C0 },
- { "cciss/c0d13p",0x68D0 },
- { "cciss/c0d14p",0x68E0 },
- { "cciss/c0d15p",0x68F0 },
-#endif
- { "nftla", 0x5d00 },
- { "nftlb", 0x5d10 },
- { "nftlc", 0x5d20 },
- { "nftld", 0x5d30 },
- { "ftla", 0x2c00 },
- { "ftlb", 0x2c08 },
- { "ftlc", 0x2c10 },
- { "ftld", 0x2c18 },
- { "mtdblock", 0x1f00 },
- { NULL, 0 }
-};
-
-kdev_t __init name_to_kdev_t(char *line)
-{
- int base = 0;
-
- if (strncmp(line,"/dev/",5) == 0) {
- struct dev_name_struct *dev = root_dev_names;
- line += 5;
- do {
- int len = strlen(dev->name);
- if (strncmp(line,dev->name,len) == 0) {
- line += len;
- base = dev->num;
- break;
- }
- dev++;
- } while (dev->name);
- }
- return to_kdev_t(base + simple_strtoul(line,NULL,base?10:16));
-}
-
-static int __init root_dev_setup(char *line)
-{
- int i;
- char ch;
-
- ROOT_DEV = name_to_kdev_t(line);
- memset (root_device_name, 0, sizeof root_device_name);
- if (strncmp (line, "/dev/", 5) == 0) line += 5;
- for (i = 0; i < sizeof root_device_name - 1; ++i)
- {
- ch = line[i];
- if ( isspace (ch) || (ch == ',') || (ch == '\0') ) break;
- root_device_name[i] = ch;
- }
- return 1;
-}
-
-__setup("root=", root_dev_setup);
-
static int __init checksetup(char *line)
{
struct kernel_param *p;
@@ -378,22 +204,6 @@
(loops_per_jiffy/(5000/HZ)) % 100);
}
-static int __init readonly(char *str)
-{
- if (*str)
- return 0;
- root_mountflags |= MS_RDONLY;
- return 1;
-}
-
-static int __init readwrite(char *str)
-{
- if (*str)
- return 0;
- root_mountflags &= ~MS_RDONLY;
- return 1;
-}
-
static int __init debug_kernel(char *str)
{
if (*str)
@@ -410,8 +220,6 @@
return 1;
}
-__setup("ro", readonly);
-__setup("rw", readwrite);
__setup("debug", debug_kernel);
__setup("quiet", quiet_kernel);
@@ -595,6 +403,9 @@
#endif
mem_init();
kmem_cache_sizes_init();
+#if defined(CONFIG_X86_PAE)
+ pgtable_cache_init();
+#endif
mempages = num_physpages;
fork_init(mempages);
@@ -624,21 +435,6 @@
rest_init();
}
-#ifdef CONFIG_BLK_DEV_INITRD
-static int do_linuxrc(void * shell)
-{
- static char *argv[] = { "linuxrc", NULL, };
-
- close(0);close(1);close(2);
- setsid();
- (void) open("/dev/console",O_RDWR,0);
- (void) dup(0);
- (void) dup(0);
- return execve(shell, argv, envp_init);
-}
-
-#endif
-
struct task_struct *child_reaper = &init_task;
static void __init do_initcalls(void)
@@ -696,6 +492,9 @@
s390_init_machine_check();
#endif
+ /* bring up the device tree */
+ device_driver_init();
+
#ifdef CONFIG_PCI
pci_init();
#endif
@@ -744,61 +543,7 @@
#endif
}
-extern void rd_load(void);
-extern void initrd_load(void);
-
-/*
- * Prepare the namespace - decide what/where to mount, load ramdisks, etc.
- */
-static void prepare_namespace(void)
-{
-#ifdef CONFIG_BLK_DEV_INITRD
- int real_root_mountflags = root_mountflags;
- if (!initrd_start)
- mount_initrd = 0;
- if (mount_initrd)
- root_mountflags &= ~MS_RDONLY;
- real_root_dev = ROOT_DEV;
-#endif
-
-#ifdef CONFIG_BLK_DEV_RAM
-#ifdef CONFIG_BLK_DEV_INITRD
- if (mount_initrd)
- initrd_load();
- else
-#endif
- rd_load();
-#endif
-
- /* Mount the root filesystem.. */
- mount_root();
-
- mount_devfs_fs ();
-
-#ifdef CONFIG_BLK_DEV_INITRD
- root_mountflags = real_root_mountflags;
- if (mount_initrd && ROOT_DEV != real_root_dev
- && MAJOR(ROOT_DEV) == RAMDISK_MAJOR && MINOR(ROOT_DEV) == 0) {
- int error;
- int i, pid;
-
- pid = kernel_thread(do_linuxrc, "/linuxrc", SIGCHLD);
- if (pid > 0) {
- while (pid != wait(&i)) {
- current->policy |= SCHED_YIELD;
- schedule();
- }
- }
- if (MAJOR(real_root_dev) != RAMDISK_MAJOR
- || MINOR(real_root_dev) != 0) {
- error = change_root(real_root_dev,"/initrd");
- if (error)
- printk(KERN_ERR "Change root to /initrd: "
- "error %d\n",error);
- }
- }
-#endif
-}
+extern void prepare_namespace(void);
static int init(void * unused)
{
|
|
From: Kenn H. <ke...@us...> - 2002-05-31 01:58:44
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/net In directory usw-pr-cvs1:/tmp/cvs-serv7433/drivers/net Modified Files: Makefile Log Message: Merge with Linux 2.5.1. Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 20 May 2002 00:33:36 -0000 1.2 +++ Makefile 31 May 2002 01:58:38 -0000 1.3 @@ -174,6 +174,7 @@ obj-$(CONFIG_EWRK3) += ewrk3.o obj-$(CONFIG_ATP) += atp.o obj-$(CONFIG_DE4X5) += de4x5.o +obj-$(CONFIG_DE2104X) += de2104x.o obj-$(CONFIG_NI5010) += ni5010.o obj-$(CONFIG_NI52) += ni52.o obj-$(CONFIG_NI65) += ni65.o |
|
From: Kenn H. <ke...@us...> - 2002-05-31 01:58:44
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi
In directory usw-pr-cvs1:/tmp/cvs-serv7433/drivers/scsi
Modified Files:
Makefile scsi_ioctl.c scsi_merge.c
Log Message:
Merge with Linux 2.5.1.
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 20 May 2002 00:33:36 -0000 1.2
+++ Makefile 31 May 2002 01:58:39 -0000 1.3
@@ -135,9 +135,10 @@
list-multi := scsi_mod.o sd_mod.o sr_mod.o initio.o a100u2w.o cpqfc.o
scsi_mod-objs := scsi.o hosts.o scsi_ioctl.o constants.o \
scsicam.o scsi_proc.o scsi_error.o \
- scsi_obsolete.o scsi_queue.o scsi_lib.o \
+ scsi_queue.o scsi_lib.o \
scsi_merge.o scsi_dma.o scsi_scan.o \
scsi_syms.o
+
sd_mod-objs := sd.o
sr_mod-objs := sr.o sr_ioctl.o sr_vendor.o
initio-objs := ini9100u.o i91uscsi.o
Index: scsi_ioctl.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_ioctl.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scsi_ioctl.c 20 May 2002 00:33:36 -0000 1.2
+++ scsi_ioctl.c 31 May 2002 01:58:39 -0000 1.3
@@ -78,8 +78,7 @@
* *(char *) ((int *) arg)[2] the actual command byte.
*
* Note that if more than MAX_BUF bytes are requested to be transferred,
- * the ioctl will fail with error EINVAL. MAX_BUF can be increased in
- * the future by increasing the size that scsi_malloc will accept.
+ * the ioctl will fail with error EINVAL.
*
* This size *does not* include the initial lengths that were passed.
*
@@ -197,10 +196,14 @@
unsigned int inlen, outlen, cmdlen;
unsigned int needed, buf_needed;
int timeout, retries, result;
- int data_direction;
+ int data_direction, gfp_mask = GFP_KERNEL;
if (!sic)
return -EINVAL;
+
+ if (dev->host->unchecked_isa_dma)
+ gfp_mask |= GFP_DMA;
+
/*
* Verify that we can read at least this much.
*/
@@ -232,7 +235,7 @@
buf_needed = (buf_needed + 511) & ~511;
if (buf_needed > MAX_BUF)
buf_needed = MAX_BUF;
- buf = (char *) scsi_malloc(buf_needed);
+ buf = (char *) kmalloc(buf_needed, gfp_mask);
if (!buf)
return -ENOMEM;
memset(buf, 0, buf_needed);
@@ -341,7 +344,7 @@
error:
if (buf)
- scsi_free(buf, buf_needed);
+ kfree(buf);
return result;
Index: scsi_merge.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_merge.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- scsi_merge.c 30 May 2002 23:46:02 -0000 1.1.1.2
+++ scsi_merge.c 31 May 2002 01:58:39 -0000 1.2
@@ -135,6 +135,7 @@
*/
bounce_limit = BLK_BOUNCE_HIGH;
if (SHpnt->highmem_io && (SDpnt->type == TYPE_DISK)) {
+#if CONFIG_PCI
if (!PCI_DMA_BUS_IS_PHYS)
/* Platforms with virtual-DMA translation
* hardware have no practical limit.
@@ -142,6 +143,7 @@
bounce_limit = BLK_BOUNCE_ANY;
else
bounce_limit = SHpnt->pci_dev->dma_mask;
+#endif
}
if (SHpnt->unchecked_isa_dma)
bounce_limit = BLK_BOUNCE_ISA;
|
|
From: Kenn H. <ke...@us...> - 2002-05-31 01:58:44
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax/mm In directory usw-pr-cvs1:/tmp/cvs-serv7433/include/asm-vax/mm Modified Files: virtmap.h Log Message: Merge with Linux 2.5.1. Index: virtmap.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/mm/virtmap.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- virtmap.h 20 May 2002 00:33:39 -0000 1.3 +++ virtmap.h 31 May 2002 01:58:39 -0000 1.4 @@ -43,5 +43,7 @@ #define virt_to_bus virt_to_phys #define bus_to_virt phys_to_virt +/* Needed for BIO layer. Convert a struct page * to a physical address */ +#define page_to_phys(page) (((page) - mem_map) << PAGE_SHIFT) #endif /* _VAX_ASM_VIRT_H */ |
|
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>
|
|
From: Kenn H. <ke...@us...> - 2002-05-31 01:58:44
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory usw-pr-cvs1:/tmp/cvs-serv7433/include/asm-vax
Modified Files:
processor.h
Log Message:
Merge with Linux 2.5.1.
Index: processor.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/processor.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- processor.h 20 May 2002 00:33:39 -0000 1.3
+++ processor.h 31 May 2002 01:58:39 -0000 1.4
@@ -53,22 +53,6 @@
/* At present only the pcb is here. */
#define INIT_THREAD { INIT_PCB }
-/* FIXME: tune this to the VAX memory map */
-
-/* This was what Andy had. I don't understand this stuff yet,
- * but I'm going to replace it with something similar to the
- * i386 version, just to get stuff to compile. We'll fix
- * it later. KPH 2000-04-25
- *
- * #define INIT_MMAP { &init_mm, PAGE_OFFSET, PAGE_OFFSET+0x10000000, \
- * PAGE_SHARED, VM_READ | VM_WRITE | VM_EXEC, NULL, &init_mm.mmap }
-*/
-#define INIT_MMAP { &init_mm, PAGE_OFFSET, PAGE_OFFSET+0x10000000, NULL, \
- PAGE_SHARED, VM_READ | VM_WRITE | VM_EXEC, 1, NULL, NULL }
-/*#define INIT_MMAP { &init_mm, 0, 0x10000000, NULL, \
- PAGE_SHARED, VM_READ | VM_WRITE | VM_EXEC, 1, NULL, NULL }*/
-
-
#include <asm/ptrace.h>
/* go with the flow here. Everyone else defines
|
|
From: Kenn H. <ke...@us...> - 2002-05-31 01:58:44
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/mm
In directory usw-pr-cvs1:/tmp/cvs-serv7433/arch/vax/mm
Modified Files:
init.c pgalloc.c
Log Message:
Merge with Linux 2.5.1.
Index: init.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/mm/init.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- init.c 20 May 2002 00:33:34 -0000 1.4
+++ init.c 31 May 2002 01:58:38 -0000 1.5
@@ -53,7 +53,7 @@
pg0 = (pte_t *)SPT_BASE;
/* set up pmd */
- swapper_pg_dir[2].pmd = (unsigned int)swapper_pm_dir;
+ swapper_pg_dir[2].pmd = swapper_pm_dir;
/* FIXME: This is where the VMALLOC stuff from head.S should go */
Index: pgalloc.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/mm/pgalloc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pgalloc.c 20 May 2002 00:33:34 -0000 1.4
+++ pgalloc.c 31 May 2002 01:58:38 -0000 1.5
@@ -156,7 +156,7 @@
remap_and_clear_pte_page(s0addr, (pte_t *)pmd);
/* this is the pointer to our pmd table. */
- pgd->pmd=(unsigned long)s0addr;
+ pgd->pmd=s0addr;
/* this is a two page block of memory */
s0addr += (PAGE_SIZE/sizeof(pmd_t));
@@ -329,7 +329,7 @@
/* decide on the segment we are in */
pgd_segment=0;
- while ((pgdp[pgd_segment].pmd != (unsigned long)pmd_basep)&&(pgd_segment<4)) {
+ while ((pgdp[pgd_segment].pmd != pmd_basep)&&(pgd_segment<4)) {
pgd_segment++;
}
|
|
From: Kenn H. <ke...@us...> - 2002-05-31 01:58:43
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax In directory usw-pr-cvs1:/tmp/cvs-serv7433/arch/vax Modified Files: Makefile Log Message: Merge with Linux 2.5.1. Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 27 May 2002 19:58:11 -0000 1.4 +++ Makefile 31 May 2002 01:58:38 -0000 1.5 @@ -117,7 +117,7 @@ $(MAKE) -C arch/vax/mm $(MAKE) -C arch/vax/kernel $(MAKE) -C arch/vax/boot - $(LD) $(LINKFLAGS) $(HEAD) init/main.o init/version.o \ + $(LD) $(LINKFLAGS) $(HEAD) init/main.o init/do_mounts.o init/version.o \ --start-group \ $(CORE_FILES) \ $(DRIVERS) \ |
