Merge branch 'ht-delete-2.6.35' into release

Len Brown
2 parents edbe77ba94 68ca406930
Showing 6 changed files Side-by-side Diff
Documentation/kernel-parameters.txt
arch/ia64/include/asm/acpi.h
arch/x86/include/asm/acpi.h
arch/x86/kernel/acpi/boot.c
arch/x86/lguest/boot.c
drivers/acpi/tables.c
@@ -143,11 +143,10 @@
  
 	acpi=		[HW,ACPI,X86]
 			Advanced Configuration and Power Interface
-			Format: { force | off | ht | strict | noirq | rsdt }
+			Format: { force | off | strict | noirq | rsdt }
 			force -- enable ACPI if default was off
 			off -- disable ACPI if default was on
 			noirq -- do not use ACPI for IRQ routing
-			ht -- run only enough ACPI to enable Hyper Threading
 			strict -- Be less tolerant of platforms that are not
 				strictly ACPI specification compliant.
 			rsdt -- prefer RSDT over (default) XSDT
@@ -94,7 +94,6 @@
 #define acpi_noirq 0	/* ACPI always enabled on IA64 */
 #define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */
 #define acpi_strict 1	/* no ACPI spec workarounds on IA64 */
-#define acpi_ht 0	/* no HT-only mode on IA64 */
 #endif
 #define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */
 static inline void disable_acpi(void) { }
@@ -85,7 +85,6 @@
 extern int acpi_noirq;
 extern int acpi_strict;
 extern int acpi_disabled;
-extern int acpi_ht;
 extern int acpi_pci_disabled;
 extern int acpi_skip_timer_override;
 extern int acpi_use_timer_override;
@@ -97,7 +96,6 @@
 static inline void disable_acpi(void)
 {
 	acpi_disabled = 1;
-	acpi_ht = 0;
 	acpi_pci_disabled = 1;
 	acpi_noirq = 1;
 }
@@ -63,7 +63,6 @@
 int acpi_noirq;				/* skip ACPI IRQ initialization */
 int acpi_pci_disabled;		/* skip ACPI PCI scan and IRQ initialization */
 EXPORT_SYMBOL(acpi_pci_disabled);
-int acpi_ht __initdata = 1;	/* enable HT */
  
 int acpi_lapic;
 int acpi_ioapic;
  
@@ -1464,9 +1463,8 @@
  
 	/*
 	 * If acpi_disabled, bail out
-	 * One exception: acpi=ht continues far enough to enumerate LAPICs
 	 */
-	if (acpi_disabled && !acpi_ht)
+	if (acpi_disabled)
 		return; 
  
 	/*
  
@@ -1497,9 +1495,8 @@
 {
 	/*
 	 * If acpi_disabled, bail out
-	 * One exception: acpi=ht continues far enough to enumerate LAPICs
 	 */
-	if (acpi_disabled && !acpi_ht)
+	if (acpi_disabled)
 		return 1;
  
 	/*
  
@@ -1517,9 +1514,8 @@
  
 	/*
 	 * If acpi_disabled, bail out
-	 * One exception: acpi=ht continues far enough to enumerate LAPICs
 	 */
-	if (acpi_disabled && !acpi_ht)
+	if (acpi_disabled)
 		return 1;
  
 	acpi_table_parse(ACPI_SIG_BOOT, acpi_parse_sbf);
  
@@ -1554,20 +1550,11 @@
 	/* acpi=force to over-ride black-list */
 	else if (strcmp(arg, "force") == 0) {
 		acpi_force = 1;
-		acpi_ht = 1;
 		acpi_disabled = 0;
 	}
 	/* acpi=strict disables out-of-spec workarounds */
 	else if (strcmp(arg, "strict") == 0) {
 		acpi_strict = 1;
-	}
-	/* Limit ACPI just to boot-time to enable HT */
-	else if (strcmp(arg, "ht") == 0) {
-		if (!acpi_force) {
-			printk(KERN_WARNING "acpi=ht will be removed in Linux-2.6.35\n");
-			disable_acpi();
-		}
-		acpi_ht = 1;
 	}
 	/* acpi=rsdt use RSDT instead of XSDT */
 	else if (strcmp(arg, "rsdt") == 0) {
@@ -1390,7 +1390,6 @@
 #endif
 #ifdef CONFIG_ACPI
 	acpi_disabled = 1;
-	acpi_ht = 0;
 #endif
  
 	/*
@@ -213,7 +213,7 @@
 	unsigned long table_end;
 	acpi_size tbl_size;
  
-	if (acpi_disabled && !acpi_ht)
+	if (acpi_disabled)
 		return -ENODEV;
  
 	if (!handler)
@@ -280,7 +280,7 @@
 	struct acpi_table_header *table = NULL;
 	acpi_size tbl_size;
  
-	if (acpi_disabled && !acpi_ht)
+	if (acpi_disabled)
 		return -ENODEV;
  
 	if (!handler)
...	...	@@ -143,11 +143,10 @@
143	143
144	144	acpi= [HW,ACPI,X86]
145	145	Advanced Configuration and Power Interface
146		- Format: { force \| off \| ht \| strict \| noirq \| rsdt }
	146	+ Format: { force \| off \| strict \| noirq \| rsdt }
147	147	force -- enable ACPI if default was off
148	148	off -- disable ACPI if default was on
149	149	noirq -- do not use ACPI for IRQ routing
150		- ht -- run only enough ACPI to enable Hyper Threading
151	150	strict -- Be less tolerant of platforms that are not
152	151	strictly ACPI specification compliant.
153	152	rsdt -- prefer RSDT over (default) XSDT
...	...	@@ -94,7 +94,6 @@
94	94	#define acpi_noirq 0 /* ACPI always enabled on IA64 */
95	95	#define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */
96	96	#define acpi_strict 1 /* no ACPI spec workarounds on IA64 */
97		-#define acpi_ht 0 /* no HT-only mode on IA64 */
98	97	#endif
99	98	#define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */
100	99	static inline void disable_acpi(void) { }
...	...	@@ -85,7 +85,6 @@
85	85	extern int acpi_noirq;
86	86	extern int acpi_strict;
87	87	extern int acpi_disabled;
88		-extern int acpi_ht;
89	88	extern int acpi_pci_disabled;
90	89	extern int acpi_skip_timer_override;
91	90	extern int acpi_use_timer_override;
...	...	@@ -97,7 +96,6 @@
97	96	static inline void disable_acpi(void)
98	97	{
99	98	acpi_disabled = 1;
100		- acpi_ht = 0;
101	99	acpi_pci_disabled = 1;
102	100	acpi_noirq = 1;
103	101	}
...	...	@@ -63,7 +63,6 @@
63	63	int acpi_noirq; /* skip ACPI IRQ initialization */
64	64	int acpi_pci_disabled; /* skip ACPI PCI scan and IRQ initialization */
65	65	EXPORT_SYMBOL(acpi_pci_disabled);
66		-int acpi_ht __initdata = 1; /* enable HT */
67	66
68	67	int acpi_lapic;
69	68	int acpi_ioapic;
70	69
...	...	@@ -1464,9 +1463,8 @@
1464	1463
1465	1464	/*
1466	1465	* If acpi_disabled, bail out
1467		- * One exception: acpi=ht continues far enough to enumerate LAPICs
1468	1466	*/
1469		- if (acpi_disabled && !acpi_ht)
	1467	+ if (acpi_disabled)
1470	1468	return;
1471	1469
1472	1470	/*
1473	1471
...	...	@@ -1497,9 +1495,8 @@
1497	1495	{
1498	1496	/*
1499	1497	* If acpi_disabled, bail out
1500		- * One exception: acpi=ht continues far enough to enumerate LAPICs
1501	1498	*/
1502		- if (acpi_disabled && !acpi_ht)
	1499	+ if (acpi_disabled)
1503	1500	return 1;
1504	1501
1505	1502	/*
1506	1503
...	...	@@ -1517,9 +1514,8 @@
1517	1514
1518	1515	/*
1519	1516	* If acpi_disabled, bail out
1520		- * One exception: acpi=ht continues far enough to enumerate LAPICs
1521	1517	*/
1522		- if (acpi_disabled && !acpi_ht)
	1518	+ if (acpi_disabled)
1523	1519	return 1;
1524	1520
1525	1521	acpi_table_parse(ACPI_SIG_BOOT, acpi_parse_sbf);
1526	1522
...	...	@@ -1554,20 +1550,11 @@
1554	1550	/* acpi=force to over-ride black-list */
1555	1551	else if (strcmp(arg, "force") == 0) {
1556	1552	acpi_force = 1;
1557		- acpi_ht = 1;
1558	1553	acpi_disabled = 0;
1559	1554	}
1560	1555	/* acpi=strict disables out-of-spec workarounds */
1561	1556	else if (strcmp(arg, "strict") == 0) {
1562	1557	acpi_strict = 1;
1563		- }
1564		- /* Limit ACPI just to boot-time to enable HT */
1565		- else if (strcmp(arg, "ht") == 0) {
1566		- if (!acpi_force) {
1567		- printk(KERN_WARNING "acpi=ht will be removed in Linux-2.6.35\n");
1568		- disable_acpi();
1569		- }
1570		- acpi_ht = 1;
1571	1558	}
1572	1559	/* acpi=rsdt use RSDT instead of XSDT */
1573	1560	else if (strcmp(arg, "rsdt") == 0) {
...	...	@@ -1390,7 +1390,6 @@
1390	1390	#endif
1391	1391	#ifdef CONFIG_ACPI
1392	1392	acpi_disabled = 1;
1393		- acpi_ht = 0;
1394	1393	#endif
1395	1394
1396	1395	/*
...	...	@@ -213,7 +213,7 @@
213	213	unsigned long table_end;
214	214	acpi_size tbl_size;
215	215
216		- if (acpi_disabled && !acpi_ht)
	216	+ if (acpi_disabled)
217	217	return -ENODEV;
218	218
219	219	if (!handler)
...	...	@@ -280,7 +280,7 @@
280	280	struct acpi_table_header *table = NULL;
281	281	acpi_size tbl_size;
282	282
283		- if (acpi_disabled && !acpi_ht)
	283	+ if (acpi_disabled)
284	284	return -ENODEV;
285	285
286	286	if (!handler)