Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

[linux-2.6-omap-h63xx.git] / include / linux / notifier.h

diff --git a/include/linux/notifier.h b/include/linux/notifier.h
index f4df40038f0c4cb54d2596cbe051dfd9bd241f0e..bd3d72ddf33398254a503fdbc8709e3cbccdc19e 100644 (file)
--- a/include/linux/notifier.h
+++ b/include/linux/notifier.h
@@ -121,6 +121,10 @@ extern int raw_notifier_chain_register(struct raw_notifier_head *nh,
 extern int srcu_notifier_chain_register(struct srcu_notifier_head *nh,
                struct notifier_block *nb);
 
+extern int blocking_notifier_chain_cond_register(
+               struct blocking_notifier_head *nh,
+               struct notifier_block *nb);
+
 extern int atomic_notifier_chain_unregister(struct atomic_notifier_head *nh,
                struct notifier_block *nb);
 extern int blocking_notifier_chain_unregister(struct blocking_notifier_head *nh,
@@ -193,6 +197,7 @@ static inline int notifier_to_errno(int ret)
 #define NETDEV_GOING_DOWN      0x0009
 #define NETDEV_CHANGENAME      0x000A
 #define NETDEV_FEAT_CHANGE     0x000B
+#define NETDEV_BONDING_FAILOVER 0x000C
 
 #define SYS_DOWN       0x0001  /* Notify of system down */
 #define SYS_RESTART    SYS_DOWN
@@ -247,6 +252,7 @@ extern struct blocking_notifier_head reboot_notifier_list;
 #define VT_DEALLOCATE          0x0002 /* Console will be deallocated */
 #define VT_WRITE               0x0003 /* A char got output */
 #define VT_UPDATE              0x0004 /* A bigger update occurred */
+#define VT_PREWRITE            0x0005 /* A char is about to be written to the console */
 
 #endif /* __KERNEL__ */
 #endif /* _LINUX_NOTIFIER_H */