[FE training-materials-updates] Merge two slides in one

maxime.ripard at free-electrons.com maxime.ripard at free-electrons.com
Tue May 29 15:46:32 CEST 2012


- Log -----------------------------------------------------------------
http://git.free-electrons.com/training-materials/commit/?id=a2558bb6d23bfb9844827ba8df46c7b86b20aa8a

commit a2558bb6d23bfb9844827ba8df46c7b86b20aa8a
Author: Maxime Ripard <maxime.ripard at free-electrons.com>
Date:   Tue May 29 15:46:06 2012 +0200

    Merge two slides in one
    
    Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>

diff --git a/slides/kernel-driver-development-general-apis/kernel-driver-development-general-apis.tex b/slides/kernel-driver-development-general-apis/kernel-driver-development-general-apis.tex
index f334c4f..8432125 100644
--- a/slides/kernel-driver-development-general-apis/kernel-driver-development-general-apis.tex
+++ b/slides/kernel-driver-development-general-apis/kernel-driver-development-general-apis.tex
@@ -49,7 +49,7 @@
 \end{frame}
 
 \begin{frame}[fragile]
-  \frametitle{Linked Lists Examples 1/3}
+  \frametitle{Linked Lists Examples (1)}
   \begin{itemize}
   \item From \code{include/linux/atmel_tc.h}
 \begin{minted}{c}
@@ -67,16 +67,22 @@ struct atmel_tc
 \end{frame}
 
 \begin{frame}[fragile]
-  \frametitle{Linked Lists Examples 2/3}
+  \frametitle{Linked Lists Examples (2)}
   \begin{itemize}
   \item From \code{drivers/misc/atmel_tclib.c}
   \end{itemize}
-\begin{minted}[fontsize=\small]{c}
+\begin{minted}[fontsize=\footnotesize]{c}
 /* Define the global list */
 static LIST_HEAD(tc_list);
 
-struct atmel_tc *atmel_tc_alloc(unsigned block,
-                                const char *name)
+static int __init tc_probe(struct platform_device *pdev) {
+    struct atmel_tc *tc;
+    tc = kzalloc(sizeof(struct atmel_tc), GFP_KERNEL);
+    /* Add an element to the list */
+    list_add_tail(&tc->node, &tc_list);
+}
+
+struct atmel_tc *atmel_tc_alloc(unsigned block, const char *name)
 {
     struct atmel_tc *tc;
     /* Iterate over the list elements */
@@ -87,15 +93,3 @@ struct atmel_tc *atmel_tc_alloc(unsigned block,
 }
 \end{minted}
 \end{frame}
-
-\begin{frame}[fragile]
-  \frametitle{Linked Lists Example 3/3}
-\begin{minted}[fontsize=\small]{c}
-static int __init tc_probe(struct platform_device *pdev) {
-    struct atmel_tc *tc;
-    tc = kzalloc(sizeof(struct atmel_tc), GFP_KERNEL);
-    /* Add an element to the list */
-    list_add_tail(&tc->node, &tc_list);
-}
-\end{minted}
-\end{frame}
diff --git a/slides/kernel-driver-development-memory/kernel-driver-development-memory.tex b/slides/kernel-driver-development-memory/kernel-driver-development-memory.tex
index 73e30f4..bb25b40 100644
--- a/slides/kernel-driver-development-memory/kernel-driver-development-memory.tex
+++ b/slides/kernel-driver-development-memory/kernel-driver-development-memory.tex
@@ -300,13 +300,13 @@
     \item Free an allocated area
     \end{itemize}
   \item Example: (\code{drivers/infiniband/core/cache.c})
-  \end{itemize}
 \begin{minted}{c}
 struct ib_update_work *work;
 work = kmalloc(sizeof *work, GFP_ATOMIC);
 ...
 kfree(work);
 \end{minted}
+  \end{itemize}
 \end{frame}
 
 \begin{frame}[fragile]

http://git.free-electrons.com/training-materials/commit/?id=cfd2e25013d7bd3b1412666f5f91f14c9dcafb7d

commit cfd2e25013d7bd3b1412666f5f91f14c9dcafb7d
Author: Maxime Ripard <maxime.ripard at free-electrons.com>
Date:   Tue May 29 15:24:46 2012 +0200

    Fix width of the slab allocators image
    
    Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>

diff --git a/slides/kernel-driver-development-memory/kernel-driver-development-memory.tex b/slides/kernel-driver-development-memory/kernel-driver-development-memory.tex
index a2716aa..73e30f4 100644
--- a/slides/kernel-driver-development-memory/kernel-driver-development-memory.tex
+++ b/slides/kernel-driver-development-memory/kernel-driver-development-memory.tex
@@ -261,7 +261,7 @@
     \end{itemize}
   \end{itemize}
   \begin{center}
-    \includegraphics[height=0.3\textheight]{slides/kernel-driver-development-memory/slab-screenshot.png}
+    \includegraphics[width=\textwidth]{slides/kernel-driver-development-memory/slab-screenshot.png}
   \end{center}
 \end{frame}
 

http://git.free-electrons.com/training-materials/commit/?id=5f536eb99c6af944597a2eaaa96a4ee2ee74bcb9

commit 5f536eb99c6af944597a2eaaa96a4ee2ee74bcb9
Author: Maxime Ripard <maxime.ripard at free-electrons.com>
Date:   Tue May 29 15:19:48 2012 +0200

    Split the page allocator API in two slides
    
    Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>

diff --git a/slides/kernel-driver-development-memory/kernel-driver-development-memory.tex b/slides/kernel-driver-development-memory/kernel-driver-development-memory.tex
index 422319f..a2716aa 100644
--- a/slides/kernel-driver-development-memory/kernel-driver-development-memory.tex
+++ b/slides/kernel-driver-development-memory/kernel-driver-development-memory.tex
@@ -151,7 +151,7 @@
 \end{frame}
 
 \begin{frame}[fragile]
-  \frametitle{Page Allocator API}
+  \frametitle{Page Allocator API: Get free pages}
   \begin{itemize}
   \item \mint{c}+unsigned long get_zeroed_page(int flags)+
     \begin{itemize}
@@ -170,6 +170,12 @@
       \code{log2(number_of_pages)}.Can be computed
       from the size with the \code{get_order()} function.
     \end{itemize}
+  \end{itemize}
+\end{frame}
+
+\begin{frame}[fragile]
+  \frametitle{Page Allocator API: Free Pages}
+  \begin{itemize}
   \item \mint{c}+void free_page(unsigned long addr)+
     \begin{itemize}
     \item Frees one page.

http://git.free-electrons.com/training-materials/commit/?id=16ae1cae9cacab26c5358439f35101765c9a9f7d

commit 16ae1cae9cacab26c5358439f35101765c9a9f7d
Author: Maxime Ripard <maxime.ripard at free-electrons.com>
Date:   Tue May 29 15:17:01 2012 +0200

    Fix items
    
    Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>

diff --git a/slides/kernel-driver-development-memory/kernel-driver-development-memory.tex b/slides/kernel-driver-development-memory/kernel-driver-development-memory.tex
index 11330f7..422319f 100644
--- a/slides/kernel-driver-development-memory/kernel-driver-development-memory.tex
+++ b/slides/kernel-driver-development-memory/kernel-driver-development-memory.tex
@@ -15,17 +15,21 @@
     \column{0.7\textwidth}
     \begin{itemize}
     \item 1GB reserved for kernel-space
-    \item Contains kernel code and core data structures, identical in
-      all address spaces
-    \item Most memory can be a direct mapping of physical memory at a
-      fixed offset
+      \begin{itemize}
+      \item Contains kernel code and core data structures, identical
+        in all address spaces
+      \item Most memory can be a direct mapping of physical memory at
+        a fixed offset
+      \end{itemize}
     \item Complete 3GB exclusive mapping available for each user-space
       process
-    \item Process code and data (program, stack, ...)
-    \item Memory-mapped files
-    \item Not necessarily mapped to physical memory (demand fault
-      paging used for dynamic mapping to physical memory pages)
-    \item Differs from one address space to another
+      \begin{itemize}
+      \item Process code and data (program, stack, ...)
+      \item Memory-mapped files
+      \item Not necessarily mapped to physical memory (demand fault
+        paging used for dynamic mapping to physical memory pages)
+      \item Differs from one address space to another
+      \end{itemize}
     \end{itemize}
   \end{columns}
 \end{frame}

http://git.free-electrons.com/training-materials/commit/?id=354acfd9c3b872ce5114f7a6851ad542cd247e67

commit 354acfd9c3b872ce5114f7a6851ad542cd247e67
Author: Maxime Ripard <maxime.ripard at free-electrons.com>
Date:   Tue May 29 15:02:29 2012 +0200

    Fix Kconfig indentation
    
    Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>

diff --git a/slides/kernel-driver-development-modules/kernel-driver-development-modules.tex b/slides/kernel-driver-development-modules/kernel-driver-development-modules.tex
index 0c7ff01..d81fcdf 100644
--- a/slides/kernel-driver-development-modules/kernel-driver-development-modules.tex
+++ b/slides/kernel-driver-development-modules/kernel-driver-development-modules.tex
@@ -231,16 +231,17 @@ endif
       adding the following lines to the Kconfig file in this
       directory:
     \end{itemize}
-  \end{itemize}
-
+{\footnotesize
 \begin{verbatim}
-  config USB_SERIAL_NAVMAN
-  tristate "USB Navman GPS device"
-  depends on USB_SERIAL
-  help
-   To compile this driver as a module, choose M here: the
-   module will be called navman.
+config USB_SERIAL_NAVMAN
+        tristate "USB Navman GPS device"
+        depends on USB_SERIAL
+        help
+          To compile this driver as a module, choose M
+          here: the module will be called navman.
 \end{verbatim}
+}
+  \end{itemize}
 \end{frame}
 
 \begin{frame}

-----------------------------------------------------------------------

Summary of changes:
 .../kernel-driver-development-general-apis.tex     |   28 +++++++---------
 .../kernel-driver-development-memory.tex           |   34 +++++++++++++-------
 .../kernel-driver-development-modules.tex          |   17 +++++-----
 3 files changed, 42 insertions(+), 37 deletions(-)


More information about the training-materials-updates mailing list