new kernel diff

550 lines not on this page · raw message

diff -urN linux-davidm/arch/ia64/dig/setup.c linux-2.3.51-lia/arch/ia64/dig/setup.c
@@ -47,17 +47,11 @@
 	unsigned int orig_x, orig_y, num_cols, num_rows, font_height;
 
 	/*
-	 * This assumes that the EFI partition is physical disk 1
-	 * partition 1 and the Linux root disk is physical disk 1
-	 * partition 2.
+	 * Default to /dev/sda2.  This assumes that the EFI partition
+	 * is physical disk 1 partition 1 and the Linux root disk is
+	 * physical disk 1 partition 2.
 	 */
-#ifdef CONFIG_IA64_LION_HACKS
-	/* default to /dev/sda2 on Lion... */
 	ROOT_DEV = to_kdev_t(0x0802);		/* default to second partition on first drive */
-#else
-	/* default to /dev/dha2 on BigSur... */
-	ROOT_DEV = to_kdev_t(0x0302);		/* default to second partition on first drive */
-#endif
 
 #ifdef CONFIG_SMP
 	init_smp_config();

diff -urN linux-davidm/arch/ia64/kernel/acpi.c linux-2.3.51-lia/arch/ia64/kernel/acpi.c
@@ -27,13 +27,12 @@
 #undef ACPI_DEBUG		/* Guess what this does? */
 
 #ifdef CONFIG_SMP
-extern unsigned long ipi_base_addr;
+extern struct smp_boot_data smp;
 #endif
 
 /* These are ugly but will be reclaimed by the kernel */
-int __initdata acpi_cpus = 0;	
-int __initdata acpi_apic_map[32];
-int __initdata cpu_cnt = 0;
+int __initdata available_cpus = 0;	
+int __initdata total_cpus = 0;
 
 void (*pm_idle) (void);
 

@@ -50,7 +49,7 @@
 	if ((lsapic->flags & LSAPIC_PRESENT) = 0) 
 		return;
 
-	printk("      CPU %d (%.04x:%.04x): ", cpu_cnt, lsapic->eid, lsapic->id);
+	printk("      CPU %d (%.04x:%.04x): ", total_cpus, lsapic->eid, lsapic->id);
 
 	if ((lsapic->flags & LSAPIC_ENABLED) = 0) {
 		printk("Disabled.\n");

@@ -62,11 +61,17 @@
 	
 	if (add) {
 		printk("Available.\n");
-		acpi_cpus++;
-		acpi_apic_map[cpu_cnt] = (lsapic->id << 8) | lsapic->eid;
+		available_cpus++;
+#ifdef CONFIG_SMP
+# if LARGE_CPU_ID_OK
+		smp.cpu_map[total_cpus] = (lsapic->id << 8) | lsapic->eid;
+# else
+		smp.cpu_map[total_cpus] = lsapic->id;
+# endif
+#endif
 	}
 	
-	cpu_cnt++;
+	total_cpus++;
 }
 
 /*

@@ -204,11 +209,11 @@
 {
 	char *p, *end;
 
-	memset(&acpi_apic_map, -1, sizeof(acpi_apic_map));
-
-#ifdef CONFIG_SMP
 	/* Base address of IPI Message Block */
 	ipi_base_addr = (unsigned long) ioremap(msapic->interrupt_block, 0);
+
+#ifdef CONFIG_SMP
+	memset(&smp, -1, sizeof(smp));
 #endif
 	
 	p = (char *) (msapic + 1);

@@ -253,7 +258,7 @@
 	}
 
 	/* Make bootup pretty */
-	printk("      %d CPUs available, %d CPUs total\n", acpi_cpus, cpu_cnt);
+	printk("      %d CPUs available, %d CPUs total\n", available_cpus, total_cpus);
 }
 
 int __init 

@@ -292,12 +297,15 @@
 			continue;
 
 		acpi_parse_msapic((acpi_sapic_t *) hdrp);
-	} /* while() */
+	}
 
-	if (acpi_cpus = 0) {
+#ifdef CONFIG_SMP
+	if (available_cpus = 0) {
 		printk("ACPI: Found 0 CPUS; assuming 1\n");
-		acpi_cpus = 1; /* We've got at least one of these, no? */
+		available_cpus = 1; /* We've got at least one of these, no? */
 	}
+	smp.cpu_count = available_cpus;
+#endif
 	return 1;
 }
 

diff -urN linux-davidm/arch/ia64/kernel/irq.c linux-2.3.51-lia/arch/ia64/kernel/irq.c
@@ -582,9 +582,7 @@
 	if (!(status & (IRQ_DISABLED | IRQ_INPROGRESS))) {
 		action = desc->action;
 		status &= ~IRQ_PENDING; /* we commit to handling */
-#ifdef CONFIG_SMP
 		status |= IRQ_INPROGRESS; /* we are handling it */
-#endif
 	}
 	desc->status = status;
 

@@ -616,9 +614,7 @@
 			break;
 		desc->status &= ~IRQ_PENDING;
 	}
-#ifdef CONFIG_SMP
 	desc->status &= ~IRQ_INPROGRESS;
-#endif
 out:
 	/*
 	 * The ->end() handler has to deal with interrupts which got

@@ -732,7 +728,6 @@
 	unsigned long val;
 	unsigned long delay;
 
-printk("probe_irq_on\n");
 	/* 
 	 * something may have generated an irq long ago and we want to
 	 * flush such a longstanding irq before considering it as spurious. 

@@ -860,7 +855,6 @@
 
 	if (nr_irqs > 1)
 		irq_found = -irq_found;
-printk("probe_irq_off=%d\n", irq_found);
 	return irq_found;
 }
 

@@ -872,7 +866,6 @@
 	struct irqaction *old, **p;
 	irq_desc_t *desc = irq_desc + irq;
 
-printk("setup_irq(irq=%u,type=%s)\n", irq, desc->handler->typename);
 	/*
 	 * Some drivers like serial.c use request_irq() heavily,
 	 * so we have to be careful not to interfere with a

75 lines not on this page · raw message

345 lines not on this page · raw message