]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
cris: use generic current.h
authorDavidlohr Bueso <dave@stgolabs.net>
Fri, 24 Feb 2017 22:55:36 +0000 (14:55 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 25 Feb 2017 01:46:53 +0000 (17:46 -0800)
Given that the arch does not add its own implementations, simply use the
asm-generic/current.h (generic-y) header instead of duplicating code.

Link: http://lkml.kernel.org/r/1485992878-4780-3-git-send-email-dave@stgolabs.net
Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/cris/include/asm/Kbuild
arch/cris/include/asm/current.h [deleted file]

index 9f19e19bff9d39117871446675563f7f9fc6426c..8e4ef321001f6d0f1f9c6d30c11f1bdbc217e195 100644 (file)
@@ -4,6 +4,7 @@ generic-y += barrier.h
 generic-y += bitsperlong.h
 generic-y += clkdev.h
 generic-y += cmpxchg.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 (file)
index 5f5c0ef..0000000
+++ /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) */