diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-17 19:51:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-17 19:51:32 -0400 |
| commit | 80d74d5123bf3aecd32302809c4e61bb8a16786b (patch) | |
| tree | 604d95410caa54c60abcfb018bc62f4fde0398bc /arch/x86_64/kernel | |
| parent | 245d95a423664761d9399656098523db6988e9cc (diff) | |
| parent | 19bb3506e27096eea5f7b71b89621ad1203ed318 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[BRIDGE]: Unaligned access when comparing ethernet addresses
[SCTP]: Unmap v4mapped addresses during SCTP_BINDX_REM_ADDR operation.
[SCTP]: Fix assertion (!atomic_read(&sk->sk_rmem_alloc)) failed message
[NET]: Set a separate lockdep class for neighbour table's proxy_queue
[NET]: Fix UDP checksum issue in net poll mode.
[KEY]: Fix conversion between IPSEC_MODE_xxx and XFRM_MODE_xxx.
[NET]: Get rid of alloc_skb_from_cache
Diffstat (limited to 'arch/x86_64/kernel')
| -rw-r--r-- | arch/x86_64/kernel/functionlist | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/functionlist b/arch/x86_64/kernel/functionlist index 01fa23580c85..7ae18ec12454 100644 --- a/arch/x86_64/kernel/functionlist +++ b/arch/x86_64/kernel/functionlist | |||
| @@ -514,7 +514,6 @@ | |||
| 514 | *(.text.dentry_open) | 514 | *(.text.dentry_open) |
| 515 | *(.text.dentry_iput) | 515 | *(.text.dentry_iput) |
| 516 | *(.text.bio_alloc) | 516 | *(.text.bio_alloc) |
| 517 | *(.text.alloc_skb_from_cache) | ||
| 518 | *(.text.wait_on_page_bit) | 517 | *(.text.wait_on_page_bit) |
| 519 | *(.text.vfs_readdir) | 518 | *(.text.vfs_readdir) |
| 520 | *(.text.vfs_lstat) | 519 | *(.text.vfs_lstat) |