diff options
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/defconfig | 7 | ||||
| -rw-r--r-- | arch/sparc/kernel/sys_sunos.c | 7 | ||||
| -rw-r--r-- | arch/sparc/mm/srmmu.c | 9 | ||||
| -rw-r--r-- | arch/sparc/mm/sun4c.c | 9 |
4 files changed, 18 insertions, 14 deletions
diff --git a/arch/sparc/defconfig b/arch/sparc/defconfig index 9d64ee85d..80e114585 100644 --- a/arch/sparc/defconfig +++ b/arch/sparc/defconfig @@ -42,7 +42,7 @@ SUN_FB_CGFOURTEEN=y SUN_FB_BWTWO=y SUN_FB_LEO=y TADPOLE_FB_WEITEK=y -#SUN_FB_CREATOR is not set +SUN_FB_CREATOR=y # # Misc Linux/SPARC drivers @@ -180,15 +180,12 @@ CONFIG_MYRI_SBUS=m # Filesystems # CONFIG_QUOTA=y -# CONFIG_DCACHE_PRELOAD is not set -# CONFIG_OMIRR is not set -# CONFIG_TRANS_NAMES is not set CONFIG_MINIX_FS=m CONFIG_EXT2_FS=y CONFIG_FAT_FS=m CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=m -CONFIG_UMSDOS_FS=m +# CONFIG_UMSDOS_FS is not set CONFIG_PROC_FS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y diff --git a/arch/sparc/kernel/sys_sunos.c b/arch/sparc/kernel/sys_sunos.c index 5d0ea0840..f60ecbe9c 100644 --- a/arch/sparc/kernel/sys_sunos.c +++ b/arch/sparc/kernel/sys_sunos.c @@ -1,4 +1,4 @@ -/* $Id: sys_sunos.c,v 1.80 1997/07/17 02:20:22 davem Exp $ +/* $Id: sys_sunos.c,v 1.81 1997/07/20 05:59:31 davem Exp $ * sys_sunos.c: SunOS specific syscall compatibility support. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) @@ -842,8 +842,9 @@ asmlinkage int sunos_nfs_mount(char *dir_name, int linux_flags, void *data) linux_nfs_mount.acdirmin = sunos_mount->acdirmin; linux_nfs_mount.acdirmax = sunos_mount->acdirmax; - if (getname (sunos_mount->hostname, &the_name)) - return -EFAULT; + the_name = getname(sunos_mount->hostname); + if(IS_ERR(the_name)) + return PTR_ERR(the_name); strncpy (linux_nfs_mount.hostname, the_name, 254); linux_nfs_mount.hostname [255] = 0; diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index 3b9970551..ad9aa8953 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c @@ -1,4 +1,4 @@ -/* $Id: srmmu.c,v 1.148 1997/06/24 15:48:02 jj Exp $ +/* $Id: srmmu.c,v 1.149 1997/07/20 05:59:34 davem Exp $ * srmmu.c: SRMMU specific routines for memory management. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) @@ -2214,7 +2214,8 @@ static void srmmu_vac_update_mmu_cache(struct vm_area_struct * vma, { if((vma->vm_flags & (VM_WRITE|VM_SHARED)) == (VM_WRITE|VM_SHARED)) { struct vm_area_struct *vmaring; - struct inode *inode; + struct dentry *dentry; + struct inode *inode = NULL; unsigned long flags, offset, vaddr, start; int alias_found = 0; pgd_t *pgdp; @@ -2223,7 +2224,9 @@ static void srmmu_vac_update_mmu_cache(struct vm_area_struct * vma, save_and_cli(flags); - inode = vma->vm_inode; + dentry = vma->vm_dentry; + if(dentry) + inode = dentry->d_inode; if (!inode) goto done; offset = (address & PAGE_MASK) - vma->vm_start; diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c index a0ffc10ed..7ffca1033 100644 --- a/arch/sparc/mm/sun4c.c +++ b/arch/sparc/mm/sun4c.c @@ -1,4 +1,4 @@ -/* $Id: sun4c.c,v 1.148 1997/05/18 21:11:19 davem Exp $ +/* $Id: sun4c.c,v 1.149 1997/07/20 05:59:38 davem Exp $ * sun4c.c: Doing in software what should be done in hardware. * * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) @@ -2435,11 +2435,14 @@ static pgd_t *sun4c_pgd_alloc(void) */ static void sun4c_vac_alias_fixup(struct vm_area_struct *vma, unsigned long address, pte_t pte) { - struct inode *inode; + struct dentry *dentry; + struct inode *inode = NULL; pgd_t *pgdp; pte_t *ptep; - inode = vma->vm_inode; + dentry = vma->vm_dentry; + if(dentry) + inode = dentry->d_inode; if(inode) { unsigned long offset = (address & PAGE_MASK) - vma->vm_start; struct vm_area_struct *vmaring = inode->i_mmap; |