From patchwork Wed Sep 19 23:41:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Vorontsov X-Patchwork-Id: 11513 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id A75FF23E41 for ; Wed, 19 Sep 2012 23:46:23 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id F3177A18150 for ; Wed, 19 Sep 2012 23:46:22 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so2020369iej.11 for ; Wed, 19 Sep 2012 16:46:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=13RHGu2VlIlDUgJhjyyYJUotyhvwJTo1Z800CuZplaw=; b=Rwj4kh3ROYDEQ0INWbXq6Lf+a/nTBHoVAJG9RUaHb1d2nNiG0Q5+H2gMLE/fEPOxFq 5lwBAP9opcZZQS/G/trBbs37IId8LJGgjbu14f3/qlqaEh3JBJjhvG3eYMOFKyH+W1OH /PmJ2aajbCU5RD9fg4BICsMIKylcSn7abnth6+08/inD+FHE7QJneL4SWYkP7nMz+LsD /Fd26NUk1hAy5XXkjqbGmX+Xnj36gqh95xS85KJfdfZvGbSOlvTGFB75Q+PbgxcDSfSh cHiwUD+kI9IXqrsPfjd0IDxnqVDPRQjcIJVoAhnZctewla9EgU4iGdnueEM9aRbkyfed bTIg== Received: by 10.50.0.193 with SMTP id 1mr158838igg.0.1348098382745; Wed, 19 Sep 2012 16:46:22 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp49685igc; Wed, 19 Sep 2012 16:46:22 -0700 (PDT) Received: by 10.68.226.195 with SMTP id ru3mr1785380pbc.149.1348098382057; Wed, 19 Sep 2012 16:46:22 -0700 (PDT) Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com [209.85.160.50]) by mx.google.com with ESMTPS id h9si2141159paw.221.2012.09.19.16.46.21 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 19 Sep 2012 16:46:22 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) client-ip=209.85.160.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) smtp.mail=anton.vorontsov@linaro.org Received: by mail-pb0-f50.google.com with SMTP id md12so3888024pbc.37 for ; Wed, 19 Sep 2012 16:46:21 -0700 (PDT) Received: by 10.66.75.73 with SMTP id a9mr952630paw.43.1348098381653; Wed, 19 Sep 2012 16:46:21 -0700 (PDT) Received: from localhost (ip-64-134-220-225.public.wayport.net. [64.134.220.225]) by mx.google.com with ESMTPS id os1sm2540539pbc.31.2012.09.19.16.46.16 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 19 Sep 2012 16:46:21 -0700 (PDT) From: Anton Vorontsov To: Andrew Morton , Russell King , Jason Wessel , Greg Kroah-Hartman , Alan Cox Cc: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Colin Cross , Brian Swetland , John Stultz , Thomas Gleixner , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, patches@linaro.org, kernel-team@android.com, kgdb-bugreport@lists.sourceforge.net, linux-serial@vger.kernel.org Subject: [PATCH 03/11] kdb: Turn KGDB_KDB=n stubs into static inlines Date: Wed, 19 Sep 2012 16:41:54 -0700 Message-Id: <1348098122-11041-3-git-send-email-anton.vorontsov@linaro.org> X-Mailer: git-send-email 1.7.11.5 In-Reply-To: <20120919234003.GA24143@lizard> References: <20120919234003.GA24143@lizard> X-Gm-Message-State: ALoCoQnExBGjUqi3BgAQ/Z2ZOE7q9wlrx2fp2woRwysXDBIqP9uPVSoPSoBTzB5y1oI2FhmgxMJt This makes the stubs actually usable, since e.g. 'foo = kdb_register();' leads to build errors in !KGDB_KDB case. Plus, with static inlines we do type checking. Signed-off-by: Anton Vorontsov Acked-by: Jason Wessel --- include/linux/kdb.h | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/include/linux/kdb.h b/include/linux/kdb.h index 42d9e86..7f6fe6e 100644 --- a/include/linux/kdb.h +++ b/include/linux/kdb.h @@ -13,6 +13,14 @@ * Copyright (C) 2009 Jason Wessel */ +typedef enum { + KDB_REPEAT_NONE = 0, /* Do not repeat this command */ + KDB_REPEAT_NO_ARGS, /* Repeat the command without arguments */ + KDB_REPEAT_WITH_ARGS, /* Repeat the command including its arguments */ +} kdb_repeat_t; + +typedef int (*kdb_func_t)(int, const char **); + #ifdef CONFIG_KGDB_KDB #include #include @@ -32,14 +40,6 @@ extern atomic_t kdb_event; #define KDB_MAXARGS 16 /* Maximum number of arguments to a function */ -typedef enum { - KDB_REPEAT_NONE = 0, /* Do not repeat this command */ - KDB_REPEAT_NO_ARGS, /* Repeat the command without arguments */ - KDB_REPEAT_WITH_ARGS, /* Repeat the command including its arguments */ -} kdb_repeat_t; - -typedef int (*kdb_func_t)(int, const char **); - /* KDB return codes from a command or internal kdb function */ #define KDB_NOTFOUND (-1) #define KDB_ARGCOUNT (-2) @@ -149,11 +149,14 @@ extern int kdb_register_repeat(char *, kdb_func_t, char *, char *, short, kdb_repeat_t); extern int kdb_unregister(char *); #else /* ! CONFIG_KGDB_KDB */ -#define kdb_printf(...) -#define kdb_init(x) -#define kdb_register(...) -#define kdb_register_repeat(...) -#define kdb_uregister(x) +static inline __printf(1, 2) int kdb_printf(const char *fmt, ...) { return 0; } +static inline void kdb_init(int level) {} +static inline int kdb_register(char *cmd, kdb_func_t func, char *usage, + char *help, short minlen) { return 0; } +static inline int kdb_register_repeat(char *cmd, kdb_func_t func, char *usage, + char *help, short minlen, + kdb_repeat_t repeat) { return 0; } +static inline int kdb_unregister(char *cmd) { return 0; } #endif /* CONFIG_KGDB_KDB */ enum { KDB_NOT_INITIALIZED,