[-mm patch] make mmc_sysfs.c:mmc_key_type static

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.20-rc3-mm1:
>...
>  git-mmc.patch
>...
>  git trees
>...


This patch makes the needlessly global struct mmc_key_type static.

Signed-off-by: Adrian Bunk <[email protected]>

---

 drivers/mmc/mmc.h       |    1 -
 drivers/mmc/mmc_sysfs.c |    4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- linux-2.6.20-rc4-mm1/drivers/mmc/mmc.h.old	2007-01-13 08:28:31.000000000 +0100
+++ linux-2.6.20-rc4-mm1/drivers/mmc/mmc.h	2007-01-13 08:28:38.000000000 +0100
@@ -20,7 +20,6 @@
 void mmc_free_host_sysfs(struct mmc_host *host);
 
 /* core-internal data */
-extern struct key_type mmc_key_type;
 struct mmc_key_payload {
 	struct rcu_head	rcu;		/* RCU destructor */
 	unsigned short	datalen;	/* length of this data */
--- linux-2.6.20-rc4-mm1/drivers/mmc/mmc_sysfs.c.old	2007-01-13 08:28:44.000000000 +0100
+++ linux-2.6.20-rc4-mm1/drivers/mmc/mmc_sysfs.c	2007-01-13 08:29:21.000000000 +0100
@@ -66,6 +66,8 @@
 
 static struct device_attribute mmc_dev_attr_scr = MMC_ATTR_RO(scr);
 
+static struct key_type mmc_key_type;
+
 #ifdef	CONFIG_MMC_PASSWORDS
 
 static ssize_t
@@ -432,7 +434,7 @@
 	kfree(mpayload);
 }
 
-struct key_type mmc_key_type = {
+static struct key_type mmc_key_type = {
 	.name		= "mmc",
 	.def_datalen	= MMC_KEYLEN_MAXBYTES,
 	.instantiate	= mmc_key_instantiate,

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]
  Powered by Linux