fix typos concerning "hierarchy"
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
parent
22c1d8b4f8
commit
732bee7af3
8 changed files with 12 additions and 12 deletions
|
@ -463,7 +463,7 @@ int omap3_noncore_dpll_set_rate(struct clk *clk, unsigned long rate)
|
||||||
}
|
}
|
||||||
if (!ret) {
|
if (!ret) {
|
||||||
/*
|
/*
|
||||||
* Switch the parent clock in the heirarchy, and make sure
|
* Switch the parent clock in the hierarchy, and make sure
|
||||||
* that the new parent's usecount is correct. Note: we
|
* that the new parent's usecount is correct. Note: we
|
||||||
* enable the new parent before disabling the old to avoid
|
* enable the new parent before disabling the old to avoid
|
||||||
* any unnecessary hardware disable->enable transitions.
|
* any unnecessary hardware disable->enable transitions.
|
||||||
|
|
|
@ -25,7 +25,7 @@ ifeq (,$(findstring spartan2,$(CONFIG_XILINX_MICROBLAZE0_FAMILY)))
|
||||||
ifeq ($(CPU_MAJOR),3)
|
ifeq ($(CPU_MAJOR),3)
|
||||||
CPUFLAGS-1 += -mno-xl-soft-mul
|
CPUFLAGS-1 += -mno-xl-soft-mul
|
||||||
else
|
else
|
||||||
# USE_HW_MUL can be 0, 1, or 2, defining a heirarchy of HW Mul support.
|
# USE_HW_MUL can be 0, 1, or 2, defining a hierarchy of HW Mul support.
|
||||||
CPUFLAGS-$(subst 1,,$(CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL)) += -mxl-multiply-high
|
CPUFLAGS-$(subst 1,,$(CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL)) += -mxl-multiply-high
|
||||||
CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL) += -mno-xl-soft-mul
|
CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL) += -mno-xl-soft-mul
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -816,7 +816,7 @@ static void __flush_qp(struct iwch_qp *qhp, unsigned long *flag)
|
||||||
atomic_inc(&qhp->refcnt);
|
atomic_inc(&qhp->refcnt);
|
||||||
spin_unlock_irqrestore(&qhp->lock, *flag);
|
spin_unlock_irqrestore(&qhp->lock, *flag);
|
||||||
|
|
||||||
/* locking heirarchy: cq lock first, then qp lock. */
|
/* locking hierarchy: cq lock first, then qp lock. */
|
||||||
spin_lock_irqsave(&rchp->lock, *flag);
|
spin_lock_irqsave(&rchp->lock, *flag);
|
||||||
spin_lock(&qhp->lock);
|
spin_lock(&qhp->lock);
|
||||||
cxio_flush_hw_cq(&rchp->cq);
|
cxio_flush_hw_cq(&rchp->cq);
|
||||||
|
@ -827,7 +827,7 @@ static void __flush_qp(struct iwch_qp *qhp, unsigned long *flag)
|
||||||
if (flushed)
|
if (flushed)
|
||||||
(*rchp->ibcq.comp_handler)(&rchp->ibcq, rchp->ibcq.cq_context);
|
(*rchp->ibcq.comp_handler)(&rchp->ibcq, rchp->ibcq.cq_context);
|
||||||
|
|
||||||
/* locking heirarchy: cq lock first, then qp lock. */
|
/* locking hierarchy: cq lock first, then qp lock. */
|
||||||
spin_lock_irqsave(&schp->lock, *flag);
|
spin_lock_irqsave(&schp->lock, *flag);
|
||||||
spin_lock(&qhp->lock);
|
spin_lock(&qhp->lock);
|
||||||
cxio_flush_hw_cq(&schp->cq);
|
cxio_flush_hw_cq(&schp->cq);
|
||||||
|
|
|
@ -899,7 +899,7 @@ static void __flush_qp(struct c4iw_qp *qhp, struct c4iw_cq *rchp,
|
||||||
atomic_inc(&qhp->refcnt);
|
atomic_inc(&qhp->refcnt);
|
||||||
spin_unlock_irqrestore(&qhp->lock, *flag);
|
spin_unlock_irqrestore(&qhp->lock, *flag);
|
||||||
|
|
||||||
/* locking heirarchy: cq lock first, then qp lock. */
|
/* locking hierarchy: cq lock first, then qp lock. */
|
||||||
spin_lock_irqsave(&rchp->lock, *flag);
|
spin_lock_irqsave(&rchp->lock, *flag);
|
||||||
spin_lock(&qhp->lock);
|
spin_lock(&qhp->lock);
|
||||||
c4iw_flush_hw_cq(&rchp->cq);
|
c4iw_flush_hw_cq(&rchp->cq);
|
||||||
|
@ -910,7 +910,7 @@ static void __flush_qp(struct c4iw_qp *qhp, struct c4iw_cq *rchp,
|
||||||
if (flushed)
|
if (flushed)
|
||||||
(*rchp->ibcq.comp_handler)(&rchp->ibcq, rchp->ibcq.cq_context);
|
(*rchp->ibcq.comp_handler)(&rchp->ibcq, rchp->ibcq.cq_context);
|
||||||
|
|
||||||
/* locking heirarchy: cq lock first, then qp lock. */
|
/* locking hierarchy: cq lock first, then qp lock. */
|
||||||
spin_lock_irqsave(&schp->lock, *flag);
|
spin_lock_irqsave(&schp->lock, *flag);
|
||||||
spin_lock(&qhp->lock);
|
spin_lock(&qhp->lock);
|
||||||
c4iw_flush_hw_cq(&schp->cq);
|
c4iw_flush_hw_cq(&schp->cq);
|
||||||
|
|
|
@ -32,11 +32,11 @@
|
||||||
* invalid SID. We also need to ensure that states don't change unexpectedly
|
* invalid SID. We also need to ensure that states don't change unexpectedly
|
||||||
* while processing another state.
|
* while processing another state.
|
||||||
*
|
*
|
||||||
* HEIRARCHY
|
* HIERARCHY
|
||||||
*
|
*
|
||||||
* The following heirarchy defines the locking rules. A greater lock
|
* The following hierarchy defines the locking rules. A greater lock
|
||||||
* may be held before acquiring a lesser lock, but a lesser lock should never
|
* may be held before acquiring a lesser lock, but a lesser lock should never
|
||||||
* be held while attempting to acquire a greater lock. Here is the heirarchy-
|
* be held while attempting to acquire a greater lock. Here is the hierarchy-
|
||||||
*
|
*
|
||||||
* lport > disc, lport > rport, disc > rport
|
* lport > disc, lport > rport, disc > rport
|
||||||
*
|
*
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
* The rport should never hold the rport mutex and then attempt to acquire
|
* The rport should never hold the rport mutex and then attempt to acquire
|
||||||
* either the lport or disc mutexes. The rport's mutex is considered lesser
|
* either the lport or disc mutexes. The rport's mutex is considered lesser
|
||||||
* than both the lport's mutex and the disc mutex. Refer to fc_lport.c for
|
* than both the lport's mutex and the disc mutex. Refer to fc_lport.c for
|
||||||
* more comments on the heirarchy.
|
* more comments on the hierarchy.
|
||||||
*
|
*
|
||||||
* The locking strategy is similar to the lport's strategy. The lock protects
|
* The locking strategy is similar to the lport's strategy. The lock protects
|
||||||
* the rport's states and is held and released by the entry points to the rport
|
* the rport's states and is held and released by the entry points to the rport
|
||||||
|
|
|
@ -965,7 +965,7 @@ static FC_DEVICE_ATTR(rport, fast_io_fail_tmo, S_IRUGO | S_IWUSR,
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Note: in the target show function we recognize when the remote
|
* Note: in the target show function we recognize when the remote
|
||||||
* port is in the heirarchy and do not allow the driver to get
|
* port is in the hierarchy and do not allow the driver to get
|
||||||
* involved in sysfs functions. The driver only gets involved if
|
* involved in sysfs functions. The driver only gets involved if
|
||||||
* it's the "old" style that doesn't use rports.
|
* it's the "old" style that doesn't use rports.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -105,7 +105,7 @@ struct cpuset {
|
||||||
/* for custom sched domain */
|
/* for custom sched domain */
|
||||||
int relax_domain_level;
|
int relax_domain_level;
|
||||||
|
|
||||||
/* used for walking a cpuset heirarchy */
|
/* used for walking a cpuset hierarchy */
|
||||||
struct list_head stack_list;
|
struct list_head stack_list;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue