Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>
CC: Keir Fraser <k...@xen.org>
CC: Jan Beulich <jbeul...@suse.com>
CC: Ian Campbell <ian.campb...@citrix.com>
CC: Stefano Stabellini <stefano.stabell...@citrix.com>
CC: Tim Deegan <t...@xen.org>
---
Compile tested for x86, arm32 and arm64
---
xen/drivers/char/console.c | 15 ---------------
xen/include/xen/lib.h | 12 ------------
2 files changed, 27 deletions(-)
diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index cb0c2d6..fce4cc8 100644
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -1150,21 +1150,6 @@ void panic(const char *fmt, ...)
machine_restart(5000);
}
-void __bug(const char *file, int line)
-{
- console_start_sync();
- printk("Xen BUG at %s:%d\n", file, line);
- dump_execution_state();
- panic("Xen BUG at %s:%d", file, line);
-}
-
-void __warn(const char *file, int line)
-{
- printk("Xen WARN at %s:%d\n", file, line);
- dump_execution_state();
-}
-
-
/*
* **************************************************************
* ****************** Console suspend/resume ********************
diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h
index ca3916b..6c8dd86 100644
--- a/xen/include/xen/lib.h
+++ b/xen/include/xen/lib.h
@@ -8,9 +8,6 @@
#include <xen/string.h>
#include <asm/bug.h>
-void noreturn __bug(const char *file, int line);
-void __warn(const char *file, int line);
-
#define BUG_ON(p) do { if (unlikely(p)) BUG(); } while (0)
#define WARN_ON(p) do { if (unlikely(p)) WARN(); } while (0)
@@ -29,15 +26,6 @@
#define BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond))
#endif
-#ifndef assert_failed
-#define assert_failed(p) \
-do { \
- printk("Assertion '%s' failed, line %d, file %s\n", p , \
- __LINE__, __FILE__); \
- BUG(); \
-} while (0)
-#endif
-
#ifndef NDEBUG
#define ASSERT(p) \
do { if ( unlikely(!(p)) ) assert_failed(#p); } while (0)
--
1.7.10.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
