[PATCH] KEYS: fix macro




From: Sebastian Siewior <sebastian@xxxxxxxxxxxxx>

Commit 664cceb0093b755739e56572b836a99104ee8a75 changed the
parameters of the function make_key_ref(). The macros that
are used in case CONFIG_KEY is not defined did not change.

Cc: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: Sebastian Siewior <sebastian@xxxxxxxxxxxxx>
Acked-by: David Howells <dhowells@xxxxxxxxxx>
---

I found this while compile testing some files with a broken .config
file. Currently there is no user of make_key_ref() that does not select
CONFIG_KEY via Kconfig. However you may want to include this patch in
your new batch :)

include/linux/key.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/key.h b/include/linux/key.h
index fcdbd5e..a70b8a8 100644
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -290,7 +290,7 @@ extern void key_init(void);
#define key_get(k) ({ NULL; })
#define key_put(k) do { } while(0)
#define key_ref_put(k) do { } while(0)
-#define make_key_ref(k) ({ NULL; })
+#define make_key_ref(k, p) ({ NULL; })
#define key_ref_to_ptr(k) ({ NULL; })
#define is_key_possessed(k) 0
#define alloc_uid_keyring(u,c) 0
--
1.5.3.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



Relevant Pages

  • Re: Linux 2.6.16.58
    ... pointing to latest tag instead of latest commit. ... also present in my local tree, I'm certain that it remained there ... More majordomo info at http://vger.kernel.org/majordomo-info.html ... Please read the FAQ at http://www.tux.org/lkml/ ...
    (Linux-Kernel)
  • Re: quicklists confuse meminfo
    ... A Google query for the commit ID returned only one ... More majordomo info at http://vger.kernel.org/majordomo-info.html ... Please read the FAQ at http://www.tux.org/lkml/ ...
    (Linux-Kernel)
  • Re: nfs4 hang regression
    ... AFAIK it is fixed - commit 3d39c691ff486142dd9aaeac12f553f4476b7a62 ... More majordomo info at http://vger.kernel.org/majordomo-info.html ... Please read the FAQ at http://www.tux.org/lkml/ ...
    (Linux-Kernel)
  • Re: 2.6.19-git3 panics on boot - ata_piix/PCI related [still in -git17]
    ... I'm also hitting this running at commit: ... I have 2 identical systems with one difference, one has a DVD ... More majordomo info at http://vger.kernel.org/majordomo-info.html ... Please read the FAQ at http://www.tux.org/lkml/ ...
    (Linux-Kernel)
  • [PATCH 3/3] libata: replace ATA_FLAG_{NCQ,NO_ATAPI} using ->proto_mask
    ... commit a02791c8298bc0c2202a49c5e781ed2c68132dc8 ... * Register FIS clearing BSY */ ... More majordomo info at http://vger.kernel.org/majordomo-info.html ... Please read the FAQ at http://www.tux.org/lkml/ ...
    (Linux-Kernel)