? sys/cscope.out ? sys/arch/aarch64/aarch64/locore.S.new ? sys/arch/evbarm/conf/GENERIC.local ? sys/arch/evbarm/conf/GENERIC_SAN ? sys/arch/evbmips/conf/OCTEON.MP ? sys/uvm/pmap/cscope.out Index: sys/arch/hppa/conf/Makefile.hppa =================================================================== RCS file: /cvsroot/src/sys/arch/hppa/conf/Makefile.hppa,v retrieving revision 1.7 diff -u -p -r1.7 Makefile.hppa --- sys/arch/hppa/conf/Makefile.hppa 7 Sep 2020 02:22:27 -0000 1.7 +++ sys/arch/hppa/conf/Makefile.hppa 14 Sep 2020 07:30:13 -0000 @@ -32,7 +32,6 @@ GENASSYM_CONF= ${HPPA}/hppa/genassym.cf ## CPPFLAGS+= -Dhppa CFLAGS+= -mpa-risc-1-1 -msoft-float -mdisable-fpregs -CWARNFLAGS.gcc+=${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 9:? -Wno-error=array-bounds :} .include "${HPPA}/spmath/Makefile.inc" Index: sys/arch/hppa/hppa/machdep.c =================================================================== RCS file: /cvsroot/src/sys/arch/hppa/hppa/machdep.c,v retrieving revision 1.15 diff -u -p -r1.15 machdep.c --- sys/arch/hppa/hppa/machdep.c 8 Sep 2020 06:13:53 -0000 1.15 +++ sys/arch/hppa/hppa/machdep.c 14 Sep 2020 07:30:13 -0000 @@ -489,19 +489,19 @@ hppa_init(paddr_t start, void *bi) DPRINTF(("SPID bits: 0x%x, error = %d\n", pdc_spidbits.spidbits, error)); /* Calculate the OS_HPMC handler checksums. */ - p = &os_hpmc; + p = os_hpmc; if (pdcproc_instr(p)) *p = 0x08000240; p[7] = ((char *) &os_hpmc_cont_end) - ((char *) &os_hpmc_cont); p[6] = (u_int) &os_hpmc_cont; p[5] = -(p[0] + p[1] + p[2] + p[3] + p[4] + p[6] + p[7]); p = &os_hpmc_cont; - q = (&os_hpmc_cont_end - 1); + q = os_hpmc_checksum; for (*q = 0; p < q; *q -= *(p++)); /* Calculate the OS_TOC handler checksum. */ p = (u_int *) &os_toc; - q = (&os_toc_end - 1); + q = os_toc_checksum; for (*q = 0; p < q; *q -= *(p++)); /* Install the OS_TOC handler. */ Index: sys/arch/hppa/hppa/machdep.h =================================================================== RCS file: /cvsroot/src/sys/arch/hppa/hppa/machdep.h,v retrieving revision 1.18 diff -u -p -r1.18 machdep.h --- sys/arch/hppa/hppa/machdep.h 15 Apr 2019 20:45:08 -0000 1.18 +++ sys/arch/hppa/hppa/machdep.h 14 Sep 2020 07:30:13 -0000 @@ -95,11 +95,15 @@ void hppa_ktext_stw(vaddr_t, int); void hppa_ktext_stb(vaddr_t, char); /* Machine check handling. */ -extern u_int os_hpmc; +extern u_int os_hpmc[8]; extern u_int os_hpmc_cont; extern u_int os_hpmc_cont_end; +extern u_int os_hpmc_checksum[1]; + int os_toc(void); extern u_int os_toc_end; +extern u_int os_toc_checksum[1]; + void hppa_machine_check(int); /* BTLB handling. */ Index: sys/arch/hppa/hppa/trap.S =================================================================== RCS file: /cvsroot/src/sys/arch/hppa/hppa/trap.S,v retrieving revision 1.72 diff -u -p -r1.72 trap.S --- sys/arch/hppa/hppa/trap.S 16 Apr 2019 07:08:46 -0000 1.72 +++ sys/arch/hppa/hppa/trap.S 14 Sep 2020 07:30:13 -0000 @@ -841,8 +841,11 @@ L$check_do_rfi: nop nop nop + +ALTENTRY(os_hpmc_checksum) nop ALTENTRY(os_hpmc_cont_end) +ALTENTRY(os_toc_checksum) nop ALTENTRY(os_toc_end) EXIT(TLABEL(hpmc)) Index: sys/arch/mips/include/mips_param.h =================================================================== RCS file: /cvsroot/src/sys/arch/mips/include/mips_param.h,v retrieving revision 1.47 diff -u -p -r1.47 mips_param.h --- sys/arch/mips/include/mips_param.h 26 Aug 2020 10:51:45 -0000 1.47 +++ sys/arch/mips/include/mips_param.h 14 Sep 2020 07:30:13 -0000 @@ -80,12 +80,18 @@ #define MSGBUFSIZE NBPG /* default message buffer size */ #endif +#if 1 /* * Most MIPS have a cache line size of 32 bytes, but Cavium chips * have a line size 128 bytes and we need to cover the larger size. */ #define COHERENCY_UNIT 128 #define CACHE_LINE_SIZE 128 +#else +#ifndef COHERENCY_UNIT +#define COHERENCY_UNIT 32 +#endif +#endif #ifdef ENABLE_MIPS_16KB_PAGE #define PGSHIFT 14 /* LOG2(NBPG) */ Index: sys/dev/ata/ata_raid.c =================================================================== RCS file: /cvsroot/src/sys/dev/ata/ata_raid.c,v retrieving revision 1.43 diff -u -p -r1.43 ata_raid.c --- sys/dev/ata/ata_raid.c 25 Aug 2020 13:42:09 -0000 1.43 +++ sys/dev/ata/ata_raid.c 14 Sep 2020 07:30:13 -0000 @@ -176,7 +176,7 @@ ata_raid_finalize(device_t self) ataraid_cd.cd_name); out: - return 1; + return 0; } /* Index: sys/dev/raidframe/rf_netbsdkintf.c =================================================================== RCS file: /cvsroot/src/sys/dev/raidframe/rf_netbsdkintf.c,v retrieving revision 1.389 diff -u -p -r1.389 rf_netbsdkintf.c --- sys/dev/raidframe/rf_netbsdkintf.c 25 Aug 2020 13:50:00 -0000 1.389 +++ sys/dev/raidframe/rf_netbsdkintf.c 14 Sep 2020 07:30:13 -0000 @@ -432,7 +432,7 @@ rf_autoconfig(device_t self) */ rf_buildroothack(config_sets); - return 1; + return 0; } int