d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge ^/head r279309 through r279312.

Browse Source
This commit is contained in:
dim 2015-02-26 07:51:43 +00:00
parent 4b25793bf5
commit a6c8ba4a73
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/libcxxrt/unwind-arm.h
View File

@ -36,6 +36,8 @@
_URC_FATAL_PHASE1_ERROR = _URC_FAILURE
} _Unwind_Reason_Code;
typedef int _Unwind_Action;
typedef uint32_t _Unwind_State;
#ifdef __clang__
static const _Unwind_State _US_VIRTUAL_UNWIND_FRAME = 0;

2
sys/arm/arm/disassem.c
View File

@ -289,7 +289,7 @@ static void disassemble_printaddr(u_int address);
vm_offset_t
disasm(const disasm_interface_t *di, vm_offset_t loc, int altfmt)
{
struct arm32_insn *i_ptr = (struct arm32_insn *)&arm32_i;
const struct arm32_insn *i_ptr = arm32_i;
u_int insn;
int matchp;

2
sys/arm/ti/am335x/am335x_rtc.c
View File

@ -137,7 +137,7 @@ am335x_rtc_detach(device_t dev)
struct am335x_rtc_softc *sc;
sc = device_get_softc(dev);
if (sc->sc_irq_res)
if (sc->sc_irq_res[0] != NULL)
bus_release_resources(dev, am335x_rtc_irq_spec, sc->sc_irq_res);
if (sc->sc_mem_res)
bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res);

4
sys/arm/ti/am335x/am335x_scm_padconf.c
View File

@ -298,6 +298,6 @@ const static struct ti_scm_padconf ti_padconf_devmap[] = {
const struct ti_scm_device ti_scm_dev = {
.padconf_muxmode_mask = 0x7,
.padconf_sate_mask = 0x78,
.padstate = (struct ti_scm_padstate *) &ti_padstate_devmap,
.padconf = (struct ti_scm_padconf *) &ti_padconf_devmap,
.padstate = ti_padstate_devmap,
.padconf = ti_padconf_devmap,
};

4
sys/arm/ti/omap4/omap4_scm_padconf.c
View File

@ -298,6 +298,6 @@ const static struct ti_scm_padconf ti_padconf_devmap[] = {
const struct ti_scm_device ti_scm_dev = {
.padconf_muxmode_mask = CONTROL_PADCONF_MUXMODE_MASK,
.padconf_sate_mask = CONTROL_PADCONF_SATE_MASK,
.padstate = (struct ti_scm_padstate *) &ti_padstate_devmap,
.padconf = (struct ti_scm_padconf *) &ti_padconf_devmap,
.padstate = ti_padstate_devmap,
.padconf = ti_padconf_devmap,
};

4
sys/arm/ti/ti_scm.h
View File

@ -59,8 +59,8 @@ struct ti_scm_padstate {
struct ti_scm_device {
uint16_t padconf_muxmode_mask;
uint16_t padconf_sate_mask;
struct ti_scm_padstate *padstate;
struct ti_scm_padconf *padconf;
const struct ti_scm_padstate *padstate;
const struct ti_scm_padconf *padconf;
};
struct ti_scm_softc {