ChangeSet 1.1466.1.2, 2005/05/19 13:04:46-06:00, djm@xxxxxxxxxxxxxxx
Merge djm@xxxxxxxxxxxxxxxxxxx:/home/djm/xeno-unstable-ia64.bk
into kirby.fc.hp.com:/home/djm/src/xen/xeno-unstable-ia64.bk
config.h | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff -Nru a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h
--- a/xen/include/asm-ia64/config.h 2005-05-19 19:04:32 -04:00
+++ b/xen/include/asm-ia64/config.h 2005-05-19 19:04:32 -04:00
@@ -29,12 +29,9 @@
#define FASTCALL(x) x // see linux/include/linux/linkage.h
#define fastcall // " "
-#define touch_nmi_watchdog()
+#define watchdog_disable() ((void)0)
+#define watchdog_enable() ((void)0)
// from linux/include/linux/types.h
-#define BITS_TO_LONGS(bits) \
- (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG)
-#define DECLARE_BITMAP(name,bits) \
- unsigned long name[BITS_TO_LONGS(bits)]
#define CLEAR_BITMAP(name,bits) \
memset(name, 0, BITS_TO_LONGS(bits)*sizeof(unsigned long))
@@ -57,7 +54,6 @@
//#define __kernel
//#define __safe
#define __force
-#define __iomem
#define __chk_user_ptr(x) (void)0
//#define __chk_io_ptr(x) (void)0
//#define __builtin_warning(x, y...) (1)
@@ -77,9 +73,6 @@
//#define CONFIG_NR_CPUS 16
#define barrier() __asm__ __volatile__("": : :"memory")
-// linux/include/spinlock.h
-#define DEFINE_SPINLOCK(x) spinlock_t x = SPIN_LOCK_UNLOCKED
-
///////////////////////////////////////////////////////////////
// xen/include/asm/config.h
// Natural boundary upon TR size to define xenheap space
@@ -226,7 +219,6 @@
// these declarations got moved at some point, find a better place for them
extern int opt_noht;
extern int ht_per_core;
-extern unsigned int watchdog_on;
// xen/include/asm/config.h
/******************************************************************************
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home