Date: Sat, 8 Feb 2003 08:42:10 -0800 (PST) From: Serguei Tzukanov <tzukanov@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 24826 for review Message-ID: <200302081642.h18GgAfI082376@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=24826 Change 24826 by tzukanov@tzukanov_antares on 2003/02/08 08:41:32 Compilation fixes. Affected files ... .. //depot/projects/s390/lib/csu/s390/crt1.c#2 edit .. //depot/projects/s390/secure/lib/libcrypto/opensslconf-s390.h#2 edit .. //depot/projects/s390/secure/lib/libcrypto/opensslconf-s390x.h#2 edit .. //depot/projects/s390/sys/conf/files.s390#2 edit .. //depot/projects/s390/sys/s390/conf/GENERIC#6 edit .. //depot/projects/s390/sys/s390/s390/clock.c#2 edit .. //depot/projects/s390/sys/s390/s390/elf_machdep.c#4 edit .. //depot/projects/s390/sys/s390/s390/identcpu.c#3 edit .. //depot/projects/s390/sys/s390/s390/vm_machdep.c#6 edit Differences ... ==== //depot/projects/s390/lib/csu/s390/crt1.c#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* LINTLIBRARY */ /*- * Copyright 1996-1998 John D. Polstra. * All rights reserved. ==== //depot/projects/s390/secure/lib/libcrypto/opensslconf-s390.h#2 (text+ko) ==== @@ -64,7 +64,7 @@ #endif #endif -#if defined(HEADER_DES_H) && !defined(DES_LONG) +#if (defined(HEADER_DES_H) || defined(HEADER_NEW_DES_H)) && !defined(DES_LONG) /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #ifndef DES_LONG @@ -173,3 +173,6 @@ #endif /* DES_DEFAULT_OPTIONS */ #endif /* HEADER_DES_LOCL_H */ +/* The Kerberos 5 support is MIT-specific. */ +#define OPENSSL_NO_KRB5 + ==== //depot/projects/s390/secure/lib/libcrypto/opensslconf-s390x.h#2 (text+ko) ==== @@ -64,7 +64,7 @@ #endif #endif -#if defined(HEADER_DES_H) && !defined(DES_LONG) +#if (defined(HEADER_DES_H) || defined(HEADER_NEW_DES_H)) && !defined(DES_LONG) /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #ifndef DES_LONG @@ -173,3 +173,6 @@ #endif /* DES_DEFAULT_OPTIONS */ #endif /* HEADER_DES_LOCL_H */ +/* The Kerberos 5 support is MIT-specific. */ +#define OPENSSL_NO_KRB5 + ==== //depot/projects/s390/sys/conf/files.s390#2 (text+ko) ==== @@ -34,8 +34,6 @@ dev/dasd/dasd_if.m optional dasd dev/dasd/dasd.c optional dasd -kern/subr_diskmbr.c standard - libkern/ashldi3.c standard libkern/ashrdi3.c standard libkern/divdi3.c standard ==== //depot/projects/s390/sys/s390/conf/GENERIC#6 (text+ko) ==== @@ -49,8 +49,7 @@ #options SMP -options NO_GEOM - +options SCHED_4BSD # 4BSD scheduler options FFS # Berkeley Fast Filesystem options SOFTUPDATES options PROCFS # Process filesystem (requires PSEUDOFS) ==== //depot/projects/s390/sys/s390/s390/clock.c#2 (text+ko) ==== @@ -213,7 +213,12 @@ } void -setstatclockrate(int hzrate) +cpu_startprofclock(void) +{ +} + +void +cpu_stopprofclock(void) { - printf("setstatclockrate(%d) called.\n", hzrate); } + ==== //depot/projects/s390/sys/s390/s390/elf_machdep.c#4 (text+ko) ==== @@ -131,8 +131,8 @@ (sysinit_cfunc_t)elf32_insert_brand_entry, &freebsd_brand_info); -int -elf_reloc(linker_file_t lf, const void *data, int type) +static int +elf_reloc_internal(linker_file_t lf, const void *data, int type, int local) { Elf_Addr A, *where = NULL; /* XXX */ const Elf_Rela *rela; @@ -206,6 +206,18 @@ } int +elf_reloc(linker_file_t lf, const void *data, int type) +{ + return elf_reloc_internal(lf, data, type, 0); +} + +int +elf_reloc_local(linker_file_t lf, const void *data, int type) +{ + return elf_reloc_internal(lf, data, type, 1); +} + +int elf_cpu_load_file(linker_file_t lf __unused) { return 0; ==== //depot/projects/s390/sys/s390/s390/identcpu.c#3 (text+ko) ==== @@ -130,7 +130,9 @@ __asm volatile (" efpc %%r0, 0" ::: "r0"); #endif esa_features |= ESA_FEATURE_AFP_FLAG; +#if 0 post_AFP: +#endif cr_clear(CR0, CR0_AFP_REGISTER); esa_features |= ESA_FEATURE_MVPG_FLAG; ==== //depot/projects/s390/sys/s390/s390/vm_machdep.c#6 (text+ko) ==== @@ -185,75 +185,6 @@ { } -int -vm_fault_quick(caddr_t v, int prot) -{ - if (prot & VM_PROT_WRITE) - return subyte(v, fubyte(v)); - else - return fubyte(v); -} - -void -vmapbuf(struct buf *bp) -{ - caddr_t va, kva, va_end; - vm_offset_t pa; - vm_page_t m; - int pindex; - - GIANT_REQUIRED; - - CTR1(KTR_PMAP, "vmapbuf: bp = %p", bp); - - KASSERT(bp->b_flags & B_PHYS, ("vmapbuf: not user I/O")); - - va_end = bp->b_data + bp->b_bufsize; - for (va = (caddr_t)trunc_page(bp->b_data), pindex = 0; - va < va_end; - va += PAGE_SIZE, pindex++) { - vm_fault_quick((va >= bp->b_data) ? va : bp->b_data, - (bp->b_iocmd == BIO_READ) - ? (VM_PROT_READ | VM_PROT_WRITE) - : VM_PROT_READ); - pa = trunc_page(vtophys(va)); - m = PHYS_TO_VM_PAGE(pa); - vm_page_hold(m); - bp->b_pages[pindex] = m; - } - KASSERT(pindex <= btoc(MAXPHYS), - ("vmapbuf: mapped more than MAXPHYS")); - pmap_qenter((vm_offset_t)bp->b_saveaddr, bp->b_pages, pindex); - - kva = bp->b_saveaddr; - bp->b_npages = pindex; - bp->b_saveaddr = bp->b_data; - bp->b_data = kva + ((vm_offset_t)bp->b_data & PAGE_MASK); -} - -void -vunmapbuf(struct buf *bp) -{ - vm_page_t *m; - int npages; - - GIANT_REQUIRED; - - CTR1(KTR_PMAP, "vunmapbuf: bp = %p", bp); - - KASSERT(bp->b_flags & B_PHYS, ("vunmapbuf: not user I/O")); - - npages = bp->b_npages; - pmap_qremove(trunc_page(bp->b_data), npages); - m = bp->b_pages; - vm_page_lock_queues(); - while (npages--) - vm_page_unhold(*m++); - vm_page_unlock_queues(); - - bp->b_data = bp->b_saveaddr; -} - void cpu_reset(void) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302081642.h18GgAfI082376>