summaryrefslogtreecommitdiff
path: root/usr/src/uts
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/uts')
-rw-r--r--usr/src/uts/common/io/hxge/hxge_virtual.c4
-rw-r--r--usr/src/uts/common/io/ib/adapters/hermon/hermon_cmd.c2
-rw-r--r--usr/src/uts/common/io/ib/adapters/tavor/tavor_cmd.c2
-rw-r--r--usr/src/uts/common/io/nxge/nxge_virtual.c4
-rw-r--r--usr/src/uts/common/sys/efi_partition.h3
-rw-r--r--usr/src/uts/common/sys/vtoc.h6
-rw-r--r--usr/src/uts/intel/io/dktp/drvobj/strategy.c12
-rw-r--r--usr/src/uts/sun4u/serengeti/io/sghsc.c4
8 files changed, 23 insertions, 14 deletions
diff --git a/usr/src/uts/common/io/hxge/hxge_virtual.c b/usr/src/uts/common/io/hxge/hxge_virtual.c
index f99c651934..435b848c58 100644
--- a/usr/src/uts/common/io/hxge/hxge_virtual.c
+++ b/usr/src/uts/common/io/hxge/hxge_virtual.c
@@ -935,8 +935,8 @@ hxge_ldgv_setup(p_hxge_ldg_t *ldgp, p_hxge_ldv_t *ldvp, uint8_t ldv,
HXGE_DEBUG_MSG((NULL, INT_CTL, "==> hxge_ldgv_setup(done): "
"ldv %d endldg %d ldg %d, ldvp $%p",
ldv, endldg, (*ldgp)->ldg, (*ldgp)->ldvp));
- (*ldvp) = ++*ldvp;
- (*ldgp) = ++*ldgp;
+ ++*ldvp;
+ ++*ldgp;
HXGE_DEBUG_MSG((NULL, INT_CTL,
"==> hxge_ldgv_setup: new ngrps %d", *ngrps));
}
diff --git a/usr/src/uts/common/io/ib/adapters/hermon/hermon_cmd.c b/usr/src/uts/common/io/ib/adapters/hermon/hermon_cmd.c
index 8de764d94b..7d2d886c37 100644
--- a/usr/src/uts/common/io/ib/adapters/hermon/hermon_cmd.c
+++ b/usr/src/uts/common/io/ib/adapters/hermon/hermon_cmd.c
@@ -697,7 +697,7 @@ hermon_impl_mbox_free(hermon_mboxlist_t *mblist, hermon_mbox_t **mb)
*/
if (mblist->mbl_pollers > 0 && mblist->mbl_waiters > 0) {
/* flip the signal value */
- mblist->mbl_signal = (++mblist->mbl_signal) % 2;
+ mblist->mbl_signal = (mblist->mbl_signal + 1) % 2;
} else if (mblist->mbl_waiters > 0) {
mblist->mbl_signal = 1;
} else {
diff --git a/usr/src/uts/common/io/ib/adapters/tavor/tavor_cmd.c b/usr/src/uts/common/io/ib/adapters/tavor/tavor_cmd.c
index 73fa04cc6f..4675367af6 100644
--- a/usr/src/uts/common/io/ib/adapters/tavor/tavor_cmd.c
+++ b/usr/src/uts/common/io/ib/adapters/tavor/tavor_cmd.c
@@ -676,7 +676,7 @@ tavor_impl_mbox_free(tavor_mboxlist_t *mblist, tavor_mbox_t **mb)
*/
if (mblist->mbl_pollers > 0 && mblist->mbl_waiters > 0) {
/* flip the signal value */
- mblist->mbl_signal = (++mblist->mbl_signal) % 2;
+ mblist->mbl_signal = (mblist->mbl_signal + 1) % 2;
} else if (mblist->mbl_waiters > 0) {
mblist->mbl_signal = 1;
} else {
diff --git a/usr/src/uts/common/io/nxge/nxge_virtual.c b/usr/src/uts/common/io/nxge/nxge_virtual.c
index f199e00c48..9305cb0d5c 100644
--- a/usr/src/uts/common/io/nxge/nxge_virtual.c
+++ b/usr/src/uts/common/io/nxge/nxge_virtual.c
@@ -3964,8 +3964,8 @@ nxge_ldgv_setup(p_nxge_ldg_t *ldgp, p_nxge_ldv_t *ldvp, uint8_t ldv,
NXGE_DEBUG_MSG((NULL, INT_CTL, "==> nxge_ldgv_setup(done): "
"ldv %d endldg %d ldg %d, ldvp $%p",
ldv, endldg, (*ldgp)->ldg, (*ldgp)->ldvp));
- (*ldvp) = ++*ldvp;
- (*ldgp) = ++*ldgp;
+ ++*ldvp;
+ ++*ldgp;
NXGE_DEBUG_MSG((NULL, INT_CTL,
"==> nxge_ldgv_setup: new ngrps %d", *ngrps));
}
diff --git a/usr/src/uts/common/sys/efi_partition.h b/usr/src/uts/common/sys/efi_partition.h
index 6de3bda39b..32d3d92b52 100644
--- a/usr/src/uts/common/sys/efi_partition.h
+++ b/usr/src/uts/common/sys/efi_partition.h
@@ -21,6 +21,7 @@
/*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright 2012 Nexenta Systems, Inc. All rights reserved.
+ * Copyright 2014 Toomas Soome <tsoome@me.com>
*/
#ifndef _SYS_EFI_PARTITION_H
@@ -144,6 +145,8 @@ typedef struct efi_gpe_Attrs {
{ 0x00, 0x02, 0x2d, 0x09, 0x71, 0x2b } }
#define EFI_FREEBSD_ZFS { 0x516e7cba, 0x6ecf, 0x11d6, 0x8f, 0xf8, \
{ 0x00, 0x02, 0x2d, 0x09, 0x71, 0x2b } }
+#define EFI_BIOS_BOOT { 0x21686148, 0x6449, 0x6e6f, 0x74, 0x4e, \
+ { 0x65, 0x65, 0x64, 0x45, 0x46, 0x49 } }
/* minimum # of bytes for partition table entires, per EFI spec */
#define EFI_MIN_ARRAY_SIZE (16 * 1024)
diff --git a/usr/src/uts/common/sys/vtoc.h b/usr/src/uts/common/sys/vtoc.h
index ab6f56829d..cc0586a184 100644
--- a/usr/src/uts/common/sys/vtoc.h
+++ b/usr/src/uts/common/sys/vtoc.h
@@ -80,7 +80,13 @@ extern "C" {
#define V_HOME 0x08 /* Home partition */
#define V_ALTSCTR 0x09 /* Alternate sector partition */
#define V_CACHE 0x0a /* Cache (cachefs) partition */
+
+/* Tags for EFI/GPT labels */
#define V_RESERVED 0x0b /* SMI reserved data */
+#define V_SYSTEM 0x0c /* EFI/GPT system partition */
+#define V_BIOS_BOOT 0x18 /* BIOS Boot partition */
+
+#define V_UNKNOWN 0xff /* Unknown partition */
/*
* Partition permission flags
diff --git a/usr/src/uts/intel/io/dktp/drvobj/strategy.c b/usr/src/uts/intel/io/dktp/drvobj/strategy.c
index 16382da154..9d869ab110 100644
--- a/usr/src/uts/intel/io/dktp/drvobj/strategy.c
+++ b/usr/src/uts/intel/io/dktp/drvobj/strategy.c
@@ -235,7 +235,7 @@ dsngl_enque(opaque_t queuep, struct buf *in_bp)
kstat_waitq_enter(KSTAT_IO_PTR(dsnglp->ds_kstat));
}
if (TGCOM_PKT(tgcom_objp, in_bp, dsngl_restart,
- (caddr_t)dsnglp) != DDI_SUCCESS) {
+ (caddr_t)dsnglp) != DDI_SUCCESS) {
dsnglp->ds_bp = in_bp;
mutex_exit(&dsnglp->ds_mutex);
@@ -369,7 +369,7 @@ dmult_enque(opaque_t queuep, struct buf *in_bp)
}
if (TGCOM_PKT(tgcom_objp, in_bp, dmult_restart,
- (caddr_t)dmultp) != DDI_SUCCESS) {
+ (caddr_t)dmultp) != DDI_SUCCESS) {
dmultp->ds_bp = in_bp;
mutex_exit(&dmultp->ds_mutex);
@@ -859,7 +859,7 @@ qmerge_create()
queobjp->que_ops = &qmerge_ops;
qfp = (struct que_data *)(queobjp+1);
- qfp->q_tab.hd_private = qfp->q_tab.hd_private = 0;
+ qfp->q_tab.hd_private = 0;
qfp->q_tab.hd_sync_next = qfp->q_tab.hd_async_next = NULL;
qfp->q_tab.hd_cnt = (void *)qmerge_sync2async;
queobjp->que_data = (opaque_t)qfp;
@@ -1176,7 +1176,7 @@ begin_nextbp:
} else {
flags &= ~QNEAR_ASYNCALSO;
SYNC2ASYNC(qfp) =
- (void *)qmerge_sync2async;
+ (void *)qmerge_sync2async;
qfp->q_tab.hd_private = 0;
goto begin_nextbp;
}
@@ -1232,7 +1232,7 @@ begin_nextbp:
if (*async_bpp)
flags |= QNEAR_ASYNCALSO;
SYNC2ASYNC(qfp) =
- (void *)qmerge_sync2async;
+ (void *)qmerge_sync2async;
}
private = 0;
}
@@ -1250,7 +1250,7 @@ begin_nextbp:
if (*async_bpp)
flags |= QNEAR_ASYNCALSO;
SYNC2ASYNC(qfp) =
- (void *)qmerge_sync2async;
+ (void *)qmerge_sync2async;
}
}
} else if (qmerge2wayscan == 0) {
diff --git a/usr/src/uts/sun4u/serengeti/io/sghsc.c b/usr/src/uts/sun4u/serengeti/io/sghsc.c
index b2527630ee..f826a94bd2 100644
--- a/usr/src/uts/sun4u/serengeti/io/sghsc.c
+++ b/usr/src/uts/sun4u/serengeti/io/sghsc.c
@@ -1783,7 +1783,7 @@ sghsc_rb_put(sghsc_rb_head_t *rb_head, sghsc_event_t *event)
rb_head->buf[rb_head->put_idx] = *event;
- rb_head->put_idx = ++rb_head->put_idx & (rb_head->size - 1);
+ rb_head->put_idx = (rb_head->put_idx + 1) & (rb_head->size - 1);
if (rb_head->put_idx == rb_head->get_idx)
rb_head->state = SGHSC_RB_FULL;
@@ -1806,7 +1806,7 @@ sghsc_rb_get(sghsc_rb_head_t *rb_head, sghsc_event_t *event)
*event = rb_head->buf[rb_head->get_idx];
- rb_head->get_idx = ++rb_head->get_idx & (rb_head->size - 1);
+ rb_head->get_idx = (rb_head->get_idx + 1) & (rb_head->size - 1);
if (rb_head->get_idx == rb_head->put_idx)
rb_head->state = SGHSC_RB_EMPTY;
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-26 22:19:27 +0000