diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
| commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
| tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /include/asm-sh64/bug.h | |
| parent | 79d20b14a0d651f15b0ef9a22b6cf12d284a6d38 (diff) | |
| parent | 6628465e33ca694bd8fd5c3cf4eb7ff9177bc694 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-sh64/bug.h')
| -rw-r--r-- | include/asm-sh64/bug.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-sh64/bug.h b/include/asm-sh64/bug.h index 3acd54d59566..5d659ec28e10 100644 --- a/include/asm-sh64/bug.h +++ b/include/asm-sh64/bug.h | |||
| @@ -17,10 +17,6 @@ | |||
| 17 | BUG(); \ | 17 | BUG(); \ |
| 18 | } while(0) | 18 | } while(0) |
| 19 | 19 | ||
| 20 | #define PAGE_BUG(page) do { \ | ||
| 21 | BUG(); \ | ||
| 22 | } while (0) | ||
| 23 | |||
| 24 | #define WARN_ON(condition) do { \ | 20 | #define WARN_ON(condition) do { \ |
| 25 | if (unlikely((condition)!=0)) { \ | 21 | if (unlikely((condition)!=0)) { \ |
| 26 | printk("Badness in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \ | 22 | printk("Badness in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \ |