diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-23 11:46:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-23 11:46:59 -0400 |
| commit | 87ce786ae5f24e336195805a9fc7428a6f922478 (patch) | |
| tree | 4e756c5b49dadcd4b9cf46a1a0e3593ccadfb291 /net/ipv4/ipvs/ip_vs_conn.c | |
| parent | 8067794bec1cc5de1431102cf0a6a1c7ce75cd85 (diff) | |
| parent | f1c5d30e1d79bbfb60eaf189db862d3cb2bcac92 (diff) | |
Merge branch 'x86/cpu' into x86/x2apic
Diffstat (limited to 'net/ipv4/ipvs/ip_vs_conn.c')
| -rw-r--r-- | net/ipv4/ipvs/ip_vs_conn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c index f8bdae47a77f..44a6872dc245 100644 --- a/net/ipv4/ipvs/ip_vs_conn.c +++ b/net/ipv4/ipvs/ip_vs_conn.c | |||
| @@ -965,7 +965,7 @@ static void ip_vs_conn_flush(void) | |||
| 965 | } | 965 | } |
| 966 | 966 | ||
| 967 | 967 | ||
| 968 | int ip_vs_conn_init(void) | 968 | int __init ip_vs_conn_init(void) |
| 969 | { | 969 | { |
| 970 | int idx; | 970 | int idx; |
| 971 | 971 | ||