From owner-svn-src-projects@FreeBSD.ORG Sun Aug 2 02:10:27 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA70C106566C; Sun, 2 Aug 2009 02:10:27 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 96DED8FC12; Sun, 2 Aug 2009 02:10:27 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n722ARvP099085; Sun, 2 Aug 2009 02:10:27 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n722ARDg099075; Sun, 2 Aug 2009 02:10:27 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200908020210.n722ARDg099075@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 2 Aug 2009 02:10:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196029 - in projects/ppc64/sys/powerpc: aim aim64 include powerpc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Aug 2009 02:10:27 -0000 Author: nwhitehorn Date: Sun Aug 2 02:10:27 2009 New Revision: 196029 URL: http://svn.freebsd.org/changeset/base/196029 Log: Fix the SLB handling to do something reasonable now. Processes have a full 64-bit address space, but can't map more than 16 GB for now. Note that this breaks the onfault handling used by copyinout, which I will fix later. This is done by assigning new, random VSIDs on demand per-segment, instead of using a per-pmap hash and appending the ESID to it. This requires a look-up table and is otherwise worse but is required due to the small 65-bit VA space on a wide variety of CPUs, including at least the POWER5, 970, and Cell. Added: projects/ppc64/sys/powerpc/include/slb.h - copied, changed from r195954, projects/ppc64/sys/powerpc/include/sr.h Modified: projects/ppc64/sys/powerpc/aim/copyinout.c projects/ppc64/sys/powerpc/aim/ofw_machdep.c projects/ppc64/sys/powerpc/aim/trap.c projects/ppc64/sys/powerpc/aim64/mmu_oea64.c projects/ppc64/sys/powerpc/aim64/trap_subr.S projects/ppc64/sys/powerpc/include/pmap.h projects/ppc64/sys/powerpc/include/sr.h projects/ppc64/sys/powerpc/powerpc/genassym.c Modified: projects/ppc64/sys/powerpc/aim/copyinout.c ============================================================================== --- projects/ppc64/sys/powerpc/aim/copyinout.c Sun Aug 2 00:20:40 2009 (r196028) +++ projects/ppc64/sys/powerpc/aim/copyinout.c Sun Aug 2 02:10:27 2009 (r196029) @@ -66,24 +66,17 @@ __FBSDID("$FreeBSD$"); #include #include +#include int setfault(faultbuf); /* defined in locore.S */ /* * Makes sure that the right segment of userspace is mapped in. */ -static __inline register_t -va_to_vsid(pmap_t pm, const volatile void *va) -{ - #ifdef __powerpc64__ - return (((uint64_t)pm->pm_context << 17) | - ((uintptr_t)va >> ADDR_SR_SHFT)); - #else - return ((pm->pm_sr[(uintptr_t)va >> ADDR_SR_SHFT]) & SR_VSID_MASK); - #endif -} #ifdef __powerpc64__ +uint64_t va_to_vsid(pmap_t pm, const volatile void *va); + static __inline void set_user_sr(register_t vsid) { @@ -99,6 +92,12 @@ set_user_sr(register_t vsid) isync(); } #else +static __inline register_t +va_to_vsid(pmap_t pm, const volatile void *va) +{ + return ((pm->pm_sr[(uintptr_t)va >> ADDR_SR_SHFT]) & SR_VSID_MASK); +} + static __inline void set_user_sr(register_t vsid) { Modified: projects/ppc64/sys/powerpc/aim/ofw_machdep.c ============================================================================== --- projects/ppc64/sys/powerpc/aim/ofw_machdep.c Sun Aug 2 00:20:40 2009 (r196028) +++ projects/ppc64/sys/powerpc/aim/ofw_machdep.c Sun Aug 2 02:10:27 2009 (r196029) @@ -383,21 +383,24 @@ OF_bootstrap() static int openfirmware(void *args) { - long oldmsr; - int result; - u_int srsave[16]; - u_int i; + long oldmsr; + int result; + #ifndef __powerpc64__ + register_t srsave[16]; + u_int i; + #endif if (pmap_bootstrapped && ofw_real_mode) args = (void *)pmap_kextract((vm_offset_t)args); ofw_sprg_prepare(); + #ifndef __powerpc64__ if (pmap_bootstrapped && !ofw_real_mode) { /* * Swap the kernel's address space with Open Firmware's */ - for (i = 0; i < 16; i++) { + if (!ppc64) for (i = 0; i < 16; i++) { srsave[i] = mfsrin(i << ADDR_SR_SHFT); mtsrin(i << ADDR_SR_SHFT, ofw_pmap.pm_sr[i]); } @@ -411,6 +414,7 @@ openfirmware(void *args) } isync(); } + #endif __asm __volatile( "\t" "sync\n\t" @@ -429,6 +433,7 @@ openfirmware(void *args) : : "r" (oldmsr) ); + #ifndef __powerpc64__ if (pmap_bootstrapped && !ofw_real_mode) { /* * Restore the kernel's addr space. The isync() doesn;t @@ -440,6 +445,7 @@ openfirmware(void *args) isync(); } } + #endif ofw_sprg_restore(); Modified: projects/ppc64/sys/powerpc/aim/trap.c ============================================================================== --- projects/ppc64/sys/powerpc/aim/trap.c Sun Aug 2 00:20:40 2009 (r196028) +++ projects/ppc64/sys/powerpc/aim/trap.c Sun Aug 2 02:10:27 2009 (r196029) @@ -523,6 +523,8 @@ trap_pfault(struct trapframe *frame, int : "=r"(user_sr) : "r"(USER_SR)); + /* XXX: THIS DOES NOT WORK */ + user_sr >>= 12; /* XXX - limit to 46 byte EA space */ Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c ============================================================================== --- projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Sun Aug 2 00:20:40 2009 (r196028) +++ projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Sun Aug 2 02:10:27 2009 (r196029) @@ -159,6 +159,7 @@ __FBSDID("$FreeBSD$"); #define MOEA_DEBUG #define TODO panic("%s: not implemented", __func__); +static uintptr_t moea64_get_unique_vsid(void); static __inline register_t cntlzd(volatile register_t a) { @@ -167,16 +168,52 @@ cntlzd(volatile register_t a) { return b; } +#ifdef __powerpc64__ +uint64_t va_to_vsid(pmap_t pm, vm_offset_t va); + +uint64_t +va_to_vsid(pmap_t pm, vm_offset_t va) +{ + uint64_t slbe, slbv, i; + + slbe = (uintptr_t)va >> ADDR_SR_SHFT; + slbe = (slbe << SLBE_ESID_SHIFT) | SLBE_VALID; + slbv = 0; + + for (i = 0; i < sizeof(pm->pm_slb)/sizeof(pm->pm_slb[0]); i++) { + if (pm->pm_slb[i].slbe == (slbe | i)) { + slbv = pm->pm_slb[i].slbv; + break; + } + } + + /* XXX: Have a long list for processes mapping more than 16 GB */ + + /* + * If there is no vsid for this VA, we need to add a new entry + * to the PMAP's segment table. + */ + + if (slbv == 0) { + slbv = moea64_get_unique_vsid() << SLBV_VSID_SHIFT; + for (i = 0; i < sizeof(pm->pm_slb)/sizeof(pm->pm_slb[0]); i++) { + if (!(pm->pm_slb[i].slbe & SLBE_VALID)) { + pm->pm_slb[i].slbv = slbv; + pm->pm_slb[i].slbe = slbe | i; + break; + } + } + } + + return ((slbv & SLBV_VSID_MASK) >> SLBV_VSID_SHIFT); +} +#else static __inline uint64_t va_to_vsid(pmap_t pm, vm_offset_t va) { - #ifdef __powerpc64__ - return (((uint64_t)pm->pm_context << 17) | - ((uintptr_t)va >> ADDR_SR_SHFT)); - #else return ((pm->pm_sr[(uintptr_t)va >> ADDR_SR_SHFT]) & SR_VSID_MASK); - #endif } +#endif #define TLBSYNC() __asm __volatile("tlbsync; ptesync"); #define SYNC() __asm __volatile("sync"); @@ -327,7 +364,14 @@ static struct pvo_entry *moea64_bpvo_poo static int moea64_bpvo_pool_index = 0; #define VSID_NBPW (sizeof(u_int32_t) * 8) -static u_int moea64_vsid_bitmap[NPMAPS / VSID_NBPW]; +#ifdef __powerpc64__ +#define NVSIDS (NPMAPS * 16) +#define VSID_HASHMASK 0xffffffffUL +#else +#define NVSIDS NPMAPS +#define VSID_HASHMASK 0xfffffUL +#endif +static u_int moea64_vsid_bitmap[NVSIDS / VSID_NBPW]; static boolean_t moea64_initialized = FALSE; @@ -720,10 +764,6 @@ moea64_bridge_cpu_bootstrap(mmu_t mmup, { int i = 0; - #ifdef __powerpc64__ - register_t slb1, slb2; - #endif - /* * Initialize segment registers and MMU */ @@ -737,21 +777,16 @@ moea64_bridge_cpu_bootstrap(mmu_t mmup, #ifdef __powerpc64__ slbia(); - for (i = 0; i < NSEGS; i++) { - if (!kernel_pmap->pm_sr[i]) + for (i = 0; i < 64; i++) { + if (!(kernel_pmap->pm_slb[i].slbe & SLBE_VALID)) continue; - /* The right-most bit is a validity bit */ - slb1 = ((register_t)kernel_pmap->pm_context << 17) | - (kernel_pmap->pm_sr[i] >> 1); - slb1 <<= 12; - slb2 = kernel_pmap->pm_sr[i] << 27 | i; - - __asm __volatile ("slbmte %0, %1" :: "r"(slb1), - "r"(slb2)); + __asm __volatile ("slbmte %0, %1" :: + "r"(kernel_pmap->pm_slb[i].slbv), + "r"(kernel_pmap->pm_slb[i].slbe)); } #else - for (i = 0; i < NSEGS; i++) + for (i = 0; i < 16; i++) mtsrin(i << ADDR_SR_SHFT, kernel_pmap->pm_sr[i]); #endif @@ -919,18 +954,21 @@ moea64_bridge_bootstrap(mmu_t mmup, vm_o /* * Make sure kernel vsid is allocated as well as VSID 0. */ - moea64_vsid_bitmap[(KERNEL_VSIDBITS & (NPMAPS - 1)) / VSID_NBPW] + moea64_vsid_bitmap[(KERNEL_VSIDBITS & (NVSIDS - 1)) / VSID_NBPW] |= 1 << (KERNEL_VSIDBITS % VSID_NBPW); moea64_vsid_bitmap[0] |= 1; /* * Initialize the kernel pmap (which is statically allocated). */ - kernel_pmap->pm_context = 0xfffff; #ifdef __powerpc64__ - for (i = 0; i < 16; i++) - kernel_pmap->pm_sr[i] = (i << 1) | 1; - kernel_pmap->pm_sr[USER_SR] = 0; + for (i = 0; i < 16; i++) { + kernel_pmap->pm_slb[i].slbv = ((KERNEL_VSIDBITS << 17) | i) << + SLBV_VSID_SHIFT; + kernel_pmap->pm_slb[i].slbe = ((uint64_t)i << SLBE_ESID_SHIFT) | + SLBE_VALID | i; + } + kernel_pmap->pm_slb[USER_SR].slbe = 0; #else for (i = 0; i < 16; i++) kernel_pmap->pm_sr[i] = EMPTY_SEGMENT + i; @@ -1787,29 +1825,20 @@ moea64_page_wired_mappings(mmu_t mmu, vm return (count); } -static u_int moea64_vsidcontext; - -void -moea64_pinit(mmu_t mmu, pmap_t pmap) -{ - int i, mask; - u_int entropy; +static uintptr_t moea64_vsidcontext; - PMAP_LOCK_INIT(pmap); +static uintptr_t +moea64_get_unique_vsid(void) { + u_int entropy; + register_t hash; + uint32_t mask; + int i; entropy = 0; __asm __volatile("mftb %0" : "=r"(entropy)); - if (pmap_bootstrapped) - pmap->pmap_phys = (pmap_t)moea64_kextract(mmu, (vm_offset_t)pmap); - else - pmap->pmap_phys = pmap; - - /* - * Allocate some segment registers for this pmap. - */ - for (i = 0; i < NPMAPS; i += VSID_NBPW) { - u_int hash, n; + for (i = 0; i < NVSIDS; i += VSID_NBPW) { + u_int n; /* * Create a new value by mutiplying by a prime and adding in @@ -1819,12 +1848,12 @@ moea64_pinit(mmu_t mmu, pmap_t pmap) * instead of a multiply.) */ moea64_vsidcontext = (moea64_vsidcontext * 0x1105) + entropy; - hash = moea64_vsidcontext & (NPMAPS - 1); + hash = moea64_vsidcontext & (NVSIDS - 1); if (hash == 0) /* 0 is special, avoid it */ continue; n = hash >> 5; mask = 1 << (hash & (VSID_NBPW - 1)); - hash = (moea64_vsidcontext & 0xfffff); + hash = (moea64_vsidcontext & VSID_HASHMASK); if (moea64_vsid_bitmap[n] & mask) { /* collision? */ /* anything free in this bucket? */ if (moea64_vsid_bitmap[n] == 0xffffffff) { @@ -1833,23 +1862,53 @@ moea64_pinit(mmu_t mmu, pmap_t pmap) } i = ffs(~moea64_vsid_bitmap[i]) - 1; mask = 1 << i; - hash &= 0xfffff & ~(VSID_NBPW - 1); + hash &= VSID_HASHMASK & ~(VSID_NBPW - 1); hash |= i; } moea64_vsid_bitmap[n] |= mask; + return (hash); + } - #ifdef __powerpc64__ - pmap->pm_context = hash; - for (i = 0; i < NSEGS; i++) - pmap->pm_sr[i] = 0; - #else - for (i = 0; i < 16; i++) - pmap->pm_sr[i] = VSID_MAKE(i, hash); - #endif - return; + panic("%s: out of segments",__func__); +} + +void +moea64_pinit(mmu_t mmu, pmap_t pmap) +{ + int i; + #ifndef __powerpc64__ + register_t hash; + #endif + + PMAP_LOCK_INIT(pmap); + + if (pmap_bootstrapped) + pmap->pmap_phys = (pmap_t)moea64_kextract(mmu, + (vm_offset_t)pmap); + else + pmap->pmap_phys = pmap; + + #ifdef __powerpc64__ + /* + * 64-bit PowerPC uses lazy segment allocation, so NULL + * all the segment entries for now. + */ + for (i = 0; i < sizeof(pmap->pm_slb)/sizeof(pmap->pm_slb[0]); i++) { + pmap->pm_slb[i].slbv = 0; + pmap->pm_slb[i].slbe = 0; } - panic("moea64_pinit: out of segments"); + #else + + /* + * Allocate some segment registers for this pmap. + */ + hash = moea64_get_unique_vsid(); + + for (i = 0; i < 16; i++) + pmap->pm_sr[i] = VSID_MAKE(i, hash); + + #endif } /* @@ -1954,21 +2013,36 @@ moea64_qremove(mmu_t mmu, vm_offset_t va } } +static __inline void +moea64_release_vsid(uint64_t vsid) +{ + int idx, mask; + + idx = vsid & (NVSIDS-1); + mask = 1 << (idx % VSID_NBPW); + idx /= VSID_NBPW; + moea64_vsid_bitmap[idx] &= ~mask; +} + + void moea64_release(mmu_t mmu, pmap_t pmap) { - int idx, mask; /* - * Free segment register's VSID + * Free segment registers' VSIDs */ + #ifdef __powerpc64__ + int i; + for (i = 0; i < sizeof(pmap->pm_slb)/sizeof(pmap->pm_slb[0]); i++) + moea64_release_vsid(pmap->pm_slb[i].slbv); + #else if (pmap->pm_sr[0] == 0) panic("moea64_release"); - idx = VSID_TO_HASH(pmap->pm_sr[0]) & (NPMAPS-1); - mask = 1 << (idx % VSID_NBPW); - idx /= VSID_NBPW; - moea64_vsid_bitmap[idx] &= ~mask; + moea64_release_vsid(pmap->pm_sr[0]); + #endif + PMAP_LOCK_DESTROY(pmap); } @@ -2111,6 +2185,7 @@ moea64_pvo_enter(pmap_t pm, uma_zone_t z */ va &= ~ADDR_POFF; vsid = va_to_vsid(pm, va); + ptegidx = va_to_pteg(vsid, va); /* Modified: projects/ppc64/sys/powerpc/aim64/trap_subr.S ============================================================================== --- projects/ppc64/sys/powerpc/aim64/trap_subr.S Sun Aug 2 00:20:40 2009 (r196028) +++ projects/ppc64/sys/powerpc/aim64/trap_subr.S Sun Aug 2 02:10:27 2009 (r196029) @@ -46,34 +46,26 @@ /* * Restore SRs for a pmap * - * Requires that r27-r31 be scratch, with r27 initialized to the pmap + * Requires that r28-r31 be scratch, with r28 initialized to the pmap */ restoresrs: slbia; - li %r29, 0; - mr %r28, %r27 - lwz %r27, PM_CONTEXT(%r27); + li %r29, 0; /* Set the counter to zero */ instslb: - li %r30, 12; - sld %r30, %r27, %r30; - ld %r31, PM_SR(%r28); + ld %r31, PM_SLB+8(%r28); /* Load SLBE */ - cmpli 0, %r31, 0; + cmpli 0, %r31, 0; /* If SLBE is not valid, get the next */ beq nslb; - - srdi %r31, %r31, 1; - or %r30, %r30, %r31; - sldi %r30, %r30, 12; - ld %r31, PM_SR(%r28); - sldi %r31, %r31, 27; - or %r31, %r31, %r29; - slbmte %r30, %r31; + + + ld %r30, PM_SLB(%r28) /* Load SLBV */ + slbmte %r30, %r31; /* Install SLB entry */ nslb: - addi %r28, %r28, 8; + addi %r28, %r28, 8; /* Advance */ addi %r29, %r29, 1; - cmpli 0, %r29, 63; + cmpli 0, %r29, 63; /* Repeat if we are not at the end */ blt instslb; blr; @@ -82,16 +74,16 @@ nslb: * User SRs are loaded through a pointer to the current pmap. */ #define RESTORE_USER_SRS() \ - GET_CPUINFO(%r27); \ - ld %r27,PC_CURPMAP(%r27); \ + GET_CPUINFO(%r28); \ + ld %r28,PC_CURPMAP(%r28); \ bl restoresrs; /* * Kernel SRs are loaded directly from kernel_pmap_ */ #define RESTORE_KERN_SRS() \ - lis %r27,CNAME(kernel_pmap_store)@ha; \ - addi %r27,%r27,CNAME(kernel_pmap_store)@l; \ + lis %r28,CNAME(kernel_pmap_store)@ha; \ + addi %r28,%r28,CNAME(kernel_pmap_store)@l; \ bl restoresrs; /* Modified: projects/ppc64/sys/powerpc/include/pmap.h ============================================================================== --- projects/ppc64/sys/powerpc/include/pmap.h Sun Aug 2 00:20:40 2009 (r196028) +++ projects/ppc64/sys/powerpc/include/pmap.h Sun Aug 2 02:10:27 2009 (r196029) @@ -70,6 +70,7 @@ #include #include #include +#include struct pmap_md { u_int md_index; @@ -84,18 +85,15 @@ struct pmap_md { #define NPMAPS 32768 #endif /* !defined(NPMAPS) */ -#ifdef __powerpc64__ -#define NSEGS 64 /* Typical SLB size. */ -#else -#define NSEGS 16 -#endif - struct pmap { struct mtx pm_mtx; - register_t pm_sr[NSEGS]; + #ifdef __powerpc64__ + struct slb pm_slb[64]; + #else + register_t pm_sr[16]; + #endif u_int pm_active; - u_int pm_context; struct pmap *pmap_phys; struct pmap_statistics pm_stats; Copied and modified: projects/ppc64/sys/powerpc/include/slb.h (from r195954, projects/ppc64/sys/powerpc/include/sr.h) ============================================================================== --- projects/ppc64/sys/powerpc/include/sr.h Wed Jul 29 21:54:34 2009 (r195954, copy source) +++ projects/ppc64/sys/powerpc/include/slb.h Sun Aug 2 02:10:27 2009 (r196029) @@ -1,5 +1,5 @@ /*- - * Copyright (C) 2002 Benno Rice. + * Copyright (C) 2009 Nathan Whitehorn * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,7 +11,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY Benno Rice ``AS IS'' AND ANY EXPRESS OR + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, @@ -25,32 +25,36 @@ * $FreeBSD$ */ -#ifndef _MACHINE_SR_H_ -#define _MACHINE_SR_H_ +#ifndef _MACHINE_SLB_H_ +#define _MACHINE_SLB_H_ /* - * Bit definitions for segment registers. + * Bit definitions for segment lookaside buffer entries. * - * PowerPC Microprocessor Family: The Programming Environments for 32-bit - * Microprocessors, section 2.3.5 + * PowerPC Microprocessor Family: The Programming Environments for 64-bit + * Microprocessors, section 7.4.2.1 + * + * Note that these bitmasks are relative to the values for one of the two + * values for slbmte, slbmfee, and slbmfev, not the internal SLB + * representation. */ -#define SR_TYPE 0x80000000 /* Type selector */ -#define SR_KS 0x40000000 /* Supervisor-state protection key */ -#define SR_KP 0x20000000 /* User-state protection key */ -#define SR_N 0x10000000 /* No-execute protection */ -#define SR_VSID_MASK 0x00ffffff /* Virtual Segment ID mask */ - -/* Kernel segment register usage */ -#define USER_SR 12 -#define KERNEL_SR 13 -#define KERNEL2_SR 14 -#define KERNEL_VSIDBITS 0xfffff -#define KERNEL_SEGMENT (0xfffff0 + KERNEL_SR) -#define KERNEL2_SEGMENT (0xfffff0 + KERNEL2_SR) -#define EMPTY_SEGMENT 0xfffff0 -#define USER_ADDR ((void *)((register_t)USER_SR << ADDR_SR_SHFT)) -#define SEGMENT_LENGTH 0x10000000 -#define SEGMENT_MASK 0xf0000000 +#define SLBV_KS 0x0000000000000800UL /* Supervisor-state prot key */ +#define SLBV_KP 0x0000000000000400UL /* User-state prot key */ +#define SLBV_N 0x0000000000000200UL /* No-execute protection */ +#define SLBV_L 0x0000000000000100UL /* Large page selector */ +#define SLBV_CLASS 0x0000000000000080UL /* Class selector */ +#define SLBV_VSID_MASK 0xfffffffffffff000UL /* Virtual segment ID mask */ +#define SLBV_VSID_SHIFT 12 + +#define SLBE_VALID 0x0000000008000000UL /* SLB entry valid */ +#define SLBE_INDEX_MASK 0x0000000000000fffUL /* SLB index mask*/ +#define SLBE_ESID_MASK 0xfffffffff0000000UL /* Effective segment ID mask */ +#define SLBE_ESID_SHIFT 28 + +struct slb { + uint64_t slbv; + uint64_t slbe; +}; -#endif /* !_MACHINE_SR_H_ */ +#endif /* !_MACHINE_SLB_H_ */ Modified: projects/ppc64/sys/powerpc/include/sr.h ============================================================================== --- projects/ppc64/sys/powerpc/include/sr.h Sun Aug 2 00:20:40 2009 (r196028) +++ projects/ppc64/sys/powerpc/include/sr.h Sun Aug 2 02:10:27 2009 (r196029) @@ -45,7 +45,7 @@ #define USER_SR 12 #define KERNEL_SR 13 #define KERNEL2_SR 14 -#define KERNEL_VSIDBITS 0xfffff +#define KERNEL_VSIDBITS 0xfffffUL #define KERNEL_SEGMENT (0xfffff0 + KERNEL_SR) #define KERNEL2_SEGMENT (0xfffff0 + KERNEL2_SR) #define EMPTY_SEGMENT 0xfffff0 Modified: projects/ppc64/sys/powerpc/powerpc/genassym.c ============================================================================== --- projects/ppc64/sys/powerpc/powerpc/genassym.c Sun Aug 2 00:20:40 2009 (r196028) +++ projects/ppc64/sys/powerpc/powerpc/genassym.c Sun Aug 2 02:10:27 2009 (r196029) @@ -102,10 +102,11 @@ ASSYM(TLBSAVE_BOOKE_R31, TLBSAVE_BOOKE_R ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock)); #if defined(AIM) -ASSYM(PM_KERNELSR, offsetof(struct pmap, pm_sr[KERNEL_SR])); -ASSYM(PM_USRSR, offsetof(struct pmap, pm_sr[USER_SR])); +#ifdef __powerpc64__ +ASSYM(PM_SLB, offsetof(struct pmap, pm_slb)); +#else ASSYM(PM_SR, offsetof(struct pmap, pm_sr)); -ASSYM(PM_CONTEXT, offsetof(struct pmap, pm_context)); +#endif #elif defined(E500) ASSYM(PM_PDIR, offsetof(struct pmap, pm_pdir)); #endif From owner-svn-src-projects@FreeBSD.ORG Sun Aug 2 04:23:12 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5BCCB106566B; Sun, 2 Aug 2009 04:23:12 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4A4968FC0A; Sun, 2 Aug 2009 04:23:12 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n724NCLo002162; Sun, 2 Aug 2009 04:23:12 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n724NCbl002160; Sun, 2 Aug 2009 04:23:12 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200908020423.n724NCbl002160@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 2 Aug 2009 04:23:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196030 - projects/ppc64/sys/powerpc/aim X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Aug 2009 04:23:12 -0000 Author: nwhitehorn Date: Sun Aug 2 04:23:12 2009 New Revision: 196030 URL: http://svn.freebsd.org/changeset/base/196030 Log: Fix the onfault handler by bringing it into the new SLB world order. This brings the kernel to the same level of functionality as before I decided to redo the SLB handling. Modified: projects/ppc64/sys/powerpc/aim/trap.c Modified: projects/ppc64/sys/powerpc/aim/trap.c ============================================================================== --- projects/ppc64/sys/powerpc/aim/trap.c Sun Aug 2 02:10:27 2009 (r196029) +++ projects/ppc64/sys/powerpc/aim/trap.c Sun Aug 2 04:23:12 2009 (r196030) @@ -486,6 +486,27 @@ syscall(struct trapframe *frame) PTRACESTOP_SC(p, td, S_PT_SCX); } +#ifdef __powerpc64__ +static uint64_t +slb_esid_lookup(pmap_t pm, uint64_t vsid) +{ + uint64_t esid; + int i; + + vsid <<= SLBV_VSID_SHIFT; + + for (i = 0; i < sizeof(pm->pm_slb)/sizeof(pm->pm_slb[0]); i++) { + if ((pm->pm_slb[i].slbv & SLBV_VSID_MASK) == vsid) { + esid = pm->pm_slb[i].slbe & SLBE_ESID_MASK; + esid >>= SLBE_ESID_SHIFT; + return (esid); + } + } + + return (0); +} +#endif + static int trap_pfault(struct trapframe *frame, int user) { @@ -523,12 +544,8 @@ trap_pfault(struct trapframe *frame, int : "=r"(user_sr) : "r"(USER_SR)); - /* XXX: THIS DOES NOT WORK */ - - user_sr >>= 12; - - /* XXX - limit to 46 byte EA space */ - user_sr &= (1UL << 17) - 1UL; + user_sr >>= SLBV_VSID_SHIFT; + user_sr = slb_esid_lookup(&p->p_vmspace->vm_pmap, user_sr); #else __asm ("mfsr %0, %1" From owner-svn-src-projects@FreeBSD.ORG Sun Aug 2 13:25:11 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E9CDB106566B; Sun, 2 Aug 2009 13:25:11 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D86988FC19; Sun, 2 Aug 2009 13:25:11 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n72DPBYL015659; Sun, 2 Aug 2009 13:25:11 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n72DPBvC015656; Sun, 2 Aug 2009 13:25:11 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <200908021325.n72DPBvC015656@svn.freebsd.org> From: Stanislav Sedov Date: Sun, 2 Aug 2009 13:25:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196034 - in projects/libprocstat: sys/kern usr.bin/fstat X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Aug 2009 13:25:12 -0000 Author: stas Date: Sun Aug 2 13:25:11 2009 New Revision: 196034 URL: http://svn.freebsd.org/changeset/base/196034 Log: - Do not fail if fullpath of the file could not be retrieved. - Print "-" for mntdir in fstat in that case. Modified: projects/libprocstat/sys/kern/kern_descrip.c projects/libprocstat/usr.bin/fstat/libprocstat.c Modified: projects/libprocstat/sys/kern/kern_descrip.c ============================================================================== --- projects/libprocstat/sys/kern/kern_descrip.c Sun Aug 2 11:26:23 2009 (r196033) +++ projects/libprocstat/sys/kern/kern_descrip.c Sun Aug 2 13:25:11 2009 (r196034) @@ -3185,10 +3185,11 @@ fill_vnode_info(struct vnode *vp, struct freepath = NULL; fullpath = "-"; error = vn_fullpath(curthread, vp, &fullpath, &freepath); - if (error != 0) - return (error); - strlcpy(kif->kf_path, fullpath, sizeof(kif->kf_path)); - free(freepath, M_TEMP); + if (error == 0) { + strlcpy(kif->kf_path, fullpath, sizeof(kif->kf_path)); + } + if (freepath != NULL) + free(freepath, M_TEMP); /* * Retrieve vnode attributes. Modified: projects/libprocstat/usr.bin/fstat/libprocstat.c ============================================================================== --- projects/libprocstat/usr.bin/fstat/libprocstat.c Sun Aug 2 11:26:23 2009 (r196033) +++ projects/libprocstat/usr.bin/fstat/libprocstat.c Sun Aug 2 13:25:11 2009 (r196034) @@ -986,7 +986,8 @@ procstat_get_vnode_info_sysctl(struct fi if (path && *path) { statfs(path, &stbuf); vn->vn_mntdir = strdup(stbuf.f_mntonname); - } + } else + vn->vn_mntdir = strdup("-"); vn->vn_dev = rdev; if (vntype == PS_FST_VTYPE_VBLK) { name = devname(rdev, S_IFBLK); From owner-svn-src-projects@FreeBSD.ORG Sun Aug 2 13:37:00 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C53E6106566B; Sun, 2 Aug 2009 13:37:00 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B3FE98FC08; Sun, 2 Aug 2009 13:37:00 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n72Db0V1015934; Sun, 2 Aug 2009 13:37:00 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n72Db0iA015932; Sun, 2 Aug 2009 13:37:00 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <200908021337.n72Db0iA015932@svn.freebsd.org> From: Stanislav Sedov Date: Sun, 2 Aug 2009 13:37:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196035 - projects/libprocstat/usr.bin/fstat X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Aug 2009 13:37:01 -0000 Author: stas Date: Sun Aug 2 13:37:00 2009 New Revision: 196035 URL: http://svn.freebsd.org/changeset/base/196035 Log: - Do not print the warning if a user has no permission to view file information for the process. Modified: projects/libprocstat/usr.bin/fstat/libprocstat.c Modified: projects/libprocstat/usr.bin/fstat/libprocstat.c ============================================================================== --- projects/libprocstat/usr.bin/fstat/libprocstat.c Sun Aug 2 13:25:11 2009 (r196034) +++ projects/libprocstat/usr.bin/fstat/libprocstat.c Sun Aug 2 13:37:00 2009 (r196035) @@ -624,7 +624,7 @@ procstat_getfiles_sysctl(struct procstat return (NULL); files = kinfo_getfile(kp->ki_pid, &cnt); - if (files == NULL) { + if (files == NULL && errno != EPERM) { warn("kinfo_getfile()"); return (NULL); } From owner-svn-src-projects@FreeBSD.ORG Sun Aug 2 21:16:02 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DFA331065672; Sun, 2 Aug 2009 21:16:01 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C27D48FC1B; Sun, 2 Aug 2009 21:16:01 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n72LG18i024989; Sun, 2 Aug 2009 21:16:01 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n72LG1bq024981; Sun, 2 Aug 2009 21:16:01 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200908022116.n72LG1bq024981@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 2 Aug 2009 21:16:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196040 - in projects/ppc64/sys/powerpc: aim aim64 include powerpc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Aug 2009 21:16:02 -0000 Author: nwhitehorn Date: Sun Aug 2 21:16:01 2009 New Revision: 196040 URL: http://svn.freebsd.org/changeset/base/196040 Log: Fix trap handling by using the correct stack frame definition on PPC64 and removing a typo that prevented link register restore from working (mtlr was in the wrong place). These bugs could cause corruption of LR and R3 while taking a trap. The kernel now can load a fake init from disk, and starts trying to execute it. Remaining steps to get init going: - Fix RESTORE_USER_SRS in trap_subr.S, which cannot work right now. - Teach aim64/machdep.c about function descriptors and TOCs, so that it starts trying to execute code instead of part of the data section. Modified: projects/ppc64/sys/powerpc/aim/trap.c projects/ppc64/sys/powerpc/aim64/swtch.S projects/ppc64/sys/powerpc/aim64/trap_subr.S projects/ppc64/sys/powerpc/include/frame.h projects/ppc64/sys/powerpc/include/pte.h projects/ppc64/sys/powerpc/include/sr.h projects/ppc64/sys/powerpc/powerpc/genassym.c Modified: projects/ppc64/sys/powerpc/aim/trap.c ============================================================================== --- projects/ppc64/sys/powerpc/aim/trap.c Sun Aug 2 19:43:32 2009 (r196039) +++ projects/ppc64/sys/powerpc/aim/trap.c Sun Aug 2 21:16:01 2009 (r196040) @@ -544,7 +544,7 @@ trap_pfault(struct trapframe *frame, int : "=r"(user_sr) : "r"(USER_SR)); - user_sr >>= SLBV_VSID_SHIFT; + user_sr = (user_sr & SLBV_VSID_MASK) >> SLBV_VSID_SHIFT; user_sr = slb_esid_lookup(&p->p_vmspace->vm_pmap, user_sr); #else Modified: projects/ppc64/sys/powerpc/aim64/swtch.S ============================================================================== --- projects/ppc64/sys/powerpc/aim64/swtch.S Sun Aug 2 19:43:32 2009 (r196039) +++ projects/ppc64/sys/powerpc/aim64/swtch.S Sun Aug 2 21:16:01 2009 (r196040) @@ -259,4 +259,5 @@ ENTRY(fork_trampoline) trapframe to simulate FRAME_SETUP does when allocating space for a frame pointer/saved LR */ - b trapexit + b .trapexit + nop Modified: projects/ppc64/sys/powerpc/aim64/trap_subr.S ============================================================================== --- projects/ppc64/sys/powerpc/aim64/trap_subr.S Sun Aug 2 19:43:32 2009 (r196039) +++ projects/ppc64/sys/powerpc/aim64/trap_subr.S Sun Aug 2 21:16:01 2009 (r196040) @@ -111,46 +111,46 @@ nslb: isync; \ mfsprg1 %r31; /* get saved SP */ \ stdu %r31,-FRAMELEN(%r1); /* save it in the callframe */ \ - std %r0, FRAME_0+16(%r1); /* save r0 in the trapframe */ \ - std %r31,FRAME_1+16(%r1); /* save SP " " */ \ - std %r2, FRAME_2+16(%r1); /* save r2 " " */ \ - std %r28,FRAME_LR+16(%r1); /* save LR " " */ \ - std %r29,FRAME_CR+16(%r1); /* save CR " " */ \ + std %r0, FRAME_0+48(%r1); /* save r0 in the trapframe */ \ + std %r31,FRAME_1+48(%r1); /* save SP " " */ \ + std %r2, FRAME_2+48(%r1); /* save r2 " " */ \ + std %r28,FRAME_LR+48(%r1); /* save LR " " */ \ + std %r29,FRAME_CR+48(%r1); /* save CR " " */ \ GET_CPUINFO(%r2); \ ld %r27,(savearea+CPUSAVE_R27)(%r2); /* get saved r27 */ \ ld %r28,(savearea+CPUSAVE_R28)(%r2); /* get saved r28 */ \ ld %r29,(savearea+CPUSAVE_R29)(%r2); /* get saved r29 */ \ ld %r30,(savearea+CPUSAVE_R30)(%r2); /* get saved r30 */ \ ld %r31,(savearea+CPUSAVE_R31)(%r2); /* get saved r31 */ \ - std %r3, FRAME_3+16(%r1); /* save r3-r31 */ \ - std %r4, FRAME_4+16(%r1); \ - std %r5, FRAME_5+16(%r1); \ - std %r6, FRAME_6+16(%r1); \ - std %r7, FRAME_7+16(%r1); \ - std %r8, FRAME_8+16(%r1); \ - std %r9, FRAME_9+16(%r1); \ - std %r10, FRAME_10+16(%r1); \ - std %r11, FRAME_11+16(%r1); \ - std %r12, FRAME_12+16(%r1); \ - std %r13, FRAME_13+16(%r1); \ - std %r14, FRAME_14+16(%r1); \ - std %r15, FRAME_15+16(%r1); \ - std %r16, FRAME_16+16(%r1); \ - std %r17, FRAME_17+16(%r1); \ - std %r18, FRAME_18+16(%r1); \ - std %r19, FRAME_19+16(%r1); \ - std %r20, FRAME_20+16(%r1); \ - std %r21, FRAME_21+16(%r1); \ - std %r22, FRAME_22+16(%r1); \ - std %r23, FRAME_23+16(%r1); \ - std %r24, FRAME_24+16(%r1); \ - std %r25, FRAME_25+16(%r1); \ - std %r26, FRAME_26+16(%r1); \ - std %r27, FRAME_27+16(%r1); \ - std %r28, FRAME_28+16(%r1); \ - std %r29, FRAME_29+16(%r1); \ - std %r30, FRAME_30+16(%r1); \ - std %r31, FRAME_31+16(%r1); \ + std %r3, FRAME_3+48(%r1); /* save r3-r31 */ \ + std %r4, FRAME_4+48(%r1); \ + std %r5, FRAME_5+48(%r1); \ + std %r6, FRAME_6+48(%r1); \ + std %r7, FRAME_7+48(%r1); \ + std %r8, FRAME_8+48(%r1); \ + std %r9, FRAME_9+48(%r1); \ + std %r10, FRAME_10+48(%r1); \ + std %r11, FRAME_11+48(%r1); \ + std %r12, FRAME_12+48(%r1); \ + std %r13, FRAME_13+48(%r1); \ + std %r14, FRAME_14+48(%r1); \ + std %r15, FRAME_15+48(%r1); \ + std %r16, FRAME_16+48(%r1); \ + std %r17, FRAME_17+48(%r1); \ + std %r18, FRAME_18+48(%r1); \ + std %r19, FRAME_19+48(%r1); \ + std %r20, FRAME_20+48(%r1); \ + std %r21, FRAME_21+48(%r1); \ + std %r22, FRAME_22+48(%r1); \ + std %r23, FRAME_23+48(%r1); \ + std %r24, FRAME_24+48(%r1); \ + std %r25, FRAME_25+48(%r1); \ + std %r26, FRAME_26+48(%r1); \ + std %r27, FRAME_27+48(%r1); \ + std %r28, FRAME_28+48(%r1); \ + std %r29, FRAME_29+48(%r1); \ + std %r30, FRAME_30+48(%r1); \ + std %r31, FRAME_31+48(%r1); \ ld %r28,(savearea+CPUSAVE_AIM_DAR)(%r2); /* saved DAR */ \ ld %r29,(savearea+CPUSAVE_AIM_DSISR)(%r2);/* saved DSISR */\ ld %r30,(savearea+CPUSAVE_SRR0)(%r2); /* saved SRR0 */ \ @@ -158,61 +158,61 @@ nslb: mfxer %r3; \ mfctr %r4; \ mfsprg3 %r5; \ - mtlr %r6; \ - std %r3, FRAME_XER+16(1); /* save xer/ctr/exc */ \ - std %r4, FRAME_CTR+16(1); \ - std %r5, FRAME_EXC+16(1); \ - std %r28,FRAME_AIM_DAR+16(1); \ - std %r29,FRAME_AIM_DSISR+16(1); /* save dsisr/srr0/srr1 */ \ - std %r30,FRAME_SRR0+16(1); \ - std %r31,FRAME_SRR1+16(1) + std %r3, FRAME_XER+48(1); /* save xer/ctr/exc */ \ + std %r4, FRAME_CTR+48(1); \ + std %r5, FRAME_EXC+48(1); \ + std %r28,FRAME_AIM_DAR+48(1); \ + std %r29,FRAME_AIM_DSISR+48(1); /* save dsisr/srr0/srr1 */ \ + std %r30,FRAME_SRR0+48(1); \ + std %r31,FRAME_SRR1+48(1) #define FRAME_LEAVE(savearea) \ /* Now restore regs: */ \ - ld %r2,FRAME_SRR0+16(%r1); \ - ld %r3,FRAME_SRR1+16(%r1); \ - ld %r4,FRAME_CTR+16(%r1); \ - ld %r5,FRAME_XER+16(%r1); \ - ld %r6,FRAME_LR+16(%r1); \ + ld %r2,FRAME_SRR0+48(%r1); \ + ld %r3,FRAME_SRR1+48(%r1); \ + ld %r4,FRAME_CTR+48(%r1); \ + ld %r5,FRAME_XER+48(%r1); \ + ld %r6,FRAME_LR+48(%r1); \ GET_CPUINFO(%r7); \ std %r2,(savearea+CPUSAVE_SRR0)(%r7); /* save SRR0 */ \ std %r3,(savearea+CPUSAVE_SRR1)(%r7); /* save SRR1 */ \ - ld %r7,FRAME_CR+16(%r1); \ + ld %r7,FRAME_CR+48(%r1); \ mtctr %r4; \ mtxer %r5; \ + mtlr %r6; \ mtsprg1 %r7; /* save cr */ \ - ld %r31,FRAME_31+16(%r1); /* restore r0-31 */ \ - ld %r30,FRAME_30+16(%r1); \ - ld %r29,FRAME_29+16(%r1); \ - ld %r28,FRAME_28+16(%r1); \ - ld %r27,FRAME_27+16(%r1); \ - ld %r26,FRAME_26+16(%r1); \ - ld %r25,FRAME_25+16(%r1); \ - ld %r24,FRAME_24+16(%r1); \ - ld %r23,FRAME_23+16(%r1); \ - ld %r22,FRAME_22+16(%r1); \ - ld %r21,FRAME_21+16(%r1); \ - ld %r20,FRAME_20+16(%r1); \ - ld %r19,FRAME_19+16(%r1); \ - ld %r18,FRAME_18+16(%r1); \ - ld %r17,FRAME_17+16(%r1); \ - ld %r16,FRAME_16+16(%r1); \ - ld %r15,FRAME_15+16(%r1); \ - ld %r14,FRAME_14+16(%r1); \ - ld %r13,FRAME_13+16(%r1); \ - ld %r12,FRAME_12+16(%r1); \ - ld %r11,FRAME_11+16(%r1); \ - ld %r10,FRAME_10+16(%r1); \ - ld %r9, FRAME_9+16(%r1); \ - ld %r8, FRAME_8+16(%r1); \ - ld %r7, FRAME_7+16(%r1); \ - ld %r6, FRAME_6+16(%r1); \ - ld %r5, FRAME_5+16(%r1); \ - ld %r4, FRAME_4+16(%r1); \ - ld %r3, FRAME_3+16(%r1); \ - ld %r2, FRAME_2+16(%r1); \ - ld %r0, FRAME_0+16(%r1); \ - ld %r1, FRAME_1+16(%r1); \ + ld %r31,FRAME_31+48(%r1); /* restore r0-31 */ \ + ld %r30,FRAME_30+48(%r1); \ + ld %r29,FRAME_29+48(%r1); \ + ld %r28,FRAME_28+48(%r1); \ + ld %r27,FRAME_27+48(%r1); \ + ld %r26,FRAME_26+48(%r1); \ + ld %r25,FRAME_25+48(%r1); \ + ld %r24,FRAME_24+48(%r1); \ + ld %r23,FRAME_23+48(%r1); \ + ld %r22,FRAME_22+48(%r1); \ + ld %r21,FRAME_21+48(%r1); \ + ld %r20,FRAME_20+48(%r1); \ + ld %r19,FRAME_19+48(%r1); \ + ld %r18,FRAME_18+48(%r1); \ + ld %r17,FRAME_17+48(%r1); \ + ld %r16,FRAME_16+48(%r1); \ + ld %r15,FRAME_15+48(%r1); \ + ld %r14,FRAME_14+48(%r1); \ + ld %r13,FRAME_13+48(%r1); \ + ld %r12,FRAME_12+48(%r1); \ + ld %r11,FRAME_11+48(%r1); \ + ld %r10,FRAME_10+48(%r1); \ + ld %r9, FRAME_9+48(%r1); \ + ld %r8, FRAME_8+48(%r1); \ + ld %r7, FRAME_7+48(%r1); \ + ld %r6, FRAME_6+48(%r1); \ + ld %r5, FRAME_5+48(%r1); \ + ld %r4, FRAME_4+48(%r1); \ + ld %r3, FRAME_3+48(%r1); \ + ld %r2, FRAME_2+48(%r1); \ + ld %r0, FRAME_0+48(%r1); \ + ld %r1, FRAME_1+48(%r1); \ /* Can't touch %r1 from here on */ \ mtsprg2 %r2; /* save r2 & r3 */ \ mtsprg3 %r3; \ @@ -234,11 +234,6 @@ nslb: ld %r3,(savearea+CPUSAVE_SRR0)(%r2); /* restore srr0 */ \ mtsrr0 %r3; \ ld %r3,(savearea+CPUSAVE_SRR1)(%r2); /* restore srr1 */ \ - \ - /* Make sure HV bit of MSR propagated to SRR1 */ \ - mfmsr %r2; \ - or %r3,%r2,%r3; \ - \ mtsrr1 %r3; \ mfsprg2 %r2; /* restore r2 & r3 */ \ mfsprg3 %r3 @@ -465,7 +460,7 @@ k_trap: trapagain: lis %r3,tocbase@ha ld %r2,tocbase@l(%r3) - addi %r3,%r1,16 + addi %r3,%r1,48 bl CNAME(.powerpc_interrupt) nop bl CNAME(.trapexit) @@ -540,13 +535,13 @@ dbtrap: /* Call C trap code: */ lis %r3,tocbase@ha ld %r2,tocbase@l(%r3) - addi %r3,%r1,16 + addi %r3,%r1,48 bl CNAME(.db_trap_glue) nop or. %r3,%r3,%r3 bne dbleave /* This wasn't for KDB, so switch to real trap: */ - ld %r3,FRAME_EXC+16(%r1) /* save exception */ + ld %r3,FRAME_EXC+48(%r1) /* save exception */ GET_CPUINFO(%r4) std %r3,(PC_DBSAVE+CPUSAVE_R31)(%r4) FRAME_LEAVE(PC_DBSAVE) Modified: projects/ppc64/sys/powerpc/include/frame.h ============================================================================== --- projects/ppc64/sys/powerpc/include/frame.h Sun Aug 2 19:43:32 2009 (r196039) +++ projects/ppc64/sys/powerpc/include/frame.h Sun Aug 2 21:16:01 2009 (r196040) @@ -71,9 +71,13 @@ struct trapframe { }; /* - * This is to ensure alignment of the stackpointer + * FRAMELEN is the size of the stack region used by the low-level trap + * handler. It is the size of its data (trapframe) plus the callframe + * header (sizeof(struct callframe) - 3 register widths). It must also + * be 16-byte aligned. */ -#define FRAMELEN roundup(sizeof(struct trapframe) + 8, 16) +#define FRAMELEN roundup(sizeof(struct trapframe) + \ + sizeof(struct callframe) - 3*sizeof(register_t), 16) #define trapframe(td) ((td)->td_frame) /* Modified: projects/ppc64/sys/powerpc/include/pte.h ============================================================================== --- projects/ppc64/sys/powerpc/include/pte.h Sun Aug 2 19:43:32 2009 (r196039) +++ projects/ppc64/sys/powerpc/include/pte.h Sun Aug 2 21:16:01 2009 (r196040) @@ -128,11 +128,11 @@ typedef struct lpte lpte_t; * Extract bits from address */ #define ADDR_SR_SHFT 28 -#define ADDR_PIDX 0x0ffff000 +#define ADDR_PIDX 0x0ffff000UL #define ADDR_PIDX_SHFT 12 #define ADDR_API_SHFT 22 #define ADDR_API_SHFT64 16 -#define ADDR_POFF 0x00000fff +#define ADDR_POFF 0x00000fffUL /* * Bits in DSISR: Modified: projects/ppc64/sys/powerpc/include/sr.h ============================================================================== --- projects/ppc64/sys/powerpc/include/sr.h Sun Aug 2 19:43:32 2009 (r196039) +++ projects/ppc64/sys/powerpc/include/sr.h Sun Aug 2 21:16:01 2009 (r196040) @@ -50,7 +50,8 @@ #define KERNEL2_SEGMENT (0xfffff0 + KERNEL2_SR) #define EMPTY_SEGMENT 0xfffff0 #define USER_ADDR ((void *)((register_t)USER_SR << ADDR_SR_SHFT)) -#define SEGMENT_LENGTH 0x10000000 -#define SEGMENT_MASK 0xf0000000 +#define SEGMENT_LENGTH 0x10000000UL +#define SEGMENT_INVMASK 0x0fffffffUL +#define SEGMENT_MASK ~SEGMENT_INVMASK #endif /* !_MACHINE_SR_H_ */ Modified: projects/ppc64/sys/powerpc/powerpc/genassym.c ============================================================================== --- projects/ppc64/sys/powerpc/powerpc/genassym.c Sun Aug 2 19:43:32 2009 (r196039) +++ projects/ppc64/sys/powerpc/powerpc/genassym.c Sun Aug 2 21:16:01 2009 (r196040) @@ -117,7 +117,11 @@ ASSYM(PTE_FLAGS, offsetof(struct pte, fl ASSYM(TLB0_ENTRY_SIZE, sizeof(struct tlb_entry)); #endif +#ifdef __powerpc64__ +ASSYM(FSP, 48); +#else ASSYM(FSP, 8); +#endif ASSYM(FRAMELEN, FRAMELEN); ASSYM(FRAME_0, offsetof(struct trapframe, fixreg[0])); ASSYM(FRAME_1, offsetof(struct trapframe, fixreg[1])); From owner-svn-src-projects@FreeBSD.ORG Mon Aug 3 01:54:14 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A3C131065670; Mon, 3 Aug 2009 01:54:14 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 77F0E8FC0A; Mon, 3 Aug 2009 01:54:14 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n731sEZL030380; Mon, 3 Aug 2009 01:54:14 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n731sELF030379; Mon, 3 Aug 2009 01:54:14 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200908030154.n731sELF030379@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 3 Aug 2009 01:54:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196042 - projects/ppc64/sys/powerpc/aim64 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Aug 2009 01:54:14 -0000 Author: nwhitehorn Date: Mon Aug 3 01:54:13 2009 New Revision: 196042 URL: http://svn.freebsd.org/changeset/base/196042 Log: Step 1: Teach the kernel how to start a PPC64 userland process. Step 2: Fix a bug in SLB refill that crept in. Step 3: Observe userland process print "Hello World!" to the console! Modified: projects/ppc64/sys/powerpc/aim64/machdep.c projects/ppc64/sys/powerpc/aim64/trap_subr.S Modified: projects/ppc64/sys/powerpc/aim64/machdep.c ============================================================================== --- projects/ppc64/sys/powerpc/aim64/machdep.c Sun Aug 2 22:47:08 2009 (r196041) +++ projects/ppc64/sys/powerpc/aim64/machdep.c Mon Aug 3 01:54:13 2009 (r196042) @@ -858,6 +858,7 @@ exec_setregs(struct thread *td, u_long e { struct trapframe *tf; struct ps_strings arginfo; + register_t entry_desc[3]; tf = trapframe(td); bzero(tf, sizeof *tf); @@ -898,8 +899,24 @@ exec_setregs(struct thread *td, u_long e tf->fixreg[7] = 0; /* termination vector */ tf->fixreg[8] = (register_t)PS_STRINGS; /* NetBSD extension */ - tf->srr0 = entry; - tf->srr1 = PSL_MBO | PSL_USERSET | PSL_FE_DFLT; + if (1) { + /* + * For 64-bit, we need to disentangle the function descriptor + * + * 0. entry point + * 1. TOC value (r2) + * 2. Environment pointer (r11) + */ + + (void)copyin((void *)entry, entry_desc, sizeof(entry_desc)); + tf->srr0 = entry_desc[0]; + tf->fixreg[2] = entry_desc[1]; + tf->fixreg[11] = entry_desc[2]; + tf->srr1 = PSL_SF | PSL_MBO | PSL_USERSET | PSL_FE_DFLT; + } else { + tf->srr0 = entry; + tf->srr1 = PSL_MBO | PSL_USERSET | PSL_FE_DFLT; + } td->td_pcb->pcb_flags = 0; } Modified: projects/ppc64/sys/powerpc/aim64/trap_subr.S ============================================================================== --- projects/ppc64/sys/powerpc/aim64/trap_subr.S Sun Aug 2 22:47:08 2009 (r196041) +++ projects/ppc64/sys/powerpc/aim64/trap_subr.S Mon Aug 3 01:54:13 2009 (r196042) @@ -63,7 +63,7 @@ instslb: slbmte %r30, %r31; /* Install SLB entry */ nslb: - addi %r28, %r28, 8; /* Advance */ + addi %r28, %r28, 16; /* Advance */ addi %r29, %r29, 1; cmpli 0, %r29, 63; /* Repeat if we are not at the end */ blt instslb; @@ -227,7 +227,16 @@ nslb: mtcr %r3; \ bf 17,1f; /* branch if PSL_PR is false */ \ /* Restore user SRs */ \ - RESTORE_USER_SRS(); /* uses r27-r31 */ \ + GET_CPUINFO(%r3); \ + std %r28,(savearea+CPUSAVE_R28)(%r3); \ + std %r29,(savearea+CPUSAVE_R29)(%r3); \ + std %r30,(savearea+CPUSAVE_R30)(%r3); \ + std %r31,(savearea+CPUSAVE_R31)(%r3); \ + RESTORE_USER_SRS(); /* uses r28-r31 */ \ + ld %r31,(savearea+CPUSAVE_R31)(%r3); \ + ld %r30,(savearea+CPUSAVE_R30)(%r3); \ + ld %r29,(savearea+CPUSAVE_R29)(%r3); \ + ld %r28,(savearea+CPUSAVE_R28)(%r3); \ 1: mfsprg1 %r2; /* restore cr */ \ mtcr %r2; \ GET_CPUINFO(%r2); \ From owner-svn-src-projects@FreeBSD.ORG Mon Aug 3 05:47:58 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA9221065670; Mon, 3 Aug 2009 05:47:58 +0000 (UTC) (envelope-from rodrigc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C8F658FC0C; Mon, 3 Aug 2009 05:47:58 +0000 (UTC) (envelope-from rodrigc@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n735lwD1035325; Mon, 3 Aug 2009 05:47:58 GMT (envelope-from rodrigc@svn.freebsd.org) Received: (from rodrigc@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n735lwvE035323; Mon, 3 Aug 2009 05:47:58 GMT (envelope-from rodrigc@svn.freebsd.org) Message-Id: <200908030547.n735lwvE035323@svn.freebsd.org> From: Craig Rodrigues Date: Mon, 3 Aug 2009 05:47:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196043 - projects/jbuild/usr.bin/make X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Aug 2009 05:47:59 -0000 Author: rodrigc Date: Mon Aug 3 05:47:58 2009 New Revision: 196043 URL: http://svn.freebsd.org/changeset/base/196043 Log: After malloc'ing a new struct Job, initialize job->mon_fname[0] and job->meta_fname[0] to '\0'. There were some cases where .ERRORSEE contained an uninitialized string. Modified: projects/jbuild/usr.bin/make/job.c Modified: projects/jbuild/usr.bin/make/job.c ============================================================================== --- projects/jbuild/usr.bin/make/job.c Mon Aug 3 01:54:13 2009 (r196042) +++ projects/jbuild/usr.bin/make/job.c Mon Aug 3 05:47:58 2009 (r196043) @@ -1993,6 +1993,10 @@ JobStart(GNode *gn, int flags, Job *prev job = previous; } else { job = emalloc(sizeof(Job)); +#ifdef MAKE_IS_BUILD + job->mon_fname[0] = '\0'; + job->meta_fname[0] = '\0'; +#endif flags |= JOB_FIRST; } From owner-svn-src-projects@FreeBSD.ORG Tue Aug 4 17:32:56 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 323C91065674; Tue, 4 Aug 2009 17:32:56 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 20FB08FC12; Tue, 4 Aug 2009 17:32:56 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n74HWtM6025966; Tue, 4 Aug 2009 17:32:55 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n74HWtR6025965; Tue, 4 Aug 2009 17:32:55 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200908041732.n74HWtR6025965@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Tue, 4 Aug 2009 17:32:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196061 - projects/mips/sys/mips/mips X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Aug 2009 17:32:56 -0000 Author: gonzo Date: Tue Aug 4 17:32:55 2009 New Revision: 196061 URL: http://svn.freebsd.org/changeset/base/196061 Log: - Use register_t for registers values Modified: projects/mips/sys/mips/mips/vm_machdep.c Modified: projects/mips/sys/mips/mips/vm_machdep.c ============================================================================== --- projects/mips/sys/mips/mips/vm_machdep.c Mon Aug 3 21:41:30 2009 (r196060) +++ projects/mips/sys/mips/mips/vm_machdep.c Tue Aug 4 17:32:55 2009 (r196061) @@ -334,14 +334,14 @@ cpu_set_upcall_kse(struct thread *td, vo stack_t *stack) { struct trapframe *tf; - u_int32_t sp; + register_t sp; /* * At the point where a function is called, sp must be 8 * byte aligned[for compatibility with 64-bit CPUs] * in ``See MIPS Run'' by D. Sweetman, p. 269 * align stack */ - sp = ((uint32_t)(stack->ss_sp + stack->ss_size) & ~0x7) - + sp = ((register_t)(stack->ss_sp + stack->ss_size) & ~0x7) - STAND_FRAME_SIZE; /* From owner-svn-src-projects@FreeBSD.ORG Tue Aug 4 18:23:00 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3DDC1106566C; Tue, 4 Aug 2009 18:23:00 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 273778FC22; Tue, 4 Aug 2009 18:23:00 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n74IN0s4027236; Tue, 4 Aug 2009 18:23:00 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n74IMx6g027195; Tue, 4 Aug 2009 18:22:59 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200908041822.n74IMx6g027195@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Tue, 4 Aug 2009 18:22:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196062 - in projects/mips: . bin/ln bin/ps cddl/contrib/opensolaris cddl/contrib/opensolaris/head cddl/contrib/opensolaris/lib/libzpool/common cddl/contrib/opensolaris/lib/libzpool/com... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Aug 2009 18:23:00 -0000 Author: gonzo Date: Tue Aug 4 18:22:58 2009 New Revision: 196062 URL: http://svn.freebsd.org/changeset/base/196062 Log: - MFC @196061 Added: projects/mips/contrib/less/cvt.c - copied unchanged from r196061, head/contrib/less/cvt.c projects/mips/contrib/less/pattern.c - copied unchanged from r196061, head/contrib/less/pattern.c projects/mips/contrib/less/pattern.h - copied unchanged from r196061, head/contrib/less/pattern.h projects/mips/contrib/tcsh/config.rpath - copied unchanged from r196061, head/contrib/tcsh/config.rpath projects/mips/etc/rc.d/hostid_save - copied unchanged from r196061, head/etc/rc.d/hostid_save projects/mips/etc/rc.d/zvol - copied unchanged from r196061, head/etc/rc.d/zvol projects/mips/lib/libc/sys/msgctl.2 - copied unchanged from r196061, head/lib/libc/sys/msgctl.2 projects/mips/lib/libc/sys/msgget.2 - copied unchanged from r196061, head/lib/libc/sys/msgget.2 projects/mips/lib/libc/sys/msgrcv.2 - copied unchanged from r196061, head/lib/libc/sys/msgrcv.2 projects/mips/lib/libc/sys/msgsnd.2 - copied unchanged from r196061, head/lib/libc/sys/msgsnd.2 projects/mips/lib/libkvm/kvm_vnet.c - copied unchanged from r196061, head/lib/libkvm/kvm_vnet.c projects/mips/share/man/man4/ahci.4 - copied unchanged from r196061, head/share/man/man4/ahci.4 projects/mips/share/man/man4/net80211.4 - copied unchanged from r196061, head/share/man/man4/net80211.4 projects/mips/share/man/man4/siis.4 - copied unchanged from r196061, head/share/man/man4/siis.4 projects/mips/sys/cam/ata/ - copied from r196061, head/sys/cam/ata/ projects/mips/sys/cam/cam_xpt_internal.h - copied unchanged from r196061, head/sys/cam/cam_xpt_internal.h projects/mips/sys/cam/scsi/scsi_xpt.c - copied unchanged from r196061, head/sys/cam/scsi/scsi_xpt.c projects/mips/sys/dev/ahci/ - copied from r196061, head/sys/dev/ahci/ projects/mips/sys/dev/ispfw/asm_2500.h - copied unchanged from r196061, head/sys/dev/ispfw/asm_2500.h projects/mips/sys/dev/siis/ - copied from r196061, head/sys/dev/siis/ projects/mips/sys/modules/ahci/ - copied from r196061, head/sys/modules/ahci/ projects/mips/sys/modules/if_epair/ - copied from r196061, head/sys/modules/if_epair/ projects/mips/sys/modules/ispfw/isp_2400_multi/ - copied from r196061, head/sys/modules/ispfw/isp_2400_multi/ projects/mips/sys/modules/ispfw/isp_2500/ - copied from r196061, head/sys/modules/ispfw/isp_2500/ projects/mips/sys/modules/ispfw/isp_2500_multi/ - copied from r196061, head/sys/modules/ispfw/isp_2500_multi/ projects/mips/sys/modules/siis/ - copied from r196061, head/sys/modules/siis/ projects/mips/sys/net/vnet.c - copied unchanged from r196061, head/sys/net/vnet.c projects/mips/sys/net80211/ieee80211_action.c - copied unchanged from r196061, head/sys/net80211/ieee80211_action.c projects/mips/sys/net80211/ieee80211_action.h - copied unchanged from r196061, head/sys/net80211/ieee80211_action.h projects/mips/sys/net80211/ieee80211_ageq.c - copied unchanged from r196061, head/sys/net80211/ieee80211_ageq.c projects/mips/sys/net80211/ieee80211_ageq.h - copied unchanged from r196061, head/sys/net80211/ieee80211_ageq.h projects/mips/sys/net80211/ieee80211_hwmp.c - copied unchanged from r196061, head/sys/net80211/ieee80211_hwmp.c projects/mips/sys/net80211/ieee80211_mesh.c - copied unchanged from r196061, head/sys/net80211/ieee80211_mesh.c projects/mips/sys/net80211/ieee80211_mesh.h - copied unchanged from r196061, head/sys/net80211/ieee80211_mesh.h projects/mips/sys/vm/sg_pager.c - copied unchanged from r196061, head/sys/vm/sg_pager.c projects/mips/tools/regression/poll/ - copied from r196061, head/tools/regression/poll/ projects/mips/tools/regression/usr.bin/jot/regress.dddd.out - copied unchanged from r196061, head/tools/regression/usr.bin/jot/regress.dddd.out projects/mips/tools/tools/net80211/scripts/mesh/ - copied from r196061, head/tools/tools/net80211/scripts/mesh/ Deleted: projects/mips/contrib/tcsh/Makefile.ADMIN projects/mips/contrib/tcsh/RELEASE-PROCEDURE projects/mips/etc/pam.d/gdm projects/mips/lib/libc/gen/msgctl.3 projects/mips/lib/libc/gen/msgget.3 projects/mips/lib/libc/gen/msgrcv.3 projects/mips/lib/libc/gen/msgsnd.3 projects/mips/share/man/man4/ieee80211.4 projects/mips/sys/kern/kern_vimage.c projects/mips/sys/netinet/vinet.h projects/mips/sys/netinet6/vinet6.h projects/mips/sys/netipsec/vipsec.h projects/mips/sys/sys/vimage.h Modified: projects/mips/ (props changed) projects/mips/MAINTAINERS projects/mips/Makefile.inc1 projects/mips/ObsoleteFiles.inc projects/mips/UPDATING projects/mips/bin/ln/ln.1 projects/mips/bin/ln/ln.c projects/mips/bin/ps/ps.1 projects/mips/bin/ps/ps.c projects/mips/cddl/contrib/opensolaris/ (props changed) projects/mips/cddl/contrib/opensolaris/head/thread.h projects/mips/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c projects/mips/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h projects/mips/cddl/lib/Makefile.inc projects/mips/cddl/lib/libctf/Makefile projects/mips/cddl/lib/libdtrace/Makefile projects/mips/contrib/amd/amd/get_args.c projects/mips/contrib/bind9/ (props changed) projects/mips/contrib/bind9/CHANGES projects/mips/contrib/bind9/bin/named/update.c projects/mips/contrib/bind9/version projects/mips/contrib/cpio/ (props changed) projects/mips/contrib/csup/ (props changed) projects/mips/contrib/ee/ (props changed) projects/mips/contrib/file/ (props changed) projects/mips/contrib/gcc/config/freebsd-spec.h projects/mips/contrib/gcc/dwarf2out.c projects/mips/contrib/gdb/ (props changed) projects/mips/contrib/gdtoa/ (props changed) projects/mips/contrib/less/ (props changed) projects/mips/contrib/less/LICENSE projects/mips/contrib/less/Makefile.aut projects/mips/contrib/less/Makefile.dsb projects/mips/contrib/less/Makefile.dsg projects/mips/contrib/less/Makefile.dsu projects/mips/contrib/less/Makefile.in projects/mips/contrib/less/Makefile.o2e projects/mips/contrib/less/Makefile.o9c projects/mips/contrib/less/Makefile.o9u projects/mips/contrib/less/Makefile.wnb projects/mips/contrib/less/Makefile.wnm projects/mips/contrib/less/NEWS projects/mips/contrib/less/README projects/mips/contrib/less/brac.c projects/mips/contrib/less/ch.c projects/mips/contrib/less/charset.c projects/mips/contrib/less/charset.h projects/mips/contrib/less/cmd.h projects/mips/contrib/less/cmdbuf.c projects/mips/contrib/less/command.c projects/mips/contrib/less/configure.ac projects/mips/contrib/less/decode.c projects/mips/contrib/less/defines.ds projects/mips/contrib/less/defines.o2 projects/mips/contrib/less/defines.o9 projects/mips/contrib/less/defines.wn projects/mips/contrib/less/edit.c projects/mips/contrib/less/filename.c projects/mips/contrib/less/forwback.c projects/mips/contrib/less/funcs.h projects/mips/contrib/less/ifile.c projects/mips/contrib/less/input.c projects/mips/contrib/less/jump.c projects/mips/contrib/less/less.h projects/mips/contrib/less/less.man projects/mips/contrib/less/less.nro projects/mips/contrib/less/lessecho.c projects/mips/contrib/less/lessecho.man projects/mips/contrib/less/lessecho.nro projects/mips/contrib/less/lesskey.c projects/mips/contrib/less/lesskey.h projects/mips/contrib/less/lesskey.man projects/mips/contrib/less/lesskey.nro projects/mips/contrib/less/lglob.h projects/mips/contrib/less/line.c projects/mips/contrib/less/linenum.c projects/mips/contrib/less/lsystem.c projects/mips/contrib/less/main.c projects/mips/contrib/less/mark.c projects/mips/contrib/less/mkhelp.c projects/mips/contrib/less/optfunc.c projects/mips/contrib/less/option.c projects/mips/contrib/less/option.h projects/mips/contrib/less/opttbl.c projects/mips/contrib/less/os.c projects/mips/contrib/less/output.c projects/mips/contrib/less/pckeys.h projects/mips/contrib/less/position.c projects/mips/contrib/less/position.h projects/mips/contrib/less/prompt.c projects/mips/contrib/less/screen.c projects/mips/contrib/less/scrsize.c projects/mips/contrib/less/search.c projects/mips/contrib/less/signal.c projects/mips/contrib/less/tags.c projects/mips/contrib/less/ttyin.c projects/mips/contrib/less/version.c projects/mips/contrib/libpcap/ (props changed) projects/mips/contrib/ncurses/ (props changed) projects/mips/contrib/netcat/ (props changed) projects/mips/contrib/netcat/nc.1 projects/mips/contrib/ntp/ (props changed) projects/mips/contrib/ntp/scripts/mkver.in projects/mips/contrib/openbsm/ (props changed) projects/mips/contrib/openbsm/NEWS projects/mips/contrib/openbsm/README projects/mips/contrib/openbsm/VERSION projects/mips/contrib/openbsm/config/config.h projects/mips/contrib/openbsm/configure projects/mips/contrib/openbsm/configure.ac projects/mips/contrib/openbsm/etc/audit_event projects/mips/contrib/openbsm/libauditd/auditd_lib.c projects/mips/contrib/openbsm/libbsm/bsm_control.c projects/mips/contrib/openbsm/libbsm/bsm_errno.c projects/mips/contrib/openbsm/libbsm/bsm_io.c projects/mips/contrib/openbsm/libbsm/bsm_token.c projects/mips/contrib/openbsm/man/audit_control.5 projects/mips/contrib/openbsm/sys/bsm/audit.h projects/mips/contrib/openbsm/sys/bsm/audit_kevents.h projects/mips/contrib/openbsm/tools/audump.c projects/mips/contrib/openpam/ (props changed) projects/mips/contrib/pf/ (props changed) projects/mips/contrib/sendmail/ (props changed) projects/mips/contrib/sendmail/cf/sh/makeinfo.sh projects/mips/contrib/tcpdump/ (props changed) projects/mips/contrib/tcpdump/ieee802_11.h projects/mips/contrib/tcpdump/ieee802_11_radio.h projects/mips/contrib/tcpdump/print-802_11.c projects/mips/contrib/tcsh/ (props changed) projects/mips/contrib/tcsh/Fixes projects/mips/contrib/tcsh/Imakefile projects/mips/contrib/tcsh/Makefile.in projects/mips/contrib/tcsh/README projects/mips/contrib/tcsh/complete.tcsh projects/mips/contrib/tcsh/config.guess projects/mips/contrib/tcsh/config.h.in projects/mips/contrib/tcsh/config.sub projects/mips/contrib/tcsh/config_f.h projects/mips/contrib/tcsh/configure projects/mips/contrib/tcsh/configure.in projects/mips/contrib/tcsh/ed.chared.c projects/mips/contrib/tcsh/ed.decls.h projects/mips/contrib/tcsh/ed.h projects/mips/contrib/tcsh/ed.inputl.c projects/mips/contrib/tcsh/ed.screen.c projects/mips/contrib/tcsh/ed.term.h projects/mips/contrib/tcsh/ed.xmap.c projects/mips/contrib/tcsh/glob.c projects/mips/contrib/tcsh/host.defs projects/mips/contrib/tcsh/ma.setp.c projects/mips/contrib/tcsh/patchlevel.h projects/mips/contrib/tcsh/sh.c projects/mips/contrib/tcsh/sh.char.c projects/mips/contrib/tcsh/sh.char.h projects/mips/contrib/tcsh/sh.decls.h projects/mips/contrib/tcsh/sh.dir.c projects/mips/contrib/tcsh/sh.dol.c projects/mips/contrib/tcsh/sh.err.c projects/mips/contrib/tcsh/sh.exec.c projects/mips/contrib/tcsh/sh.exp.c projects/mips/contrib/tcsh/sh.file.c projects/mips/contrib/tcsh/sh.func.c projects/mips/contrib/tcsh/sh.glob.c projects/mips/contrib/tcsh/sh.h projects/mips/contrib/tcsh/sh.lex.c projects/mips/contrib/tcsh/sh.proc.c projects/mips/contrib/tcsh/sh.proc.h projects/mips/contrib/tcsh/sh.sem.c projects/mips/contrib/tcsh/sh.set.c projects/mips/contrib/tcsh/snames.h projects/mips/contrib/tcsh/tc.bind.c projects/mips/contrib/tcsh/tc.const.c projects/mips/contrib/tcsh/tc.decls.h projects/mips/contrib/tcsh/tc.func.c projects/mips/contrib/tcsh/tc.os.h projects/mips/contrib/tcsh/tc.sig.h projects/mips/contrib/tcsh/tc.str.c projects/mips/contrib/tcsh/tcsh.man projects/mips/contrib/tcsh/tw.color.c projects/mips/contrib/tcsh/tw.comp.c projects/mips/contrib/tcsh/tw.parse.c projects/mips/contrib/top/ (props changed) projects/mips/contrib/top/install-sh (props changed) projects/mips/crypto/openssh/ (props changed) projects/mips/crypto/openssl/ (props changed) projects/mips/etc/mtree/BSD.include.dist projects/mips/etc/ntp.conf projects/mips/etc/pam.d/Makefile projects/mips/etc/portsnap.conf projects/mips/etc/rc.d/Makefile projects/mips/etc/rc.d/hostid projects/mips/etc/rc.d/zfs projects/mips/games/fortune/datfiles/fortunes projects/mips/games/fortune/datfiles/fortunes-o.real projects/mips/gnu/lib/libdialog/Makefile projects/mips/gnu/lib/libg2c/Makefile projects/mips/gnu/lib/libgcc/Makefile projects/mips/gnu/lib/libobjc/Makefile projects/mips/gnu/lib/libreadline/Makefile.inc projects/mips/gnu/lib/libregex/Makefile projects/mips/gnu/lib/libssp/libssp_nonshared/Makefile projects/mips/include/Makefile projects/mips/include/dlfcn.h projects/mips/include/unistd.h projects/mips/lib/Makefile.inc projects/mips/lib/libalias/libalias/Makefile projects/mips/lib/libarchive/Makefile projects/mips/lib/libarchive/archive_read_support_format_iso9660.c projects/mips/lib/libautofs/Makefile projects/mips/lib/libbegemot/Makefile projects/mips/lib/libbluetooth/Makefile projects/mips/lib/libbsm/Makefile projects/mips/lib/libbsnmp/Makefile.inc projects/mips/lib/libbz2/Makefile projects/mips/lib/libc/ (props changed) projects/mips/lib/libc/Makefile projects/mips/lib/libc/gen/Makefile.inc projects/mips/lib/libc/gen/dlopen.3 projects/mips/lib/libc/gen/ftok.3 projects/mips/lib/libc/gen/pw_scan.c projects/mips/lib/libc/posix1e/Makefile.inc projects/mips/lib/libc/stdio/asprintf.c (props changed) projects/mips/lib/libc/stdio/fread.c projects/mips/lib/libc/stdio/fwrite.c projects/mips/lib/libc/stdtime/ (props changed) projects/mips/lib/libc/string/ffsll.c (props changed) projects/mips/lib/libc/string/flsll.c (props changed) projects/mips/lib/libc/string/wcpcpy.c (props changed) projects/mips/lib/libc/sys/Makefile.inc projects/mips/lib/libc/sys/Symbol.map projects/mips/lib/libc/sys/execve.2 projects/mips/lib/libc/sys/link.2 projects/mips/lib/libc/sys/mmap.2 projects/mips/lib/libc/sys/pathconf.2 projects/mips/lib/libc/sys/stack_protector.c projects/mips/lib/libcam/Makefile projects/mips/lib/libcrypt/Makefile projects/mips/lib/libdevstat/Makefile projects/mips/lib/libdwarf/Makefile projects/mips/lib/libdwarf/dwarf_loc.c projects/mips/lib/libedit/Makefile projects/mips/lib/libexpat/Makefile projects/mips/lib/libfetch/Makefile projects/mips/lib/libftpio/Makefile projects/mips/lib/libgpib/Makefile projects/mips/lib/libipsec/Makefile projects/mips/lib/libjail/jail.c projects/mips/lib/libjail/jail.h projects/mips/lib/libkiconv/Makefile projects/mips/lib/libkse/Makefile projects/mips/lib/libkvm/Makefile projects/mips/lib/libkvm/kvm.c projects/mips/lib/libkvm/kvm_private.h projects/mips/lib/libkvm/kvm_proc.c projects/mips/lib/libmagic/Makefile projects/mips/lib/libmemstat/Makefile projects/mips/lib/libncp/Makefile projects/mips/lib/libnetgraph/Makefile projects/mips/lib/libngatm/Makefile projects/mips/lib/libopie/Makefile projects/mips/lib/libpam/Makefile.inc projects/mips/lib/libpcap/Makefile projects/mips/lib/libproc/Makefile projects/mips/lib/libradius/Makefile projects/mips/lib/libsdp/Makefile projects/mips/lib/libsmb/Makefile projects/mips/lib/libtacplus/Makefile projects/mips/lib/libthr/thread/thr_rtld.c projects/mips/lib/libthr/thread/thr_rwlock.c projects/mips/lib/libugidfw/Makefile projects/mips/lib/libusb/ (props changed) projects/mips/lib/libusb/Makefile projects/mips/lib/libusb/libusb.3 projects/mips/lib/libusb/libusb.h projects/mips/lib/libusb/libusb10.c projects/mips/lib/libusb/libusb10.h projects/mips/lib/libusb/libusb10_desc.c projects/mips/lib/libusb/libusb10_io.c projects/mips/lib/libusb/libusb20.3 (contents, props changed) projects/mips/lib/libusb/libusb20_compat01.c projects/mips/lib/libusb/libusb20_int.h projects/mips/lib/libusb/usb.h (props changed) projects/mips/lib/libusbhid/Makefile projects/mips/lib/libutil/ (props changed) projects/mips/lib/libutil/Makefile projects/mips/lib/libvgl/Makefile projects/mips/lib/libwrap/Makefile projects/mips/lib/libypclnt/Makefile projects/mips/lib/ncurses/ncurses/Makefile projects/mips/libexec/rtld-elf/Makefile projects/mips/libexec/rtld-elf/map_object.c projects/mips/libexec/rtld-elf/rtld.c projects/mips/sbin/ (props changed) projects/mips/sbin/camcontrol/camcontrol.8 projects/mips/sbin/camcontrol/camcontrol.c projects/mips/sbin/dhclient/dispatch.c projects/mips/sbin/ifconfig/ifconfig.8 projects/mips/sbin/ifconfig/ifconfig.c projects/mips/sbin/ifconfig/ifieee80211.c projects/mips/sbin/ifconfig/ifmedia.c projects/mips/sbin/ipfw/ (props changed) projects/mips/sbin/mount_nfs/mount_nfs.8 projects/mips/secure/lib/libcrypto/Makefile projects/mips/secure/lib/libssh/Makefile projects/mips/secure/lib/libssl/Makefile projects/mips/share/man/man4/Makefile projects/mips/share/man/man4/aac.4 projects/mips/share/man/man4/acpi_hp.4 projects/mips/share/man/man4/acpi_wmi.4 projects/mips/share/man/man4/altq.4 projects/mips/share/man/man4/asmc.4 projects/mips/share/man/man4/ath.4 projects/mips/share/man/man4/epair.4 projects/mips/share/man/man4/mwl.4 projects/mips/share/man/man4/mxge.4 projects/mips/share/man/man4/pcm.4 projects/mips/share/man/man4/ral.4 projects/mips/share/man/man4/u3g.4 projects/mips/share/man/man4/urtw.4 projects/mips/share/man/man4/wlan.4 projects/mips/share/man/man5/procfs.5 projects/mips/share/man/man9/Makefile projects/mips/share/man/man9/netisr.9 projects/mips/share/misc/committers-ports.dot projects/mips/share/mk/bsd.lib.mk projects/mips/share/zoneinfo/ (props changed) projects/mips/sys/ (props changed) projects/mips/sys/amd64/amd64/cpu_switch.S projects/mips/sys/amd64/amd64/exception.S projects/mips/sys/amd64/amd64/genassym.c projects/mips/sys/amd64/amd64/initcpu.c projects/mips/sys/amd64/amd64/io_apic.c projects/mips/sys/amd64/amd64/machdep.c projects/mips/sys/amd64/amd64/msi.c projects/mips/sys/amd64/amd64/pmap.c projects/mips/sys/amd64/amd64/sys_machdep.c projects/mips/sys/amd64/amd64/vm_machdep.c projects/mips/sys/amd64/conf/GENERIC projects/mips/sys/amd64/ia32/ia32_exception.S projects/mips/sys/amd64/ia32/ia32_reg.c projects/mips/sys/amd64/ia32/ia32_signal.c projects/mips/sys/amd64/include/cpufunc.h projects/mips/sys/amd64/include/md_var.h projects/mips/sys/amd64/include/param.h projects/mips/sys/amd64/include/pcb.h projects/mips/sys/amd64/include/pmap.h projects/mips/sys/amd64/include/vm.h projects/mips/sys/amd64/include/xen/ (props changed) projects/mips/sys/amd64/linux32/linux32_sysvec.c projects/mips/sys/amd64/pci/pci_bus.c projects/mips/sys/arm/arm/busdma_machdep.c projects/mips/sys/arm/arm/cpufunc.c projects/mips/sys/arm/arm/minidump_machdep.c projects/mips/sys/arm/arm/pmap.c projects/mips/sys/arm/arm/vm_machdep.c projects/mips/sys/arm/conf/AVILA projects/mips/sys/arm/conf/CAMBRIA projects/mips/sys/arm/include/param.h projects/mips/sys/arm/include/pmap.h projects/mips/sys/arm/include/vm.h projects/mips/sys/boot/forth/loader.conf projects/mips/sys/bsm/audit.h projects/mips/sys/bsm/audit_kevents.h projects/mips/sys/cam/cam.c projects/mips/sys/cam/cam.h projects/mips/sys/cam/cam_ccb.h projects/mips/sys/cam/cam_periph.c projects/mips/sys/cam/cam_xpt.c projects/mips/sys/cam/cam_xpt.h projects/mips/sys/cam/cam_xpt_periph.h projects/mips/sys/cam/scsi/scsi_all.c projects/mips/sys/cam/scsi/scsi_cd.c projects/mips/sys/cam/scsi/scsi_ch.c projects/mips/sys/cam/scsi/scsi_da.c projects/mips/sys/cam/scsi/scsi_pass.c projects/mips/sys/cam/scsi/scsi_pt.c projects/mips/sys/cam/scsi/scsi_sa.c projects/mips/sys/cam/scsi/scsi_ses.c projects/mips/sys/cam/scsi/scsi_sg.c projects/mips/sys/cddl/compat/opensolaris/sys/sig.h projects/mips/sys/cddl/contrib/opensolaris/ (props changed) projects/mips/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/mips/sys/cddl/dev/dtrace/amd64/dtrace_subr.c projects/mips/sys/cddl/dev/dtrace/i386/dtrace_subr.c projects/mips/sys/compat/freebsd32/freebsd32_misc.c projects/mips/sys/compat/freebsd32/freebsd32_proto.h projects/mips/sys/compat/freebsd32/freebsd32_syscall.h projects/mips/sys/compat/freebsd32/freebsd32_syscalls.c projects/mips/sys/compat/freebsd32/freebsd32_sysent.c projects/mips/sys/compat/freebsd32/syscalls.master projects/mips/sys/compat/linprocfs/linprocfs.c projects/mips/sys/compat/linux/linux_ioctl.c projects/mips/sys/compat/linux/linux_mib.c projects/mips/sys/compat/linux/linux_socket.c projects/mips/sys/compat/svr4/svr4_sockio.c projects/mips/sys/compat/svr4/svr4_stat.c projects/mips/sys/conf/NOTES projects/mips/sys/conf/files projects/mips/sys/conf/newvers.sh projects/mips/sys/conf/options projects/mips/sys/contrib/altq/altq/altq_subr.c projects/mips/sys/contrib/dev/acpica/ (props changed) projects/mips/sys/contrib/dev/acpica/compiler/aslcompile.c projects/mips/sys/contrib/dev/acpica/compiler/aslutils.c projects/mips/sys/contrib/ipfilter/netinet/fil.c projects/mips/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c projects/mips/sys/contrib/pf/ (props changed) projects/mips/sys/contrib/pf/net/pf.c projects/mips/sys/contrib/pf/net/pf_if.c projects/mips/sys/contrib/pf/net/pf_ioctl.c projects/mips/sys/contrib/pf/net/pf_subr.c projects/mips/sys/contrib/pf/net/pfvar.h projects/mips/sys/contrib/rdma/rdma_cma.c projects/mips/sys/ddb/db_expr.c projects/mips/sys/ddb/db_sym.c projects/mips/sys/ddb/db_variables.c projects/mips/sys/ddb/db_variables.h projects/mips/sys/ddb/ddb.h projects/mips/sys/dev/aac/aac.c projects/mips/sys/dev/aac/aac_disk.c projects/mips/sys/dev/acpi_support/acpi_hp.c projects/mips/sys/dev/acpica/acpi.c projects/mips/sys/dev/acpica/acpi_battery.c projects/mips/sys/dev/acpica/acpi_cpu.c projects/mips/sys/dev/acpica/acpi_dock.c projects/mips/sys/dev/acpica/acpi_pcib_acpi.c projects/mips/sys/dev/acpica/acpi_thermal.c projects/mips/sys/dev/adb/adb_bus.c projects/mips/sys/dev/advansys/advansys.c projects/mips/sys/dev/advansys/advlib.h projects/mips/sys/dev/aic7xxx/aic79xx_osm.h projects/mips/sys/dev/aic7xxx/aic7xxx_osm.h projects/mips/sys/dev/alc/if_alc.c projects/mips/sys/dev/amd/amd.h projects/mips/sys/dev/amdtemp/amdtemp.c projects/mips/sys/dev/amr/amr.c projects/mips/sys/dev/ata/ (props changed) projects/mips/sys/dev/ata/ata-all.c projects/mips/sys/dev/ata/ata-usb.c (props changed) projects/mips/sys/dev/ata/atapi-cam.c projects/mips/sys/dev/ata/atapi-cd.c projects/mips/sys/dev/ata/chipsets/ata-ahci.c projects/mips/sys/dev/ata/chipsets/ata-marvell.c projects/mips/sys/dev/ata/chipsets/ata-nvidia.c projects/mips/sys/dev/ath/ah_osdep.c projects/mips/sys/dev/ath/ah_osdep.h projects/mips/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c projects/mips/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c projects/mips/sys/dev/ath/if_ath.c projects/mips/sys/dev/ath/if_athvar.h projects/mips/sys/dev/atkbdc/psm.c projects/mips/sys/dev/bktr/bktr_os.c projects/mips/sys/dev/ciss/ciss.c projects/mips/sys/dev/ciss/cissvar.h projects/mips/sys/dev/cxgb/ (props changed) projects/mips/sys/dev/cxgb/cxgb_sge.c projects/mips/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c projects/mips/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/mips/sys/dev/drm/drm_drv.c projects/mips/sys/dev/drm/drm_pciids.h projects/mips/sys/dev/drm/r600_cp.c projects/mips/sys/dev/drm/radeon_drv.h projects/mips/sys/dev/e1000/e1000_82542.c projects/mips/sys/dev/e1000/e1000_ich8lan.c projects/mips/sys/dev/e1000/if_em.c projects/mips/sys/dev/e1000/if_igb.c projects/mips/sys/dev/hptrr/hptrr_config.c projects/mips/sys/dev/if_ndis/if_ndis.c projects/mips/sys/dev/ips/ips_pci.c projects/mips/sys/dev/ipw/if_ipw.c projects/mips/sys/dev/isp/isp.c projects/mips/sys/dev/isp/isp_freebsd.c projects/mips/sys/dev/isp/isp_freebsd.h projects/mips/sys/dev/isp/isp_ioctl.h projects/mips/sys/dev/isp/isp_library.c projects/mips/sys/dev/isp/isp_library.h projects/mips/sys/dev/isp/isp_pci.c projects/mips/sys/dev/isp/isp_sbus.c projects/mips/sys/dev/isp/isp_stds.h projects/mips/sys/dev/isp/isp_target.c projects/mips/sys/dev/isp/isp_target.h projects/mips/sys/dev/isp/ispmbox.h projects/mips/sys/dev/isp/ispreg.h projects/mips/sys/dev/isp/ispvar.h projects/mips/sys/dev/ispfw/asm_2300.h projects/mips/sys/dev/ispfw/asm_2400.h projects/mips/sys/dev/ispfw/ispfw.c projects/mips/sys/dev/iwi/if_iwi.c projects/mips/sys/dev/iwn/if_iwn.c projects/mips/sys/dev/ixgbe/ixgbe.c projects/mips/sys/dev/mfi/mfi.c projects/mips/sys/dev/mfi/mfivar.h projects/mips/sys/dev/mlx/mlx.c projects/mips/sys/dev/mlx/mlxvar.h projects/mips/sys/dev/mmc/mmc.c projects/mips/sys/dev/mpt/mpt.h projects/mips/sys/dev/mpt/mpt_pci.c projects/mips/sys/dev/mwl/if_mwl.c projects/mips/sys/dev/mwl/if_mwlvar.h projects/mips/sys/dev/mxge/if_mxge.c projects/mips/sys/dev/pccbb/pccbb.c projects/mips/sys/dev/pci/pci.c projects/mips/sys/dev/pst/pst-iop.c projects/mips/sys/dev/ral/rt2560.c projects/mips/sys/dev/ral/rt2661.c projects/mips/sys/dev/re/if_re.c projects/mips/sys/dev/rp/rp.c projects/mips/sys/dev/sound/pci/hda/hdac.c projects/mips/sys/dev/sound/pcm/feeder_rate.c projects/mips/sys/dev/sound/usb/uaudio.c (contents, props changed) projects/mips/sys/dev/sound/usb/uaudio.h (props changed) projects/mips/sys/dev/sound/usb/uaudio_pcm.c (props changed) projects/mips/sys/dev/sound/usb/uaudioreg.h (props changed) projects/mips/sys/dev/trm/trm.h projects/mips/sys/dev/twe/twe.c projects/mips/sys/dev/uart/uart_cpu_powerpc.c projects/mips/sys/dev/usb/controller/at91dci.c (contents, props changed) projects/mips/sys/dev/usb/controller/at91dci.h (props changed) projects/mips/sys/dev/usb/controller/at91dci_atmelarm.c (props changed) projects/mips/sys/dev/usb/controller/atmegadci.c projects/mips/sys/dev/usb/controller/avr32dci.c projects/mips/sys/dev/usb/controller/ehci.c (contents, props changed) projects/mips/sys/dev/usb/controller/ehci.h (props changed) projects/mips/sys/dev/usb/controller/ehci_pci.c (contents, props changed) projects/mips/sys/dev/usb/controller/musb_otg.c (contents, props changed) projects/mips/sys/dev/usb/controller/musb_otg.h (props changed) projects/mips/sys/dev/usb/controller/musb_otg_atmelarm.c (props changed) projects/mips/sys/dev/usb/controller/ohci.c (contents, props changed) projects/mips/sys/dev/usb/controller/ohci.h (props changed) projects/mips/sys/dev/usb/controller/ohci_atmelarm.c (props changed) projects/mips/sys/dev/usb/controller/ohci_pci.c (contents, props changed) projects/mips/sys/dev/usb/controller/uhci.c (contents, props changed) projects/mips/sys/dev/usb/controller/uhci.h (props changed) projects/mips/sys/dev/usb/controller/uhci_pci.c (contents, props changed) projects/mips/sys/dev/usb/controller/usb_controller.c (contents, props changed) projects/mips/sys/dev/usb/controller/uss820dci.c (contents, props changed) projects/mips/sys/dev/usb/controller/uss820dci.h (props changed) projects/mips/sys/dev/usb/controller/uss820dci_atmelarm.c (props changed) projects/mips/sys/dev/usb/input/uhid.c (props changed) projects/mips/sys/dev/usb/input/ukbd.c (contents, props changed) projects/mips/sys/dev/usb/input/ums.c (contents, props changed) projects/mips/sys/dev/usb/input/usb_rdesc.h (props changed) projects/mips/sys/dev/usb/misc/udbp.c (props changed) projects/mips/sys/dev/usb/misc/udbp.h (props changed) projects/mips/sys/dev/usb/misc/ufm.c (props changed) projects/mips/sys/dev/usb/net/if_aue.c (props changed) projects/mips/sys/dev/usb/net/if_auereg.h (props changed) projects/mips/sys/dev/usb/net/if_axe.c (props changed) projects/mips/sys/dev/usb/net/if_axereg.h (props changed) projects/mips/sys/dev/usb/net/if_cdce.c (props changed) projects/mips/sys/dev/usb/net/if_cdcereg.h (props changed) projects/mips/sys/dev/usb/net/if_cue.c (props changed) projects/mips/sys/dev/usb/net/if_cuereg.h (props changed) projects/mips/sys/dev/usb/net/if_kue.c (props changed) projects/mips/sys/dev/usb/net/if_kuefw.h (props changed) projects/mips/sys/dev/usb/net/if_kuereg.h (props changed) projects/mips/sys/dev/usb/net/if_rue.c (props changed) projects/mips/sys/dev/usb/net/if_ruereg.h (props changed) projects/mips/sys/dev/usb/net/if_udav.c (props changed) projects/mips/sys/dev/usb/net/if_udavreg.h (props changed) projects/mips/sys/dev/usb/net/usb_ethernet.c (contents, props changed) projects/mips/sys/dev/usb/net/usb_ethernet.h (props changed) projects/mips/sys/dev/usb/quirk/usb_quirk.c (props changed) projects/mips/sys/dev/usb/quirk/usb_quirk.h (props changed) projects/mips/sys/dev/usb/serial/u3g.c (contents, props changed) projects/mips/sys/dev/usb/serial/uark.c (props changed) projects/mips/sys/dev/usb/serial/ubsa.c (props changed) projects/mips/sys/dev/usb/serial/ubser.c (props changed) projects/mips/sys/dev/usb/serial/uchcom.c (props changed) projects/mips/sys/dev/usb/serial/ucycom.c (props changed) projects/mips/sys/dev/usb/serial/ufoma.c (props changed) projects/mips/sys/dev/usb/serial/uftdi.c (props changed) projects/mips/sys/dev/usb/serial/uftdi_reg.h (props changed) projects/mips/sys/dev/usb/serial/ugensa.c (props changed) projects/mips/sys/dev/usb/serial/uipaq.c (props changed) projects/mips/sys/dev/usb/serial/ulpt.c (contents, props changed) projects/mips/sys/dev/usb/serial/umct.c (props changed) projects/mips/sys/dev/usb/serial/umodem.c (props changed) projects/mips/sys/dev/usb/serial/umoscom.c (props changed) projects/mips/sys/dev/usb/serial/uplcom.c (props changed) projects/mips/sys/dev/usb/serial/usb_serial.c (props changed) projects/mips/sys/dev/usb/serial/usb_serial.h (props changed) projects/mips/sys/dev/usb/serial/uvisor.c (props changed) projects/mips/sys/dev/usb/serial/uvscom.c (props changed) projects/mips/sys/dev/usb/storage/rio500_usb.h (props changed) projects/mips/sys/dev/usb/storage/umass.c (props changed) projects/mips/sys/dev/usb/storage/urio.c (props changed) projects/mips/sys/dev/usb/storage/ustorage_fs.c (props changed) projects/mips/sys/dev/usb/template/usb_template.c (props changed) projects/mips/sys/dev/usb/template/usb_template.h (props changed) projects/mips/sys/dev/usb/template/usb_template_cdce.c (props changed) projects/mips/sys/dev/usb/template/usb_template_msc.c (props changed) projects/mips/sys/dev/usb/template/usb_template_mtp.c (props changed) projects/mips/sys/dev/usb/ufm_ioctl.h (props changed) projects/mips/sys/dev/usb/usb.h (props changed) projects/mips/sys/dev/usb/usb_bus.h (props changed) projects/mips/sys/dev/usb/usb_busdma.c (contents, props changed) projects/mips/sys/dev/usb/usb_busdma.h (props changed) projects/mips/sys/dev/usb/usb_cdc.h (props changed) projects/mips/sys/dev/usb/usb_compat_linux.c (contents, props changed) projects/mips/sys/dev/usb/usb_compat_linux.h (contents, props changed) projects/mips/sys/dev/usb/usb_controller.h (contents, props changed) projects/mips/sys/dev/usb/usb_core.c (props changed) projects/mips/sys/dev/usb/usb_core.h (props changed) projects/mips/sys/dev/usb/usb_debug.c (props changed) projects/mips/sys/dev/usb/usb_debug.h (props changed) projects/mips/sys/dev/usb/usb_dev.c (contents, props changed) projects/mips/sys/dev/usb/usb_dev.h (contents, props changed) projects/mips/sys/dev/usb/usb_device.c (contents, props changed) projects/mips/sys/dev/usb/usb_device.h (props changed) projects/mips/sys/dev/usb/usb_dynamic.c (props changed) projects/mips/sys/dev/usb/usb_dynamic.h (props changed) projects/mips/sys/dev/usb/usb_endian.h (props changed) projects/mips/sys/dev/usb/usb_error.c (props changed) projects/mips/sys/dev/usb/usb_generic.c (props changed) projects/mips/sys/dev/usb/usb_generic.h (props changed) projects/mips/sys/dev/usb/usb_handle_request.c (contents, props changed) projects/mips/sys/dev/usb/usb_hid.c (contents, props changed) projects/mips/sys/dev/usb/usb_hub.c (contents, props changed) projects/mips/sys/dev/usb/usb_hub.h (props changed) projects/mips/sys/dev/usb/usb_if.m (props changed) projects/mips/sys/dev/usb/usb_ioctl.h (props changed) projects/mips/sys/dev/usb/usb_lookup.c (props changed) projects/mips/sys/dev/usb/usb_mbuf.c (props changed) projects/mips/sys/dev/usb/usb_mbuf.h (props changed) projects/mips/sys/dev/usb/usb_msctest.c (props changed) projects/mips/sys/dev/usb/usb_msctest.h (props changed) projects/mips/sys/dev/usb/usb_parse.c (contents, props changed) projects/mips/sys/dev/usb/usb_pci.h (props changed) projects/mips/sys/dev/usb/usb_process.c (props changed) projects/mips/sys/dev/usb/usb_process.h (props changed) projects/mips/sys/dev/usb/usb_request.c (contents, props changed) projects/mips/sys/dev/usb/usb_request.h (props changed) projects/mips/sys/dev/usb/usb_transfer.c (contents, props changed) projects/mips/sys/dev/usb/usb_transfer.h (props changed) projects/mips/sys/dev/usb/usb_util.c (props changed) projects/mips/sys/dev/usb/usb_util.h (props changed) projects/mips/sys/dev/usb/usbdevs (contents, props changed) projects/mips/sys/dev/usb/usbdi.h projects/mips/sys/dev/usb/usbhid.h (props changed) projects/mips/sys/dev/usb/wlan/if_rum.c (props changed) projects/mips/sys/dev/usb/wlan/if_rumfw.h (props changed) projects/mips/sys/dev/usb/wlan/if_rumreg.h (props changed) projects/mips/sys/dev/usb/wlan/if_rumvar.h (props changed) projects/mips/sys/dev/usb/wlan/if_uath.c projects/mips/sys/dev/usb/wlan/if_upgt.c projects/mips/sys/dev/usb/wlan/if_ural.c (props changed) projects/mips/sys/dev/usb/wlan/if_uralreg.h (props changed) projects/mips/sys/dev/usb/wlan/if_uralvar.h (props changed) projects/mips/sys/dev/usb/wlan/if_zyd.c (props changed) projects/mips/sys/dev/usb/wlan/if_zydfw.h (props changed) projects/mips/sys/dev/usb/wlan/if_zydreg.h (props changed) projects/mips/sys/dev/wpi/if_wpi.c projects/mips/sys/dev/xen/blkback/blkback.c projects/mips/sys/dev/xen/netback/netback.c projects/mips/sys/dev/xen/netfront/ (props changed) projects/mips/sys/dev/xen/xenpci/ (props changed) projects/mips/sys/dev/xl/if_xl.c projects/mips/sys/fs/fifofs/fifo_vnops.c projects/mips/sys/fs/nfs/nfs_commonkrpc.c projects/mips/sys/fs/nfs/nfs_var.h projects/mips/sys/fs/nfs/nfsport.h projects/mips/sys/fs/nfsclient/nfs_clbio.c projects/mips/sys/fs/nfsclient/nfs_clrpcops.c projects/mips/sys/fs/nfsclient/nfs_clstate.c projects/mips/sys/fs/nfsclient/nfs_clvfsops.c projects/mips/sys/fs/nfsclient/nfs_clvnops.c projects/mips/sys/fs/nfsserver/nfs_nfsdport.c projects/mips/sys/fs/procfs/procfs_map.c projects/mips/sys/fs/unionfs/union_subr.c projects/mips/sys/geom/geom_dev.c projects/mips/sys/geom/part/g_part.c projects/mips/sys/geom/part/g_part_if.m projects/mips/sys/geom/vinum/geom_vinum.c projects/mips/sys/i386/acpica/acpi_machdep.c projects/mips/sys/i386/bios/smapi.c projects/mips/sys/i386/bios/smbios.c projects/mips/sys/i386/bios/vpd.c projects/mips/sys/i386/conf/GENERIC projects/mips/sys/i386/i386/initcpu.c projects/mips/sys/i386/i386/io_apic.c projects/mips/sys/i386/i386/machdep.c projects/mips/sys/i386/i386/msi.c projects/mips/sys/i386/i386/pmap.c projects/mips/sys/i386/i386/vm_machdep.c projects/mips/sys/i386/ibcs2/ibcs2_misc.c projects/mips/sys/i386/include/cpufunc.h projects/mips/sys/i386/include/md_var.h projects/mips/sys/i386/include/param.h projects/mips/sys/i386/include/pmap.h projects/mips/sys/i386/include/sf_buf.h projects/mips/sys/i386/include/vm.h projects/mips/sys/i386/pci/pci_bus.c projects/mips/sys/i386/xen/pmap.c projects/mips/sys/ia64/ia64/pmap.c projects/mips/sys/ia64/include/param.h projects/mips/sys/ia64/include/pmap.h projects/mips/sys/ia64/include/vm.h projects/mips/sys/kern/init_main.c projects/mips/sys/kern/init_sysent.c projects/mips/sys/kern/kern_exec.c projects/mips/sys/kern/kern_exit.c projects/mips/sys/kern/kern_fork.c projects/mips/sys/kern/kern_jail.c projects/mips/sys/kern/kern_linker.c projects/mips/sys/kern/kern_mbuf.c projects/mips/sys/kern/kern_poll.c projects/mips/sys/kern/kern_proc.c projects/mips/sys/kern/kern_prot.c projects/mips/sys/kern/kern_sig.c projects/mips/sys/kern/kern_synch.c projects/mips/sys/kern/kern_sysctl.c projects/mips/sys/kern/kern_thread.c projects/mips/sys/kern/kern_uuid.c projects/mips/sys/kern/link_elf.c projects/mips/sys/kern/link_elf_obj.c projects/mips/sys/kern/subr_bus.c projects/mips/sys/kern/subr_param.c projects/mips/sys/kern/subr_sleepqueue.c projects/mips/sys/kern/subr_trap.c projects/mips/sys/kern/sys_pipe.c projects/mips/sys/kern/sys_socket.c projects/mips/sys/kern/syscalls.c projects/mips/sys/kern/syscalls.master projects/mips/sys/kern/systrace_args.c projects/mips/sys/kern/tty.c projects/mips/sys/kern/tty_pts.c projects/mips/sys/kern/tty_ttydisc.c projects/mips/sys/kern/uipc_domain.c projects/mips/sys/kern/uipc_socket.c projects/mips/sys/kern/uipc_syscalls.c projects/mips/sys/kern/uipc_usrreq.c projects/mips/sys/kern/vfs_bio.c projects/mips/sys/kern/vfs_lookup.c projects/mips/sys/kern/vfs_mount.c projects/mips/sys/kern/vfs_syscalls.c projects/mips/sys/mips/conf/OCTEON1 (props changed) projects/mips/sys/mips/include/param.h projects/mips/sys/mips/include/pmap.h projects/mips/sys/mips/include/vm.h projects/mips/sys/mips/mips/pmap.c projects/mips/sys/mips/octeon1/ (props changed) projects/mips/sys/modules/Makefile projects/mips/sys/modules/cam/Makefile projects/mips/sys/modules/dtrace/dtnfsclient/ (props changed) projects/mips/sys/modules/geom/geom_label/Makefile projects/mips/sys/modules/ip6_mroute_mod/ (props changed) projects/mips/sys/modules/ipmi/ipmi_linux/ (props changed) projects/mips/sys/modules/ispfw/Makefile projects/mips/sys/modules/wlan/Makefile projects/mips/sys/net/bpf.c projects/mips/sys/net/bridgestp.c projects/mips/sys/net/flowtable.c projects/mips/sys/net/flowtable.h projects/mips/sys/net/if.c projects/mips/sys/net/if_bridge.c projects/mips/sys/net/if_clone.c projects/mips/sys/net/if_clone.h projects/mips/sys/net/if_ef.c projects/mips/sys/net/if_enc.c projects/mips/sys/net/if_epair.c projects/mips/sys/net/if_ethersubr.c projects/mips/sys/net/if_faith.c projects/mips/sys/net/if_gif.c projects/mips/sys/net/if_gif.h projects/mips/sys/net/if_gre.c projects/mips/sys/net/if_llatbl.c projects/mips/sys/net/if_loop.c projects/mips/sys/net/if_media.h projects/mips/sys/net/if_mib.c projects/mips/sys/net/if_spppsubr.c projects/mips/sys/net/if_stf.c projects/mips/sys/net/if_tun.c projects/mips/sys/net/if_var.h projects/mips/sys/net/if_vlan.c projects/mips/sys/net/netisr.c projects/mips/sys/net/netisr.h projects/mips/sys/net/raw_cb.c projects/mips/sys/net/raw_cb.h projects/mips/sys/net/raw_usrreq.c projects/mips/sys/net/route.c projects/mips/sys/net/rtsock.c projects/mips/sys/net/vnet.h projects/mips/sys/net80211/_ieee80211.h projects/mips/sys/net80211/ieee80211.c projects/mips/sys/net80211/ieee80211.h projects/mips/sys/net80211/ieee80211_adhoc.c projects/mips/sys/net80211/ieee80211_crypto.c projects/mips/sys/net80211/ieee80211_crypto.h projects/mips/sys/net80211/ieee80211_ddb.c projects/mips/sys/net80211/ieee80211_freebsd.c projects/mips/sys/net80211/ieee80211_freebsd.h projects/mips/sys/net80211/ieee80211_hostap.c projects/mips/sys/net80211/ieee80211_ht.c projects/mips/sys/net80211/ieee80211_ht.h projects/mips/sys/net80211/ieee80211_input.c projects/mips/sys/net80211/ieee80211_input.h projects/mips/sys/net80211/ieee80211_ioctl.c projects/mips/sys/net80211/ieee80211_ioctl.h projects/mips/sys/net80211/ieee80211_node.c projects/mips/sys/net80211/ieee80211_node.h projects/mips/sys/net80211/ieee80211_output.c projects/mips/sys/net80211/ieee80211_proto.c projects/mips/sys/net80211/ieee80211_proto.h projects/mips/sys/net80211/ieee80211_scan.c projects/mips/sys/net80211/ieee80211_scan.h projects/mips/sys/net80211/ieee80211_scan_sta.c projects/mips/sys/net80211/ieee80211_sta.c projects/mips/sys/net80211/ieee80211_var.h projects/mips/sys/net80211/ieee80211_wds.c projects/mips/sys/netgraph/atm/ng_atm.c projects/mips/sys/netgraph/bluetooth/socket/ng_btsocket.c projects/mips/sys/netgraph/netgraph.h projects/mips/sys/netgraph/ng_base.c projects/mips/sys/netgraph/ng_bridge.c projects/mips/sys/netgraph/ng_eiface.c projects/mips/sys/netgraph/ng_ether.c projects/mips/sys/netgraph/ng_gif.c projects/mips/sys/netgraph/ng_iface.c projects/mips/sys/netgraph/ng_pipe.c projects/mips/sys/netgraph/ng_socket.c projects/mips/sys/netgraph/ng_source.c projects/mips/sys/netinet/icmp6.h projects/mips/sys/netinet/icmp_var.h projects/mips/sys/netinet/if_ether.c projects/mips/sys/netinet/igmp.c projects/mips/sys/netinet/in.c projects/mips/sys/netinet/in_gif.c projects/mips/sys/netinet/in_mcast.c projects/mips/sys/netinet/in_pcb.c projects/mips/sys/netinet/in_pcb.h projects/mips/sys/netinet/in_proto.c projects/mips/sys/netinet/in_rmx.c projects/mips/sys/netinet/in_var.h projects/mips/sys/netinet/ip_carp.c projects/mips/sys/netinet/ip_divert.c projects/mips/sys/netinet/ip_fastfwd.c projects/mips/sys/netinet/ip_fw.h projects/mips/sys/netinet/ip_icmp.c projects/mips/sys/netinet/ip_input.c projects/mips/sys/netinet/ip_ipsec.c projects/mips/sys/netinet/ip_mroute.c projects/mips/sys/netinet/ip_options.c projects/mips/sys/netinet/ip_output.c projects/mips/sys/netinet/ip_var.h projects/mips/sys/netinet/ipfw/ip_dummynet.c (props changed) projects/mips/sys/netinet/ipfw/ip_fw2.c (contents, props changed) projects/mips/sys/netinet/ipfw/ip_fw_nat.c projects/mips/sys/netinet/ipfw/ip_fw_pfil.c (contents, props changed) projects/mips/sys/netinet/raw_ip.c projects/mips/sys/netinet/sctp_auth.c projects/mips/sys/netinet/sctp_indata.c projects/mips/sys/netinet/sctp_os_bsd.h projects/mips/sys/netinet/sctp_sysctl.c projects/mips/sys/netinet/sctp_sysctl.h projects/mips/sys/netinet/sctp_uio.h projects/mips/sys/netinet/sctputil.c projects/mips/sys/netinet/sctputil.h projects/mips/sys/netinet/tcp_hostcache.c projects/mips/sys/netinet/tcp_input.c projects/mips/sys/netinet/tcp_offload.c projects/mips/sys/netinet/tcp_offload.h projects/mips/sys/netinet/tcp_output.c projects/mips/sys/netinet/tcp_reass.c projects/mips/sys/netinet/tcp_sack.c projects/mips/sys/netinet/tcp_subr.c projects/mips/sys/netinet/tcp_syncache.c projects/mips/sys/netinet/tcp_syncache.h projects/mips/sys/netinet/tcp_timer.c projects/mips/sys/netinet/tcp_timewait.c projects/mips/sys/netinet/tcp_usrreq.c projects/mips/sys/netinet/tcp_var.h projects/mips/sys/netinet/udp_usrreq.c projects/mips/sys/netinet/udp_var.h projects/mips/sys/netinet6/dest6.c projects/mips/sys/netinet6/frag6.c projects/mips/sys/netinet6/icmp6.c projects/mips/sys/netinet6/in6.c projects/mips/sys/netinet6/in6_gif.c projects/mips/sys/netinet6/in6_ifattach.c projects/mips/sys/netinet6/in6_mcast.c projects/mips/sys/netinet6/in6_pcb.c projects/mips/sys/netinet6/in6_proto.c projects/mips/sys/netinet6/in6_rmx.c projects/mips/sys/netinet6/in6_src.c projects/mips/sys/netinet6/in6_var.h projects/mips/sys/netinet6/ip6_forward.c projects/mips/sys/netinet6/ip6_input.c projects/mips/sys/netinet6/ip6_ipsec.c projects/mips/sys/netinet6/ip6_mroute.c projects/mips/sys/netinet6/ip6_output.c projects/mips/sys/netinet6/ip6_var.h projects/mips/sys/netinet6/mld6.c projects/mips/sys/netinet6/nd6.c projects/mips/sys/netinet6/nd6.h projects/mips/sys/netinet6/nd6_nbr.c projects/mips/sys/netinet6/nd6_rtr.c projects/mips/sys/netinet6/raw_ip6.c projects/mips/sys/netinet6/raw_ip6.h projects/mips/sys/netinet6/route6.c projects/mips/sys/netinet6/scope6.c projects/mips/sys/netinet6/tcp6_var.h projects/mips/sys/netinet6/udp6_usrreq.c projects/mips/sys/netipsec/ah_var.h projects/mips/sys/netipsec/esp_var.h projects/mips/sys/netipsec/ipcomp_var.h projects/mips/sys/netipsec/ipip_var.h projects/mips/sys/netipsec/ipsec.c projects/mips/sys/netipsec/ipsec.h projects/mips/sys/netipsec/ipsec6.h projects/mips/sys/netipsec/ipsec_input.c projects/mips/sys/netipsec/ipsec_mbuf.c projects/mips/sys/netipsec/ipsec_output.c projects/mips/sys/netipsec/key.c projects/mips/sys/netipsec/key_debug.c projects/mips/sys/netipsec/key_debug.h projects/mips/sys/netipsec/keysock.c projects/mips/sys/netipsec/keysock.h projects/mips/sys/netipsec/xform_ah.c projects/mips/sys/netipsec/xform_esp.c projects/mips/sys/netipsec/xform_ipcomp.c projects/mips/sys/netipsec/xform_ipip.c projects/mips/sys/netipsec/xform_tcp.c projects/mips/sys/nfs/nfs_common.c projects/mips/sys/nfsclient/bootp_subr.c projects/mips/sys/nfsclient/nfs_bio.c projects/mips/sys/nfsclient/nfs_diskless.c projects/mips/sys/nfsclient/nfs_vnops.c projects/mips/sys/nfsclient/nfsmount.h projects/mips/sys/pc98/cbus/fdc.c projects/mips/sys/pc98/conf/GENERIC projects/mips/sys/pci/if_rlreg.h projects/mips/sys/powerpc/aim/mmu_oea64.c projects/mips/sys/powerpc/booke/pmap.c projects/mips/sys/powerpc/include/param.h projects/mips/sys/powerpc/include/pmap.h projects/mips/sys/powerpc/include/vm.h projects/mips/sys/powerpc/mpc85xx/lbc.h projects/mips/sys/rpc/clnt_rc.c projects/mips/sys/rpc/clnt_vc.c projects/mips/sys/security/audit/audit.c projects/mips/sys/security/audit/audit.h projects/mips/sys/security/audit/audit_arg.c projects/mips/sys/security/audit/audit_bsm.c projects/mips/sys/security/audit/audit_bsm_errno.c projects/mips/sys/security/audit/audit_bsm_klib.c projects/mips/sys/security/audit/audit_bsm_token.c projects/mips/sys/security/audit/audit_private.h projects/mips/sys/sparc64/conf/GENERIC projects/mips/sys/sparc64/include/param.h projects/mips/sys/sparc64/include/pmap.h projects/mips/sys/sparc64/include/vm.h projects/mips/sys/sparc64/sparc64/pmap.c projects/mips/sys/sun4v/conf/GENERIC projects/mips/sys/sun4v/include/param.h projects/mips/sys/sun4v/include/pmap.h projects/mips/sys/sun4v/include/vm.h projects/mips/sys/sun4v/sun4v/pmap.c projects/mips/sys/sys/bus.h projects/mips/sys/sys/disk.h projects/mips/sys/sys/domain.h projects/mips/sys/sys/jail.h projects/mips/sys/sys/kernel.h projects/mips/sys/sys/namei.h projects/mips/sys/sys/param.h projects/mips/sys/sys/pcpu.h projects/mips/sys/sys/priv.h projects/mips/sys/sys/proc.h projects/mips/sys/sys/signalvar.h projects/mips/sys/sys/sleepqueue.h projects/mips/sys/sys/socketvar.h projects/mips/sys/sys/sockio.h projects/mips/sys/sys/syscall.h projects/mips/sys/sys/syscall.mk projects/mips/sys/sys/syscallsubr.h projects/mips/sys/sys/sysctl.h projects/mips/sys/sys/sysproto.h projects/mips/sys/sys/ucred.h projects/mips/sys/sys/user.h projects/mips/sys/tools/sound/feeder_rate_mkfilter.awk projects/mips/sys/vm/device_pager.c projects/mips/sys/vm/pmap.h projects/mips/sys/vm/vm.h projects/mips/sys/vm/vm_contig.c projects/mips/sys/vm/vm_extern.h projects/mips/sys/vm/vm_fault.c projects/mips/sys/vm/vm_map.c projects/mips/sys/vm/vm_meter.c projects/mips/sys/vm/vm_mmap.c projects/mips/sys/vm/vm_object.c projects/mips/sys/vm/vm_object.h projects/mips/sys/vm/vm_page.c projects/mips/sys/vm/vm_pageout.c projects/mips/sys/vm/vm_pager.c projects/mips/sys/vm/vm_pager.h projects/mips/sys/vm/vm_phys.c projects/mips/sys/vm/vm_phys.h projects/mips/sys/xen/evtchn.h (props changed) projects/mips/sys/xen/evtchn/evtchn.c projects/mips/sys/xen/hypervisor.h (props changed) projects/mips/sys/xen/xen_intr.h (props changed) projects/mips/sys/xen/xenbus/xenbus_probe.c projects/mips/tools/regression/lib/msun/test-conj.t (props changed) projects/mips/tools/regression/usr.bin/jot/regress.sh projects/mips/tools/regression/usr.bin/pkill/pgrep-_g.t (props changed) projects/mips/tools/regression/usr.bin/pkill/pgrep-_s.t (props changed) projects/mips/tools/regression/usr.bin/pkill/pkill-_g.t (props changed) projects/mips/tools/tools/ath/common/dumpregs.h (props changed) projects/mips/tools/tools/ath/common/dumpregs_5210.c (props changed) projects/mips/tools/tools/ath/common/dumpregs_5211.c (props changed) projects/mips/tools/tools/ath/common/dumpregs_5212.c (props changed) projects/mips/tools/tools/ath/common/dumpregs_5416.c (props changed) projects/mips/tools/tools/nanobsd/gateworks/G2348 projects/mips/tools/tools/nanobsd/gateworks/G2358 projects/mips/tools/tools/net80211/scripts/config projects/mips/tools/tools/net80211/stumbler/stumbler.c projects/mips/tools/tools/net80211/w00t/README projects/mips/tools/tools/net80211/w00t/ap/ap.c projects/mips/tools/tools/net80211/w00t/assoc/assoc.c projects/mips/tools/tools/net80211/w00t/expand/expand.c projects/mips/tools/tools/net80211/w00t/prga/prga.c projects/mips/tools/tools/net80211/w00t/redir/redir.c projects/mips/tools/tools/net80211/wesside/wesside/wesside.c projects/mips/tools/tools/net80211/wlaninject/wlaninject.c projects/mips/tools/tools/net80211/wlanstats/wlanstats.c projects/mips/tools/tools/vimage/Makefile projects/mips/tools/tools/vimage/vimage.c projects/mips/usr.bin/calendar/calendars/calendar.freebsd projects/mips/usr.bin/cpio/cmdline.c projects/mips/usr.bin/cpio/cpio.c projects/mips/usr.bin/cpio/test/test_owner_parse.c projects/mips/usr.bin/csup/ (props changed) projects/mips/usr.bin/fstat/fstat.1 projects/mips/usr.bin/gzip/gzip.c projects/mips/usr.bin/jot/jot.c projects/mips/usr.bin/kdump/mkioctls projects/mips/usr.bin/less/Makefile projects/mips/usr.bin/locate/locate/fastfind.c projects/mips/usr.bin/locate/locate/locate.c projects/mips/usr.bin/mklocale/yacc.y projects/mips/usr.bin/netstat/netstat.1 projects/mips/usr.bin/procstat/ (props changed) projects/mips/usr.bin/procstat/procstat_cred.c projects/mips/usr.bin/procstat/procstat_vm.c projects/mips/usr.bin/sockstat/sockstat.1 projects/mips/usr.sbin/acpi/acpidump/acpi.c projects/mips/usr.sbin/acpi/acpidump/acpidump.h projects/mips/usr.sbin/bsnmpd/modules/Makefile.inc projects/mips/usr.sbin/dumpcis/cardinfo.h (props changed) projects/mips/usr.sbin/dumpcis/cis.h (props changed) projects/mips/usr.sbin/getpmac/getpmac.c projects/mips/usr.sbin/jail/jail.8 projects/mips/usr.sbin/jail/jail.c projects/mips/usr.sbin/jls/jls.8 projects/mips/usr.sbin/jls/jls.c projects/mips/usr.sbin/makefs/ffs/ffs_bswap.c (props changed) projects/mips/usr.sbin/makefs/ffs/ffs_subr.c (props changed) projects/mips/usr.sbin/makefs/ffs/ufs_bswap.h (props changed) projects/mips/usr.sbin/makefs/getid.c (props changed) projects/mips/usr.sbin/pkg_install/add/perform.c projects/mips/usr.sbin/ppp/nat_cmd.c projects/mips/usr.sbin/ppp/ppp.8.m4 projects/mips/usr.sbin/sysinstall/disks.c projects/mips/usr.sbin/sysinstall/dispatch.c projects/mips/usr.sbin/sysinstall/dist.c projects/mips/usr.sbin/sysinstall/help/usage.hlp projects/mips/usr.sbin/sysinstall/install.c projects/mips/usr.sbin/sysinstall/label.c projects/mips/usr.sbin/sysinstall/menus.c projects/mips/usr.sbin/sysinstall/sysinstall.h projects/mips/usr.sbin/sysinstall/user.c projects/mips/usr.sbin/tzsetup/tzsetup.8 projects/mips/usr.sbin/tzsetup/tzsetup.c projects/mips/usr.sbin/wlandebug/wlandebug.8 projects/mips/usr.sbin/wlandebug/wlandebug.c projects/mips/usr.sbin/wpa/hostapd/hostapd.8 projects/mips/usr.sbin/wpa/hostapd/hostapd.conf.5 projects/mips/usr.sbin/wpa/hostapd_cli/hostapd_cli.8 projects/mips/usr.sbin/wpa/wpa_cli/wpa_cli.8 projects/mips/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8 projects/mips/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 projects/mips/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 projects/mips/usr.sbin/zic/ (props changed) Modified: projects/mips/MAINTAINERS ============================================================================== --- projects/mips/MAINTAINERS Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/MAINTAINERS Tue Aug 4 18:22:58 2009 (r196062) @@ -111,7 +111,7 @@ truss alfred Will be happy to review co rpc alfred Pre-commit review requested. xfs kan@FreeBSD.org,rodrigc@FreeBSD.org,cattelan@xfs.org Pre-commit review preferred. -pkg_install krion Pre-commit review or approval from portmgr@ requested. +pkg_install portmgr Pre-commit review or approval from portmgr@ requested. linux emul emulation Please discuss changes here. bs{diff,patch} cperciva Pre-commit review requested. portsnap cperciva Pre-commit review requested. @@ -123,7 +123,6 @@ lib/libsdp emax Pre-commit review prefe usr.bin/bluetooth emax Pre-commit review preferred. usr.sbin/bluetooth emax Pre-commit review preferred. gnu/usr.bin/send-pr bugmaster Pre-commit review requested. -BSD.{local,x11*}.dist portmgr Pre-commit review requested, since these files interface with ports. ncurses rafan Heads-up appreciated, try not to break it. Following are the entries from the Makefiles, and a few other sources. Modified: projects/mips/Makefile.inc1 ============================================================================== --- projects/mips/Makefile.inc1 Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/Makefile.inc1 Tue Aug 4 18:22:58 2009 (r196062) @@ -1069,7 +1069,7 @@ libraries: # # static libgcc.a prerequisite for shared libc # -_prereq_libs= gnu/lib/libgcc +_prereq_libs= gnu/lib/libssp/libssp_nonshared gnu/lib/libgcc # These dependencies are not automatically generated: # Modified: projects/mips/ObsoleteFiles.inc ============================================================================== --- projects/mips/ObsoleteFiles.inc Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/ObsoleteFiles.inc Tue Aug 4 18:22:58 2009 (r196062) @@ -14,6 +14,232 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090801: vimage.h removed in favour of vnet.h +OLD_FILES+=usr/include/sys/vimage.h +# 20090719: library version bump for 8.0 +OLD_LIBS+=lib/libalias.so.6 +OLD_LIBS+=lib/libavl.so.1 +OLD_LIBS+=lib/libbegemot.so.3 +OLD_LIBS+=lib/libbsdxml.so.3 +OLD_LIBS+=lib/libbsnmp.so.4 +OLD_LIBS+=lib/libcam.so.4 +OLD_LIBS+=lib/libcrypt.so.4 +OLD_LIBS+=lib/libcrypto.so.5 +OLD_LIBS+=lib/libctf.so.1 +OLD_LIBS+=lib/libdevstat.so.6 +OLD_LIBS+=lib/libdtrace.so.1 +OLD_LIBS+=lib/libedit.so.6 +OLD_LIBS+=lib/libgeom.so.4 +OLD_LIBS+=lib/libipsec.so.3 +OLD_LIBS+=lib/libipx.so.4 +OLD_LIBS+=lib/libkiconv.so.3 +OLD_LIBS+=lib/libkvm.so.4 +OLD_LIBS+=lib/libmd.so.4 +OLD_LIBS+=lib/libncurses.so.7 +OLD_LIBS+=lib/libncursesw.so.7 +OLD_LIBS+=lib/libnvpair.so.1 +OLD_LIBS+=lib/libpcap.so.6 +OLD_LIBS+=lib/libreadline.so.7 +OLD_LIBS+=lib/libsbuf.so.4 +OLD_LIBS+=lib/libufs.so.4 +OLD_LIBS+=lib/libumem.so.1 +OLD_LIBS+=lib/libutil.so.7 +OLD_LIBS+=lib/libuutil.so.1 +OLD_LIBS+=lib/libz.so.4 +OLD_LIBS+=lib/libzfs.so.1 +OLD_LIBS+=lib/libzpool.so.1 +OLD_LIBS+=usr/lib/libarchive.so.4 +OLD_LIBS+=usr/lib/libauditd.so.4 +OLD_LIBS+=usr/lib/libbluetooth.so.3 +OLD_LIBS+=usr/lib/libbsm.so.2 +OLD_LIBS+=usr/lib/libbz2.so.3 +OLD_LIBS+=usr/lib/libcalendar.so.4 +OLD_LIBS+=usr/lib/libcom_err.so.4 +OLD_LIBS+=usr/lib/libdevinfo.so.4 +OLD_LIBS+=usr/lib/libdialog.so.6 +OLD_LIBS+=usr/lib/libdwarf.so.1 +OLD_LIBS+=usr/lib/libfetch.so.5 +OLD_LIBS+=usr/lib/libform.so.4 +OLD_LIBS+=usr/lib/libformw.so.4 +OLD_LIBS+=usr/lib/libftpio.so.7 +OLD_LIBS+=usr/lib/libgnuregex.so.4 +OLD_LIBS+=usr/lib/libgpib.so.2 +OLD_LIBS+=usr/lib/libhistory.so.7 +OLD_LIBS+=usr/lib/libmagic.so.3 +OLD_LIBS+=usr/lib/libmemstat.so.2 +OLD_LIBS+=usr/lib/libmenu.so.4 +OLD_LIBS+=usr/lib/libmenuw.so.4 +OLD_LIBS+=usr/lib/libmilter.so.4 +OLD_LIBS+=usr/lib/libncp.so.3 +OLD_LIBS+=usr/lib/libnetgraph.so.3 +OLD_LIBS+=usr/lib/libngatm.so.3 +OLD_LIBS+=usr/lib/libobjc.so.3 +OLD_LIBS+=usr/lib/libopie.so.5 +OLD_LIBS+=usr/lib/libpam.so.4 +OLD_LIBS+=usr/lib/libpanel.so.4 +OLD_LIBS+=usr/lib/libpanelw.so.4 +OLD_LIBS+=usr/lib/libpmc.so.4 +OLD_LIBS+=usr/lib/libproc.so.1 +OLD_LIBS+=usr/lib/libradius.so.3 +OLD_LIBS+=usr/lib/librpcsvc.so.4 +OLD_LIBS+=usr/lib/libsdp.so.3 +OLD_LIBS+=usr/lib/libsmb.so.3 +OLD_LIBS+=usr/lib/libssh.so.4 +OLD_LIBS+=usr/lib/libssl.so.5 +OLD_LIBS+=usr/lib/libtacplus.so.3 +OLD_LIBS+=usr/lib/libugidfw.so.3 +OLD_LIBS+=usr/lib/libusb.so.1 +OLD_LIBS+=usr/lib/libusbhid.so.3 +OLD_LIBS+=usr/lib/libvgl.so.5 +OLD_LIBS+=usr/lib/libwrap.so.5 +OLD_LIBS+=usr/lib/libypclnt.so.3 +OLD_LIBS+=usr/lib/pam_chroot.so.4 +OLD_LIBS+=usr/lib/pam_deny.so.4 +OLD_LIBS+=usr/lib/pam_echo.so.4 +OLD_LIBS+=usr/lib/pam_exec.so.4 +OLD_LIBS+=usr/lib/pam_ftpusers.so.4 +OLD_LIBS+=usr/lib/pam_group.so.4 +OLD_LIBS+=usr/lib/pam_guest.so.4 +OLD_LIBS+=usr/lib/pam_krb5.so.4 +OLD_LIBS+=usr/lib/pam_ksu.so.4 +OLD_LIBS+=usr/lib/pam_lastlog.so.4 +OLD_LIBS+=usr/lib/pam_login_access.so.4 +OLD_LIBS+=usr/lib/pam_nologin.so.4 +OLD_LIBS+=usr/lib/pam_opie.so.4 +OLD_LIBS+=usr/lib/pam_opieaccess.so.4 +OLD_LIBS+=usr/lib/pam_passwdqc.so.4 +OLD_LIBS+=usr/lib/pam_permit.so.4 +OLD_LIBS+=usr/lib/pam_radius.so.4 +OLD_LIBS+=usr/lib/pam_rhosts.so.4 +OLD_LIBS+=usr/lib/pam_rootok.so.4 +OLD_LIBS+=usr/lib/pam_securetty.so.4 +OLD_LIBS+=usr/lib/pam_self.so.4 +OLD_LIBS+=usr/lib/pam_ssh.so.4 +OLD_LIBS+=usr/lib/pam_tacplus.so.4 +OLD_LIBS+=usr/lib/pam_unix.so.4 +OLD_LIBS+=usr/lib/snmp_atm.so.5 +OLD_LIBS+=usr/lib/snmp_bridge.so.5 +OLD_LIBS+=usr/lib/snmp_hostres.so.5 +OLD_LIBS+=usr/lib/snmp_mibII.so.5 +OLD_LIBS+=usr/lib/snmp_netgraph.so.5 +OLD_LIBS+=usr/lib/snmp_pf.so.5 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libalias.so.6 +OLD_LIBS+=usr/lib32/libarchive.so.4 +OLD_LIBS+=usr/lib32/libauditd.so.4 +OLD_LIBS+=usr/lib32/libavl.so.1 +OLD_LIBS+=usr/lib32/libbegemot.so.3 +OLD_LIBS+=usr/lib32/libbluetooth.so.3 +OLD_LIBS+=usr/lib32/libbsdxml.so.3 +OLD_LIBS+=usr/lib32/libbsm.so.2 +OLD_LIBS+=usr/lib32/libbsnmp.so.4 +OLD_LIBS+=usr/lib32/libbz2.so.3 +OLD_LIBS+=usr/lib32/libcalendar.so.4 +OLD_LIBS+=usr/lib32/libcam.so.4 +OLD_LIBS+=usr/lib32/libcom_err.so.4 +OLD_LIBS+=usr/lib32/libcrypt.so.4 +OLD_LIBS+=usr/lib32/libcrypto.so.5 +OLD_LIBS+=usr/lib32/libctf.so.1 +OLD_LIBS+=usr/lib32/libdevinfo.so.4 +OLD_LIBS+=usr/lib32/libdevstat.so.6 +OLD_LIBS+=usr/lib32/libdialog.so.6 +OLD_LIBS+=usr/lib32/libdtrace.so.1 +OLD_LIBS+=usr/lib32/libdwarf.so.1 +OLD_LIBS+=usr/lib32/libedit.so.6 +OLD_LIBS+=usr/lib32/libfetch.so.5 +OLD_LIBS+=usr/lib32/libform.so.4 +OLD_LIBS+=usr/lib32/libformw.so.4 +OLD_LIBS+=usr/lib32/libftpio.so.7 +OLD_LIBS+=usr/lib32/libgeom.so.4 +OLD_LIBS+=usr/lib32/libgnuregex.so.4 +OLD_LIBS+=usr/lib32/libgpib.so.2 +OLD_LIBS+=usr/lib32/libhistory.so.7 +OLD_LIBS+=usr/lib32/libipsec.so.3 +OLD_LIBS+=usr/lib32/libipx.so.4 +OLD_LIBS+=usr/lib32/libkiconv.so.3 +OLD_LIBS+=usr/lib32/libkvm.so.4 +OLD_LIBS+=usr/lib32/libmagic.so.3 +OLD_LIBS+=usr/lib32/libmd.so.4 +OLD_LIBS+=usr/lib32/libmemstat.so.2 +OLD_LIBS+=usr/lib32/libmenu.so.4 +OLD_LIBS+=usr/lib32/libmenuw.so.4 +OLD_LIBS+=usr/lib32/libmilter.so.4 +OLD_LIBS+=usr/lib32/libncp.so.3 +OLD_LIBS+=usr/lib32/libncurses.so.7 +OLD_LIBS+=usr/lib32/libncursesw.so.7 +OLD_LIBS+=usr/lib32/libnetgraph.so.3 +OLD_LIBS+=usr/lib32/libngatm.so.3 +OLD_LIBS+=usr/lib32/libnvpair.so.1 +OLD_LIBS+=usr/lib32/libobjc.so.3 +OLD_LIBS+=usr/lib32/libopie.so.5 +OLD_LIBS+=usr/lib32/libpam.so.4 +OLD_LIBS+=usr/lib32/libpanel.so.4 +OLD_LIBS+=usr/lib32/libpanelw.so.4 +OLD_LIBS+=usr/lib32/libpcap.so.6 +OLD_LIBS+=usr/lib32/libpmc.so.4 +OLD_LIBS+=usr/lib32/libproc.so.1 +OLD_LIBS+=usr/lib32/libradius.so.3 +OLD_LIBS+=usr/lib32/libreadline.so.7 +OLD_LIBS+=usr/lib32/librpcsvc.so.4 +OLD_LIBS+=usr/lib32/libsbuf.so.4 +OLD_LIBS+=usr/lib32/libsdp.so.3 +OLD_LIBS+=usr/lib32/libsmb.so.3 +OLD_LIBS+=usr/lib32/libssh.so.4 +OLD_LIBS+=usr/lib32/libssl.so.5 +OLD_LIBS+=usr/lib32/libtacplus.so.3 +OLD_LIBS+=usr/lib32/libufs.so.4 +OLD_LIBS+=usr/lib32/libugidfw.so.3 +OLD_LIBS+=usr/lib32/libumem.so.1 +OLD_LIBS+=usr/lib32/libusb.so.1 +OLD_LIBS+=usr/lib32/libusbhid.so.3 +OLD_LIBS+=usr/lib32/libutil.so.7 +OLD_LIBS+=usr/lib32/libuutil.so.1 +OLD_LIBS+=usr/lib32/libvgl.so.5 +OLD_LIBS+=usr/lib32/libwrap.so.5 +OLD_LIBS+=usr/lib32/libypclnt.so.3 +OLD_LIBS+=usr/lib32/libz.so.4 +OLD_LIBS+=usr/lib32/libzfs.so.1 +OLD_LIBS+=usr/lib32/libzpool.so.1 +OLD_LIBS+=usr/lib32/pam_chroot.so.4 +OLD_LIBS+=usr/lib32/pam_deny.so.4 +OLD_LIBS+=usr/lib32/pam_echo.so.4 +OLD_LIBS+=usr/lib32/pam_exec.so.4 +OLD_LIBS+=usr/lib32/pam_ftpusers.so.4 +OLD_LIBS+=usr/lib32/pam_group.so.4 +OLD_LIBS+=usr/lib32/pam_guest.so.4 +OLD_LIBS+=usr/lib32/pam_krb5.so.4 +OLD_LIBS+=usr/lib32/pam_ksu.so.4 +OLD_LIBS+=usr/lib32/pam_lastlog.so.4 +OLD_LIBS+=usr/lib32/pam_login_access.so.4 +OLD_LIBS+=usr/lib32/pam_nologin.so.4 +OLD_LIBS+=usr/lib32/pam_opie.so.4 +OLD_LIBS+=usr/lib32/pam_opieaccess.so.4 +OLD_LIBS+=usr/lib32/pam_passwdqc.so.4 +OLD_LIBS+=usr/lib32/pam_permit.so.4 +OLD_LIBS+=usr/lib32/pam_radius.so.4 +OLD_LIBS+=usr/lib32/pam_rhosts.so.4 +OLD_LIBS+=usr/lib32/pam_rootok.so.4 +OLD_LIBS+=usr/lib32/pam_securetty.so.4 +OLD_LIBS+=usr/lib32/pam_self.so.4 +OLD_LIBS+=usr/lib32/pam_ssh.so.4 +OLD_LIBS+=usr/lib32/pam_tacplus.so.4 +OLD_LIBS+=usr/lib32/pam_unix.so.4 +.endif +# 20090718: the gdm pam.d file is no longer required. +OLD_FILES+=etc/pam.d/gdm +# 20090713: vimage container structs removed. +OLD_FILES+=usr/include/netinet/vinet.h +OLD_FILES+=usr/include/netinet6/vinet6.h +OLD_FILES+=usr/include/netipsec/vipsec.h +# 20090712: ieee80211.4 -> net80211.4 +OLD_FILES+=usr/share/man/man4/ieee80211.4.gz +# 20090711: typo fixed, kproc_resume,.9 -> kproc_resume.9 +OLD_FILES+=usr/share/man/man9/kproc_resume,.9.gz +# 20090709: msgctl.3 msgget.3 msgrcv.3 msgsnd.3 manual pages moved +OLD_FILES+=usr/share/man/man3/msgctl.3.gz +OLD_FILES+=usr/share/man/man3/msgget.3.gz +OLD_FILES+=usr/share/man/man3/msgrcv.3.gz +OLD_FILES+=usr/share/man/man3/msgsnd.3.gz # 20090630: old kernel RPC implementation removal OLD_FILES+=usr/include/nfs/rpcv2.h # 20090624: update usbdi(9) @@ -263,8 +489,6 @@ OLD_FILES+=usr/include/dev/usb/usb_mem.h OLD_FILES+=usr/include/dev/usb/usb_port.h OLD_FILES+=usr/include/dev/usb/usb_quirks.h OLD_FILES+=usr/include/dev/usb/usbcdc.h -OLD_FILES+=usr/include/dev/usb/usbdi.h -OLD_FILES+=usr/include/dev/usb/usbdi_util.h OLD_FILES+=usr/include/dev/usb/usbdivar.h OLD_FILES+=usr/include/dev/usb/uxb360gp_rdesc.h # 20090203: removal of pccard header files @@ -1852,7 +2076,6 @@ OLD_FILES+=usr/sbin/kenv OLD_FILES+=usr/bin/kenv OLD_FILES+=usr/sbin/elf2aout # 200210XX -OLD_FILES+=usr/include/libusb.h OLD_FILES+=usr/include/libusbhid.h OLD_FILES+=usr/share/man/man3/All_FreeBSD.3.gz OLD_FILES+=usr/share/man/man3/CheckRules.3.gz Modified: projects/mips/UPDATING ============================================================================== --- projects/mips/UPDATING Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/UPDATING Tue Aug 4 18:22:58 2009 (r196062) @@ -22,6 +22,30 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090719: + Bump the shared library version numbers for all libraries that + do not use symbol versioning as part of the 8.0-RELEASE cycle. + Bump __FreeBSD_version to 800105. + +20090714: + Due to changes in the implementation of virtual network stack + support, all network-related kernel modules must be recompiled. + As this change breaks the ABI, bump __FreeBSD_version to 800104. + +20090713: + The TOE interface to the TCP syncache has been modified to remove struct + tcpopt () from the ABI of the network stack. The + cxgb driver is the only TOE consumer affected by this change, and needs + to be recompiled along with the kernel. As this change breaks the ABI, + bump __FreeBSD_version to 800103. + +20090712: + Padding has been added to struct tcpcb, sackhint and tcpstat in + to facilitate future MFCs and bug fixes whilst + maintainig the ABI. However, this change breaks the ABI, so bump + __FreeBSD_version to 800102. User space tools that rely on the size of + any of these structs (e.g. sockstat) need to be recompiled. + 20090630: The NFS_LEGACYRPC option has been removed along with the old kernel RPC implementation that this option selected. Kernel @@ -41,9 +65,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. 20090624: The ABI of various structures related to the SYSV IPC API have - been changed. As a result, the COMPAT_FREEBSD[456] kernel - options now all require COMPAT_FREEBSD7. Bump __FreeBSD_version - to 800100. + been changed. As a result, the COMPAT_FREEBSD[456] and COMPAT_43 + kernel options now all require COMPAT_FREEBSD7. + Bump __FreeBSD_version to 800100. 20090622: Layout of struct vnet has changed as routing related variables Modified: projects/mips/bin/ln/ln.1 ============================================================================== --- projects/mips/bin/ln/ln.1 Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/bin/ln/ln.1 Tue Aug 4 18:22:58 2009 (r196062) @@ -32,7 +32,7 @@ .\" @(#)ln.1 8.2 (Berkeley) 12/30/93 .\" $FreeBSD$ .\" -.Dd June 6, 2008 +.Dd July 17, 2009 .Dt LN 1 .Os .Sh NAME @@ -41,13 +41,13 @@ .Nd link files .Sh SYNOPSIS .Nm -.Op Fl s Op Fl F +.Op Fl L | Fl P | Fl s Op Fl F .Op Fl f | iw .Op Fl hnv .Ar source_file .Op Ar target_file .Nm -.Op Fl s Op Fl F +.Op Fl L | Fl P | Fl s Op Fl F .Op Fl f | iw .Op Fl hnv .Ar source_file ... @@ -77,16 +77,6 @@ to a file is one of the differences betw .Pp The options are as follows: .Bl -tag -width flag -.It Fl f -If the target file already exists, -then unlink it so that the link may occur. -(The -.Fl f -option overrides any previous -.Fl i -and -.Fl w -options.) .It Fl F If the target file already exists and is a directory, then remove it so that the link may occur. @@ -105,6 +95,29 @@ The option is a no-op unless .Fl s option is specified. +.It Fl L +When creating a hard link to a symbolic link, +create a hard link to the target of the symbolic link. +This is the default. +This option cancels the +.Fl P +option. +.It Fl P +When creating a hard link to a symbolic link, +create a hard link to the symbolic link itself. +This option cancels the +.Fl L +option. +.It Fl f +If the target file already exists, +then unlink it so that the link may occur. +(The +.Fl f +option overrides any previous +.Fl i +and +.Fl w +options.) .It Fl h If the .Ar target_file Modified: projects/mips/bin/ln/ln.c ============================================================================== --- projects/mips/bin/ln/ln.c Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/bin/ln/ln.c Tue Aug 4 18:22:58 2009 (r196062) @@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -56,12 +57,11 @@ int fflag; /* Unlink existing files. int Fflag; /* Remove empty directories also. */ int hflag; /* Check new name for symlink first. */ int iflag; /* Interactive mode. */ +int Pflag; /* Create hard links to symlinks. */ int sflag; /* Symbolic, not hard, link. */ int vflag; /* Verbose output. */ int wflag; /* Warn if symlink target does not * exist, and -f is not enabled. */ - /* System link call. */ -int (*linkf)(const char *, const char *); char linkch; int linkit(const char *, const char *, int); @@ -90,15 +90,20 @@ main(int argc, char *argv[]) argv += optind; if (argc != 2) usage(); - linkf = link; exit(linkit(argv[0], argv[1], 0)); } - while ((ch = getopt(argc, argv, "Ffhinsvw")) != -1) + while ((ch = getopt(argc, argv, "FLPfhinsvw")) != -1) switch (ch) { case 'F': Fflag = 1; break; + case 'L': + Pflag = 0; + break; + case 'P': + Pflag = 1; + break; case 'f': fflag = 1; iflag = 0; @@ -129,7 +134,6 @@ main(int argc, char *argv[]) argv += optind; argc -= optind; - linkf = sflag ? symlink : link; linkch = sflag ? '-' : '='; if (sflag == 0) Fflag = 0; @@ -179,7 +183,7 @@ linkit(const char *source, const char *t if (!sflag) { /* If source doesn't exist, quit now. */ - if (stat(source, &sb)) { + if ((Pflag ? lstat : stat)(source, &sb)) { warn("%s", source); return (1); } @@ -276,7 +280,9 @@ linkit(const char *source, const char *t } /* Attempt the link. */ - if ((*linkf)(source, target)) { + if (sflag ? symlink(source, target) : + linkat(AT_FDCWD, source, AT_FDCWD, target, + Pflag ? 0 : AT_SYMLINK_FOLLOW)) { warn("%s", target); return (1); } @@ -289,8 +295,8 @@ void usage(void) { (void)fprintf(stderr, "%s\n%s\n%s\n", - "usage: ln [-s [-F]] [-f | -i] [-hnv] source_file [target_file]", - " ln [-s [-F]] [-f | -i] [-hnv] source_file ... target_dir", + "usage: ln [-s [-F] | -L | -P] [-f | -i] [-hnv] source_file [target_file]", + " ln [-s [-F] | -L | -P] [-f | -i] [-hnv] source_file ... target_dir", " link source_file target_file"); exit(1); } Modified: projects/mips/bin/ps/ps.1 ============================================================================== --- projects/mips/bin/ps/ps.1 Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/bin/ps/ps.1 Tue Aug 4 18:22:58 2009 (r196062) @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd May 16, 2009 +.Dd July 9, 2009 .Dt PS 1 .Os .Sh NAME @@ -637,6 +637,7 @@ the mount point of .Xr kill 1 , .Xr pgrep 1 , .Xr pkill 1 , +.Xr procstat 1 , .Xr w 1 , .Xr kvm 3 , .Xr strftime 3 , Modified: projects/mips/bin/ps/ps.c ============================================================================== --- projects/mips/bin/ps/ps.c Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/bin/ps/ps.c Tue Aug 4 18:22:58 2009 (r196062) @@ -1331,7 +1331,7 @@ check_procfs(void) static void usage(void) { -#define SINGLE_OPTS "[-aCce" OPT_LAZY_f "HhjlmrSTuvwXxZ]" +#define SINGLE_OPTS "[-aCcde" OPT_LAZY_f "HhjlmrSTuvwXxZ]" (void)fprintf(stderr, "%s\n%s\n%s\n%s\n", "usage: ps " SINGLE_OPTS " [-O fmt | -o fmt] [-G gid[,gid...]]", Modified: projects/mips/cddl/contrib/opensolaris/head/thread.h ============================================================================== --- projects/mips/cddl/contrib/opensolaris/head/thread.h Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/cddl/contrib/opensolaris/head/thread.h Tue Aug 4 18:22:58 2009 (r196062) @@ -53,7 +53,6 @@ typedef pthread_rwlock_t rwlock_t; #define mutex_lock(l) pthread_mutex_lock(l) #define mutex_trylock(l) pthread_mutex_trylock(l) #define mutex_unlock(l) pthread_mutex_unlock(l) -#define mutex_owned(l) pthread_mutex_isowned_np(l) #define rwlock_init(l,f,a) pthread_rwlock_init(l,NULL) #define rwlock_destroy(l) pthread_rwlock_destroy(l) #define rw_rdlock(l) pthread_rwlock_rdlock(l) Modified: projects/mips/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c ============================================================================== --- projects/mips/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Tue Aug 4 18:22:58 2009 (r196062) @@ -115,6 +115,14 @@ zmutex_destroy(kmutex_t *mp) mp->initialized = B_FALSE; } +int +zmutex_owned(kmutex_t *mp) +{ + ASSERT(mp->initialized == B_TRUE); + + return (mp->m_owner == curthread); +} + void mutex_enter(kmutex_t *mp) { Modified: projects/mips/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h ============================================================================== --- projects/mips/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Tue Aug 4 18:22:58 2009 (r196062) @@ -237,9 +237,11 @@ typedef struct kmutex { #define mutex_init(mp, b, c, d) zmutex_init((kmutex_t *)(mp)) #define mutex_destroy(mp) zmutex_destroy((kmutex_t *)(mp)) +#define mutex_owned(mp) zmutex_owned((kmutex_t *)(mp)) extern void zmutex_init(kmutex_t *mp); extern void zmutex_destroy(kmutex_t *mp); +extern int zmutex_owned(kmutex_t *mp); extern void mutex_enter(kmutex_t *mp); extern void mutex_exit(kmutex_t *mp); extern int mutex_tryenter(kmutex_t *mp); Modified: projects/mips/cddl/lib/Makefile.inc ============================================================================== --- projects/mips/cddl/lib/Makefile.inc Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/cddl/lib/Makefile.inc Tue Aug 4 18:22:58 2009 (r196062) @@ -1,6 +1,6 @@ # $FreeBSD$ SHLIBDIR?= /lib -SHLIB_MAJOR?= 1 +SHLIB_MAJOR?= 2 .include "../Makefile.inc" Modified: projects/mips/cddl/lib/libctf/Makefile ============================================================================== --- projects/mips/cddl/lib/libctf/Makefile Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/cddl/lib/libctf/Makefile Tue Aug 4 18:22:58 2009 (r196062) @@ -3,7 +3,7 @@ .include "../../Makefile.inc" LIB= ctf -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 SRCS= ctf_create.c \ ctf_decl.c \ Modified: projects/mips/cddl/lib/libdtrace/Makefile ============================================================================== --- projects/mips/cddl/lib/libdtrace/Makefile Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/cddl/lib/libdtrace/Makefile Tue Aug 4 18:22:58 2009 (r196062) @@ -3,7 +3,7 @@ .include "../../Makefile.inc" LIB= dtrace -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 WARNS= 1 Modified: projects/mips/contrib/amd/amd/get_args.c ============================================================================== --- projects/mips/contrib/amd/amd/get_args.c Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/amd/amd/get_args.c Tue Aug 4 18:22:58 2009 (r196062) @@ -96,8 +96,8 @@ get_version_string(void) xsnprintf(tmpbuf, sizeof(tmpbuf), "Configured by %s@%s on date %s.\n", USER_NAME, HOST_NAME, CONFIG_DATE); strlcat(vers, tmpbuf, len); - xsnprintf(tmpbuf, sizeof(tmpbuf), "Built by %s@%s on date %s.\n", - BUILD_USER, BUILD_HOST, BUILD_DATE); + xsnprintf(tmpbuf, sizeof(tmpbuf), "Built by %s@%s.\n", + BUILD_USER, BUILD_HOST); strlcat(vers, tmpbuf, len); xsnprintf(tmpbuf, sizeof(tmpbuf), "cpu=%s (%s-endian), arch=%s, karch=%s.\n", cpu, endian, gopt.arch, gopt.karch); Modified: projects/mips/contrib/bind9/CHANGES ============================================================================== --- projects/mips/contrib/bind9/CHANGES Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/bind9/CHANGES Tue Aug 4 18:22:58 2009 (r196062) @@ -1,3 +1,7 @@ + --- 9.6.1-P1 released --- + +2640. [security] A specially crafted update packet will cause named + to exit. [RT #20000] --- 9.6.1 released --- Modified: projects/mips/contrib/bind9/bin/named/update.c ============================================================================== --- projects/mips/contrib/bind9/bin/named/update.c Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/bind9/bin/named/update.c Tue Aug 4 18:22:58 2009 (r196062) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: update.c,v 1.151.12.5 2009/04/30 07:03:37 marka Exp $ */ +/* $Id: update.c,v 1.151.12.5.12.1 2009/07/28 14:18:08 marka Exp $ */ #include @@ -979,7 +979,11 @@ temp_check(isc_mem_t *mctx, dns_diff_t * if (type == dns_rdatatype_rrsig || type == dns_rdatatype_sig) covers = dns_rdata_covers(&t->rdata); - else + else if (type == dns_rdatatype_any) { + dns_db_detachnode(db, &node); + dns_diff_clear(&trash); + return (DNS_R_NXRRSET); + } else covers = 0; /* Modified: projects/mips/contrib/bind9/version ============================================================================== --- projects/mips/contrib/bind9/version Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/bind9/version Tue Aug 4 18:22:58 2009 (r196062) @@ -1,4 +1,4 @@ -# $Id: version,v 1.43.12.5 2009/06/04 04:02:41 marka Exp $ +# $Id: version,v 1.43.12.5.8.1 2009/07/28 14:18:08 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -6,5 +6,5 @@ MAJORVER=9 MINORVER=6 PATCHVER=1 -RELEASETYPE= -RELEASEVER= +RELEASETYPE=-P +RELEASEVER=1 Modified: projects/mips/contrib/gcc/config/freebsd-spec.h ============================================================================== --- projects/mips/contrib/gcc/config/freebsd-spec.h Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/gcc/config/freebsd-spec.h Tue Aug 4 18:22:58 2009 (r196062) @@ -168,6 +168,7 @@ is built with the --enable-threads confi %{pg: %{pthread:-lpthread_p} -lc_p}} \ %{shared: \ %{pthread:-lpthread} -lc} \ + %{fstack-protector|fstack-protector-all:-lssp_nonshared} \ " #endif #endif Modified: projects/mips/contrib/gcc/dwarf2out.c ============================================================================== --- projects/mips/contrib/gcc/dwarf2out.c Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/gcc/dwarf2out.c Tue Aug 4 18:22:58 2009 (r196062) @@ -10007,7 +10007,7 @@ reference_to_unused (tree * tp, int * wa return NULL_TREE; else if (!cgraph_global_info_ready && (TREE_CODE (*tp) == VAR_DECL || TREE_CODE (*tp) == FUNCTION_DECL)) - gcc_unreachable (); + return *tp; else if (DECL_P (*tp) && TREE_CODE (*tp) == VAR_DECL) { struct cgraph_varpool_node *node = cgraph_varpool_node (*tp); Modified: projects/mips/contrib/less/LICENSE ============================================================================== --- projects/mips/contrib/less/LICENSE Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/less/LICENSE Tue Aug 4 18:22:58 2009 (r196062) @@ -2,7 +2,7 @@ ------------ Less -Copyright (C) 1984-2008 Mark Nudelman +Copyright (C) 1984-2009 Mark Nudelman Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions Modified: projects/mips/contrib/less/Makefile.aut ============================================================================== --- projects/mips/contrib/less/Makefile.aut Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/less/Makefile.aut Tue Aug 4 18:22:58 2009 (r196062) @@ -10,10 +10,10 @@ srcdir = . SRC = \ main.c screen.c brac.c ch.c charset.c cmdbuf.c \ - command.c decode.c edit.c filename.c forwback.c \ + command.c cvt.c decode.c edit.c filename.c forwback.c \ help.c ifile.c input.c jump.c line.c linenum.c \ lsystem.c mark.c optfunc.c option.c opttbl.c os.c \ - output.c position.c prompt.c search.c signal.c \ + output.c pattern.c position.c prompt.c search.c signal.c \ tags.c ttyin.c version.c DISTFILES_W = \ defines.ds Makefile.dsb Makefile.dsg Makefile.dsu \ @@ -24,7 +24,8 @@ DISTFILES = \ ${SRC} regexp.c regexp.h \ COPYING INSTALL LICENSE Makefile.in Makefile.aut NEWS README \ configure configure.ac lesskey.c lessecho.c scrsize.c \ - charset.h cmd.h funcs.h lglob.h less.h lesskey.h option.h pckeys.h position.h \ + charset.h cmd.h funcs.h lglob.h less.h lesskey.h option.h \ + pckeys.h pattern.h position.h \ install.sh defines.h.in mkinstalldirs \ less.nro less.man lesskey.nro lesskey.man lessecho.nro lessecho.man \ less.hlp \ @@ -109,6 +110,8 @@ dist: ${DISTFILES} cd $$REL; chmod +w ${DISTFILES_W}; cd ..; \ echo "Creating release/$$REL/$$REL.tar.gz"; \ tar -cf - $$REL | gzip -c >release/$$REL/$$REL.tar.gz; \ + echo "Signing release/$$REL/$$REL.tar.gz"; \ + gpg --detach-sign release/$$REL/$$REL.tar.gz; \ echo "Creating release/$$REL/$$REL.zip"; \ zip -rq release/$$REL/$$REL.zip $$REL; \ rm -rf $$REL Modified: projects/mips/contrib/less/Makefile.dsb ============================================================================== --- projects/mips/contrib/less/Makefile.dsb Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/less/Makefile.dsb Tue Aug 4 18:22:58 2009 (r196062) @@ -18,12 +18,13 @@ EXT = .EXE .c.obj: $(CC) -c -I. $(CPPFLAGS) $(CFLAGS) $< -OBJ = main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj command.obj \ - decode.obj edit.obj filename.obj forwback.obj help.obj ifile.obj \ - input.obj jump.obj line.obj linenum.obj lsystem.obj \ - mark.obj optfunc.obj option.obj opttbl.obj os.obj output.obj \ - position.obj prompt.obj search.obj signal.obj tags.obj \ - ttyin.obj version.obj +OBJ = \ + main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj \ + command.obj cvt.obj decode.obj edit.obj filename.obj forwback.obj \ + help.obj ifile.obj input.obj jump.obj line.obj linenum.obj \ + lsystem.obj mark.obj optfunc.obj option.obj opttbl.obj os.obj \ + output.obj pattern.obj position.obj prompt.obj search.obj signal.obj \ + tags.obj ttyin.obj version.obj all: less$(EXT) lesskey$(EXT) Modified: projects/mips/contrib/less/Makefile.dsg ============================================================================== --- projects/mips/contrib/less/Makefile.dsg Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/less/Makefile.dsg Tue Aug 4 18:22:58 2009 (r196062) @@ -33,11 +33,12 @@ manext = 1 .c.o: ${CC} -I. ${CFLAGS_COMPILE_ONLY} -DBINDIR=\"${bindir}\" -DSYSDIR=\"${sysconfdir}\" ${CPPFLAGS} ${CFLAGS} $< -OBJ = main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \ - command.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \ +OBJ = \ + main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \ + command.${O} cvt.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \ help.${O} ifile.${O} input.${O} jump.${O} line.${O} linenum.${O} \ lsystem.${O} mark.${O} optfunc.${O} option.${O} opttbl.${O} os.${O} \ - output.${O} position.${O} prompt.${O} search.${O} signal.${O} \ + output.${O} pattern.${O} position.${O} prompt.${O} search.${O} signal.${O} \ tags.${O} ttyin.${O} version.${O} all: less lesskey lessecho Modified: projects/mips/contrib/less/Makefile.dsu ============================================================================== --- projects/mips/contrib/less/Makefile.dsu Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/less/Makefile.dsu Tue Aug 4 18:22:58 2009 (r196062) @@ -27,12 +27,13 @@ LIBS = $(LIBDIR)\llibce.lib $(LIBDIR)\gr .c.obj: $(CC) -c -I. -I$(INCDIR) $(CPPFLAGS) $(CFLAGS) $< -OBJ = main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj command.obj \ - decode.obj edit.obj filename.obj forwback.obj help.obj ifile.obj \ - input.obj jump.obj line.obj linenum.obj lsystem.obj \ - mark.obj optfunc.obj option.obj opttbl.obj os.obj output.obj \ - position.obj prompt.obj search.obj signal.obj tags.obj \ - ttyin.obj version.obj +OBJ = \ + main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj \ + command.obj cvt.obj decode.obj edit.obj filename.obj forwback.obj \ + help.obj ifile.obj input.obj jump.obj line.obj linenum.obj \ + lsystem.obj mark.obj optfunc.obj option.obj opttbl.obj os.obj \ + output.obj pattern.obj position.obj prompt.obj search.obj signal.obj \ + tags.obj ttyin.obj version.obj all: less lesskey Modified: projects/mips/contrib/less/Makefile.in ============================================================================== --- projects/mips/contrib/less/Makefile.in Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/less/Makefile.in Tue Aug 4 18:22:58 2009 (r196062) @@ -43,11 +43,12 @@ SHELL = /bin/sh .c.o: ${CC} -I. ${CFLAGS_COMPILE_ONLY} -DBINDIR=\"${bindir}\" -DSYSDIR=\"${sysconfdir}\" ${CPPFLAGS} ${CFLAGS} $< -OBJ = main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \ - command.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \ +OBJ = \ + main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \ + command.${O} cvt.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \ help.${O} ifile.${O} input.${O} jump.${O} line.${O} linenum.${O} \ lsystem.${O} mark.${O} optfunc.${O} option.${O} opttbl.${O} os.${O} \ - output.${O} position.${O} prompt.${O} search.${O} signal.${O} \ + output.${O} pattern.${O} position.${O} prompt.${O} search.${O} signal.${O} \ tags.${O} ttyin.${O} version.${O} @REGEX_O@ all: less$(EXEEXT) lesskey$(EXEEXT) lessecho$(EXEEXT) Modified: projects/mips/contrib/less/Makefile.o2e ============================================================================== --- projects/mips/contrib/less/Makefile.o2e Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/less/Makefile.o2e Tue Aug 4 18:22:58 2009 (r196062) @@ -18,11 +18,12 @@ O = obj .c.${O}: ${CC} -c ${CPPFLAGS} ${CFLAGS} $< -OBJ = main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \ - command.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \ +OBJ = \ + main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \ + command.${O} cvt.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \ help.${O} ifile.${O} input.${O} jump.${O} line.${O} linenum.${O} \ lsystem.${O} mark.${O} optfunc.${O} option.${O} opttbl.${O} os.${O} \ - output.${O} position.${O} prompt.${O} search.${O} signal.${O} \ + output.${O} pattern.${O} position.${O} prompt.${O} search.${O} signal.${O} \ tags.${O} ttyin.${O} version.${O} regexp.${O} all: less.exe lesskey.exe scrsize.exe Modified: projects/mips/contrib/less/Makefile.o9c ============================================================================== --- projects/mips/contrib/less/Makefile.o9c Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/less/Makefile.o9c Tue Aug 4 18:22:58 2009 (r196062) @@ -22,11 +22,12 @@ O = r .c.${O}: ${CC} ${CFLAGS_COMPILE_ONLY} ${CPPFLAGS} ${CFLAGS} $< -OBJ = main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \ - command.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \ +OBJ = \ + main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \ + command.${O} cvt.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \ help.${O} ifile.${O} input.${O} jump.${O} line.${O} linenum.${O} \ lsystem.${O} mark.${O} optfunc.${O} option.${O} opttbl.${O} os.${O} \ - output.${O} position.${O} prompt.${O} search.${O} signal.${O} \ + output.${O} pattern.${O} position.${O} prompt.${O} search.${O} signal.${O} \ tags.${O} ttyin.${O} version.${O} regexp.${O} all: less lessecho lesskey Modified: projects/mips/contrib/less/Makefile.o9u ============================================================================== --- projects/mips/contrib/less/Makefile.o9u Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/less/Makefile.o9u Tue Aug 4 18:22:58 2009 (r196062) @@ -21,11 +21,12 @@ O = r .c.${O}: ${CC} ${CFLAGS_COMPILE_ONLY} ${CPPFLAGS} ${CFLAGS} $< -OBJ = main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \ - command.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \ +OBJ = \ + main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \ + command.${O} cvt.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \ help.${O} ifile.${O} input.${O} jump.${O} line.${O} linenum.${O} \ lsystem.${O} mark.${O} optfunc.${O} option.${O} opttbl.${O} os.${O} \ - output.${O} position.${O} prompt.${O} search.${O} signal.${O} \ + output.${O} pattern.${O} position.${O} prompt.${O} search.${O} signal.${O} \ tags.${O} ttyin.${O} version.${O} regexp.${O} all: less lesskey Modified: projects/mips/contrib/less/Makefile.wnb ============================================================================== --- projects/mips/contrib/less/Makefile.wnb Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/less/Makefile.wnb Tue Aug 4 18:22:58 2009 (r196062) @@ -25,12 +25,13 @@ LIBS = ${LIBDIR}\import32.lib ${LIBDIR}\ .c.obj: ${CC} -c -I. ${CPPFLAGS} ${CFLAGS} $< -OBJ = main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj command.obj \ - decode.obj edit.obj filename.obj forwback.obj help.obj ifile.obj \ - input.obj jump.obj line.obj linenum.obj lsystem.obj \ - mark.obj optfunc.obj option.obj opttbl.obj os.obj output.obj \ - position.obj prompt.obj search.obj signal.obj tags.obj \ - ttyin.obj version.obj regexp.obj +OBJ = \ + main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj \ + command.obj cvt.obj decode.obj edit.obj filename.obj forwback.obj \ + help.obj ifile.obj input.obj jump.obj line.obj linenum.obj \ + lsystem.obj mark.obj optfunc.obj option.obj opttbl.obj os.obj \ + output.obj pattern.obj position.obj prompt.obj search.obj signal.obj \ + tags.obj ttyin.obj version.obj regexp.obj all: less lesskey lessecho Modified: projects/mips/contrib/less/Makefile.wnm ============================================================================== --- projects/mips/contrib/less/Makefile.wnm Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/less/Makefile.wnm Tue Aug 4 18:22:58 2009 (r196062) @@ -23,12 +23,13 @@ LIBS = user32.lib .c.obj: $(CC) $(CFLAGS) $< -OBJ = main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj command.obj \ - decode.obj edit.obj filename.obj forwback.obj help.obj ifile.obj \ - input.obj jump.obj line.obj linenum.obj lsystem.obj \ - mark.obj optfunc.obj option.obj opttbl.obj os.obj output.obj \ - position.obj prompt.obj search.obj signal.obj tags.obj \ - ttyin.obj version.obj regexp.obj +OBJ = \ + main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj \ + command.obj cvt.obj decode.obj edit.obj filename.obj forwback.obj \ + help.obj ifile.obj input.obj jump.obj line.obj linenum.obj \ + lsystem.obj mark.obj optfunc.obj option.obj opttbl.obj os.obj \ + output.obj pattern.obj position.obj prompt.obj search.obj signal.obj \ + tags.obj ttyin.obj version.obj regexp.obj all: less.exe lesskey.exe Modified: projects/mips/contrib/less/NEWS ============================================================================== --- projects/mips/contrib/less/NEWS Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/less/NEWS Tue Aug 4 18:22:58 2009 (r196062) @@ -12,6 +12,18 @@ ====================================================================== + Major changes between "less" versions 429 and 436 + +* Don't pass "-" to non-pipe LESSOPEN unless it starts with "-". + +* Allow a fraction as the argument to the -# (--shift) option. + +* Fix highlight bug when underlined/overstruck text matches at end of line. + +* Fix non-regex searches with ctrl-R. + +====================================================================== + Major changes between "less" versions 424 and 429 * LESSOPEN pipe will now be used on standard input, if the LESSOPEN Modified: projects/mips/contrib/less/README ============================================================================== --- projects/mips/contrib/less/README Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/less/README Tue Aug 4 18:22:58 2009 (r196062) @@ -1,7 +1,7 @@ - Less, version 429 + Less, version 436 - This is the distribution of less, version 429, released 11 Apr 2009. + This is the distribution of less, version 436, released 07 Jul 2009. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or Modified: projects/mips/contrib/less/brac.c ============================================================================== --- projects/mips/contrib/less/brac.c Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/less/brac.c Tue Aug 4 18:22:58 2009 (r196062) @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2008 Mark Nudelman + * Copyright (C) 1984-2009 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. Modified: projects/mips/contrib/less/ch.c ============================================================================== --- projects/mips/contrib/less/ch.c Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/less/ch.c Tue Aug 4 18:22:58 2009 (r196062) @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2008 Mark Nudelman + * Copyright (C) 1984-2009 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. Modified: projects/mips/contrib/less/charset.c ============================================================================== --- projects/mips/contrib/less/charset.c Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/less/charset.c Tue Aug 4 18:22:58 2009 (r196062) @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2008 Mark Nudelman + * Copyright (C) 1984-2009 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -425,7 +425,7 @@ prchar(c) c &= 0377; if ((c < 128 || !utf_mode) && !control_char(c)) - SNPRINTF1(buf, sizeof(buf), "%c", c); + SNPRINTF1(buf, sizeof(buf), "%c", (int) c); else if (c == ESC) strcpy(buf, "ESC"); #if IS_EBCDIC_HOST @@ -442,7 +442,7 @@ prchar(c) "..V....D....TU.Z"[c]); #else else if (c < 128 && !control_char(c ^ 0100)) - SNPRINTF1(buf, sizeof(buf), "^%c", c ^ 0100); + SNPRINTF1(buf, sizeof(buf), "^%c", (int) (c ^ 0100)); #endif else SNPRINTF1(buf, sizeof(buf), binfmt, c); Modified: projects/mips/contrib/less/charset.h ============================================================================== --- projects/mips/contrib/less/charset.h Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/less/charset.h Tue Aug 4 18:22:58 2009 (r196062) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2008 Mark Nudelman + * Copyright (C) 2005-2009 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. Modified: projects/mips/contrib/less/cmd.h ============================================================================== --- projects/mips/contrib/less/cmd.h Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/less/cmd.h Tue Aug 4 18:22:58 2009 (r196062) @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2008 Mark Nudelman + * Copyright (C) 1984-2009 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. Modified: projects/mips/contrib/less/cmdbuf.c ============================================================================== --- projects/mips/contrib/less/cmdbuf.c Tue Aug 4 17:32:55 2009 (r196061) +++ projects/mips/contrib/less/cmdbuf.c Tue Aug 4 18:22:58 2009 (r196062) @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2008 Mark Nudelman + * Copyright (C) 1984-2009 Mark Nudelman *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Thu Aug 6 17:34:16 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B7BC106564A; Thu, 6 Aug 2009 17:34:16 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5A4AB8FC18; Thu, 6 Aug 2009 17:34:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n76HYGWE061144; Thu, 6 Aug 2009 17:34:16 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n76HYGiu061143; Thu, 6 Aug 2009 17:34:16 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200908061734.n76HYGiu061143@svn.freebsd.org> From: Lawrence Stewart Date: Thu, 6 Aug 2009 17:34:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196083 - projects/tcp_ffcaia2008_8.x/sys/netinet X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Aug 2009 17:34:16 -0000 Author: lstewart Date: Thu Aug 6 17:34:15 2009 New Revision: 196083 URL: http://svn.freebsd.org/changeset/base/196083 Log: Keep a sender-side tally of the total number of bytes outstanding at the receiver when SACK is in use. This allows us to *accurately* gauge how much of the outstanding window of data is actually sitting in the receiver's buffers. This in turn will be used by follow up work to improve fast recovery performance for SACK enabled connections. Sponsored by: FreeBSD Foundation Modified: projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_input.c projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_sack.c projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_var.h Modified: projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_input.c ============================================================================== --- projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_input.c Thu Aug 6 09:07:07 2009 (r196082) +++ projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_input.c Thu Aug 6 17:34:15 2009 (r196083) @@ -2073,8 +2073,8 @@ tcp_do_segment(struct mbuf *m, struct tc /* * Compute the amount of data in flight first. - * We can inject new data into the pipe iff - * we have less than 1/2 the original window's + * We can inject new data into the pipe iff + * we have less than 1/2 the original window's * worth of data in flight. */ awnd = (tp->snd_nxt - tp->snd_fack) + Modified: projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_sack.c ============================================================================== --- projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_sack.c Thu Aug 6 09:07:07 2009 (r196082) +++ projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_sack.c Thu Aug 6 17:34:15 2009 (r196083) @@ -316,6 +316,8 @@ tcp_sackhole_insert(struct tcpcb *tp, tc else TAILQ_INSERT_TAIL(&tp->snd_holes, hole, scblink); + tp->sack_hole_bytes += hole->end - hole->start; + /* Update SACK hint. */ if (tp->sack_nexthole == NULL) tp->sack_nexthole = hole; @@ -337,8 +339,22 @@ tcp_sackhole_remove(struct tcpcb *tp, st /* Remove this SACK hole. */ TAILQ_REMOVE(&tp->snd_holes, hole, scblink); + tp->sack_hole_bytes -= hole->end - hole->start; + /* Free this SACK hole. */ tcp_sackhole_free(tp, hole); + + /* +#ifdef INVARIANTS + if (TAILQ_EMPTY(&tp->snd_holes)) + KASSERT(tp->sack_hole_bytes == 0, + ("tp->sack_hole_bytes is %d instead of 0", tp->sack_hole_bytes)); +#endif + */ + if (TAILQ_EMPTY(&tp->snd_holes) && tp->sack_hole_bytes != 0) { + printf("tp->sack_hole_bytes is %d instead of 0", tp->sack_hole_bytes); + tp->sack_hole_bytes = 0; + } } /* @@ -499,14 +515,16 @@ tcp_sack_doack(struct tcpcb *tp, struct */ continue; } else { - /* Move start of hole forward. */ + /* Shrink hole: slide start of hole forward. */ + tp->sack_hole_bytes -= sblkp->end - cur->start; cur->start = sblkp->end; cur->rxmit = SEQ_MAX(cur->rxmit, cur->start); } } else { /* Data acks at least the end of hole. */ if (SEQ_GEQ(sblkp->end, cur->end)) { - /* Move end of hole backward. */ + /* Shrink hole: slide end of hole backward. */ + tp->sack_hole_bytes -= sblkp->start - cur->end; cur->end = sblkp->start; cur->rxmit = SEQ_MIN(cur->rxmit, cur->end); } else { @@ -523,6 +541,20 @@ tcp_sack_doack(struct tcpcb *tp, struct += (temp->rxmit - temp->start); } + /* + * Adjust tp->sack_hole_bytes specially + * here because tcp_sackhole_insert + * adds bytes to the tally that were + * already accounted for. Undo the + * addition of cur->end-sblkp->end bytes + * and also adjust for number of bytes + * in the sack block i.e. + * sblkp->end-sblkp->start + */ + tp->sack_hole_bytes -= cur->end - + sblkp->end - + sblkp->end + + sblkp->start; cur->end = sblkp->start; cur->rxmit = SEQ_MIN(cur->rxmit, cur->end); Modified: projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_var.h ============================================================================== --- projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_var.h Thu Aug 6 09:07:07 2009 (r196082) +++ projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_var.h Thu Aug 6 17:34:15 2009 (r196083) @@ -186,6 +186,8 @@ struct tcpcb { episode starts at this seq number */ struct sackhole *sack_nexthole; /* next hole to rexmt */ int sack_bytes_rexmit; /* # bytes rexmt this RTT */ + int sack_hole_bytes; /* # bytes not yet sacked by rcv'r + this recovery episode */ int t_rttlow; /* smallest observerved RTT */ u_int32_t rfbuf_ts; /* recv buffer autoscaling timestamp */ int rfbuf_cnt; /* recv buffer autoscaling byte count */ From owner-svn-src-projects@FreeBSD.ORG Fri Aug 7 01:46:08 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 957B5106566C; Fri, 7 Aug 2009 01:46:08 +0000 (UTC) (envelope-from rodrigc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8327B8FC1E; Fri, 7 Aug 2009 01:46:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n771k8iP071595; Fri, 7 Aug 2009 01:46:08 GMT (envelope-from rodrigc@svn.freebsd.org) Received: (from rodrigc@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n771k8XL071593; Fri, 7 Aug 2009 01:46:08 GMT (envelope-from rodrigc@svn.freebsd.org) Message-Id: <200908070146.n771k8XL071593@svn.freebsd.org> From: Craig Rodrigues Date: Fri, 7 Aug 2009 01:46:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196084 - projects/jbuild/usr.bin/jbuild X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Aug 2009 01:46:09 -0000 Author: rodrigc Date: Fri Aug 7 01:46:08 2009 New Revision: 196084 URL: http://svn.freebsd.org/changeset/base/196084 Log: Add first draft of jbuild(1) man page. Added: projects/jbuild/usr.bin/jbuild/jbuild.1 Added: projects/jbuild/usr.bin/jbuild/jbuild.1 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/jbuild/usr.bin/jbuild/jbuild.1 Fri Aug 7 01:46:08 2009 (r196084) @@ -0,0 +1,1786 @@ +.\" Copyright (c) 1990, 1993 +.\" The Regents of the University of California. All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. All advertising materials mentioning features or use of this software +.\" must display the following acknowledgement: +.\" This product includes software developed by the University of +.\" California, Berkeley and its contributors. +.\" 4. Neither the name of the University nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" @(#)make.1 8.8 (Berkeley) 6/13/95 +.\" $FreeBSD$ +.\" +.Dd August 6, 2009 +.Dt JBUILD 1 +.Os +.Sh NAME +.Nm jbuild +.Nd maintain program dependencies +.Sh SYNOPSIS +.Nm +.Op Fl ABPSXeiknpqrstv +.Op Fl C Ar directory +.Op Fl D Ar variable +.Op Fl d Ar flags +.Op Fl E Ar variable +.Op Fl f Ar makefile +.Op Fl I Ar directory +.Bk -words +.Op Fl j Ar max_jobs +.Op Fl m Ar directory +.Ek +.Op Fl V Ar variable +.Op Fl x Ar warning_options +.Op Ar variable Ns No = Ns Ar value +.Op Ar target ... +.Sh DESCRIPTION +The +.Nm +utility is a program designed to simplify the maintenance of other programs. +Its input is a list of specifications +describing dependency relationships between the generation of +files and programs. +.Pp +First of all, the initial list of specifications will be read +from the system makefile, +.Pa sys.mk , +unless inhibited with the +.Fl r +option. +The standard +.Pa sys.mk +as shipped with +.Fx +also handles +.Xr make.conf 5 , +the default path to which +can be altered via the +.Nm +variable +.Va __MAKE_CONF . +.Pp +Then the first +.Pa Buildfile , +that can be found in the current directory +or search path (see the +.Fl I +option) +will be read for the main list of dependency specifications. +A different Buildfile or list of them can be supplied via the +.Fl f +option(s). +Finally, if the file +.Pa .depend +can be found in any of the aforesaid locations, it will also be read (see +.Xr mkdep 1 ) . +.Pp +The options are as follows: +.Bl -tag -width Ds +.It Fl A +Make archive errors non-fatal, causing +.Nm +to just skip the remainder +or all of the archive and continue after printing a message. +.It Fl B +Try to be backwards compatible by executing a single shell per command and +by executing the commands to make the sources of a dependency line in sequence. +This is turned on by default unless +.Fl j +is used. +.It Fl C Ar directory +Change to +.Ar directory +before reading the Buildfiles or doing anything else. +If multiple +.Fl C +options are specified, each is interpreted relative to the previous one: +.Fl C Pa / Fl C Pa etc +is equivalent to +.Fl C Pa /etc . +.It Fl D Ar variable +Define +.Ar variable +to be 1, in the global context. +.It Fl d Ar flags +Turn on debugging, and specify which portions of +.Nm +are to print debugging information. +Argument +.Ar flags +is one or more of the following: +.Bl -tag -width Ds +.It Ar A +Print all possible debugging information; +equivalent to specifying all of the debugging flags. +.It Ar a +Print debugging information about archive searching and caching. +.It Ar c +Print debugging information about conditional evaluation. +.It Ar d +Print debugging information about directory searching and caching. +.It Ar f +Print debugging information about the execution of for loops. +.It Ar "g1" +Print the input graph before making anything. +.It Ar "g2" +Print the input graph after making everything, or before exiting +on error. +.It Ar j +Print debugging information about running multiple shells. +.It Ar l +Print commands in Buildfiles regardless of whether or not they are prefixed +by @ or other "quiet" flags. +Also known as "loud" behavior. +.It Ar m +Print debugging information about making targets, including modification +dates. +.It Ar s +Print debugging information about suffix-transformation rules. +.It Ar t +Print debugging information about target list maintenance. +.It Ar v +Print debugging information about variable assignment. +.El +.It Fl E Ar variable +Specify a variable whose environment value (if any) will override +macro assignments within Buildfiles. +.It Fl e +Specify that environment values override macro assignments within +makefiles for all variables. +.It Fl f Ar Buildfile +Specify a Buildfile to read instead of the default one. +If +.Ar Buildfile +is not an absolute pathname, +.Nm +will search for it as described above. +In case +.Ar Buildfile +is +.Sq Fl , +standard input is read. +Multiple +.Fl f +options can be supplied, +and the makefiles will be read in that order. +Unlike the other command-line options, +.Fl f +is neither stored in +.Va .MAKEFLAGS +nor pushed down to sub-makes via +.Ev MAKEFLAGS . +See below for more details on these variables. +.It Fl I Ar directory +Specify a directory in which to search for Buildfiles and included Buildfiles. +Multiple +.Fl I +options can be specified to form a search path. +The system makefile directory (or directories, see the +.Fl m +option) is automatically appended at the tail of this path. +.It Fl i +Ignore non-zero exit of shell commands in the makefile. +Equivalent to specifying +.Sq Ic \- +before each command line in the makefile. +.It Fl j Ar max_jobs +Specify the maximum number of jobs that +.Nm +may have running at any one time. +Turns compatibility mode off, unless the +.Fl B +flag is also specified. +.It Fl k +Continue processing after errors are encountered, but only on those targets +that do not depend on the target whose creation caused the error. +.It Fl m Ar directory +Specify a directory in which to search for +the system makefile and makefiles included via the <...> style. +Multiple +.Fl m +options can be specified to form a search path. +This path will override the default system include path, +.Pa /usr/share/mk . +The system include path will always be appended to the search path used +for "..."-style inclusions and makefile searches (see the +.Fl I +option). +.It Fl n +Display the commands that would have been executed, but do not actually +execute them. +.It Fl P +Collate the output of a given job and display it only when the job finishes, +instead of mixing the output of parallel jobs together. +This option has no effect unless +.Fl j +is used too. +.It Fl p +Only print the input graph, not executing any commands. +The output is the same as +.Fl d Ar g1 . +When combined with +.Fl f Pa /dev/null , +only the builtin rules of +.Nm +are displayed. +.It Fl Q +Do not generate metadata files during build. +Do not use this option if you plan to do an update build later. +.It Fl q +Do not execute any commands, but exit 0 if the specified targets are +up-to-date and 1, otherwise. +.It Fl r +Do not process the system makefile. +.It Fl S +Stop processing when an error is encountered. +Default behaviour. +This is needed to negate the +.Fl k +option during recursive builds. +.It Fl s +Echo all commands as they are executed. +This increases the verbosity of the output of +.Nm +which defaults to not echoing commands as they are executed. +.It Fl t +Rather than re-building a target as specified in the makefile, create it +or update its modification time to make it appear up-to-date. +.It Fl V Ar variable +Print +.Nm Ns 's +idea of the value of +.Ar variable , +in the global context. +Do not build any targets. +Multiple instances of this option may be specified; +the variables will be printed one per line, +with a blank line for each null or undefined variable. +.It Fl v +Be extra verbose. +Print any extra information. +.It Fl X +When using the +.Fl V +option to print the values of variables, +do not recursively expand the values. +.It Ar variable Ns No = Ns Ar value +Set the value of the variable +.Ar variable +to +.Ar value . +.It Fl x Ar warning_options +Specify extended warning options. +This option may be specified several times. +A +.Ar warning_option +can be prefixed with +.Dq Li no +in which case the warning is switched off. +The currently available options are: +.Bl -tag -width indent +.It Li dirsyntax +Warn if anything except blanks and comments follows an +.Ic .endif +or +.Ic .else +directive. +.El +.Pp +See also the +.Ic .WARN +special target. +.El +.Pp +There are seven different types of lines in a makefile: file dependency +specifications, shell commands, variable assignments, include statements, +conditional directives, for loops, and comments. +.Pp +In general, lines may be continued from one line to the next by ending +them with a backslash +.Pq Ql \e . +The trailing newline character and initial whitespace on the following +line are compressed into a single space. +.Sh FILE DEPENDENCY SPECIFICATIONS +Dependency lines consist of one or more targets, an operator, and zero +or more sources. +This creates a relationship where the targets +.Dq depend +on the sources +and are usually created from them. +The exact relationship between the target and the source is determined +by the operator that separates them. +The three operators are as follows: +.Bl -tag -width flag +.It Ic \&: +A target is considered out-of-date if its modification time is less than +those of any of its sources. +Sources for a target accumulate over dependency lines when this operator +is used. +The target is removed if +.Nm +is interrupted. +.It Ic \&! +Targets are always re-created, but not until all sources have been +examined and re-created as necessary. +Sources for a target accumulate over dependency lines when this operator +is used. +The target is removed if +.Nm +is interrupted. +.It Ic :: +If no sources are specified, the target is always re-created. +Otherwise, a target is considered out-of-date if any of its sources has +been modified more recently than the target. +Sources for a target do not accumulate over dependency lines when this +operator is used. +The target will not be removed if +.Nm +is interrupted. +.El +.Pp +Targets and sources may contain the shell wildcard expressions +.Ql \&? , +.Ql * , +.Ql [] +and +.Ql {} . +The expressions +.Ql \&? , +.Ql * +and +.Ql [] +may only be used as part of the final +component of the target or source, and must be used to describe existing +files. +The expression +.Ql {} +need not necessarily be used to describe existing files. +Expansion is in directory order, not alphabetically as done in the shell. +.Sh SHELL COMMANDS +Each target may have associated with it a series of shell commands, normally +used to create the target. +Each of the commands in this script +.Em must +be preceded by a tab. +While any target may appear on a dependency line, only one of these +dependencies may be followed by a creation script, unless the +.Sq Ic :: +operator is used. +.Pp +If the first characters of the command line are +.Sq Ic @ , +.Sq Ic \- , +and/or +.Sq Ic + , +the command is treated specially. +A +.Sq Ic @ +causes the command not to be echoed before it is executed. +A +.Sq Ic \- +causes any non-zero exit status of the command line to be ignored. +A +.Sq Ic + +causes the command to be executed even if +.Fl n +is specified on the command line. +.Sh VARIABLE ASSIGNMENTS +Variables in +.Nm +are much like variables in the shell, and, by tradition, +consist of all upper-case letters. +The five operators that can be used to assign values to variables are as +follows: +.Bl -tag -width Ds +.It Ic = +Assign the value to the variable. +Any previous value is overridden. +.It Ic += +Append the value to the current value of the variable. +.It Ic ?= +Assign the value to the variable if it is not already defined. +.It Ic := +Assign with expansion, i.e., expand the value before assigning it +to the variable. +Normally, expansion is not done until the variable is referenced. +.It Ic != +Expand the value and pass it to the shell for execution and assign +the result to the variable. +Any newlines in the result are replaced with spaces. +.El +.Pp +Any whitespace before the assigned +.Ar value +is removed; if the value is being appended, a single space is inserted +between the previous contents of the variable and the appended value. +.Pp +Variables are expanded by surrounding the variable name with either +curly braces +.Pq Ql {} +or parentheses +.Pq Ql () +and preceding it with +a dollar sign +.Pq Ql $ . +If the variable name contains only a single letter, the surrounding +braces or parentheses are not required. +This shorter form is not recommended. +.Pp +Variable substitution occurs at two distinct times, depending on where +the variable is being used. +Variables in dependency lines are expanded as the line is read. +Variables in shell commands are expanded when the shell command is +executed. +.Pp +The four different classes of variables (in order of increasing precedence) +are: +.Bl -tag -width Ds +.It Environment variables +Variables defined as part of +.Nm Ns 's +environment. +.It Global variables +Variables defined in the makefile or in included makefiles. +.It Command line variables +Variables defined as part of the command line and variables +obtained from the +.Ev MAKEFLAGS +environment variable or the +.Ic .MAKEFLAGS +target. +.It Local variables +Variables that are defined specific to a certain target. +.El +.Pp +If the name of an environment variable appears in a makefile +on the left-hand side of an assignment, +a global variable with the same name is created, and the latter +shadows the former as per their relative precedences. +The environment is not changed in this case, and the change +is not exported to programs executed by +.Nm . +However, a command-line variable actually replaces +the environment variable of the same name if the latter exists, +which is visible to child programs. +.Pp +There are seven local variables in +.Nm : +.Bl -tag -width ".ARCHIVE" +.It Va .ALLSRC +The list of all sources for this target; also known as +.Sq Va > . +.It Va .ARCHIVE +The name of the archive file; also known as +.Sq Va \&! . +.It Va .IMPSRC +The name/path of the source from which the target is to be transformed +(the +.Dq implied +source); also known as +.Sq Va < . +.It Va .MEMBER +The name of the archive member; also known as +.Sq Va % . +.It Va .OODATE +The list of sources for this target that were deemed out-of-date; also +known as +.Sq Va \&? . +.It Va .PREFIX +The file prefix of the file, containing only the file portion, no suffix +or preceding directory components; also known as +.Sq Va * . +.It Va .TARGET +The name of the target; also known as +.Sq Va @ . +.El +.Pp +The shorter forms +.Sq Va @ , +.Sq Va \&! , +.Sq Va < , +.Sq Va % , +.Sq Va \&? , +.Sq Va > , +and +.Sq Va * +are permitted for backward +compatibility and are not recommended. +The six variables +.Sq Va @F , +.Sq Va @D , +.Sq Va +.It Ic .include Ar \*qfile\*q +Include the specified makefile. +Variables between the angle brackets +or double quotes are expanded to form the file name. +If angle brackets +are used, the included makefile is expected to be in the system +makefile directory. +If double quotes are used, the including +makefile's directory and any directories specified using the +.Fl I +option are searched before the system +makefile directory. +.It Ic .sinclude Ar +.It Ic .sinclude Ar \*qfile\*q +Like +.Ic .include , +but silently ignored if the file cannot be found and opened. +.It Ic .undef Ar variable +Un-define the specified global variable. +Only global variables may be un-defined. +.It Ic .error Ar message +Terminate processing of the makefile immediately. +The filename of the +makefile, the line on which the error was encountered and the specified +message are printed to the standard error output and +.Nm +terminates with exit code 1. +Variables in the message are expanded. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Aug 7 02:06:35 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B9905106564A; Fri, 7 Aug 2009 02:06:35 +0000 (UTC) (envelope-from rodrigc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A8B978FC08; Fri, 7 Aug 2009 02:06:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7726Z6O072050; Fri, 7 Aug 2009 02:06:35 GMT (envelope-from rodrigc@svn.freebsd.org) Received: (from rodrigc@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7726Zen072048; Fri, 7 Aug 2009 02:06:35 GMT (envelope-from rodrigc@svn.freebsd.org) Message-Id: <200908070206.n7726Zen072048@svn.freebsd.org> From: Craig Rodrigues Date: Fri, 7 Aug 2009 02:06:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196085 - projects/jbuild/usr.bin/jbuild/port X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Aug 2009 02:06:36 -0000 Author: rodrigc Date: Fri Aug 7 02:06:35 2009 New Revision: 196085 URL: http://svn.freebsd.org/changeset/base/196085 Log: Add man page to port. Modified: projects/jbuild/usr.bin/jbuild/port/Makefile Modified: projects/jbuild/usr.bin/jbuild/port/Makefile ============================================================================== --- projects/jbuild/usr.bin/jbuild/port/Makefile Fri Aug 7 01:46:08 2009 (r196084) +++ projects/jbuild/usr.bin/jbuild/port/Makefile Fri Aug 7 02:06:35 2009 (r196085) @@ -23,7 +23,6 @@ do-fetch: do-extract: mkdir -p ${WRKSRC} ( cd ${WRKSRC} ; ln -s ../../../filemon . ; ln -s ../../../../jbuild .; ln -s ../../../../jdirdep .; ln -s ../../../../make .) - ( cd ${WRKSRC}; cp ../../../../make/make.1 jbuild.1 ) cp Makefile.port ${WRKSRC}/Makefile do-install: @@ -32,7 +31,7 @@ do-install: ( cd ${WRKSRC}/jdirdep; ${MAKE} install BINDIR=${PREFIX}/bin ) cp ${WRKSRC}/jdirdep/jcommit ${PREFIX}/bin cp ${WRKSRC}/jdirdep/jgetsrc ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/jbuild.1 ${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/jbuild/jbuild.1 ${MANPREFIX}/man/man1 do-clean: ( cd ${WRKSRC}/filemon; ${MAKE} clean ) From owner-svn-src-projects@FreeBSD.ORG Fri Aug 7 15:41:17 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 37C48106566B; Fri, 7 Aug 2009 15:41:17 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 274F38FC27; Fri, 7 Aug 2009 15:41:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n77FfGOD008736; Fri, 7 Aug 2009 15:41:17 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n77FfGmq008735; Fri, 7 Aug 2009 15:41:16 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200908071541.n77FfGmq008735@svn.freebsd.org> From: Nathan Whitehorn Date: Fri, 7 Aug 2009 15:41:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196086 - projects/ppc64/sys/powerpc/aim64 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Aug 2009 15:41:17 -0000 Author: nwhitehorn Date: Fri Aug 7 15:41:16 2009 New Revision: 196086 URL: http://svn.freebsd.org/changeset/base/196086 Log: Use the correct link register mask to know when we are taking a segmentation exception instead of a DSI/ISI. Modified: projects/ppc64/sys/powerpc/aim64/machdep.c projects/ppc64/sys/powerpc/aim64/trap_subr.S Modified: projects/ppc64/sys/powerpc/aim64/machdep.c ============================================================================== --- projects/ppc64/sys/powerpc/aim64/machdep.c Fri Aug 7 02:06:35 2009 (r196085) +++ projects/ppc64/sys/powerpc/aim64/machdep.c Fri Aug 7 15:41:16 2009 (r196086) @@ -232,7 +232,7 @@ extern char kernel_text[], _end[]; #ifdef SMP extern void *rstcode, *rstsize; #endif -extern void *trapcode, *trapcode64, *trapsize; +extern void *trapcode, *trapsize; extern void *alitrap, *alisize; extern void *dsitrap, *dsisize; extern void *decrint, *decrsize; Modified: projects/ppc64/sys/powerpc/aim64/trap_subr.S ============================================================================== --- projects/ppc64/sys/powerpc/aim64/trap_subr.S Fri Aug 7 02:06:35 2009 (r196085) +++ projects/ppc64/sys/powerpc/aim64/trap_subr.S Fri Aug 7 15:41:16 2009 (r196086) @@ -290,7 +290,7 @@ CNAME(trapcode): mtsprg1 %r1 /* save SP */ mflr %r1 /* Save the old LR in r1 */ mtsprg2 %r1 /* And then in SPRG2 */ - li %r1, 0x20 /* How to get the vector from LR */ + li %r1, 0xA0 /* How to get the vector from LR */ bla generictrap /* LR & SPRG3 is exception # */ CNAME(trapsize) = .-CNAME(trapcode)