codafs: fix build warning

[linux-2.6-omap-h63xx.git] / net / core / flow.c

diff --git a/net/core/flow.c b/net/core/flow.c
index 9cfe84571ca55554284ac617478333f2d3ba26d4..19991175fdeb4bca0f2e357ae7dfa5545dc72371 100644 (file)
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -23,15 +23,14 @@
 #include <linux/mutex.h>
 #include <net/flow.h>
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
 #include <linux/security.h>
 
 struct flow_cache_entry {
        struct flow_cache_entry *next;
        u16                     family;
        u8                      dir;
-       struct flowi            key;
        u32                     genid;
+       struct flowi            key;
        void                    *object;
        atomic_t                *object_ref;
 };
@@ -346,7 +345,7 @@ static int __init flow_cache_init(void)
 
        flow_cachep = kmem_cache_create("flow_cache",
                                        sizeof(struct flow_cache_entry),
-                                       0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
+                                       0, SLAB_PANIC,
                                        NULL);
        flow_hash_shift = 10;
        flow_lwm = 2 * flow_hash_size;