[PATCH 0/4] archs: use generic current.h

[PATCH 0/4] archs: use generic current.h

[Davidlohr Bueso]

Hi Andrew,

This is a resend of straightforward arch patches that I had no
response from the maintainers but are trivial enough that I
hope you can pick them up, like you did the m32r one.

Thanks!

Davidlohr Bueso (4):
  alpha: use generic current.h
  cris: use generic current.h
  parisc: use generic current.h
  score: remove asm/current.h

 arch/alpha/include/asm/Kbuild     |  1 +
 arch/alpha/include/asm/current.h  |  9 ---------
 arch/cris/include/asm/Kbuild      |  1 +
 arch/cris/include/asm/current.h   | 15 ---------------
 arch/parisc/include/asm/Kbuild    |  1 +
 arch/parisc/include/asm/current.h | 15 ---------------
 arch/score/include/asm/Kbuild     |  1 +
 arch/score/include/asm/current.h  |  6 ------
 8 files changed, 4 insertions(+), 45 deletions(-)
 delete mode 100644 arch/alpha/include/asm/current.h
 delete mode 100644 arch/cris/include/asm/current.h
 delete mode 100644 arch/parisc/include/asm/current.h
 delete mode 100644 arch/score/include/asm/current.h

-- 
2.6.6

[PATCH 1/4] alpha: use generic current.h

[Davidlohr Bueso]

Given that the arch does not add its own implementations, simply
use the asm-generic/current.h (generic-y) header instead of
duplicating code.

Cc: linux-alpha@vger.kernel.org
Cc: rth@twiddle.net
Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
---
 arch/alpha/include/asm/Kbuild    | 1 +
 arch/alpha/include/asm/current.h | 9 ---------
 2 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 arch/alpha/include/asm/current.h

diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild
index bf8475ce85ee..4c5468b03e45 100644
--- a/arch/alpha/include/asm/Kbuild
+++ b/arch/alpha/include/asm/Kbuild
@@ -10,3 +10,4 @@ generic-y += mm-arch-hooks.h
 generic-y += preempt.h
 generic-y += sections.h
 generic-y += trace_clock.h
+generic-y += current.h
diff --git a/arch/alpha/include/asm/current.h b/arch/alpha/include/asm/current.h
deleted file mode 100644
index 094d285a1b34..000000000000
--- a/arch/alpha/include/asm/current.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _ALPHA_CURRENT_H
-#define _ALPHA_CURRENT_H
-
-#include <linux/thread_info.h>
-
-#define get_current()	(current_thread_info()->task)
-#define current		get_current()
-
-#endif /* _ALPHA_CURRENT_H */
-- 
2.6.6

[PATCH 2/4] cris: use generic current.h

[Davidlohr Bueso]

Given that the arch does not add its own implementations, simply
use the asm-generic/current.h (generic-y) header instead of
duplicating code.

Cc: starvik@axis.com
Cc: linux-cris-kernel@axis.com
Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
---
 arch/cris/include/asm/Kbuild    |  1 +
 arch/cris/include/asm/current.h | 15 ---------------
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 arch/cris/include/asm/current.h

diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index 1778805f6380..0568dbe224b8 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -5,6 +5,7 @@ generic-y += bitsperlong.h
 generic-y += clkdev.h
 generic-y += cmpxchg.h
 generic-y += cputime.h
+generic-y += current.h
 generic-y += device.h
 generic-y += div64.h
 generic-y += errno.h
diff --git a/arch/cris/include/asm/current.h b/arch/cris/include/asm/current.h
deleted file mode 100644
index 5f5c0efd00be..000000000000
--- a/arch/cris/include/asm/current.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _CRIS_CURRENT_H
-#define _CRIS_CURRENT_H
-
-#include <linux/thread_info.h>
-
-struct task_struct;
-
-static inline struct task_struct * get_current(void)
-{
-        return current_thread_info()->task;
-}
- 
-#define current get_current()
-
-#endif /* !(_CRIS_CURRENT_H) */
-- 
2.6.6

[PATCH 3/4] parisc: use generic current.h

[Davidlohr Bueso]

Given that the arch does not add its own implementations, simply
use the asm-generic/current.h (generic-y) header instead of
duplicating code.

Cc: jejb@parisc-linux.org
Cc: linux-parisc@vger.kernel.org
Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
---
 arch/parisc/include/asm/Kbuild    |  1 +
 arch/parisc/include/asm/current.h | 15 ---------------
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 arch/parisc/include/asm/current.h

diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild
index 91f53c07f410..a07448dc2b29 100644
--- a/arch/parisc/include/asm/Kbuild
+++ b/arch/parisc/include/asm/Kbuild
@@ -3,6 +3,7 @@ generic-y += auxvec.h
 generic-y += barrier.h
 generic-y += clkdev.h
 generic-y += cputime.h
+generic-y += current.h
 generic-y += device.h
 generic-y += div64.h
 generic-y += emergency-restart.h
diff --git a/arch/parisc/include/asm/current.h b/arch/parisc/include/asm/current.h
deleted file mode 100644
index 0fb9338e3bf2..000000000000
--- a/arch/parisc/include/asm/current.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _PARISC_CURRENT_H
-#define _PARISC_CURRENT_H
-
-#include <linux/thread_info.h>
-
-struct task_struct;
-
-static inline struct task_struct * get_current(void)
-{
-	return current_thread_info()->task;
-}
- 
-#define current get_current()
-
-#endif /* !(_PARISC_CURRENT_H) */
-- 
2.6.6

[PATCH 4/4] score: remove asm/current.h

[Davidlohr Bueso]

... it's already using the generic version anyways, so just
drop the file as do the other archs that do not implement
their own version of the current macro.

Cc: lennox.wu@gmail.com
Cc: liqin.linux@gmail.com
Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
---
 arch/score/include/asm/Kbuild    | 1 +
 arch/score/include/asm/current.h | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 arch/score/include/asm/current.h

diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild
index a05218ff3fe4..a68eb2ec98a1 100644
--- a/arch/score/include/asm/Kbuild
+++ b/arch/score/include/asm/Kbuild
@@ -5,6 +5,7 @@ header-y +=
 generic-y += barrier.h
 generic-y += clkdev.h
 generic-y += cputime.h
+generic-y += current.h
 generic-y += irq_work.h
 generic-y += mcs_spinlock.h
 generic-y += mm-arch-hooks.h
diff --git a/arch/score/include/asm/current.h b/arch/score/include/asm/current.h
deleted file mode 100644
index 16eae9cbaf1a..000000000000
--- a/arch/score/include/asm/current.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_CURRENT_H
-#define _ASM_SCORE_CURRENT_H
-
-#include <asm-generic/current.h>
-
-#endif /* _ASM_SCORE_CURRENT_H */
-- 
2.6.6