CVS commit: src/sys/dev/pci
Module Name:src Committed By: skrll Date: Fri May 29 06:12:31 UTC 2009 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add a bunch of HP stuff. From OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.989 -r1.990 src/sys/dev/pci/pcidevs 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/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.989 src/sys/dev/pci/pcidevs:1.990 --- src/sys/dev/pci/pcidevs:1.989 Mon May 18 09:06:22 2009 +++ src/sys/dev/pci/pcidevs Fri May 29 06:12:31 2009 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.989 2009/05/18 09:06:22 skrll Exp $ +$NetBSD: pcidevs,v 1.990 2009/05/29 06:12:31 skrll Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1999,15 +1999,26 @@ product HEURICON PMPPC 0x000e PM/PPC /* Hewlett-Packard products */ -product HP A4977A 0x1005 A4977A Visualize EG +product HP VISUALIZE_EG 0x1005 Visualize EG +product HP VISUALIZE_FX6 0x1006 Visualize FX6 product HP VISUALIZE_FX4 0x1008 Visualize FX4 +product HP VISUALIZE_FX2 0x100a Visualize FX2 product HP TACHYON_TL 0x1028 Tachyon TL FC Controller +product HP TACHYON_XL2 0x1029 Tachyon XL2 FC Controller product HP TACHYON_TS 0x102A Tachyon TS FC Controller -product HP TACHYON_XL2 0x1030 Tachyon XL2 FC Controller product HP J2585A 0x1030 J2585A product HP J2585B 0x1031 J2585B -product HP 82557B 0x1200 82557B 10/100 NIC +product HP DIVA 0x1048 Diva Serial Multiport +product HP ELROY 0x1054 Elroy Ropes-PCI +product HP VISUALIZE_FXE 0x108b Visualize FXe +product HP TOPTOOLS 0x10c1 TopTools Communications Port product HP NETRAID_4M 0x10c2 NetRaid-4M +product HP SMARTIRQ 0x10ed NetServer SmartIRQ +product HP 82557B 0x1200 82557B 10/100 NIC +product HP PLUTO 0x1229 Pluto MIO +product HP ZX1_IOC 0x122a zx1 IOC +product HP MERCURY 0x122e Mercury Ropes-PCI +product HP QUICKSILVER 0x12b4 QuickSilver Ropes-PCI product HP HPSAV100 0x3210 Smart Array V100 product HP HPSAE200I_1 0x3211 Smart Array E200i
CVS commit: src/sys/arch/hp700/hp700
Module Name:src
Committed By: skrll
Date: Fri May 29 08:39:05 UTC 2009
Modified Files:
src/sys/arch/hp700/hp700: machdep.c
Log Message:
Save screen space and make machine check output easier to read (for me)
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/hp700/hp700/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/hp700/hp700/machdep.c
diff -u src/sys/arch/hp700/hp700/machdep.c:1.67 src/sys/arch/hp700/hp700/machdep.c:1.68
--- src/sys/arch/hp700/hp700/machdep.c:1.67 Fri May 29 08:37:34 2009
+++ src/sys/arch/hp700/hp700/machdep.c Fri May 29 08:39:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.67 2009/05/29 08:37:34 skrll Exp $ */
+/* $NetBSD: machdep.c,v 1.68 2009/05/29 08:39:05 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.67 2009/05/29 08:37:34 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.68 2009/05/29 08:39:05 skrll Exp $);
#include opt_cputype.h
#include opt_ddb.h
@@ -1516,8 +1516,8 @@
printf(\n\n\t%s Registers:, name);
for (reg_k = 0; reg_k reg_j; reg_k++)
printf(%s0x%08x,
- (reg_k 3) ? : \n\t,
- regarray[reg_k]);
+(reg_k 3) ? : \n,
+regarray[reg_k]);
}
/* Print out some interesting registers. */
@@ -1605,28 +1605,23 @@
regarray = regs-pim_regs_sr0;
reg_j = 8;
}
- printf(\n\n\t%s Registers:, name);
- for (reg_k = 0; reg_k reg_j; reg_k++) {
-printf(%s,
- (reg_k 1) ? : \n\t);
-if (!(reg_k 1))
- printf(%2d: , reg_k);
-printf(0x%016lx,
- (unsigned long)regarray[reg_k]);
- }
-
+ printf(\n\n%s Registers:, name);
+ for (reg_k = 0; reg_k reg_j; reg_k++)
+printf(%s0x%016lx,
+ (reg_k 3) ? : \n,
+ (unsigned long)regarray[reg_k]);
}
/* Print out some interesting registers. */
- printf(\n\n\tIIA head 0x%lx:0x%016lx\n
- \tIIA tail 0x%lx:0x%016lx,
+ printf(\n\nIIA head 0x%lx:0x%016lx\n
+ IIA tail 0x%lx:0x%016lx,
(unsigned long)regs-pim_regs_cr17,
(unsigned long)regs-pim_regs_cr18,
(unsigned long)regs-pim_regs_iisq_tail,
(unsigned long)regs-pim_regs_iioq_tail);
- PIM_WORD(\n\tIPSW, regs-pim_regs_cr22, PSW_BITS);
- printf(\n\tSP 0x%lx:0x%016lx\n\tFP 0x%lx:0x%016lx,
- (unsigned long)regs-pim_regs_sr0,
+ PIM_WORD(\nIPSW, regs-pim_regs_cr22, PSW_BITS);
+ printf(\nSP 0x%lx:0x%016lx\nFP 0x%lx:0x%016lx,
+ (unsigned long)regs-pim_regs_sr0,
(unsigned long)regs-pim_regs_r30,
(unsigned long)regs-pim_regs_sr0,
(unsigned long)regs-pim_regs_r3);
@@ -1634,25 +1629,25 @@
/* If we have check words, display them. */
if (checks != NULL) {
- PIM_WORD(\n\n\tCheck Type, checks-pim_check_type,
+ PIM_WORD(\n\nCheck Type, checks-pim_check_type,
PIM_CHECK_BITS);
- PIM_WORD(\n\tCPU State, checks-pim_check_cpu_state,
+ PIM_WORD(\nCPU State, checks-pim_check_cpu_state,
PIM_CPU_BITS PIM_CPU_HPMC_BITS);
- PIM_WORD(\n\tCache Check, checks-pim_check_cache,
+ PIM_WORD(\nCache Check, checks-pim_check_cache,
PIM_CACHE_BITS);
- PIM_WORD(\n\tTLB Check, checks-pim_check_tlb,
+ PIM_WORD(\nTLB Check, checks-pim_check_tlb,
PIM_TLB_BITS);
- PIM_WORD(\n\tBus Check, checks-pim_check_bus,
+ PIM_WORD(\nBus Check, checks-pim_check_bus,
PIM_BUS_BITS);
- PIM_WORD(\n\tAssist Check, checks-pim_check_assist,
+ PIM_WORD(\nAssist Check, checks-pim_check_assist,
PIM_ASSIST_BITS);
- printf(\tAssist State %u, checks-pim_check_assist_state);
- printf(\n\tSystem Responder 0x%016lx,
- (unsigned long)checks-pim_check_responder);
- printf(\n\tSystem Requestor 0x%016lx,
- (unsigned long)checks-pim_check_requestor);
- printf(\n\tPath Info 0x%08x,
- checks-pim_check_path_info);
+ printf(Assist State %u, checks-pim_check_assist_state);
+ printf(\nSystem Responder 0x%016lx,
+ (unsigned long)checks-pim_check_responder);
+ printf(\nSystem Requestor 0x%016lx,
+ (unsigned long)checks-pim_check_requestor);
+ printf(\nPath Info 0x%08x,
+ checks-pim_check_path_info);
}
}
CVS commit: src/sys/arch/hp700/hp700
Module Name:src
Committed By: skrll
Date: Fri May 29 08:37:34 UTC 2009
Modified Files:
src/sys/arch/hp700/hp700: machdep.c
Log Message:
KNF
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/hp700/hp700/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/hp700/hp700/machdep.c
diff -u src/sys/arch/hp700/hp700/machdep.c:1.66 src/sys/arch/hp700/hp700/machdep.c:1.67
--- src/sys/arch/hp700/hp700/machdep.c:1.66 Mon May 18 05:20:46 2009
+++ src/sys/arch/hp700/hp700/machdep.c Fri May 29 08:37:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.66 2009/05/18 05:20:46 skrll Exp $ */
+/* $NetBSD: machdep.c,v 1.67 2009/05/29 08:37:34 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.66 2009/05/18 05:20:46 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.67 2009/05/29 08:37:34 skrll Exp $);
#include opt_cputype.h
#include opt_ddb.h
@@ -792,9 +792,8 @@
cpu_revision = (*cpu_desidhash)();
/* force strong ordering for now */
- if (hppa_cpu_info-hci_features HPPA_FTRS_W32B) {
+ if (hppa_cpu_info-hci_features HPPA_FTRS_W32B)
kpsw |= PSW_O;
- }
snprintf(cpu_model, sizeof(cpu_model), HP9000/%s, model);
CVS commit: src/sys/arch/hp700/hp700
Module Name:src
Committed By: skrll
Date: Fri May 29 08:44:29 UTC 2009
Modified Files:
src/sys/arch/hp700/hp700: machdep.c
Log Message:
Tidyup error handling around PDC_PIM.
CTASSERT - KASSERT
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/hp700/hp700/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/hp700/hp700/machdep.c
diff -u src/sys/arch/hp700/hp700/machdep.c:1.68 src/sys/arch/hp700/hp700/machdep.c:1.69
--- src/sys/arch/hp700/hp700/machdep.c:1.68 Fri May 29 08:39:05 2009
+++ src/sys/arch/hp700/hp700/machdep.c Fri May 29 08:44:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.68 2009/05/29 08:39:05 skrll Exp $ */
+/* $NetBSD: machdep.c,v 1.69 2009/05/29 08:44:29 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.68 2009/05/29 08:39:05 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.69 2009/05/29 08:44:29 skrll Exp $);
#include opt_cputype.h
#include opt_ddb.h
@@ -1656,7 +1656,7 @@
{
int pdc_pim_type;
const char *name;
- int error;
+ int pimerror, error;
/* Do an fcacheall(). */
fcacheall();
@@ -1680,12 +1680,10 @@
/* NOTREACHED */
}
- error = pdc_call((iodcio_t)pdc, 0, PDC_PIM, pdc_pim_type,
- pdc_pim, pim_data_buffer, sizeof(pim_data_buffer));
- if (error 0)
- printf( - WARNING: could not transfer PIM info (%d), error);
+ pimerror = pdc_call((iodcio_t)pdc, 0, PDC_PIM, pdc_pim_type,
+ pdc_pim, pim_data_buffer, sizeof(pim_data_buffer));
- CTASSERT(pdc_pim.count = sizeof(pim_data_buffer));
+ KASSERT(pdc_pim.count = sizeof(pim_data_buffer));
/*
* Reset IO and log errors.
@@ -1695,16 +1693,20 @@
* implemented by some machines.
*/
error = pdc_call((iodcio_t)pdc, 0, PDC_IO, 0, 0, 0, 0);
- if (error != PDC_ERR_OK error != PDC_ERR_NOPROC)
+ if (error != PDC_ERR_OK error != PDC_ERR_NOPROC)
/* This seems futile if we can't print to the console. */
panic(PDC_IO failed);
printf(\nmachine check: %s, name);
- if (hppa_cpu_info-hci_features HPPA_FTRS_W32B)
- hppa_pim64_dump(check_type);
- else
- hppa_pim_dump(check_type);
+ if (pimerror 0) {
+ printf( - WARNING: could not transfer PIM info (%d), pimerror);
+ } else {
+ if (hppa_cpu_info-hci_features HPPA_FTRS_W32B)
+ hppa_pim64_dump(check_type);
+ else
+ hppa_pim_dump(check_type);
+ }
printf(\n);
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Fri May 29 09:12:00 UTC 2009 Modified Files: othersrc/usr.bin/tnftp: configure Log Message: regenerate To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 othersrc/usr.bin/tnftp/configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/tnftp/configure diff -u othersrc/usr.bin/tnftp/configure:1.31 othersrc/usr.bin/tnftp/configure:1.32 --- othersrc/usr.bin/tnftp/configure:1.31 Fri May 22 01:16:29 2009 +++ othersrc/usr.bin/tnftp/configure Fri May 29 09:12:00 2009 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 1.17 . +# From configure.ac Revision: 1.18 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.63 for tnftp 20090520. #
CVS commit: src/sys/compat/osf1
Module Name:src Committed By: njoly Date: Fri May 29 09:32:41 UTC 2009 Modified Files: src/sys/compat/osf1: osf1_file.c Log Message: Make getdirentries set a correct block read position for basep argument. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/compat/osf1/osf1_file.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/compat/osf1/osf1_file.c diff -u src/sys/compat/osf1/osf1_file.c:1.35 src/sys/compat/osf1/osf1_file.c:1.36 --- src/sys/compat/osf1/osf1_file.c:1.35 Thu May 28 15:21:26 2009 +++ src/sys/compat/osf1/osf1_file.c Fri May 29 09:32:41 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_file.c,v 1.35 2009/05/28 15:21:26 njoly Exp $ */ +/* $NetBSD: osf1_file.c,v 1.36 2009/05/29 09:32:41 njoly Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -58,7 +58,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: osf1_file.c,v 1.35 2009/05/28 15:21:26 njoly Exp $); +__KERNEL_RCSID(0, $NetBSD: osf1_file.c,v 1.36 2009/05/29 09:32:41 njoly Exp $); #if defined(_KERNEL_OPT) #include opt_syscall_debug.h @@ -142,7 +142,7 @@ struct uio auio; struct iovec aiov; struct osf1_dirent idb; - off_t off; /* true file offset */ + off_t off, off1;/* true file offset */ int buflen, error, eofflag; off_t *cookiebuf = NULL, *cookie; int ncookies, fd; @@ -164,7 +164,7 @@ buflen = min(MAXBSIZE, SCARG(uap, nbytes)); buf = malloc(buflen, M_TEMP, M_WAITOK); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); - off = fp-f_offset; + off = off1 = fp-f_offset; again: aiov.iov_base = buf; aiov.iov_len = buflen; @@ -244,7 +244,7 @@ free(cookiebuf, M_TEMP); free(buf, M_TEMP); if (SCARG(uap, basep) != NULL) - error = copyout(eofflag, SCARG(uap, basep), sizeof(long)); + error = copyout(off1, SCARG(uap, basep), sizeof(long)); out1: fd_putfile(fd); return error;
CVS commit: src/sys/arch/hp700/dev
Module Name:src
Committed By: skrll
Date: Fri May 29 12:33:35 UTC 2009
Added Files:
src/sys/arch/hp700/dev: ssiovar.h
Log Message:
Missed in previous WIP commit.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/hp700/dev/ssiovar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/arch/hp700/dev/ssiovar.h
diff -u /dev/null src/sys/arch/hp700/dev/ssiovar.h:1.1
--- /dev/null Fri May 29 12:33:35 2009
+++ src/sys/arch/hp700/dev/ssiovar.h Fri May 29 12:33:34 2009
@@ -0,0 +1,31 @@
+/* $NetBSD: ssiovar.h,v 1.1 2009/05/29 12:33:34 skrll Exp $ */
+
+/* $OpenBSD: ssiovar.h,v 1.1 2007/06/19 22:51:26 kettenis Exp $ */
+
+/*
+ * Copyright (c) 2007 Mark Kettenis
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+struct ssio_attach_args {
+ const char *saa_name;
+ bus_space_tag_t saa_iot;
+ bus_addr_t saa_iobase;
+ int saa_irq;
+};
+
+#define ssiocf_irq cf_loc[0]
+#define SSIO_UNK_IRQ -1
+
+void *ssio_intr_establish(int, int, int (*)(void *), void *, const char *);
CVS commit: [jym-xensuspend] src/sys/arch/xen/x86
Module Name:src
Committed By: jym
Date: Fri May 29 17:30:51 UTC 2009
Modified Files:
src/sys/arch/xen/x86 [jym-xensuspend]: hypervisor_machdep.c
Log Message:
- use uvm_km_alloc() instead of kmem_alloc() to enforce alignement when
allocating p2m_frame pages (xentools can only deal with page-aligned addresses)
- *sigh* do not use paddr_t for p2m_frame_list_list with PAE, xentools expect
32 bits addresses even with 64 bits PTE...
To generate a diff of this commit:
cvs rdiff -u -r1.11.8.1 -r1.11.8.2 src/sys/arch/xen/x86/hypervisor_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/xen/x86/hypervisor_machdep.c
diff -u src/sys/arch/xen/x86/hypervisor_machdep.c:1.11.8.1 src/sys/arch/xen/x86/hypervisor_machdep.c:1.11.8.2
--- src/sys/arch/xen/x86/hypervisor_machdep.c:1.11.8.1 Mon Feb 9 00:03:55 2009
+++ src/sys/arch/xen/x86/hypervisor_machdep.c Fri May 29 17:30:51 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor_machdep.c,v 1.11.8.1 2009/02/09 00:03:55 jym Exp $ */
+/* $NetBSD: hypervisor_machdep.c,v 1.11.8.2 2009/05/29 17:30:51 jym Exp $ */
/*
*
@@ -59,11 +59,10 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hypervisor_machdep.c,v 1.11.8.1 2009/02/09 00:03:55 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: hypervisor_machdep.c,v 1.11.8.2 2009/05/29 17:30:51 jym Exp $);
#include sys/param.h
#include sys/systm.h
-#include sys/kmem.h
#include uvm/uvm_extern.h
@@ -424,10 +423,11 @@
* A L1 page contains the list of MFN we are looking for
*/
max_pfn = xen_start_info.nr_pages;
-fpp = PAGE_SIZE / sizeof(paddr_t);
+fpp = PAGE_SIZE / sizeof(unsigned long);
/* we only need one L3 page */
-l3_p2m_page = kmem_alloc(PAGE_SIZE, KM_NOSLEEP);
+l3_p2m_page = (vaddr_t *)uvm_km_alloc(kernel_map, PAGE_SIZE,
+ PAGE_SIZE, UVM_KMF_WIRED | UVM_KMF_NOWAIT);
if (l3_p2m_page == NULL)
panic(could not allocate memory for l3_p2m_page);
@@ -437,7 +437,9 @@
*/
l2_p2m_page_size = howmany(max_pfn, fpp);
-l2_p2m_page = kmem_alloc(l2_p2m_page_size * PAGE_SIZE, KM_NOSLEEP);
+l2_p2m_page = (vaddr_t *)uvm_km_alloc(kernel_map,
+ l2_p2m_page_size * PAGE_SIZE,
+ PAGE_SIZE, UVM_KMF_WIRED | UVM_KMF_NOWAIT);
if (l2_p2m_page == NULL)
panic(could not allocate memory for l2_p2m_page);
@@ -457,7 +459,7 @@
unsigned long max_pfn;
max_pfn = xen_start_info.nr_pages;
-fpp = PAGE_SIZE / sizeof(paddr_t);
+fpp = PAGE_SIZE / sizeof(unsigned long);
for (i = 0; i l2_p2m_page_size; i++) {
/*
@@ -481,7 +483,7 @@
HYPERVISOR_shared_info-arch.pfn_to_mfn_frame_list_list =
vtomfn((vaddr_t)l3_p2m_page);
-HYPERVISOR_shared_info-arch.max_pfn = max_pfn;
+HYPERVISOR_shared_info-arch.max_pfn = max_pfn;
}
#endif /* XEN3 */
CVS commit: src/sys/dev/ofw
Module Name:src Committed By: rjs Date: Fri May 29 20:10:40 UTC 2009 Modified Files: src/sys/dev/ofw: ofcons.c Log Message: Pass correct argument to q_to_b(). To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/dev/ofw/ofcons.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/ofw/ofcons.c diff -u src/sys/dev/ofw/ofcons.c:1.40 src/sys/dev/ofw/ofcons.c:1.41 --- src/sys/dev/ofw/ofcons.c:1.40 Tue May 12 14:39:22 2009 +++ src/sys/dev/ofw/ofcons.c Fri May 29 20:10:39 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ofcons.c,v 1.40 2009/05/12 14:39:22 cegger Exp $ */ +/* $NetBSD: ofcons.c,v 1.41 2009/05/29 20:10:39 rjs Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ofcons.c,v 1.40 2009/05/12 14:39:22 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: ofcons.c,v 1.41 2009/05/29 20:10:39 rjs Exp $); #include sys/param.h #include sys/conf.h @@ -220,7 +220,7 @@ } tp-t_state |= TS_BUSY; splx(s); - len = q_to_b(cl, buf, OFBURSTLEN); + len = q_to_b(tp-t_outq, buf, OFBURSTLEN); OF_write(stdout, buf, len); s = spltty(); tp-t_state = ~TS_BUSY;
CVS commit: src/sys/arch/sparc
Module Name:src Committed By: mrg Date: Fri May 29 22:06:56 UTC 2009 Modified Files: src/sys/arch/sparc/include: cpu.h src/sys/arch/sparc/sparc: locore.s vm_machdep.c Log Message: fix up cpu_setfunc() as noted by uwe: - don't call lwp_startup for cpu_setfunc() users - introduce lwp_setfunc_trampoline instead - no need to set the new lwp for setfunc To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/arch/sparc/include/cpu.h cvs rdiff -u -r1.245 -r1.246 src/sys/arch/sparc/sparc/locore.s cvs rdiff -u -r1.99 -r1.100 src/sys/arch/sparc/sparc/vm_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/sparc/include/cpu.h diff -u src/sys/arch/sparc/include/cpu.h:1.85 src/sys/arch/sparc/include/cpu.h:1.86 --- src/sys/arch/sparc/include/cpu.h:1.85 Wed May 27 01:35:28 2009 +++ src/sys/arch/sparc/include/cpu.h Fri May 29 22:06:55 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.85 2009/05/27 01:35:28 mrg Exp $ */ +/* $NetBSD: cpu.h,v 1.86 2009/05/29 22:06:55 mrg Exp $ */ /* * Copyright (c) 1992, 1993 @@ -196,6 +196,7 @@ void write_all_windows(void); void write_user_windows(void); void lwp_trampoline(void); +void lwp_setfunc_trampoline(void); struct pcb; void snapshot(struct pcb *); struct frame *getfp(void); Index: src/sys/arch/sparc/sparc/locore.s diff -u src/sys/arch/sparc/sparc/locore.s:1.245 src/sys/arch/sparc/sparc/locore.s:1.246 --- src/sys/arch/sparc/sparc/locore.s:1.245 Mon May 18 01:36:11 2009 +++ src/sys/arch/sparc/sparc/locore.s Fri May 29 22:06:55 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.245 2009/05/18 01:36:11 mrg Exp $ */ +/* $NetBSD: locore.s,v 1.246 2009/05/29 22:06:55 mrg Exp $ */ /* * Copyright (c) 1996 Paul Kranenburg @@ -5043,6 +5043,9 @@ * * If were setting up a kernel thread, the function *(%l0) will not * return. + * + * For KERN_SA applications, we provide an alternate entry point for + * cpu_setfunc() to use. */ ENTRY(lwp_trampoline) /* @@ -5055,6 +5058,7 @@ call lwp_startup mov %l2, %o1 +_ENTRY(lwp_setfunc_trampoline) call %l0 mov %l1, %o0 Index: src/sys/arch/sparc/sparc/vm_machdep.c diff -u src/sys/arch/sparc/sparc/vm_machdep.c:1.99 src/sys/arch/sparc/sparc/vm_machdep.c:1.100 --- src/sys/arch/sparc/sparc/vm_machdep.c:1.99 Wed May 27 04:08:06 2009 +++ src/sys/arch/sparc/sparc/vm_machdep.c Fri May 29 22:06:56 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: vm_machdep.c,v 1.99 2009/05/27 04:08:06 mrg Exp $ */ +/* $NetBSD: vm_machdep.c,v 1.100 2009/05/29 22:06:56 mrg Exp $ */ /* * Copyright (c) 1996 @@ -49,7 +49,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.99 2009/05/27 04:08:06 mrg Exp $); +__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.100 2009/05/29 22:06:56 mrg Exp $); #include opt_multiprocessor.h @@ -275,8 +275,15 @@ /* Construct kernel frame to return to in cpu_switch() */ rp = (struct rwindow *)((u_int)npcb + TOPFRAMEOFF); + /**rp = *(struct rwindow *)((u_int)opcb + TOPFRAMEOFF);*/ + rp-rw_local[0] = (int)func; /* Function to call */ + rp-rw_local[1] = (int)arg; /* and its argument */ + rp-rw_local[2] = (int)l2; /* new LWP */ - cpu_setfunc(l2, func, arg); + npcb-pcb_pc = (int)lwp_trampoline - 8; + npcb-pcb_sp = (int)rp; + npcb-pcb_psr = ~PSR_CWP; /* Run in window #0 */ + npcb-pcb_wim = 1; /* Fence at window #1 */ } /* @@ -329,9 +336,8 @@ rp = (struct rwindow *)((u_int)pcb + TOPFRAMEOFF); rp-rw_local[0] = (int)func; /* Function to call */ rp-rw_local[1] = (int)arg; /* and its argument */ - rp-rw_local[2] = (int)l; /* new lwp */ - pcb-pcb_pc = (int)lwp_trampoline - 8; + pcb-pcb_pc = (int)lwp_setfunc_trampoline - 8; pcb-pcb_sp = (int)rp; pcb-pcb_psr = ~PSR_CWP; /* Run in window #0 */ pcb-pcb_wim = 1; /* Fence at window #1 */
CVS commit: xsrc/external/mit/freetype/dist/include/freetype/config
Module Name:xsrc Committed By: nonaka Date: Fri May 29 22:25:07 UTC 2009 Modified Files: xsrc/external/mit/freetype/dist/include/freetype/config: ftconfig.h Log Message: Use correct syntax for orr instruction. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h 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/freetype/dist/include/freetype/config/ftconfig.h diff -u xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h:1.1.1.2 xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h:1.2 --- xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h:1.1.1.2 Mon Apr 13 18:51:14 2009 +++ xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h Fri May 29 22:25:07 2009 @@ -327,7 +327,7 @@ adds %1, %1, %0\n\t /* %1 += %0 */ adc%2, %2, #0\n\t /* %2 += carry */ mov%0, %1, lsr #16\n\t /* %0 = %1 16 */ - orr%0, %2, lsl #16\n\t /* %0 |= %2 16 */ + orr%0, %0, %2, lsl #16\n\t /* %0 |= %2 16 */ : =r(a), =r(t2), =r(t) : r(a), r(b) ); return a;
CVS commit: src/sys/dev/sdmmc
Module Name:src
Committed By: nonaka
Date: Fri May 29 22:27:40 UTC 2009
Modified Files:
src/sys/dev/sdmmc: ld_sdmmc.c
Log Message:
It is avoided that the error occurs when the card attaches it,
when wedge is supported.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/sdmmc/ld_sdmmc.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/sdmmc/ld_sdmmc.c
diff -u src/sys/dev/sdmmc/ld_sdmmc.c:1.2 src/sys/dev/sdmmc/ld_sdmmc.c:1.3
--- src/sys/dev/sdmmc/ld_sdmmc.c:1.2 Wed May 6 08:20:49 2009
+++ src/sys/dev/sdmmc/ld_sdmmc.c Fri May 29 22:27:40 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_sdmmc.c,v 1.2 2009/05/06 08:20:49 cegger Exp $ */
+/* $NetBSD: ld_sdmmc.c,v 1.3 2009/05/29 22:27:40 nonaka Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ld_sdmmc.c,v 1.2 2009/05/06 08:20:49 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: ld_sdmmc.c,v 1.3 2009/05/29 22:27:40 nonaka Exp $);
#include rnd.h
@@ -43,6 +43,7 @@
#include sys/endian.h
#include sys/dkio.h
#include sys/disk.h
+#include sys/kthread.h
#if NRND 0
#include sys/rnd.h
#endif
@@ -84,6 +85,7 @@
static int ld_sdmmc_dump(struct ld_softc *, void *, int, int);
static int ld_sdmmc_start(struct ld_softc *, struct buf *);
+static void ld_sdmmc_doattach(void *);
static void ld_sdmmc_dobio(void *);
static void ld_sdmmc_timeout(void *);
@@ -109,6 +111,7 @@
struct ld_sdmmc_softc *sc = device_private(self);
struct sdmmc_attach_args *sa = aux;
struct ld_softc *ld = sc-sc_ld;
+ struct lwp *lwp;
ld-sc_dv = self;
@@ -128,7 +131,24 @@
ld-sc_dump = ld_sdmmc_dump;
ld-sc_start = ld_sdmmc_start;
+ /*
+ * It is avoided that the error occurs when the card attaches it,
+ * when wedge is supported.
+ */
+ if (kthread_create(PRI_NONE, KTHREAD_MPSAFE, NULL,
+ ld_sdmmc_doattach, sc, lwp, %sattach, device_xname(self))) {
+ aprint_error_dev(self, couldn't create thread\n);
+ }
+}
+
+static void
+ld_sdmmc_doattach(void *arg)
+{
+ struct ld_sdmmc_softc *sc = (struct ld_sdmmc_softc *)arg;
+ struct ld_softc *ld = sc-sc_ld;
+
ldattach(ld);
+ kthread_exit(0);
}
static int
CVS commit: src/sys/kern
Module Name:src
Committed By: dyoung
Date: Fri May 29 23:27:08 UTC 2009
Modified Files:
src/sys/kern: subr_autoconf.c
Log Message:
In config_detach(9), if device deactivation fails with EOPNOTSUPP,
don't treat it as an error. This should stop the kernel from
panicking in config_detach(9) when sd(4)/wd(4) detach.
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/sys/kern/subr_autoconf.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/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.176 src/sys/kern/subr_autoconf.c:1.177
--- src/sys/kern/subr_autoconf.c:1.176 Sun May 24 12:27:50 2009
+++ src/sys/kern/subr_autoconf.c Fri May 29 23:27:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.176 2009/05/24 12:27:50 ad Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.177 2009/05/29 23:27:08 dyoung Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_autoconf.c,v 1.176 2009/05/24 12:27:50 ad Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_autoconf.c,v 1.177 2009/05/29 23:27:08 dyoung Exp $);
#include opt_ddb.h
#include drvctl.h
@@ -1511,8 +1511,8 @@
(flags (DETACH_SHUTDOWN|DETACH_FORCE)) == DETACH_SHUTDOWN
(dev-dv_flags DVF_DETACH_SHUTDOWN) == 0) {
rv = EBUSY; /* XXX EOPNOTSUPP? */
- } else if (ca-ca_activate != NULL)
- rv = config_deactivate(dev);
+ } else if ((rv = config_deactivate(dev)) == EOPNOTSUPP)
+ rv = 0; /* Do not treat EOPNOTSUPP as an error */
/*
* Try to detach the device. If that's not possible, then
CVS commit: src/sys/arch/sparc/sparc
Module Name:src
Committed By: mrg
Date: Sat May 30 01:19:29 UTC 2009
Modified Files:
src/sys/arch/sparc/sparc: cpu.c
Log Message:
print the curpcb in mach cpu output as well.
To generate a diff of this commit:
cvs rdiff -u -r1.215 -r1.216 src/sys/arch/sparc/sparc/cpu.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/sparc/sparc/cpu.c
diff -u src/sys/arch/sparc/sparc/cpu.c:1.215 src/sys/arch/sparc/sparc/cpu.c:1.216
--- src/sys/arch/sparc/sparc/cpu.c:1.215 Wed May 27 02:19:49 2009
+++ src/sys/arch/sparc/sparc/cpu.c Sat May 30 01:19:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.215 2009/05/27 02:19:49 mrg Exp $ */
+/* $NetBSD: cpu.c,v 1.216 2009/05/30 01:19:29 mrg Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.215 2009/05/27 02:19:49 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.216 2009/05/30 01:19:29 mrg Exp $);
#include opt_multiprocessor.h
#include opt_lockdebug.h
@@ -424,7 +424,7 @@
}
/*
- * Note: `eintstack' is set in init_cpuinfo() above.
+ * Note: `eintstack' is set in cpu_attach_non_boot() above.
* The %wim register will be initialized in cpu_hatch().
*/
cpi-ci_curlwp = cpi-ci_data.cpu_idlelwp;
@@ -2015,16 +2015,17 @@
struct cpu_info *ci;
CPU_INFO_ITERATOR cii;
- db_printf(%-4s %-10s %-8s %-10s %-10s %-10s\n,
- CPU#, CPUINFO, FLAGS, CURLWP, CURPROC, FPLWP);
+ db_printf(%-4s %-10s %-8s %-10s %-10s %-10s %-10s\n,
+ CPU#, CPUINFO, FLAGS, CURLWP, CURPROC, FPLWP, CPCB);
for (CPU_INFO_FOREACH(cii, ci)) {
- db_printf(%-4d %-10p %-8x %-10p %-10p %-10p\n,
+ db_printf(%-4d %-10p %-8x %-10p %-10p %-10p %-10p\n,
ci-ci_cpuid,
ci,
ci-flags,
ci-ci_curlwp,
ci-ci_curlwp == NULL ? NULL : ci-ci_curlwp-l_proc,
- ci-fplwp);
+ ci-fplwp,
+ ci-curpcb);
}
}
#endif
CVS commit: [yamt-nfs-mp] src/sys/uvm
Module Name:src
Committed By: yamt
Date: Sat May 30 04:23:20 UTC 2009
Modified Files:
src/sys/uvm [yamt-nfs-mp]: uvm_mmap.c
Log Message:
wrap long lines.
To generate a diff of this commit:
cvs rdiff -u -r1.122.4.1 -r1.122.4.2 src/sys/uvm/uvm_mmap.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_mmap.c
diff -u src/sys/uvm/uvm_mmap.c:1.122.4.1 src/sys/uvm/uvm_mmap.c:1.122.4.2
--- src/sys/uvm/uvm_mmap.c:1.122.4.1 Mon May 4 08:14:39 2009
+++ src/sys/uvm/uvm_mmap.c Sat May 30 04:23:20 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_mmap.c,v 1.122.4.1 2009/05/04 08:14:39 yamt Exp $ */
+/* $NetBSD: uvm_mmap.c,v 1.122.4.2 2009/05/30 04:23:20 yamt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -51,7 +51,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_mmap.c,v 1.122.4.1 2009/05/04 08:14:39 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_mmap.c,v 1.122.4.2 2009/05/30 04:23:20 yamt Exp $);
#include opt_compat_netbsd.h
#include opt_pax.h
@@ -145,7 +145,8 @@
/* ARGSUSED */
int
-sys_mincore(struct lwp *l, const struct sys_mincore_args *uap, register_t *retval)
+sys_mincore(struct lwp *l, const struct sys_mincore_args *uap,
+register_t *retval)
{
/* {
syscallarg(void *) addr;
@@ -562,7 +563,8 @@
*/
int
-sys___msync13(struct lwp *l, const struct sys___msync13_args *uap, register_t *retval)
+sys___msync13(struct lwp *l, const struct sys___msync13_args *uap,
+register_t *retval)
{
/* {
syscallarg(void *) addr;
@@ -716,7 +718,8 @@
*/
int
-sys_mprotect(struct lwp *l, const struct sys_mprotect_args *uap, register_t *retval)
+sys_mprotect(struct lwp *l, const struct sys_mprotect_args *uap,
+register_t *retval)
{
/* {
syscallarg(void *) addr;
@@ -760,7 +763,8 @@
*/
int
-sys_minherit(struct lwp *l, const struct sys_minherit_args *uap, register_t *retval)
+sys_minherit(struct lwp *l, const struct sys_minherit_args *uap,
+ register_t *retval)
{
/* {
syscallarg(void *) addr;
@@ -801,7 +805,8 @@
/* ARGSUSED */
int
-sys_madvise(struct lwp *l, const struct sys_madvise_args *uap, register_t *retval)
+sys_madvise(struct lwp *l, const struct sys_madvise_args *uap,
+ register_t *retval)
{
/* {
syscallarg(void *) addr;
@@ -953,7 +958,8 @@
*/
int
-sys_munlock(struct lwp *l, const struct sys_munlock_args *uap, register_t *retval)
+sys_munlock(struct lwp *l, const struct sys_munlock_args *uap,
+register_t *retval)
{
/* {
syscallarg(const void *) addr;
@@ -996,7 +1002,8 @@
*/
int
-sys_mlockall(struct lwp *l, const struct sys_mlockall_args *uap, register_t *retval)
+sys_mlockall(struct lwp *l, const struct sys_mlockall_args *uap,
+register_t *retval)
{
/* {
syscallarg(int) flags;
@@ -1037,7 +1044,8 @@
*/
int
-uvm_mmap(struct vm_map *map, vaddr_t *addr, vsize_t size, vm_prot_t prot, vm_prot_t maxprot, int flags, void *handle, voff_t foff, vsize_t locklimit)
+uvm_mmap(struct vm_map *map, vaddr_t *addr, vsize_t size, vm_prot_t prot,
+vm_prot_t maxprot, int flags, void *handle, voff_t foff, vsize_t locklimit)
{
struct uvm_object *uobj;
struct vnode *vp;
CVS commit: [yamt-nfs-mp] src/sys/uvm
Module Name:src
Committed By: yamt
Date: Sat May 30 04:25:43 UTC 2009
Modified Files:
src/sys/uvm [yamt-nfs-mp]: uvm_mmap.c
Log Message:
revert the previous, which has been committed to the wrong branch.
To generate a diff of this commit:
cvs rdiff -u -r1.122.4.2 -r1.122.4.3 src/sys/uvm/uvm_mmap.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_mmap.c
diff -u src/sys/uvm/uvm_mmap.c:1.122.4.2 src/sys/uvm/uvm_mmap.c:1.122.4.3
--- src/sys/uvm/uvm_mmap.c:1.122.4.2 Sat May 30 04:23:20 2009
+++ src/sys/uvm/uvm_mmap.c Sat May 30 04:25:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_mmap.c,v 1.122.4.2 2009/05/30 04:23:20 yamt Exp $ */
+/* $NetBSD: uvm_mmap.c,v 1.122.4.3 2009/05/30 04:25:43 yamt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -51,7 +51,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_mmap.c,v 1.122.4.2 2009/05/30 04:23:20 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_mmap.c,v 1.122.4.3 2009/05/30 04:25:43 yamt Exp $);
#include opt_compat_netbsd.h
#include opt_pax.h
@@ -145,8 +145,7 @@
/* ARGSUSED */
int
-sys_mincore(struct lwp *l, const struct sys_mincore_args *uap,
-register_t *retval)
+sys_mincore(struct lwp *l, const struct sys_mincore_args *uap, register_t *retval)
{
/* {
syscallarg(void *) addr;
@@ -563,8 +562,7 @@
*/
int
-sys___msync13(struct lwp *l, const struct sys___msync13_args *uap,
-register_t *retval)
+sys___msync13(struct lwp *l, const struct sys___msync13_args *uap, register_t *retval)
{
/* {
syscallarg(void *) addr;
@@ -718,8 +716,7 @@
*/
int
-sys_mprotect(struct lwp *l, const struct sys_mprotect_args *uap,
-register_t *retval)
+sys_mprotect(struct lwp *l, const struct sys_mprotect_args *uap, register_t *retval)
{
/* {
syscallarg(void *) addr;
@@ -763,8 +760,7 @@
*/
int
-sys_minherit(struct lwp *l, const struct sys_minherit_args *uap,
- register_t *retval)
+sys_minherit(struct lwp *l, const struct sys_minherit_args *uap, register_t *retval)
{
/* {
syscallarg(void *) addr;
@@ -805,8 +801,7 @@
/* ARGSUSED */
int
-sys_madvise(struct lwp *l, const struct sys_madvise_args *uap,
- register_t *retval)
+sys_madvise(struct lwp *l, const struct sys_madvise_args *uap, register_t *retval)
{
/* {
syscallarg(void *) addr;
@@ -958,8 +953,7 @@
*/
int
-sys_munlock(struct lwp *l, const struct sys_munlock_args *uap,
-register_t *retval)
+sys_munlock(struct lwp *l, const struct sys_munlock_args *uap, register_t *retval)
{
/* {
syscallarg(const void *) addr;
@@ -1002,8 +996,7 @@
*/
int
-sys_mlockall(struct lwp *l, const struct sys_mlockall_args *uap,
-register_t *retval)
+sys_mlockall(struct lwp *l, const struct sys_mlockall_args *uap, register_t *retval)
{
/* {
syscallarg(int) flags;
@@ -1044,8 +1037,7 @@
*/
int
-uvm_mmap(struct vm_map *map, vaddr_t *addr, vsize_t size, vm_prot_t prot,
-vm_prot_t maxprot, int flags, void *handle, voff_t foff, vsize_t locklimit)
+uvm_mmap(struct vm_map *map, vaddr_t *addr, vsize_t size, vm_prot_t prot, vm_prot_t maxprot, int flags, void *handle, voff_t foff, vsize_t locklimit)
{
struct uvm_object *uobj;
struct vnode *vp;
CVS commit: src/sys/uvm
Module Name:src
Committed By: yamt
Date: Sat May 30 04:26:16 UTC 2009
Modified Files:
src/sys/uvm: uvm_mmap.c
Log Message:
wrap long lines.
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sys/uvm/uvm_mmap.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_mmap.c
diff -u src/sys/uvm/uvm_mmap.c:1.128 src/sys/uvm/uvm_mmap.c:1.129
--- src/sys/uvm/uvm_mmap.c:1.128 Sun Mar 29 01:02:51 2009
+++ src/sys/uvm/uvm_mmap.c Sat May 30 04:26:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_mmap.c,v 1.128 2009/03/29 01:02:51 mrg Exp $ */
+/* $NetBSD: uvm_mmap.c,v 1.129 2009/05/30 04:26:16 yamt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -51,7 +51,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_mmap.c,v 1.128 2009/03/29 01:02:51 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_mmap.c,v 1.129 2009/05/30 04:26:16 yamt Exp $);
#include opt_compat_netbsd.h
#include opt_pax.h
@@ -145,7 +145,8 @@
/* ARGSUSED */
int
-sys_mincore(struct lwp *l, const struct sys_mincore_args *uap, register_t *retval)
+sys_mincore(struct lwp *l, const struct sys_mincore_args *uap,
+register_t *retval)
{
/* {
syscallarg(void *) addr;
@@ -562,7 +563,8 @@
*/
int
-sys___msync13(struct lwp *l, const struct sys___msync13_args *uap, register_t *retval)
+sys___msync13(struct lwp *l, const struct sys___msync13_args *uap,
+register_t *retval)
{
/* {
syscallarg(void *) addr;
@@ -716,7 +718,8 @@
*/
int
-sys_mprotect(struct lwp *l, const struct sys_mprotect_args *uap, register_t *retval)
+sys_mprotect(struct lwp *l, const struct sys_mprotect_args *uap,
+register_t *retval)
{
/* {
syscallarg(void *) addr;
@@ -760,7 +763,8 @@
*/
int
-sys_minherit(struct lwp *l, const struct sys_minherit_args *uap, register_t *retval)
+sys_minherit(struct lwp *l, const struct sys_minherit_args *uap,
+ register_t *retval)
{
/* {
syscallarg(void *) addr;
@@ -801,7 +805,8 @@
/* ARGSUSED */
int
-sys_madvise(struct lwp *l, const struct sys_madvise_args *uap, register_t *retval)
+sys_madvise(struct lwp *l, const struct sys_madvise_args *uap,
+ register_t *retval)
{
/* {
syscallarg(void *) addr;
@@ -953,7 +958,8 @@
*/
int
-sys_munlock(struct lwp *l, const struct sys_munlock_args *uap, register_t *retval)
+sys_munlock(struct lwp *l, const struct sys_munlock_args *uap,
+register_t *retval)
{
/* {
syscallarg(const void *) addr;
@@ -996,7 +1002,8 @@
*/
int
-sys_mlockall(struct lwp *l, const struct sys_mlockall_args *uap, register_t *retval)
+sys_mlockall(struct lwp *l, const struct sys_mlockall_args *uap,
+register_t *retval)
{
/* {
syscallarg(int) flags;
@@ -1037,7 +1044,8 @@
*/
int
-uvm_mmap(struct vm_map *map, vaddr_t *addr, vsize_t size, vm_prot_t prot, vm_prot_t maxprot, int flags, void *handle, voff_t foff, vsize_t locklimit)
+uvm_mmap(struct vm_map *map, vaddr_t *addr, vsize_t size, vm_prot_t prot,
+vm_prot_t maxprot, int flags, void *handle, voff_t foff, vsize_t locklimit)
{
struct uvm_object *uobj;
struct vnode *vp;
