diff options
| author | davem <davem> | 2002-01-19 02:05:04 +0000 |
|---|---|---|
| committer | davem <davem> | 2002-01-19 02:05:04 +0000 |
| commit | e6c8f6673130f3191c1c16e533a2124bf4b7824d (patch) | |
| tree | a7f0fd69ff8945377e8016198ec03e9118f09576 | |
| parent | d4de35c26e3f4c4b614017b3ab83ae8ca684365b (diff) | |
| download | netdev-vger-cvs-e6c8f6673130f3191c1c16e533a2124bf4b7824d.tar.gz | |
Remove __FUNCTION__ cpp pasting, gcc-3.1 warns
about it.
| -rw-r--r-- | include/linux/rtnetlink.h | 4 | ||||
| -rw-r--r-- | net/netlink/af_netlink.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index 4f6105ff6..43976035c 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -586,9 +586,9 @@ extern void rtnl_unlock(void); extern void rtnetlink_init(void); #define ASSERT_RTNL() do { if (down_trylock(&rtnl_sem) == 0) { up(&rtnl_sem); \ -printk("RTNL: assertion failed at " __FILE__ "(%d):" __FUNCTION__ "\n", __LINE__); } \ +printk("RTNL: assertion failed at " __FILE__ "(%d)\n", __LINE__); } \ } while(0); -#define BUG_TRAP(x) if (!(x)) { printk("KERNEL: assertion (" #x ") failed at " __FILE__ "(%d):" __FUNCTION__ "\n", __LINE__); } +#define BUG_TRAP(x) if (!(x)) { printk("KERNEL: assertion (" #x ") failed at " __FILE__ "(%d)\n", __LINE__); } #endif /* __KERNEL__ */ diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 613e233fd..f9f40f245 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -36,7 +36,7 @@ #include <asm/uaccess.h> #include <linux/skbuff.h> #include <linux/netdevice.h> -#include <linux/netlink.h> +#include <linux/rtnetlink.h> #include <linux/proc_fs.h> #include <linux/smp_lock.h> #include <net/sock.h> @@ -48,8 +48,6 @@ #define NL_EMULATE_DEV #endif -#define BUG_TRAP(x) if (!(x)) { printk("Assertion (" #x ") failed at " __FILE__ "(%d):" __FUNCTION__ "\n", __LINE__); } - struct netlink_opt { u32 pid; |