summaryrefslogtreecommitdiffstats
path: root/drivers/android
diff options
context:
space:
mode:
authorJann Horn <jannh@google.com>2019-10-16 17:01:19 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-17 06:00:43 -0700
commit990be747648576184a65af0b20032126cb83a046 (patch)
tree25ab5459200af180ff11e00855543b5b053a5ce9 /drivers/android
parent97856e59384de326174360a780038113fea19f42 (diff)
downloadlinux-990be747648576184a65af0b20032126cb83a046.tar.bz2
binder: Use common definition of SZ_1K
SZ_1K has been defined in include/linux/sizes.h since v3.6. Get rid of the duplicate definition. Signed-off-by: Jann Horn <jannh@google.com> Acked-by: Christian Brauner <christian.brauner@ubuntu.com> Link: https://lore.kernel.org/r/20191016150119.154756-2-jannh@google.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/android')
-rw-r--r--drivers/android/binder.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 5b9ac2122e89..bef788058bc3 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -65,6 +65,7 @@
#include <linux/ratelimit.h>
#include <linux/syscalls.h>
#include <linux/task_work.h>
+#include <linux/sizes.h>
#include <uapi/linux/android/binder.h>
#include <uapi/linux/android/binderfs.h>
@@ -92,11 +93,6 @@ static atomic_t binder_last_id;
static int proc_show(struct seq_file *m, void *unused);
DEFINE_SHOW_ATTRIBUTE(proc);
-/* This is only defined in include/asm-arm/sizes.h */
-#ifndef SZ_1K
-#define SZ_1K 0x400
-#endif
-
#ifndef SZ_4M
#define SZ_4M 0x400000
#endif