diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
| commit | 414f746d232d41ed6ae8632c4495ae795373c44b (patch) | |
| tree | 167f9bc8f139c6e82e6732b38c7a938b8a9d31cd /include/linux/rtnetlink.h | |
| parent | 5a7a201c51c324876d00a54e7208af6af12d1ca4 (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'include/linux/rtnetlink.h')
| -rw-r--r-- | include/linux/rtnetlink.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index f4d386c191f5..ca643b13b026 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h | |||
| @@ -755,13 +755,6 @@ extern void __rtnl_unlock(void); | |||
| 755 | } \ | 755 | } \ |
| 756 | } while(0) | 756 | } while(0) |
| 757 | 757 | ||
| 758 | #define BUG_TRAP(x) do { \ | ||
| 759 | if (unlikely(!(x))) { \ | ||
| 760 | printk(KERN_ERR "KERNEL: assertion (%s) failed at %s (%d)\n", \ | ||
| 761 | #x, __FILE__ , __LINE__); \ | ||
| 762 | } \ | ||
| 763 | } while(0) | ||
| 764 | |||
| 765 | static inline u32 rtm_get_table(struct rtattr **rta, u8 table) | 758 | static inline u32 rtm_get_table(struct rtattr **rta, u8 table) |
| 766 | { | 759 | { |
| 767 | return RTA_GET_U32(rta[RTA_TABLE-1]); | 760 | return RTA_GET_U32(rta[RTA_TABLE-1]); |