diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
| commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
| tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /include/asm-x86_64/bug.h | |
| parent | 325a479c4c110db278ef3361460a48c4093252cc (diff) | |
| parent | 1016888fb69662936b32ab767c7419a3be9a69d3 (diff) | |
Auto merge with /home/aegl/GIT/linus
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 { | |||
| 21 | asm volatile("ud2 ; .quad %c1 ; .short %c0" :: \ | 21 | asm volatile("ud2 ; .quad %c1 ; .short %c0" :: \ |
| 22 | "i"(__LINE__), "i" (__stringify(__FILE__))) | 22 | "i"(__LINE__), "i" (__stringify(__FILE__))) |
| 23 | void out_of_line_bug(void); | 23 | void out_of_line_bug(void); |
| 24 | #else | ||
| 25 | static inline void out_of_line_bug(void) { } | ||
| 24 | #endif | 26 | #endif |
| 25 | 27 | ||
| 26 | #include <asm-generic/bug.h> | 28 | #include <asm-generic/bug.h> |