diff options
| author | Len Brown <len.brown@intel.com> | 2005-12-22 22:01:55 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-12-22 22:01:55 -0500 |
| commit | db9ace7083dbdcc3d02bdd6a1d26132c80b5b726 (patch) | |
| tree | 022e1162c2ef3f83d6214fdc7f3678bc5545714a /include/linux | |
| parent | d8bcd8e41576809f276fa44be5012568296cce41 (diff) | |
| parent | c162eeaa21fde6c27112690f5bc0a461a9f1763e (diff) | |
Auto-update from upstream
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ipv6_route.h | 1 | ||||
| -rw-r--r-- | include/linux/irq.h | 2 | ||||
| -rw-r--r-- | include/linux/preempt.h | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/ipv6_route.h b/include/linux/ipv6_route.h index e2f935038013..d7c41d1d706a 100644 --- a/include/linux/ipv6_route.h +++ b/include/linux/ipv6_route.h @@ -18,6 +18,7 @@ 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 diff --git a/include/linux/irq.h b/include/linux/irq.h index c516382fbec2..f04ba20712a2 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -10,7 +10,7 @@ */ #include <linux/config.h> -#include <asm/smp.h> /* cpu_online_map */ +#include <linux/smp.h> #if !defined(CONFIG_ARCH_S390) diff --git a/include/linux/preempt.h b/include/linux/preempt.h index d9a2f5254a51..5769d14d1e6a 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h @@ -48,6 +48,7 @@ do { \ #define preempt_enable() \ do { \ preempt_enable_no_resched(); \ + barrier(); \ preempt_check_resched(); \ } while (0) |