x86/mm, mm/hwpoison: Don't unconditionally unmap kernel 1:1 pages

[sfrench/cifs-2.6.git] / include / linux / ipv6_route.h

diff --git a/include/linux/ipv6_route.h b/include/linux/ipv6_route.h
index 1e7d8af2defe78d27bbe9c2518065b3679e63903..25b5f1f5e7802a6d53f41783d9c0b5bad256a173 100644 (file)
--- a/include/linux/ipv6_route.h
+++ b/include/linux/ipv6_route.h
@@ -9,54 +9,11 @@
  *      as published by the Free Software Foundation; either version
  *      2 of the License, or (at your option) any later version.
  */
-
 #ifndef _LINUX_IPV6_ROUTE_H
 #define _LINUX_IPV6_ROUTE_H
 
-#include <linux/types.h>
-
-#define RTF_DEFAULT    0x00010000      /* default - learned via ND     */
-#define RTF_ALLONLINK  0x00020000      /* (deprecated and will be removed)
-                                          fallback, no routers on link */
-#define RTF_ADDRCONF   0x00040000      /* addrconf route - RA          */
-#define RTF_PREFIX_RT  0x00080000      /* A prefix only route - RA     */
-#define RTF_ANYCAST    0x00100000      /* Anycast                      */
-
-#define RTF_NONEXTHOP  0x00200000      /* route with no nexthop        */
-#define RTF_EXPIRES    0x00400000
-
-#define RTF_ROUTEINFO  0x00800000      /* route information - RA       */
-
-#define RTF_CACHE      0x01000000      /* cache entry                  */
-#define RTF_FLOW       0x02000000      /* flow significant route       */
-#define RTF_POLICY     0x04000000      /* policy route                 */
-
-#define RTF_PREF(pref) ((pref) << 27)
-#define RTF_PREF_MASK  0x18000000
+#include <uapi/linux/ipv6_route.h>
 
-#define RTF_LOCAL      0x80000000
-
-#ifdef __KERNEL__
 #define IPV6_EXTRACT_PREF(flag)        (((flag) & RTF_PREF_MASK) >> 27)
 #define IPV6_DECODE_PREF(pref) ((pref) ^ 2)    /* 1:low,2:med,3:high */
 #endif
-
-struct in6_rtmsg {
-       struct in6_addr         rtmsg_dst;
-       struct in6_addr         rtmsg_src;
-       struct in6_addr         rtmsg_gateway;
-       __u32                   rtmsg_type;
-       __u16                   rtmsg_dst_len;
-       __u16                   rtmsg_src_len;
-       __u32                   rtmsg_metric;
-       unsigned long           rtmsg_info;
-        __u32                  rtmsg_flags;
-       int                     rtmsg_ifindex;
-};
-
-#define RTMSG_NEWDEVICE                0x11
-#define RTMSG_DELDEVICE                0x12
-#define RTMSG_NEWROUTE         0x21
-#define RTMSG_DELROUTE         0x22
-
-#endif