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: 21055 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f199.google.com (mail-pd0-f199.google.com [209.85.192.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 14EFA20D84 for ; Tue, 15 Oct 2013 21:04:48 +0000 (UTC) Received: by mail-pd0-f199.google.com with SMTP id v10sf16620125pde.2 for ; Tue, 15 Oct 2013 14:04:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=bG8t0RIno+SF0y7eyknR8NEovZF3WS97Q0xPP5KAYsM=; b=Ai1xIU/VCGVcH0HJucmc4SI0aT4rZ+Abt0pjFIPNyMWm6X4P0aE8Btg7RBbRTH+CxT 4bC14DnL5I6aIqM6KCLOhRRV91V4mugO60GdQUWBJ6fPE173BK8mVbQzNcuLaobllwoH O/akc38Kkxt9wy4Kk54ABs/sHtZUua3AlAd1Cc33cnf125OIlMpQjBExZiIYUJ4ens/s RkbE7OHzpHOmdsTzJqLlv/NocvQrhbOKanHUVtQK5wMauuYD++VaONShIpd9BXBjDIfK 7gYI4AdbBV0IyAFN13D0y02/bRSqtztNG71Ac0mykyt41gOLRLvv/nxTN2u2Ew6AtSZs e/9Q== X-Received: by 10.66.144.41 with SMTP id sj9mr16322880pab.23.1381871087289; Tue, 15 Oct 2013 14:04:47 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.133.100 with SMTP id pb4ls282572qeb.44.gmail; Tue, 15 Oct 2013 14:04:47 -0700 (PDT) X-Received: by 10.220.78.18 with SMTP id i18mr8032549vck.3.1381871087126; Tue, 15 Oct 2013 14:04:47 -0700 (PDT) Received: from mail-vb0-f54.google.com (mail-vb0-f54.google.com [209.85.212.54]) by mx.google.com with ESMTPS id dg3si4001016veb.144.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Oct 2013 14:04:47 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.54 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.54; Received: by mail-vb0-f54.google.com with SMTP id q14so5603137vbe.27 for ; Tue, 15 Oct 2013 14:04:47 -0700 (PDT) X-Gm-Message-State: ALoCoQn9WBlXE+/jv+hPZBRvz5kOvgNdwqOhJULuOz8S4XAgP0SZoRkOdZGkkGeNZGwZj7mjD75B X-Received: by 10.58.46.171 with SMTP id w11mr13736446vem.5.1381871087043; Tue, 15 Oct 2013 14:04:47 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp328431vcz; Tue, 15 Oct 2013 14:04:46 -0700 (PDT) X-Received: by 10.224.63.199 with SMTP id c7mr32889825qai.74.1381871086324; Tue, 15 Oct 2013 14:04:46 -0700 (PDT) Received: from mail-qe0-f41.google.com (mail-qe0-f41.google.com [209.85.128.41]) by mx.google.com with ESMTPS id 7si33769938qaw.13.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Oct 2013 14:04:46 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.41 is neither permitted nor denied by best guess record for domain of dave.long@linaro.org) client-ip=209.85.128.41; Received: by mail-qe0-f41.google.com with SMTP id x7so5589691qeu.14 for ; Tue, 15 Oct 2013 14:04:46 -0700 (PDT) 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 Cc: Rabin Vincent , "Jon Medhurst (Tixy)" , Oleg Nesterov , Srikar Dronamraju , Ingo Molnar , linux-kernel@vger.kernel.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-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: dave.long@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.54 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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.