Merge bk://ldm.bkbits.net/linux-2.5-core

into home.transmeta.com:/home/torvalds/v2.5/linux

6 files changed, 0 insertions, 7 deletions

diff --git a/include/asm-i386/smp.h b/include/asm-i386/smp.h
index f72e82945a57..71dd76aa0d83 100644
--- a/include/asm-i386/smp.h
+++ b/include/asm-i386/smp.h
@@ -41,7 +41,6 @@ extern int cpu_sibling_map[];
 extern void smp_flush_tlb(void);
 extern void smp_message_irq(int cpl, void *dev_id, struct pt_regs *regs);
 extern void smp_send_reschedule(int cpu);
-extern void smp_send_reschedule_all(void);
 extern void smp_invalidate_rcv(void);		/* Process an NMI */
 extern void (*mtrr_hook) (void);
 extern void zap_low_mappings (void);
diff --git a/include/asm-ia64/smp.h b/include/asm-ia64/smp.h
index 5147ca20d3ac..df4b07cf7f46 100644
--- a/include/asm-ia64/smp.h
+++ b/include/asm-ia64/smp.h
@@ -136,8 +136,6 @@ extern void smp_do_timer (struct pt_regs *regs);
 extern int smp_call_function_single (int cpuid, void (*func) (void *info), void *info,
 				     int retry, int wait);
 extern void smp_send_reschedule (int cpu);
-extern void smp_send_reschedule_all (void);
-
 
 #endif /* CONFIG_SMP */
 #endif /* _ASM_IA64_SMP_H */
diff --git a/include/asm-ppc64/smp.h b/include/asm-ppc64/smp.h
index 0dd474425342..f3cfd38ff0a2 100644
--- a/include/asm-ppc64/smp.h
+++ b/include/asm-ppc64/smp.h
@@ -34,7 +34,6 @@ extern void smp_send_tlb_invalidate(int);
 extern void smp_send_xmon_break(int cpu);
 struct pt_regs;
 extern void smp_message_recv(int, struct pt_regs *);
-extern void smp_send_reschedule_all(void);
 
 #define NO_PROC_ID		0xFF            /* No processor magic marker */
 
diff --git a/include/asm-x86_64/smp.h b/include/asm-x86_64/smp.h
index 53ee2b8a8716..a624ef178425 100644
--- a/include/asm-x86_64/smp.h
+++ b/include/asm-x86_64/smp.h
@@ -42,7 +42,6 @@ extern int pic_mode;
 extern void smp_flush_tlb(void);
 extern void smp_message_irq(int cpl, void *dev_id, struct pt_regs *regs);
 extern void smp_send_reschedule(int cpu);
-extern void smp_send_reschedule_all(void);
 extern void smp_invalidate_rcv(void);		/* Process an NMI */
 extern void (*mtrr_hook) (void);
 extern void zap_low_mappings(void);
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 706819e9a27c..c6a8f20203ec 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1115,7 +1115,6 @@ typedef struct {
 #ifdef CONFIG_PROC_FS
 extern void proc_ide_create(void);
 extern void proc_ide_destroy(void);
-extern void recreate_proc_ide_device(ide_hwif_t *, ide_drive_t *);
 extern void destroy_proc_ide_device(ide_hwif_t *, ide_drive_t *);
 extern void destroy_proc_ide_drives(ide_hwif_t *);
 extern void create_proc_ide_interfaces(void);
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 194d2f5ecb87..98f235eec967 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -110,7 +110,6 @@ void smp_prepare_boot_cpu(void);
 #define smp_call_function(func,info,retry,wait)	({ 0; })
 #define on_each_cpu(func,info,retry,wait)	({ func(info); 0; })
 static inline void smp_send_reschedule(int cpu) { }
-static inline void smp_send_reschedule_all(void) { }
 #define cpu_online_map				1
 #define cpu_online(cpu)				({ BUG_ON((cpu) != 0); 1; })
 #define num_online_cpus()			1