Menu
▾
▴
[linuxsh-dev] 2.5.12
|
From: NIIBE Y. <gn...@m1...> - 2002-05-01 06:17:28
|
Changes from mainline.
2002-05-01 NIIBE Yutaka <gn...@m1...>
* AGAINST-2.5.12: New file.
* AGAINST-2.5.11: Removed.
* Makefile: Version 2.5.12.
* arch/sh/mm/init.c, drivers/block/rd.c, drivers/char/Makefile,
drivers/pci/pci.ids, fs/nfs/inode.c, mm/memory.c: Incorporate
changes in 2.5.12.
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/Makefile,v
retrieving revision 1.19
diff -u -3 -p -r1.19 Makefile
--- Makefile 1 May 2002 01:10:47 -0000 1.19
+++ Makefile 1 May 2002 06:15:08 -0000
@@ -1,6 +1,6 @@
VERSION = 2
PATCHLEVEL = 5
-SUBLEVEL = 11
+SUBLEVEL = 12
EXTRAVERSION =-sh
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
Index: arch/sh/mm/init.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/mm/init.c,v
retrieving revision 1.2
diff -u -3 -p -r1.2 init.c
--- arch/sh/mm/init.c 12 Apr 2002 04:26:28 -0000 1.2
+++ arch/sh/mm/init.c 1 May 2002 06:15:08 -0000
@@ -74,7 +74,7 @@ void show_mem(void)
printk("%d reserved pages\n",reserved);
printk("%d pages shared\n",shared);
printk("%d pages swap cached\n",cached);
- show_buffers();
+ printk("%ld buffermem pages\n", nr_buffermem_pages());
}
/* References to section boundaries */
Index: drivers/block/rd.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/block/rd.c,v
retrieving revision 1.9
diff -u -3 -p -r1.9 rd.c
--- drivers/block/rd.c 1 May 2002 01:10:47 -0000 1.9
+++ drivers/block/rd.c 1 May 2002 06:15:08 -0000
@@ -106,19 +106,19 @@ int rd_blocksize = BLOCK_SIZE; /* bloc
*/
static int ramdisk_readpage(struct file *file, struct page * page)
{
- if (!Page_Uptodate(page)) {
+ if (!PageUptodate(page)) {
memset(kmap(page), 0, PAGE_CACHE_SIZE);
kunmap(page);
flush_dcache_page(page);
SetPageUptodate(page);
}
- UnlockPage(page);
+ unlock_page(page);
return 0;
}
static int ramdisk_prepare_write(struct file *file, struct page *page, unsigned offset, unsigned to)
{
- if (!Page_Uptodate(page)) {
+ if (!PageUptodate(page)) {
void *addr = page_address(page);
memset(addr, 0, PAGE_CACHE_SIZE);
flush_dcache_page(page);
@@ -173,7 +173,7 @@ static int rd_blkdev_pagecache_IO(int rw
goto out;
err = 0;
- if (!Page_Uptodate(page)) {
+ if (!PageUptodate(page)) {
memset(kmap(page), 0, PAGE_CACHE_SIZE);
kunmap(page);
SetPageUptodate(page);
@@ -206,7 +206,7 @@ static int rd_blkdev_pagecache_IO(int rw
SetPageDirty(page);
}
if (unlock)
- UnlockPage(page);
+ unlock_page(page);
__free_page(page);
} while (size);
Index: drivers/char/Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/char/Makefile,v
retrieving revision 1.6
diff -u -3 -p -r1.6 Makefile
--- drivers/char/Makefile 1 May 2002 01:10:47 -0000 1.6
+++ drivers/char/Makefile 1 May 2002 06:15:08 -0000
@@ -16,7 +16,8 @@ obj-y += mem.o tty_io.o n_tty.o tty_ioc
export-objs := busmouse.o console.o keyboard.o sysrq.o \
misc.o pty.o random.o selection.o serial.o \
- sonypi.o tty_io.o tty_ioctl.o generic_serial.o rtc.o
+ sonypi.o tty_io.o tty_ioctl.o generic_serial.o rtc.o \
+ ip2main.o
mod-subdirs := ftape drm pcmcia
Index: drivers/pci/pci.ids
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/pci/pci.ids,v
retrieving revision 1.9
diff -u -3 -p -r1.9 pci.ids
--- drivers/pci/pci.ids 1 May 2002 00:36:45 -0000 1.9
+++ drivers/pci/pci.ids 1 May 2002 06:15:08 -0000
@@ -5100,9 +5100,11 @@
244b 82820 820 (Camino 2) Chipset IDE U100
244c 82820 820 (Camino 2) Chipset ISA Bridge (ICH2-M)
244e 82820 820 (Camino 2) Chipset PCI
+ 245b 82801E C-ICH IDE
2485 AC'97 Audio Controller
248a 82801CAM ICH3-M IDE
248b 82801CA ICH3 IDE
+ 24cb 82801DB ICH4 IDE
2500 82820 820 (Camino) Chipset Host Bridge (MCH)
1043 801c P3C-2000 system chipset
2501 82820 820 (Camino) Chipset Host Bridge (MCH)
Index: fs/nfs/inode.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/fs/nfs/inode.c,v
retrieving revision 1.4
diff -u -3 -p -r1.4 inode.c
--- fs/nfs/inode.c 10 Apr 2002 11:09:39 -0000 1.4
+++ fs/nfs/inode.c 1 May 2002 06:15:08 -0000
@@ -751,7 +751,8 @@ printk("nfs_notify_change: revalidate fa
if (!S_ISREG(inode->i_mode))
attr->ia_valid &= ~ATTR_SIZE;
- filemap_fdatasync(inode->i_mapping);
+ filemap_fdatawait(inode->i_mapping);
+ filemap_fdatawrite(inode->i_mapping);
error = nfs_wb_all(inode);
filemap_fdatawait(inode->i_mapping);
if (error)
Index: mm/memory.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/mm/memory.c,v
retrieving revision 1.11
diff -u -3 -p -r1.11 memory.c
--- mm/memory.c 1 May 2002 01:10:47 -0000 1.11
+++ mm/memory.c 1 May 2002 06:15:08 -0000
@@ -653,7 +653,7 @@ void unmap_kiobuf (struct kiobuf *iobuf)
map = iobuf->maplist[i];
if (map) {
if (iobuf->locked)
- UnlockPage(map);
+ unlock_page(map);
/* FIXME: cache flush missing for rw==READ
* FIXME: call the correct reference counting function
*/
@@ -698,11 +698,11 @@ int lock_kiovec(int nr, struct kiobuf *i
if (!page)
continue;
- if (TryLockPage(page)) {
+ if (TestSetPageLocked(page)) {
while (j--) {
struct page *tmp = *--ppage;
if (tmp)
- UnlockPage(tmp);
+ unlock_page(tmp);
}
goto retry;
}
@@ -738,7 +738,7 @@ int lock_kiovec(int nr, struct kiobuf *i
return -EINVAL;
/* Try again... */
- wait_on_page(page);
+ wait_on_page_locked(page);
}
if (++repeat < 16)
@@ -768,7 +768,7 @@ int unlock_kiovec(int nr, struct kiobuf
page = *ppage;
if (!page)
continue;
- UnlockPage(page);
+ unlock_page(page);
}
}
return 0;
@@ -984,7 +984,7 @@ static int do_wp_page(struct mm_struct *
if (!VALID_PAGE(old_page))
goto bad_wp_page;
- if (!TryLockPage(old_page)) {
+ if (!TestSetPageLocked(old_page)) {
int reuse = can_share_swap_page(old_page);
unlock_page(old_page);
if (reuse) {
|
