diff options
| author | Dave Jones <davej@delerium.codemonkey.org.uk> | 2003-12-16 01:02:35 +0000 |
|---|---|---|
| committer | Dave Jones <davej@delerium.codemonkey.org.uk> | 2003-12-16 01:02:35 +0000 |
| commit | 3cdecffe5561dd49cc2b203dc1475e43f87fbbe8 (patch) | |
| tree | 52ba67d634f4be2f4a541171bc01a103b110ab44 /include/linux | |
| parent | 2fa72d28f55baa95d7f2f27f38e267cd506ce6d4 (diff) | |
| parent | 056ffaadc8a7197d681e12b2da9ab61ca68e9a97 (diff) | |
Merge delerium.codemonkey.org.uk:/mnt/nfs/sepia/bar/src/kernel/2.6/trees/bk-linus
into delerium.codemonkey.org.uk:/mnt/nfs/sepia/bar/src/kernel/2.6/trees/agpgart
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/blkdev.h | 4 | ||||
| -rw-r--r-- | include/linux/list.h | 12 | ||||
| -rw-r--r-- | include/linux/rtnetlink.h | 1 |
3 files changed, 16 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index dcd5911223d0..35e0f0004e87 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -82,6 +82,8 @@ struct request_list { wait_queue_head_t wait[2]; }; +#define BLK_MAX_CDB 16 + /* * try to put the fields that are referenced together in the same cacheline */ @@ -147,7 +149,7 @@ struct request { * when request is used as a packet command carrier */ unsigned int cmd_len; - unsigned char cmd[16]; + unsigned char cmd[BLK_MAX_CDB]; unsigned int data_len; void *data; diff --git a/include/linux/list.h b/include/linux/list.h index b7d383e6a312..0835011b0ffb 100644 --- a/include/linux/list.h +++ b/include/linux/list.h @@ -208,6 +208,18 @@ static inline int list_empty(const struct list_head *head) return head->next == head; } +/** + * list_empty_careful - tests whether a list is + * empty _and_ checks that no other CPU might be + * in the process of still modifying either member + * @head: the list to test. + */ +static inline int list_empty_careful(const struct list_head *head) +{ + struct list_head *next = head->next; + return (next == head) && (next == head->prev); +} + static inline void __list_splice(struct list_head *list, struct list_head *head) { diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index aadba39502cc..4a26f207b5d7 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -138,6 +138,7 @@ enum #define RTPROT_ZEBRA 11 /* Zebra */ #define RTPROT_BIRD 12 /* BIRD */ #define RTPROT_DNROUTED 13 /* DECnet routing daemon */ +#define RTPROT_XORP 14 /* XORP */ /* rtm_scope |