[Xen-changelog] Kill a few dead definitions/declarations.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1448, 2005/05/06 11:50:35+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Kill a few dead definitions/declarations.
        Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>



 drivers/char/console.c   |    8 --------
 include/asm-x86/config.h |   30 ------------------------------
 2 files changed, 38 deletions(-)


diff -Nru a/xen/drivers/char/console.c b/xen/drivers/char/console.c
--- a/xen/drivers/char/console.c        2005-05-06 07:04:42 -04:00
+++ b/xen/drivers/char/console.c        2005-05-06 07:04:42 -04:00
@@ -637,14 +637,6 @@
     machine_restart(0);
 }
 
-
-void __out_of_line_bug(int line)
-{
-    printk("kernel BUG in header file at line %d\n", line);
-    BUG();
-    for ( ; ; ) ;
-}
-
 /*
  * Local variables:
  * mode: C
diff -Nru a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
--- a/xen/include/asm-x86/config.h      2005-05-06 07:04:42 -04:00
+++ b/xen/include/asm-x86/config.h      2005-05-06 07:04:42 -04:00
@@ -23,34 +23,6 @@
 #define CONFIG_ACPI 1
 #define CONFIG_ACPI_BOOT 1
 
-//#define CONFIG_PCI 0
-//#define CONFIG_PCI_DIRECT 0
-#if defined(__i386__)
-//#define CONFIG_PCI_BIOS 0
-#endif
-
-#define CONFIG_IDE 1
-#define CONFIG_BLK_DEV_IDE 1
-#define CONFIG_BLK_DEV_IDEDMA 1
-#define CONFIG_BLK_DEV_IDEPCI 1
-#define CONFIG_IDEDISK_MULTI_MODE 1
-#define CONFIG_IDEDISK_STROKE 1
-#define CONFIG_IDEPCI_SHARE_IRQ 1
-#define CONFIG_BLK_DEV_IDEDMA_PCI 1
-#define CONFIG_IDEDMA_PCI_AUTO 1
-#define CONFIG_IDEDMA_AUTO 1
-#define CONFIG_IDEDMA_ONLYDISK 1
-#define CONFIG_BLK_DEV_IDE_MODES 1
-#define CONFIG_BLK_DEV_PIIX 1
-
-#define CONFIG_SCSI 1
-#define CONFIG_SCSI_LOGGING 1
-#define CONFIG_BLK_DEV_SD 1
-#define CONFIG_SD_EXTRA_DEVS 40
-#define CONFIG_SCSI_MULTI_LUN 1
-
-#define CONFIG_XEN_ATTENTION_KEY 1
-
 #define HZ 100
 
 #define OPT_CONSOLE_STR "com1,vga"
@@ -91,8 +63,6 @@
 
 #ifndef __ASSEMBLY__
 extern unsigned long _end; /* standard ELF symbol */
-extern void __out_of_line_bug(int line) __attribute__((noreturn));
-#define out_of_line_bug() __out_of_line_bug(__LINE__)
 #endif /* __ASSEMBLY__ */
 
 #define FORCE_CRASH() __asm__ __volatile__ ( "ud2" )

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog