diff options
author | <jgarzik@pretzel.yyz.us> | 2005-05-26 21:40:25 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-26 21:40:25 -0400 |
commit | 462cee296476278acaa54c41925b3273e0e4dd40 (patch) | |
tree | c9d9fcfc4dd62807cb67678a6eda0151bfa8be95 /include/asm-x86_64/bug.h | |
parent | 126fa4b9ca5d9d7cb7d46f779ad3bd3631ca387c (diff) | |
parent | 4ec5240ec367a592834385893200dd4fb369354c (diff) |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
Diffstat (limited to 'include/asm-x86_64/bug.h')
-rw-r--r-- | include/asm-x86_64/bug.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86_64/bug.h b/include/asm-x86_64/bug.h index bdbf66eab6ee..3d2a666a5dd5 100644 --- a/include/asm-x86_64/bug.h +++ b/include/asm-x86_64/bug.h @@ -21,6 +21,8 @@ struct bug_frame { asm volatile("ud2 ; .quad %c1 ; .short %c0" :: \ "i"(__LINE__), "i" (__stringify(__FILE__))) void out_of_line_bug(void); +#else +static inline void out_of_line_bug(void) { } #endif #include <asm-generic/bug.h> |