diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 20:32:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 20:32:22 -0500 |
| commit | 15578eeb6cd4b74492f26e60624aa1a9a52ddd7b (patch) | |
| tree | d938e61f953ca63a745e7ace4a78c16876509ed5 /include/linux/kernel.h | |
| parent | 8f28afac3494f573ac774030a1f840b7d6237da2 (diff) | |
| parent | 3860288ee8298bf2784e9a0c37d26d3a82941e35 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 323924edb26a..a5363324cf95 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -228,6 +228,7 @@ extern void dump_stack(void); | |||
| 228 | ntohs((addr).s6_addr16[6]), \ | 228 | ntohs((addr).s6_addr16[6]), \ |
| 229 | ntohs((addr).s6_addr16[7]) | 229 | ntohs((addr).s6_addr16[7]) |
| 230 | #define NIP6_FMT "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x" | 230 | #define NIP6_FMT "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x" |
| 231 | #define NIP6_SEQFMT "%04x%04x%04x%04x%04x%04x%04x%04x" | ||
| 231 | 232 | ||
| 232 | #if defined(__LITTLE_ENDIAN) | 233 | #if defined(__LITTLE_ENDIAN) |
| 233 | #define HIPQUAD(addr) \ | 234 | #define HIPQUAD(addr) \ |