CVS commit: src/sys/dev/usb
Module Name:src
Committed By: cegger
Date: Sat May 29 06:44:23 UTC 2010
Modified Files:
src/sys/dev/usb: usb_subr.c
Log Message:
unload usbverbose, not pciverbose
To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 src/sys/dev/usb/usb_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.169 src/sys/dev/usb/usb_subr.c:1.170
--- src/sys/dev/usb/usb_subr.c:1.169 Sat May 29 01:14:29 2010
+++ src/sys/dev/usb/usb_subr.c Sat May 29 06:44:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr.c,v 1.169 2010/05/29 01:14:29 pgoyette Exp $ */
+/* $NetBSD: usb_subr.c,v 1.170 2010/05/29 06:44:22 cegger Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.169 2010/05/29 01:14:29 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.170 2010/05/29 06:44:22 cegger Exp $");
#include "opt_compat_netbsd.h"
#include "opt_usbverbose.h"
@@ -132,7 +132,7 @@
if (loaded == 0)
return;
if (--loaded == 0)
- module_unload("pciverbose");
+ module_unload("usbverbose");
}
const char *
CVS commit: src/sys
Module Name:src
Committed By: rmind
Date: Sat May 29 05:53:57 UTC 2010
Modified Files:
src/sys/arch/x86/x86: cpu_topology.c
src/sys/sys: cpu_data.h
Log Message:
Rename ci_node_id to ci_package_id, as some claim that the former might
be confused with NUMA node.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x86/x86/cpu_topology.c
cvs rdiff -u -r1.30 -r1.31 src/sys/sys/cpu_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/cpu_topology.c
diff -u src/sys/arch/x86/x86/cpu_topology.c:1.5 src/sys/arch/x86/x86/cpu_topology.c:1.6
--- src/sys/arch/x86/x86/cpu_topology.c:1.5 Sun May 9 20:32:41 2010
+++ src/sys/arch/x86/x86/cpu_topology.c Sat May 29 05:53:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_topology.c,v 1.5 2010/05/09 20:32:41 rmind Exp $ */
+/* $NetBSD: cpu_topology.c,v 1.6 2010/05/29 05:53:57 rmind Exp $ */
/*-
* Copyright (c) 2009 Mindaugas Rasiukevicius ,
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu_topology.c,v 1.5 2010/05/09 20:32:41 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_topology.c,v 1.6 2010/05/29 05:53:57 rmind Exp $");
#include
#include
@@ -60,7 +60,7 @@
cpu_family = CPUID2FAMILY(ci->ci_signature);
/* Initial values. */
- ci->ci_node_id = apic_id;
+ ci->ci_package_id = apic_id;
ci->ci_core_id = 0;
ci->ci_smt_id = 0;
@@ -161,7 +161,7 @@
}
if (smt_bits + core_bits) {
- ci->ci_node_id = apic_id >> (smt_bits + core_bits);
+ ci->ci_package_id = apic_id >> (smt_bits + core_bits);
}
if (core_bits) {
u_int core_mask = __BITS(smt_bits, smt_bits + core_bits - 1);
Index: src/sys/sys/cpu_data.h
diff -u src/sys/sys/cpu_data.h:1.30 src/sys/sys/cpu_data.h:1.31
--- src/sys/sys/cpu_data.h:1.30 Sun May 9 20:18:40 2010
+++ src/sys/sys/cpu_data.h Sat May 29 05:53:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_data.h,v 1.30 2010/05/09 20:18:40 rmind Exp $ */
+/* $NetBSD: cpu_data.h,v 1.31 2010/05/29 05:53:57 rmind Exp $ */
/*-
* Copyright (c) 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
lwp_t *cpu_onproc; /* bottom level LWP */
CIRCLEQ_ENTRY(cpu_info) cpu_qchain; /* circleq of all CPUs */
- cpuid_t cpu_node_id;
+ cpuid_t cpu_package_id;
cpuid_t cpu_core_id;
cpuid_t cpu_smt_id;
@@ -114,7 +114,7 @@
#define ci_spin_locks2 ci_data.cpu_spin_locks2
#define ci_lkdebug_recurse ci_data.cpu_lkdebug_recurse
-#define ci_node_id ci_data.cpu_node_id
+#define ci_package_id ci_data.cpu_package_id
#define ci_core_id ci_data.cpu_core_id
#define ci_smt_id ci_data.cpu_smt_id
CVS commit: xsrc/external/mit/xf86-video-vmware/dist/src
Module Name:xsrc
Committed By: mrg
Date: Sat May 29 05:11:48 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-vmware/dist/src: vmwaremodule.c
Log Message:
avoid vmware module crashing with "X -configure".
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c
diff -u xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c:1.2 xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c:1.3
--- xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c:1.2 Sun May 23 06:36:09 2010
+++ xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c Sat May 29 05:11:48 2010
@@ -152,7 +152,7 @@
int vmware_devices;
int matched;
char *driver_name;
-GDevPtr *gdevs;
+GDevPtr *gdevs = NULL;
GDevPtr gdev;
int i;
@@ -173,7 +173,7 @@
matched = vmwlegacy_devices;
}
-for (i = 0; i < vmware_devices; i++) {
+for (i = 0; gdevs && i < vmware_devices; i++) {
gdev = gdevs[i];
gdev->driver = driver_name;
}
CVS commit: src
Module Name:src
Committed By: pgoyette
Date: Sat May 29 01:14:30 UTC 2010
Modified Files:
src/distrib/sets/lists/modules: mi
src/sys/dev/usb: files.usb usb.c usb_subr.c
src/sys/modules: Makefile
Added Files:
src/sys/dev/usb: usb_verbose.c usb_verbose.h
src/sys/modules/usbverbose: Makefile
Log Message:
Extract USBVERBOSE into a kernel module. The module can be builtin
by defining 'options USBVERBOSE' in the kernel config file (no change
from current behavior), or it can be loaded at boot time on those
architectures that support the boot loader's "load" command.
The module is built for all architectures, whether or not USB support
exists.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.97 -r1.98 src/sys/dev/usb/files.usb
cvs rdiff -u -r1.120 -r1.121 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.168 -r1.169 src/sys/dev/usb/usb_subr.c
cvs rdiff -u -r0 -r1.1 src/sys/dev/usb/usb_verbose.c \
src/sys/dev/usb/usb_verbose.h
cvs rdiff -u -r1.42 -r1.43 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/usbverbose/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.14 src/distrib/sets/lists/modules/mi:1.15
--- src/distrib/sets/lists/modules/mi:1.14 Mon May 24 20:29:41 2010
+++ src/distrib/sets/lists/modules/mi Sat May 29 01:14:30 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.14 2010/05/24 20:29:41 pgoyette Exp $
+# $NetBSD: mi,v 1.15 2010/05/29 01:14:30 pgoyette Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -124,6 +124,8 @@
./@MODULEDIR@/umap/umap.kmod base-kernel-modules kmod
./@MODULEDIR@/unionbase-kernel-modules kmod
./@MODULEDIR@/union/union.kmod base-kernel-modules kmod
+./@MODULEDIR@/usbverbose base-kernel-modules kmod
+./@MODULEDIR@/usbverbose/usbverbose.kmod base-kernel-modules kmod
./@MODULEDIR@/vnd base-kernel-modules kmod
./@MODULEDIR@/vnd/vnd.kmod base-kernel-modules kmod
./@MODULEDIR@/zfsbase-kernel-modules kmod,zfs
Index: src/sys/dev/usb/files.usb
diff -u src/sys/dev/usb/files.usb:1.97 src/sys/dev/usb/files.usb:1.98
--- src/sys/dev/usb/files.usb:1.97 Thu Mar 11 10:38:37 2010
+++ src/sys/dev/usb/files.usb Sat May 29 01:14:29 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.usb,v 1.97 2010/03/11 10:38:37 enami Exp $
+# $NetBSD: files.usb,v 1.98 2010/05/29 01:14:29 pgoyette Exp $
#
# Config file and device description for machine-independent USB code.
# Included by ports that need it. Ports that use it must provide
@@ -22,6 +22,7 @@
file dev/usb/usb_mem.c usb
file dev/usb/usb_subr.c usb
file dev/usb/usb_quirks.c usb
+file dev/usb/usb_verbose.c usb & usbverbose
# Hub driver
device uhub: usbdevif, usbifif
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.120 src/sys/dev/usb/usb.c:1.121
--- src/sys/dev/usb/usb.c:1.120 Sat Dec 19 11:41:56 2009
+++ src/sys/dev/usb/usb.c Sat May 29 01:14:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.120 2009/12/19 11:41:56 pooka Exp $ */
+/* $NetBSD: usb.c,v 1.121 2010/05/29 01:14:29 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2002, 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.120 2009/12/19 11:41:56 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.121 2010/05/29 01:14:29 pgoyette Exp $");
#include "opt_compat_netbsd.h"
@@ -55,10 +55,12 @@
#include
#include
#include
+#include
#include
#include
#include
+#include
#define USB_DEV_MINOR 255
@@ -187,6 +189,9 @@
}
aprint_normal("\n");
+ /* Try to load the usbverbose module */
+ usb_verbose_ctl(true);
+
config_interrupts(self, usb_doattach);
}
@@ -981,6 +986,9 @@
ue->u.ue_ctrlr.ue_bus = device_unit(self);
usb_add_event(USB_EVENT_CTRLR_DETACH, ue);
+ /* Try to unload the usbverbose module */
+ usb_verbose_ctl(false);
+
return (0);
}
Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.168 src/sys/dev/usb/usb_subr.c:1.169
--- src/sys/dev/usb/usb_subr.c:1.168 Sun Apr 25 09:14:38 2010
+++ src/sys/dev/usb/usb_subr.c Sat May 29 01:14:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr.c,v 1.168 2010/04/25 09:14:38 matthias Exp $ */
+/* $NetBSD: usb_subr.c,v 1.169 2010/05/29 01:14:29 pgoyette Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.168 2010/04/25 09:14:38 matthias Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.169 2010/05/29 01:14:29 pgoyette Exp $");
#include "opt_compat_netbsd.h"
#include "opt_usbverbose.h"
@@ -46,6 +46,7 @@
#include
#include
+#include
#include
@@ -54,6 +55,7 @@
#include
#include
#include
+#include
#include "locators.h"
@@ -81,
CVS commit: src/sys/uvm
Module Name:src
Committed By: rmind
Date: Fri May 28 23:41:15 UTC 2010
Modified Files:
src/sys/uvm: uvm_aobj.c uvm_fault.c
Log Message:
uvm_fault_{upper,lower}_done: move drop-swap outside the page-queues lock.
Assert for object lock being held (or ref count 0) in uao_set_swslot().
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/sys/uvm/uvm_aobj.c
cvs rdiff -u -r1.173 -r1.174 src/sys/uvm/uvm_fault.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/uvm/uvm_aobj.c
diff -u src/sys/uvm/uvm_aobj.c:1.108 src/sys/uvm/uvm_aobj.c:1.109
--- src/sys/uvm/uvm_aobj.c:1.108 Wed Oct 21 21:12:07 2009
+++ src/sys/uvm/uvm_aobj.c Fri May 28 23:41:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_aobj.c,v 1.108 2009/10/21 21:12:07 rmind Exp $ */
+/* $NetBSD: uvm_aobj.c,v 1.109 2010/05/28 23:41:14 rmind Exp $ */
/*
* Copyright (c) 1998 Chuck Silvers, Charles D. Cranor and
@@ -43,7 +43,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_aobj.c,v 1.108 2009/10/21 21:12:07 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_aobj.c,v 1.109 2010/05/28 23:41:14 rmind Exp $");
#include "opt_uvmhist.h"
@@ -319,6 +319,8 @@
UVMHIST_LOG(pdhist, "aobj %p pageidx %d slot %d",
aobj, pageidx, slot, 0);
+ KASSERT(mutex_owned(&uobj->vmobjlock) || uobj->uo_refs == 0);
+
/*
* if noswap flag is set, then we can't set a non-zero slot.
*/
Index: src/sys/uvm/uvm_fault.c
diff -u src/sys/uvm/uvm_fault.c:1.173 src/sys/uvm/uvm_fault.c:1.174
--- src/sys/uvm/uvm_fault.c:1.173 Wed Feb 24 15:58:26 2010
+++ src/sys/uvm/uvm_fault.c Fri May 28 23:41:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_fault.c,v 1.173 2010/02/24 15:58:26 uebayasi Exp $ */
+/* $NetBSD: uvm_fault.c,v 1.174 2010/05/28 23:41:14 rmind Exp $ */
/*
*
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.173 2010/02/24 15:58:26 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.174 2010/05/28 23:41:14 rmind Exp $");
#include "opt_uvmhist.h"
@@ -1512,6 +1512,8 @@
struct uvm_faultinfo *ufi, struct uvm_faultctx *flt,
struct uvm_object *uobj, struct vm_anon *anon, struct vm_page *pg)
{
+ const bool wire_paging = flt->wire_paging;
+
UVMHIST_FUNC("uvm_fault_upper_done"); UVMHIST_CALLED(maphist);
/*
@@ -1519,7 +1521,7 @@
*/
mutex_enter(&uvm_pageqlock);
- if (flt->wire_paging) {
+ if (wire_paging) {
uvm_pagewire(pg);
/*
@@ -1530,11 +1532,15 @@
*/
pg->flags &= ~(PG_CLEAN);
- uvm_anon_dropswap(anon);
+
} else {
uvm_pageactivate(pg);
}
mutex_exit(&uvm_pageqlock);
+
+ if (wire_paging) {
+ uvm_anon_dropswap(anon);
+ }
}
/*
@@ -2206,6 +2212,8 @@
struct uvm_faultinfo *ufi, struct uvm_faultctx *flt,
struct uvm_object *uobj, struct vm_anon *anon, struct vm_page *pg)
{
+ bool dropswap = false;
+
UVMHIST_FUNC("uvm_fault_lower_done"); UVMHIST_CALLED(maphist);
mutex_enter(&uvm_pageqlock);
@@ -,13 +2230,16 @@
KASSERT(uobj != NULL);
pg->flags &= ~(PG_CLEAN);
- uao_dropswap(uobj, pg->offset >> PAGE_SHIFT);
+ dropswap = true;
}
} else {
uvm_pageactivate(pg);
}
mutex_exit(&uvm_pageqlock);
+ if (dropswap) {
+ uao_dropswap(uobj, pg->offset >> PAGE_SHIFT);
+ }
if (pg->flags & PG_WANTED)
wakeup(pg);
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi
Module Name:src
Committed By: cliff
Date: Fri May 28 22:14:53 UTC 2010
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_intr.c rmixl_spl.S
Log Message:
rmixl_spl.S:
- where possible, stop using CP0 STATUS to disable all interrupts,zero EIMR
instead. more efficient since less meddling with CP0.
assume STATUS[IE] is normally set.
- add rmixl_spl_init_cpu(), to initialize cp0 interrupt control for this cpu
rmixl_intr.c:
- rmixl_intr_init_cpu() calls rmixl_spl_init_cpu()
to set up CP0 interrupt controls for this cpu
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.20 -r1.1.2.21 src/sys/arch/mips/rmi/rmixl_intr.c
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/arch/mips/rmi/rmixl_spl.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/rmi/rmixl_intr.c
diff -u src/sys/arch/mips/rmi/rmixl_intr.c:1.1.2.20 src/sys/arch/mips/rmi/rmixl_intr.c:1.1.2.21
--- src/sys/arch/mips/rmi/rmixl_intr.c:1.1.2.20 Fri May 21 23:35:42 2010
+++ src/sys/arch/mips/rmi/rmixl_intr.c Fri May 28 22:14:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_intr.c,v 1.1.2.20 2010/05/21 23:35:42 cliff Exp $ */
+/* $NetBSD: rmixl_intr.c,v 1.1.2.21 2010/05/28 22:14:53 cliff Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rmixl_intr.c,v 1.1.2.20 2010/05/21 23:35:42 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_intr.c,v 1.1.2.21 2010/05/28 22:14:53 cliff Exp $");
#include "opt_ddb.h"
#define __INTR_PRIVATE
@@ -474,13 +474,11 @@
rmixl_intr_init_cpu(struct cpu_info *ci)
{
struct rmixl_cpu_softc *sc = (void *)ci->ci_softc;
+ extern void rmixl_spl_init_cpu(void);
+
KASSERT(sc != NULL);
- /* ack any pending in the EIRR, zeroing CAUSE[8..15] */
- uint64_t eirr;
- asm volatile("dmfc0 %0, $9, 6;" : "=r"(eirr));
- eirr &= ~0xff;
- asm volatile("dmtc0 %0, $9, 6;" :: "r"(eirr));
+ rmixl_spl_init_cpu();
for (int vec=0; vec < NINTRVECS; vec++)
evcnt_attach_dynamic(&sc->sc_vec_evcnts[vec],
Index: src/sys/arch/mips/rmi/rmixl_spl.S
diff -u src/sys/arch/mips/rmi/rmixl_spl.S:1.1.2.3 src/sys/arch/mips/rmi/rmixl_spl.S:1.1.2.4
--- src/sys/arch/mips/rmi/rmixl_spl.S:1.1.2.3 Fri May 21 23:35:21 2010
+++ src/sys/arch/mips/rmi/rmixl_spl.S Fri May 28 22:14:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_spl.S,v 1.1.2.3 2010/05/21 23:35:21 cliff Exp $ */
+/* $NetBSD: rmixl_spl.S,v 1.1.2.4 2010/05/28 22:14:53 cliff Exp $ */
/*-
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include
#include
-RCSID("$NetBSD: rmixl_spl.S,v 1.1.2.3 2010/05/21 23:35:21 cliff Exp $");
+RCSID("$NetBSD: rmixl_spl.S,v 1.1.2.4 2010/05/28 22:14:53 cliff Exp $");
#include "assym.h"
@@ -71,6 +71,29 @@
.dword 0 /* IPL_HIGH */
.text
+
+/*
+ * initialize cp0 interrupt control for this cpu
+ * - set STATUS[IE]
+ * - clear EIRR and EIMR
+ * on return, all interrupts are disabled by EIMR
+ *
+ * henceforth STATUS[IE] is expected to remain normally set
+ * but may be cleared and restored for temporary interrupt disablement
+ *
+ * call before the first call to spl0 on this cpu
+ */
+LEAF_NOPROFILE(rmixl_spl_init_cpu)
+ mfc0 t0, MIPS_COP_0_STATUS # get STATUS
+ ori t0, MIPS_SR_INT_IE # set IE
+ mtc0 zero, MIPS_COP_0_STATUS ## disable all ints in STATUS
+ dmtc0 zero, RMIXL_COP_0_EIMR ## " " " " EIMR
+ dmtc0 zero, RMIXL_COP_0_EIRR ## clear EIRR
+ mtc0 t0, MIPS_COP_0_STATUS ## set STATUS | IE
+ j ra
+ nop
+END(rmixl_spl_init_cpu)
+
/*
* RMIXL processor interrupt control
*
@@ -86,15 +109,10 @@
INT_L v0, CPU_INFO_CPL(a3) # get current IPL from cpu_info
sltu v1, a1, v0 # newipl < curipl
bnez v1, 2f# yes, don't change.
- mfc0 a2, MIPS_COP_0_STATUS # load STATUS
- and a2, ~MIPS_INT_MASK # clear STATUS[IM]
- sll v1, a0, 8 # EIMR[7:0] to STATUS[15:8]
- and v1, MIPS_INT_MASK # "" "
- or v1, a2# new STATUS value
- mtc0 zero, MIPS_COP_0_STATUS ## disable all ints in STATUS
+ nop
+ dmtc0 zero, RMIXL_COP_0_EIMR ## disable all interrupts
INT_S a1, CPU_INFO_CPL(a3) ## save IPL in cpu_info
dmtc0 a0, RMIXL_COP_0_EIMR ## set new EIMR
- mtc0 v1, MIPS_COP_0_STATUS ## set new STATUS
#ifdef PARANOIA
j ra
nop
@@ -118,22 +136,14 @@
99: beqz v0, 99b# loop forever if false
nop
#endif /* PARANOIA */
- #move a1, zero # avoid lookup on splx(IPL_NONE)
- #beq a0, zero, 1f # skip load
PTR_LA v1, _C_LABEL(ipl_eimr_map) # get address of table
sll a2, a0, MAP_SCALESHIFT # convert IPL to array offset
PTR_ADDU v1, a2# add to table addr
REG_L v1, (v1) # load EIMR bits for this IPL
1:
- dmfc0 a2, MIPS_COP_0_STATUS # load STATUS
- and a2, ~MIPS_INT_MASK # clear STATUS[IM]
- sll v0, v1, 8 # EIMR[7:0] to STATUS[15:8]
- and v0, MIPS_INT_MASK # "" "
- or v0, a2# new STATUS value
dmtc0 zero, RMIXL_COP_0_EIMR ## disable all interrupts
- INT_S
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src
Committed By: matt
Date: Fri May 28 21:24:47 UTC 2010
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: mips_machdep.c
Log Message:
When use N32 and we are on a MIPS64 chip, enable 64-bit instructions via
PX so that we can still use the TLB miss exception instead of the XTLB miss
exception path.
To generate a diff of this commit:
cvs rdiff -u -r1.205.4.1.2.1.2.45 -r1.205.4.1.2.1.2.46 \
src/sys/arch/mips/mips/mips_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/mips_machdep.c
diff -u src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.45 src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.46
--- src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.45 Thu May 6 19:51:20 2010
+++ src/sys/arch/mips/mips/mips_machdep.c Fri May 28 21:24:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.45 2010/05/06 19:51:20 cliff Exp $ */
+/* $NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.46 2010/05/28 21:24:47 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -112,7 +112,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.45 2010/05/06 19:51:20 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.46 2010/05/28 21:24:47 matt Exp $");
#define __INTR_PRIVATE
@@ -1239,8 +1239,11 @@
/*
* allow 64bit ops in userland for non-O32 ABIs
*/
- if (l->l_proc->p_md.md_abi != _MIPS_BSD_API_O32)
+ if (l->l_proc->p_md.md_abi == _MIPS_BSD_API_N32 && CPUISMIPS64) {
+ tf->tf_regs[_R_SR] |= MIPS_SR_PX;
+ } else if (l->l_proc->p_md.md_abi != _MIPS_BSD_API_O32) {
tf->tf_regs[_R_SR] |= MIPS_SR_UX;
+ }
if (_MIPS_SIM_NEWABI_P(l->l_proc->p_md.md_abi))
tf->tf_regs[_R_SR] |= MIPS3_SR_FR;
#endif
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/include
Module Name:src Committed By: matt Date: Fri May 28 21:23:21 UTC 2010 Modified Files: src/sys/arch/mips/include [matt-nb5-mips64]: vmparam.h Log Message: Make sure that user stack starts 32KB below maximum so that accesses with displacements will never cross the VM_MAXUSER_ADDRESS boundary. To generate a diff of this commit: cvs rdiff -u -r1.41.28.13 -r1.41.28.14 src/sys/arch/mips/include/vmparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/include/vmparam.h diff -u src/sys/arch/mips/include/vmparam.h:1.41.28.13 src/sys/arch/mips/include/vmparam.h:1.41.28.14 --- src/sys/arch/mips/include/vmparam.h:1.41.28.13 Thu Mar 11 08:19:01 2010 +++ src/sys/arch/mips/include/vmparam.h Fri May 28 21:23:21 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.41.28.13 2010/03/11 08:19:01 matt Exp $ */ +/* $NetBSD: vmparam.h,v 1.41.28.14 2010/05/28 21:23:21 matt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -98,8 +98,8 @@ * and some QED CPUs perform some virtual address checks before the * offset is calculated. */ -#define USRSTACK (VM_MAXUSER_ADDRESS-PAGE_SIZE) /* Start of user stack */ -#define USRSTACK32 ((uint32_t)VM_MAXUSER32_ADDRESS-PAGE_SIZE) +#define USRSTACK (VM_MAXUSER_ADDRESS-0x8000) /* Start of user stack */ +#define USRSTACK32 ((uint32_t)VM_MAXUSER32_ADDRESS-0x8000) /* alignment requirement for u-area space in bytes */ #define USPACE_ALIGN USPACE
CVS commit: src/gnu/usr.bin/gdb6/libgdb
Module Name:src
Committed By: jklos
Date: Fri May 28 19:11:23 UTC 2010
Modified Files:
src/gnu/usr.bin/gdb6/libgdb: Makefile
Log Message:
Added optimization reduction for gdb/dwarf2-frame.c for Amigas. We don't
see the problem on other m68k platforms, but that could be because other
platforms don't have m68060s (except Atari, perhaps).
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/gnu/usr.bin/gdb6/libgdb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/usr.bin/gdb6/libgdb/Makefile
diff -u src/gnu/usr.bin/gdb6/libgdb/Makefile:1.8 src/gnu/usr.bin/gdb6/libgdb/Makefile:1.9
--- src/gnu/usr.bin/gdb6/libgdb/Makefile:1.8 Sat May 3 14:48:31 2008
+++ src/gnu/usr.bin/gdb6/libgdb/Makefile Fri May 28 19:11:23 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/05/03 14:48:31 lukem Exp $
+# $NetBSD: Makefile,v 1.9 2010/05/28 19:11:23 jklos Exp $
.include
@@ -39,3 +39,7 @@
# Don't run yacc/bison or lex
.y.c .y.h .l.c:
+
+.if ${MACHINE} == "amiga"
+COPTS.dwarf2-frame.c+=-O1
+.endif
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: pooka Date: Fri May 28 18:17:24 UTC 2010 Modified Files: src/sys/rump/librump/rumpkern: scheduler.c Log Message: Deal with the "we get a portably arbitrary set of headers on different archs" problem. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/rump/librump/rumpkern/scheduler.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/librump/rumpkern/scheduler.c diff -u src/sys/rump/librump/rumpkern/scheduler.c:1.15 src/sys/rump/librump/rumpkern/scheduler.c:1.16 --- src/sys/rump/librump/rumpkern/scheduler.c:1.15 Fri May 28 16:44:14 2010 +++ src/sys/rump/librump/rumpkern/scheduler.c Fri May 28 18:17:24 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: scheduler.c,v 1.15 2010/05/28 16:44:14 pooka Exp $ */ +/* $NetBSD: scheduler.c,v 1.16 2010/05/28 18:17:24 pooka Exp $ */ /* * Copyright (c) 2010 Antti Kantee. All Rights Reserved. @@ -26,9 +26,10 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: scheduler.c,v 1.15 2010/05/28 16:44:14 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: scheduler.c,v 1.16 2010/05/28 18:17:24 pooka Exp $"); #include +#include #include #include #include
CVS commit: src/etc/mtree
Module Name:src Committed By: ghen Date: Fri May 28 17:17:12 UTC 2010 Modified Files: src/etc/mtree: NetBSD.dist.Xorg Log Message: Update to xkeyboard-config 1.9. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/etc/mtree/NetBSD.dist.Xorg Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.Xorg diff -u src/etc/mtree/NetBSD.dist.Xorg:1.7 src/etc/mtree/NetBSD.dist.Xorg:1.8 --- src/etc/mtree/NetBSD.dist.Xorg:1.7 Sat May 22 23:19:45 2010 +++ src/etc/mtree/NetBSD.dist.Xorg Fri May 28 17:17:12 2010 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.Xorg,v 1.7 2010/05/22 23:19:45 mrg Exp $ +# $NetBSD: NetBSD.dist.Xorg,v 1.8 2010/05/28 17:17:12 ghen Exp $ ./usr/X11R7 ./usr/X11R7/bin @@ -131,10 +131,12 @@ ./usr/X11R7/lib/X11/xkb/semantics ./usr/X11R7/lib/X11/xkb/symbols ./usr/X11R7/lib/X11/xkb/symbols/digital_vndr +./usr/X11R7/lib/X11/xkb/symbols/extras ./usr/X11R7/lib/X11/xkb/symbols/fujitsu_vndr ./usr/X11R7/lib/X11/xkb/symbols/hp_vndr ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr ./usr/X11R7/lib/X11/xkb/symbols/nec_vndr +./usr/X11R7/lib/X11/xkb/symbols/nokia_vndr ./usr/X11R7/lib/X11/xkb/symbols/sgi_vndr ./usr/X11R7/lib/X11/xkb/symbols/sharp_vndr ./usr/X11R7/lib/X11/xkb/symbols/sony_vndr
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Fri May 28 16:44:14 UTC 2010
Modified Files:
src/sys/rump/librump/rumpkern: rump.c scheduler.c threads.c
Log Message:
Improve the CPU scheduler for a host MP system with multithreaded
access. The old scheduler had a global freelist which caused a
cache crisis with multiple host threads trying to schedule a virtual
CPU simultaneously.
The rump scheduler is different from a normal thread scheduler, so
it has different requirements. First, we schedule a CPU for a
thread (which we get from the host scheduler) instead of scheduling
a thread onto a CPU. Second, scheduling points are at every
entry/exit to/from the rump kernel, including (but not limited to)
syscall entry points and hypercalls. This means scheduling happens
a lot more frequently than in a normal kernel.
For every lwp, cache the previously used CPU. When scheduling,
attempt to reuse the same CPU. If we get it, we can use it directly
without any memory barriers or expensive locks. If the CPU is
taken, migrate. Use a lock/wait only in the slowpath. Be very
wary of walking the entire CPU array because that does not lead to
a happy cacher.
The migration algorithm could probably benefit from improved
heuristics and tuning. Even as such, with the new scheduler an
application which has two threads making rlimit syscalls in a tight
loop experiences almost 400% speedup. The exact speedup is difficult
to pinpoint, though, since the old scheduler caused very jittery
results due to cache contention. Also, the rump version is now
70% faster than the counterpart which calls the host kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.171 -r1.172 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.14 -r1.15 src/sys/rump/librump/rumpkern/scheduler.c
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/librump/rumpkern/threads.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.171 src/sys/rump/librump/rumpkern/rump.c:1.172
--- src/sys/rump/librump/rumpkern/rump.c:1.171 Tue May 11 14:57:20 2010
+++ src/sys/rump/librump/rumpkern/rump.c Fri May 28 16:44:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.171 2010/05/11 14:57:20 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.172 2010/05/28 16:44:14 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.171 2010/05/11 14:57:20 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.172 2010/05/28 16:44:14 pooka Exp $");
#include
#define ELFSIZE ARCH_ELFSIZE
@@ -269,7 +269,7 @@
/* init minimal lwp/cpu context */
l = &lwp0;
l->l_lid = 1;
- l->l_cpu = rump_cpu;
+ l->l_cpu = l->l_target_cpu = rump_cpu;
rumpuser_set_curlwp(l);
mutex_init(&tty_lock, MUTEX_DEFAULT, IPL_NONE);
@@ -533,6 +533,7 @@
l->l_lid = lid;
l->l_fd = p->p_fd;
l->l_cpu = NULL;
+ l->l_target_cpu = rump_cpu;
lwp_initspecific(l);
LIST_INSERT_HEAD(&alllwp, l, l_list);
@@ -545,7 +546,7 @@
struct lwp *l = curlwp;
rumpuser_set_curlwp(NULL);
- newlwp->l_cpu = l->l_cpu;
+ newlwp->l_cpu = newlwp->l_target_cpu = l->l_cpu;
newlwp->l_mutex = l->l_mutex;
l->l_mutex = NULL;
l->l_cpu = NULL;
Index: src/sys/rump/librump/rumpkern/scheduler.c
diff -u src/sys/rump/librump/rumpkern/scheduler.c:1.14 src/sys/rump/librump/rumpkern/scheduler.c:1.15
--- src/sys/rump/librump/rumpkern/scheduler.c:1.14 Tue May 18 14:58:42 2010
+++ src/sys/rump/librump/rumpkern/scheduler.c Fri May 28 16:44:14 2010
@@ -1,10 +1,7 @@
-/* $NetBSD: scheduler.c,v 1.14 2010/05/18 14:58:42 pooka Exp $ */
+/* $NetBSD: scheduler.c,v 1.15 2010/05/28 16:44:14 pooka Exp $ */
/*
- * Copyright (c) 2009 Antti Kantee. All Rights Reserved.
- *
- * Development of this software was supported by
- * The Finnish Cultural Foundation.
+ * Copyright (c) 2010 Antti Kantee. All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -29,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: scheduler.c,v 1.14 2010/05/18 14:58:42 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scheduler.c,v 1.15 2010/05/28 16:44:14 pooka Exp $");
#include
#include
@@ -44,28 +41,62 @@
#include "rump_private.h"
-/* should go for MAXCPUS at some point */
static struct cpu_info rump_cpus[MAXCPUS];
static struct rumpcpu {
+ /* needed in fastpath */
struct cpu_info *rcpu_ci;
- int rcpu_flags;
+ void *rcpu_prevlwp;
+
+ /* needed in slowpath */
+ struct rumpuser_mtx *rcpu_mtx;
struct rumpuser_cv *rcpu_cv;
- LIST_ENTRY(rumpcpu) rcpu_entries;
+ int rcpu_wanted;
+
+ /* offset 20 (P=4) or 36 (P=8) here */
+
+ /*
+ * Some stats. Not really that necessary, but we should
+ * have room. Note that these overflow quite fast, so need
+ * to be col
CVS commit: src/sys/arch/sandpoint
Module Name:src
Committed By: phx
Date: Fri May 28 15:45:11 UTC 2010
Modified Files:
src/sys/arch/sandpoint: README.NAS
src/sys/arch/sandpoint/pci: pci_machdep.c
src/sys/arch/sandpoint/stand/netboot: brdsetup.c
Log Message:
QNAP support (untested): PCI fixup and corrected PCI address lines (+1).
Patch submitted by Toru Nishimura.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sandpoint/README.NAS
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sandpoint/pci/pci_machdep.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sandpoint/stand/netboot/brdsetup.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sandpoint/README.NAS
diff -u src/sys/arch/sandpoint/README.NAS:1.6 src/sys/arch/sandpoint/README.NAS:1.7
--- src/sys/arch/sandpoint/README.NAS:1.6 Thu May 27 15:35:46 2010
+++ src/sys/arch/sandpoint/README.NAS Fri May 28 15:45:11 2010
@@ -1,4 +1,4 @@
-$NetBSD: README.NAS,v 1.6 2010/05/27 15:35:46 phx Exp $
+$NetBSD: README.NAS,v 1.7 2010/05/28 15:45:11 phx Exp $
MPC8241/8245 NAS products
@@ -23,7 +23,7 @@
PCI IDSEL EPIC IRQ
Kurobox 11, 12, 13, 14 -> 0, 1, 4, 3
Synology 12, 13, 14, 15 -> 4, 0, 1, 2
-QNAP 12, 13, 14, 15 -> 0, 1, 2, 3
+QNAP 13, 14, 15, 16 -> 0, 1, 2, 3
StorCenter 12, 13, 14, 15 -> 0, 1, 2, 3
- USB EHCI is a multiple function PCI device which has
Index: src/sys/arch/sandpoint/pci/pci_machdep.c
diff -u src/sys/arch/sandpoint/pci/pci_machdep.c:1.18 src/sys/arch/sandpoint/pci/pci_machdep.c:1.19
--- src/sys/arch/sandpoint/pci/pci_machdep.c:1.18 Thu May 27 14:54:42 2010
+++ src/sys/arch/sandpoint/pci/pci_machdep.c Fri May 28 15:45:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.18 2010/05/27 14:54:42 phx Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.19 2010/05/28 15:45:11 phx Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.18 2010/05/27 14:54:42 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.19 2010/05/28 15:45:11 phx Exp $");
#include "opt_pci.h"
@@ -322,8 +322,8 @@
*ihp = (line == 13) ? 4 : line - 11;
break;
case BRD_QNAPTS101:
- /* map line 12-15 to EPIC IRQ0-3 */
- *ihp = line - 12;
+ /* map line 13-16 to EPIC IRQ0-3 */
+ *ihp = line - 13;
break;
case BRD_SYNOLOGY:
/* map line 12,13-15 to EPIC IRQ4,0-2 */
Index: src/sys/arch/sandpoint/stand/netboot/brdsetup.c
diff -u src/sys/arch/sandpoint/stand/netboot/brdsetup.c:1.19 src/sys/arch/sandpoint/stand/netboot/brdsetup.c:1.20
--- src/sys/arch/sandpoint/stand/netboot/brdsetup.c:1.19 Thu May 20 20:18:51 2010
+++ src/sys/arch/sandpoint/stand/netboot/brdsetup.c Fri May 28 15:45:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: brdsetup.c,v 1.19 2010/05/20 20:18:51 phx Exp $ */
+/* $NetBSD: brdsetup.c,v 1.20 2010/05/28 15:45:11 phx Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -45,10 +45,11 @@
void xxx ## pcifix(struct brdprop *); \
void xxx ## reset(void)
-BRD_DECL(enc);
BRD_DECL(mot);
+BRD_DECL(enc);
BRD_DECL(kuro);
BRD_DECL(syno);
+BRD_DECL(qnap);
static struct brdprop brdlist[] = {
{
@@ -57,14 +58,14 @@
BRD_SANDPOINTX3,
0,
"com", 0x3f8, 115200,
- motsetup, NULL, motpcifix },
+ motsetup, motbrdfix, motpcifix },
{
"encpp1",
"EnCore PP1",
BRD_ENCOREPP1,
0,
"com", 0x3f8, 115200,
- encsetup, NULL, encpcifix },
+ encsetup, encbrdfix, encpcifix },
{
"kurobox",
"KuroBox",
@@ -86,7 +87,7 @@
BRD_QNAPTS101,
0,
"eumb", 0x4500, 115200,
- NULL, NULL, NULL },
+ NULL, NULL, qnappcifix },
{
"iomega",
"IOMEGA Storcenter",
@@ -668,6 +669,37 @@
}
void
+qnappcifix(struct brdprop *brd)
+{
+ unsigned ide, nic, usb, val;
+
+ ide = pcimaketag(0, 13, 0);
+ val = pcicfgread(ide, 0x3c) & 0xff00;
+ val |= 13;
+ pcicfgwrite(ide, 0x3c, val);
+
+ usb = pcimaketag(0, 14, 0);
+ val = pcicfgread(usb, 0x3c) & 0xff00;
+ val |= 14;
+ pcicfgwrite(usb, 0x3c, val);
+
+ usb = pcimaketag(0, 14, 1);
+ val = pcicfgread(usb, 0x3c) & 0xff00;
+ val |= 14;
+ pcicfgwrite(usb, 0x3c, val);
+
+ usb = pcimaketag(0, 14, 2);
+ val = pcicfgread(usb, 0x3c) & 0xff00;
+ val |= 14;
+ pcicfgwrite(usb, 0x3c, val);
+
+ nic = pcimaketag(0, 15, 0);
+ val = pcicfgread(nic, 0x3c) & 0xff00;
+ val |= 15;
+ pcicfgwrite(nic, 0x3c, val);
+}
+
+void
synoreset()
{
CVS commit: [uebayasi-xip] src/sys/arch/acorn26/acorn26
Module Name:src
Committed By: uebayasi
Date: Fri May 28 15:42:17 UTC 2010
Modified Files:
src/sys/arch/acorn26/acorn26 [uebayasi-xip]: pmap.c
Log Message:
Redo previous.
To generate a diff of this commit:
cvs rdiff -u -r1.30.2.3 -r1.30.2.4 src/sys/arch/acorn26/acorn26/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn26/acorn26/pmap.c
diff -u src/sys/arch/acorn26/acorn26/pmap.c:1.30.2.3 src/sys/arch/acorn26/acorn26/pmap.c:1.30.2.4
--- src/sys/arch/acorn26/acorn26/pmap.c:1.30.2.3 Fri May 28 15:40:05 2010
+++ src/sys/arch/acorn26/acorn26/pmap.c Fri May 28 15:42:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.30.2.3 2010/05/28 15:40:05 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.30.2.4 2010/05/28 15:42:17 uebayasi Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 Ben Harris
* All rights reserved.
@@ -102,7 +102,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.30.2.3 2010/05/28 15:40:05 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.30.2.4 2010/05/28 15:42:17 uebayasi Exp $");
#include /* for cold */
#include
@@ -634,7 +634,7 @@
UVMHIST_FUNC("pmap_enter");
UVMHIST_CALLED(pmaphist);
- return pmap_enter1(pmap, va, pa, prot, flags, 1);
+ return pmap_enter1(pmap, va, pa, prot, flags, 0);
}
static int
CVS commit: [uebayasi-xip] src/sys/arch/acorn26/acorn26
Module Name:src
Committed By: uebayasi
Date: Fri May 28 15:40:05 UTC 2010
Modified Files:
src/sys/arch/acorn26/acorn26 [uebayasi-xip]: pmap.c
Log Message:
pmap_enter:
This pmap treats all pmap_enter()'ed entries as "managed", and always
allocate PV entries. Put back the original behavior. There is no need
to check the new PMAP_UNMANAGED flag.
To generate a diff of this commit:
cvs rdiff -u -r1.30.2.2 -r1.30.2.3 src/sys/arch/acorn26/acorn26/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn26/acorn26/pmap.c
diff -u src/sys/arch/acorn26/acorn26/pmap.c:1.30.2.2 src/sys/arch/acorn26/acorn26/pmap.c:1.30.2.3
--- src/sys/arch/acorn26/acorn26/pmap.c:1.30.2.2 Wed Apr 28 08:31:05 2010
+++ src/sys/arch/acorn26/acorn26/pmap.c Fri May 28 15:40:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.30.2.2 2010/04/28 08:31:05 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.30.2.3 2010/05/28 15:40:05 uebayasi Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 Ben Harris
* All rights reserved.
@@ -102,7 +102,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.30.2.2 2010/04/28 08:31:05 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.30.2.3 2010/05/28 15:40:05 uebayasi Exp $");
#include /* for cold */
#include
@@ -634,8 +634,7 @@
UVMHIST_FUNC("pmap_enter");
UVMHIST_CALLED(pmaphist);
- return pmap_enter1(pmap, va, pa, prot, flags,
- (flags & PMAP_UNMANAGED) != 0);
+ return pmap_enter1(pmap, va, pa, prot, flags, 1);
}
static int
CVS commit: [uebayasi-xip] src/sys/uvm
Module Name:src
Committed By: uebayasi
Date: Fri May 28 15:26:22 UTC 2010
Modified Files:
src/sys/uvm [uebayasi-xip]: uvm_device.c
Log Message:
Comment.
To generate a diff of this commit:
cvs rdiff -u -r1.57.2.1 -r1.57.2.2 src/sys/uvm/uvm_device.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/uvm/uvm_device.c
diff -u src/sys/uvm/uvm_device.c:1.57.2.1 src/sys/uvm/uvm_device.c:1.57.2.2
--- src/sys/uvm/uvm_device.c:1.57.2.1 Tue Apr 27 08:20:09 2010
+++ src/sys/uvm/uvm_device.c Fri May 28 15:26:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_device.c,v 1.57.2.1 2010/04/27 08:20:09 uebayasi Exp $ */
+/* $NetBSD: uvm_device.c,v 1.57.2.2 2010/05/28 15:26:22 uebayasi Exp $ */
/*
*
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_device.c,v 1.57.2.1 2010/04/27 08:20:09 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_device.c,v 1.57.2.2 2010/05/28 15:26:22 uebayasi Exp $");
#include "opt_uvmhist.h"
@@ -428,7 +428,9 @@
ufi->orig_map->pmap, curr_va, paddr, mapprot);
/*
* XXXUEBS
- * always map device pages as unmanaged (uncached) for now.
+ * always map device pages as unmanaged (uncached) for
+ * now. this may be changed when UVM will support some
+ * "managed" device pages like PAT in the future.
*/
if (pmap_enter(ufi->orig_map->pmap, curr_va, paddr,
mapprot, PMAP_CANFAIL | PMAP_UNMANAGED | mapprot) != 0) {
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Fri May 28 13:25:54 UTC 2010 Modified Files: src/share/man/man4: iwn.4 Log Message: Bump date for previous. Remove trailing space. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/share/man/man4/iwn.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/iwn.4 diff -u src/share/man/man4/iwn.4:1.8 src/share/man/man4/iwn.4:1.9 --- src/share/man/man4/iwn.4:1.8 Thu May 27 19:27:24 2010 +++ src/share/man/man4/iwn.4 Fri May 28 13:25:54 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: iwn.4,v 1.8 2010/05/27 19:27:24 spz Exp $ +.\" $NetBSD: iwn.4,v 1.9 2010/05/28 13:25:54 wiz Exp $ .\" .\" Copyright (c) 2007,2008 .\" Damien Bergamini . All rights reserved. @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd May 18, 2009 +.Dd May 27, 2010 .Dt IWN 4 .Os .Sh NAME @@ -185,7 +185,7 @@ .It "iwn%d: could not get firmware handle %s" .It "iwn%d: could not read firmware" The driver was unable to find the file with the proper firmware image. -It should be located in +It should be located in .Pa /libdata/firmware/if_iwn . .It "iwn%d: firmware file too short: %d bytes" The firmware image is corrupted and can't be loaded into the adapter.
CVS commit: src
Module Name:src Committed By: ghen Date: Fri May 28 13:01:23 UTC 2010 Modified Files: src/distrib/sets/lists/xcomp: mi src/external/mit/xorg/lib/xkeyboard-config: Makefile Log Message: Install pkgconfig file for xkeyboard-config. To generate a diff of this commit: cvs rdiff -u -r1.109 -r1.110 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/xkeyboard-config/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.109 src/distrib/sets/lists/xcomp/mi:1.110 --- src/distrib/sets/lists/xcomp/mi:1.109 Sun May 23 21:32:50 2010 +++ src/distrib/sets/lists/xcomp/mi Fri May 28 13:01:23 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.109 2010/05/23 21:32:50 mrg Exp $ +# $NetBSD: mi,v 1.110 2010/05/28 13:01:23 ghen Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -6320,6 +6320,7 @@ ./usr/X11R7/lib/pkgconfig/xineramaproto.pc -unknown- xorg ./usr/X11R7/lib/pkgconfig/xkbfile.pc -unknown- xorg ./usr/X11R7/lib/pkgconfig/xkbui.pc -unknown- xorg +./usr/X11R7/lib/pkgconfig/xkeyboard-config.pc -unknown- xorg ./usr/X11R7/lib/pkgconfig/xmu.pc -unknown- xorg ./usr/X11R7/lib/pkgconfig/xmuu.pc -unknown- xorg ./usr/X11R7/lib/pkgconfig/xorg-server.pc -unknown- xorg Index: src/external/mit/xorg/lib/xkeyboard-config/Makefile diff -u src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.2 src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.3 --- src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.2 Fri May 28 12:38:34 2010 +++ src/external/mit/xorg/lib/xkeyboard-config/Makefile Fri May 28 13:01:23 2010 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2010/05/28 12:38:34 ghen Exp $ +# $NetBSD: Makefile,v 1.3 2010/05/28 13:01:23 ghen Exp $ SUBDIR= compat geometry keycodes keymap rules semantics symbols types PKGCONFIG= xkeyboard-config +.include .include
CVS commit: src
Module Name:src Committed By: ghen Date: Fri May 28 12:38:35 UTC 2010 Modified Files: src/distrib/sets/lists/xbase: mi src/external/mit/xorg/lib/xkeyboard-config: Makefile src/external/mit/xorg/lib/xkeyboard-config/compat: Makefile src/external/mit/xorg/lib/xkeyboard-config/geometry: Makefile src/external/mit/xorg/lib/xkeyboard-config/keycodes: Makefile src/external/mit/xorg/lib/xkeyboard-config/rules: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/macintosh_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/types: Makefile Added Files: src/external/mit/xorg/lib/xkeyboard-config/symbols/extras: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/nokia_vndr: Makefile Log Message: Update to xkeyboard-config 1.4. To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/xkeyboard-config/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/extras/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/macintosh_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/nokia_vndr/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/lib/xkeyboard-config/types/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xbase/mi diff -u src/distrib/sets/lists/xbase/mi:1.92 src/distrib/sets/lists/xbase/mi:1.93 --- src/distrib/sets/lists/xbase/mi:1.92 Tue May 25 13:13:55 2010 +++ src/distrib/sets/lists/xbase/mi Fri May 28 12:38:34 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.92 2010/05/25 13:13:55 nonaka Exp $ +# $NetBSD: mi,v 1.93 2010/05/28 12:38:34 ghen Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1845,6 +1845,7 @@ ./usr/X11R7/lib/X11/xkb/compat/README -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/accessx -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/basic -unknown- xorg +./usr/X11R7/lib/X11/xkb/compat/caps -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/complete -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/default -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/iso9995 -unknown- xorg @@ -1889,6 +1890,7 @@ ./usr/X11R7/lib/X11/xkb/geometry/macintosh -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/microsoft -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/nec -unknown- xorg +./usr/X11R7/lib/X11/xkb/geometry/nokia -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/northgate -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/pc -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/sgi -obsolete- obsolete @@ -1902,6 +1904,7 @@ ./usr/X11R7/lib/X11/xkb/geometry/sony -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/sun -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/thinkpad -unknown- xorg +./usr/X11R7/lib/X11/xkb/geometry/typematrix -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/winbook -unknown- xorg ./usr/X11R7/lib/X11/xkb/keycodes base-x11-root xorg ./usr/X11R7/lib/X11/xkb/keycodes.dir -unknown- xorg @@ -1915,6 +1918,7 @@ ./usr/X11R7/lib/X11/xkb/keycodes/digital_vndr base-x11-root xorg ./usr/X11R7/lib/X11/xkb/keycodes/digital_vndr/lk -unknown- xorg ./usr/X11R7/lib/X11/xkb/keycodes/digital_vndr/pc -unknown- xorg +./usr/X11R7/lib/X11/xkb/keycodes/empty -unknown- xorg ./usr/X11R7/lib/X11/xkb/keycodes/evdev -unknown- xorg ./usr/X11R7/lib/X11/xkb/keycodes/fujitsu -unknown- xorg ./usr/X11R7/lib/X11/xkb/keycodes/hp -unknown- xorg @@ -2025,9 +2029,11 @@ ./usr/X11R7/lib/X11/xkb/rulesbase-x11-root xorg ./usr/X11R7/lib/X11/xkb/rules/README -unknown- xorg ./usr/X11R7/lib/X11/xkb/rules/base -unknown- xorg +./usr/X11R7/lib/X11/xkb/rules/base.extras.xml -unknown- xorg ./usr/X11R7/lib/X11/xkb/rules/base.lst -unknown- xorg ./usr/X11R7/lib/X11/xkb/rules/base.xml -unknown- xorg ./usr/X11R7/lib/X11/xkb/rules/evdev -unknown- xorg +./usr/X11R7/lib/X11/xkb/rules/evdev.extras.xml -unknown- xorg ./usr/X11R7/lib/X11/xkb/rules/evdev.lst -unknown- xorg ./usr/X11R7/lib/X11/xkb/rules/evdev.xml -un
CVS commit: src/distrib/sets/lists/xcomp
Module Name:src Committed By: njoly Date: Fri May 28 11:27:18 UTC 2010 Modified Files: src/distrib/sets/lists/xcomp: md.i386 Log Message: +libgeode_drv.so.2.debug for i386. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/xcomp/md.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xcomp/md.i386 diff -u src/distrib/sets/lists/xcomp/md.i386:1.34 src/distrib/sets/lists/xcomp/md.i386:1.35 --- src/distrib/sets/lists/xcomp/md.i386:1.34 Fri May 28 10:49:51 2010 +++ src/distrib/sets/lists/xcomp/md.i386 Fri May 28 11:27:18 2010 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.34 2010/05/28 10:49:51 njoly Exp $ +# $NetBSD: md.i386,v 1.35 2010/05/28 11:27:18 njoly Exp $ ./usr/X11R6/include/xf86Optrec.h -unknown- x11 ./usr/X11R6/include/xf86Parser.h -unknown- x11 ./usr/X11R6/man/cat3/XF86VidMode.0 -unknown- .cat,x11 @@ -123,6 +123,7 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libcirrus_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libcirrus_laguna.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libelographics_drv.so.1.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libgeode_drv.so.2.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libglint_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libi128_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libi740_drv.so.1.debug -unknown- xorg,debug
CVS commit: src/distrib/sets/lists/xserver
Module Name:src Committed By: njoly Date: Fri May 28 11:14:08 UTC 2010 Modified Files: src/distrib/sets/lists/xserver: md.i386 Log Message: un-obsolete ws.0 for i386. To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 src/distrib/sets/lists/xserver/md.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xserver/md.i386 diff -u src/distrib/sets/lists/xserver/md.i386:1.78 src/distrib/sets/lists/xserver/md.i386:1.79 --- src/distrib/sets/lists/xserver/md.i386:1.78 Fri May 28 04:55:07 2010 +++ src/distrib/sets/lists/xserver/md.i386 Fri May 28 11:14:08 2010 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.78 2010/05/28 04:55:07 mrg Exp $ +# $NetBSD: md.i386,v 1.79 2010/05/28 11:14:08 njoly Exp $ ./usr/X11R6/bin/X -unknown- x11 ./usr/X11R6/bin/XFree86 -unknown- x11 ./usr/X11R6/bin/gtf -unknown- x11 @@ -744,7 +744,7 @@ ./usr/X11R7/man/cat4/vmmouse.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/vmware.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/void.0-unknown- obsolete -./usr/X11R7/man/cat4/ws.0-unknown- obsolete +./usr/X11R7/man/cat4/ws.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/wsfb.0-unknown- .cat,xorg ./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg ./usr/X11R7/man/html1/Xorg.html-unknown- html,xorg
CVS commit: src/distrib/sets/lists/xcomp
Module Name:src Committed By: njoly Date: Fri May 28 10:49:52 UTC 2010 Modified Files: src/distrib/sets/lists/xcomp: md.amd64 md.i386 Log Message: +libopenchrome_drv.so.0.debug for amd64 and i386. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/xcomp/md.amd64 cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/xcomp/md.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xcomp/md.amd64 diff -u src/distrib/sets/lists/xcomp/md.amd64:1.27 src/distrib/sets/lists/xcomp/md.amd64:1.28 --- src/distrib/sets/lists/xcomp/md.amd64:1.27 Fri May 28 06:26:55 2010 +++ src/distrib/sets/lists/xcomp/md.amd64 Fri May 28 10:49:51 2010 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.27 2010/05/28 06:26:55 mrg Exp $ +# $NetBSD: md.amd64,v 1.28 2010/05/28 10:49:51 njoly Exp $ ./usr/X11R6/include/xf86Optrec.h -unknown- x11 ./usr/X11R6/include/xf86Parser.h -unknown- x11 ./usr/X11R6/man/cat3/XF86VidMode.0 -unknown- .cat,x11 @@ -138,6 +138,7 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libneomagic_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libnv_drv.so.2.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libopenchrome_drv.so.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libr128_drv.so.6.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libradeon_drv.so.6.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libradeonhd_drv.so.1.debug -unknown- xorg,debug Index: src/distrib/sets/lists/xcomp/md.i386 diff -u src/distrib/sets/lists/xcomp/md.i386:1.33 src/distrib/sets/lists/xcomp/md.i386:1.34 --- src/distrib/sets/lists/xcomp/md.i386:1.33 Fri May 28 06:26:55 2010 +++ src/distrib/sets/lists/xcomp/md.i386 Fri May 28 10:49:51 2010 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.33 2010/05/28 06:26:55 mrg Exp $ +# $NetBSD: md.i386,v 1.34 2010/05/28 10:49:51 njoly Exp $ ./usr/X11R6/include/xf86Optrec.h -unknown- x11 ./usr/X11R6/include/xf86Parser.h -unknown- x11 ./usr/X11R6/man/cat3/XF86VidMode.0 -unknown- .cat,x11 @@ -134,6 +134,7 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libneomagic_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libnv_drv.so.2.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libopenchrome_drv.so.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libr128_drv.so.6.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libradeon_drv.so.6.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libradeonhd_drv.so.1.debug -unknown- xorg,debug
CVS commit: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc Committed By: ghen Date: Fri May 28 10:01:08 UTC 2010 Modified Files: xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.am symbols.dir Added Files: xsrc/external/mit/xkeyboard-config/dist/rules: base.lo_s.part base.o_k.part Removed Files: xsrc/external/mit/xkeyboard-config/dist/po: s...@latn.po xsrc/external/mit/xkeyboard-config/dist/rules: base base.l2_s.part base.l3_s.part base.l4_s.part base.lst evdev evdev.lst xsrc/external/mit/xkeyboard-config/dist/rules/compat: layoutRename.lst ln_s.sh lnv_s.sh ml1_s.sh ml1v1_s.sh ml1v_s.sh ml_s.sh mlv_s.sh variantRename.lst xsrc/external/mit/xkeyboard-config/dist/symbols: braille xsrc/external/mit/xkeyboard-config/dist/symbols/macintosh_vndr: es xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr: cs hu ko sw usb Log Message: Resolve conflicts. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xkeyboard-config/dist/po/s...@latn.po cvs rdiff -u -r1.4 -r0 xsrc/external/mit/xkeyboard-config/dist/rules/base cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xkeyboard-config/dist/rules/base.l2_s.part \ xsrc/external/mit/xkeyboard-config/dist/rules/base.l3_s.part \ xsrc/external/mit/xkeyboard-config/dist/rules/base.l4_s.part \ xsrc/external/mit/xkeyboard-config/dist/rules/evdev \ xsrc/external/mit/xkeyboard-config/dist/rules/evdev.lst cvs rdiff -u -r0 -r1.3 \ xsrc/external/mit/xkeyboard-config/dist/rules/base.lo_s.part \ xsrc/external/mit/xkeyboard-config/dist/rules/base.o_k.part cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/xkeyboard-config/dist/rules/base.lst cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xkeyboard-config/dist/rules/compat/layoutRename.lst cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/xkeyboard-config/dist/rules/compat/ln_s.sh \ xsrc/external/mit/xkeyboard-config/dist/rules/compat/lnv_s.sh \ xsrc/external/mit/xkeyboard-config/dist/rules/compat/ml1_s.sh \ xsrc/external/mit/xkeyboard-config/dist/rules/compat/ml1v1_s.sh \ xsrc/external/mit/xkeyboard-config/dist/rules/compat/ml1v_s.sh \ xsrc/external/mit/xkeyboard-config/dist/rules/compat/ml_s.sh \ xsrc/external/mit/xkeyboard-config/dist/rules/compat/mlv_s.sh \ xsrc/external/mit/xkeyboard-config/dist/rules/compat/variantRename.lst cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/xkeyboard-config/dist/symbols/braille cvs rdiff -u -r1.5 -r1.6 \ xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xkeyboard-config/dist/symbols/macintosh_vndr/es cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr/cs \ xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr/hu \ xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr/ko \ xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr/sw \ xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr/usb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.2 xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.3 --- xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.2 Sun Dec 13 04:54:51 2009 +++ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am Fri May 28 10:01:08 2010 @@ -1,12 +1,12 @@ -SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr sharp_vndr sony_vndr sun_vndr xfree68_vndr +SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sharp_vndr sony_vndr sun_vndr xfree68_vndr extras symbolsdir = $(xkb_base)/symbols dist_symbols_DATA = \ ad af al \ am ara az \ -be bd \ -bg br ba \ -bt by braille \ +ba bd be \ +bg br brai \ +bt bw by \ ca cd \ ch cn cz \ de dk \ @@ -16,21 +16,24 @@ gr hr hu \ ie il in iq \ ir is it jp \ -kg kh kr kz \ +ke kg kh \ +kr kz \ la latam latin \ lk lt lv \ -ma mao me mk \ -mm mn mt mv \ +ma mao me \ +mk ml mm \ +mn mt mv \ ng nl no np \ pc pk pl pt \ ro rs ru \ -se si sk \ +se si sk sn \ sy th \ -tj tr \ +terminate \ +tj tm tr tz \ ua us uz vn \ za \ -altwin capslock compose ctrl eurosign group inet \ -keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl +altwin capslock compose ctrl empty eurosign group inet \ +keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl typo dir_data = $(dist_symbols_DATA) Index: xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.5 xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.6 --- xsrc/external/mit/xkeyboard-config
CVS commit: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc Committed By: ghen Date: Fri May 28 09:55:02 UTC 2010 Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10477 Log Message: Initial import of xkeyboard-config-1.9 Status: Vendor Tag: xorg Release Tags: xkeyboard-config-1-9 U xsrc/external/mit/xkeyboard-config/dist/install-sh U xsrc/external/mit/xkeyboard-config/dist/configure.in U xsrc/external/mit/xkeyboard-config/dist/xkbrules.am U xsrc/external/mit/xkeyboard-config/dist/missing U xsrc/external/mit/xkeyboard-config/dist/README U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4 U xsrc/external/mit/xkeyboard-config/dist/intltool-merge.in U xsrc/external/mit/xkeyboard-config/dist/configure U xsrc/external/mit/xkeyboard-config/dist/autogen.sh U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS U xsrc/external/mit/xkeyboard-config/dist/COPYING N xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in U xsrc/external/mit/xkeyboard-config/dist/config.rpath U xsrc/external/mit/xkeyboard-config/dist/CREDITS U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.spec.in U xsrc/external/mit/xkeyboard-config/dist/TODO U xsrc/external/mit/xkeyboard-config/dist/NEWS U xsrc/external/mit/xkeyboard-config/dist/intltool-update.in U xsrc/external/mit/xkeyboard-config/dist/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/Makefile.in U xsrc/external/mit/xkeyboard-config/dist/AUTHORS U xsrc/external/mit/xkeyboard-config/dist/intltool-extract.in U xsrc/external/mit/xkeyboard-config/dist/ChangeLog U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.spec U xsrc/external/mit/xkeyboard-config/dist/symbols/compose U xsrc/external/mit/xkeyboard-config/dist/symbols/mn U xsrc/external/mit/xkeyboard-config/dist/symbols/de U xsrc/external/mit/xkeyboard-config/dist/symbols/eurosign U xsrc/external/mit/xkeyboard-config/dist/symbols/il U xsrc/external/mit/xkeyboard-config/dist/symbols/ro U xsrc/external/mit/xkeyboard-config/dist/symbols/srvr_ctrl U xsrc/external/mit/xkeyboard-config/dist/symbols/me U xsrc/external/mit/xkeyboard-config/dist/symbols/mm U xsrc/external/mit/xkeyboard-config/dist/symbols/ma U xsrc/external/mit/xkeyboard-config/dist/symbols/fi N xsrc/external/mit/xkeyboard-config/dist/symbols/tz U xsrc/external/mit/xkeyboard-config/dist/symbols/bt U xsrc/external/mit/xkeyboard-config/dist/symbols/ie U xsrc/external/mit/xkeyboard-config/dist/symbols/be U xsrc/external/mit/xkeyboard-config/dist/symbols/ba U xsrc/external/mit/xkeyboard-config/dist/symbols/ng U xsrc/external/mit/xkeyboard-config/dist/symbols/af U xsrc/external/mit/xkeyboard-config/dist/symbols/dk U xsrc/external/mit/xkeyboard-config/dist/symbols/fo U xsrc/external/mit/xkeyboard-config/dist/symbols/gr U xsrc/external/mit/xkeyboard-config/dist/symbols/hu U xsrc/external/mit/xkeyboard-config/dist/symbols/kh U xsrc/external/mit/xkeyboard-config/dist/symbols/az U xsrc/external/mit/xkeyboard-config/dist/symbols/ge U xsrc/external/mit/xkeyboard-config/dist/symbols/altwin U xsrc/external/mit/xkeyboard-config/dist/symbols/et U xsrc/external/mit/xkeyboard-config/dist/symbols/br N xsrc/external/mit/xkeyboard-config/dist/symbols/typo U xsrc/external/mit/xkeyboard-config/dist/symbols/kz U xsrc/external/mit/xkeyboard-config/dist/symbols/kpdl N xsrc/external/mit/xkeyboard-config/dist/symbols/bw U xsrc/external/mit/xkeyboard-config/dist/symbols/cn N xsrc/external/mit/xkeyboard-config/dist/symbols/terminate U xsrc/external/mit/xkeyboard-config/dist/symbols/ctrl U xsrc/external/mit/xkeyboard-config/dist/symbols/lk U xsrc/external/mit/xkeyboard-config/dist/symbols/cz U xsrc/external/mit/xkeyboard-config/dist/symbols/bg U xsrc/external/mit/xkeyboard-config/dist/symbols/sk U xsrc/external/mit/xkeyboard-config/dist/symbols/lt N xsrc/external/mit/xkeyboard-config/dist/symbols/sn U xsrc/external/mit/xkeyboard-config/dist/symbols/keypad U xsrc/external/mit/xkeyboard-config/dist/symbols/gn U xsrc/external/mit/xkeyboard-config/dist/symbols/rs U xsrc/external/mit/xkeyboard-config/dist/symbols/jp U xsrc/external/mit/xkeyboard-config/dist/symbols/latam U xsrc/external/mit/xkeyboard-config/dist/symbols/hr N xsrc/external/mit/xkeyboard-config/dist/symbols/brai C xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir U xsrc/external/mit/xkeyboard-config/dist/symbols/sy U xsrc/external/mit/xkeyboard-config/dist/symbols/level5 U xsrc/external/mit/xkeyboard-config/dist/symbols/am U xsrc/external/mit/xkeyboard-config/dist/symbols/latin U xsrc/external/mit/xkeyboard-config/dist/symbols/kr U xsrc/external/mit/xkeyboard-config/dist/symbols/no U xsrc/external/mit/xkeyboard-config/dist/symbols/mv U xsrc/external/mit/xkeyboard-config/dist/symbols/olpc U xsrc/external/mit/xkeyboard-config/dist/symbols/ua U xsrc/external/mit/xkeyboard-config/dist/symbols/al U xsrc/external/mit/xkeyboard-config/dist/symbols/iq U xsrc/external/mit/xkeyboard-config/dist/symbols/pc U xsrc/external/mit/xkeyboard-config/dist/symbols/lv U xsrc
CVS commit: xsrc/external/mit/xkeyboard-config/dist/symbols
Module Name:xsrc Committed By: ghen Date: Fri May 28 09:50:36 UTC 2010 Modified Files: xsrc/external/mit/xkeyboard-config/dist/symbols: symbols.dir Log Message: Restore original (1.4 distfile) order to ease merges. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.4 xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.5 --- xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.4 Tue May 25 13:12:51 2010 +++ xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir Fri May 28 09:50:36 2010 @@ -1,3 +1,5 @@ +-dp- a--- mn(basic) +--p- a--- mn(olpc) --p- -m-- compose(ralt) --p- -m-- compose(lwin) --p- -m-- compose(rwin) @@ -5,12 +7,6 @@ --p- -m-- compose(rctrl) --p- -m-- compose(caps) --p- -m-- compose(102) --dp- a--- mn(basic) ---p- a--- mn(olpc) ---p- eurosign(e) ---p- eurosign(2) ---p- eurosign(4) ---p- eurosign(5) -d-- de(basic) --p- a--- de(nodeadkeys) --p- a--- de(deadgraveacute) @@ -32,10 +28,10 @@ --p- a--- ro(std) --p- a--- ro(std_cedilla) --p- a--- ro(winkeys) ---p- --kf srvr_ctrl(xfree86) ---p- --k- srvr_ctrl(stdkeypad) ---p- ---f srvr_ctrl(fkey2vt) ---p- --kf srvr_ctrl(no_srvr_keys) +--p- eurosign(e) +--p- eurosign(2) +--p- eurosign(4) +--p- eurosign(5) -dp- a--- me(basic) --p- a--- me(cyrillic) --p- a--- me(cyrillicyz) @@ -71,7 +67,10 @@ --p- a--- be(Sundeadkeys) --p- a--- be(nodeadkeys) --p- a--- be(wang) - sony_vndr/us(nwp5461) +--p- --kf srvr_ctrl(xfree86) +--p- --k- srvr_ctrl(stdkeypad) +--p- ---f srvr_ctrl(fkey2vt) +--p- --kf srvr_ctrl(no_srvr_keys) -dp- a--- ba(basic) --p- a--- ba(us) --p- a--- ba(alternatequotes) @@ -101,9 +100,35 @@ --p- a---g--- gr(extended) --p- a---g--- gr(polytonic) --p- a---g--- gr(nodeadkeys) --dp- sun_vndr/solaris(defaults) ---p- sun_vndr/solaris(keynames) ---p- sun_vndr/solaris(xf86keynames) + sony_vndr/us(nwp5461) +-dp- hu(basic) +--p- hu(standard) +--p- hu(nodeadkeys) +--p- hu(qwerty) +--p- hu(101_qwertz_comma_dead) +--p- hu(101_qwertz_comma_nodead) +--p- hu(101_qwertz_dot_dead) +--p- hu(101_qwertz_dot_nodead) +--p- hu(101_qwerty_comma_dead) +--p- hu(101_qwerty_comma_nodead) +--p- hu(101_qwerty_dot_dead) +--p- hu(101_qwerty_dot_nodead) +--p- hu(102_qwertz_comma_dead) +--p- hu(102_qwertz_comma_nodead) +--p- hu(102_qwertz_dot_dead) +--p- hu(102_qwertz_dot_nodead) +--p- hu(102_qwerty_comma_dead) +--p- hu(102_qwerty_comma_nodead) +--p- hu(102_qwerty_dot_dead) +--p- hu(102_qwerty_dot_nodead) +h-p- a--- hu(def_102) +h-p- a--- hu(def_101) +h-p- a--- hu(def_qwertz) +h-p- a--- hu(def_qwerty) +h-p- --k- hu(def_dot) +h-p- a--- hu(def_dead) +h-p- a--- hu(def_nodead) +h-p- a--- hu(def_common) sun_vndr/de(type4) sun_vndr/fi(basic) sun_vndr/ko(type4) @@ -117,6 +142,9 @@ sun_vndr/gr(type5) -dp- a--- sun_vndr/hu(type5) sun_vndr/cz(type5) +-dp- sun_vndr/solaris(defaults) +--p- sun_vndr/solaris(keynames) +--p- sun_vndr/solaris(xf86keynames) -dp- a--- sun_vndr/lt(type5) sun_vndr/jp(basic) sun_vndr/jp(type4) @@ -180,35 +208,6 @@ sun_vndr/usb(sun_usb) sun_vndr/ru(basic) --p- sun_vndr/ru(type6) --dp- hu(basic) ---p- hu(standard) ---p- hu(nodeadkeys) ---p- hu(qwerty) ---p- hu(101_qwertz_comma_dead) ---p- hu(101_qwertz_comma_nodead) ---p- hu(101_qwertz_dot_dead) ---p- hu(101_qwertz_dot_nodead) ---p- hu(101_qwerty_comma_dead) ---p- hu(101_qwerty_comma_nodead) ---p- hu(101_qwerty_dot_dead) ---p- hu(101_qwerty_dot_nodead) ---p- hu(102_qwertz_comma_dead) ---p- hu(102_qwertz_comma_nodead) ---p- --
CVS commit: [uebayasi-xip] src
Module Name:src
Committed By: uebayasi
Date: Fri May 28 09:14:56 UTC 2010
Modified Files:
src/sbin/mount [uebayasi-xip]: mount.8
src/sbin/mount_ffs [uebayasi-xip]: mount_ffs.c
src/sys/sys [uebayasi-xip]: fstypes.h
src/sys/ufs/ffs [uebayasi-xip]: ffs_vfsops.c
Log Message:
Remove the "xip" option from mount_ffs(8) for simplicity.
To generate a diff of this commit:
cvs rdiff -u -r1.69.2.1 -r1.69.2.2 src/sbin/mount/mount.8
cvs rdiff -u -r1.25.10.1 -r1.25.10.2 src/sbin/mount_ffs/mount_ffs.c
cvs rdiff -u -r1.26.14.2 -r1.26.14.3 src/sys/sys/fstypes.h
cvs rdiff -u -r1.257.2.5 -r1.257.2.6 src/sys/ufs/ffs/ffs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/mount/mount.8
diff -u src/sbin/mount/mount.8:1.69.2.1 src/sbin/mount/mount.8:1.69.2.2
--- src/sbin/mount/mount.8:1.69.2.1 Thu Feb 11 05:36:16 2010
+++ src/sbin/mount/mount.8 Fri May 28 09:14:55 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: mount.8,v 1.69.2.1 2010/02/11 05:36:16 uebayasi Exp $
+.\" $NetBSD: mount.8,v 1.69.2.2 2010/05/28 09:14:55 uebayasi Exp $
.\"
.\" Copyright (c) 1980, 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -299,8 +299,6 @@
The same as
.Fl u ;
indicate that the status of an already mounted file system should be changed.
-.It Cm xip
-Enable eXecute-In-Place if the block device supports it.
.El
.Pp
Any additional options specific to a given file system type (see the
Index: src/sbin/mount_ffs/mount_ffs.c
diff -u src/sbin/mount_ffs/mount_ffs.c:1.25.10.1 src/sbin/mount_ffs/mount_ffs.c:1.25.10.2
--- src/sbin/mount_ffs/mount_ffs.c:1.25.10.1 Thu Feb 11 05:38:20 2010
+++ src/sbin/mount_ffs/mount_ffs.c Fri May 28 09:14:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mount_ffs.c,v 1.25.10.1 2010/02/11 05:38:20 uebayasi Exp $ */
+/* $NetBSD: mount_ffs.c,v 1.25.10.2 2010/05/28 09:14:55 uebayasi Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)mount_ufs.c 8.4 (Berkeley) 4/26/95";
#else
-__RCSID("$NetBSD: mount_ffs.c,v 1.25.10.1 2010/02/11 05:38:20 uebayasi Exp $");
+__RCSID("$NetBSD: mount_ffs.c,v 1.25.10.2 2010/05/28 09:14:55 uebayasi Exp $");
#endif
#endif /* not lint */
@@ -74,7 +74,6 @@
MOPT_SOFTDEP,
MOPT_LOG,
MOPT_GETARGS,
- MOPT_XIP,
MOPT_NULL,
};
Index: src/sys/sys/fstypes.h
diff -u src/sys/sys/fstypes.h:1.26.14.2 src/sys/sys/fstypes.h:1.26.14.3
--- src/sys/sys/fstypes.h:1.26.14.2 Tue Feb 23 06:58:06 2010
+++ src/sys/sys/fstypes.h Fri May 28 09:14:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fstypes.h,v 1.26.14.2 2010/02/23 06:58:06 uebayasi Exp $ */
+/* $NetBSD: fstypes.h,v 1.26.14.3 2010/05/28 09:14:55 uebayasi Exp $ */
/*
* Copyright (c) 1989, 1991, 1993
@@ -86,6 +86,7 @@
#define __MNT_UNUSED1 0x0002
#define __MNT_UNUSED2 0x0020
#define __MNT_UNUSED3 0x0080
+#define __MNT_UNUSED4 0x0100
#define MNT_RDONLY 0x0001 /* read only filesystem */
#define MNT_SYNCHRONOUS 0x0002 /* file system written synchronously */
@@ -96,7 +97,6 @@
#define MNT_ASYNC 0x0040 /* file system written asynchronously */
#define MNT_NOCOREDUMP 0x8000 /* don't write core dumps to this FS */
#define MNT_IGNORE 0x0010 /* don't show entry in df */
-#define MNT_XIP 0x0100 /* eXecute-In-Place */
#define MNT_LOG 0x0200 /* Use logging */
#define MNT_NOATIME 0x0400 /* Never update access times in fs */
#define MNT_SYMPERM 0x2000 /* recognize symlink permission */
@@ -113,12 +113,11 @@
{ MNT_ASYNC, 0, "asynchronous" }, \
{ MNT_NOCOREDUMP, 0, "nocoredump" }, \
{ MNT_IGNORE, 0, "hidden" }, \
- { MNT_XIP, 0, "xip" }, \
- { MNT_LOG, 0, "log" }, \
{ MNT_NOATIME, 0, "noatime" }, \
{ MNT_SYMPERM, 0, "symperm" }, \
{ MNT_NODEVMTIME, 0, "nodevmtime" }, \
{ MNT_SOFTDEP, 0, "soft dependencies" }, \
+ { MNT_LOG, 0, "log" },
/*
* exported mount flags.
@@ -179,8 +178,7 @@
MNT_LOCAL | \
MNT_QUOTA | \
MNT_ROOTFS | \
- MNT_LOG | \
- MNT_XIP)
+ MNT_LOG)
/*
* External filesystem control flags.
@@ -229,7 +227,7 @@
"\34MNT_EXNORESPORT" \
"\33MNT_NOATIME" \
"\32MNT_LOG" \
- "\31MNT_XIP" \
+ "\31MNT_UNUSED" \
"\30MNT_UNUSED" \
"\27MNT_GETARGS" \
"\26MNT_UNUSED" \
Index: src/sys/ufs/ffs/ffs_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.257.2.5 src/sys/ufs/ffs/ffs_vfsops.c:1.257.2.6
--- src/sys/ufs/ffs/ffs_vfsops.c:1.257.2.5 Fri Apr 30 14:44:34 2010
+++ src/sys/ufs/ffs/ffs_vfsops.c Fri May 28 09:14:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vfsops.c,v 1.257.2.5 2010/04/30 14:44:34 uebayasi Exp $ */
+/* $NetBSD: ffs_vfsops.c,v 1.257.2.6 2010/05/28 09:14:55 uebayasi Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.257.2.5 2010/04/30 14:44:34 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.257.2.6 201
CVS commit: [uebayasi-xip] src/sys/sys
Module Name:src
Committed By: uebayasi
Date: Fri May 28 09:13:37 UTC 2010
Modified Files:
src/sys/sys [uebayasi-xip]: dkio.h
Log Message:
Reduce changes against HEAD.
To generate a diff of this commit:
cvs rdiff -u -r1.15.2.3 -r1.15.2.4 src/sys/sys/dkio.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/dkio.h
diff -u src/sys/sys/dkio.h:1.15.2.3 src/sys/sys/dkio.h:1.15.2.4
--- src/sys/sys/dkio.h:1.15.2.3 Fri Apr 30 14:44:32 2010
+++ src/sys/sys/dkio.h Fri May 28 09:13:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dkio.h,v 1.15.2.3 2010/04/30 14:44:32 uebayasi Exp $ */
+/* $NetBSD: dkio.h,v 1.15.2.4 2010/05/28 09:13:37 uebayasi Exp $ */
/*
* Copyright (c) 1987, 1988, 1993
@@ -105,6 +105,7 @@
/* get disk-info dictionary */
#define DIOCGDISKINFO _IOR('d', 127, struct plistref)
+
#define DIOCTUR _IOR('d', 128, int) /* test unit ready */
/* get physical address cookie if directly memory-mappable (XIP) */
CVS commit: [uebayasi-xip] src/sys/arch/hppa/hppa
Module Name:src
Committed By: uebayasi
Date: Fri May 28 08:32:20 UTC 2010
Modified Files:
src/sys/arch/hppa/hppa [uebayasi-xip]: pmap.c
Log Message:
Fix a typo; pointed out by Chuck Silvers.
To generate a diff of this commit:
cvs rdiff -u -r1.63.2.3 -r1.63.2.4 src/sys/arch/hppa/hppa/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/hppa/pmap.c
diff -u src/sys/arch/hppa/hppa/pmap.c:1.63.2.3 src/sys/arch/hppa/hppa/pmap.c:1.63.2.4
--- src/sys/arch/hppa/hppa/pmap.c:1.63.2.3 Fri Apr 30 14:39:27 2010
+++ src/sys/arch/hppa/hppa/pmap.c Fri May 28 08:32:20 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.63.2.3 2010/04/30 14:39:27 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.63.2.4 2010/05/28 08:32:20 uebayasi Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.63.2.3 2010/04/30 14:39:27 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.63.2.4 2010/05/28 08:32:20 uebayasi Exp $");
#include "opt_device_page.h"
#include "opt_xip.h"
@@ -1118,7 +1118,7 @@
continue;
sheep = PHYS_TO_VM_PAGE(PTE_PAGE(*pde));
- struct vm_page_md * const md = VM_PAGE_TO_MD(sheap);
+ struct vm_page_md * const md = VM_PAGE_TO_MD(sheep);
for (haggis = md->pvh_list; haggis != NULL; )
if (haggis->pv_pmap == pmap) {
CVS commit: [uebayasi-xip] src/sys/dev/tc
Module Name:src Committed By: uebayasi Date: Fri May 28 07:50:44 UTC 2010 Modified Files: src/sys/dev/tc [uebayasi-xip]: px.c Log Message: Fix build. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.37.2.1 src/sys/dev/tc/px.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/tc/px.c diff -u src/sys/dev/tc/px.c:1.37 src/sys/dev/tc/px.c:1.37.2.1 --- src/sys/dev/tc/px.c:1.37 Sat Aug 22 17:38:06 2009 +++ src/sys/dev/tc/px.c Fri May 28 07:50:44 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: px.c,v 1.37 2009/08/22 17:38:06 tsutsui Exp $ */ +/* $NetBSD: px.c,v 1.37.2.1 2010/05/28 07:50:44 uebayasi Exp $ */ /*- * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.37 2009/08/22 17:38:06 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.37.2.1 2010/05/28 07:50:44 uebayasi Exp $"); #include #include @@ -42,7 +42,7 @@ #include #include -#include +#include #if defined(pmax) #include
CVS commit: src/sbin/disklabel
Module Name:src
Committed By: dholland
Date: Fri May 28 07:40:53 UTC 2010
Modified Files:
src/sbin/disklabel: interact.c
Log Message:
Change getnum() to use intmax_t instead of int, so it doesn't overflow
between 2^31 and 2^32. Adjust call sites accordingly. PR 43354.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sbin/disklabel/interact.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/disklabel/interact.c
diff -u src/sbin/disklabel/interact.c:1.33 src/sbin/disklabel/interact.c:1.34
--- src/sbin/disklabel/interact.c:1.33 Sat Nov 28 10:52:10 2009
+++ src/sbin/disklabel/interact.c Fri May 28 07:40:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: interact.c,v 1.33 2009/11/28 10:52:10 abs Exp $ */
+/* $NetBSD: interact.c,v 1.34 2010/05/28 07:40:53 dholland Exp $ */
/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
@@ -30,7 +30,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: interact.c,v 1.33 2009/11/28 10:52:10 abs Exp $");
+__RCSID("$NetBSD: interact.c,v 1.34 2010/05/28 07:40:53 dholland Exp $");
#endif /* lint */
#include
@@ -67,7 +67,7 @@
static int alphacmp(const void *, const void *);
static void defnum(struct disklabel *, char *, uint32_t);
static void dumpnames(const char *, const char * const *, size_t);
-static int getnum(struct disklabel *, char *, int);
+static intmax_t getnum(struct disklabel *, char *, intmax_t);
static int rounding = 0; /* sector rounding */
static int chaining = 0; /* make partitions contiguous */
@@ -444,6 +444,7 @@
cmd_part(struct disklabel *lp, char *s, int fd)
{
int i;
+ intmax_t im;
char line[BUFSIZ];
char def[BUFSIZ];
int part;
@@ -503,14 +504,15 @@
cp[line[0] - 'a'].p_size;
}
} else {
- if ((i = getnum(lp, line, 0)) == -1 || i < 0) {
+ if ((im = getnum(lp, line, 0)) == -1 || im < 0) {
printf("Bad offset `%s'\n", line);
continue;
- } else if ((uint32_t)i > lp->d_secperunit) {
+ } else if (im > 0xLL ||
+ (uint32_t)im > lp->d_secperunit) {
printf("Offset `%s' out of range\n", line);
continue;
}
- p->p_offset = i;
+ p->p_offset = (uint32_t)im;
}
break;
}
@@ -522,16 +524,16 @@
return;
else if (i == 0)
break;
- if ((i = getnum(lp, line, lp->d_secperunit - p->p_offset))
+ if ((im = getnum(lp, line, lp->d_secperunit - p->p_offset))
== -1) {
printf("Bad size `%s'\n", line);
continue;
- } else if
- ((i + p->p_offset) > lp->d_secperunit) {
+ } else if (im > 0xLL ||
+ (im + p->p_offset) > lp->d_secperunit) {
printf("Size `%s' out of range\n", line);
continue;
}
- p->p_size = i;
+ p->p_size = im;
break;
}
@@ -708,15 +710,15 @@
}
-static int
-getnum(struct disklabel *lp, char *buf, int max)
+static intmax_t
+getnum(struct disklabel *lp, char *buf, intmax_t defaultval)
{
char *ep;
double d;
- int rv;
+ intmax_t rv;
- if (max && buf[0] == '$' && buf[1] == 0)
- return max;
+ if (defaultval && buf[0] == '$' && buf[1] == 0)
+ return defaultval;
d = strtod(buf, &ep);
if (buf == ep)
@@ -729,32 +731,32 @@
case '\0':
case 's':
case 'S':
- rv = (int) d;
+ rv = (intmax_t) d;
break;
case 'c':
case 'C':
- rv = (int) (d * lp->d_secpercyl);
+ rv = (intmax_t) (d * lp->d_secpercyl);
break;
case 'k':
case 'K':
- rv = (int) (d * 1024 / lp->d_secsize);
+ rv = (intmax_t) (d * 1024 / lp->d_secsize);
break;
case 'm':
case 'M':
- rv = (int) (d * 1024 * 1024 / lp->d_secsize);
+ rv = (intmax_t) (d * 1024 * 1024 / lp->d_secsize);
break;
case 'g':
case 'G':
- rv = (int) (d * 1024 * 1024 * 1024 / lp->d_secsize);
+ rv = (intmax_t) (d * 1024 * 1024 * 1024 / lp->d_secsize);
break;
case 't':
case 'T':
- rv = (int) (d * 1024 * 1024 * 1024 * 1024 / lp->d_secsize);
+ rv = (intmax_t) (d * 1024 * 1024 * 1024 * 1024 / lp->d_secsize);
break;
default:
