From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 939BBFA3728 for ; Wed, 16 Oct 2019 15:01:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6C5E5218DE for ; Wed, 16 Oct 2019 15:01:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="f0n+et9v" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392273AbfJPPBh (ORCPT ); Wed, 16 Oct 2019 11:01:37 -0400 Received: from mail-wr1-f73.google.com ([209.85.221.73]:55690 "EHLO mail-wr1-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392186AbfJPPBh (ORCPT ); Wed, 16 Oct 2019 11:01:37 -0400 Received: by mail-wr1-f73.google.com with SMTP id o10so11839706wrm.22 for ; Wed, 16 Oct 2019 08:01:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=rhvfW/MCKGI2uxeEW6Nn+IuXscNU7+I/egjWinp71uE=; b=f0n+et9vXhAXbCHqu0gWhPEK6MCzXc906FFde3nnutVDBB1zo+n6ZsPhR/E5C53h6s i/diHbdVgi/7rcsvxNtAsSMu3OrO6/KBl2CZB9cLTZU75Qw47nb8E9G+O44hiwbQxKSF V2QZW4W9P6DCLu+hwxjI3i8PnB7sHnzxMc73vDMXYPSRGF1Ta2OacJbm/atVXMbQVfg4 u88i56zouDFSWDrgov598pS+yfNf9FyHwv+xAFyrKJ5fP35+/u6GAqqCimiSvUsP/UFQ t+/7a8qZMhiVgk+ldhokMwdZRj5HJRXV+7oPbEn4gFQ7P1avlas5OINJLuGYzNdjNWFd bVxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=rhvfW/MCKGI2uxeEW6Nn+IuXscNU7+I/egjWinp71uE=; b=srM+8VbwXvmcCUEuneQyeEi+Vpkk2CjnR5+E1go0QHi29uzEXsYpCn6A3rqLLkkRUo v3Rg5bK8HwgVpjOgOxAjnPmIBtOwm0bzVxlH3m9fgufTBSc1o97I5O3nkBRPG8WqHezl 8sZtc6Eht29wtD4wbAok+CwFceji6mWQ3ptdbe9LtJu01+f/whHUldKnBIeu8OBByHbQ 3NNkAmydrS/aPEvvUzsvLYIhgYii8F8Uqj85yeK6ACLAU4B4KjYMTSY1y0X7Se7IKZBA l2VKyqYtZhkQc/+ZV+YXDnjenDgrMYcbxpPqrneKZE0nkil55lLK70I3TBFco60G1AQt nejQ== X-Gm-Message-State: APjAAAUM0JIQj0lqVm5pyImTPlv249hCrIR9ZWxMk+Lk1menAwe72Kje QB1VZtwlV9sDVhoh0jmKLQb/BLNPDw== X-Google-Smtp-Source: APXvYqzWLNszz1Nx7EBZhwr8CSMAeG/Ushr6nHeHKyszLYbN/KtaEJqXIILl35ZKwECUm9JFDurNyMR+fA== X-Received: by 2002:a5d:4dd2:: with SMTP id f18mr2996914wru.4.1571238093597; Wed, 16 Oct 2019 08:01:33 -0700 (PDT) Date: Wed, 16 Oct 2019 17:01:19 +0200 In-Reply-To: <20191016150119.154756-1-jannh@google.com> Message-Id: <20191016150119.154756-2-jannh@google.com> Mime-Version: 1.0 References: <20191016150119.154756-1-jannh@google.com> X-Mailer: git-send-email 2.23.0.700.g56cf767bdb-goog Subject: [PATCH 2/2] binder: Use common definition of SZ_1K From: Jann Horn To: Greg Kroah-Hartman , "=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=" , Todd Kjos , Martijn Coenen , Joel Fernandes , Christian Brauner , jannh@google.com Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org SZ_1K has been defined in include/linux/sizes.h since v3.6. Get rid of the duplicate definition. Signed-off-by: Jann Horn --- drivers/android/binder.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 265d9dd46a5e..a606262da9d6 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -65,6 +65,7 @@ #include #include #include +#include #include #include @@ -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 - #define FORBIDDEN_MMAP_FLAGS (VM_WRITE) enum { -- 2.23.0.700.g56cf767bdb-goog