diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/mount.h | 2 | ||||
-rw-r--r-- | include/linux/phy.h | 2 | ||||
-rw-r--r-- | include/linux/rbtree.h | 4 | ||||
-rw-r--r-- | include/linux/stddef.h | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/mount.h b/include/linux/mount.h index e4d185ccf8..57d5ba9523 100644 --- a/include/linux/mount.h +++ b/include/linux/mount.h @@ -1,6 +1,6 @@ /* * - * Definitions for mount interface. This describes the in the kernel build + * Definitions for mount interface. This describes the in the kernel build * linkedlist with mounted filesystems. * * Author: Marco van Wieringen <mvw@planets.elm.net> diff --git a/include/linux/phy.h b/include/linux/phy.h index 38b0670187..d7b10afbc9 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -251,7 +251,7 @@ struct phy_driver { struct driver_d drv; }; -#define to_phy_driver(d) container_of(d, struct phy_driver, drv) +#define to_phy_driver(d) ((d) ? container_of(d, struct phy_driver, drv) : NULL) #define PHY_ANY_ID "MATCH ANY PHY" #define PHY_ANY_UID 0xffffffff diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h index d85b0adb5c..a5ef1b9a98 100644 --- a/include/linux/rbtree.h +++ b/include/linux/rbtree.h @@ -1,7 +1,7 @@ /* Red Black Trees (C) 1999 Andrea Arcangeli <andrea@suse.de> - + * SPDX-License-Identifier: GPL-2.0+ linux/include/linux/rbtree.h @@ -61,7 +61,7 @@ extern struct rb_node *rb_first_postorder(const struct rb_root *); extern struct rb_node *rb_next_postorder(const struct rb_node *); /* Fast replacement of a single node without remove/rebalance/add/rebalance */ -extern void rb_replace_node(struct rb_node *victim, struct rb_node *new, +extern void rb_replace_node(struct rb_node *victim, struct rb_node *new, struct rb_root *root); static inline void rb_link_node(struct rb_node * node, struct rb_node * parent, diff --git a/include/linux/stddef.h b/include/linux/stddef.h index e36632872d..680d0c7662 100644 --- a/include/linux/stddef.h +++ b/include/linux/stddef.h @@ -17,6 +17,8 @@ enum { #include <linux/types.h> #endif +typedef unsigned short wchar_t; + #undef offsetof #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) |