From patchwork Tue Oct 15 21:04:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 3048901 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6FB12BF924 for ; Tue, 15 Oct 2013 21:44:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A8ADD2031C for ; Tue, 15 Oct 2013 21:44:57 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9DE312030E for ; Tue, 15 Oct 2013 21:44:56 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VWBpo-0003oE-Dm; Tue, 15 Oct 2013 21:07:21 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VWBpB-00063L-Nu; Tue, 15 Oct 2013 21:06:42 +0000 Received: from mail-qe0-f54.google.com ([209.85.128.54]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VWBnf-0005sN-6o for linux-arm-kernel@lists.infradead.org; Tue, 15 Oct 2013 21:05:13 +0000 Received: by mail-qe0-f54.google.com with SMTP id 1so6958756qec.13 for ; Tue, 15 Oct 2013 14:04:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bG8t0RIno+SF0y7eyknR8NEovZF3WS97Q0xPP5KAYsM=; b=eIoA8V5DFaF8CrNfIESRjJSpC0vQ45XSb9D4bdEXbjmvTsnpy/E9HJ2ezj8mifSATo QIlp6aZi+McPMACpSXX+g1OPpSNPB/gLl2ZAIr/kAjRVJ9MaOgDhOLPfLr6dklLejAWz PxOxHvhvlgjigTDFXZ6y90AOikhILTm1rnavoQJMwXsRfZN0dzieixHvtx60w0JdQ/P0 adzFVlt+MbOH4nGR/f/ljauuIqcLYkcUGm9RdnmmNBrGqA5WXjyby/INfKXYhzItjYl0 6A80wqLljeUu3INnHKKbuKf5WXMg4rBCM2SmNBNNGk5jSzP2IAP2ot9UpkPCS2+0EfVa t4Dw== X-Gm-Message-State: ALoCoQnj7PhqvMTuP1weMApy4dwyVpbWItB7eoec35PaLEmH/mOqMriaCxL6Rhv+FCV9HoEhzXNG X-Received: by 10.49.41.3 with SMTP id b3mr34460853qel.51.1381871086093; Tue, 15 Oct 2013 14:04:46 -0700 (PDT) Received: from localhost.localdomain (pool-72-71-243-183.cncdnh.fast00.myfairpoint.net. [72.71.243.183]) by mx.google.com with ESMTPSA id i4sm159645128qan.0.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Oct 2013 14:04:45 -0700 (PDT) From: David Long To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 10/13] kprobes: Remove uneeded kernel dependency on struct arch_specific_insn Date: Tue, 15 Oct 2013 17:04:25 -0400 Message-Id: <1381871068-27660-11-git-send-email-dave.long@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1381871068-27660-1-git-send-email-dave.long@linaro.org> References: <1381871068-27660-1-git-send-email-dave.long@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131015_170507_367249_44AC2D6D X-CRM114-Status: GOOD ( 10.27 ) X-Spam-Score: -2.6 (--) Cc: "Jon Medhurst \(Tixy\)" , Srikar Dronamraju , Oleg Nesterov , linux-kernel@vger.kernel.org, Rabin Vincent , Ingo Molnar X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "David A. Long" Instead of depending on include/asm/kprobes.h to provide a dummy definition for struct arch_specific_insn, do so in include/linux/kprobes.h. Signed-off-by: David A. Long --- include/linux/kprobes.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h index 925eaf2..4b5a74d 100644 --- a/include/linux/kprobes.h +++ b/include/linux/kprobes.h @@ -52,9 +52,6 @@ #else /* CONFIG_KPROBES */ typedef int kprobe_opcode_t; -struct arch_specific_insn { - int dummy; -}; #endif /* CONFIG_KPROBES */ struct kprobe; @@ -110,7 +107,11 @@ struct kprobe { kprobe_opcode_t opcode; /* copy of the original instruction */ +#ifdef CONFIG_KPROBES struct arch_specific_insn ainsn; +#else + int ainsn; +#endif /* * Indicates various status flags.