Menu
▾
▴
[linuxsh-dev] 2.4.18
|
From: NIIBE Y. <gn...@m1...> - 2002-02-26 11:40:08
|
For 2.4, I'll commit following update from mainline.
2002-02-26 NIIBE Yutaka <gn...@m1...>
Updated to 2.4.18
* Makefile: Version 2.4.18. Merged.
* AGAINST-2.4.18: New file.
* AGAINST-2.4.17: Removed.
* drivers/Makefile, drivers/block/rd.c, drivers/char/Makefile,
drivers/net/8139too.c, drivers/net/Config.in, drivers/pci/pci.ids,
kernel/ptrace.c, mm/memory.c: Merge the changes.
* include/asm-sh/pci.h (DECLARE_PCI_UNMAP_ADDR,
DECLARE_PCI_UNMAP_LEN, pci_unmap_addr, pci_unmap_addr_set,
pci_unmap_len, pci_unmap_len_set): New API added.
* drivers/char/sh-sci.c (sci_ioctl TIOCGSERIAL): set return code "rc".
* arch/sh/vmlinux.lds.S (.text.lock): Removed.
* arch/sh/kernel/sh_ksyms.c (simple_strtol): Removed.
* include/asm-sh/unistd.h (__NR_security, __NR_gettid,
__NR_readahead): Added.
* arch/sh/kernel/entry.S (sys_gettid, sys_readahead): Added.
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/Makefile,v
retrieving revision 1.1.1.1.2.3
diff -u -3 -p -r1.1.1.1.2.3 Makefile
--- Makefile 24 Jan 2002 10:15:28 -0000 1.1.1.1.2.3
+++ Makefile 26 Feb 2002 11:37:01 -0000
@@ -1,12 +1,12 @@
VERSION = 2
PATCHLEVEL = 4
-SUBLEVEL = 17
+SUBLEVEL = 18
EXTRAVERSION =
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
-KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//")
+KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//g")
CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
else if [ -x /bin/bash ]; then echo /bin/bash; \
@@ -137,7 +137,8 @@ DRIVERS-y += drivers/char/char.o \
drivers/net/net.o \
drivers/media/media.o
DRIVERS-$(CONFIG_AGP) += drivers/char/agp/agp.o
-DRIVERS-$(CONFIG_DRM) += drivers/char/drm/drm.o
+DRIVERS-$(CONFIG_DRM_NEW) += drivers/char/drm/drm.o
+DRIVERS-$(CONFIG_DRM_OLD) += drivers/char/drm-4.0/drm.o
DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/nubus.a
DRIVERS-$(CONFIG_ISDN) += drivers/isdn/isdn.a
DRIVERS-$(CONFIG_NET_FC) += drivers/net/fc/fc.o
@@ -205,7 +206,7 @@ CLEAN_FILES = \
drivers/scsi/aic7xxx/aicasm/aicasm_scan.c \
drivers/scsi/aic7xxx/aicasm/y.tab.h \
drivers/scsi/aic7xxx/aicasm/aicasm \
- drivers/scsi/53c700-mem.c \
+ drivers/scsi/53c700_d.h \
net/khttpd/make_times_h \
net/khttpd/times.h \
submenu*
@@ -243,14 +244,14 @@ MRPROPER_DIRS = \
include arch/$(ARCH)/Makefile
-export CPPFLAGS CFLAGS AFLAGS
+export CPPFLAGS CFLAGS CFLAGS_KERNEL AFLAGS AFLAGS_KERNEL
export NETWORKS DRIVERS LIBS HEAD LDFLAGS LINKFLAGS MAKEBOOT ASFLAGS
.S.s:
- $(CPP) $(AFLAGS) -traditional -o $*.s $<
+ $(CPP) $(AFLAGS) $(AFLAGS_KERNEL) -traditional -o $*.s $<
.S.o:
- $(CC) $(AFLAGS) -traditional -c -o $*.o $<
+ $(CC) $(AFLAGS) $(AFLAGS_KERNEL) -traditional -c -o $*.o $<
Version: dummy
@rm -f include/linux/compile.h
@@ -330,11 +331,13 @@ include/linux/version.h: ./Makefile
@echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))' >>.ver
@mv -f .ver $@
+comma := ,
+
init/version.o: init/version.c include/linux/compile.h include/config/MARKER
- $(CC) $(CFLAGS) $(CFLAGS_KERNEL) -DUTS_MACHINE='"$(ARCH)"' -c -o init/version.o init/version.c
+ $(CC) $(CFLAGS) $(CFLAGS_KERNEL) -DUTS_MACHINE='"$(ARCH)"' -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o init/version.o init/version.c
init/main.o: init/main.c include/config/MARKER
- $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -c -o $*.o $<
+ $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $*.o $<
fs lib mm ipc kernel drivers net: dummy
$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" $(subst $@, _dir_$@, $@)
Index: arch/sh/vmlinux.lds.S
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/vmlinux.lds.S,v
retrieving revision 1.1.1.1
diff -u -3 -p -r1.1.1.1 vmlinux.lds.S
--- arch/sh/vmlinux.lds.S 15 Oct 2001 20:44:47 -0000 1.1.1.1
+++ arch/sh/vmlinux.lds.S 26 Feb 2002 11:37:01 -0000
@@ -23,7 +23,6 @@ SECTIONS
*(.fixup)
*(.gnu.warning)
} = 0x0009
- .text.lock : { *(.text.lock) } /* out-of-line lock text */
.rodata : { *(.rodata) *(.rodata.*) }
.kstrtab : { *(.kstrtab) }
Index: arch/sh/kernel/entry.S
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/entry.S,v
retrieving revision 1.1.1.1.2.1
diff -u -3 -p -r1.1.1.1.2.1 entry.S
--- arch/sh/kernel/entry.S 25 Jan 2002 00:51:42 -0000 1.1.1.1.2.1
+++ arch/sh/kernel/entry.S 26 Feb 2002 11:37:01 -0000
@@ -1195,6 +1195,10 @@ ENTRY(sys_call_table)
.long SYMBOL_NAME(sys_madvise)
.long SYMBOL_NAME(sys_getdents64) /* 220 */
.long SYMBOL_NAME(sys_fcntl64)
+ .long SYMBOL_NAME(sys_ni_syscall) /* reserved for TUX */
+ .long SYMBOL_NAME(sys_ni_syscall) /* Reserved for Security */
+ .long SYMBOL_NAME(sys_gettid)
+ .long SYMBOL_NAME(sys_readahead) /* 225 */
/*
* NOTE!! This doesn't have to be exact - we just have
@@ -1202,7 +1206,7 @@ ENTRY(sys_call_table)
* entries. Don't panic if you notice that this hasn't
* been shrunk every time we add a new system call.
*/
- .rept NR_syscalls-221
+ .rept NR_syscalls-(.-sys_call_table)/4
.long SYMBOL_NAME(sys_ni_syscall)
.endr
Index: arch/sh/kernel/sh_ksyms.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/sh_ksyms.c,v
retrieving revision 1.1.1.1
diff -u -3 -p -r1.1.1.1 sh_ksyms.c
--- arch/sh/kernel/sh_ksyms.c 15 Oct 2001 20:44:53 -0000 1.1.1.1
+++ arch/sh/kernel/sh_ksyms.c 26 Feb 2002 11:37:01 -0000
@@ -39,8 +39,6 @@ EXPORT_SYMBOL(no_irq_type);
/* Networking helper routines. */
EXPORT_SYMBOL(csum_partial_copy);
-EXPORT_SYMBOL(simple_strtol);
-
EXPORT_SYMBOL(strtok);
EXPORT_SYMBOL(strpbrk);
EXPORT_SYMBOL(strstr);
Index: drivers/Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/Makefile,v
retrieving revision 1.1.1.1.2.2
diff -u -3 -p -r1.1.1.1.2.2 Makefile
--- drivers/Makefile 30 Nov 2001 23:03:47 -0000 1.1.1.1.2.2
+++ drivers/Makefile 26 Feb 2002 11:37:01 -0000
@@ -1,7 +1,7 @@
#
# Makefile for the Linux kernel device drivers.
#
-# 15 Sep 2000, Christoph Hellwig <hc...@ca...>
+# 15 Sep 2000, Christoph Hellwig <hc...@in...>
# Rewritten to use lists instead of if-statements.
#
Index: drivers/block/rd.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/block/rd.c,v
retrieving revision 1.1.1.1.2.4
diff -u -3 -p -r1.1.1.1.2.4 rd.c
--- drivers/block/rd.c 24 Jan 2002 10:15:32 -0000 1.1.1.1.2.4
+++ drivers/block/rd.c 26 Feb 2002 11:37:01 -0000
@@ -191,26 +191,44 @@ __setup("ramdisk_blocksize=", ramdisk_bl
* 2000 Transmeta Corp.
* aops copied from ramfs.
*/
-static int ramdisk_readpage(struct file *file, struct page * page)
+static void ramdisk_updatepage(struct page * page, int need_kmap)
{
if (!Page_Uptodate(page)) {
- memset(kmap(page), 0, PAGE_CACHE_SIZE);
- kunmap(page);
+ struct buffer_head *bh = page->buffers;
+ void * address;
+
+ if (need_kmap)
+ kmap(page);
+ address = page_address(page);
+ if (bh) {
+ struct buffer_head *tmp = bh;
+ do {
+ if (!buffer_uptodate(tmp)) {
+ memset(address, 0, tmp->b_size);
+ mark_buffer_uptodate(tmp, 1);
+ }
+ address += tmp->b_size;
+ tmp = tmp->b_this_page;
+ } while (tmp != bh);
+ } else
+ memset(address, 0, PAGE_CACHE_SIZE);
+ if (need_kmap)
+ kunmap(page);
flush_dcache_page(page);
SetPageUptodate(page);
}
+}
+
+static int ramdisk_readpage(struct file *file, struct page * page)
+{
+ ramdisk_updatepage(page, 1);
UnlockPage(page);
return 0;
}
static int ramdisk_prepare_write(struct file *file, struct page *page, unsigned offset, unsigned to)
{
- if (!Page_Uptodate(page)) {
- void *addr = page_address(page);
- memset(addr, 0, PAGE_CACHE_SIZE);
- flush_dcache_page(page);
- SetPageUptodate(page);
- }
+ ramdisk_updatepage(page, 0);
SetPageDirty(page);
return 0;
}
@@ -233,44 +251,40 @@ static int rd_blkdev_pagecache_IO(int rw
unsigned long index;
int offset, size, err;
- err = -EIO;
err = 0;
mapping = rd_bdev[minor]->bd_inode->i_mapping;
+ /* writing a buffer cache not uptodate must not clear it */
+ if (sbh->b_page->mapping == mapping) {
+ if (rw == WRITE) {
+ mark_buffer_uptodate(sbh, 1);
+ SetPageDirty(sbh->b_page);
+ }
+ goto out;
+ }
+
index = sbh->b_rsector >> (PAGE_CACHE_SHIFT - 9);
offset = (sbh->b_rsector << 9) & ~PAGE_CACHE_MASK;
size = sbh->b_size;
do {
int count;
- struct page ** hash;
struct page * page;
char * src, * dst;
- int unlock = 0;
count = PAGE_CACHE_SIZE - offset;
if (count > size)
count = size;
size -= count;
- hash = page_hash(mapping, index);
- page = __find_get_page(mapping, index, hash);
+ page = grab_cache_page(mapping, index);
if (!page) {
- page = grab_cache_page(mapping, index);
err = -ENOMEM;
- if (!page)
- goto out;
- err = 0;
-
- if (!Page_Uptodate(page)) {
- memset(kmap(page), 0, PAGE_CACHE_SIZE);
- kunmap(page);
- SetPageUptodate(page);
- }
-
- unlock = 1;
+ goto out;
}
+ ramdisk_updatepage(page, 1);
+
index++;
if (rw == READ) {
@@ -294,8 +308,7 @@ static int rd_blkdev_pagecache_IO(int rw
} else {
SetPageDirty(page);
}
- if (unlock)
- UnlockPage(page);
+ UnlockPage(page);
__free_page(page);
} while (size);
Index: drivers/char/Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/char/Makefile,v
retrieving revision 1.1.1.1.2.2
diff -u -3 -p -r1.1.1.1.2.2 Makefile
--- drivers/char/Makefile 30 Nov 2001 23:03:52 -0000 1.1.1.1.2.2
+++ drivers/char/Makefile 26 Feb 2002 11:37:01 -0000
@@ -25,7 +25,7 @@ export-objs := busmouse.o console.o
misc.o pty.o random.o selection.o serial.o \
sonypi.o tty_io.o tty_ioctl.o generic_serial.o
-mod-subdirs := joystick ftape drm pcmcia
+mod-subdirs := joystick ftape drm drm-4.0 pcmcia
list-multi :=
@@ -203,7 +203,8 @@ obj-$(CONFIG_INTEL_RNG) += i810_rng.o
obj-$(CONFIG_QIC02_TAPE) += tpqic02.o
subdir-$(CONFIG_FTAPE) += ftape
-subdir-$(CONFIG_DRM) += drm
+subdir-$(CONFIG_DRM_OLD) += drm-4.0
+subdir-$(CONFIG_DRM_NEW) += drm
subdir-$(CONFIG_PCMCIA) += pcmcia
subdir-$(CONFIG_AGP) += agp
Index: drivers/char/sh-sci.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/char/sh-sci.c,v
retrieving revision 1.1.1.1
diff -u -3 -p -r1.1.1.1 sh-sci.c
--- drivers/char/sh-sci.c 15 Oct 2001 20:44:59 -0000 1.1.1.1
+++ drivers/char/sh-sci.c 26 Feb 2002 11:37:01 -0000
@@ -919,7 +919,7 @@ static int sci_ioctl(struct tty_struct *
case TIOCGSERIAL:
if ((rc = verify_area(VERIFY_WRITE, (void *) arg,
sizeof(struct serial_struct))) == 0)
- gs_getserial(&port->gs, (struct serial_struct *) arg);
+ rc = gs_getserial(&port->gs, (struct serial_struct *) arg);
break;
case TIOCSSERIAL:
if ((rc = verify_area(VERIFY_READ, (void *) arg,
Index: drivers/net/8139too.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/net/8139too.c,v
retrieving revision 1.1.1.1.2.4
diff -u -3 -p -r1.1.1.1.2.4 8139too.c
--- drivers/net/8139too.c 24 Jan 2002 10:15:32 -0000 1.1.1.1.2.4
+++ drivers/net/8139too.c 26 Feb 2002 11:37:01 -0000
@@ -3,7 +3,7 @@
8139too.c: A RealTek RTL-8139 Fast Ethernet driver for Linux.
Maintained by Jeff Garzik <jg...@ma...>
- Copyright 2000,2001 Jeff Garzik
+ Copyright 2000-2002 Jeff Garzik
Much code comes from Donald Becker's rtl8139.c driver,
versions 1.13 and older. This driver was originally based
@@ -92,7 +92,7 @@
*/
#define DRV_NAME "8139too"
-#define DRV_VERSION "0.9.22"
+#define DRV_VERSION "0.9.24"
#include <linux/config.h>
@@ -167,6 +167,9 @@ static int max_interrupt_work = 20;
The RTL chips use a 64 element hash table based on the Ethernet CRC. */
static int multicast_filter_limit = 32;
+/* bitmapped message enable number */
+static int debug = -1;
+
/* Size of the in-memory receive ring. */
#ifdef CONFIG_8139TOO_BUF16K
#define RX_BUF_LEN_IDX 1 /* 0==8K, 1==16K, 2==32K, 3==64K */
@@ -225,6 +228,8 @@ typedef enum {
DFE538TX,
DFE690TXD,
SEGABBA,
+ FE2000VX,
+ ALLIED8139,
RTL8129,
} board_t;
@@ -242,6 +247,8 @@ static struct {
{ "Addtron Technolgy 8139 10/100BaseTX", RTL8139_CAPS },
{ "D-Link DFE-538TX (RealTek RTL8139)", RTL8139_CAPS },
{ "D-Link DFE-690TXD (RealTek RTL8139)", RTL8139_CAPS },
+ { "AboCom FE2000VX (RealTek RTL8139)", RTL8139_CAPS },
+ { "Allied Telesyn 8139 CardBus", RTL8139_CAPS },
{ "SEGA Broadband Adapter", RTL8139_CAPS },
{ "RealTek RTL8129", RTL8129_CAPS },
};
@@ -256,6 +263,8 @@ static struct pci_device_id rtl8139_pci_
{0x4033, 0x1360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ADDTRON8139 },
{0x1186, 0x1300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DFE538TX },
{0x1186, 0x1340, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DFE690TXD },
+ {0x13d1, 0xab06, PCI_ANY_ID, PCI_ANY_ID, 0, 0, FE2000VX },
+ {0x1259, 0xa117, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ALLIED8139 },
{0x11db, 0x1234, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SEGABBA },
#ifdef CONFIG_8139TOO_8129
@@ -268,6 +277,7 @@ static struct pci_device_id rtl8139_pci_
*/
{PCI_ANY_ID, 0x8139, 0x10ec, 0x8139, 0, 0, RTL8139 },
{PCI_ANY_ID, 0x8139, 0x1186, 0x1300, 0, 0, DFE538TX },
+ {PCI_ANY_ID, 0x8139, 0x13d1, 0xab06, 0, 0, FE2000VX },
{0,}
};
@@ -540,6 +550,7 @@ struct rtl_extra_stats {
unsigned long early_rx;
unsigned long tx_buf_mapped;
unsigned long tx_timeouts;
+ unsigned long rx_lost_in_ring;
};
struct rtl8139_private {
@@ -558,12 +569,8 @@ struct rtl8139_private {
dma_addr_t tx_bufs_dma;
signed char phys[4]; /* MII device addresses. */
char twistie, twist_row, twist_col; /* Twister tune state. */
- unsigned int full_duplex:1; /* Full-duplex operation requested. */
- unsigned int duplex_lock:1;
unsigned int default_port:4; /* Last dev->if_port value. */
- unsigned int media2:4; /* Secondary monitored media port. */
unsigned int medialock:1; /* Don't sense media type. */
- unsigned int mediasense:1; /* Media sensing in progress. */
spinlock_t lock;
chip_t chipset;
pid_t thr_pid;
@@ -572,6 +579,7 @@ struct rtl8139_private {
u32 rx_config;
struct rtl_extra_stats xstats;
int time_to_die;
+ struct mii_if_info mii;
};
MODULE_AUTHOR ("Jeff Garzik <jg...@ma...>");
@@ -582,6 +590,8 @@ MODULE_PARM (multicast_filter_limit, "i"
MODULE_PARM (max_interrupt_work, "i");
MODULE_PARM (media, "1-" __MODULE_STRING(MAX_UNITS) "i");
MODULE_PARM (full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i");
+MODULE_PARM (debug, "i");
+MODULE_PARM_DESC (debug, "8139too bitmapped message enable number");
MODULE_PARM_DESC (multicast_filter_limit, "8139too maximum number of filtered multicast addresses");
MODULE_PARM_DESC (max_interrupt_work, "8139too maximum events handled per interrupt");
MODULE_PARM_DESC (media, "8139too: Bits 4+9: force full duplex, bit 5: 100Mbps");
@@ -970,6 +980,9 @@ static int __devinit rtl8139_init_one (s
spin_lock_init (&tp->lock);
init_waitqueue_head (&tp->thr_wait);
init_completion (&tp->thr_exited);
+ tp->mii.dev = dev;
+ tp->mii.mdio_read = mdio_read;
+ tp->mii.mdio_write = mdio_write;
/* dev is fully set up and ready to use now */
DPRINTK("about to register device named %s (%p)...\n", dev->name, dev);
@@ -1021,18 +1034,18 @@ static int __devinit rtl8139_init_one (s
/* The lower four bits are the media type. */
option = (board_idx >= MAX_UNITS) ? 0 : media[board_idx];
if (option > 0) {
- tp->full_duplex = (option & 0x210) ? 1 : 0;
+ tp->mii.full_duplex = (option & 0x210) ? 1 : 0;
tp->default_port = option & 0xFF;
if (tp->default_port)
tp->medialock = 1;
}
if (board_idx < MAX_UNITS && full_duplex[board_idx] > 0)
- tp->full_duplex = full_duplex[board_idx];
- if (tp->full_duplex) {
+ tp->mii.full_duplex = full_duplex[board_idx];
+ if (tp->mii.full_duplex) {
printk(KERN_INFO "%s: Media type forced to Full Duplex.\n", dev->name);
/* Changing the MII-advertised media because might prevent
re-connection. */
- tp->duplex_lock = 1;
+ tp->mii.duplex_lock = 1;
}
if (tp->default_port) {
printk(KERN_INFO " Forcing %dMbps %s-duplex operation.\n",
@@ -1289,7 +1302,7 @@ static int rtl8139_open (struct net_devi
}
- tp->full_duplex = tp->duplex_lock;
+ tp->mii.full_duplex = tp->mii.duplex_lock;
tp->tx_flag = (TX_FIFO_THRESH << 11) & 0x003f0000;
tp->twistie = 1;
tp->time_to_die = 0;
@@ -1301,7 +1314,7 @@ static int rtl8139_open (struct net_devi
" GP Pins %2.2x %s-duplex.\n",
dev->name, pci_resource_start (tp->pci_dev, 1),
dev->irq, RTL_R8 (MediaStatus),
- tp->full_duplex ? "full" : "half");
+ tp->mii.full_duplex ? "full" : "half");
tp->thr_pid = kernel_thread (rtl8139_thread, dev, CLONE_FS | CLONE_FILES);
if (tp->thr_pid < 0)
@@ -1317,18 +1330,18 @@ static void rtl_check_media (struct net_
struct rtl8139_private *tp = dev->priv;
if (tp->phys[0] >= 0) {
- u16 mii_reg5 = mdio_read(dev, tp->phys[0], 5);
- if (mii_reg5 == 0xffff)
+ u16 mii_lpa = mdio_read(dev, tp->phys[0], MII_LPA);
+ if (mii_lpa == 0xffff)
; /* Not there */
- else if ((mii_reg5 & 0x0100) == 0x0100
- || (mii_reg5 & 0x00C0) == 0x0040)
- tp->full_duplex = 1;
+ else if ((mii_lpa & LPA_100FULL) == LPA_100FULL
+ || (mii_lpa & 0x00C0) == LPA_10FULL)
+ tp->mii.full_duplex = 1;
printk (KERN_INFO"%s: Setting %s%s-duplex based on"
" auto-negotiated partner ability %4.4x.\n",
- dev->name, mii_reg5 == 0 ? "" :
- (mii_reg5 & 0x0180) ? "100mbps " : "10mbps ",
- tp->full_duplex ? "full" : "half", mii_reg5);
+ dev->name, mii_lpa == 0 ? "" :
+ (mii_lpa & 0x0180) ? "100mbps " : "10mbps ",
+ tp->mii.full_duplex ? "full" : "half", mii_lpa);
}
}
@@ -1517,30 +1530,30 @@ static inline void rtl8139_thread_iter (
struct rtl8139_private *tp,
void *ioaddr)
{
- int mii_reg5;
+ int mii_lpa;
- mii_reg5 = mdio_read (dev, tp->phys[0], 5);
+ mii_lpa = mdio_read (dev, tp->phys[0], MII_LPA);
- if (!tp->duplex_lock && mii_reg5 != 0xffff) {
- int duplex = (mii_reg5 & 0x0100)
- || (mii_reg5 & 0x01C0) == 0x0040;
- if (tp->full_duplex != duplex) {
- tp->full_duplex = duplex;
+ if (!tp->mii.duplex_lock && mii_lpa != 0xffff) {
+ int duplex = (mii_lpa & LPA_100FULL)
+ || (mii_lpa & 0x01C0) == 0x0040;
+ if (tp->mii.full_duplex != duplex) {
+ tp->mii.full_duplex = duplex;
- if (mii_reg5) {
+ if (mii_lpa) {
printk (KERN_INFO
"%s: Setting %s-duplex based on MII #%d link"
" partner ability of %4.4x.\n",
dev->name,
- tp->full_duplex ? "full" : "half",
- tp->phys[0], mii_reg5);
+ tp->mii.full_duplex ? "full" : "half",
+ tp->phys[0], mii_lpa);
} else {
printk(KERN_INFO"%s: media is unconnected, link down, or incompatible connection\n",
dev->name);
}
#if 0
RTL_W8 (Cfg9346, Cfg9346_Unlock);
- RTL_W8 (Config1, tp->full_duplex ? 0x60 : 0x20);
+ RTL_W8 (Config1, tp->mii.full_duplex ? 0x60 : 0x20);
RTL_W8 (Cfg9346, Cfg9346_Lock);
#endif
}
@@ -1774,23 +1787,36 @@ static void rtl8139_rx_err (u32 rx_statu
struct rtl8139_private *tp, void *ioaddr)
{
u8 tmp8;
+#ifndef CONFIG_8139_NEW_RX_RESET
int tmp_work;
+#endif
DPRINTK ("%s: Ethernet frame had errors, status %8.8x.\n",
dev->name, rx_status);
- if (rx_status & RxTooLong) {
- DPRINTK ("%s: Oversized Ethernet frame, status %4.4x!\n",
- dev->name, rx_status);
- /* A.C.: The chip hangs here. */
- }
tp->stats.rx_errors++;
- if (rx_status & (RxBadSymbol | RxBadAlign))
- tp->stats.rx_frame_errors++;
- if (rx_status & (RxRunt | RxTooLong))
- tp->stats.rx_length_errors++;
- if (rx_status & RxCRCErr)
- tp->stats.rx_crc_errors++;
+ if (!(rx_status & RxStatusOK)) {
+ if (rx_status & RxTooLong) {
+ DPRINTK ("%s: Oversized Ethernet frame, status %4.4x!\n",
+ dev->name, rx_status);
+ /* A.C.: The chip hangs here. */
+ }
+ if (rx_status & (RxBadSymbol | RxBadAlign))
+ tp->stats.rx_frame_errors++;
+ if (rx_status & (RxRunt | RxTooLong))
+ tp->stats.rx_length_errors++;
+ if (rx_status & RxCRCErr)
+ tp->stats.rx_crc_errors++;
+ } else {
+ tp->xstats.rx_lost_in_ring++;
+ }
+#ifdef CONFIG_8139_NEW_RX_RESET
+ tmp8 = RTL_R8 (ChipCmd);
+ RTL_W8 (ChipCmd, tmp8 & ~CmdRxEnb);
+ RTL_W8 (ChipCmd, tmp8);
+ RTL_W32 (RxConfig, tp->rx_config);
+ tp->cur_rx = 0;
+#else
/* Reset the receiver, based on RealTek recommendation. (Bug?) */
/* disable receive */
@@ -1835,6 +1861,7 @@ static void rtl8139_rx_err (u32 rx_statu
/* A.C.: Reset the multicast list. */
__set_rx_mode (dev);
+#endif
}
static void rtl8139_rx_interrupt (struct net_device *dev,
@@ -1969,13 +1996,13 @@ static void rtl8139_weird_interrupt (str
(tp->drv_flags & HAS_LNK_CHNG)) {
/* Really link-change on new chips. */
int lpar = RTL_R16 (NWayLPAR);
- int duplex = (lpar & 0x0100) || (lpar & 0x01C0) == 0x0040
- || tp->duplex_lock;
- if (tp->full_duplex != duplex) {
- tp->full_duplex = duplex;
+ int duplex = (lpar & LPA_100FULL) || (lpar & 0x01C0) == 0x0040
+ || tp->mii.duplex_lock;
+ if (tp->mii.full_duplex != duplex) {
+ tp->mii.full_duplex = duplex;
#if 0
RTL_W8 (Cfg9346, Cfg9346_Unlock);
- RTL_W8 (Config1, tp->full_duplex ? 0x60 : 0x20);
+ RTL_W8 (Config1, tp->mii.full_duplex ? 0x60 : 0x20);
RTL_W8 (Cfg9346, Cfg9346_Lock);
#endif
}
@@ -2134,48 +2161,6 @@ static int rtl8139_close (struct net_dev
}
-/* Get the ethtool settings. Assumes that eset points to kernel
- memory, *eset has been initialized as {ETHTOOL_GSET}, and other
- threads or interrupts aren't messing with the 8139. */
-static void netdev_get_eset (struct net_device *dev, struct ethtool_cmd *eset)
-{
- struct rtl8139_private *np = dev->priv;
- void *ioaddr = np->mmio_addr;
- u16 advert;
-
- eset->supported = SUPPORTED_10baseT_Half
- | SUPPORTED_10baseT_Full
- | SUPPORTED_100baseT_Half
- | SUPPORTED_100baseT_Full
- | SUPPORTED_Autoneg
- | SUPPORTED_TP;
-
- eset->advertising = ADVERTISED_TP | ADVERTISED_Autoneg;
- advert = mdio_read (dev, np->phys[0], 4);
- if (advert & 0x0020)
- eset->advertising |= ADVERTISED_10baseT_Half;
- if (advert & 0x0040)
- eset->advertising |= ADVERTISED_10baseT_Full;
- if (advert & 0x0080)
- eset->advertising |= ADVERTISED_100baseT_Half;
- if (advert & 0x0100)
- eset->advertising |= ADVERTISED_100baseT_Full;
-
- eset->speed = (RTL_R8 (MediaStatus) & 0x08) ? 10 : 100;
- /* (KON)FIXME: np->full_duplex is set or reset by the thread,
- which means this always shows half duplex if the interface
- isn't up yet, even if it has already autonegotiated. */
- eset->duplex = np->full_duplex ? DUPLEX_FULL : DUPLEX_HALF;
- eset->port = PORT_TP;
- /* (KON)FIXME: Is np->phys[0] correct? starfire.c uses that. */
- eset->phy_address = np->phys[0];
- eset->transceiver = XCVR_INTERNAL;
- eset->autoneg = (mdio_read (dev, np->phys[0], 0) & 0x1000) != 0;
- eset->maxtxpkt = 1;
- eset->maxrxpkt = 1;
-}
-
-
/* Get the ethtool Wake-on-LAN settings. Assumes that wol points to
kernel memory, *wol has been initialized as {ETHTOOL_GWOL}, and
other threads or interrupts aren't messing with the 8139. */
@@ -2250,7 +2235,6 @@ static int netdev_set_wol (struct net_de
return 0;
}
-
static int netdev_ethtool_ioctl (struct net_device *dev, void *useraddr)
{
struct rtl8139_private *np = dev->priv;
@@ -2259,33 +2243,71 @@ static int netdev_ethtool_ioctl (struct
/* dev_ioctl() in ../../net/core/dev.c has already checked
capable(CAP_NET_ADMIN), so don't bother with that here. */
- if (copy_from_user (ðcmd, useraddr, sizeof (ethcmd)))
+ if (get_user(ethcmd, (u32 *)useraddr))
return -EFAULT;
switch (ethcmd) {
- case ETHTOOL_GSET:
- {
- struct ethtool_cmd eset = { ETHTOOL_GSET };
- spin_lock_irq (&np->lock);
- netdev_get_eset (dev, &eset);
- spin_unlock_irq (&np->lock);
- if (copy_to_user (useraddr, &eset, sizeof (eset)))
- return -EFAULT;
- return 0;
- }
- /* TODO: ETHTOOL_SSET */
+ case ETHTOOL_GDRVINFO: {
+ struct ethtool_drvinfo info = { ETHTOOL_GDRVINFO };
+ strcpy (info.driver, DRV_NAME);
+ strcpy (info.version, DRV_VERSION);
+ strcpy (info.bus_info, np->pci_dev->slot_name);
+ if (copy_to_user (useraddr, &info, sizeof (info)))
+ return -EFAULT;
+ return 0;
+ }
- case ETHTOOL_GDRVINFO:
- {
- struct ethtool_drvinfo info = { ETHTOOL_GDRVINFO };
- strcpy (info.driver, DRV_NAME);
- strcpy (info.version, DRV_VERSION);
- strcpy (info.bus_info, np->pci_dev->slot_name);
- if (copy_to_user (useraddr, &info, sizeof (info)))
- return -EFAULT;
- return 0;
- }
+ /* get settings */
+ case ETHTOOL_GSET: {
+ struct ethtool_cmd ecmd = { ETHTOOL_GSET };
+ spin_lock_irq(&np->lock);
+ mii_ethtool_gset(&np->mii, &ecmd);
+ spin_unlock_irq(&np->lock);
+ if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
+ return -EFAULT;
+ return 0;
+ }
+ /* set settings */
+ case ETHTOOL_SSET: {
+ int r;
+ struct ethtool_cmd ecmd;
+ if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
+ return -EFAULT;
+ spin_lock_irq(&np->lock);
+ r = mii_ethtool_sset(&np->mii, &ecmd);
+ spin_unlock_irq(&np->lock);
+ return r;
+ }
+ /* restart autonegotiation */
+ case ETHTOOL_NWAY_RST: {
+ return mii_nway_restart(&np->mii);
+ }
+ /* get link status */
+ case ETHTOOL_GLINK: {
+ struct ethtool_value edata = {ETHTOOL_GLINK};
+ edata.data = mii_link_ok(&np->mii);
+ if (copy_to_user(useraddr, &edata, sizeof(edata)))
+ return -EFAULT;
+ return 0;
+ }
+
+ /* get message-level */
+ case ETHTOOL_GMSGLVL: {
+ struct ethtool_value edata = {ETHTOOL_GMSGLVL};
+ edata.data = debug;
+ if (copy_to_user(useraddr, &edata, sizeof(edata)))
+ return -EFAULT;
+ return 0;
+ }
+ /* set message-level */
+ case ETHTOOL_SMSGLVL: {
+ struct ethtool_value edata;
+ if (copy_from_user(&edata, useraddr, sizeof(edata)))
+ return -EFAULT;
+ debug = edata.data;
+ return 0;
+ }
case ETHTOOL_GWOL:
{
@@ -2325,6 +2347,9 @@ static int netdev_ioctl (struct net_devi
int rc = 0;
int phy = tp->phys[0] & 0x3f;
+ if (!netif_running(dev))
+ return -EINVAL;
+
if (cmd != SIOCETHTOOL) {
/* With SIOCETHTOOL, this would corrupt the pointer. */
data->phy_id &= 0x1f;
@@ -2359,9 +2384,9 @@ static int netdev_ioctl (struct net_devi
/* Check for autonegotiation on or reset. */
tp->medialock = (value & 0x9000) ? 0 : 1;
if (tp->medialock)
- tp->full_duplex = (value & 0x0100) ? 1 : 0;
+ tp->mii.full_duplex = (value & 0x0100) ? 1 : 0;
break;
- case 4: /* tp->advertising = value; */ break;
+ case 4: tp->mii.advertising = value; break;
}
}
mdio_write(dev, data->phy_id, data->reg_num, data->val_in);
Index: drivers/net/Config.in
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/net/Config.in,v
retrieving revision 1.1.1.1.2.2
diff -u -3 -p -r1.1.1.1.2.2 Config.in
--- drivers/net/Config.in 30 Nov 2001 23:03:55 -0000 1.1.1.1.2.2
+++ drivers/net/Config.in 26 Feb 2002 11:37:01 -0000
@@ -36,11 +36,15 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; the
if [ "$CONFIG_PPC" = "y" ]; then
dep_tristate ' MACE (Power Mac ethernet) support' CONFIG_MACE $CONFIG_ALL_PPC
if [ "$CONFIG_MACE" != "n" ]; then
- bool ' Use AAUI port instead of TP by default' CONFIG_MACE_AAUI_PORT
+ bool ' Use AAUI port instead of TP by default' CONFIG_MACE_AAUI_PORT
fi
dep_tristate ' BMAC (G3 ethernet) support' CONFIG_BMAC $CONFIG_ALL_PPC
dep_tristate ' GMAC (G4/iBook ethernet) support' CONFIG_GMAC $CONFIG_ALL_PPC
- tristate ' National DP83902AV (Oak ethernet) support' CONFIG_OAKNET
+ if [ "$CONFIG_4xx" = "y" ]; then
+ if [ "$CONFIG_STB03xxx" = "y" -o "$CONFIG_403GCX" = "y" ]; then
+ tristate ' National DP83902AV (Oak ethernet) support' CONFIG_OAKNET
+ fi
+ fi
fi
if [ "$CONFIG_ZORRO" = "y" ]; then
tristate ' Ariadne support' CONFIG_ARIADNE
@@ -75,7 +79,6 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; the
fi
dep_tristate ' Sun BigMAC 10/100baseT support (EXPERIMENTAL)' CONFIG_SUNBMAC $CONFIG_SBUS $CONFIG_EXPERIMENTAL
dep_tristate ' Sun QuadEthernet support' CONFIG_SUNQE $CONFIG_SBUS
- dep_tristate ' Sun LANCE support' CONFIG_SUNLANCE $CONFIG_SBUS
dep_tristate ' Sun GEM support' CONFIG_SUNGEM $CONFIG_PCI
bool ' 3COM cards' CONFIG_NET_VENDOR_3COM
if [ "$CONFIG_NET_VENDOR_3COM" = "y" ]; then
@@ -173,6 +176,9 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; the
dep_tristate ' Mylex EISA LNE390A/B support (EXPERIMENTAL)' CONFIG_LNE390 $CONFIG_EISA $CONFIG_EXPERIMENTAL
dep_tristate ' Myson MTD-8xx PCI Ethernet support' CONFIG_FEALNX $CONFIG_PCI
dep_tristate ' National Semiconductor DP8381x series PCI Ethernet support' CONFIG_NATSEMI $CONFIG_PCI
+ if [ "$CONFIG_NATSEMI" = "y" -o "$CONFIG_NATSEMI" = "m" ]; then
+ bool ' NatSemi workaround for high errors' CONFIG_NATSEMI_CABLE_MAGIC
+ fi
dep_tristate ' PCI NE2000 and clones support (see help)' CONFIG_NE2K_PCI $CONFIG_PCI
dep_tristate ' Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)' CONFIG_NE3210 $CONFIG_EISA $CONFIG_EXPERIMENTAL
dep_tristate ' Racal-Interlan EISA ES3210 support (EXPERIMENTAL)' CONFIG_ES3210 $CONFIG_EISA $CONFIG_EXPERIMENTAL
@@ -181,6 +187,7 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; the
dep_mbool ' Use PIO instead of MMIO' CONFIG_8139TOO_PIO $CONFIG_8139TOO
dep_mbool ' Support for automatic channel equalization (EXPERIMENTAL)' CONFIG_8139TOO_TUNE_TWISTER $CONFIG_8139TOO $CONFIG_EXPERIMENTAL
dep_mbool ' Support for older RTL-8129/8130 boards' CONFIG_8139TOO_8129 $CONFIG_8139TOO
+ dep_mbool ' Experiment for better RX reset (EXPERIMENTAL)' CONFIG_8139_NEW_RX_RESET $CONFIG_8139TOO $CONFIG_EXPERIMENTAL
dep_mbool ' Support for Dreamcast Broad Band Adaptor' CONFIG_8139TOO_DREAMCAST $CONFIG_8139TOO
dep_tristate ' SiS 900/7016 PCI Fast Ethernet Adapter support' CONFIG_SIS900 $CONFIG_PCI
dep_tristate ' SMC EtherPower II' CONFIG_EPIC100 $CONFIG_PCI
Index: drivers/pci/pci.ids
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/pci/pci.ids,v
retrieving revision 1.1.1.1.2.2
diff -u -3 -p -r1.1.1.1.2.2 pci.ids
--- drivers/pci/pci.ids 30 Nov 2001 23:03:55 -0000 1.1.1.1.2.2
+++ drivers/pci/pci.ids 26 Feb 2002 11:37:02 -0000
@@ -1180,11 +1180,21 @@
0017 Paddington Mac I/O
0018 UniNorth FireWire
0019 KeyLargo USB
- 001e UniNorth PCI
+ 001e UniNorth Internal PCI
001f UniNorth PCI
0020 UniNorth AGP
- 0021 UniNorth GMAC
+ 0021 UniNorth GMAC (Sun GEM)
0022 KeyLargo Mac I/O
+ 0024 UniNorth/Pangea GMAC (Sun GEM)
+ 0025 KeyLargo/Pangea Mac I/O
+ 0026 KeyLargo/Pangea USB
+ 0027 UniNorth/Pangea AGP
+ 0028 UniNorth/Pangea PCI
+ 0029 UniNorth/Pangea Internal PCI
+ 002d UniNorth 1.5 AGP
+ 002e UniNorth 1.5 PCI
+ 002f UniNorth 1.5 Internal PCI
+ 0030 UniNorth/Pangea FireWire
106c Hyundai Electronics America
8801 Dual Pentium ISA/PCI Motherboard
8802 PowerPC ISA/PCI Motherboard
@@ -2602,6 +2612,8 @@
0005 ATP850UF
0006 ATP860 NO-BIOS
0007 ATP860
+ 0008 ATP865 NO-ROM
+ 0009 ATP865
8002 AEC6710 SCSI-2 Host Adapter
8010 AEC6712UW SCSI
8020 AEC6712U SCSI
Index: include/asm-sh/pci.h
===================================================================
RCS file: /cvsroot/linuxsh/linux/include/asm-sh/pci.h,v
retrieving revision 1.1.1.1.2.1
diff -u -3 -p -r1.1.1.1.2.1 pci.h
--- include/asm-sh/pci.h 30 Oct 2001 23:22:18 -0000 1.1.1.1.2.1
+++ include/asm-sh/pci.h 26 Feb 2002 11:37:02 -0000
@@ -89,6 +89,31 @@ static inline dma_addr_t pci_map_single(
return virt_to_bus(ptr);
}
+/* pci_unmap_{single,page} being a nop depends upon the
+ * configuration.
+ */
+#ifdef CONFIG_SH_PCIDMA_NONCOHERENT
+#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) \
+ dma_addr_t ADDR_NAME;
+#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) \
+ __u32 LEN_NAME;
+#define pci_unmap_addr(PTR, ADDR_NAME) \
+ ((PTR)->ADDR_NAME)
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \
+ (((PTR)->ADDR_NAME) = (VAL))
+#define pci_unmap_len(PTR, LEN_NAME) \
+ ((PTR)->LEN_NAME)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL) \
+ (((PTR)->LEN_NAME) = (VAL))
+#else
+#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
+#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)
+#define pci_unmap_addr(PTR, ADDR_NAME) (0)
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0)
+#define pci_unmap_len(PTR, LEN_NAME) (0)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0)
+#endif
+
/* Unmap a single streaming mode DMA translation. The dma_addr and size
* must match what was provided for in a previous pci_map_single call. All
* other usages are undefined.
Index: include/asm-sh/unistd.h
===================================================================
RCS file: /cvsroot/linuxsh/linux/include/asm-sh/unistd.h,v
retrieving revision 1.1.1.1
diff -u -3 -p -r1.1.1.1 unistd.h
--- include/asm-sh/unistd.h 15 Oct 2001 20:45:10 -0000 1.1.1.1
+++ include/asm-sh/unistd.h 26 Feb 2002 11:37:02 -0000
@@ -231,6 +231,9 @@
#define __NR_madvise 219
#define __NR_getdents64 220
#define __NR_fcntl64 221
+#define __NR_security 223 /* syscall for security modules */
+#define __NR_gettid 224
+#define __NR_readahead 225
/* user-visible error numbers are in the range -1 - -125: see <asm-sh/errno.h> */
Index: kernel/ptrace.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/kernel/ptrace.c,v
retrieving revision 1.1.1.1.2.2
diff -u -3 -p -r1.1.1.1.2.2 ptrace.c
--- kernel/ptrace.c 24 Jan 2002 10:15:32 -0000 1.1.1.1.2.2
+++ kernel/ptrace.c 26 Feb 2002 11:37:02 -0000
@@ -174,6 +174,7 @@ int access_process_vm(struct task_struct
put_page(page);
len -= bytes;
buf += bytes;
+ addr += bytes;
}
up_read(&mm->mmap_sem);
mmput(mm);
Index: mm/memory.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/mm/memory.c,v
retrieving revision 1.1.1.1.2.4
diff -u -3 -p -r1.1.1.1.2.4 memory.c
--- mm/memory.c 24 Jan 2002 10:15:32 -0000 1.1.1.1.2.4
+++ mm/memory.c 26 Feb 2002 11:37:02 -0000
@@ -177,7 +177,7 @@ int copy_page_range(struct mm_struct *ds
pgd_t * src_pgd, * dst_pgd;
unsigned long address = vma->vm_start;
unsigned long end = vma->vm_end;
- unsigned long cow = (vma->vm_flags & (VM_SHARED | VM_WRITE)) == VM_WRITE;
+ unsigned long cow = (vma->vm_flags & (VM_SHARED | VM_MAYWRITE)) == VM_MAYWRITE;
src_pgd = pgd_offset(src, address)-1;
dst_pgd = pgd_offset(dst, address)-1;
@@ -245,7 +245,7 @@ skip_copy_pte_range: address = (address
goto cont_copy_pte_range;
/* If it's a COW mapping, write protect it both in the parent and the child */
- if (cow) {
+ if (cow && pte_write(pte)) {
ptep_set_wrprotect(src_pte);
pte = *src_pte;
}
@@ -442,23 +442,34 @@ static inline struct page * get_page_map
return page;
}
+/*
+ * Please read Documentation/cachetlb.txt before using this function,
+ * accessing foreign memory spaces can cause cache coherency problems.
+ *
+ * Accessing a VM_IO area is even more dangerous, therefore the function
+ * fails if pages is != NULL and a VM_IO area is found.
+ */
int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, unsigned long start,
int len, int write, int force, struct page **pages, struct vm_area_struct **vmas)
{
- int i = 0;
+ int i;
+ unsigned int flags;
+
+ /*
+ * Require read or write permissions.
+ * If 'force' is set, we only require the "MAY" flags.
+ */
+ flags = write ? (VM_WRITE | VM_MAYWRITE) : (VM_READ | VM_MAYREAD);
+ flags &= force ? (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
+ i = 0;
do {
struct vm_area_struct * vma;
vma = find_extend_vma(mm, start);
- if ( !vma ||
- (!force &&
- ((write && (!(vma->vm_flags & VM_WRITE))) ||
- (!write && (!(vma->vm_flags & VM_READ))) ) )) {
- if (i) return i;
- return -EFAULT;
- }
+ if ( !vma || (pages && vma->vm_flags & VM_IO) || !(flags & vma->vm_flags) )
+ return i ? : -EFAULT;
spin_lock(&mm->page_table_lock);
do {
@@ -486,8 +497,9 @@ int get_user_pages(struct task_struct *t
/* FIXME: call the correct function,
* depending on the type of the found page
*/
- if (pages[i])
- page_cache_get(pages[i]);
+ if (!pages[i])
+ goto bad_page;
+ page_cache_get(pages[i]);
}
if (vmas)
vmas[i] = vma;
@@ -497,7 +509,19 @@ int get_user_pages(struct task_struct *t
} while(len && start < vma->vm_end);
spin_unlock(&mm->page_table_lock);
} while(len);
+out:
return i;
+
+ /*
+ * We found an invalid page in the VMA. Release all we have
+ * so far and fail.
+ */
+bad_page:
+ spin_unlock(&mm->page_table_lock);
+ while (i--)
+ page_cache_release(pages[i]);
+ i = -EFAULT;
+ goto out;
}
/*
|
