---

yaml --- r: 5637 b: refs/heads/master c: c013622 h: refs/heads/master i: 5635: 47f5194 v: v3
git-mirror · Aug 4, 2005 · 551c58e · 551c58e
1 parent a862892
commit 551c58e
Show file tree

Hide file tree

Showing 34 changed files with 130 additions and 784 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d22d85a852b72398a81b8e476977b28b4400f7c
+refs/heads/master: c013622d5fe0ffeb0c74b2af4c2b1aad6164f709
diff --git a/trunk/Documentation/kprobes.txt b/trunk/Documentation/kprobes.txt
diff --git a/trunk/Documentation/video4linux/bttv/Insmod-options b/trunk/Documentation/video4linux/bttv/Insmod-options
@@ -44,9 +44,6 @@ bttv.o
 				push used by bttv.  bttv will disable overlay
 				by default on this hardware to avoid crashes.
 				With this insmod option you can override this.
-		no_overlay=1	Disable overlay. It should be used by broken
-				hardware that doesn't support PCI2PCI direct
-				transfers.
 		automute=0/1	Automatically mutes the sound if there is
 				no TV signal, on by default.  You might try
 				to disable this if you have bad input signal

diff --git a/trunk/arch/arm/oprofile/backtrace.c b/trunk/arch/arm/oprofile/backtrace.c
@@ -115,7 +115,7 @@ static int valid_kernel_stack(struct frame_tail *tail, struct pt_regs *regs)
 	return (tailaddr > stack) && (tailaddr < stack_base);
 }
 
-void arm_backtrace(struct pt_regs const *regs, unsigned int depth)
+void arm_backtrace(struct pt_regs * const regs, unsigned int depth)
 {
 	struct frame_tail *tail;
 	unsigned long last_address = 0;

diff --git a/trunk/arch/arm26/mm/fault.c b/trunk/arch/arm26/mm/fault.c
@@ -176,12 +176,12 @@ __do_page_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
 	 * Handle the "normal" cases first - successful and sigbus
 	 */
 	switch (fault) {
-	case VM_FAULT_MAJOR:
+	case 2:
 		tsk->maj_flt++;
 		return fault;
-	case VM_FAULT_MINOR:
+	case 1:
 		tsk->min_flt++;
-	case VM_FAULT_SIGBUS:
+	case 0:
 		return fault;
 	}
 
@@ -226,11 +226,14 @@ int do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
 	/*
 	 * Handle the "normal" case first
 	 */
-	switch (fault) {
-	case VM_FAULT_MINOR:
-	case VM_FAULT_MAJOR:
+	if (fault > 0)
 		return 0;
-	case VM_FAULT_SIGBUS:
+
+	/*
+	 * We had some memory, but were unable to
+	 * successfully fix up this page fault.
+	 */
+	if (fault == 0){
 		goto do_sigbus;
 	}
 

diff --git a/trunk/arch/cris/mm/fault.c b/trunk/arch/cris/mm/fault.c
@@ -284,13 +284,13 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
 	 */
 
 	switch (handle_mm_fault(mm, vma, address, writeaccess & 1)) {
-	case VM_FAULT_MINOR:
+	case 1:
 		tsk->min_flt++;
 		break;
-	case VM_FAULT_MAJOR:
+	case 2:
 		tsk->maj_flt++;
 		break;
-	case VM_FAULT_SIGBUS:
+	case 0:
 		goto do_sigbus;
 	default:
 		goto out_of_memory;

diff --git a/trunk/arch/frv/mm/fault.c b/trunk/arch/frv/mm/fault.c
@@ -163,13 +163,13 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
 	 * the fault.
 	 */
 	switch (handle_mm_fault(mm, vma, ear0, write)) {
-	case VM_FAULT_MINOR:
+	case 1:
 		current->min_flt++;
 		break;
-	case VM_FAULT_MAJOR:
+	case 2:
 		current->maj_flt++;
 		break;
-	case VM_FAULT_SIGBUS:
+	case 0:
 		goto do_sigbus;
 	default:
 		goto out_of_memory;

diff --git a/trunk/arch/m68k/mm/fault.c b/trunk/arch/m68k/mm/fault.c
@@ -160,13 +160,13 @@ int do_page_fault(struct pt_regs *regs, unsigned long address,
 	printk("handle_mm_fault returns %d\n",fault);
 #endif
 	switch (fault) {
-	case VM_FAULT_MINOR:
+	case 1:
 		current->min_flt++;
 		break;
-	case VM_FAULT_MAJOR:
+	case 2:
 		current->maj_flt++;
 		break;
-	case VM_FAULT_SIGBUS:
+	case 0:
 		goto bus_err;
 	default:
 		goto out_of_memory;

diff --git a/trunk/arch/parisc/mm/fault.c b/trunk/arch/parisc/mm/fault.c
@@ -178,17 +178,17 @@ void do_page_fault(struct pt_regs *regs, unsigned long code,
 	 */
 
 	switch (handle_mm_fault(mm, vma, address, (acc_type & VM_WRITE) != 0)) {
-	      case VM_FAULT_MINOR:
+	      case 1:
 		++current->min_flt;
 		break;
-	      case VM_FAULT_MAJOR:
+	      case 2:
 		++current->maj_flt;
 		break;
-	      case VM_FAULT_SIGBUS:
+	      case 0:
 		/*
-		 * We hit a hared mapping outside of the file, or some
-		 * other thing happened to us that made us unable to
-		 * handle the page fault gracefully.
+		 * We ran out of memory, or some other thing happened
+		 * to us that made us unable to handle the page fault
+		 * gracefully.
 		 */
 		goto bad_area;
 	      default:

diff --git a/trunk/arch/ppc64/kernel/head.S b/trunk/arch/ppc64/kernel/head.S
@@ -2071,7 +2071,7 @@ _GLOBAL(hmt_start_secondary)
 	blr
 #endif
 
-#if defined(CONFIG_KEXEC) || (defined(CONFIG_SMP) && !defined(CONFIG_PPC_ISERIES))
+#if defined(CONFIG_SMP) && !defined(CONFIG_PPC_ISERIES)
 _GLOBAL(smp_release_cpus)
 	/* All secondary cpus are spinning on a common
 	 * spinloop, release them all now so they can start

diff --git a/trunk/arch/ppc64/kernel/machine_kexec.c b/trunk/arch/ppc64/kernel/machine_kexec.c
@@ -185,7 +185,7 @@ void kexec_copy_flush(struct kimage *image)
 void kexec_smp_down(void *arg)
 {
 	if (ppc_md.cpu_irq_down)
-		ppc_md.cpu_irq_down(1);
+		ppc_md.cpu_irq_down();
 
 	local_irq_disable();
 	kexec_smp_wait();
@@ -232,7 +232,7 @@ static void kexec_prepare_cpus(void)
 
 	/* after we tell the others to go down */
 	if (ppc_md.cpu_irq_down)
-		ppc_md.cpu_irq_down(0);
+		ppc_md.cpu_irq_down();
 
 	put_cpu();
 
@@ -243,19 +243,15 @@ static void kexec_prepare_cpus(void)
 
 static void kexec_prepare_cpus(void)
 {
-	extern void smp_release_cpus(void);
 	/*
 	 * move the secondarys to us so that we can copy
 	 * the new kernel 0-0x100 safely
 	 *
 	 * do this if kexec in setup.c ?
-	 *
-	 * We need to release the cpus if we are ever going from an
-	 * UP to an SMP kernel.
 	 */
-	smp_release_cpus();
+	smp_relase_cpus();
 	if (ppc_md.cpu_irq_down)
-		ppc_md.cpu_irq_down(0);
+		ppc_md.cpu_irq_down();
 	local_irq_disable();
 }
 

diff --git a/trunk/arch/ppc64/kernel/mpic.c b/trunk/arch/ppc64/kernel/mpic.c
@@ -794,10 +794,10 @@ void mpic_setup_this_cpu(void)
 
 /*
  * XXX: someone who knows mpic should check this.
- * do we need to eoi the ipi including for kexec cpu here (see xics comments)?
+ * do we need to eoi the ipi here (see xics comments)?
  * or can we reset the mpic in the new kernel?
  */
-void mpic_teardown_this_cpu(int secondary)
+void mpic_teardown_this_cpu(void)
 {
 	struct mpic *mpic = mpic_primary;
 	unsigned long flags;

diff --git a/trunk/arch/ppc64/kernel/mpic.h b/trunk/arch/ppc64/kernel/mpic.h
@@ -256,7 +256,7 @@ extern unsigned int mpic_irq_get_priority(unsigned int irq);
 extern void mpic_setup_this_cpu(void);
 
 /* Clean up for kexec (or cpu offline or ...) */
-extern void mpic_teardown_this_cpu(int secondary);
+extern void mpic_teardown_this_cpu(void);
 
 /* Request IPIs on primary mpic */
 extern void mpic_request_ipis(void);

diff --git a/trunk/arch/ppc64/kernel/xics.c b/trunk/arch/ppc64/kernel/xics.c
@@ -647,30 +647,29 @@ static void xics_set_affinity(unsigned int virq, cpumask_t cpumask)
 	}
 }
 
-void xics_teardown_cpu(int secondary)
+void xics_teardown_cpu(void)
 {
 	int cpu = smp_processor_id();
+	int status;
 
 	ops->cppr_info(cpu, 0x00);
 	iosync();
 
 	/*
-	 * Some machines need to have at least one cpu in the GIQ,
-	 * so leave the master cpu in the group.
+	 * we need to EOI the IPI if we got here from kexec down IPI
+	 *
+	 * xics doesn't care if we duplicate an EOI as long as we
+	 * don't EOI and raise priority.
+	 *
+	 * probably need to check all the other interrupts too
+	 * should we be flagging idle loop instead?
+	 * or creating some task to be scheduled?
 	 */
-	if (secondary) {
-		/*
-		 * we need to EOI the IPI if we got here from kexec down IPI
-		 *
-		 * probably need to check all the other interrupts too
-		 * should we be flagging idle loop instead?
-		 * or creating some task to be scheduled?
-		 */
-		ops->xirr_info_set(cpu, XICS_IPI);
-		rtas_set_indicator(GLOBAL_INTERRUPT_QUEUE,
-			(1UL << interrupt_server_size) - 1 -
-			default_distrib_server, 0);
-	}
+	ops->xirr_info_set(cpu, XICS_IPI);
+
+	status = rtas_set_indicator(GLOBAL_INTERRUPT_QUEUE,
+		(1UL << interrupt_server_size) - 1 - default_distrib_server, 0);
+	WARN_ON(status != 0);
 }
 
 #ifdef CONFIG_HOTPLUG_CPU

diff --git a/trunk/arch/sh64/mm/fault.c b/trunk/arch/sh64/mm/fault.c
@@ -223,13 +223,13 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
 	 */
 survive:
 	switch (handle_mm_fault(mm, vma, address, writeaccess)) {
-	case VM_FAULT_MINOR:
+	case 1:
 		tsk->min_flt++;
 		break;
-	case VM_FAULT_MAJOR:
+	case 2:
 		tsk->maj_flt++;
 		break;
-	case VM_FAULT_SIGBUS:
+	case 0:
 		goto do_sigbus;
 	default:
 		goto out_of_memory;

diff --git a/trunk/arch/x86_64/mm/fault.c b/trunk/arch/x86_64/mm/fault.c
@@ -439,13 +439,13 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code)
 	 * the fault.
 	 */
 	switch (handle_mm_fault(mm, vma, address, write)) {
-	case VM_FAULT_MINOR:
+	case 1:
 		tsk->min_flt++;
 		break;
-	case VM_FAULT_MAJOR:
+	case 2:
 		tsk->maj_flt++;
 		break;
-	case VM_FAULT_SIGBUS:
+	case 0:
 		goto do_sigbus;
 	default:
 		goto out_of_memory;

diff --git a/trunk/drivers/acpi/dispatcher/dswload.c b/trunk/drivers/acpi/dispatcher/dswload.c
@@ -491,6 +491,12 @@ acpi_ds_load2_begin_op (
 		if ((!(walk_state->op_info->flags & AML_NSOPCODE) &&
 			  (walk_state->opcode != AML_INT_NAMEPATH_OP)) ||
 			(!(walk_state->op_info->flags & AML_NAMED))) {
+			if ((walk_state->op_info->class == AML_CLASS_EXECUTE) ||
+				(walk_state->op_info->class == AML_CLASS_CONTROL)) {
+				ACPI_REPORT_WARNING ((
+					"Encountered executable code at module level, [%s]\n",
+					acpi_ps_get_opcode_name (walk_state->opcode)));
+			}
 			return_ACPI_STATUS (AE_OK);
 		}
 

diff --git a/trunk/drivers/acpi/osl.c b/trunk/drivers/acpi/osl.c
@@ -145,14 +145,10 @@ acpi_os_vprintf(const char *fmt, va_list args)
 #endif
 }
 
-extern int acpi_in_resume;
 void *
 acpi_os_allocate(acpi_size size)
 {
-	if (acpi_in_resume)
-		return kmalloc(size, GFP_ATOMIC);
-	else
-		return kmalloc(size, GFP_KERNEL);
+	return kmalloc(size, GFP_KERNEL);
 }
 
 void

diff --git a/trunk/drivers/acpi/pci_link.c b/trunk/drivers/acpi/pci_link.c
@@ -798,11 +798,6 @@ acpi_pci_link_resume(
 		return_VALUE(0);
 }
 
-/*
- * FIXME: this is a workaround to avoid nasty warning.  It will be removed
- * after every device calls pci_disable_device in .resume.
- */
-int acpi_in_resume;
 static int
 irqrouter_resume(
 	struct sys_device *dev)
@@ -812,7 +807,6 @@ irqrouter_resume(
 
 	ACPI_FUNCTION_TRACE("irqrouter_resume");
 
-	acpi_in_resume = 1;
 	list_for_each(node, &acpi_link.entries) {
 		link = list_entry(node, struct acpi_pci_link, node);
 		if (!link) {
@@ -822,7 +816,6 @@ irqrouter_resume(
 		}
 		acpi_pci_link_resume(link);
 	}
-	acpi_in_resume = 0;
 	return_VALUE(0);
 }
 

diff --git a/trunk/drivers/ide/ide-probe.c b/trunk/drivers/ide/ide-probe.c
@@ -960,15 +960,6 @@ static void save_match(ide_hwif_t *hwif, ide_hwif_t *new, ide_hwif_t **match)
 }
 #endif /* MAX_HWIFS > 1 */
 
-static inline int hwif_to_node(ide_hwif_t *hwif)
-{
-	if (hwif->pci_dev)
-		return pcibus_to_node(hwif->pci_dev->bus);
-	else
-		/* Add ways to determine the node of other busses here */
-		return -1;
-}
-
 /*
  * init request queue
  */
@@ -987,7 +978,8 @@ static int ide_init_queue(ide_drive_t *drive)
 	 *	do not.
 	 */
 
-	q = blk_init_queue_node(do_ide_request, &ide_lock, hwif_to_node(hwif));
+	q = blk_init_queue_node(do_ide_request, &ide_lock,
+				pcibus_to_node(drive->hwif->pci_dev->bus));
 	if (!q)
 		return 1;
 
@@ -1056,8 +1048,6 @@ static int init_irq (ide_hwif_t *hwif)
 
 	BUG_ON(in_interrupt());
 	BUG_ON(irqs_disabled());	
-	BUG_ON(hwif == NULL);
-
 	down(&ide_cfg_sem);
 	hwif->hwgroup = NULL;
 #if MAX_HWIFS > 1
@@ -1107,7 +1097,7 @@ static int init_irq (ide_hwif_t *hwif)
 		spin_unlock_irq(&ide_lock);
 	} else {
 		hwgroup = kmalloc_node(sizeof(ide_hwgroup_t), GFP_KERNEL,
-					hwif_to_node(hwif->drives[0].hwif));
+			pcibus_to_node(hwif->drives[0].hwif->pci_dev->bus));
 		if (!hwgroup)
 	       		goto out_up;
 

diff --git a/trunk/drivers/infiniband/include/ib_cm.h b/trunk/drivers/infiniband/include/ib_cm.h
@@ -169,8 +169,7 @@ enum ib_cm_rej_reason {
 	IB_CM_REJ_INVALID_ALT_TRAFFIC_CLASS	= __constant_htons(21),
 	IB_CM_REJ_INVALID_ALT_HOP_LIMIT		= __constant_htons(22),
 	IB_CM_REJ_INVALID_ALT_PACKET_RATE	= __constant_htons(23),
-	IB_CM_REJ_PORT_CM_REDIRECT		= __constant_htons(24),
-	IB_CM_REJ_PORT_REDIRECT			= __constant_htons(25),
+	IB_CM_REJ_PORT_REDIRECT			= __constant_htons(24),
 	IB_CM_REJ_INVALID_MTU			= __constant_htons(26),
 	IB_CM_REJ_INSUFFICIENT_RESP_RESOURCES	= __constant_htons(27),
 	IB_CM_REJ_CONSUMER_DEFINED		= __constant_htons(28),