Merge branches 'amd-iommu/fixes' and 'dma-debug/fixes' into iommu/fixes

[mv-sheeva.git] / security / keys / gc.c

diff --git a/security/keys/gc.c b/security/keys/gc.c
index 485fc6233c38e16336bc9886c0dbfceb2fa63cdd..4770be375ffece3d506ea86b769aee3bf8607595 100644 (file)
--- a/security/keys/gc.c
+++ b/security/keys/gc.c
@@ -169,9 +169,9 @@ static void key_garbage_collector(struct work_struct *work)
 
        /* trawl through the keys looking for keyrings */
        for (;;) {
-               if (key->expiry > now && key->expiry < new_timer) {
+               if (key->expiry > limit && key->expiry < new_timer) {
                        kdebug("will expire %x in %ld",
-                              key_serial(key), key->expiry - now);
+                              key_serial(key), key->expiry - limit);
                        new_timer = key->expiry;
                }