Commit d8c34b94 authored by Gideon Israel Dsouza's avatar Gideon Israel Dsouza Committed by Herbert Xu
Browse files

crypto: Replaced gcc specific attributes with macros from compiler.h 



Continuing from this commit: 52f5684c
("kernel: use macros from compiler.h instead of __attribute__((...))")

I submitted 4 total patches. They are part of task I've taken up to
increase compiler portability in the kernel. I've cleaned up the
subsystems under /kernel /mm /block and /security, this patch targets
/crypto.

There is <linux/compiler.h> which provides macros for various gcc specific
constructs. Eg: __weak for __attribute__((weak)). I've cleaned all
instances of gcc specific attributes with the right macros for the crypto
subsystem.

I had to make one additional change into compiler-gcc.h for the case when
one wants to use this: __attribute__((aligned) and not specify an alignment
factor. From the gcc docs, this will result in the largest alignment for
that data type on the target machine so I've named the macro
__aligned_largest. Please advise if another name is more appropriate.

Signed-off-by: default avatarGideon Israel Dsouza <gidisrael@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent d2110224

crypto/ablkcipher.c

+3 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/slab.h>

#include <linux/seq_file.h>

#include <linux/cryptouser.h>

#include <linux/compiler.h>

#include <net/netlink.h>



#include <crypto/scatterwalk.h>
@@ -394,7 +395,7 @@ static int crypto_ablkcipher_report(struct sk_buff *skb, struct crypto_alg *alg) 
#endif



static void crypto_ablkcipher_show(struct seq_file *m, struct crypto_alg *alg)

	__attribute__ ((unused));

	__maybe_unused;

static void crypto_ablkcipher_show(struct seq_file *m, struct crypto_alg *alg)

{

	struct ablkcipher_alg *ablkcipher = &alg->cra_ablkcipher;
@@ -468,7 +469,7 @@ static int crypto_givcipher_report(struct sk_buff *skb, struct crypto_alg *alg) 
#endif



static void crypto_givcipher_show(struct seq_file *m, struct crypto_alg *alg)

	__attribute__ ((unused));

	__maybe_unused;

static void crypto_givcipher_show(struct seq_file *m, struct crypto_alg *alg)

{

	struct ablkcipher_alg *ablkcipher = &alg->cra_ablkcipher;

crypto/acompress.c

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/crypto.h>

#include <crypto/algapi.h>

#include <linux/cryptouser.h>

#include <linux/compiler.h>

#include <net/netlink.h>

#include <crypto/internal/acompress.h>

#include <crypto/internal/scompress.h>
@@ -50,7 +51,7 @@ static int crypto_acomp_report(struct sk_buff *skb, struct crypto_alg *alg) 
#endif



static void crypto_acomp_show(struct seq_file *m, struct crypto_alg *alg)

	__attribute__ ((unused));

	__maybe_unused;



static void crypto_acomp_show(struct seq_file *m, struct crypto_alg *alg)

{

crypto/aead.c

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/slab.h>

#include <linux/seq_file.h>

#include <linux/cryptouser.h>

#include <linux/compiler.h>

#include <net/netlink.h>



#include "internal.h"
@@ -132,7 +133,7 @@ static int crypto_aead_report(struct sk_buff *skb, struct crypto_alg *alg) 
#endif



static void crypto_aead_show(struct seq_file *m, struct crypto_alg *alg)

	__attribute__ ((unused));

	__maybe_unused;

static void crypto_aead_show(struct seq_file *m, struct crypto_alg *alg)

{

	struct aead_alg *aead = container_of(alg, struct aead_alg, base);

crypto/ahash.c

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/slab.h>

#include <linux/seq_file.h>

#include <linux/cryptouser.h>

#include <linux/compiler.h>

#include <net/netlink.h>



#include "internal.h"
@@ -493,7 +494,7 @@ static int crypto_ahash_report(struct sk_buff *skb, struct crypto_alg *alg) 
#endif



static void crypto_ahash_show(struct seq_file *m, struct crypto_alg *alg)

	__attribute__ ((unused));

	__maybe_unused;

static void crypto_ahash_show(struct seq_file *m, struct crypto_alg *alg)

{

	seq_printf(m, "type         : ahash\n");

crypto/akcipher.c

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/slab.h>

#include <linux/string.h>

#include <linux/crypto.h>

#include <linux/compiler.h>

#include <crypto/algapi.h>

#include <linux/cryptouser.h>

#include <net/netlink.h>
@@ -47,7 +48,7 @@ static int crypto_akcipher_report(struct sk_buff *skb, struct crypto_alg *alg) 
#endif



static void crypto_akcipher_show(struct seq_file *m, struct crypto_alg *alg)

	__attribute__ ((unused));

	__maybe_unused;



static void crypto_akcipher_show(struct seq_file *m, struct crypto_alg *alg)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE