redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block

Browse source 
* 'sg' of git://git.kernel.dk/linux-2.6-block:
  [SG] Get rid of __sg_mark_end()
  cleanup asm/scatterlist.h includes
  SG: Make sg_init_one() use general table init functions
This commit is contained in:
Linus Torvalds 2007-11-03 12:43:21 -07:00
parent a7e1e001f4 c46f2334c8
commit 160acc2e89
43 changed files with 49 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
block/ll_rw_blk.c
View file

@ -1369,7 +1369,7 @@ new_segment:
} /* segments in rq */
if (sg)
__sg_mark_end(sg);
sg_mark_end(sg);
return nsegs;
}

1
crypto/anubis.c
View file

@ -33,7 +33,6 @@
#include <linux/module.h>
#include <linux/mm.h>
#include <asm/byteorder.h>
#include <asm/scatterlist.h>
#include <linux/crypto.h>
#include <linux/types.h>

1
crypto/blowfish.c
View file

@ -20,7 +20,6 @@
#include <linux/module.h>
#include <linux/mm.h>
#include <asm/byteorder.h>
#include <asm/scatterlist.h>
#include <linux/crypto.h>
#include <linux/types.h>

1
crypto/compress.c
View file

@ -14,7 +14,6 @@
#include <linux/types.h>
#include <linux/crypto.h>
#include <linux/errno.h>
#include <asm/scatterlist.h>
#include <linux/string.h>
#include "internal.h"

1
crypto/crypto_null.c
View file

@ -19,7 +19,6 @@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/mm.h>
#include <asm/scatterlist.h>
#include <linux/crypto.h>
#include <linux/string.h>

1
crypto/khazad.c
View file

@ -23,7 +23,6 @@
#include <linux/module.h>
#include <linux/mm.h>
#include <asm/byteorder.h>
#include <asm/scatterlist.h>
#include <linux/crypto.h>
#include <linux/types.h>

1
crypto/sha1_generic.c
View file

@ -23,7 +23,6 @@
#include <linux/cryptohash.h>
#include <linux/types.h>
#include <crypto/sha.h>
#include <asm/scatterlist.h>
#include <asm/byteorder.h>
struct sha1_ctx {

1
crypto/sha256_generic.c
View file

@ -22,7 +22,6 @@
#include <linux/crypto.h>
#include <linux/types.h>
#include <crypto/sha.h>
#include <asm/scatterlist.h>
#include <asm/byteorder.h>
struct sha256_ctx {

1
crypto/sha512.c
View file

@ -19,7 +19,6 @@
#include <linux/types.h>
#include <crypto/sha.h>
#include <asm/scatterlist.h>
#include <asm/byteorder.h>
struct sha512_ctx {

1
crypto/tea.c
View file

@ -23,7 +23,6 @@
#include <linux/module.h>
#include <linux/mm.h>
#include <asm/byteorder.h>
#include <asm/scatterlist.h>
#include <linux/crypto.h>
#include <linux/types.h>

1
crypto/tgr192.c
View file

@ -25,7 +25,6 @@
#include <linux/module.h>
#include <linux/mm.h>
#include <asm/byteorder.h>
#include <asm/scatterlist.h>
#include <linux/crypto.h>
#include <linux/types.h>

1
crypto/wp512.c
View file

@ -23,7 +23,6 @@
#include <linux/module.h>
#include <linux/mm.h>
#include <asm/byteorder.h>
#include <asm/scatterlist.h>
#include <linux/crypto.h>
#include <linux/types.h>

1
drivers/base/dmapool.c
View file

@ -2,7 +2,6 @@
#include <linux/device.h>
#include <linux/mm.h>
#include <asm/io.h> /* Needed for i386 to build */
#include <asm/scatterlist.h> /* Needed for i386 to build */
#include <linux/dma-mapping.h>
#include <linux/dmapool.h>
#include <linux/slab.h>

2
drivers/ieee1394/sbp2.c
View file

@ -71,11 +71,11 @@
#include <linux/types.h>
#include <linux/wait.h>
#include <linux/workqueue.h>
#include <linux/scatterlist.h>
#include <asm/byteorder.h>
#include <asm/errno.h>
#include <asm/param.h>
#include <asm/scatterlist.h>
#include <asm/system.h>
#include <asm/types.h>

2
drivers/media/video/bt8xx/bttvp.h
View file

@ -36,7 +36,7 @@
#include <linux/pci.h>
#include <linux/input.h>
#include <linux/mutex.h>
#include <asm/scatterlist.h>
#include <linux/scatterlist.h>
#include <asm/io.h>
#include <media/v4l2-common.h>

1
drivers/mmc/core/core.c
View file

@ -19,7 +19,6 @@
#include <linux/pagemap.h>
#include <linux/err.h>
#include <linux/leds.h>
#include <asm/scatterlist.h>
#include <linux/scatterlist.h>
#include <linux/mmc/card.h>

1
drivers/mmc/core/mmc_ops.c
View file

@ -10,7 +10,6 @@
*/
#include <linux/types.h>
#include <asm/scatterlist.h>
#include <linux/scatterlist.h>
#include <linux/mmc/host.h>

1
drivers/mmc/core/sd_ops.c
View file

@ -10,7 +10,6 @@
*/
#include <linux/types.h>
#include <asm/scatterlist.h>
#include <linux/scatterlist.h>
#include <linux/mmc/host.h>

1
drivers/mmc/core/sdio_ops.c
View file

@ -9,7 +9,6 @@
* your option) any later version.
*/
#include <asm/scatterlist.h>
#include <linux/scatterlist.h>
#include <linux/mmc/host.h>

1
drivers/net/meth.c
View file

@ -33,7 +33,6 @@
#include <asm/ip32/ip32_ints.h>
#include <asm/io.h>
#include <asm/scatterlist.h>
#include "meth.h"

2
drivers/scsi/scsi_lib.c
View file

@ -785,7 +785,7 @@ struct scatterlist *scsi_alloc_sgtable(struct scsi_cmnd *cmd, gfp_t gfp_mask)
* end-of-list
*/
if (!left)
sg_mark_end(sgl, this);
sg_mark_end(&sgl[this - 1]);
/*
* don't allow subsequent mempool allocs to sleep, it would

1
drivers/usb/core/buffer.c
View file

@ -11,7 +11,6 @@
#include <linux/device.h>
#include <linux/mm.h>
#include <asm/io.h>
#include <asm/scatterlist.h>
#include <linux/dma-mapping.h>
#include <linux/dmapool.h>
#include <linux/usb.h>

1
drivers/usb/core/hcd.c
View file

@ -30,7 +30,6 @@
#include <linux/utsname.h>
#include <linux/mm.h>
#include <asm/io.h>
#include <asm/scatterlist.h>
#include <linux/device.h>
#include <linux/dma-mapping.h>
#include <linux/mutex.h>

2
drivers/usb/core/usb.c
View file

@ -36,7 +36,7 @@
#include <linux/workqueue.h>
#include <asm/io.h>
#include <asm/scatterlist.h>
#include <linux/scatterlist.h>
#include <linux/mm.h>
#include <linux/dma-mapping.h>

2
fs/nfsd/nfs4recover.c
View file

@ -43,7 +43,7 @@
#include <linux/file.h>
#include <linux/namei.h>
#include <asm/uaccess.h>
#include <asm/scatterlist.h>
#include <linux/scatterlist.h>
#include <linux/crypto.h>
#include <linux/sched.h>

68
include/linux/scatterlist.h
View file

@ -188,21 +188,46 @@ static inline void sg_chain(struct scatterlist *prv, unsigned int prv_nents,
/**
* sg_mark_end - Mark the end of the scatterlist
* @sgl: Scatterlist
* @nents: Number of entries in sgl
* @sg: SG entryScatterlist
*
* Description:
* Marks the last entry as the termination point for sg_next()
* Marks the passed in sg entry as the termination point for the sg
* table. A call to sg_next() on this entry will return NULL.
*
**/
static inline void sg_mark_end(struct scatterlist *sgl, unsigned int nents)
static inline void sg_mark_end(struct scatterlist *sg)
{
sgl[nents - 1].page_link = 0x02;
#ifdef CONFIG_DEBUG_SG
BUG_ON(sg->sg_magic != SG_MAGIC);
#endif
/*
* Set termination bit, clear potential chain bit
*/
sg->page_link |= 0x02;
sg->page_link &= ~0x01;
}
static inline void __sg_mark_end(struct scatterlist *sg)
/**
* sg_init_table - Initialize SG table
* @sgl: The SG table
* @nents: Number of entries in table
*
* Notes:
* If this is part of a chained sg table, sg_mark_end() should be
* used only on the last table part.
*
**/
static inline void sg_init_table(struct scatterlist *sgl, unsigned int nents)
{
sg->page_link |= 0x02;
memset(sgl, 0, sizeof(*sgl) * nents);
#ifdef CONFIG_DEBUG_SG
{
unsigned int i;
for (i = 0; i < nents; i++)
sgl[i].sg_magic = SG_MAGIC;
}
#endif
sg_mark_end(&sgl[nents - 1]);
}
/**
@ -219,37 +244,10 @@ static inline void __sg_mark_end(struct scatterlist *sg)
static inline void sg_init_one(struct scatterlist *sg, const void *buf,
unsigned int buflen)
{
memset(sg, 0, sizeof(*sg));
#ifdef CONFIG_DEBUG_SG
sg->sg_magic = SG_MAGIC;
#endif
sg_mark_end(sg, 1);
sg_init_table(sg, 1);
sg_set_buf(sg, buf, buflen);
}
/**
* sg_init_table - Initialize SG table
* @sgl: The SG table
* @nents: Number of entries in table
*
* Notes:
* If this is part of a chained sg table, sg_mark_end() should be
* used only on the last table part.
*
**/
static inline void sg_init_table(struct scatterlist *sgl, unsigned int nents)
{
memset(sgl, 0, sizeof(*sgl) * nents);
sg_mark_end(sgl, nents);
#ifdef CONFIG_DEBUG_SG
{
unsigned int i;
for (i = 0; i < nents; i++)
sgl[i].sg_magic = SG_MAGIC;
}
#endif
}
/**
* sg_phys - Return physical address of an sg entry
* @sg: SG entry

2
include/net/esp.h
View file

@ -3,7 +3,7 @@
#include <linux/crypto.h>
#include <net/xfrm.h>
#include <asm/scatterlist.h>
#include <linux/scatterlist.h>
#define ESP_NUM_FAST_SG 4

2
include/rdma/ib_verbs.h
View file

@ -48,9 +48,9 @@
#include <linux/kref.h>
#include <linux/list.h>
#include <linux/rwsem.h>
#include <linux/scatterlist.h>
#include <asm/atomic.h>
#include <asm/scatterlist.h>
#include <asm/uaccess.h>
union ib_gid {

2
include/scsi/libsas.h
View file

@ -36,7 +36,7 @@
#include <scsi/scsi_device.h>
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_transport_sas.h>
#include <asm/scatterlist.h>
#include <linux/scatterlist.h>
struct block_device;

2
net/core/skbuff.c
View file

@ -2095,7 +2095,7 @@ int skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int le
{
int nsg = __skb_to_sgvec(skb, sg, offset, len);
__sg_mark_end(&sg[nsg - 1]);
sg_mark_end(&sg[nsg - 1]);
return nsg;
}

1
net/ieee80211/ieee80211_crypt_ccmp.c
View file

@ -25,7 +25,6 @@
#include <net/ieee80211.h>
#include <linux/crypto.h>
#include <asm/scatterlist.h>
MODULE_AUTHOR("Jouni Malinen");
MODULE_DESCRIPTION("Host AP crypt: CCMP");

1
net/ipv4/ah4.c
View file

@ -8,7 +8,6 @@
#include <linux/spinlock.h>
#include <net/icmp.h>
#include <net/protocol.h>
#include <asm/scatterlist.h>
/* Clear mutable options and find final destination to substitute

1
net/ipv4/ipcomp.c
View file

@ -14,7 +14,6 @@
* - Adaptive compression.
*/
#include <linux/module.h>
#include <asm/scatterlist.h>
#include <asm/semaphore.h>
#include <linux/crypto.h>
#include <linux/pfkeyv2.h>

2
net/ipv4/tcp_ipv4.c
View file

@ -1083,7 +1083,7 @@ static int tcp_v4_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,
sg_set_buf(&sg[block++], key->key, key->keylen);
nbytes += key->keylen;
__sg_mark_end(&sg[block - 1]);
sg_mark_end(&sg[block - 1]);
/* Now store the Hash into the packet */
err = crypto_hash_init(desc);

1
net/ipv6/ah6.c
View file

@ -35,7 +35,6 @@
#include <net/ipv6.h>
#include <net/protocol.h>
#include <net/xfrm.h>
#include <asm/scatterlist.h>
static int zero_out_mutable_opts(struct ipv6_opt_hdr *opthdr)
{

1
net/ipv6/ipcomp6.c
View file

@ -34,7 +34,6 @@
#include <net/ip.h>
#include <net/xfrm.h>
#include <net/ipcomp.h>
#include <asm/scatterlist.h>
#include <asm/semaphore.h>
#include <linux/crypto.h>
#include <linux/pfkeyv2.h>

2
net/ipv6/tcp_ipv6.c
View file

@ -781,7 +781,7 @@ static int tcp_v6_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,
sg_set_buf(&sg[block++], key->key, key->keylen);
nbytes += key->keylen;
__sg_mark_end(&sg[block - 1]);
sg_mark_end(&sg[block - 1]);
/* Now store the hash into the packet */
err = crypto_hash_init(desc);

1
net/mac80211/aes_ccm.c
View file

@ -11,7 +11,6 @@
#include <linux/types.h>
#include <linux/crypto.h>
#include <linux/err.h>
#include <asm/scatterlist.h>
#include <net/mac80211.h>
#include "ieee80211_key.h"

2
net/rxrpc/rxkad.c
View file

@ -702,7 +702,7 @@ static void rxkad_sg_set_buf2(struct scatterlist sg[2],
nsg++;
}
__sg_mark_end(&sg[nsg - 1]);
sg_mark_end(&sg[nsg - 1]);
ASSERTCMP(sg[0].length + sg[1].length, ==, buflen);
}

6
net/sunrpc/auth_gss/gss_krb5_crypto.c
View file

@ -211,8 +211,8 @@ encryptor(struct scatterlist *sg, void *data)
if (thislen == 0)
return 0;
__sg_mark_end(&desc->infrags[desc->fragno - 1]);
__sg_mark_end(&desc->outfrags[desc->fragno - 1]);
sg_mark_end(&desc->infrags[desc->fragno - 1]);
sg_mark_end(&desc->outfrags[desc->fragno - 1]);
ret = crypto_blkcipher_encrypt_iv(&desc->desc, desc->outfrags,
desc->infrags, thislen);
@ -293,7 +293,7 @@ decryptor(struct scatterlist *sg, void *data)
if (thislen == 0)
return 0;
__sg_mark_end(&desc->frags[desc->fragno - 1]);
sg_mark_end(&desc->frags[desc->fragno - 1]);
ret = crypto_blkcipher_decrypt_iv(&desc->desc, desc->frags,
desc->frags, thislen);

1
net/sunrpc/auth_gss/gss_krb5_seal.c
View file

@ -63,7 +63,6 @@
#include <linux/jiffies.h>
#include <linux/sunrpc/gss_krb5.h>
#include <linux/random.h>
#include <asm/scatterlist.h>
#include <linux/crypto.h>
#ifdef RPC_DEBUG

1
net/sunrpc/auth_gss/gss_krb5_wrap.c
View file

@ -4,7 +4,6 @@
#include <linux/sunrpc/gss_krb5.h>
#include <linux/random.h>
#include <linux/pagemap.h>
#include <asm/scatterlist.h>
#include <linux/crypto.h>
#ifdef RPC_DEBUG

1
net/xfrm/xfrm_algo.c
View file

@ -21,7 +21,6 @@
#if defined(CONFIG_INET_ESP) || defined(CONFIG_INET_ESP_MODULE) || defined(CONFIG_INET6_ESP) || defined(CONFIG_INET6_ESP_MODULE)
#include <net/esp.h>
#endif
#include <asm/scatterlist.h>
/*
* Algorithms supported by IPsec. These entries contain properties which