From: NIIBE Y. <gn...@m1...> - 2001-12-14 06:55:45
|
I think this is good to apply to branch and trunk. 2001-12-14 NIIBE Yutaka <gn...@m1...> * include/asm-sh/hitachi_se.h (PA_BCR): Comment fix to sync mainline. * drivers/block/rd.c (initrd_read): Don't need to flush the cache. (This file can be removed.) * include/linux/highmem.h (memclear_highpage_flush): Likewise. Index: drivers/block/rd.c =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/block/rd.c,v retrieving revision 1.2 diff -u -3 -p -r1.2 rd.c --- drivers/block/rd.c 2001/12/03 22:15:34 1.2 +++ drivers/block/rd.c 2001/12/14 06:53:02 @@ -399,7 +399,6 @@ static ssize_t initrd_read(struct file * if (count > left) count = left; if (count == 0) return 0; copy_to_user(buf, (char *)initrd_start + *ppos, count); - flush_cache_all(); *ppos += count; return count; } Index: include/asm-sh/hitachi_se.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/hitachi_se.h,v retrieving revision 1.2 diff -u -3 -p -r1.2 hitachi_se.h --- include/asm-sh/hitachi_se.h 2001/10/16 21:33:00 1.2 +++ include/asm-sh/hitachi_se.h 2001/12/14 06:53:02 @@ -36,7 +36,7 @@ #define PA_DIPSW0 0xb0800000 /* Dip switch 5,6 */ #define PA_DIPSW1 0xb0800002 /* Dip switch 7,8 */ #define PA_LED 0xb0c00000 /* LED */ -#define PA_BCR 0xb1400000 /* FPGA on the MS7750SE01 */ +#define PA_BCR 0xb1400000 /* FPGA */ #define PA_MRSHPC 0xb83fffe0 /* MR-SHPC-01 PCMCIA controller */ #define PA_MRSHPC_MW1 0xb8400000 /* MR-SHPC-01 memory window base */ Index: include/linux/highmem.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/linux/highmem.h,v retrieving revision 1.1.1.1 diff -u -3 -p -r1.1.1.1 highmem.h --- include/linux/highmem.h 2001/10/15 20:45:12 1.1.1.1 +++ include/linux/highmem.h 2001/12/14 06:53:02 @@ -78,7 +78,6 @@ static inline void memclear_highpage_flu BUG(); kaddr = kmap(page); memset(kaddr + offset, 0, size); - flush_dcache_page(page); flush_page_to_ram(page); kunmap(page); } -- |