>From fa20d77f7a35114dd6bf93e362b44235b163f1ad Mon Sep 17 00:00:00 2001
From: Akira Yokosawa <akiyks@xxxxxxxxx>
Date: Sat, 4 Nov 2017 08:34:01 +0900
Subject: [PATCH 3/3] Fix layout hiccups in answers to quick quizzes
Signed-off-by: Akira Yokosawa <akiyks@xxxxxxxxx>
---
defer/rcuapi.tex | 7 ++++---
defer/rcufundamental.tex | 1 +
memorder/memorder.tex | 7 ++++---
toolsoftrade/toolsoftrade.tex | 2 +-
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/defer/rcuapi.tex b/defer/rcuapi.tex
index d4e434d..55811a1 100644
--- a/defer/rcuapi.tex
+++ b/defer/rcuapi.tex
@@ -367,9 +367,10 @@ returns a value that must be passed into the corresponding
In practice, however, doing this is almost certainly a bad idea.
In particular, the code shown in
Listing~\ref{lst:defer:Multistage SRCU Deadlocks}
- could still result in deadlock.
-
+ could still result in deadlock.%
+%
\begin{listing}[htbp]
+\scriptsize
{
\begin{verbbox}
1 idx = srcu_read_lock(&ssa);
@@ -387,7 +388,7 @@ returns a value that must be passed into the corresponding
\theverbbox
\caption{Multistage SRCU Deadlocks}
\label{lst:defer:Multistage SRCU Deadlocks}
-\end{listing}
+\end{listing}%
%
} \QuickQuizEnd
diff --git a/defer/rcufundamental.tex b/defer/rcufundamental.tex
index 4c16478..f2cfab2 100644
--- a/defer/rcufundamental.tex
+++ b/defer/rcufundamental.tex
@@ -750,6 +750,7 @@ versions of the list active at a given time.
Listing~\ref{lst:defer:Concurrent RCU Deletion}.
\begin{listing}[htbp]
+\scriptsize
{
\begin{verbbox}
1 spin_lock(&mylock);
diff --git a/memorder/memorder.tex b/memorder/memorder.tex
index 3ba4d3a..0e823d4 100644
--- a/memorder/memorder.tex
+++ b/memorder/memorder.tex
@@ -1854,8 +1854,8 @@ exists (1:r1=1 /\ 1:r2=0)
\theverbbox
\caption{Litmus Test Distinguishing Multicopy Atomic From Other Multicopy Atomic}
\label{lst:memorder:Litmus Test Distinguishing Multicopy Atomic From Other Multicopy Atomic}
-\end{listing}
-
+\end{listing}%
+%
Listing~\ref{lst:memorder:Litmus Test Distinguishing Multicopy Atomic From Other Multicopy Atomic}
(\path{C-MP-OMCA+o-o-o+o-rmb-o.litmus})
shows such a test.
@@ -2299,7 +2299,8 @@ exists (1:r2=0 /\ x1=2)
\theverbbox
\caption{R Litmus Test With Write Memory Barrier (No Ordering)}
\label{lst:memorder:R Litmus Test With Write Memory Barrier (No Ordering)}
-\end{listing}
+\end{listing}%
+%
Wrong.
Listing~\ref{lst:memorder:R Litmus Test With Write Memory Barrier (No Ordering)}
diff --git a/toolsoftrade/toolsoftrade.tex b/toolsoftrade/toolsoftrade.tex
index d37a295..7d3e038 100644
--- a/toolsoftrade/toolsoftrade.tex
+++ b/toolsoftrade/toolsoftrade.tex
@@ -727,7 +727,7 @@ by \co{lock_writer()} while holding the lock.
The reason that ``x = 0'' was output was that \co{lock_reader()}
acquired the lock first.
Had \co{lock_writer()} instead acquired the lock first, then
- the output would have been ``x = 3''.
+ the output would have been \mbox{``x = 3''}.
However, because the code fragment started \co{lock_reader()} first
and because this run was performed on a multiprocessor,
one would normally expect \co{lock_reader()} to acquire the
--
2.7.4
--
To unsubscribe from this list: send the line "unsubscribe perfbook" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
