Module Name: src Committed By: skrll Date: Fri Oct 6 11:45:37 UTC 2023
Modified Files: src/sys/arch/ia64/include: asm.h bootinfo.h cpu.h db_machdep.h ia64_cpu.h int_limits.h intrdefs.h loadfile_machdep.h lock.h param.h pmap.h proc.h setjmp.h userret.h vmparam.h Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/include/asm.h \ src/sys/arch/ia64/include/pmap.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/include/bootinfo.h cvs rdiff -u -r1.21 -r1.22 src/sys/arch/ia64/include/cpu.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/include/db_machdep.h \ src/sys/arch/ia64/include/setjmp.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/include/ia64_cpu.h \ src/sys/arch/ia64/include/intrdefs.h \ src/sys/arch/ia64/include/loadfile_machdep.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/include/int_limits.h cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ia64/include/lock.h cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ia64/include/param.h \ src/sys/arch/ia64/include/vmparam.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/ia64/include/proc.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/include/userret.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/ia64/include/asm.h diff -u src/sys/arch/ia64/include/asm.h:1.8 src/sys/arch/ia64/include/asm.h:1.9 --- src/sys/arch/ia64/include/asm.h:1.8 Fri Apr 17 14:19:43 2020 +++ src/sys/arch/ia64/include/asm.h Fri Oct 6 11:45:37 2023 @@ -1,26 +1,26 @@ -/* $NetBSD: asm.h,v 1.8 2020/04/17 14:19:43 joerg Exp $ */ +/* $NetBSD: asm.h,v 1.9 2023/10/06 11:45:37 skrll Exp $ */ /* - * Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or software.distribut...@cs.cmu.edu * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ Index: src/sys/arch/ia64/include/pmap.h diff -u src/sys/arch/ia64/include/pmap.h:1.8 src/sys/arch/ia64/include/pmap.h:1.9 --- src/sys/arch/ia64/include/pmap.h:1.8 Sat Apr 8 18:08:33 2017 +++ src/sys/arch/ia64/include/pmap.h Fri Oct 6 11:45:37 2023 @@ -178,10 +178,10 @@ void pmap_procwr(struct proc *, vaddr_t, struct vm_page_md { TAILQ_HEAD(,pv_entry) pv_list; vm_memattr_t memattr; -#if 0 /* XXX freebsd */ +#if 0 /* XXX freebsd */ uint8_t pv_flags; uint8_t aflags; -#endif +#endif }; #define VM_MDPAGE_INIT(pg) \ Index: src/sys/arch/ia64/include/bootinfo.h diff -u src/sys/arch/ia64/include/bootinfo.h:1.2 src/sys/arch/ia64/include/bootinfo.h:1.3 --- src/sys/arch/ia64/include/bootinfo.h:1.2 Thu Dec 26 04:53:11 2019 +++ src/sys/arch/ia64/include/bootinfo.h Fri Oct 6 11:45:37 2023 @@ -1,21 +1,21 @@ -/* $NetBSD: bootinfo.h,v 1.2 2019/12/26 04:53:11 msaitoh Exp $ */ +/* $NetBSD: bootinfo.h,v 1.3 2023/10/06 11:45:37 skrll Exp $ */ /*- * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. * All rights reserved. * * Author: Chris G. Demetriou - * + * * Permission to use, copy, modify and distribute this software and * its documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND + * + * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" + * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to * * Software Distribution Coordinator or software.distribut...@cs.cmu.edu Index: src/sys/arch/ia64/include/cpu.h diff -u src/sys/arch/ia64/include/cpu.h:1.21 src/sys/arch/ia64/include/cpu.h:1.22 --- src/sys/arch/ia64/include/cpu.h:1.21 Tue May 31 08:43:14 2022 +++ src/sys/arch/ia64/include/cpu.h Fri Oct 6 11:45:37 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.21 2022/05/31 08:43:14 andvar Exp $ */ +/* $NetBSD: cpu.h,v 1.22 2023/10/06 11:45:37 skrll Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -155,7 +155,7 @@ struct clockframe { /* * Give a profiling tick to the current process when the user profiling - * buffer pages are invalid. XXX:Fixme.... On the ia64 I haven't yet figured + * buffer pages are invalid. XXX:Fixme.... On the ia64 I haven't yet figured * out what to do about this.. XXX. */ /* extern void cpu_need_proftick(struct lwp *l); */ Index: src/sys/arch/ia64/include/db_machdep.h diff -u src/sys/arch/ia64/include/db_machdep.h:1.4 src/sys/arch/ia64/include/db_machdep.h:1.5 --- src/sys/arch/ia64/include/db_machdep.h:1.4 Mon Nov 6 03:47:47 2017 +++ src/sys/arch/ia64/include/db_machdep.h Fri Oct 6 11:45:37 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: db_machdep.h,v 1.4 2017/11/06 03:47:47 christos Exp $ */ +/* $NetBSD: db_machdep.h,v 1.5 2023/10/06 11:45:37 skrll Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. @@ -76,8 +76,8 @@ extern db_regs_t *ddb_regp; /* pointer t #define ADDR_SLOT0(addr) ( (addr) & ~(0xFUL) ) #define SLOT_ADDR(addr) ( (addr) & (0xFUL) ) -/* breakpoint address. - * Check for violations of pseudo offsets above 2. +/* breakpoint address. + * Check for violations of pseudo offsets above 2. * Adjust for 32 bit shift within Bundle. */ Index: src/sys/arch/ia64/include/setjmp.h diff -u src/sys/arch/ia64/include/setjmp.h:1.4 src/sys/arch/ia64/include/setjmp.h:1.5 --- src/sys/arch/ia64/include/setjmp.h:1.4 Mon Jun 29 01:37:27 2020 +++ src/sys/arch/ia64/include/setjmp.h Fri Oct 6 11:45:37 2023 @@ -1,31 +1,31 @@ -/* $NetBSD: setjmp.h,v 1.4 2020/06/29 01:37:27 scole Exp $ */ +/* $NetBSD: setjmp.h,v 1.5 2023/10/06 11:45:37 skrll Exp $ */ /*- * Copyright (c) 2000 * Intel Corporation. * 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 Intel Corporation and * its contributors. - * + * * 4. Neither the name of Intel Corporation or its contributors may be * used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION 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 @@ -37,7 +37,7 @@ * 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. - * + * * $FreeBSD: src/sys/ia64/include/setjmp.h,v 1.12 2003/07/26 08:03:43 marcel Exp $ */ Index: src/sys/arch/ia64/include/ia64_cpu.h diff -u src/sys/arch/ia64/include/ia64_cpu.h:1.3 src/sys/arch/ia64/include/ia64_cpu.h:1.4 --- src/sys/arch/ia64/include/ia64_cpu.h:1.3 Mon Aug 8 12:25:35 2016 +++ src/sys/arch/ia64/include/ia64_cpu.h Fri Oct 6 11:45:37 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ia64_cpu.h,v 1.3 2016/08/08 12:25:35 scole Exp $ */ +/* $NetBSD: ia64_cpu.h,v 1.4 2023/10/06 11:45:37 skrll Exp $ */ /*- * Copyright (c) 2007 Marcel Moolenaar @@ -312,7 +312,7 @@ ia64_ld1(uint8_t *p) } static __inline uint16_t -ia64_ld2(uint16_t *p) +ia64_ld2(uint16_t *p) { uint16_t v; @@ -321,7 +321,7 @@ ia64_ld2(uint16_t *p) } static __inline uint32_t -ia64_ld4(uint32_t *p) +ia64_ld4(uint32_t *p) { uint32_t v; @@ -330,7 +330,7 @@ ia64_ld4(uint32_t *p) } static __inline uint64_t -ia64_ld8(uint64_t *p) +ia64_ld8(uint64_t *p) { uint64_t v; Index: src/sys/arch/ia64/include/intrdefs.h diff -u src/sys/arch/ia64/include/intrdefs.h:1.3 src/sys/arch/ia64/include/intrdefs.h:1.4 --- src/sys/arch/ia64/include/intrdefs.h:1.3 Mon Apr 28 20:23:25 2008 +++ src/sys/arch/ia64/include/intrdefs.h Fri Oct 6 11:45:37 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: intrdefs.h,v 1.3 2008/04/28 20:23:25 martin Exp $ */ +/* $NetBSD: intrdefs.h,v 1.4 2023/10/06 11:45:37 skrll Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -15,7 +15,7 @@ * 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. - * + * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 Index: src/sys/arch/ia64/include/loadfile_machdep.h diff -u src/sys/arch/ia64/include/loadfile_machdep.h:1.3 src/sys/arch/ia64/include/loadfile_machdep.h:1.4 --- src/sys/arch/ia64/include/loadfile_machdep.h:1.3 Wed Aug 6 21:57:49 2014 +++ src/sys/arch/ia64/include/loadfile_machdep.h Fri Oct 6 11:45:37 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: loadfile_machdep.h,v 1.3 2014/08/06 21:57:49 joerg Exp $ */ +/* $NetBSD: loadfile_machdep.h,v 1.4 2023/10/06 11:45:37 skrll Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ extern vsize_t ia64_unwindtablen; #ifdef _STANDALONE /* XXX: cherry: This whole thing is glue between the NetBSD pread/vpbcopy etc. etc - * and the FreeBSD kern_pread/bzero etc. etc. Needs to be cleaned up + * and the FreeBSD kern_pread/bzero etc. etc. Needs to be cleaned up * after discussion. */ Index: src/sys/arch/ia64/include/int_limits.h diff -u src/sys/arch/ia64/include/int_limits.h:1.5 src/sys/arch/ia64/include/int_limits.h:1.6 --- src/sys/arch/ia64/include/int_limits.h:1.5 Wed Aug 13 22:31:06 2014 +++ src/sys/arch/ia64/include/int_limits.h Fri Oct 6 11:45:37 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: int_limits.h,v 1.5 2014/08/13 22:31:06 matt Exp $ */ +/* $NetBSD: int_limits.h,v 1.6 2023/10/06 11:45:37 skrll Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -80,7 +80,7 @@ #define UINT_LEAST64_MAX 0xffffffffffffffffUL /* uint_least64_t */ /* 7.18.2.3 Limits of fastest minimum-width integer types */ - + /* minimum values of fastest minimum-width signed integer types */ #define INT_FAST8_MIN (-0x7fffffff-1) /* int_fast8_t */ #define INT_FAST16_MIN (-0x7fffffff-1) /* int_fast16_t */ Index: src/sys/arch/ia64/include/lock.h diff -u src/sys/arch/ia64/include/lock.h:1.9 src/sys/arch/ia64/include/lock.h:1.10 --- src/sys/arch/ia64/include/lock.h:1.9 Sat Feb 12 17:17:53 2022 +++ src/sys/arch/ia64/include/lock.h Fri Oct 6 11:45:37 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: lock.h,v 1.9 2022/02/12 17:17:53 riastradh Exp $ */ +/* $NetBSD: lock.h,v 1.10 2023/10/06 11:45:37 skrll Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -91,7 +91,7 @@ __cpu_simple_lock_try(__cpu_simple_lock_ uint8_t val; val = __SIMPLELOCK_LOCKED; - __asm volatile ("xchg1 %0=[%1],%2" : + __asm volatile ("xchg1 %0=[%1],%2" : "=r" (val) :"r" (lockp), "r" (val) :"memory"); Index: src/sys/arch/ia64/include/param.h diff -u src/sys/arch/ia64/include/param.h:1.11 src/sys/arch/ia64/include/param.h:1.12 --- src/sys/arch/ia64/include/param.h:1.11 Mon May 31 14:38:55 2021 +++ src/sys/arch/ia64/include/param.h Fri Oct 6 11:45:37 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.11 2021/05/31 14:38:55 simonb Exp $ */ + /* $NetBSD: param.h,v 1.12 2023/10/06 11:45:37 skrll Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -118,10 +118,10 @@ #define ia64_round_page(x) ((((unsigned long)(x)) + NBPG - 1) & ~(NBPG - 1)) #define ia64_trunc_page(x) ((unsigned long)(x) & ~(NBPG - 1)) - + #define ia64_btop(x) ((unsigned long)(x) >> PGSHIFT) -#define ia64_ptob(x) ((unsigned long)(x) << PGSHIFT) - +#define ia64_ptob(x) ((unsigned long)(x) << PGSHIFT) + #ifdef _KERNEL #ifndef _LOCORE Index: src/sys/arch/ia64/include/vmparam.h diff -u src/sys/arch/ia64/include/vmparam.h:1.11 src/sys/arch/ia64/include/vmparam.h:1.12 --- src/sys/arch/ia64/include/vmparam.h:1.11 Fri Mar 29 16:04:54 2019 +++ src/sys/arch/ia64/include/vmparam.h Fri Oct 6 11:45:37 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.11 2019/03/29 16:04:54 scole Exp $ */ +/* $NetBSD: vmparam.h,v 1.12 2023/10/06 11:45:37 skrll Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -123,7 +123,7 @@ #define IA64_PBVM_PAGE_SHIFT 16 /* 64KB */ #define IA64_PBVM_PAGE_SIZE (1 << IA64_PBVM_PAGE_SHIFT) #define IA64_PBVM_PAGE_MASK (IA64_PBVM_PAGE_SIZE - 1) - + #define IA64_ID_PAGE_SHIFT 28 /* 256M */ #define IA64_ID_PAGE_SIZE (1 << IA64_ID_PAGE_SHIFT) #define IA64_ID_PAGE_MASK (IA64_ID_PAGE_SIZE-1) Index: src/sys/arch/ia64/include/proc.h diff -u src/sys/arch/ia64/include/proc.h:1.10 src/sys/arch/ia64/include/proc.h:1.11 --- src/sys/arch/ia64/include/proc.h:1.10 Sat Dec 29 20:06:49 2018 +++ src/sys/arch/ia64/include/proc.h Fri Oct 6 11:45:37 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: proc.h,v 1.10 2018/12/29 20:06:49 scole Exp $ */ +/* $NetBSD: proc.h,v 1.11 2023/10/06 11:45:37 skrll Exp $ */ #ifndef _IA64_PROC_H_ #define _IA64_PROC_H_ @@ -8,7 +8,7 @@ /* * Process u-area is organised as follows: * - * ------------------------------------------- + * ------------------------------------------- * | | | | | * | bspstore sp | 16bytes | TF | PCB | * | ----> <--- | | | | Index: src/sys/arch/ia64/include/userret.h diff -u src/sys/arch/ia64/include/userret.h:1.1 src/sys/arch/ia64/include/userret.h:1.2 --- src/sys/arch/ia64/include/userret.h:1.1 Mon Jul 20 04:41:37 2009 +++ src/sys/arch/ia64/include/userret.h Fri Oct 6 11:45:37 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: userret.h,v 1.1 2009/07/20 04:41:37 kiyohara Exp $ */ + /* $NetBSD: userret.h,v 1.2 2023/10/06 11:45:37 skrll Exp $ */ /* * Copyright (c) 2009 KIYOHARA Takashi * All rights reserved.