diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 12:00:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 12:00:33 -0500 |
| commit | 3d14b5beba35250c548d3851a2b84fce742d8311 (patch) | |
| tree | 065e3d93c3fcbc5ee4c44fa78662393cddbdf6de /arch/x86/include/asm/bug.h | |
| parent | 0719dc341389882cc834ed18fc9b7fc6006b2b85 (diff) | |
| parent | 1bf8e6219552d5dd27012d567ec8c4bb9c2d86b4 (diff) | |
Merge branch 'sa1100' into devel
Diffstat (limited to 'arch/x86/include/asm/bug.h')
| -rw-r--r-- | arch/x86/include/asm/bug.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h index d9cf1cd156d2..f654d1bb17fb 100644 --- a/arch/x86/include/asm/bug.h +++ b/arch/x86/include/asm/bug.h | |||
| @@ -22,14 +22,14 @@ do { \ | |||
| 22 | ".popsection" \ | 22 | ".popsection" \ |
| 23 | : : "i" (__FILE__), "i" (__LINE__), \ | 23 | : : "i" (__FILE__), "i" (__LINE__), \ |
| 24 | "i" (sizeof(struct bug_entry))); \ | 24 | "i" (sizeof(struct bug_entry))); \ |
| 25 | for (;;) ; \ | 25 | unreachable(); \ |
| 26 | } while (0) | 26 | } while (0) |
| 27 | 27 | ||
| 28 | #else | 28 | #else |
| 29 | #define BUG() \ | 29 | #define BUG() \ |
| 30 | do { \ | 30 | do { \ |
| 31 | asm volatile("ud2"); \ | 31 | asm volatile("ud2"); \ |
| 32 | for (;;) ; \ | 32 | unreachable(); \ |
| 33 | } while (0) | 33 | } while (0) |
| 34 | #endif | 34 | #endif |
| 35 | 35 | ||