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

* 'sg' of git://git.kernel.dk/linux-2.6-block:
  Add CONFIG_DEBUG_SG sg validation
  Change table chaining layout
  Update arch/ to use sg helpers
  Update swiotlb to use sg helpers
  Update net/ to use sg helpers
  Update fs/ to use sg helpers
  [SG] Update drivers to use sg helpers
  [SG] Update crypto/ to sg helpers
  [SG] Update block layer to use sg helpers
  [SG] Add helpers for manipulating SG entries

1 files changed, 2 insertions, 2 deletions

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index 18d489c8b935..d741c63af42c 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -317,7 +317,7 @@ static void test_cipher(char *algo, int enc,
                                 goto out;
                         }
 
-                        q = kmap(sg[0].page) + sg[0].offset;
+                        q = kmap(sg_page(&sg[0])) + sg[0].offset;
                         hexdump(q, cipher_tv[i].rlen);
 
                         printk("%s\n",
@@ -390,7 +390,7 @@ static void test_cipher(char *algo, int enc,
                         temp = 0;
                         for (k = 0; k < cipher_tv[i].np; k++) {
                                 printk("page %u\n", k);
-                                q = kmap(sg[k].page) + sg[k].offset;
+                                q = kmap(sg_page(&sg[k])) + sg[k].offset;
                                 hexdump(q, cipher_tv[i].tap[k]);
                                 printk("%s\n",
                                         memcmp(q, cipher_tv[i].result + temp,