diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-02-13 16:20:07 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-02-13 16:20:07 +0100 |
commit | 654b0c9627bc1b34cc21643afa8ac359c50db7d7 (patch) | |
tree | f25069e2987e6d61793585adf969f42f9380afcd /include/net/netns/generic.h | |
parent | PM / QoS: Simplify PM QoS expansion/merge (diff) | |
parent | PM / QoS: CPU C-state breakage with PM Qos change (diff) | |
download | wireguard-linux-654b0c9627bc1b34cc21643afa8ac359c50db7d7.tar.xz wireguard-linux-654b0c9627bc1b34cc21643afa8ac359c50db7d7.zip |
Merge commit 'pm-fixes-for-3.3-rc3' into pm-qos
New material in the pm-qos branch depends on recent power management
fixes.
Diffstat (limited to 'include/net/netns/generic.h')
-rw-r--r-- | include/net/netns/generic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/netns/generic.h b/include/net/netns/generic.h index 3419bf5cd154..d55f43443335 100644 --- a/include/net/netns/generic.h +++ b/include/net/netns/generic.h @@ -41,6 +41,7 @@ static inline void *net_generic(const struct net *net, int id) ptr = ng->ptr[id - 1]; rcu_read_unlock(); + BUG_ON(!ptr); return ptr; } #endif |