Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/thorpej_scsipi]: src/sys Make sure files that shouldn't change are ident...
details: https://anonhg.NetBSD.org/src/rev/2fba2dd41568
branches: thorpej_scsipi
changeset: 477406:2fba2dd41568
user: bouyer <bouyer%NetBSD.org@localhost>
date: Fri Mar 23 11:38:27 2001 +0000
description:
Make sure files that shouldn't change are identical to HEAD.
diffstat:
sys/arch/alpha/conf/TCWSCONS | 4 +-
sys/arch/arm32/include/param.h | 4 ++-
sys/arch/ofppc/ofppc/locore.S | 18 +------------
sys/arch/sandpoint/sandpoint/machdep.c | 48 +---------------------------------
sys/uvm/uvm_vnode.c | 26 +-----------------
5 files changed, 8 insertions(+), 92 deletions(-)
diffs (166 lines):
diff -r 8efb48d8a514 -r 2fba2dd41568 sys/arch/alpha/conf/TCWSCONS
--- a/sys/arch/alpha/conf/TCWSCONS Fri Mar 23 11:35:16 2001 +0000
+++ b/sys/arch/alpha/conf/TCWSCONS Fri Mar 23 11:38:27 2001 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: TCWSCONS,v 1.3.2.4 2001/03/12 13:27:05 bouyer Exp $
+# $NetBSD: TCWSCONS,v 1.3.2.5 2001/03/23 11:38:27 bouyer Exp $
#
# TURBOchannel Alpha DEC3000
include "arch/alpha/conf/std.alpha"
-#ident "GENERIC-$Revision: 1.3.2.4 $"
+#ident "TCWSCONS-$Revision: 1.3.2.5 $"
maxusers 32
diff -r 8efb48d8a514 -r 2fba2dd41568 sys/arch/arm32/include/param.h
--- a/sys/arch/arm32/include/param.h Fri Mar 23 11:35:16 2001 +0000
+++ b/sys/arch/arm32/include/param.h Fri Mar 23 11:38:27 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.15.8.2 2001/03/12 13:27:41 bouyer Exp $ */
+/* $NetBSD: param.h,v 1.15.8.3 2001/03/23 11:38:27 bouyer Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -44,4 +44,6 @@
#define _MACHINE_ARCH arm32
#define MACHINE_ARCH "arm32"
+#include <arm/arm32/param.h>
+
#endif /* _ARM32_PARAM_H_ */
diff -r 8efb48d8a514 -r 2fba2dd41568 sys/arch/ofppc/ofppc/locore.S
--- a/sys/arch/ofppc/ofppc/locore.S Fri Mar 23 11:35:16 2001 +0000
+++ b/sys/arch/ofppc/ofppc/locore.S Fri Mar 23 11:38:27 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.11.8.5 2001/03/12 13:29:11 bouyer Exp $ */
+/* $NetBSD: locore.S,v 1.11.8.6 2001/03/23 11:38:28 bouyer Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -239,22 +239,6 @@
#include <powerpc/powerpc/locore_subr.S>
/*
- * Child comes here at the end of a fork.
- * Mostly similar to the above.
- */
- .globl _C_LABEL(fork_trampoline)
-_C_LABEL(fork_trampoline):
- xor 3,3,3
- lis 4,_C_LABEL(machine_interface)+SPLX@ha
- lwz 0,_C_LABEL(machine_interface)+SPLX@l(4)
- mtlr 0
- blrl
- mtlr 31
- mr 3,30
- blrl /* jump indirect to r31 */
- b trapexit
-
-/*
* Pull in common trap vector code.
*/
#include <powerpc/powerpc/trap_subr.S>
diff -r 8efb48d8a514 -r 2fba2dd41568 sys/arch/sandpoint/sandpoint/machdep.c
--- a/sys/arch/sandpoint/sandpoint/machdep.c Fri Mar 23 11:35:16 2001 +0000
+++ b/sys/arch/sandpoint/sandpoint/machdep.c Fri Mar 23 11:38:27 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.3.2.3 2001/03/12 13:29:17 bouyer Exp $ */
+/* $NetBSD: machdep.c,v 1.3.2.4 2001/03/23 11:38:28 bouyer Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -372,52 +372,6 @@
}
void
-identifycpu()
-{
- int pvr;
-
- /*
- * Find cpu type
- */
- asm ("mfpvr %0" : "=r"(pvr));
- cpu = pvr >> 16;
- switch (cpu) {
- case 1:
- sprintf(cpu_model, "601");
- break;
- case 3:
- sprintf(cpu_model, "603");
- break;
- case 4:
- sprintf(cpu_model, "604");
- break;
- case 5:
- sprintf(cpu_model, "602");
- break;
- case 6:
- sprintf(cpu_model, "603e");
- break;
- case 7:
- sprintf(cpu_model, "603ev");
- break;
- case 9:
- sprintf(cpu_model, "604ev");
- break;
- case 20:
- sprintf(cpu_model, "620");
- break;
- case 0x81:
- sprintf(cpu_model, "8240");
- break;
- default:
- sprintf(cpu_model, "Version %x", cpu);
- break;
- }
- sprintf(cpu_model + strlen(cpu_model), " (Revision %x)", pvr & 0xffff);
- printf("CPU: %s %s\n", cpu_name, cpu_model);
-}
-
-void
install_extint(handler)
void (*handler) __P((void));
{
diff -r 8efb48d8a514 -r 2fba2dd41568 sys/uvm/uvm_vnode.c
--- a/sys/uvm/uvm_vnode.c Fri Mar 23 11:35:16 2001 +0000
+++ b/sys/uvm/uvm_vnode.c Fri Mar 23 11:38:27 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_vnode.c,v 1.26.2.7 2001/03/12 13:32:15 bouyer Exp $ */
+/* $NetBSD: uvm_vnode.c,v 1.26.2.8 2001/03/23 11:38:28 bouyer Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -614,30 +614,6 @@
* ppsp/npages.
*/
- if (result == VM_PAGER_AGAIN) {
-
- /*
- * it is unlikely, but page could have been released
- * while we had the object lock dropped. we ignore
- * this now and retry the I/O. we will detect and
- * handle the released page after the syncio I/O
- * completes.
- */
-#ifdef DIAGNOSTIC
- if (flags & PGO_SYNCIO)
- panic("uvn_flush: PGO_SYNCIO return 'try again' error (impossible)");
-#endif
- flags |= PGO_SYNCIO;
- goto ReTry;
- }
-
- /*
- * the cleaning operation is now done. finish up. note that
- * on error (!OK, !PEND) uvm_pager_put drops the cluster for us.
- * if success (OK, PEND) then uvm_pager_put returns the cluster
- * to us in ppsp/npages.
- */
-
/*
* for pending async i/o if we are not deactivating/freeing
* we can move on to the next page.
Home |
Main Index |
Thread Index |
Old Index