diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:53:14 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:53:14 -0400 |
| commit | 325a479c4c110db278ef3361460a48c4093252cc (patch) | |
| tree | bcfbf4d0647d9442045639a5c19da59d55190e81 /net/core/dev.c | |
| parent | ebcc80c1b6629a445f7471cc1ddb48faf8a84e70 (diff) | |
| parent | 7f9eaedf894dbaa08c157832e9a6c9c03ffed1ed (diff) | |
Merge with temp tree to get David's gdb inferior calls patch
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 7bd4cd4502c4..f5f005846fe1 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -3091,7 +3091,7 @@ void free_netdev(struct net_device *dev) | |||
| 3091 | void synchronize_net(void) | 3091 | void synchronize_net(void) |
| 3092 | { | 3092 | { |
| 3093 | might_sleep(); | 3093 | might_sleep(); |
| 3094 | synchronize_kernel(); | 3094 | synchronize_rcu(); |
| 3095 | } | 3095 | } |
| 3096 | 3096 | ||
| 3097 | /** | 3097 | /** |