[PATCH 0/2] Minor clean-ups in plist and spinlock

[PATCH 0/2] Minor clean-ups in plist and spinlock

[John Kacur]

Thomas / Ingo

These patches clean-up some minor problems.
They are safe for 2.6.33, but can also wait for 2.6.34.
They should also be applied to the -rt branch until accepted upstream.

They can be pulled at
git://git.kernel.org/pub/scm/linux/kernel/git/jkacur/jk-2.6.git
branch: jk/v2.6.33-rc3-cleanups

John Kacur (2):
  plist: Fix grammar mistake, and c-style mistake.
  spinlock: Fix some indentation problems in spinlock.h

 include/linux/plist.h    |    4 ++--
 include/linux/spinlock.h |   20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

[PATCH 1/2] plist: Fix grammar mistake, and c-style mistake.

[John Kacur]

Signed-off-by: John Kacur <jkacur@redhat.com>
---
 include/linux/plist.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/plist.h b/include/linux/plist.h
index 8227f71..6898985 100644
--- a/include/linux/plist.h
+++ b/include/linux/plist.h
@@ -45,7 +45,7 @@
  * the insertion of new nodes. There are no nodes with duplicate
  * priorites on the list.
  *
- * The nodes on the node_list is ordered by priority and can contain
+ * The nodes on the node_list are ordered by priority and can contain
  * entries which have the same priority. Those entries are ordered
  * FIFO
  *
@@ -265,7 +265,7 @@ static inline int plist_node_empty(const struct plist_node *node)
  *
  * Assumes the plist is _not_ empty.
  */
-static inline struct plist_node* plist_first(const struct plist_head *head)
+static inline struct plist_node *plist_first(const struct plist_head *head)
 {
 	return list_entry(head->node_list.next,
 			  struct plist_node, plist.node_list);
-- 
1.6.5.2

[PATCH 2/2] spinlock: Fix some indentation problems in spinlock.h

[John Kacur]

Signed-off-by: John Kacur <jkacur@redhat.com>
---
 include/linux/spinlock.h |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
index 8608821..d2df17b 100644
--- a/include/linux/spinlock.h
+++ b/include/linux/spinlock.h
@@ -63,14 +63,14 @@
 #define LOCK_SECTION_NAME ".text.lock."KBUILD_BASENAME
 
 #define LOCK_SECTION_START(extra)               \
-        ".subsection 1\n\t"                     \
-        extra                                   \
-        ".ifndef " LOCK_SECTION_NAME "\n\t"     \
-        LOCK_SECTION_NAME ":\n\t"               \
-        ".endif\n"
+	".subsection 1\n\t"                     \
+	extra                                   \
+	".ifndef " LOCK_SECTION_NAME "\n\t"     \
+	LOCK_SECTION_NAME ":\n\t"               \
+	".endif\n"
 
 #define LOCK_SECTION_END                        \
-        ".previous\n\t"
+	".previous\n\t"
 
 #define __lockfunc __attribute__((section(".spinlock.text")))
 
@@ -170,10 +170,10 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock)
 	_raw_spin_lock_nested(lock, subclass)
 
 # define raw_spin_lock_nest_lock(lock, nest_lock)			\
-	 do {								\
-		 typecheck(struct lockdep_map *, &(nest_lock)->dep_map);\
-		 _raw_spin_lock_nest_lock(lock, &(nest_lock)->dep_map);	\
-	 } while (0)
+	do {								\
+		typecheck(struct lockdep_map *, &(nest_lock)->dep_map);\
+		_raw_spin_lock_nest_lock(lock, &(nest_lock)->dep_map);	\
+	} while (0)
 #else
 # define raw_spin_lock_nested(lock, subclass)		_raw_spin_lock(lock)
 # define raw_spin_lock_nest_lock(lock, nest_lock)	_raw_spin_lock(lock)
-- 
1.6.5.2

[tip:core/locking] plist: Fix grammar mistake, and c-style mistake

[tip-bot for John Kacur]

Commit-ID:  9ca94d7c016130f9ed77f142424ace9c19742809
Gitweb:     http://git.kernel.org/tip/9ca94d7c016130f9ed77f142424ace9c19742809
Author:     John Kacur <jkacur@redhat.com>
AuthorDate: Mon, 11 Jan 2010 21:21:06 +0100
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Wed, 13 Jan 2010 10:51:39 +0100

plist: Fix grammar mistake, and c-style mistake

Signed-off-by: John Kacur <jkacur@redhat.com>
Acked-by: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <1263241267-25204-2-git-send-email-jkacur@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 include/linux/plist.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/plist.h b/include/linux/plist.h
index 8227f71..6898985 100644
--- a/include/linux/plist.h
+++ b/include/linux/plist.h
@@ -45,7 +45,7 @@
  * the insertion of new nodes. There are no nodes with duplicate
  * priorites on the list.
  *
- * The nodes on the node_list is ordered by priority and can contain
+ * The nodes on the node_list are ordered by priority and can contain
  * entries which have the same priority. Those entries are ordered
  * FIFO
  *
@@ -265,7 +265,7 @@ static inline int plist_node_empty(const struct plist_node *node)
  *
  * Assumes the plist is _not_ empty.
  */
-static inline struct plist_node* plist_first(const struct plist_head *head)
+static inline struct plist_node *plist_first(const struct plist_head *head)
 {
 	return list_entry(head->node_list.next,
 			  struct plist_node, plist.node_list);