From patchwork Mon Jul 16 03:53:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 1199791 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 59CB4DF24C for ; Mon, 16 Jul 2012 03:58:29 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SqcOq-0001VO-6A; Mon, 16 Jul 2012 03:55:08 +0000 Received: from mail-ob0-f177.google.com ([209.85.214.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SqcOE-0001TZ-An for linux-arm-kernel@lists.infradead.org; Mon, 16 Jul 2012 03:54:31 +0000 Received: by mail-ob0-f177.google.com with SMTP id ta17so9221228obb.36 for ; Sun, 15 Jul 2012 20:54:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=IdDvMHeOzvgQ4HO0mldwOyD54LB1Q1+FkqMGOWiFufs=; b=Qq9SII1Y7SdUX5bQPrAX1m5YVberNrfzco/nSCuKg+6zN3l/qDmtrQ9WgvHocOtunV Pi4AkcB9CsKItTJbspJjMBpLf511uPGwX5s7EBUBYEEwLdUTF0aIf6dJwAC3fmyDQcp2 NQ+amS2LWz7XJniyc3JVdOuNzPUIpAIqIUjO8QCUtTlkdcohJaqboQbshitp7OnrjGOj 6nmZBa44c5AP4Om1BCdg3QSAdSJV/vnwLuoOxLWLg5+s6Gg3QPJVj6oibBTjoIzKHHy9 0ADAmJxCuwbYyQHWmNE3bdItOynBoB5powJHPoGdFTdXhsfH1ye35GxHs/voSAdMpLOZ GrGQ== Received: by 10.60.171.135 with SMTP id au7mr13465442oec.62.1342410870015; Sun, 15 Jul 2012 20:54:30 -0700 (PDT) Received: from rob-laptop.grandecom.net (65-36-72-55.dyn.grandenetworks.net. [65.36.72.55]) by mx.google.com with ESMTPS id a9sm7393862obp.14.2012.07.15.20.54.26 (version=SSLv3 cipher=OTHER); Sun, 15 Jul 2012 20:54:28 -0700 (PDT) From: Rob Herring To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/3] ARM: use asm-generic version of kmap_types.h Date: Sun, 15 Jul 2012 22:53:55 -0500 Message-Id: <1342410836-6010-3-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1342410836-6010-1-git-send-email-robherring2@gmail.com> References: <1342410836-6010-1-git-send-email-robherring2@gmail.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.177 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (robherring2[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (robherring2[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Russell King , Rob Herring , Arnd Bergmann , Nicolas Pitre X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Rob Herring kmap_types.h is virtually unused now with the stack based kmap_atomic, so we can just use the generic one. This does bump KM_TYPE_NR from 16 to 20, but there is still plenty of space left in the fixmap area. Signed-off-by: Rob Herring --- arch/arm/include/asm/Kbuild | 1 + arch/arm/include/asm/kmap_types.h | 33 --------------------------------- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 arch/arm/include/asm/kmap_types.h diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild index 8a7196c..c296c75 100644 --- a/arch/arm/include/asm/Kbuild +++ b/arch/arm/include/asm/Kbuild @@ -13,6 +13,7 @@ generic-y += ioctl.h generic-y += ipcbuf.h generic-y += irq_regs.h generic-y += kdebug.h +generic-y += kmap_types.h generic-y += local.h generic-y += local64.h generic-y += msgbuf.h diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h deleted file mode 100644 index e51b1e8..0000000 --- a/arch/arm/include/asm/kmap_types.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef __ARM_KMAP_TYPES_H -#define __ARM_KMAP_TYPES_H - -/* - * This is the "bare minimum". AIO seems to require this. - */ -enum km_type { - KM_BOUNCE_READ, - KM_SKB_SUNRPC_DATA, - KM_SKB_DATA_SOFTIRQ, - KM_USER0, - KM_USER1, - KM_BIO_SRC_IRQ, - KM_BIO_DST_IRQ, - KM_PTE0, - KM_PTE1, - KM_IRQ0, - KM_IRQ1, - KM_SOFTIRQ0, - KM_SOFTIRQ1, - KM_L1_CACHE, - KM_L2_CACHE, - KM_KDB, - KM_TYPE_NR -}; - -#ifdef CONFIG_DEBUG_HIGHMEM -#define KM_NMI (-1) -#define KM_NMI_PTE (-1) -#define KM_IRQ_PTE (-1) -#endif - -#endif