* linux-next: build failure after merge of the crypto-current tree
@ 2011-11-01 0:58 Stephen Rothwell
2011-11-01 1:11 ` Herbert Xu
` (2 more replies)
0 siblings, 3 replies; 14+ messages in thread
From: Stephen Rothwell @ 2011-11-01 0:58 UTC (permalink / raw)
To: Herbert Xu; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 2268 bytes --]
Hi Herbert,
After merging the crypto-current tree, today's linux-next build (x86_64
allmodconfig) failed like this:
GEN /scratch/sfr/x86_64_allmodconfig/Makefile
scripts/kconfig/conf --allmodconfig Kconfig
net/Kconfig:5:error: recursive dependency detected!
net/Kconfig:5: symbol NET is selected by CRYPTO_USER
crypto/Kconfig:103: symbol CRYPTO_USER depends on CRYPTO
crypto/Kconfig:15: symbol CRYPTO is selected by BT
net/bluetooth/Kconfig:5: symbol BT depends on NET
warning: (SCSI_CXGB3_ISCSI && SCSI_CXGB4_ISCSI && SCSI_BNX2X_FCOE) selects NETDEVICES which has unmet direct dependencies (NET)
warning: (SCSI_CXGB3_ISCSI && SCSI_CXGB4_ISCSI && SCSI_BNX2_ISCSI && SCSI_BNX2X_FCOE) selects ETHERNET which has unmet direct dependencies (NETDEVICES && NET)
#
# configuration written to .config
#
WITHOUT_DISTCC:
ARCH=x86_64
CCVER=4.6
net/Kconfig:5:error: recursive dependency detected!
net/Kconfig:5: symbol NET is selected by CRYPTO_USER
crypto/Kconfig:103: symbol CRYPTO_USER depends on CRYPTO
crypto/Kconfig:15: symbol CRYPTO is selected by BT
net/bluetooth/Kconfig:5: symbol BT depends on NET
warning: (SCSI_CXGB3_ISCSI && SCSI_CXGB4_ISCSI && SCSI_BNX2X_FCOE) selects NETDEVICES which has unmet direct dependencies (NET)
warning: (SCSI_CXGB3_ISCSI && SCSI_CXGB4_ISCSI && SCSI_BNX2_ISCSI && SCSI_BNX2X_FCOE) selects ETHERNET which has unmet direct dependencies (NETDEVICES && NET)
*
* Restart config...
*
*
* Security options
*
Enable access key retention support (KEYS) [Y/n/?] y
TRUSTED KEYS (TRUSTED_KEYS) [M/n/?] m
ENCRYPTED KEYS (ENCRYPTED_KEYS) [M/n/y/?] m
Enable the /proc/keys file by which keys may be viewed (KEYS_DEBUG_PROC_KEYS) [Y/n/?] y
Restrict unprivileged access to the kernel syslog (SECURITY_DMESG_RESTRICT) [Y/n/?] y
Enable different security models (SECURITY) [N/y/?] (NEW) aborted!
Console input/output is redirected. Run 'make oldconfig' to update configuration.
Presumbly caused by commit ea8bdfcff175 ("crypto: user - Add dependency
on NET").
I have used the crypto-current tree from next-20111025 for today (i.e. that
commit has not been added to linux-next today).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: linux-next: build failure after merge of the crypto-current tree 2011-11-01 0:58 linux-next: build failure after merge of the crypto-current tree Stephen Rothwell @ 2011-11-01 1:11 ` Herbert Xu 2011-11-01 4:23 ` Stephen Rothwell 2011-11-02 20:09 ` Luis Henriques 2 siblings, 0 replies; 14+ messages in thread From: Herbert Xu @ 2011-11-01 1:11 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next, linux-kernel On Tue, Nov 01, 2011 at 11:58:51AM +1100, Stephen Rothwell wrote: > Hi Herbert, > > After merging the crypto-current tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > GEN /scratch/sfr/x86_64_allmodconfig/Makefile > scripts/kconfig/conf --allmodconfig Kconfig > net/Kconfig:5:error: recursive dependency detected! > net/Kconfig:5: symbol NET is selected by CRYPTO_USER > crypto/Kconfig:103: symbol CRYPTO_USER depends on CRYPTO > crypto/Kconfig:15: symbol CRYPTO is selected by BT > net/bluetooth/Kconfig:5: symbol BT depends on NET > warning: (SCSI_CXGB3_ISCSI && SCSI_CXGB4_ISCSI && SCSI_BNX2X_FCOE) selects NETDEVICES which has unmet direct dependencies (NET) > warning: (SCSI_CXGB3_ISCSI && SCSI_CXGB4_ISCSI && SCSI_BNX2_ISCSI && SCSI_BNX2X_FCOE) selects ETHERNET which has unmet direct dependencies (NETDEVICES && NET) Hmm, don't know why I didn't see that here. Does making it a dependency cause this to go away? diff --git a/crypto/Kconfig b/crypto/Kconfig index 259dea9..527a857 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -102,8 +102,8 @@ config CRYPTO_MANAGER2 config CRYPTO_USER tristate "Userspace cryptographic algorithm configuration" + depends on NET select CRYPTO_MANAGER - select NET help Userapace configuration for cryptographic instantiations such as cbc(aes). Thanks, -- Email: Herbert Xu <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: linux-next: build failure after merge of the crypto-current tree 2011-11-01 0:58 linux-next: build failure after merge of the crypto-current tree Stephen Rothwell 2011-11-01 1:11 ` Herbert Xu @ 2011-11-01 4:23 ` Stephen Rothwell 2011-11-01 5:18 ` Herbert Xu 2011-11-02 20:09 ` Luis Henriques 2 siblings, 1 reply; 14+ messages in thread From: Stephen Rothwell @ 2011-11-01 4:23 UTC (permalink / raw) To: Herbert Xu; +Cc: linux-next, linux-kernel [-- Attachment #1: Type: text/plain, Size: 490 bytes --] Hi Herbert, On Tue, 1 Nov 2011 11:58:51 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Presumbly caused by commit ea8bdfcff175 ("crypto: user - Add dependency > on NET"). > > I have used the crypto-current tree from next-20111025 for today (i.e. that > commit has not been added to linux-next today). Same problem and solution in the crypto tree (obviously). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: linux-next: build failure after merge of the crypto-current tree 2011-11-01 4:23 ` Stephen Rothwell @ 2011-11-01 5:18 ` Herbert Xu 2011-11-01 6:02 ` Stephen Rothwell 0 siblings, 1 reply; 14+ messages in thread From: Herbert Xu @ 2011-11-01 5:18 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next, linux-kernel On Tue, Nov 01, 2011 at 03:23:12PM +1100, Stephen Rothwell wrote: > Hi Herbert, > > On Tue, 1 Nov 2011 11:58:51 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > > > Presumbly caused by commit ea8bdfcff175 ("crypto: user - Add dependency > > on NET"). > > > > I have used the crypto-current tree from next-20111025 for today (i.e. that > > commit has not been added to linux-next today). > > Same problem and solution in the crypto tree (obviously). So did the change to depends_on fix it? Thanks, -- Email: Herbert Xu <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: linux-next: build failure after merge of the crypto-current tree 2011-11-01 5:18 ` Herbert Xu @ 2011-11-01 6:02 ` Stephen Rothwell 0 siblings, 0 replies; 14+ messages in thread From: Stephen Rothwell @ 2011-11-01 6:02 UTC (permalink / raw) To: Herbert Xu; +Cc: linux-next, linux-kernel [-- Attachment #1: Type: text/plain, Size: 297 bytes --] Hi Herbert, On Tue, 1 Nov 2011 16:18:10 +1100 Herbert Xu <herbert@gondor.apana.org.au> wrote: > > So did the change to depends_on fix it? I have not yet had time to test that ... -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: linux-next: build failure after merge of the crypto-current tree 2011-11-01 0:58 linux-next: build failure after merge of the crypto-current tree Stephen Rothwell 2011-11-01 1:11 ` Herbert Xu 2011-11-01 4:23 ` Stephen Rothwell @ 2011-11-02 20:09 ` Luis Henriques 2011-11-02 23:39 ` Herbert Xu 2 siblings, 1 reply; 14+ messages in thread From: Luis Henriques @ 2011-11-02 20:09 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Herbert Xu, Steffen Klassert Hi, In gmane.linux.kernel, you wrote: > --Signature=_Tue__1_Nov_2011_11_58_51_+1100_R__G+wW+4zIqxa7J > Content-Type: text/plain; charset=US-ASCII > Content-Disposition: inline > Content-Transfer-Encoding: quoted-printable > > Hi Herbert, > > After merging the crypto-current tree, today's linux-next build (x86_64 > allmodconfig) failed like this: I'm not sure if this is related, but I am currently unable to build mainline kernel when disabling CONFIG_NET. This seems to be due to the patch serie: http://news.gmane.org/gmane.linux.kernel.cryptoapi/cutoff=6228 For instance, commit 6ad414fe710d4fd3a8c8c6c2ad8fefcfcc207968 adds a dependency over function nla_put(), which is only defined when CONFIG_NET is enabled. Cheers, -- Luis Henriques ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: linux-next: build failure after merge of the crypto-current tree 2011-11-02 20:09 ` Luis Henriques @ 2011-11-02 23:39 ` Herbert Xu 2011-11-03 5:58 ` Steffen Klassert 0 siblings, 1 reply; 14+ messages in thread From: Herbert Xu @ 2011-11-02 23:39 UTC (permalink / raw) To: Luis Henriques Cc: Stephen Rothwell, linux-next, linux-kernel, Steffen Klassert On Wed, Nov 02, 2011 at 08:09:13PM +0000, Luis Henriques wrote: > > I'm not sure if this is related, but I am currently unable to build mainline > kernel when disabling CONFIG_NET. This seems to be due to the patch serie: > > http://news.gmane.org/gmane.linux.kernel.cryptoapi/cutoff=6228 > > For instance, commit 6ad414fe710d4fd3a8c8c6c2ad8fefcfcc207968 adds a dependency > over function nla_put(), which is only defined when CONFIG_NET is enabled. Indeed, I missed the dependency in the report functions which is built even when CRYPTO_USER is turned off. Does this patch fix the problem for you? Thanks, -- Email: Herbert Xu <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: linux-next: build failure after merge of the crypto-current tree 2011-11-02 23:39 ` Herbert Xu @ 2011-11-03 5:58 ` Steffen Klassert 2011-11-03 6:16 ` Herbert Xu 0 siblings, 1 reply; 14+ messages in thread From: Steffen Klassert @ 2011-11-03 5:58 UTC (permalink / raw) To: Herbert Xu; +Cc: Luis Henriques, Stephen Rothwell, linux-next, linux-kernel On Thu, Nov 03, 2011 at 10:39:36AM +1100, Herbert Xu wrote: > On Wed, Nov 02, 2011 at 08:09:13PM +0000, Luis Henriques wrote: > > > > I'm not sure if this is related, but I am currently unable to build mainline > > kernel when disabling CONFIG_NET. This seems to be due to the patch serie: > > > > http://news.gmane.org/gmane.linux.kernel.cryptoapi/cutoff=6228 > > > > For instance, commit 6ad414fe710d4fd3a8c8c6c2ad8fefcfcc207968 adds a dependency > > over function nla_put(), which is only defined when CONFIG_NET is enabled. > > Indeed, I missed the dependency in the report functions which > is built even when CRYPTO_USER is turned off. > > Does this patch fix the problem for you? > Hm, did you forget to add the patch to the mail? ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: linux-next: build failure after merge of the crypto-current tree 2011-11-03 5:58 ` Steffen Klassert @ 2011-11-03 6:16 ` Herbert Xu 2011-11-03 10:15 ` Luis Henriques 0 siblings, 1 reply; 14+ messages in thread From: Herbert Xu @ 2011-11-03 6:16 UTC (permalink / raw) To: Steffen Klassert Cc: Luis Henriques, Stephen Rothwell, linux-next, linux-kernel On Thu, Nov 03, 2011 at 06:58:24AM +0100, Steffen Klassert wrote: > On Thu, Nov 03, 2011 at 10:39:36AM +1100, Herbert Xu wrote: > > On Wed, Nov 02, 2011 at 08:09:13PM +0000, Luis Henriques wrote: > > > > > > I'm not sure if this is related, but I am currently unable to build mainline > > > kernel when disabling CONFIG_NET. This seems to be due to the patch serie: > > > > > > http://news.gmane.org/gmane.linux.kernel.cryptoapi/cutoff=6228 > > > > > > For instance, commit 6ad414fe710d4fd3a8c8c6c2ad8fefcfcc207968 adds a dependency > > > over function nla_put(), which is only defined when CONFIG_NET is enabled. > > > > Indeed, I missed the dependency in the report functions which > > is built even when CRYPTO_USER is turned off. > > > > Does this patch fix the problem for you? > > > > Hm, did you forget to add the patch to the mail? Probably :) diff --git a/crypto/Kconfig b/crypto/Kconfig index 527a857..cdba95c 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -38,6 +38,7 @@ config CRYPTO_ALGAPI config CRYPTO_ALGAPI2 tristate + select NLATTR config CRYPTO_AEAD tristate Cheers, -- Email: Herbert Xu <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: linux-next: build failure after merge of the crypto-current tree 2011-11-03 6:16 ` Herbert Xu @ 2011-11-03 10:15 ` Luis Henriques 2011-11-03 11:42 ` Herbert Xu 0 siblings, 1 reply; 14+ messages in thread From: Luis Henriques @ 2011-11-03 10:15 UTC (permalink / raw) To: Herbert Xu; +Cc: Steffen Klassert, Stephen Rothwell, linux-next, linux-kernel On Thu, Nov 03, 2011 at 05:16:28PM +1100, Herbert Xu wrote: > On Thu, Nov 03, 2011 at 06:58:24AM +0100, Steffen Klassert wrote: > > On Thu, Nov 03, 2011 at 10:39:36AM +1100, Herbert Xu wrote: > > > On Wed, Nov 02, 2011 at 08:09:13PM +0000, Luis Henriques wrote: > > > > > > > > I'm not sure if this is related, but I am currently unable to build mainline > > > > kernel when disabling CONFIG_NET. This seems to be due to the patch serie: > > > > > > > > http://news.gmane.org/gmane.linux.kernel.cryptoapi/cutoff=6228 > > > > > > > > For instance, commit 6ad414fe710d4fd3a8c8c6c2ad8fefcfcc207968 adds a dependency > > > > over function nla_put(), which is only defined when CONFIG_NET is enabled. > > > > > > Indeed, I missed the dependency in the report functions which > > > is built even when CRYPTO_USER is turned off. > > > > > > Does this patch fix the problem for you? > > > > > > > Hm, did you forget to add the patch to the mail? > > Probably :) > > diff --git a/crypto/Kconfig b/crypto/Kconfig > index 527a857..cdba95c 100644 > --- a/crypto/Kconfig > +++ b/crypto/Kconfig > @@ -38,6 +38,7 @@ config CRYPTO_ALGAPI > > config CRYPTO_ALGAPI2 > tristate > + select NLATTR > > config CRYPTO_AEAD > tristate No, this did not solved the problem; build still fails. The problem is that, in lib/nlattr.c, we have: #ifdef CONFIG_NET ... EXPORT_SYMBOL(nla_put); ... #endif So, I still have an undefined reference to nla_put. BTW, I'm not talking about the -next tree, so this problem may or may not be the same one reported by Stephen. Cheers, -- Luis Henriques ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: linux-next: build failure after merge of the crypto-current tree 2011-11-03 10:15 ` Luis Henriques @ 2011-11-03 11:42 ` Herbert Xu 2011-11-03 11:59 ` Luis Henriques 0 siblings, 1 reply; 14+ messages in thread From: Herbert Xu @ 2011-11-03 11:42 UTC (permalink / raw) To: Luis Henriques Cc: Steffen Klassert, Stephen Rothwell, linux-next, linux-kernel On Thu, Nov 03, 2011 at 10:15:54AM +0000, Luis Henriques wrote: > > No, this did not solved the problem; build still fails. The problem is > that, in lib/nlattr.c, we have: Ugh, for the time being I guess we'll have to wrap these within CONFIG_NET, as I'd rather not have CONFIG_CRYPTO depend on CONFIG_NET. Please let me know whether this patch fixes the problem. diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c index a816f24..aa19970 100644 --- a/crypto/ablkcipher.c +++ b/crypto/ablkcipher.c @@ -383,6 +383,7 @@ static int crypto_init_ablkcipher_ops(struct crypto_tfm *tfm, u32 type, return 0; } +#ifdef CONFIG_NET static int crypto_ablkcipher_report(struct sk_buff *skb, struct crypto_alg *alg) { struct crypto_report_blkcipher rblkcipher; @@ -404,6 +405,12 @@ static int crypto_ablkcipher_report(struct sk_buff *skb, struct crypto_alg *alg) nla_put_failure: return -EMSGSIZE; } +#else +static int crypto_ablkcipher_report(struct sk_buff *skb, struct crypto_alg *alg) +{ + return -ENOSYS; +} +#endif static void crypto_ablkcipher_show(struct seq_file *m, struct crypto_alg *alg) __attribute__ ((unused)); @@ -457,6 +464,7 @@ static int crypto_init_givcipher_ops(struct crypto_tfm *tfm, u32 type, return 0; } +#ifdef CONFIG_NET static int crypto_givcipher_report(struct sk_buff *skb, struct crypto_alg *alg) { struct crypto_report_blkcipher rblkcipher; @@ -478,6 +486,12 @@ static int crypto_givcipher_report(struct sk_buff *skb, struct crypto_alg *alg) nla_put_failure: return -EMSGSIZE; } +#else +static int crypto_givcipher_report(struct sk_buff *skb, struct crypto_alg *alg) +{ + return -ENOSYS; +} +#endif static void crypto_givcipher_show(struct seq_file *m, struct crypto_alg *alg) __attribute__ ((unused)); diff --git a/crypto/aead.c b/crypto/aead.c index 701556f..fb8772f 100644 --- a/crypto/aead.c +++ b/crypto/aead.c @@ -111,6 +111,7 @@ static int crypto_init_aead_ops(struct crypto_tfm *tfm, u32 type, u32 mask) return 0; } +#ifdef CONFIG_NET static int crypto_aead_report(struct sk_buff *skb, struct crypto_alg *alg) { struct crypto_report_aead raead; @@ -132,6 +133,12 @@ static int crypto_aead_report(struct sk_buff *skb, struct crypto_alg *alg) nla_put_failure: return -EMSGSIZE; } +#else +static int crypto_aead_report(struct sk_buff *skb, struct crypto_alg *alg) +{ + return -ENOSYS; +} +#endif static void crypto_aead_show(struct seq_file *m, struct crypto_alg *alg) __attribute__ ((unused)); @@ -190,6 +197,7 @@ static int crypto_init_nivaead_ops(struct crypto_tfm *tfm, u32 type, u32 mask) return 0; } +#ifdef CONFIG_NET static int crypto_nivaead_report(struct sk_buff *skb, struct crypto_alg *alg) { struct crypto_report_aead raead; @@ -210,6 +218,12 @@ static int crypto_nivaead_report(struct sk_buff *skb, struct crypto_alg *alg) nla_put_failure: return -EMSGSIZE; } +#else +static int crypto_nivaead_report(struct sk_buff *skb, struct crypto_alg *alg) +{ + return -ENOSYS; +} +#endif static void crypto_nivaead_show(struct seq_file *m, struct crypto_alg *alg) diff --git a/crypto/ahash.c b/crypto/ahash.c index a3e6ef9..1b9b7d1 100644 --- a/crypto/ahash.c +++ b/crypto/ahash.c @@ -399,6 +399,7 @@ static unsigned int crypto_ahash_extsize(struct crypto_alg *alg) return sizeof(struct crypto_shash *); } +#ifdef CONFIG_NET static int crypto_ahash_report(struct sk_buff *skb, struct crypto_alg *alg) { struct crypto_report_hash rhash; @@ -416,6 +417,12 @@ static int crypto_ahash_report(struct sk_buff *skb, struct crypto_alg *alg) nla_put_failure: return -EMSGSIZE; } +#else +static int crypto_ahash_report(struct sk_buff *skb, struct crypto_alg *alg) +{ + return -ENOSYS; +} +#endif static void crypto_ahash_show(struct seq_file *m, struct crypto_alg *alg) __attribute__ ((unused)); diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c index 2572d26..ad0226f 100644 --- a/crypto/blkcipher.c +++ b/crypto/blkcipher.c @@ -494,6 +494,7 @@ static int crypto_init_blkcipher_ops(struct crypto_tfm *tfm, u32 type, u32 mask) return crypto_init_blkcipher_ops_async(tfm); } +#ifdef CONFIG_NET static int crypto_blkcipher_report(struct sk_buff *skb, struct crypto_alg *alg) { struct crypto_report_blkcipher rblkcipher; @@ -515,6 +516,12 @@ static int crypto_blkcipher_report(struct sk_buff *skb, struct crypto_alg *alg) nla_put_failure: return -EMSGSIZE; } +#else +static int crypto_blkcipher_report(struct sk_buff *skb, struct crypto_alg *alg) +{ + return -ENOSYS; +} +#endif static void crypto_blkcipher_show(struct seq_file *m, struct crypto_alg *alg) __attribute__ ((unused)); diff --git a/crypto/pcompress.c b/crypto/pcompress.c index fefda78..ad8b659 100644 --- a/crypto/pcompress.c +++ b/crypto/pcompress.c @@ -48,6 +48,7 @@ static int crypto_pcomp_init_tfm(struct crypto_tfm *tfm) return 0; } +#ifdef CONFIG_NET static int crypto_pcomp_report(struct sk_buff *skb, struct crypto_alg *alg) { struct crypto_report_comp rpcomp; @@ -62,6 +63,12 @@ static int crypto_pcomp_report(struct sk_buff *skb, struct crypto_alg *alg) nla_put_failure: return -EMSGSIZE; } +#else +static int crypto_pcomp_report(struct sk_buff *skb, struct crypto_alg *alg) +{ + return -ENOSYS; +} +#endif static void crypto_pcomp_show(struct seq_file *m, struct crypto_alg *alg) __attribute__ ((unused)); diff --git a/crypto/rng.c b/crypto/rng.c index feb7de0..e7c23e8 100644 --- a/crypto/rng.c +++ b/crypto/rng.c @@ -60,6 +60,7 @@ static int crypto_init_rng_ops(struct crypto_tfm *tfm, u32 type, u32 mask) return 0; } +#ifdef CONFIG_NET static int crypto_rng_report(struct sk_buff *skb, struct crypto_alg *alg) { struct crypto_report_rng rrng; @@ -76,6 +77,12 @@ static int crypto_rng_report(struct sk_buff *skb, struct crypto_alg *alg) nla_put_failure: return -EMSGSIZE; } +#else +static int crypto_rng_report(struct sk_buff *skb, struct crypto_alg *alg) +{ + return -ENOSYS; +} +#endif static void crypto_rng_show(struct seq_file *m, struct crypto_alg *alg) __attribute__ ((unused)); diff --git a/crypto/shash.c b/crypto/shash.c index ea8a9c6..dabbbb6 100644 --- a/crypto/shash.c +++ b/crypto/shash.c @@ -524,6 +524,7 @@ static unsigned int crypto_shash_extsize(struct crypto_alg *alg) return alg->cra_ctxsize; } +#ifdef CONFIG_NET static int crypto_shash_report(struct sk_buff *skb, struct crypto_alg *alg) { struct crypto_report_hash rhash; @@ -541,6 +542,12 @@ static int crypto_shash_report(struct sk_buff *skb, struct crypto_alg *alg) nla_put_failure: return -EMSGSIZE; } +#else +static int crypto_shash_report(struct sk_buff *skb, struct crypto_alg *alg) +{ + return -ENOSYS; +} +#endif static void crypto_shash_show(struct seq_file *m, struct crypto_alg *alg) __attribute__ ((unused)); Thanks, -- Email: Herbert Xu <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: linux-next: build failure after merge of the crypto-current tree 2011-11-03 11:42 ` Herbert Xu @ 2011-11-03 11:59 ` Luis Henriques 2011-11-10 15:50 ` Ingo Molnar 0 siblings, 1 reply; 14+ messages in thread From: Luis Henriques @ 2011-11-03 11:59 UTC (permalink / raw) To: Herbert Xu; +Cc: Steffen Klassert, Stephen Rothwell, linux-next, linux-kernel On Thu, Nov 03, 2011 at 10:42:14PM +1100, Herbert Xu wrote: > On Thu, Nov 03, 2011 at 10:15:54AM +0000, Luis Henriques wrote: > > > > No, this did not solved the problem; build still fails. The problem is > > that, in lib/nlattr.c, we have: > > Ugh, for the time being I guess we'll have to wrap these within > CONFIG_NET, as I'd rather not have CONFIG_CRYPTO depend on CONFIG_NET. > > Please let me know whether this patch fixes the problem. Yep, it compiles and boots. Thanks for the patch. Cheers, -- Luis Henriques ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: linux-next: build failure after merge of the crypto-current tree 2011-11-03 11:59 ` Luis Henriques @ 2011-11-10 15:50 ` Ingo Molnar 2011-11-10 22:50 ` Herbert Xu 0 siblings, 1 reply; 14+ messages in thread From: Ingo Molnar @ 2011-11-10 15:50 UTC (permalink / raw) To: Luis Henriques Cc: Herbert Xu, Steffen Klassert, Stephen Rothwell, linux-next, linux-kernel * Luis Henriques <henrix@camandro.org> wrote: > On Thu, Nov 03, 2011 at 10:42:14PM +1100, Herbert Xu wrote: > > On Thu, Nov 03, 2011 at 10:15:54AM +0000, Luis Henriques wrote: > > > > > > No, this did not solved the problem; build still fails. The problem is > > > that, in lib/nlattr.c, we have: > > > > Ugh, for the time being I guess we'll have to wrap these within > > CONFIG_NET, as I'd rather not have CONFIG_CRYPTO depend on CONFIG_NET. > > > > Please let me know whether this patch fixes the problem. > > Yep, it compiles and boots. Thanks for the patch. v3.2-rc1 has been released with this (commonly triggering) build bug included. Herbert, is the fix on the way to upstream? Thanks, Ingo ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: linux-next: build failure after merge of the crypto-current tree 2011-11-10 15:50 ` Ingo Molnar @ 2011-11-10 22:50 ` Herbert Xu 0 siblings, 0 replies; 14+ messages in thread From: Herbert Xu @ 2011-11-10 22:50 UTC (permalink / raw) To: Ingo Molnar Cc: Luis Henriques, Steffen Klassert, Stephen Rothwell, linux-next, linux-kernel On Thu, Nov 10, 2011 at 04:50:19PM +0100, Ingo Molnar wrote: > > v3.2-rc1 has been released with this (commonly triggering) build bug > included. Herbert, is the fix on the way to upstream? Oops, I thought I had committed it already. Let me push it now. Thanks, -- Email: Herbert Xu <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2011-11-10 22:50 UTC | newest] Thread overview: 14+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-11-01 0:58 linux-next: build failure after merge of the crypto-current tree Stephen Rothwell 2011-11-01 1:11 ` Herbert Xu 2011-11-01 4:23 ` Stephen Rothwell 2011-11-01 5:18 ` Herbert Xu 2011-11-01 6:02 ` Stephen Rothwell 2011-11-02 20:09 ` Luis Henriques 2011-11-02 23:39 ` Herbert Xu 2011-11-03 5:58 ` Steffen Klassert 2011-11-03 6:16 ` Herbert Xu 2011-11-03 10:15 ` Luis Henriques 2011-11-03 11:42 ` Herbert Xu 2011-11-03 11:59 ` Luis Henriques 2011-11-10 15:50 ` Ingo Molnar 2011-11-10 22:50 ` Herbert Xu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).