diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-29 23:47:48 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-29 23:47:48 -0500 |
| commit | 60b7379dc5b1743427b031cca53e30860a38ada6 (patch) | |
| tree | c0462b8dd188861bd04f36dd31672b7446e35dd8 /net/packet/af_packet.c | |
| parent | a523a5ecc8c6ddceb8f783f600605553e5ad8963 (diff) | |
| parent | 7a5a4f978750756755dc839014e13d1b088ccc8e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/packet/af_packet.c')
| -rw-r--r-- | net/packet/af_packet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index dfb148e9fdaa..efa844501136 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c | |||
| @@ -378,7 +378,7 @@ static void unregister_prot_hook(struct sock *sk, bool sync) | |||
| 378 | __unregister_prot_hook(sk, sync); | 378 | __unregister_prot_hook(sk, sync); |
| 379 | } | 379 | } |
| 380 | 380 | ||
| 381 | static inline __pure struct page *pgv_to_page(void *addr) | 381 | static inline struct page * __pure pgv_to_page(void *addr) |
| 382 | { | 382 | { |
| 383 | if (is_vmalloc_addr(addr)) | 383 | if (is_vmalloc_addr(addr)) |
| 384 | return vmalloc_to_page(addr); | 384 | return vmalloc_to_page(addr); |