svn commit: r342843 - head/sys/dev/pccard
Author: imp
Date: Mon Jan 7 06:19:51 2019
New Revision: 342843
URL: https://svnweb.freebsd.org/changeset/base/342843
Log:
Fix a race between setting up the interrupt handler and it firing by
setting the data prior to setting up the interrupt. Now we only set
the cookie afterwards, and that (a) cannot be helpd and (b) isn't used
in the ISR.
PR: 147127
Submitted by: hps@
Modified:
head/sys/dev/pccard/pccard.c
Modified: head/sys/dev/pccard/pccard.c
==
--- head/sys/dev/pccard/pccard.cMon Jan 7 05:59:58 2019
(r342842)
+++ head/sys/dev/pccard/pccard.cMon Jan 7 06:19:51 2019
(r342843)
@@ -1272,13 +1272,16 @@ pccard_setup_intr(device_t dev, device_t child, struct
if (pf->intr_filter != NULL || pf->intr_handler != NULL)
panic("Only one interrupt handler per function allowed");
- err = bus_generic_setup_intr(dev, child, irq, flags, pccard_filter,
- intr ? pccard_intr : NULL, pf, cookiep);
- if (err != 0)
- return (err);
pf->intr_filter = filt;
pf->intr_handler = intr;
pf->intr_handler_arg = arg;
+ err = bus_generic_setup_intr(dev, child, irq, flags, pccard_filter,
+ intr ? pccard_intr : NULL, pf, cookiep);
+ if (err != 0) {
+ pf->intr_filter = NULL;
+ pf->intr_handler = NULL;
+ return (err);
+ }
pf->intr_handler_cookie = *cookiep;
if (pccard_mfc(sc)) {
pccard_ccr_write(pf, PCCARD_CCR_OPTION,
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r342842 - head/sys/dev/pccbb
Author: imp Date: Mon Jan 7 05:59:58 2019 New Revision: 342842 URL: https://svnweb.freebsd.org/changeset/base/342842 Log: Fix TI PCI1520 PCI Cardbus bridge, but others affected. On system with Celeron 1.5GHz CPU, sometimes when a PCMCIA to Compact Flash adapter containing a Compact Flash card is inserted in the cardbus slot the system hangs. This problem has not been observed in systems with a 2.8GHz XEON CPU or faster. Analysis of the cbb driver shows functional interrupts are routed to PCI BEFORE the interrupt handler for functional interrupts has been registered. Fix applied as described in the bug. PR: 128040 Submitted by: Arthur Hartwig Modified: head/sys/dev/pccbb/pccbb.c Modified: head/sys/dev/pccbb/pccbb.c == --- head/sys/dev/pccbb/pccbb.c Mon Jan 7 05:58:55 2019(r342841) +++ head/sys/dev/pccbb/pccbb.c Mon Jan 7 05:59:58 2019(r342842) @@ -275,6 +275,8 @@ cbb_enable_func_intr(struct cbb_softc *sc) reg = (exca_getb(>exca[0], EXCA_INTR) & ~EXCA_INTR_IRQ_MASK) | EXCA_INTR_IRQ_NONE; exca_putb(>exca[0], EXCA_INTR, reg); + PCI_MASK_CONFIG(sc->dev, CBBR_BRIDGECTRL, + & ~CBBM_BRIDGECTRL_INTR_IREQ_ISA_EN, 2); } int @@ -873,8 +875,6 @@ cbb_power(device_t brdev, int volts) reg_ctrl &= ~TOPIC97_REG_CTRL_CLKRUN_ENA; pci_write_config(sc->dev, TOPIC_REG_CTRL, reg_ctrl, 4); } - PCI_MASK_CONFIG(brdev, CBBR_BRIDGECTRL, - & ~CBBM_BRIDGECTRL_INTR_IREQ_ISA_EN, 2); retval = 1; done:; if (volts != 0 && sc->chipset == CB_O2MICRO) ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r342840 - in head: share/mk stand tools/build/options
Author: imp
Date: Mon Jan 7 05:49:27 2019
New Revision: 342840
URL: https://svnweb.freebsd.org/changeset/base/342840
Log:
Create MK_LOADER_VERBOSE and connect it to ELF_VERBOSE in the loader
code.
PR: 18498
Submitted by: mellon at pobox dot com
Added:
head/tools/build/options/WITH_LOADER_VERBOSE (contents, props changed)
Modified:
head/share/mk/src.opts.mk
head/stand/loader.mk
Modified: head/share/mk/src.opts.mk
==
--- head/share/mk/src.opts.mk Mon Jan 7 05:31:40 2019(r342839)
+++ head/share/mk/src.opts.mk Mon Jan 7 05:49:27 2019(r342840)
@@ -204,6 +204,7 @@ __DEFAULT_NO_OPTIONS = \
LIBSOFT \
LOADER_FIREWIRE \
LOADER_FORCE_LE \
+LOADER_VERBOSE \
NAND \
OFED_EXTRA \
OPENLDAP \
Modified: head/stand/loader.mk
==
--- head/stand/loader.mkMon Jan 7 05:31:40 2019(r342839)
+++ head/stand/loader.mkMon Jan 7 05:49:27 2019(r342840)
@@ -155,6 +155,10 @@ vers.c: ${LDRSRC}/newvers.sh ${VERSION_FILE}
sh ${LDRSRC}/newvers.sh ${REPRO_FLAG} ${VERSION_FILE} \
${NEWVERSWHAT}
+.if ${MK_LOADER_VERBOSE} != "no"
+CFLAGS+= -DELF_VERBOSE
+.endif
+
.if !empty(HELP_FILES)
HELP_FILES+= ${LDRSRC}/help.common
Added: head/tools/build/options/WITH_LOADER_VERBOSE
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITH_LOADER_VERBOSEMon Jan 7 05:49:27
2019(r342840)
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to build with extra verbose debugging in the loader.
+May explode already nearly too large loader over the limit.
+Use with care.
+
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r342826 - head/sys/dev/ahci
Author: kib
Date: Mon Jan 7 02:39:40 2019
New Revision: 342826
URL: https://svnweb.freebsd.org/changeset/base/342826
Log:
Fix use of busdma(9) KPI in ahci(4).
Use BUS_DMA_NOWAIT for loads at initialization time.
Report actual numeric error code if any problem occurs at the
initialization.
Reported and tested by: pho
Reviewed by: mav
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Differential revision:https://reviews.freebsd.org/D18741
Modified:
head/sys/dev/ahci/ahci.c
Modified: head/sys/dev/ahci/ahci.c
==
--- head/sys/dev/ahci/ahci.cMon Jan 7 00:32:19 2019(r342825)
+++ head/sys/dev/ahci/ahci.cMon Jan 7 02:39:40 2019(r342826)
@@ -982,18 +982,22 @@ ahci_dmainit(device_t dev)
struct ahci_channel *ch = device_get_softc(dev);
struct ahci_dc_cb_args dcba;
size_t rfsize;
+ int error;
/* Command area. */
- if (bus_dma_tag_create(bus_get_dma_tag(dev), 1024, 0,
+ error = bus_dma_tag_create(bus_get_dma_tag(dev), 1024, 0,
BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR,
NULL, NULL, AHCI_WORK_SIZE, 1, AHCI_WORK_SIZE,
- 0, NULL, NULL, >dma.work_tag))
+ 0, NULL, NULL, >dma.work_tag);
+ if (error != 0)
goto error;
- if (bus_dmamem_alloc(ch->dma.work_tag, (void **)>dma.work,
- BUS_DMA_ZERO, >dma.work_map))
+ error = bus_dmamem_alloc(ch->dma.work_tag, (void **)>dma.work,
+ BUS_DMA_ZERO, >dma.work_map);
+ if (error != 0)
goto error;
- if (bus_dmamap_load(ch->dma.work_tag, ch->dma.work_map, ch->dma.work,
- AHCI_WORK_SIZE, ahci_dmasetupc_cb, , 0) || dcba.error) {
+ error = bus_dmamap_load(ch->dma.work_tag, ch->dma.work_map,
ch->dma.work,
+ AHCI_WORK_SIZE, ahci_dmasetupc_cb, , BUS_DMA_NOWAIT);
+ if (error != 0 || (error = dcba.error) != 0) {
bus_dmamem_free(ch->dma.work_tag, ch->dma.work,
ch->dma.work_map);
goto error;
}
@@ -1003,33 +1007,37 @@ ahci_dmainit(device_t dev)
rfsize = 4096;
else
rfsize = 256;
- if (bus_dma_tag_create(bus_get_dma_tag(dev), rfsize, 0,
+ error = bus_dma_tag_create(bus_get_dma_tag(dev), rfsize, 0,
BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR,
NULL, NULL, rfsize, 1, rfsize,
- 0, NULL, NULL, >dma.rfis_tag))
+ 0, NULL, NULL, >dma.rfis_tag);
+ if (error != 0)
goto error;
- if (bus_dmamem_alloc(ch->dma.rfis_tag, (void **)>dma.rfis, 0,
- >dma.rfis_map))
+ error = bus_dmamem_alloc(ch->dma.rfis_tag, (void **)>dma.rfis, 0,
+ >dma.rfis_map);
+ if (error != 0)
goto error;
- if (bus_dmamap_load(ch->dma.rfis_tag, ch->dma.rfis_map, ch->dma.rfis,
- rfsize, ahci_dmasetupc_cb, , 0) || dcba.error) {
+ error = bus_dmamap_load(ch->dma.rfis_tag, ch->dma.rfis_map,
ch->dma.rfis,
+ rfsize, ahci_dmasetupc_cb, , BUS_DMA_NOWAIT);
+ if (error != 0 || (error = dcba.error) != 0) {
bus_dmamem_free(ch->dma.rfis_tag, ch->dma.rfis,
ch->dma.rfis_map);
goto error;
}
ch->dma.rfis_bus = dcba.maddr;
/* Data area. */
- if (bus_dma_tag_create(bus_get_dma_tag(dev), 2, 0,
+ error = bus_dma_tag_create(bus_get_dma_tag(dev), 2, 0,
BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR,
NULL, NULL,
AHCI_SG_ENTRIES * PAGE_SIZE * ch->numslots,
AHCI_SG_ENTRIES, AHCI_PRD_MAX,
- 0, busdma_lock_mutex, >mtx, >dma.data_tag)) {
+ 0, busdma_lock_mutex, >mtx, >dma.data_tag);
+ if (error != 0)
goto error;
- }
return;
error:
- device_printf(dev, "WARNING - DMA initialization failed\n");
+ device_printf(dev, "WARNING - DMA initialization failed, error %d\n",
+ error);
ahci_dmafini(dev);
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r342823 - head/contrib/xz/src/common
Author: kib
Date: Sun Jan 6 23:59:04 2019
New Revision: 342823
URL: https://svnweb.freebsd.org/changeset/base/342823
Log:
Clamp tuklib_physmem() return value to SIZE_T_MAX.
On 32bit platforms it is possible to have (much) more physical RAM
than is mappable into single address space. In this case liblzma
scales the value into a request to mmap more address space than it is
theoretically possible.
Reported and tested by: pho
Reviewed by: delphij
Discussed with: emaste
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/contrib/xz/src/common/tuklib_physmem.c
Modified: head/contrib/xz/src/common/tuklib_physmem.c
==
--- head/contrib/xz/src/common/tuklib_physmem.c Sun Jan 6 23:43:12 2019
(r342822)
+++ head/contrib/xz/src/common/tuklib_physmem.c Sun Jan 6 23:59:04 2019
(r342823)
@@ -45,6 +45,7 @@
# include
#elif defined(TUKLIB_PHYSMEM_SYSCONF)
+# include
# include
#elif defined(TUKLIB_PHYSMEM_SYSCTL)
@@ -145,13 +146,16 @@ tuklib_physmem(void)
#elif defined(TUKLIB_PHYSMEM_SYSCONF)
const long pagesize = sysconf(_SC_PAGESIZE);
const long pages = sysconf(_SC_PHYS_PAGES);
- if (pagesize != -1 && pages != -1)
+ if (pagesize != -1 && pages != -1) {
// According to docs, pagesize * pages can overflow.
// Simple case is 32-bit box with 4 GiB or more RAM,
// which may report exactly 4 GiB of RAM, and "long"
// being 32-bit will overflow. Casting to uint64_t
// hopefully avoids overflows in the near future.
ret = (uint64_t)pagesize * (uint64_t)pages;
+ if (ret > SIZE_T_MAX)
+ ret = SIZE_T_MAX;
+ }
#elif defined(TUKLIB_PHYSMEM_SYSCTL)
int name[2] = {
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r342822 - head/sys/dev/asmc
Author: dab
Date: Sun Jan 6 23:43:12 2019
New Revision: 342822
URL: https://svnweb.freebsd.org/changeset/base/342822
Log:
asmc: Add support for Mac mini 4,1 (Mid-2010)
MFC after:1 week
Modified:
head/sys/dev/asmc/asmc.c
head/sys/dev/asmc/asmcvar.h
Modified: head/sys/dev/asmc/asmc.c
==
--- head/sys/dev/asmc/asmc.cSun Jan 6 22:50:16 2019(r342821)
+++ head/sys/dev/asmc/asmc.cSun Jan 6 23:43:12 2019(r342822)
@@ -151,6 +151,8 @@ static struct asmc_model *asmc_match(device_t dev);
asmc_mbp_sysctl_light_right, \
asmc_mbp_sysctl_light_control
+#define ASMC_LIGHT_FUNCS_DISABLED NULL, NULL, NULL
+
struct asmc_model asmc_models[] = {
{
"MacBook1,1", "Apple SMC MacBook Core Duo",
@@ -264,6 +266,15 @@ struct asmc_model asmc_models[] = {
ASMC_FAN_FUNCS,
NULL, NULL, NULL,
ASMC_MM31_TEMPS, ASMC_MM31_TEMPNAMES, ASMC_MM31_TEMPDESCS
+ },
+
+ /* The Mac Mini 4,1 (Mid-2010) has no SMS */
+ {
+ "Macmini4,1", "Apple SMC Mac mini 4,1 (Mid-2010)",
+ ASMC_SMS_FUNCS_DISABLED,
+ ASMC_FAN_FUNCS,
+ ASMC_LIGHT_FUNCS_DISABLED,
+ ASMC_MM41_TEMPS, ASMC_MM41_TEMPNAMES, ASMC_MM41_TEMPDESCS
},
/* The Mac Mini 5,2 has no SMS */
Modified: head/sys/dev/asmc/asmcvar.h
==
--- head/sys/dev/asmc/asmcvar.h Sun Jan 6 22:50:16 2019(r342821)
+++ head/sys/dev/asmc/asmcvar.h Sun Jan 6 23:43:12 2019(r342822)
@@ -360,6 +360,27 @@ struct asmc_softc {
"Northbridge Proximity Temperature", \
"Wireless Module Proximity Temperature", }
+#define ASMC_MM41_TEMPS{ "TA0P", "TC0D", "TC0G", "TC0H",
"TC0P", \
+ "TC0p", "TCPG", "TH0G", "TH0P", "TH0p", \
+ "TM0G", "TM0P", "TM0p", "TN0D", "TN0G", \
+ "TN0P", "TN0p", "TN1D", "TN1E", "TN1F", \
+ "TN1G", "TN1S", "TNPG", "TO0P", "TO0p", \
+ "TW0P", "Tm0P", "Tp0C", NULL }
+
+#define ASMC_MM41_TEMPNAMES{ "TA0P", "TC0D", "TC0G", "TC0H", "TC0P", \
+ "TC0p", "TCPG", "TH0G", "TH0P", "TH0p", \
+ "TM0G", "TM0P", "TM0p", "TN0D", "TN0G", \
+ "TN0P", "TN0p", "TN1D", "TN1E", "TN1F", \
+ "TN1G", "TN1S", "TNPG", "TO0P", "TO0p", \
+ "TW0P", "Tm0P", "Tp0C", NULL }
+
+#define ASMC_MM41_TEMPDESCS{ "TA0P", "TC0D", "TC0G", "TC0H", "TC0P", \
+ "TC0p", "TCPG", "TH0G", "TH0P", "TH0p", \
+ "TM0G", "TM0P", "TM0p", "TN0D", "TN0G", \
+ "TN0P", "TN0p", "TN1D", "TN1E", "TN1F", \
+ "TN1G", "TN1S", "TNPG", "TO0P", "TO0p", \
+ "TW0P", "Tm0P", "Tp0C", NULL }
+
#define ASMC_MM52_TEMPS{ "TA0P", "TA1P", \
"TC0D", "TC0P", \
"TG0D", "TG1D", \
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r342817 - head/usr.bin/getconf
Author: jilles Date: Sun Jan 6 21:43:14 2019 New Revision: 342817 URL: https://svnweb.freebsd.org/changeset/base/342817 Log: getconf(1): Minor mdoc fix MFC after:1 week Modified: head/usr.bin/getconf/getconf.1 Modified: head/usr.bin/getconf/getconf.1 == --- head/usr.bin/getconf/getconf.1 Sun Jan 6 21:34:05 2019 (r342816) +++ head/usr.bin/getconf/getconf.1 Sun Jan 6 21:43:14 2019 (r342817) @@ -70,7 +70,7 @@ Otherwise, all system configuration variables are reported using .Xr confstr 3 and -.Xr sysconf 3. +.Xr sysconf 3 . .Pp The second form of the command, with two mandatory arguments, retrieves file- and file system-specific ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r342816 - head/lib/libc/sys
Author: jilles Date: Sun Jan 6 21:34:05 2019 New Revision: 342816 URL: https://svnweb.freebsd.org/changeset/base/342816 Log: thr_wake(2): Minor mdoc fixes MFC after:1 week Modified: head/lib/libc/sys/thr_wake.2 Modified: head/lib/libc/sys/thr_wake.2 == --- head/lib/libc/sys/thr_wake.2Sun Jan 6 21:24:44 2019 (r342815) +++ head/lib/libc/sys/thr_wake.2Sun Jan 6 21:34:05 2019 (r342816) @@ -67,7 +67,7 @@ of that thread in the kernel to fail immediately with .Er EINTR error. The flag is cleared by an interruptible sleep attempt or by a call to -.Xr thr_suspend 2. +.Xr thr_suspend 2 . This is used by the system threading library to implement cancellation. .Pp If @@ -96,7 +96,7 @@ of the calling thread. .El .Sh SEE ALSO .Xr ps 1 , -.Xr thr_self 2 +.Xr thr_self 2 , .Xr thr_suspend 2 , .Xr pthread_cancel 3 , .Xr pthread_resume_np 3 , ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r342815 - in head/contrib/ipfilter/ipsd: . Celler
Author: cy Date: Sun Jan 6 21:24:44 2019 New Revision: 342815 URL: https://svnweb.freebsd.org/changeset/base/342815 Log: Remove ipsd (IP Scan Detetor). It is unused and to my knowledge has never been used on any platform that ipfilter has been on. However it looks like it could be a useful utility, therefore there are plans to make it a port one day. It lacks a man page as well. MFC after:1 month Deleted: head/contrib/ipfilter/ipsd/Celler/ip_compat.h head/contrib/ipfilter/ipsd/Makefile head/contrib/ipfilter/ipsd/README head/contrib/ipfilter/ipsd/ipsd.c head/contrib/ipfilter/ipsd/ipsd.h head/contrib/ipfilter/ipsd/ipsdr.c head/contrib/ipfilter/ipsd/linux.h head/contrib/ipfilter/ipsd/sbpf.c head/contrib/ipfilter/ipsd/sdlpi.c head/contrib/ipfilter/ipsd/slinux.c head/contrib/ipfilter/ipsd/snit.c ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r342812 - head/share/skel
niedz., 6 sty 2019 o 16:50 Cy Schubert napisał(a): > > In message <201901061623.x06gns1w057...@repo.freebsd.org>, Edward > Tomasz Napier > ala writes: > > Author: trasz > > Date: Sun Jan 6 16:23:28 2019 > > New Revision: 342812 > > URL: https://svnweb.freebsd.org/changeset/base/342812 > > > > Log: > > Give sh(1) a proper default prompt instead of just "$". > > > > Reviewed by:jilles > > MFC after: 2 weeks > > Relnotes: totally > > Sponsored by: DARPA, AFRL > > Differential Revision: https://reviews.freebsd.org/D18697 > > > > Modified: > > head/share/skel/dot.shrc > > > > Modified: head/share/skel/dot.shrc > > = > > = > > --- head/share/skel/dot.shrc Sun Jan 6 05:07:52 2019(r342811) > > +++ head/share/skel/dot.shrc Sun Jan 6 16:23:28 2019(r342812) > > @@ -32,8 +32,8 @@ alias g='egrep -i' > > # alias rm='rm -i' > > > > > > -# # set prompt: ``username@hostname:directory $ '' > > -# PS1="`whoami`@\h:\w \\$ " > > +# set prompt: ``username@hostname:directory $ '' > > +PS1="`whoami`@\h:\w \\$ " > > > > # search path for cd(1) > > # CDPATH=:$HOME > > > > Hmmm. At $JOB the RHEL servers use this prompt. IMO the prompt is > unwieldy and distracting. Instead of \w could we use \W instead? The whole point of this change is to make things a little less weird for newcomers; existing users either use one of the shells from ports, or just carry their own shell rc file with their preferred PS1; either way they probably won't even notice. That's why I chose to follow the _actual_ status quo, both in FreeBSD (the new prompt is the same as the csh(1) one, apart from the '$') and Linux. Thus the '\w'. ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r342814 - head/usr.bin/primes
Author: delphij
Date: Sun Jan 6 20:42:09 2019
New Revision: 342814
URL: https://svnweb.freebsd.org/changeset/base/342814
Log:
Remove unneeded assert.h (there is no assertion in this file).
MFC after:2 weeks
Modified:
head/usr.bin/primes/spsp.c
Modified: head/usr.bin/primes/spsp.c
==
--- head/usr.bin/primes/spsp.c Sun Jan 6 20:39:23 2019(r342813)
+++ head/usr.bin/primes/spsp.c Sun Jan 6 20:42:09 2019(r342814)
@@ -26,7 +26,6 @@
#include
__FBSDID("$FreeBSD$");
-#include
#include
#include
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r342813 - head/usr.bin/mkimg
Author: delphij
Date: Sun Jan 6 20:39:23 2019
New Revision: 342813
URL: https://svnweb.freebsd.org/changeset/base/342813
Log:
Remove unneeded headers.
MFC after:1 month
Modified:
head/usr.bin/mkimg/apm.c
head/usr.bin/mkimg/bsd.c
head/usr.bin/mkimg/ebr.c
head/usr.bin/mkimg/endian.h
head/usr.bin/mkimg/format.c
head/usr.bin/mkimg/gpt.c
head/usr.bin/mkimg/mbr.c
head/usr.bin/mkimg/qcow.c
head/usr.bin/mkimg/raw.c
head/usr.bin/mkimg/scheme.c
head/usr.bin/mkimg/uuid.c
head/usr.bin/mkimg/vhd.c
head/usr.bin/mkimg/vmdk.c
head/usr.bin/mkimg/vtoc8.c
Modified: head/usr.bin/mkimg/apm.c
==
--- head/usr.bin/mkimg/apm.cSun Jan 6 16:23:28 2019(r342812)
+++ head/usr.bin/mkimg/apm.cSun Jan 6 20:39:23 2019(r342813)
@@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
-#include
#include
Modified: head/usr.bin/mkimg/bsd.c
==
--- head/usr.bin/mkimg/bsd.cSun Jan 6 16:23:28 2019(r342812)
+++ head/usr.bin/mkimg/bsd.cSun Jan 6 20:39:23 2019(r342813)
@@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
-#include
#include
Modified: head/usr.bin/mkimg/ebr.c
==
--- head/usr.bin/mkimg/ebr.cSun Jan 6 16:23:28 2019(r342812)
+++ head/usr.bin/mkimg/ebr.cSun Jan 6 20:39:23 2019(r342813)
@@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
-#include
#include
Modified: head/usr.bin/mkimg/endian.h
==
--- head/usr.bin/mkimg/endian.h Sun Jan 6 16:23:28 2019(r342812)
+++ head/usr.bin/mkimg/endian.h Sun Jan 6 20:39:23 2019(r342813)
@@ -29,6 +29,8 @@
#ifndef _MKIMG_ENDIAN_H_
#define _MKIMG_ENDIAN_H_
+#include
+
static __inline uint16_t
be16dec(const void *pp)
{
Modified: head/usr.bin/mkimg/format.c
==
--- head/usr.bin/mkimg/format.c Sun Jan 6 16:23:28 2019(r342812)
+++ head/usr.bin/mkimg/format.c Sun Jan 6 20:39:23 2019(r342813)
@@ -28,16 +28,11 @@
__FBSDID("$FreeBSD$");
#include
-#include
#include
-#include
-#include
#include
-#include
#include "image.h"
#include "format.h"
-#include "mkimg.h"
static struct mkimg_format *first;
static struct mkimg_format *format;
Modified: head/usr.bin/mkimg/gpt.c
==
--- head/usr.bin/mkimg/gpt.cSun Jan 6 16:23:28 2019(r342812)
+++ head/usr.bin/mkimg/gpt.cSun Jan 6 20:39:23 2019(r342813)
@@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
-#include
#include
#include
Modified: head/usr.bin/mkimg/mbr.c
==
--- head/usr.bin/mkimg/mbr.cSun Jan 6 16:23:28 2019(r342812)
+++ head/usr.bin/mkimg/mbr.cSun Jan 6 20:39:23 2019(r342813)
@@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
-#include
#include
Modified: head/usr.bin/mkimg/qcow.c
==
--- head/usr.bin/mkimg/qcow.c Sun Jan 6 16:23:28 2019(r342812)
+++ head/usr.bin/mkimg/qcow.c Sun Jan 6 20:39:23 2019(r342813)
@@ -29,11 +29,9 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include
#include
#include
#include
-#include
#include "endian.h"
#include "image.h"
Modified: head/usr.bin/mkimg/raw.c
==
--- head/usr.bin/mkimg/raw.cSun Jan 6 16:23:28 2019(r342812)
+++ head/usr.bin/mkimg/raw.cSun Jan 6 20:39:23 2019(r342813)
@@ -28,14 +28,10 @@
__FBSDID("$FreeBSD$");
#include
-#include
-#include
-#include
#include
#include "image.h"
#include "format.h"
-#include "mkimg.h"
static int
raw_resize(lba_t imgsz __unused)
Modified: head/usr.bin/mkimg/scheme.c
==
--- head/usr.bin/mkimg/scheme.c Sun Jan 6 16:23:28 2019(r342812)
+++ head/usr.bin/mkimg/scheme.c Sun Jan 6 20:39:23 2019(r342813)
@@ -29,10 +29,8 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include
#include
#include
-#include
#include
#include
#include
Modified: head/usr.bin/mkimg/uuid.c
==
--- head/usr.bin/mkimg/uuid.c Sun Jan 6 16:23:28 2019(r342812)
+++ head/usr.bin/mkimg/uuid.c Sun Jan 6 20:39:23 2019(r342813)
@@ -28,7 +28,6 @@
__FBSDID("$FreeBSD$");
#include
-#include
#include
Re: svn commit: r342812 - head/share/skel
> In message <201901061623.x06gns1w057...@repo.freebsd.org>, Edward > Tomasz Napier > ala writes: > > Author: trasz > > Date: Sun Jan 6 16:23:28 2019 > > New Revision: 342812 > > URL: https://svnweb.freebsd.org/changeset/base/342812 > > > > Log: > > Give sh(1) a proper default prompt instead of just "$". > > > > Reviewed by: jilles > > MFC after:2 weeks > > Relnotes: totally > > Sponsored by: DARPA, AFRL > > Differential Revision:https://reviews.freebsd.org/D18697 > > > > Modified: > > head/share/skel/dot.shrc > > > > Modified: head/share/skel/dot.shrc > > = > > = > > --- head/share/skel/dot.shrcSun Jan 6 05:07:52 2019 > > (r342811) > > +++ head/share/skel/dot.shrcSun Jan 6 16:23:28 2019 > > (r342812) > > @@ -32,8 +32,8 @@ alias g='egrep -i' > > # alias rm='rm -i' > > > > > > -# # set prompt: ``username@hostname:directory $ '' > > -# PS1="`whoami`@\h:\w \\$ " > > +# set prompt: ``username@hostname:directory $ '' > > +PS1="`whoami`@\h:\w \\$ " > > > > # search path for cd(1) > > # CDPATH=:$HOME > > > > Hmmm. At $JOB the RHEL servers use this prompt. IMO the prompt is > unwieldy and distracting. Instead of \w could we use \W instead? Or you just could leave 30 year old status quo in place, people who want other things have long ago dealt with this and your just creating new things they have to deal with, like undoing your tweaking of defaults, which cause local customization patches to now fail because you change the line they are trying to patch. -- Rod Grimes rgri...@freebsd.org ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r342812 - head/share/skel
In message <201901061623.x06gns1w057...@repo.freebsd.org>, Edward Tomasz Napier ala writes: > Author: trasz > Date: Sun Jan 6 16:23:28 2019 > New Revision: 342812 > URL: https://svnweb.freebsd.org/changeset/base/342812 > > Log: > Give sh(1) a proper default prompt instead of just "$". > > Reviewed by:jilles > MFC after: 2 weeks > Relnotes: totally > Sponsored by: DARPA, AFRL > Differential Revision: https://reviews.freebsd.org/D18697 > > Modified: > head/share/skel/dot.shrc > > Modified: head/share/skel/dot.shrc > = > = > --- head/share/skel/dot.shrc Sun Jan 6 05:07:52 2019(r342811) > +++ head/share/skel/dot.shrc Sun Jan 6 16:23:28 2019(r342812) > @@ -32,8 +32,8 @@ alias g='egrep -i' > # alias rm='rm -i' > > > -# # set prompt: ``username@hostname:directory $ '' > -# PS1="`whoami`@\h:\w \\$ " > +# set prompt: ``username@hostname:directory $ '' > +PS1="`whoami`@\h:\w \\$ " > > # search path for cd(1) > # CDPATH=:$HOME > Hmmm. At $JOB the RHEL servers use this prompt. IMO the prompt is unwieldy and distracting. Instead of \w could we use \W instead? -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r342812 - head/share/skel
Author: trasz Date: Sun Jan 6 16:23:28 2019 New Revision: 342812 URL: https://svnweb.freebsd.org/changeset/base/342812 Log: Give sh(1) a proper default prompt instead of just "$". Reviewed by: jilles MFC after:2 weeks Relnotes: totally Sponsored by: DARPA, AFRL Differential Revision:https://reviews.freebsd.org/D18697 Modified: head/share/skel/dot.shrc Modified: head/share/skel/dot.shrc == --- head/share/skel/dot.shrcSun Jan 6 05:07:52 2019(r342811) +++ head/share/skel/dot.shrcSun Jan 6 16:23:28 2019(r342812) @@ -32,8 +32,8 @@ alias g='egrep -i' # alias rm='rm -i' -# # set prompt: ``username@hostname:directory $ '' -# PS1="`whoami`@\h:\w \\$ " +# set prompt: ``username@hostname:directory $ '' +PS1="`whoami`@\h:\w \\$ " # search path for cd(1) # CDPATH=:$HOME ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r342811 - head/sys/contrib/ncsw/user/env
Author: jhibbits
Date: Sun Jan 6 05:07:52 2019
New Revision: 342811
URL: https://svnweb.freebsd.org/changeset/base/342811
Log:
dtsec: Fix formatting of addresses in translation error messages
Don't clamp addresses to 8 hex digits, particularly since this is primarily
used now on a 64-bit platform.
MFC after:1 week
Modified:
head/sys/contrib/ncsw/user/env/xx.c
Modified: head/sys/contrib/ncsw/user/env/xx.c
==
--- head/sys/contrib/ncsw/user/env/xx.c Sun Jan 6 02:39:03 2019
(r342810)
+++ head/sys/contrib/ncsw/user/env/xx.c Sun Jan 6 05:07:52 2019
(r342811)
@@ -704,7 +704,7 @@ XX_VirtToPhys(void *addr)
paddr = pmap_kextract((vm_offset_t)addr);
if (paddr == 0)
printf("NetCommSW: "
- "Unable to translate virtual address 0x%08X!\n", addr);
+ "Unable to translate virtual address %p!\n", addr);
else
pmap_track_page(kernel_pmap, (vm_offset_t)addr);
@@ -758,7 +758,7 @@ XX_PhysToVirt(physAddress_t addr)
return ((void *)(pv->pv_va + ((vm_offset_t)addr & PAGE_MASK)));
printf("NetCommSW: "
- "Unable to translate physical address 0x%08llX!\n", addr);
+ "Unable to translate physical address 0x%09jx!\n", (uintmax_t)addr);
return (NULL);
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
