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-06 00:12:30
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers In directory usw-pr-cvs1:/tmp/cvs-serv18183/drivers Modified Files: Makefile Log Message: Merge with Linus' 2.5.3 release Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 20 May 2002 00:33:34 -0000 1.2 +++ Makefile 6 Jun 2002 00:12:24 -0000 1.3 @@ -10,7 +10,7 @@ message/i2o message/fusion scsi md ieee1394 pnp isdn atm \ fc4 net/hamradio i2c acpi bluetooth -subdir-y := parport char block net sound misc media cdrom hotplug +subdir-y := base parport char block net sound misc media cdrom hotplug subdir-m := $(subdir-y) |
|
From: Kenn H. <ke...@us...> - 2002-06-06 00:12:30
|
Update of /cvsroot/linux-vax/kernel-2.5/init
In directory usw-pr-cvs1:/tmp/cvs-serv18183/init
Modified Files:
main.c
Log Message:
Merge with Linus' 2.5.3 release
Index: main.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/init/main.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- main.c 5 Jun 2002 21:55:04 -0000 1.4
+++ main.c 6 Jun 2002 00:12:24 -0000 1.5
@@ -38,35 +38,10 @@
#include <asm/ccwcache.h>
#endif
-#ifdef CONFIG_PCI
-#include <linux/pci.h>
-#endif
-
-#ifdef CONFIG_DIO
-#include <linux/dio.h>
-#endif
-
-#ifdef CONFIG_ZORRO
-#include <linux/zorro.h>
-#endif
-
#ifdef CONFIG_MTRR
# include <asm/mtrr.h>
#endif
-#ifdef CONFIG_NUBUS
-#include <linux/nubus.h>
-#endif
-
-#ifdef CONFIG_ISAPNP
-#include <linux/isapnp.h>
-#endif
-
-#ifdef CONFIG_IRDA
-extern int irda_proto_init(void);
-extern int irda_device_init(void);
-#endif
-
#ifdef CONFIG_X86_LOCAL_APIC
#include <asm/smp.h>
#endif
@@ -92,10 +67,8 @@
extern void fork_init(unsigned long);
extern void mca_init(void);
extern void sbus_init(void);
-extern void ppc_init(void);
extern void sysctl_init(void);
extern void signals_init(void);
-extern int init_pcmcia_ds(void);
extern void free_initmem(void);
@@ -107,8 +80,6 @@
extern void vax_dev_init(void);
#endif
-extern void ecard_init(void);
-
#if defined(CONFIG_SYSVIPC)
extern void ipc_init(void);
#endif
@@ -294,8 +265,6 @@
extern void setup_arch(char **);
extern void cpu_idle(void);
-unsigned long wait_init_idle;
-
#ifndef CONFIG_SMP
#ifdef CONFIG_X86_LOCAL_APIC
@@ -309,13 +278,11 @@
#else
-
/* Called by boot processor to activate the rest. */
static void __init smp_init(void)
{
/* Get other processors into their bootup holding patterns. */
smp_boot_cpus();
- wait_init_idle = cpu_online_map;
smp_threads_ready=1;
smp_commence();
@@ -416,6 +383,7 @@
check_bugs();
printk("POSIX conformance testing by UNIFIX\n");
+ init_idle(current, smp_processor_id());
/*
* We count on the initial thread going ok
* Like idlers init is an unlocked kernel thread, which will
@@ -423,14 +391,6 @@
*/
smp_init();
- /*
- * Finally, we wait for all other CPU's, and initialize this
- * thread that will become the idle thread for the boot CPU.
- * After this, the scheduler is fully initialized, and we can
- * start creating and running new threads.
- */
- init_idle();
-
/* Do the rest non-__init'ed, we're now alive */
rest_init();
}
@@ -495,52 +455,11 @@
/* bring up the device tree */
device_driver_init();
-#ifdef CONFIG_PCI
- pci_init();
-#endif
-#ifdef CONFIG_SBUS
- sbus_init();
-#endif
-#if defined(CONFIG_PPC)
- ppc_init();
-#endif
-#ifdef CONFIG_MCA
- mca_init();
-#endif
-#ifdef CONFIG_ARCH_ACORN
- ecard_init();
-#endif
-#ifdef CONFIG_ZORRO
- zorro_init();
-#endif
-#ifdef CONFIG_DIO
- dio_init();
-#endif
-#ifdef CONFIG_NUBUS
- nubus_init();
-#endif
-#ifdef CONFIG_ISAPNP
- isapnp_init();
-#endif
-#ifdef CONFIG_TC
- tc_init();
-#endif
-#ifdef CONFIG_VAX
- vax_dev_init();
-#endif
/* Networking initialization needs a process context */
sock_init();
start_context_thread();
do_initcalls();
-
-#ifdef CONFIG_IRDA
- irda_proto_init();
- irda_device_init(); /* Must be done after protocol initialization */
-#endif
-#ifdef CONFIG_PCMCIA
- init_pcmcia_ds(); /* Do this last */
-#endif
}
extern void prepare_namespace(void);
|
|
From: Kenn H. <ke...@us...> - 2002-06-06 00:12:30
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax
In directory usw-pr-cvs1:/tmp/cvs-serv18183/arch/vax
Modified Files:
460.config ka650.config m76.config vmlinux.lds
Log Message:
Merge with Linus' 2.5.3 release
Index: 460.config
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/460.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 460.config 5 Jun 2002 21:55:03 -0000 1.4
+++ 460.config 6 Jun 2002 00:12:24 -0000 1.5
@@ -77,7 +77,7 @@
#
CONFIG_PACKET=y
# CONFIG_PACKET_MMAP is not set
-# CONFIG_NETLINK is not set
+CONFIG_NETLINK_DEV=y
# CONFIG_NETFILTER is not set
# CONFIG_FILTER is not set
CONFIG_UNIX=y
@@ -90,6 +90,7 @@
# CONFIG_IP_PNP_RARP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
# CONFIG_IPV6 is not set
@@ -230,7 +231,6 @@
# CONFIG_NCPFS_NLS is not set
# CONFIG_NCPFS_EXTRAS is not set
# CONFIG_ZISOFS_FS is not set
-# CONFIG_ZLIB_FS_INFLATE is not set
#
# Partition Types
@@ -317,3 +317,5 @@
# Library routines
#
CONFIG_CRC32=y
+# CONFIG_ZLIB_INFLATE is not set
+# CONFIG_ZLIB_DEFLATE is not set
Index: ka650.config
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/ka650.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ka650.config 5 Jun 2002 21:56:22 -0000 1.1
+++ ka650.config 6 Jun 2002 00:12:24 -0000 1.2
@@ -75,7 +75,7 @@
# Networking options
#
# CONFIG_PACKET is not set
-# CONFIG_NETLINK is not set
+CONFIG_NETLINK_DEV=y
# CONFIG_NETFILTER is not set
# CONFIG_FILTER is not set
CONFIG_UNIX=y
@@ -88,6 +88,7 @@
# CONFIG_IP_PNP_RARP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
# CONFIG_IPV6 is not set
@@ -199,7 +200,6 @@
# CONFIG_NCPFS_NLS is not set
# CONFIG_NCPFS_EXTRAS is not set
# CONFIG_ZISOFS_FS is not set
-# CONFIG_ZLIB_FS_INFLATE is not set
#
# Partition Types
@@ -286,3 +286,5 @@
# Library routines
#
CONFIG_CRC32=y
+# CONFIG_ZLIB_INFLATE is not set
+# CONFIG_ZLIB_DEFLATE is not set
Index: m76.config
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/m76.config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- m76.config 20 May 2002 00:33:33 -0000 1.3
+++ m76.config 6 Jun 2002 00:12:24 -0000 1.4
@@ -3,6 +3,8 @@
#
CONFIG_VAX=y
CONFIG_UID16=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
#
# Code maturity level options
@@ -26,6 +28,7 @@
CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_AOUT is not set
CONFIG_ELF_KERNEL=y
+CONFIG_KCORE_ELF=y
# CONFIG_EXTRA_ELF_COMPILER is not set
CONFIG_NET=y
CONFIG_SYSVIPC=y
@@ -61,6 +64,7 @@
# CONFIG_PARIDE is not set
# CONFIG_BLK_CPQ_DA is not set
# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_CISS_SCSI_TAPE is not set
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_LOOP is not set
# CONFIG_BLK_DEV_NBD is not set
@@ -73,7 +77,7 @@
#
CONFIG_PACKET=y
# CONFIG_PACKET_MMAP is not set
-# CONFIG_NETLINK is not set
+CONFIG_NETLINK_DEV=y
# CONFIG_NETFILTER is not set
# CONFIG_FILTER is not set
CONFIG_UNIX=y
@@ -81,15 +85,18 @@
# CONFIG_IP_MULTICAST is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
CONFIG_IP_PNP_BOOTP=y
# CONFIG_IP_PNP_RARP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
# CONFIG_IPV6 is not set
# CONFIG_KHTTPD is not set
# CONFIG_ATM is not set
+# CONFIG_VLAN_8021Q is not set
#
#
@@ -135,6 +142,7 @@
# SCSI low-level drivers
#
CONFIG_SCSI_VAX_5380=y
+# CONFIG_SCSI_VAX_53C94 is not set
#
# Network device support
@@ -158,31 +166,45 @@
# CONFIG_AUTOFS4_FS is not set
CONFIG_REISERFS_FS=y
# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
# CONFIG_ADFS_FS is not set
+# CONFIG_ADFS_FS_RW is not set
# CONFIG_AFFS_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_BFS_FS is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_JBD is not set
+# CONFIG_JBD_DEBUG is not set
CONFIG_FAT_FS=y
CONFIG_MSDOS_FS=y
# CONFIG_UMSDOS_FS is not set
CONFIG_VFAT_FS=y
# CONFIG_EFS_FS is not set
# CONFIG_JFFS_FS is not set
+# CONFIG_JFFS2_FS is not set
# CONFIG_CRAMFS is not set
-# CONFIG_RAMFS is not set
+# CONFIG_TMPFS is not set
+CONFIG_RAMFS=y
CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y
+# CONFIG_ZISOFS is not set
# CONFIG_MINIX_FS is not set
+# CONFIG_VXFS_FS is not set
# CONFIG_NTFS_FS is not set
+# CONFIG_NTFS_RW is not set
# CONFIG_HPFS_FS is not set
CONFIG_PROC_FS=y
# CONFIG_DEVFS_FS is not set
+# CONFIG_DEVFS_MOUNT is not set
+# CONFIG_DEVFS_DEBUG is not set
CONFIG_DEVPTS_FS=y
# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX4FS_RW is not set
# CONFIG_ROMFS_FS is not set
CONFIG_EXT2_FS=y
# CONFIG_SYSV_FS is not set
# CONFIG_UDF_FS is not set
+# CONFIG_UDF_RW is not set
CONFIG_UFS_FS=y
# CONFIG_UFS_FS_WRITE is not set
@@ -190,14 +212,25 @@
# Network File Systems
#
# CONFIG_CODA_FS is not set
+# CONFIG_INTERMEZZO_FS is not set
CONFIG_NFS_FS=y
# CONFIG_NFS_V3 is not set
CONFIG_ROOT_NFS=y
# CONFIG_NFSD is not set
+# CONFIG_NFSD_V3 is not set
CONFIG_SUNRPC=y
CONFIG_LOCKD=y
# CONFIG_SMB_FS is not set
# CONFIG_NCP_FS is not set
+# CONFIG_NCPFS_PACKET_SIGNING is not set
+# CONFIG_NCPFS_IOCTL_LOCKING is not set
+# CONFIG_NCPFS_STRONG is not set
+# CONFIG_NCPFS_NFS_NS is not set
+# CONFIG_NCPFS_OS2_NS is not set
+# CONFIG_NCPFS_SMALLDOS is not set
+# CONFIG_NCPFS_NLS is not set
+# CONFIG_NCPFS_EXTRAS is not set
+# CONFIG_ZISOFS_FS is not set
#
# Partition Types
@@ -213,6 +246,7 @@
# CONFIG_MINIX_SUBPARTITION is not set
# CONFIG_SOLARIS_X86_PARTITION is not set
# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
# CONFIG_SGI_PARTITION is not set
CONFIG_ULTRIX_PARTITION=y
# CONFIG_SUN_PARTITION is not set
@@ -238,11 +272,13 @@
# CONFIG_NLS_CODEPAGE_865 is not set
# CONFIG_NLS_CODEPAGE_866 is not set
# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
# CONFIG_NLS_ISO8859_1 is not set
# CONFIG_NLS_ISO8859_2 is not set
# CONFIG_NLS_ISO8859_3 is not set
@@ -250,11 +286,12 @@
# CONFIG_NLS_ISO8859_5 is not set
# CONFIG_NLS_ISO8859_6 is not set
# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_8 is not set
# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
# CONFIG_NLS_ISO8859_14 is not set
# CONFIG_NLS_ISO8859_15 is not set
# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
# CONFIG_NLS_UTF8 is not set
#
@@ -267,6 +304,7 @@
CONFIG_SERIAL_CONSOLE=y
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
+# CONFIG_RTC is not set
#
# Kernel hacking
@@ -274,3 +312,10 @@
CONFIG_MAGIC_SYSRQ=y
CONFIG_PROFILE=y
CONFIG_PROFILE_SHIFT=2
+
+#
+# Library routines
+#
+CONFIG_CRC32=y
+# CONFIG_ZLIB_INFLATE is not set
+# CONFIG_ZLIB_DEFLATE is not set
Index: vmlinux.lds
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/vmlinux.lds,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vmlinux.lds 20 May 2002 00:33:33 -0000 1.3
+++ vmlinux.lds 6 Jun 2002 00:12:24 -0000 1.4
@@ -57,7 +57,15 @@
.setup.init : { *(.setup.init) }
__setup_end = .;
__initcall_start = .;
- .initcall.init : { *(.initcall.init) }
+ .initcall.init : {
+ *(.initcall1.init)
+ *(.initcall2.init)
+ *(.initcall3.init)
+ *(.initcall4.init)
+ *(.initcall5.init)
+ *(.initcall6.init)
+ *(.initcall7.init)
+ }
__initcall_end = .;
. = ALIGN(4096);
__init_end = .;
|
|
From: Kenn H. <ke...@us...> - 2002-06-06 00:12:29
|
Update of /cvsroot/linux-vax/kernel-2.5/net/core
In directory usw-pr-cvs1:/tmp/cvs-serv18183/net/core
Modified Files:
Makefile datagram.c dev.c neighbour.c rtnetlink.c scm.c
skbuff.c sock.c
Log Message:
Merge with Linus' 2.5.3 release
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/net/core/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 24 May 2002 00:06:03 -0000 1.3
+++ Makefile 6 Jun 2002 00:12:24 -0000 1.4
@@ -26,5 +26,8 @@
obj-$(CONFIG_NETFILTER) += netfilter.o
obj-$(CONFIG_NET_DIVERT) += dv.o
obj-$(CONFIG_NET_PROFILE) += profile.o
+obj-$(CONFIG_NET_RADIO) += wireless.o
+# Ugly. I wish all wireless drivers were moved in drivers/net/wireless
+obj-$(CONFIG_NET_PCMCIA_RADIO) += wireless.o
include $(TOPDIR)/Rules.make
Index: datagram.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/net/core/datagram.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- datagram.c 24 May 2002 00:06:05 -0000 1.3
+++ datagram.c 6 Jun 2002 00:12:24 -0000 1.4
@@ -30,21 +30,18 @@
#include <asm/system.h>
#include <linux/mm.h>
#include <linux/interrupt.h>
-#include <linux/in.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/inet.h>
#include <linux/netdevice.h>
+#include <linux/rtnetlink.h>
#include <linux/poll.h>
#include <linux/highmem.h>
-#include <net/ip.h>
#include <net/protocol.h>
-#include <net/route.h>
-#include <net/tcp.h>
-#include <net/udp.h>
#include <linux/skbuff.h>
#include <net/sock.h>
+#include <net/checksum.h>
/*
Index: dev.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/net/core/dev.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dev.c 24 May 2002 00:06:05 -0000 1.3
+++ dev.c 6 Jun 2002 00:12:24 -0000 1.4
@@ -102,6 +102,7 @@
#include <linux/module.h>
#if defined(CONFIG_NET_RADIO) || defined(CONFIG_NET_PCMCIA_RADIO)
#include <linux/wireless.h> /* Note : will define WIRELESS_EXT */
+#include <net/iw_handler.h>
#endif /* CONFIG_NET_RADIO || CONFIG_NET_PCMCIA_RADIO */
#ifdef CONFIG_PLIP
extern int plip_init(void);
@@ -238,7 +239,7 @@
#ifdef CONFIG_NET_FASTROUTE
/* Hack to detect packet socket */
- if (pt->data) {
+ if ((pt->data) && ((int)(pt->data)!=1)) {
netdev_fastroute_obstacles++;
dev_clear_fastroute(pt->dev);
}
@@ -875,7 +876,7 @@
void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
{
struct packet_type *ptype;
- get_fast_time(&skb->stamp);
+ do_gettimeofday(&skb->stamp);
br_read_lock(BR_NETPROTO_LOCK);
for (ptype = ptype_all; ptype!=NULL; ptype = ptype->next)
@@ -1218,7 +1219,7 @@
unsigned long flags;
if (skb->stamp.tv_sec == 0)
- get_fast_time(&skb->stamp);
+ do_gettimeofday(&skb->stamp);
/* The code is rearranged so that the path is the most
short when CPU is congested, but is still operating.
@@ -1796,122 +1797,6 @@
#endif /* CONFIG_PROC_FS */
-#ifdef WIRELESS_EXT
-#ifdef CONFIG_PROC_FS
-
-/*
- * Print one entry of /proc/net/wireless
- * This is a clone of /proc/net/dev (just above)
- */
-static int sprintf_wireless_stats(char *buffer, struct net_device *dev)
-{
- /* Get stats from the driver */
- struct iw_statistics *stats = (dev->get_wireless_stats ?
- dev->get_wireless_stats(dev) :
- (struct iw_statistics *) NULL);
- int size;
-
- if (stats != (struct iw_statistics *) NULL) {
- size = sprintf(buffer,
- "%6s: %04x %3d%c %3d%c %3d%c %6d %6d %6d %6d %6d %6d\n",
- dev->name,
- stats->status,
- stats->qual.qual,
- stats->qual.updated & 1 ? '.' : ' ',
- stats->qual.level,
- stats->qual.updated & 2 ? '.' : ' ',
- stats->qual.noise,
- stats->qual.updated & 4 ? '.' : ' ',
- stats->discard.nwid,
- stats->discard.code,
- stats->discard.fragment,
- stats->discard.retries,
- stats->discard.misc,
- stats->miss.beacon);
- stats->qual.updated = 0;
- }
- else
- size = 0;
-
- return size;
-}
-
-/*
- * Print info for /proc/net/wireless (print all entries)
- * This is a clone of /proc/net/dev (just above)
- */
-static int dev_get_wireless_info(char * buffer, char **start, off_t offset,
- int length)
-{
- int len = 0;
- off_t begin = 0;
- off_t pos = 0;
- int size;
-
- struct net_device * dev;
-
- size = sprintf(buffer,
- "Inter-| sta-| Quality | Discarded packets | Missed\n"
- " face | tus | link level noise | nwid crypt frag retry misc | beacon\n"
- );
-
- pos += size;
- len += size;
-
- read_lock(&dev_base_lock);
- for (dev = dev_base; dev != NULL; dev = dev->next) {
- size = sprintf_wireless_stats(buffer + len, dev);
- len += size;
- pos = begin + len;
-
- if (pos < offset) {
- len = 0;
- begin = pos;
- }
- if (pos > offset + length)
- break;
- }
- read_unlock(&dev_base_lock);
-
- *start = buffer + (offset - begin); /* Start of wanted data */
- len -= (offset - begin); /* Start slop */
- if (len > length)
- len = length; /* Ending slop */
- if (len < 0)
- len = 0;
-
- return len;
-}
-#endif /* CONFIG_PROC_FS */
-
-/*
- * Allow programatic access to /proc/net/wireless even if /proc
- * doesn't exist... Also more efficient...
- */
-static inline int dev_iwstats(struct net_device *dev, struct ifreq *ifr)
-{
- /* Get stats from the driver */
- struct iw_statistics *stats = (dev->get_wireless_stats ?
- dev->get_wireless_stats(dev) :
- (struct iw_statistics *) NULL);
-
- if (stats != (struct iw_statistics *) NULL) {
- struct iwreq * wrq = (struct iwreq *)ifr;
-
- /* Copy statistics to the user buffer */
- if(copy_to_user(wrq->u.data.pointer, stats,
- sizeof(struct iw_statistics)))
- return -EFAULT;
-
- /* Check if we need to clear the update flag */
- if(wrq->u.data.flags != 0)
- stats->qual.updated = 0;
- return(0);
- } else
- return -EOPNOTSUPP;
-}
-#endif /* WIRELESS_EXT */
-
/**
* netdev_set_master - set up master/slave pair
* @slave: slave device
@@ -2209,11 +2094,6 @@
notifier_call_chain(&netdev_chain, NETDEV_CHANGENAME, dev);
return 0;
-#ifdef WIRELESS_EXT
- case SIOCGIWSTATS:
- return dev_iwstats(dev, ifr);
-#endif /* WIRELESS_EXT */
-
/*
* Unknown or private ioctl
*/
@@ -2239,17 +2119,6 @@
return -EOPNOTSUPP;
}
-#ifdef WIRELESS_EXT
- if (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) {
- if (dev->do_ioctl) {
- if (!netif_device_present(dev))
- return -ENODEV;
- return dev->do_ioctl(dev, ifr, cmd);
- }
- return -EOPNOTSUPP;
- }
-#endif /* WIRELESS_EXT */
-
}
return -EINVAL;
}
@@ -2431,7 +2300,8 @@
}
dev_load(ifr.ifr_name);
rtnl_lock();
- ret = dev_ifsioc(&ifr, cmd);
+ /* Follow me in net/core/wireless.c */
+ ret = wireless_process_ioctl(&ifr, cmd);
rtnl_unlock();
if (!ret && IW_IS_GET(cmd) &&
copy_to_user(arg, &ifr, sizeof(struct ifreq)))
@@ -2856,6 +2726,7 @@
proc_net_create("dev", 0, dev_get_info);
create_proc_read_entry("net/softnet_stat", 0, 0, dev_proc_stats, NULL);
#ifdef WIRELESS_EXT
+ /* Available in net/core/wireless.c */
proc_net_create("wireless", 0, dev_get_wireless_info);
#endif /* WIRELESS_EXT */
#endif /* CONFIG_PROC_FS */
Index: neighbour.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/net/core/neighbour.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- neighbour.c 24 May 2002 00:06:05 -0000 1.3
+++ neighbour.c 6 Jun 2002 00:12:25 -0000 1.4
@@ -1172,9 +1172,6 @@
return 0;
}
-#ifdef CONFIG_RTNETLINK
-
-
int neigh_delete(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
{
struct ndmsg *ndm = NLMSG_DATA(nlh);
@@ -1438,12 +1435,7 @@
netlink_broadcast(rtnl, skb, 0, RTMGRP_NEIGH, GFP_ATOMIC);
}
-
-
-#endif
-
-
-#endif
+#endif /* CONFIG_ARPD */
#ifdef CONFIG_SYSCTL
Index: rtnetlink.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/net/core/rtnetlink.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rtnetlink.c 24 May 2002 00:06:06 -0000 1.3
+++ rtnetlink.c 6 Jun 2002 00:12:25 -0000 1.4
@@ -45,7 +45,6 @@
#include <net/protocol.h>
#include <net/arp.h>
#include <net/route.h>
-#include <net/tcp.h>
#include <net/udp.h>
#include <net/sock.h>
#include <net/pkt_sched.h>
@@ -77,15 +76,10 @@
return 0;
}
-#ifdef CONFIG_RTNETLINK
struct sock *rtnl;
struct rtnetlink_link * rtnetlink_links[NPROTO];
-#define _S 1 /* superuser privileges required */
-#define _X 2 /* exclusive access to tables required */
-#define _G 4 /* GET request */
-
static const int rtm_min[(RTM_MAX+1-RTM_BASE)/4] =
{
NLMSG_LENGTH(sizeof(struct ifinfomsg)),
@@ -533,7 +527,3 @@
rtnetlink_links[PF_UNSPEC] = link_rtnetlink_table;
rtnetlink_links[PF_PACKET] = link_rtnetlink_table;
}
-
-
-
-#endif
Index: scm.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/net/core/scm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scm.c 24 May 2002 00:06:06 -0000 1.3
+++ scm.c 6 Jun 2002 00:12:25 -0000 1.4
@@ -26,11 +26,7 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-#include <linux/inet.h>
-#include <net/ip.h>
#include <net/protocol.h>
-#include <net/tcp.h>
-#include <net/udp.h>
#include <linux/skbuff.h>
#include <net/sock.h>
#include <net/scm.h>
Index: skbuff.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/net/core/skbuff.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- skbuff.c 24 May 2002 00:06:06 -0000 1.3
+++ skbuff.c 6 Jun 2002 00:12:25 -0000 1.4
@@ -49,15 +49,14 @@
#include <linux/string.h>
#include <linux/skbuff.h>
#include <linux/cache.h>
+#include <linux/rtnetlink.h>
#include <linux/init.h>
#include <linux/highmem.h>
-#include <net/ip.h>
#include <net/protocol.h>
#include <net/dst.h>
-#include <net/tcp.h>
-#include <net/udp.h>
#include <net/sock.h>
+#include <net/checksum.h>
#include <asm/uaccess.h>
#include <asm/system.h>
Index: sock.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/net/core/sock.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sock.c 24 May 2002 00:06:06 -0000 1.3
+++ sock.c 6 Jun 2002 00:12:25 -0000 1.4
@@ -113,24 +113,20 @@
#include <asm/uaccess.h>
#include <asm/system.h>
-#include <linux/inet.h>
#include <linux/netdevice.h>
-#include <net/ip.h>
#include <net/protocol.h>
-#include <net/arp.h>
-#include <net/route.h>
-#include <net/tcp.h>
-#include <net/udp.h>
#include <linux/skbuff.h>
#include <net/sock.h>
-#include <net/raw.h>
-#include <net/icmp.h>
#include <linux/ipsec.h>
#ifdef CONFIG_FILTER
#include <linux/filter.h>
#endif
+#ifdef CONFIG_INET
+#include <net/tcp.h>
+#endif
+
/* Run time adjustable parameters. */
__u32 sysctl_wmem_max = SK_WMEM_MAX;
__u32 sysctl_rmem_max = SK_RMEM_MAX;
@@ -759,48 +755,62 @@
* Generic send/receive buffer handlers
*/
-struct sk_buff *sock_alloc_send_skb(struct sock *sk, unsigned long size,
- int noblock, int *errcode)
+struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len,
+ unsigned long data_len, int noblock, int *errcode)
{
- int err;
struct sk_buff *skb;
long timeo;
+ int err;
timeo = sock_sndtimeo(sk, noblock);
-
while (1) {
- unsigned long try_size = size;
-
err = sock_error(sk);
if (err != 0)
goto failure;
- /*
- * We should send SIGPIPE in these cases according to
- * 1003.1g draft 6.4. If we (the user) did a shutdown()
- * call however we should not.
- *
- * Note: This routine isnt just used for datagrams and
- * anyway some datagram protocols have a notion of
- * close down.
- */
-
err = -EPIPE;
- if (sk->shutdown&SEND_SHUTDOWN)
+ if (sk->shutdown & SEND_SHUTDOWN)
goto failure;
if (atomic_read(&sk->wmem_alloc) < sk->sndbuf) {
- skb = alloc_skb(try_size, sk->allocation);
- if (skb)
+ skb = alloc_skb(header_len, sk->allocation);
+ if (skb) {
+ int npages;
+ int i;
+
+ /* No pages, we're done... */
+ if (!data_len)
+ break;
+
+ npages = (data_len + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
+ skb->truesize += data_len;
+ skb_shinfo(skb)->nr_frags = npages;
+ for (i = 0; i < npages; i++) {
+ struct page *page;
+ skb_frag_t *frag;
+
+ page = alloc_pages(sk->allocation, 0);
+ if (!page) {
+ err = -ENOBUFS;
+ kfree_skb(skb);
+ goto failure;
+ }
+
+ frag = &skb_shinfo(skb)->frags[i];
+ frag->page = page;
+ frag->page_offset = 0;
+ frag->size = (data_len >= PAGE_SIZE ?
+ PAGE_SIZE :
+ data_len);
+ data_len -= PAGE_SIZE;
+ }
+
+ /* Full success... */
break;
+ }
err = -ENOBUFS;
goto failure;
}
-
- /*
- * This means we have too many buffers for this socket already.
- */
-
set_bit(SOCK_ASYNC_NOSPACE, &sk->socket->flags);
set_bit(SOCK_NOSPACE, &sk->socket->flags);
err = -EAGAIN;
@@ -819,6 +829,12 @@
failure:
*errcode = err;
return NULL;
+}
+
+struct sk_buff *sock_alloc_send_skb(struct sock *sk, unsigned long size,
+ int noblock, int *errcode)
+{
+ return sock_alloc_send_pskb(sk, size, 0, noblock, errcode);
}
void __lock_sock(struct sock *sk)
|
|
From: Kenn H. <ke...@us...> - 2002-06-06 00:12:29
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv18183/arch/vax/kernel
Modified Files:
init_task.c interrupt.c process.c ptrace.c vax_dev_init.c
Log Message:
Merge with Linus' 2.5.3 release
Index: init_task.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/init_task.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- init_task.c 31 May 2002 01:58:38 -0000 1.4
+++ init_task.c 6 Jun 2002 00:12:24 -0000 1.5
@@ -1,6 +1,7 @@
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/init.h>
+#include <linux/init_task.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
Index: interrupt.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/interrupt.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- interrupt.c 31 May 2002 01:58:38 -0000 1.5
+++ interrupt.c 6 Jun 2002 00:12:24 -0000 1.6
@@ -536,13 +536,13 @@
ret_with_reschedule:
// printk("syscall: pid %d need_resched %d sigpending %d state %d\n",current->pid,current->need_resched,current->sigpending,current->state);
- if (current->need_resched) {
+ if (need_resched()) {
schedule();
goto ret_from_sys_call;
}
/* check for pending signals */
- if (current->sigpending != 0) {
+ if (current->work.sigpending != 0) {
/* FIXME: do we need to check the IPL here (i386 does a sti here) */
/* FIXME: oldset? */
do_signal(0,regs);
Index: process.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/process.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- process.c 5 Jun 2002 21:55:03 -0000 1.5
+++ process.c 6 Jun 2002 00:12:24 -0000 1.6
@@ -34,7 +34,7 @@
while(1) {
/* Although we are an idle CPU, we do not want to
get into the scheduler unnecessarily. */
- if (current->need_resched) {
+ if (need_resched()) {
schedule();
check_pgt_cache();
}
Index: ptrace.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/ptrace.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ptrace.c 20 May 2002 00:33:33 -0000 1.4
+++ ptrace.c 6 Jun 2002 00:12:24 -0000 1.5
@@ -271,10 +271,17 @@
res = -EIO;
if ((unsigned long) data > _NSIG)
break;
- if (request == PTRACE_SYSCALL)
- child->ptrace |= PT_TRACESYS;
- else
- child->ptrace &= ~PT_TRACESYS;
+ if (request == PTRACE_SYSCALL) {
+ if (!(child->ptrace & PT_SYSCALLTRACE)) {
+ child->ptrace |= PT_SYSCALLTRACE;
+ child->work.syscall_trace++;
+ }
+ } else {
+ if (child->ptrace & PT_SYSCALLTRACE) {
+ child->ptrace &= ~PT_SYSCALLTRACE;
+ child->work.syscall_trace--;
+ }
+ }
child->exit_code = data;
wake_up_process(child);
res = 0;
@@ -301,7 +308,10 @@
res = -EIO;
if ((unsigned long) data > _NSIG)
break;
- child->ptrace &= ~ PT_TRACESYS;
+ if (child->ptrace & PT_SYSCALLTRACE) {
+ child->ptrace &= ~PT_SYSCALLTRACE;
+ child->work.syscall_trace--;
+ }
if ((child->ptrace & PT_DTRACE)==0)
child->ptrace |= PT_DTRACE;
@@ -334,8 +344,8 @@
asmlinkage void syscall_trace(void)
{
- if ((current->ptrace & (PT_PTRACED|PT_TRACESYS))
- != (PT_PTRACED|PT_TRACESYS))
+ if ((current->ptrace & (PT_PTRACED|PT_SYSCALLTRACE))
+ != (PT_PTRACED|PT_SYSCALLTRACE))
return;
current->exit_code = SIGTRAP;
current->state = TASK_STOPPED;
Index: vax_dev_init.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/vax_dev_init.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vax_dev_init.c 20 May 2002 00:33:33 -0000 1.3
+++ vax_dev_init.c 6 Jun 2002 00:12:24 -0000 1.4
@@ -8,13 +8,14 @@
*/
#include <linux/types.h> /* For NULL */
#include <linux/kernel.h> /* For printk */
+#include <linux/init.h>
#include <asm/mtpr.h>
#include <asm/mv.h>
#include <asm/vaxcpu.h>
-void vax_dev_init(void)
+static void __init vax_dev_init(void)
{
if (mv->init_devices) {
mv->init_devices();
@@ -22,4 +23,5 @@
return;
}
-
+subsys_initcall(vax_dev_init);
+
|
|
From: Kenn H. <ke...@us...> - 2002-06-06 00:12:29
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/base In directory usw-pr-cvs1:/tmp/cvs-serv18183/drivers/base Modified Files: core.c Log Message: Merge with Linus' 2.5.3 release Index: core.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/base/core.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- core.c 5 Jun 2002 22:23:02 -0000 1.1.1.1 +++ core.c 6 Jun 2002 00:12:24 -0000 1.2 @@ -8,6 +8,7 @@ #include <linux/device.h> #include <linux/module.h> #include <linux/malloc.h> +#include <linux/init.h> #undef DEBUG |
|
From: Kenn H. <ke...@us...> - 2002-06-06 00:12:29
|
Update of /cvsroot/linux-vax/kernel-2.5 In directory usw-pr-cvs1:/tmp/cvs-serv18183 Modified Files: Makefile Log Message: Merge with Linus' 2.5.3 release Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 5 Jun 2002 21:55:03 -0000 1.4 +++ Makefile 6 Jun 2002 00:12:24 -0000 1.5 @@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 5 -SUBLEVEL = 2 +SUBLEVEL = 3 EXTRAVERSION = KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) @@ -133,7 +133,8 @@ DRIVERS-$(CONFIG_ACPI) += drivers/acpi/acpi.o DRIVERS-$(CONFIG_PARPORT) += drivers/parport/driver.o -DRIVERS-y += drivers/char/char.o \ +DRIVERS-y += drivers/base/base.o \ + drivers/char/char.o \ drivers/block/block.o \ drivers/misc/misc.o \ drivers/net/net.o \ @@ -171,7 +172,7 @@ DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a DRIVERS-$(CONFIG_ALL_PPC) += drivers/macintosh/macintosh.o DRIVERS-$(CONFIG_MAC) += drivers/macintosh/macintosh.o -DRIVERS-$(CONFIG_ISAPNP) += drivers/pnp/pnp.o +DRIVERS-$(CONFIG_PNP) += drivers/pnp/pnp.o DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/sgi.a DRIVERS-$(CONFIG_VT) += drivers/video/video.o DRIVERS-$(CONFIG_PARIDE) += drivers/block/paride/paride.a |
|
From: Kenn H. <ke...@us...> - 2002-06-06 00:12:29
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/net In directory usw-pr-cvs1:/tmp/cvs-serv18183/drivers/net Modified Files: Makefile Log Message: Merge with Linus' 2.5.3 release Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 31 May 2002 01:58:38 -0000 1.3 +++ Makefile 6 Jun 2002 00:12:24 -0000 1.4 @@ -17,7 +17,7 @@ export-objs := 8390.o arlan.o aironet4500_core.o aironet4500_card.o \ ppp_async.o ppp_generic.o slhc.o pppox.o auto_irq.o \ - net_init.o + net_init.o mii.o list-multi := rcpci.o rcpci-objs := rcpci45.o rclanmtl.o @@ -166,7 +166,6 @@ obj-$(CONFIG_EEXPRESS_PRO) += eepro.o obj-$(CONFIG_8139CP) += 8139cp.o obj-$(CONFIG_8139TOO) += 8139too.o -obj-$(CONFIG_WAVELAN) += wavelan.o obj-$(CONFIG_ARLAN) += arlan.o arlan-proc.o obj-$(CONFIG_ZNET) += znet.o obj-$(CONFIG_LAN_SAA9730) += saa9730.o |
|
From: Kenn H. <ke...@us...> - 2002-06-06 00:07:37
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory usw-pr-cvs1:/tmp/cvs-serv17578
Modified Files:
mmu_context.h
Log Message:
2.5.3's scheduler no longer wants sched_find_first_zero_bit(), but would
prefer sched_find_first_bit()
Index: mmu_context.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/mmu_context.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mmu_context.h 5 Jun 2002 21:55:04 -0000 1.4
+++ mmu_context.h 6 Jun 2002 00:07:33 -0000 1.5
@@ -16,18 +16,19 @@
# error update this function.
#endif
-static inline int sched_find_first_zero_bit(char *bitmap)
+static inline int sched_find_first_bit(unsigned long *b)
{
- unsigned int *b = (unsigned int *)bitmap;
- unsigned int rt;
-
- rt = b[0] & b[1] & b[2] & b[3];
- if (unlikely(rt != 0xffffffff))
- return find_first_zero_bit(bitmap, MAX_RT_PRIO);
-
- if (b[4] != ~0)
- return ffz(b[4]) + MAX_RT_PRIO;
- return ffz(b[5]) + 32 + MAX_RT_PRIO;
+ if (unlikely(b[0]))
+ return __ffs(b[0]);
+ if (unlikely(b[1]))
+ return __ffs(b[1]) + 32;
+ if (unlikely(b[2]))
+ return __ffs(b[2]) + 64;
+ if (unlikely(b[3]))
+ return __ffs(b[3]) + 96;
+ if (b[4])
+ return __ffs(b[4]) + 128;
+ return __ffs(b[5]) + 32 + 128;
}
|
|
From: Kenn H. <ke...@us...> - 2002-06-06 00:06:16
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory usw-pr-cvs1:/tmp/cvs-serv17366
Modified Files:
bitops.h
Log Message:
Added __ffs() (works like ffz() in that result is undefined if no bit is
set in argument - contrast with ffs() which returns -1 if nothing set)
Index: bitops.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/bitops.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bitops.h 5 Jun 2002 21:55:04 -0000 1.4
+++ bitops.h 6 Jun 2002 00:06:11 -0000 1.5
@@ -341,6 +341,20 @@
return word;
}
+/**
+ * __ffs - find first bit in word.
+ * @word: The word to search
+ *
+ * Undefined if no bit exists, so code should check against 0 first.
+ */
+static __inline__ unsigned long __ffs(unsigned long word)
+{
+ __asm__("ffs $0, $32, %1 , %0\n"
+ :"=ir" (word)
+ :"ir" (word));
+ return word;
+}
+
#ifdef __KERNEL__
/**
* ffs - find first bit set
|
|
From: Kenn H. <ke...@us...> - 2002-06-05 21:56:50
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/usb/hcd In directory usw-pr-cvs1:/tmp/cvs-serv538/hcd Added Files: .cvsignore Log Message: Add a .cvsignore file for a new directory --- NEW FILE --- *.a.flags *.o.flags .depend *.lst |
|
From: Kenn H. <ke...@us...> - 2002-06-05 21:56:25
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax In directory usw-pr-cvs1:/tmp/cvs-serv348 Added Files: ka650.config Log Message: Added a default config for KA650 --- NEW FILE --- # # Automatically generated make config: don't edit # CONFIG_VAX=y CONFIG_UID16=y CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # # Code maturity level options # CONFIG_EXPERIMENTAL=y # # Loadable module support # # CONFIG_MODULES is not set # # Processor type and features # # CONFIG_SMP is not set # CONFIG_SMP is not set # # General setup # CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set CONFIG_ELF_KERNEL=y CONFIG_KCORE_ELF=y # CONFIG_EXTRA_ELF_COMPILER is not set CONFIG_NET=y CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_SYSCTL is not set CONFIG_KCORE_ELF=y # CONFIG_KCORE_AOUT is not set # CONFIG_BINFMT_AOUT is not set CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_MISC is not set CONFIG_PROC_FS=y # # Bus support # CONFIG_QBUS=y CONFIG_UNIBUS=y CONFIG_VAXBI=y # CONFIG_VSBUS is not set # # Mass storage support # CONFIG_MSCP=y CONFIG_TMSCP=y # # Block devices # # CONFIG_BLK_DEV_FD is not set # CONFIG_BLK_DEV_XD is not set # CONFIG_PARIDE is not set # CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_CISS_SCSI_TAPE is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_NBD is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=4096 CONFIG_BLK_DEV_INITRD=y # # Networking options # # CONFIG_PACKET is not set # CONFIG_NETLINK is not set # CONFIG_NETFILTER is not set # CONFIG_FILTER is not set CONFIG_UNIX=y CONFIG_INET=y # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_PNP=y # CONFIG_IP_PNP_DHCP is not set CONFIG_IP_PNP_BOOTP=y # CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set # CONFIG_INET_ECN is not set # CONFIG_SYN_COOKIES is not set # CONFIG_IPV6 is not set # CONFIG_KHTTPD is not set # CONFIG_ATM is not set # CONFIG_VLAN_8021Q is not set # # # # CONFIG_IPX is not set # CONFIG_ATALK is not set # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_LLC is not set # CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set # CONFIG_NET_FASTROUTE is not set # CONFIG_NET_HW_FLOWCONTROL is not set # # QoS and/or fair queueing # # CONFIG_NET_SCHED is not set # # SCSI support # # CONFIG_SCSI is not set # # Network device support # # CONFIG_NETDEVICES is not set # # File systems # # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set # CONFIG_REISERFS_FS is not set # CONFIG_REISERFS_CHECK is not set # CONFIG_REISERFS_PROC_INFO is not set # CONFIG_ADFS_FS is not set # CONFIG_ADFS_FS_RW is not set # CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EXT3_FS is not set # CONFIG_JBD is not set # CONFIG_JBD_DEBUG is not set # CONFIG_FAT_FS is not set # CONFIG_MSDOS_FS is not set # CONFIG_UMSDOS_FS is not set # CONFIG_VFAT_FS is not set # CONFIG_EFS_FS is not set # CONFIG_JFFS_FS is not set # CONFIG_JFFS2_FS is not set # CONFIG_CRAMFS is not set CONFIG_TMPFS=y CONFIG_RAMFS=y CONFIG_ISO9660_FS=y CONFIG_JOLIET=y # CONFIG_ZISOFS is not set # CONFIG_MINIX_FS is not set # CONFIG_VXFS_FS is not set # CONFIG_NTFS_FS is not set # CONFIG_NTFS_RW is not set # CONFIG_HPFS_FS is not set CONFIG_PROC_FS=y # CONFIG_DEVFS_FS is not set # CONFIG_DEVFS_MOUNT is not set # CONFIG_DEVFS_DEBUG is not set CONFIG_DEVPTS_FS=y # CONFIG_QNX4FS_FS is not set # CONFIG_QNX4FS_RW is not set # CONFIG_ROMFS_FS is not set CONFIG_EXT2_FS=y # CONFIG_SYSV_FS is not set # CONFIG_UDF_FS is not set # CONFIG_UDF_RW is not set # CONFIG_UFS_FS is not set # CONFIG_UFS_FS_WRITE is not set # # Network File Systems # # CONFIG_CODA_FS is not set # CONFIG_INTERMEZZO_FS is not set CONFIG_NFS_FS=y # CONFIG_NFS_V3 is not set CONFIG_ROOT_NFS=y # CONFIG_NFSD is not set # CONFIG_NFSD_V3 is not set CONFIG_SUNRPC=y CONFIG_LOCKD=y # CONFIG_SMB_FS is not set # CONFIG_NCP_FS is not set # CONFIG_NCPFS_PACKET_SIGNING is not set # CONFIG_NCPFS_IOCTL_LOCKING is not set # CONFIG_NCPFS_STRONG is not set # CONFIG_NCPFS_NFS_NS is not set # CONFIG_NCPFS_OS2_NS is not set # CONFIG_NCPFS_SMALLDOS is not set # CONFIG_NCPFS_NLS is not set # CONFIG_NCPFS_EXTRAS is not set # CONFIG_ZISOFS_FS is not set # CONFIG_ZLIB_FS_INFLATE is not set # # Partition Types # CONFIG_PARTITION_ADVANCED=y # CONFIG_ACORN_PARTITION is not set CONFIG_OSF_PARTITION=y # CONFIG_AMIGA_PARTITION is not set # CONFIG_ATARI_PARTITION is not set # CONFIG_MAC_PARTITION is not set CONFIG_MSDOS_PARTITION=y # CONFIG_BSD_DISKLABEL is not set # CONFIG_MINIX_SUBPARTITION is not set # CONFIG_SOLARIS_X86_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set # CONFIG_LDM_PARTITION is not set # CONFIG_SGI_PARTITION is not set CONFIG_ULTRIX_PARTITION=y # CONFIG_SUN_PARTITION is not set # CONFIG_SMB_NLS is not set CONFIG_NLS=y # # Native Language Support # CONFIG_NLS_DEFAULT="iso8859-1" # CONFIG_NLS_CODEPAGE_437 is not set # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set # CONFIG_NLS_CODEPAGE_852 is not set # CONFIG_NLS_CODEPAGE_855 is not set # CONFIG_NLS_CODEPAGE_857 is not set # CONFIG_NLS_CODEPAGE_860 is not set # CONFIG_NLS_CODEPAGE_861 is not set # CONFIG_NLS_CODEPAGE_862 is not set # CONFIG_NLS_CODEPAGE_863 is not set # CONFIG_NLS_CODEPAGE_864 is not set # CONFIG_NLS_CODEPAGE_865 is not set # CONFIG_NLS_CODEPAGE_866 is not set # CONFIG_NLS_CODEPAGE_869 is not set # CONFIG_NLS_CODEPAGE_936 is not set # CONFIG_NLS_CODEPAGE_950 is not set # CONFIG_NLS_CODEPAGE_932 is not set # CONFIG_NLS_CODEPAGE_949 is not set # CONFIG_NLS_CODEPAGE_874 is not set # CONFIG_NLS_ISO8859_8 is not set # CONFIG_NLS_CODEPAGE_1251 is not set # CONFIG_NLS_ISO8859_1 is not set # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set # CONFIG_NLS_ISO8859_5 is not set # CONFIG_NLS_ISO8859_6 is not set # CONFIG_NLS_ISO8859_7 is not set # CONFIG_NLS_ISO8859_9 is not set # CONFIG_NLS_ISO8859_13 is not set # CONFIG_NLS_ISO8859_14 is not set # CONFIG_NLS_ISO8859_15 is not set # CONFIG_NLS_KOI8_R is not set # CONFIG_NLS_KOI8_U is not set # CONFIG_NLS_UTF8 is not set # # VAX Character devices # # CONFIG_VT is not set CONFIG_SERIAL=y # CONFIG_DZ is not set CONFIG_SERIAL_MTPR=y CONFIG_SERIAL_CONSOLE=y CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 CONFIG_RTC=y # # Kernel hacking # CONFIG_MAGIC_SYSRQ=y CONFIG_PROFILE=y CONFIG_PROFILE_SHIFT=2 # # Library routines # CONFIG_CRC32=y |
|
From: Kenn H. <ke...@us...> - 2002-06-05 21:55:09
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/mm
In directory usw-pr-cvs1:/tmp/cvs-serv31851/arch/vax/mm
Modified Files:
fault.c
Log Message:
Merge with Linus' 2.5.2 release
Index: fault.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/mm/fault.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fault.c 20 May 2002 00:33:34 -0000 1.3
+++ fault.c 5 Jun 2002 21:55:03 -0000 1.4
@@ -176,8 +176,7 @@
out_of_memory:
if (current->pid == 1)
{
- current->policy |= SCHED_YIELD;
- schedule();
+ yield();
goto survive;
}
up_read(&mm->mmap_sem);
|
|
From: Kenn H. <ke...@us...> - 2002-06-05 21:55:09
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv31851/arch/vax/kernel
Modified Files:
cpu_ka410.c cpu_ka42.c cpu_ka43.c cpu_ka46.c cpu_ka55.c
cpu_vxt.c process.c
Log Message:
Merge with Linus' 2.5.2 release
Index: cpu_ka410.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka410.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cpu_ka410.c 20 May 2002 01:09:49 -0000 1.5
+++ cpu_ka410.c 5 Jun 2002 21:55:03 -0000 1.6
@@ -60,9 +60,11 @@
void ka410_post_vm_init(void)
{
+#ifdef CONFIG_DZ
init_dz11_console(0x200A000, 3);
dz_serial_console_init(0,0);
+#endif
}
const char *ka410_cpu_type_str(void)
Index: cpu_ka42.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka42.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cpu_ka42.c 20 May 2002 01:09:49 -0000 1.5
+++ cpu_ka42.c 5 Jun 2002 21:55:03 -0000 1.6
@@ -71,9 +71,11 @@
#define KA42_CADR_DSE 0x10
__mtpr(KA42_CADR_S2E|KA42_CADR_S1E|KA42_CADR_ISE|KA42_CADR_DSE, PR_CADR);
+#ifdef CONFIG_DZ
init_dz11_console(0x200A0000, 3);
dz_serial_console_init(0, 0);
+#endif
}
void ka42_init_devices(void)
Index: cpu_ka43.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka43.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cpu_ka43.c 31 May 2002 01:58:38 -0000 1.6
+++ cpu_ka43.c 5 Jun 2002 21:55:03 -0000 1.7
@@ -95,9 +95,11 @@
/* dont call ka43_cache_reset before this function (unlikely) */
void ka43_post_vm_init(void)
{
+#ifdef CONFIG_DZ
init_dz11_console(0x200A0000, 3);
dz_serial_console_init(0, 0);
+#endif
cpu_regs = ioremap(KA43_CPU_BASE, KA43_CPU_SIZE);
ka43_creg_addr = ioremap(KA43_CH2_CREG, 1);
Index: cpu_ka46.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka46.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cpu_ka46.c 27 May 2002 19:59:03 -0000 1.6
+++ cpu_ka46.c 5 Jun 2002 21:55:03 -0000 1.7
@@ -83,8 +83,10 @@
void ka46_post_vm_init(void)
{
+#ifdef CONFIG_DZ
init_dz11_console(0x200A0000, 3);
dz_serial_console_init(0, 0);
+#endif
}
const char *ka46_cpu_type_str(void)
Index: cpu_ka55.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka55.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cpu_ka55.c 20 May 2002 01:09:49 -0000 1.5
+++ cpu_ka55.c 5 Jun 2002 21:55:03 -0000 1.6
@@ -91,9 +91,11 @@
void ka55_post_vm_init(void)
{
+#ifdef CONFIG_DZ
init_dz11_console(0x25000000, 3);
dz_serial_console_init(0, 0);
+#endif
}
const char *ka55_cpu_type_str(void)
Index: cpu_vxt.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_vxt.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cpu_vxt.c 20 May 2002 09:32:33 -0000 1.6
+++ cpu_vxt.c 5 Jun 2002 21:55:03 -0000 1.7
@@ -9,6 +9,8 @@
* may 2002. It looks as if the 20040058 address is right for prom output.
*/
+/* FIXME: recent VXT work in 2.4 needs to be pulled over */
+
#include <linux/types.h> /* For NULL */
#include <linux/kernel.h> /* For printk */
@@ -63,9 +65,10 @@
void vxt_post_vm_init(void)
{
-
+#ifdef CONFIG_DZ
init_dz11_console(0x200A0000, 3);
dz_serial_console_init(0, 0);
+#endif
}
Index: process.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/process.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- process.c 20 May 2002 00:33:33 -0000 1.4
+++ process.c 5 Jun 2002 21:55:03 -0000 1.5
@@ -29,8 +29,7 @@
void cpu_idle(void)
{
/* endless idle loop with no priority at all */
- current->nice = 20;
- current->counter = -100;
+ current->__nice = 20;
while(1) {
/* Although we are an idle CPU, we do not want to
|
|
From: Kenn H. <ke...@us...> - 2002-06-05 21:55:09
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi
In directory usw-pr-cvs1:/tmp/cvs-serv31851/drivers/scsi
Modified Files:
scsi_ioctl.c scsi_merge.c
Log Message:
Merge with Linus' 2.5.2 release
Index: scsi_ioctl.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_ioctl.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scsi_ioctl.c 31 May 2002 01:58:39 -0000 1.3
+++ scsi_ioctl.c 5 Jun 2002 21:55:04 -0000 1.4
@@ -4,7 +4,6 @@
* - get rid of some verify_areas and use __copy*user and __get/put_user
* for the ones that remain
*/
-#define __NO_VERSION__
#include <linux/module.h>
#include <asm/io.h>
Index: scsi_merge.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_merge.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scsi_merge.c 31 May 2002 01:58:39 -0000 1.2
+++ scsi_merge.c 5 Jun 2002 21:55:04 -0000 1.3
@@ -15,7 +15,6 @@
* be handled all at once by a host adapter.
*/
-#define __NO_VERSION__
#include <linux/config.h>
#include <linux/module.h>
@@ -59,12 +58,10 @@
*/
int scsi_init_io(Scsi_Cmnd *SCpnt)
{
- struct request *req;
+ struct request *req = &SCpnt->request;
struct scatterlist *sgpnt;
int count, gfp_mask;
- req = &SCpnt->request;
-
/*
* First we need to know how many scatter gather segments are needed.
*/
@@ -85,14 +82,13 @@
BUG_ON(!sgpnt);
SCpnt->request_buffer = (char *) sgpnt;
- SCpnt->request_bufflen = 0;
+ SCpnt->request_bufflen = req->nr_sectors << 9;
req->buffer = NULL;
/*
* Next, walk the list, and fill in the addresses and sizes of
* each segment.
*/
- SCpnt->request_bufflen = req->nr_sectors << 9;
count = blk_rq_map_sg(req->q, req, SCpnt->request_buffer);
/*
@@ -144,8 +140,7 @@
else
bounce_limit = SHpnt->pci_dev->dma_mask;
#endif
- }
- if (SHpnt->unchecked_isa_dma)
+ } else if (SHpnt->unchecked_isa_dma)
bounce_limit = BLK_BOUNCE_ISA;
blk_queue_bounce_limit(q, bounce_limit);
|
|
From: Kenn H. <ke...@us...> - 2002-06-05 21:55:09
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax In directory usw-pr-cvs1:/tmp/cvs-serv31851/arch/vax Modified Files: 460.config config.in Log Message: Merge with Linus' 2.5.2 release Index: 460.config =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/460.config,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- 460.config 20 May 2002 00:33:33 -0000 1.3 +++ 460.config 5 Jun 2002 21:55:03 -0000 1.4 @@ -3,6 +3,8 @@ # CONFIG_VAX=y CONFIG_UID16=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # # Code maturity level options @@ -26,6 +28,7 @@ CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set CONFIG_ELF_KERNEL=y +CONFIG_KCORE_ELF=y # CONFIG_EXTRA_ELF_COMPILER is not set CONFIG_NET=y CONFIG_SYSVIPC=y @@ -61,6 +64,7 @@ # CONFIG_PARIDE is not set # CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_CISS_SCSI_TAPE is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_NBD is not set @@ -81,6 +85,7 @@ # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_PNP=y +# CONFIG_IP_PNP_DHCP is not set CONFIG_IP_PNP_BOOTP=y # CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set @@ -90,6 +95,7 @@ # CONFIG_IPV6 is not set # CONFIG_KHTTPD is not set # CONFIG_ATM is not set +# CONFIG_VLAN_8021Q is not set # # @@ -135,6 +141,7 @@ # SCSI low-level drivers # # CONFIG_SCSI_VAX_5380 is not set +# CONFIG_SCSI_VAX_53C94 is not set # # Network device support @@ -158,31 +165,45 @@ # CONFIG_AUTOFS4_FS is not set CONFIG_REISERFS_FS=y # CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set # CONFIG_ADFS_FS is not set +# CONFIG_ADFS_FS_RW is not set # CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_BFS_FS is not set +# CONFIG_EXT3_FS is not set +# CONFIG_JBD is not set +# CONFIG_JBD_DEBUG is not set CONFIG_FAT_FS=y CONFIG_MSDOS_FS=y # CONFIG_UMSDOS_FS is not set CONFIG_VFAT_FS=y # CONFIG_EFS_FS is not set # CONFIG_JFFS_FS is not set +# CONFIG_JFFS2_FS is not set # CONFIG_CRAMFS is not set -# CONFIG_RAMFS is not set +# CONFIG_TMPFS is not set +CONFIG_RAMFS=y CONFIG_ISO9660_FS=y CONFIG_JOLIET=y +# CONFIG_ZISOFS is not set # CONFIG_MINIX_FS is not set +# CONFIG_VXFS_FS is not set # CONFIG_NTFS_FS is not set +# CONFIG_NTFS_RW is not set # CONFIG_HPFS_FS is not set CONFIG_PROC_FS=y # CONFIG_DEVFS_FS is not set +# CONFIG_DEVFS_MOUNT is not set +# CONFIG_DEVFS_DEBUG is not set CONFIG_DEVPTS_FS=y # CONFIG_QNX4FS_FS is not set +# CONFIG_QNX4FS_RW is not set # CONFIG_ROMFS_FS is not set CONFIG_EXT2_FS=y # CONFIG_SYSV_FS is not set # CONFIG_UDF_FS is not set +# CONFIG_UDF_RW is not set CONFIG_UFS_FS=y # CONFIG_UFS_FS_WRITE is not set @@ -190,14 +211,26 @@ # Network File Systems # # CONFIG_CODA_FS is not set +# CONFIG_INTERMEZZO_FS is not set CONFIG_NFS_FS=y # CONFIG_NFS_V3 is not set CONFIG_ROOT_NFS=y # CONFIG_NFSD is not set +# CONFIG_NFSD_V3 is not set CONFIG_SUNRPC=y CONFIG_LOCKD=y # CONFIG_SMB_FS is not set # CONFIG_NCP_FS is not set +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +# CONFIG_NCPFS_NFS_NS is not set +# CONFIG_NCPFS_OS2_NS is not set +# CONFIG_NCPFS_SMALLDOS is not set +# CONFIG_NCPFS_NLS is not set +# CONFIG_NCPFS_EXTRAS is not set +# CONFIG_ZISOFS_FS is not set +# CONFIG_ZLIB_FS_INFLATE is not set # # Partition Types @@ -213,6 +246,7 @@ # CONFIG_MINIX_SUBPARTITION is not set # CONFIG_SOLARIS_X86_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set # CONFIG_SGI_PARTITION is not set CONFIG_ULTRIX_PARTITION=y # CONFIG_SUN_PARTITION is not set @@ -238,11 +272,13 @@ # CONFIG_NLS_CODEPAGE_865 is not set # CONFIG_NLS_CODEPAGE_866 is not set # CONFIG_NLS_CODEPAGE_869 is not set -# CONFIG_NLS_CODEPAGE_874 is not set -# CONFIG_NLS_CODEPAGE_932 is not set # CONFIG_NLS_CODEPAGE_936 is not set -# CONFIG_NLS_CODEPAGE_949 is not set # CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set # CONFIG_NLS_ISO8859_1 is not set # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set @@ -250,11 +286,12 @@ # CONFIG_NLS_ISO8859_5 is not set # CONFIG_NLS_ISO8859_6 is not set # CONFIG_NLS_ISO8859_7 is not set -# CONFIG_NLS_ISO8859_8 is not set # CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set # CONFIG_NLS_ISO8859_14 is not set # CONFIG_NLS_ISO8859_15 is not set # CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set # CONFIG_NLS_UTF8 is not set # @@ -267,6 +304,7 @@ CONFIG_SERIAL_CONSOLE=y CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 +# CONFIG_RTC is not set # # Kernel hacking @@ -274,3 +312,8 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_PROFILE=y CONFIG_PROFILE_SHIFT=2 + +# +# Library routines +# +CONFIG_CRC32=y Index: config.in =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/config.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- config.in 20 May 2002 01:09:49 -0000 1.5 +++ config.in 5 Jun 2002 21:55:03 -0000 1.6 @@ -186,3 +186,5 @@ fi endmenu +source lib/Config.in + |
|
From: Kenn H. <ke...@us...> - 2002-06-05 21:55:09
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv31851/drivers/char
Modified Files:
dz.c
Log Message:
Merge with Linus' 2.5.2 release
Index: dz.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/dz.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dz.c 20 May 2002 00:33:35 -0000 1.2
+++ dz.c 5 Jun 2002 21:55:03 -0000 1.3
@@ -83,7 +83,6 @@
DECLARE_TASK_QUEUE(tq_serial);
-extern wait_queue_head_t keypress_wait;
static struct dz_serial *lines[4];
static unsigned char tmp_buffer[256];
@@ -234,8 +233,6 @@
if (info->is_console) {
if (ch == 0)
return; /* it's a break ... */
-
- wake_up (&keypress_wait); /* It is a 'keyboard interrupt' ;-) */
}
#endif
@@ -1318,7 +1315,7 @@
struct dz_serial *info;
int retval, line;
- line = MINOR(tty->device) - tty->driver.minor_start;
+ line = minor(tty->device) - tty->driver.minor_start;
/*
* The dz lines for the mouse/keyboard must be opened using their
@@ -1636,14 +1633,9 @@
}
}
-static int dz_console_wait_key(struct console *co)
-{
- return 0;
-}
-
static kdev_t dz_console_device(struct console *c)
{
- return MKDEV(TTY_MAJOR, 64 + c->index);
+ return mk_kdev(TTY_MAJOR, 64 + c->index);
}
static int __init dz_console_setup(struct console *co, char *options)
@@ -1746,13 +1738,12 @@
}
static struct console dz_sercons = {
- name: "ttyS",
- write: dz_console_print,
- device: dz_console_device,
- wait_key: dz_console_wait_key,
- 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)
|
|
From: Kenn H. <ke...@us...> - 2002-06-05 21:55:09
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory usw-pr-cvs1:/tmp/cvs-serv31851/include/asm-vax
Modified Files:
bitops.h mmu_context.h
Log Message:
Merge with Linus' 2.5.2 release
Index: bitops.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/bitops.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bitops.h 20 May 2002 00:33:38 -0000 1.3
+++ bitops.h 5 Jun 2002 21:55:04 -0000 1.4
@@ -98,6 +98,24 @@
:"ir" (nr));
}
+/**
+ * __clear_bit - Set a bit in memory
+ * @nr: the bit to clear
+ * @addr: the address to start counting from
+ *
+ * Unlike clear_bit(), this function is non-atomic and may be reordered.
+ * If it's called on the same region of memory simultaneously, the effect
+ * may be that only one operation succeeds.
+ */
+static __inline__ void __clear_bit(int nr, volatile void * addr)
+{
+ __asm__(
+ "bbcc %1,%0, 2f\n"
+ "2:\n"
+ :"=m" (ADDR)
+ :"ir" (nr));
+}
+
#define smp_mb__before_clear_bit() smp_mb()
#define smp_mb__after_clear_bit() smp_mb()
Index: mmu_context.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/mmu_context.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mmu_context.h 20 May 2002 00:33:39 -0000 1.3
+++ mmu_context.h 5 Jun 2002 21:55:04 -0000 1.4
@@ -3,4 +3,32 @@
#include <asm/mm/mmu_context.h>
+/* This was introduced in 2.5.2 and for some strange reason, was
+ implemented in this header file for i386/sparc/sparc64. */
+
+ /*
+ * Every architecture must define this function. It's the fastest
+ * way of searching a 168-bit bitmap where the first 128 bits are
+ * unlikely to be set. It's guaranteed that at least one of the 168
+ * bits is cleared.
+ */
+#if MAX_RT_PRIO != 128 || MAX_PRIO != 168
+# error update this function.
+#endif
+
+static inline int sched_find_first_zero_bit(char *bitmap)
+{
+ unsigned int *b = (unsigned int *)bitmap;
+ unsigned int rt;
+
+ rt = b[0] & b[1] & b[2] & b[3];
+ if (unlikely(rt != 0xffffffff))
+ return find_first_zero_bit(bitmap, MAX_RT_PRIO);
+
+ if (b[4] != ~0)
+ return ffz(b[4]) + MAX_RT_PRIO;
+ return ffz(b[5]) + 32 + MAX_RT_PRIO;
+}
+
+
#endif /* __VAX_TMP_MMUCONTEXT_H */
|
|
From: Kenn H. <ke...@us...> - 2002-06-05 21:55:08
|
Update of /cvsroot/linux-vax/kernel-2.5/init
In directory usw-pr-cvs1:/tmp/cvs-serv31851/init
Modified Files:
main.c
Log Message:
Merge with Linus' 2.5.2 release
Index: main.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/init/main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- main.c 31 May 2002 01:58:39 -0000 1.3
+++ main.c 5 Jun 2002 21:55:04 -0000 1.4
@@ -316,18 +316,9 @@
/* Get other processors into their bootup holding patterns. */
smp_boot_cpus();
wait_init_idle = cpu_online_map;
- clear_bit(current->processor, &wait_init_idle); /* Don't wait on me! */
smp_threads_ready=1;
smp_commence();
-
- /* Wait for the other cpus to set up their idle processes */
- printk("Waiting on wait_init_idle (map = 0x%lx)\n", wait_init_idle);
- while (wait_init_idle) {
- cpu_relax();
- barrier();
- }
- printk("All processors have done init_idle\n");
}
#endif
@@ -343,7 +334,6 @@
{
kernel_thread(init, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGNAL);
unlock_kernel();
- current->need_resched = 1;
cpu_idle();
}
@@ -432,6 +422,16 @@
* make syscalls (and thus be locked).
*/
smp_init();
+
+ /*
+ * Finally, we wait for all other CPU's, and initialize this
+ * thread that will become the idle thread for the boot CPU.
+ * After this, the scheduler is fully initialized, and we can
+ * start creating and running new threads.
+ */
+ init_idle();
+
+ /* Do the rest non-__init'ed, we're now alive */
rest_init();
}
|
|
From: Kenn H. <ke...@us...> - 2002-06-05 21:55:08
|
Update of /cvsroot/linux-vax/kernel-2.5 In directory usw-pr-cvs1:/tmp/cvs-serv31851 Modified Files: Makefile Log Message: Merge with Linus' 2.5.2 release Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 31 May 2002 01:58:38 -0000 1.3 +++ Makefile 5 Jun 2002 21:55:03 -0000 1.4 @@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 5 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) @@ -124,7 +124,7 @@ NETWORKS =net/network.o LIBS =$(TOPDIR)/lib/lib.a -SUBDIRS =kernel drivers mm fs net ipc lib +SUBDIRS =kernel lib drivers mm fs net ipc DRIVERS-n := DRIVERS-y := @@ -264,9 +264,9 @@ $(LD) $(LINKFLAGS) $(HEAD) init/main.o init/version.o init/do_mounts.o \ --start-group \ $(CORE_FILES) \ + $(LIBS) \ $(DRIVERS) \ $(NETWORKS) \ - $(LIBS) \ --end-group \ -o vmlinux $(NM) vmlinux | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map |
|
From: Kenn H. <ke...@us...> - 2002-06-01 18:50:12
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/boot/tools In directory usw-pr-cvs1:/tmp/cvs-serv4399/arch/vax/boot/tools Modified Files: .cvsignore Log Message: Added a bunch of .cvsignore files for new directories and fixed up a couple of existing ones Index: .cvsignore =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/boot/tools/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 May 2002 00:33:33 -0000 1.3 +++ .cvsignore 1 Jun 2002 18:49:38 -0000 1.4 @@ -3,4 +3,5 @@ .depend *.lst mkbootblk - +setcmdline +showcmdline |
|
From: Kenn H. <ke...@us...> - 2002-06-01 18:49:56
|
Update of /cvsroot/linux-vax/kernel-2.5/fs/intermezzo In directory usw-pr-cvs1:/tmp/cvs-serv4399/fs/intermezzo 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:56
|
Update of /cvsroot/linux-vax/kernel-2.5/fs/jbd In directory usw-pr-cvs1:/tmp/cvs-serv4399/fs/jbd 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:56
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi/aic7xxx/aicasm In directory usw-pr-cvs1:/tmp/cvs-serv4399/drivers/scsi/aic7xxx/aicasm 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:56
|
Update of /cvsroot/linux-vax/kernel-2.5/net/8021q In directory usw-pr-cvs1:/tmp/cvs-serv4399/net/8021q 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 |
