---

yaml --- r: 5063 b: refs/heads/master c: 9560782 h: refs/heads/master i: 5061: 7b3520d 5059: 57a9171 5055: ffe914b v: v3
git-mirror · Jul 26, 2005 · f3f6d74 · f3f6d74
1 parent 6afbaf2
commit f3f6d74
Show file tree

Hide file tree

Showing 183 changed files with 30,875 additions and 35,440 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db776a14f327c20d4984ac4b724a934df34bfe31
+refs/heads/master: 9560782f9a68a5de3e72bc3ba71317f373844549
diff --git a/trunk/Documentation/scsi/scsi_mid_low_api.txt b/trunk/Documentation/scsi/scsi_mid_low_api.txt
@@ -388,6 +388,7 @@ Summary:
    scsi_remove_device - detach and remove a SCSI device
    scsi_remove_host - detach and remove all SCSI devices owned by host
    scsi_report_bus_reset - report scsi _bus_ reset observed
+   scsi_set_device - place device reference in host structure
    scsi_track_queue_full - track successive QUEUE_FULL events 
    scsi_unblock_requests - allow further commands to be queued to given host
    scsi_unregister - [calls scsi_host_put()]
@@ -739,6 +740,20 @@ int scsi_remove_host(struct Scsi_Host *shost)
 void scsi_report_bus_reset(struct Scsi_Host * shost, int channel)
 
 
+/**
+ * scsi_set_device - place device reference in host structure
+ * @shost: a pointer to a scsi host instance
+ * @pdev: pointer to device instance to assign
+ *
+ *      Returns nothing
+ *
+ *      Might block: no
+ *
+ *      Defined in: include/scsi/scsi_host.h .
+ **/
+void scsi_set_device(struct Scsi_Host * shost, struct device * dev)
+
+
 /**
  * scsi_track_queue_full - track successive QUEUE_FULL events on given
  *                      device to determine if and when there is a need

diff --git a/trunk/arch/alpha/kernel/process.c b/trunk/arch/alpha/kernel/process.c
@@ -165,20 +165,23 @@ machine_restart(char *restart_cmd)
 	common_shutdown(LINUX_REBOOT_CMD_RESTART, restart_cmd);
 }
 
+EXPORT_SYMBOL(machine_restart);
 
 void
 machine_halt(void)
 {
 	common_shutdown(LINUX_REBOOT_CMD_HALT, NULL);
 }
 
+EXPORT_SYMBOL(machine_halt);
 
 void
 machine_power_off(void)
 {
 	common_shutdown(LINUX_REBOOT_CMD_POWER_OFF, NULL);
 }
 
+EXPORT_SYMBOL(machine_power_off);
 
 /* Used by sysrq-p, among others.  I don't believe r9-r15 are ever
    saved in the context it's used.  */

diff --git a/trunk/arch/arm/kernel/process.c b/trunk/arch/arm/kernel/process.c
@@ -131,13 +131,15 @@ void machine_halt(void)
 {
 }
 
+EXPORT_SYMBOL(machine_halt);
 
 void machine_power_off(void)
 {
 	if (pm_power_off)
 		pm_power_off();
 }
 
+EXPORT_SYMBOL(machine_power_off);
 
 void machine_restart(char * __unused)
 {
@@ -167,6 +169,8 @@ void machine_restart(char * __unused)
 	while (1);
 }
 
+EXPORT_SYMBOL(machine_restart);
+
 void __show_regs(struct pt_regs *regs)
 {
 	unsigned long flags = condition_codes(regs);

diff --git a/trunk/arch/arm26/kernel/process.c b/trunk/arch/arm26/kernel/process.c
@@ -103,6 +103,9 @@ void machine_power_off(void)
 {
 }
 
+EXPORT_SYMBOL(machine_halt);
+EXPORT_SYMBOL(machine_power_off);
+
 void machine_restart(char * __unused)
 {
 	/*
@@ -133,6 +136,8 @@ void machine_restart(char * __unused)
 	while (1);
 }
 
+EXPORT_SYMBOL(machine_restart);
+
 void show_regs(struct pt_regs * regs)
 {
 	unsigned long flags;

diff --git a/trunk/arch/cris/kernel/process.c b/trunk/arch/cris/kernel/process.c
@@ -113,7 +113,6 @@
 #include <linux/user.h>
 #include <linux/elfcore.h>
 #include <linux/mqueue.h>
-#include <linux/reboot.h>
 
 //#define DEBUG
 
@@ -209,11 +208,13 @@ void cpu_idle (void)
 
 void hard_reset_now (void);
 
-void machine_restart(char *cmd)
+void machine_restart(void)
 {
 	hard_reset_now();
 }
 
+EXPORT_SYMBOL(machine_restart);
+
 /*
  * Similar to machine_power_off, but don't shut off power.  Add code
  * here to freeze the system for e.g. post-mortem debug purpose when
@@ -224,12 +225,16 @@ void machine_halt(void)
 {
 }
 
+EXPORT_SYMBOL(machine_halt);
+
 /* If or when software power-off is implemented, add code here.  */
 
 void machine_power_off(void)
 {
 }
 
+EXPORT_SYMBOL(machine_power_off);
+
 /*
  * When a process does an "exec", machine state like FPU and debug
  * registers need to be reset.  This is a hook function for that.

diff --git a/trunk/arch/h8300/kernel/process.c b/trunk/arch/h8300/kernel/process.c
@@ -90,20 +90,26 @@ void machine_restart(char * __unused)
 	__asm__("jmp @@0"); 
 }
 
+EXPORT_SYMBOL(machine_restart);
+
 void machine_halt(void)
 {
 	local_irq_disable();
 	__asm__("sleep");
 	for (;;);
 }
 
+EXPORT_SYMBOL(machine_halt);
+
 void machine_power_off(void)
 {
 	local_irq_disable();
 	__asm__("sleep");
 	for (;;);
 }
 
+EXPORT_SYMBOL(machine_power_off);
+
 void show_regs(struct pt_regs * regs)
 {
 	printk("\nPC: %08lx  Status: %02x",

diff --git a/trunk/arch/i386/kernel/apm.c b/trunk/arch/i386/kernel/apm.c
@@ -911,7 +911,14 @@ static void apm_power_off(void)
 		0xcd, 0x15		/* int   $0x15       */
 	};
 
+	/*
+	 * This may be called on an SMP machine.
+	 */
+#ifdef CONFIG_SMP
 	/* Some bioses don't like being called from CPU != 0 */
+	set_cpus_allowed(current, cpumask_of_cpu(0));
+	BUG_ON(smp_processor_id() != 0);
+#endif
 	if (apm_info.realmode_power_off)
 	{
 		(void)apm_save_cpus();

diff --git a/trunk/arch/i386/kernel/reboot.c b/trunk/arch/i386/kernel/reboot.c
@@ -284,7 +284,7 @@ void machine_shutdown(void)
 	reboot_cpu_id = 0;
 
 	/* See if there has been given a command line override */
-	if ((reboot_cpu != -1) && (reboot_cpu < NR_CPUS) &&
+	if ((reboot_cpu_id != -1) && (reboot_cpu < NR_CPUS) &&
 		cpu_isset(reboot_cpu, cpu_online_map)) {
 		reboot_cpu_id = reboot_cpu;
 	}
@@ -311,8 +311,10 @@ void machine_shutdown(void)
 #endif
 }
 
-void machine_emergency_restart(void)
+void machine_restart(char * __unused)
 {
+	machine_shutdown();
+
 	if (!reboot_thru_bios) {
 		if (efi_enabled) {
 			efi.reset_system(EFI_RESET_COLD, EFI_SUCCESS, 0, NULL);
@@ -335,22 +337,23 @@ void machine_emergency_restart(void)
 	machine_real_restart(jump_to_bios, sizeof(jump_to_bios));
 }
 
-void machine_restart(char * __unused)
-{
-	machine_shutdown();
-	machine_emergency_restart();
-}
+EXPORT_SYMBOL(machine_restart);
 
 void machine_halt(void)
 {
 }
 
+EXPORT_SYMBOL(machine_halt);
+
 void machine_power_off(void)
 {
-	machine_shutdown();
+	lapic_shutdown();
 
+	if (efi_enabled)
+		efi.reset_system(EFI_RESET_SHUTDOWN, EFI_SUCCESS, 0, NULL);
 	if (pm_power_off)
 		pm_power_off();
 }
 
+EXPORT_SYMBOL(machine_power_off);
 
diff --git a/trunk/arch/i386/mach-visws/reboot.c b/trunk/arch/i386/mach-visws/reboot.c
@@ -22,6 +22,8 @@ void machine_restart(char * __unused)
 	outb(PIIX4_RESET_VAL, PIIX4_RESET_PORT);
 }
 
+EXPORT_SYMBOL(machine_restart);
+
 void machine_power_off(void)
 {
 	unsigned short pm_status;
@@ -41,7 +43,10 @@ void machine_power_off(void)
 	outl(PIIX_SPECIAL_STOP, 0xCFC);
 }
 
+EXPORT_SYMBOL(machine_power_off);
+
 void machine_halt(void)
 {
 }
 
+EXPORT_SYMBOL(machine_halt);
diff --git a/trunk/arch/i386/mach-voyager/voyager_basic.c b/trunk/arch/i386/mach-voyager/voyager_basic.c
@@ -278,6 +278,8 @@ machine_restart(char *cmd)
 	}
 }
 
+EXPORT_SYMBOL(machine_restart);
+
 void
 mca_nmi_hook(void)
 {
@@ -313,9 +315,12 @@ machine_halt(void)
 	machine_power_off();
 }
 
+EXPORT_SYMBOL(machine_halt);
+
 void machine_power_off(void)
 {
 	if (pm_power_off)
 		pm_power_off();
 }
 
+EXPORT_SYMBOL(machine_power_off);
diff --git a/trunk/arch/ia64/kernel/process.c b/trunk/arch/ia64/kernel/process.c
@@ -807,12 +807,16 @@ machine_restart (char *restart_cmd)
 	(*efi.reset_system)(EFI_RESET_WARM, 0, 0, NULL);
 }
 
+EXPORT_SYMBOL(machine_restart);
+
 void
 machine_halt (void)
 {
 	cpu_halt();
 }
 
+EXPORT_SYMBOL(machine_halt);
+
 void
 machine_power_off (void)
 {
@@ -821,3 +825,4 @@ machine_power_off (void)
 	machine_halt();
 }
 
+EXPORT_SYMBOL(machine_power_off);
diff --git a/trunk/arch/m32r/kernel/process.c b/trunk/arch/m32r/kernel/process.c
@@ -115,18 +115,24 @@ void machine_restart(char *__unused)
 		cpu_relax();
 }
 
+EXPORT_SYMBOL(machine_restart);
+
 void machine_halt(void)
 {
 	printk("Please push reset button!\n");
 	while (1)
 		cpu_relax();
 }
 
+EXPORT_SYMBOL(machine_halt);
+
 void machine_power_off(void)
 {
 	/* M32R_FIXME */
 }
 
+EXPORT_SYMBOL(machine_power_off);
+
 static int __init idle_setup (char *str)
 {
 	if (!strncmp(str, "poll", 4)) {

diff --git a/trunk/arch/m68k/kernel/process.c b/trunk/arch/m68k/kernel/process.c
@@ -113,20 +113,26 @@ void machine_restart(char * __unused)
 	for (;;);
 }
 
+EXPORT_SYMBOL(machine_restart);
+
 void machine_halt(void)
 {
 	if (mach_halt)
 		mach_halt();
 	for (;;);
 }
 
+EXPORT_SYMBOL(machine_halt);
+
 void machine_power_off(void)
 {
 	if (mach_power_off)
 		mach_power_off();
 	for (;;);
 }
 
+EXPORT_SYMBOL(machine_power_off);
+
 void show_regs(struct pt_regs * regs)
 {
 	printk("\n");

diff --git a/trunk/arch/m68knommu/kernel/process.c b/trunk/arch/m68knommu/kernel/process.c
@@ -80,20 +80,26 @@ void machine_restart(char * __unused)
 	for (;;);
 }
 
+EXPORT_SYMBOL(machine_restart);
+
 void machine_halt(void)
 {
 	if (mach_halt)
 		mach_halt();
 	for (;;);
 }
 
+EXPORT_SYMBOL(machine_halt);
+
 void machine_power_off(void)
 {
 	if (mach_power_off)
 		mach_power_off();
 	for (;;);
 }
 
+EXPORT_SYMBOL(machine_power_off);
+
 void show_regs(struct pt_regs * regs)
 {
 	printk(KERN_NOTICE "\n");

diff --git a/trunk/arch/mips/kernel/reset.c b/trunk/arch/mips/kernel/reset.c
@@ -26,13 +26,18 @@ void machine_restart(char *command)
 	_machine_restart(command);
 }
 
+EXPORT_SYMBOL(machine_restart);
+
 void machine_halt(void)
 {
 	_machine_halt();
 }
 
+EXPORT_SYMBOL(machine_halt);
+
 void machine_power_off(void)
 {
 	_machine_power_off();
 }
 
+EXPORT_SYMBOL(machine_power_off);