Date: Sun, 2 Mar 2003 06:43:05 -0800 (PST) From: Serguei Tzukanov <tzukanov@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 26198 for review Message-ID: <200303021443.h22Eh5Wf044944@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=26198 Change 26198 by tzukanov@tzukanov_antares on 2003/03/02 06:42:18 Post-TFC fixes. Affected files ... .. //depot/projects/s390/sys/conf/Makefile.s390#3 edit .. //depot/projects/s390/sys/conf/files.s390#3 edit .. //depot/projects/s390/sys/s390/include/pmap.h#2 edit .. //depot/projects/s390/sys/s390/s390/dat.h#2 edit .. //depot/projects/s390/sys/s390/s390/hmcsc.c#5 edit .. //depot/projects/s390/sys/s390/s390/mem.c#3 edit .. //depot/projects/s390/sys/s390/s390/pmap.c#9 edit .. //depot/projects/s390/sys/s390/s390/trap.c#5 edit Differences ... ==== //depot/projects/s390/sys/conf/Makefile.s390#3 (text+ko) ==== @@ -33,10 +33,6 @@ WERROR= -CWARNFLAGS= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ - -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ - -ansi - FMT= # Which version of config(8) is required. @@ -44,8 +40,6 @@ STD8X16FONT?= iso -HACK_EXTRA_FLAGS=-Wl,-shared - .if !defined(S) .if exists(./@/.) S= ./@ @@ -55,12 +49,8 @@ .endif .include "$S/conf/kern.pre.mk" -# XXX: this should probably go somewhere else -COPTS+= +MDOBJS= -SYSTEM_SFILES= -SYSTEM_OBJS= vnode_if.o ${OBJS} hints.o env.o config.o hack.So - %BEFORE_DEPEND %OBJS @@ -73,12 +63,6 @@ %CLEAN -#lint: /tmp -# @lint -hbxn -DGENERIC -Dvolatile= ${COPTS} \ -# $S/$M/$M/Locore.c ${CFILES} | \ -# grep -v 'struct/union .* never defined' | \ -# grep -v 'possible pointer alignment problem' - %RULES .include "$S/conf/kern.post.mk" ==== //depot/projects/s390/sys/conf/files.s390#3 (text+ko) ==== @@ -80,7 +80,7 @@ s390/s390/in_cksum.S optional inet s390/s390/in6_cksum.S optional inet6 s390/s390/iucv.c optional iucv -s390/s390/locore.S standard +s390/s390/locore.S standard no-obj s390/s390/machdep.c standard s390/s390/mcheck.c standard s390/s390/mem.c standard ==== //depot/projects/s390/sys/s390/include/pmap.h#2 (text+ko) ==== @@ -67,7 +67,6 @@ TAILQ_HEAD(,pv_entry) pm_pvlist; /* list of mappings in pmap */ u_int pm_active; /* active on cpus */ struct pmap_statistics pm_stats; /* pmap statistics */ - struct vm_page * pm_ptphint; /* pmap ptp hint */ }; #define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) ==== //depot/projects/s390/sys/s390/s390/dat.h#2 (text+ko) ==== @@ -46,11 +46,7 @@ /* Segment-table entry. */ typedef u_long ste_t; -#define STESIZE sizeof(ste_t) - /* Page-table entry. */ typedef u_long pte_t; -#define PTESIZE sizeof(pte_t) - #endif /* !_ESA_DAT_H_ */ ==== //depot/projects/s390/sys/s390/s390/hmcsc.c#5 (text+ko) ==== @@ -170,7 +170,7 @@ #endif static int -hmcsc_cngetc(dev_t dev) +hmcsc_cngetc(struct consdev *cn) { int c; @@ -195,7 +195,7 @@ } static int -hmcsc_cncheckc(dev_t dev) +hmcsc_cncheckc(struct consdev *cn) { int c = -1; @@ -208,7 +208,7 @@ } static void -hmcsc_cnputc(dev_t dev, int c) +hmcsc_cnputc(struct consdev *cn, int c) { mtx_lock_spin(&hmcsc_lock); if ((c == '\n') || (outcur >= HMCSC_BUF_LEN)) @@ -219,7 +219,7 @@ } CONS_DRIVER -(hmcsc, hmcsc_cnprobe, hmcsc_cninit, 0, hmcsc_cngetc, hmcsc_cncheckc, hmcsc_cnputc, 0); +(hmcsc, hmcsc_cnprobe, hmcsc_cninit, NULL, hmcsc_cngetc, hmcsc_cncheckc, hmcsc_cnputc, NULL); static int hmcsc_param(struct tty *tp, struct termios *t) @@ -237,7 +237,7 @@ tp->t_state |= TS_BUSY; while (tp->t_outq.c_cc != 0) - hmcsc_cnputc(tp->t_dev, getc(&tp->t_outq)); + hmcsc_cnputc(NULL, getc(&tp->t_outq)); tp->t_state &= ~TS_BUSY; @@ -262,7 +262,7 @@ if (outcur) hmcsc_flush(); - while ((c = hmcsc_cncheckc(tp->t_dev)) != -1) { + while ((c = hmcsc_cncheckc(NULL)) != -1) { if (tp->t_state & TS_ISOPEN) (*linesw[tp->t_line].l_rint)(c, tp); } ==== //depot/projects/s390/sys/s390/s390/mem.c#3 (text+ko) ==== @@ -153,17 +153,20 @@ } static int -memmmap(dev_t dev, vm_offset_t offset, int prot) +memmmap(dev_t dev, vm_offset_t offset, vm_offset_t *paddr, int prot) { switch (minor(dev)) { case 1: - offset = lra(offset); - /* fall through */ + *paddr = lra(offset); + break; case 0: - return atop(offset); + *paddr = offset; + break; default: return -1; } + + return 0; } #define CDEV_MAJOR 2 ==== //depot/projects/s390/sys/s390/s390/pmap.c#9 (text+ko) ==== @@ -353,7 +353,7 @@ vm_offset_t ptepa = STE_PTO(ste); pte_t pte; - for (i = 0; i < 256; i++, ptepa += PTESIZE) { + for (i = 0; i < 256; i++, ptepa += sizeof(pte_t)) { pte = lura(ptepa); KASSERT(pte & PTE_INVALID, @@ -428,9 +428,6 @@ pmap->pm_stats.resident_count--; - if (pmap->pm_ptphint == mpte) - pmap->pm_ptphint = NULL; - /* Free the page if it is finally unwired. */ if (--mpte->wire_count == 0) { CTR0(KTR_PMAP, "\t\tmpte->wire_count == 0"); @@ -475,14 +472,13 @@ if (mpte == NULL) { vm_pindex_t pindex = VA_SX(va) >> 2; - if (pmap->pm_ptphint && - (pmap->pm_ptphint->pindex == pindex)) { - mpte = pmap->pm_ptphint; + if (pmap->pm_pteobj->root && + (pmap->pm_pteobj->root->pindex == pindex)) { + mpte = pmap->pm_pteobj->root; } else { while ((mpte = vm_page_lookup(pmap->pm_pteobj, pindex)) != NULL && vm_page_sleep_if_busy(mpte, FALSE, "pulook")) vm_page_lock_queues(); - pmap->pm_ptphint = mpte; } KASSERT(mpte != NULL, ("pmap_unuse_ptp: mpte == NULL")); } @@ -600,14 +596,11 @@ /* Set invalid flag in the four page tables. */ ptepa = VM_PAGE_TO_PHYS(mpte); - for (i = 0; i < NPTEP; i++, ptepa += PTESIZE) + for (i = 0; i < NPTEP; i++, ptepa += sizeof(pte_t)) stura(ptepa, PTE_INVALID); pmap_set_ste_quad(&pmap->pm_sto[ptindex & ~3ul], ptepa - PAGE_SIZE); - /* Set the page table page hint. */ - pmap->pm_ptphint = mpte; - vm_page_lock_queues(); mpte->valid = VM_PAGE_BITS_ALL; vm_page_flag_clear(mpte, PG_ZERO); @@ -629,12 +622,11 @@ ste = pmap->pm_sto[ptindex]; CTR1(KTR_PMAP, "\tste = %x", ste); if (ste_valid(ste)) { - if (pmap->pm_ptphint && - (pmap->pm_ptphint->pindex == (ptindex >> 2))) { - mpte = pmap->pm_ptphint; + if (pmap->pm_pteobj->root && + (pmap->pm_pteobj->root->pindex == (ptindex >> 2))) { + mpte = pmap->pm_pteobj->root; } else { mpte = pmap_page_lookup(pmap->pm_pteobj, (ptindex >> 2)); - pmap->pm_ptphint = mpte; } KASSERT(mpte != NULL, ("pmap_get_pte: mpte == NULL")); mpte->hold_count++; @@ -700,9 +692,6 @@ else pmap_clear_ste_quad(&pmap->pm_sto[m->pindex << 2]); - if (pmap->pm_ptphint == m) - pmap->pm_ptphint = NULL; - m->wire_count--; cnt.v_wire_count--; vm_page_free(m); @@ -1223,12 +1212,6 @@ } } -vm_offset_t -pmap_phys_address(int ppn) -{ - return ptoa(ppn); -} - void pmap_pinit(pmap_t pmap) { @@ -1257,7 +1240,6 @@ pmap->pm_sto[i] = STE_INVALID; pmap->pm_active = 0; - pmap->pm_ptphint = NULL; TAILQ_INIT(&pmap->pm_pvlist); bzero(&pmap->pm_stats, sizeof(pmap->pm_stats)); } @@ -1268,7 +1250,6 @@ CTR1(KTR_PMAP, "pmap_pinit0: pmap = %p", pmap); pmap->pm_sto = proc0sto; - pmap->pm_ptphint = NULL; pmap->pm_active = 0; TAILQ_INIT(&pmap->pm_pvlist); bzero(&pmap->pm_stats, sizeof(pmap->pm_stats)); ==== //depot/projects/s390/sys/s390/s390/trap.c#5 (text+ko) ==== @@ -50,7 +50,6 @@ #include <sys/kernel.h> #include <sys/lock.h> #include <sys/ktr.h> -#include <sys/kse.h> #include <sys/mutex.h> #include <sys/resourcevar.h> #include <sys/signalvar.h> @@ -510,7 +509,7 @@ if (td->td_ucred != p->p_ucred) cred_update_thread(td); - if (p->p_flag & P_KSES) + if (p->p_flag & P_THREADED) thread_user_enter(p, td); code = tf->tf_gpr[0]; 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?200303021443.h22Eh5Wf044944>