---

yaml
---
r: 14883
b: refs/heads/master
c: d9e2d18
h: refs/heads/master
i:
  14881: 09ddf52
  14879: ee0652a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31b3c31bca3b4df975631323d6ee6f49f43f4956
+refs/heads/master: d9e2d185bf01e20339158f77c3fca00b02014912

trunk/MAINTAINERS

@@ -536,7 +536,6 @@ P:	Mauro Carvalho Chehab
 M:	mchehab@brturbo.com.br
 L:	video4linux-list@redhat.com
 W:	http://linuxtv.org
-T:	quilt http://www.linuxtv.org/download/quilt/
 S:	Maintained
 
 BUSLOGIC SCSI DRIVER
@@ -834,7 +833,6 @@ P:	LinuxTV.org Project
 M: 	linux-dvb-maintainer@linuxtv.org
 L: 	linux-dvb@linuxtv.org (subscription required)
 W:	http://linuxtv.org/
-T:	quilt http://www.linuxtv.org/download/quilt/
 S:	Supported
 
 EATA-DMA SCSI DRIVER
@@ -2887,7 +2885,6 @@ P:	Mauro Carvalho Chehab
 M:	mchehab@brturbo.com.br
 L:	video4linux-list@redhat.com
 W:	http://linuxtv.org
-T:	quilt http://www.linuxtv.org/download/quilt/
 S:	Maintained
 
 W1 DALLAS'S 1-WIRE BUS

trunk/Makefile

@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 15
-EXTRAVERSION =-rc4
+EXTRAVERSION =-rc3
 NAME=Affluent Albatross
 
 # *DOCUMENTATION*

trunk/arch/i386/kernel/acpi/boot.c

@@ -638,13 +638,6 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
 			return 0;
 
 		pmtmr_ioport = fadt->xpm_tmr_blk.address;
-		/*
-		 * "X" fields are optional extensions to the original V1.0
-		 * fields, so we must selectively expand V1.0 fields if the
-		 * corresponding X field is zero.
-	 	 */
-		if (!pmtmr_ioport)
-			pmtmr_ioport = fadt->V1_pm_tmr_blk;
 	} else {
 		/* FADT rev. 1 */
 		pmtmr_ioport = fadt->V1_pm_tmr_blk;

trunk/arch/ppc/boot/simple/Makefile

@@ -262,11 +262,11 @@ $(images)/zImage.initrd-STRIPELF: $(obj)/zvmlinux.initrd
 		skip=64 bs=1k
 
 $(images)/zImage-TREE: $(obj)/zvmlinux $(MKTREE)
-	$(MKTREE) $(obj)/zvmlinux $(images)/zImage.$(end-y) $(entrypoint-y)
+	$(MKTREE) $(obj)/zvmlinux $(images)/zImage.$(end-y) $(ENTRYPOINT)
 
 $(images)/zImage.initrd-TREE: $(obj)/zvmlinux.initrd $(MKTREE)
 	$(MKTREE) $(obj)/zvmlinux.initrd $(images)/zImage.initrd.$(end-y) \
-		$(entrypoint-y)
+		$(ENTRYPOINT)
 
 $(images)/zImage-PPLUS: $(obj)/zvmlinux $(MKPREP) $(MKBUGBOOT)
 	$(MKPREP) -pbp $(obj)/zvmlinux $(images)/zImage.$(end-y)

trunk/arch/ppc/syslib/m82xx_pci.c

@@ -248,8 +248,7 @@ pq2ads_setup_pci(struct pci_controller *hose)
 	pci_div = ( (sccr & SCCR_PCI_MODCK) ? 2 : 1) *
 			( ( (sccr & SCCR_PCIDF_MSK) >> SCCR_PCIDF_SHIFT) + 1);
 	freq = (uint)((2*binfo->bi_cpmfreq)/(pci_div));
-	time = (int)66666666/freq;
-
+	time = (int)666666/freq;
 	/* due to PCI Local Bus spec, some devices needs to wait such a long
 	time after RST 	deassertion. More specifically, 0.508s for 66MHz & twice more for 33 */
 	printk("%s: The PCI bus is %d Mhz.\nWaiting %s after deasserting RST...\n",__FILE__,freq,

trunk/drivers/acpi/Kconfig

@@ -197,6 +197,7 @@ config ACPI_ASUS
 config ACPI_IBM
 	tristate "IBM ThinkPad Laptop Extras"
 	depends on X86
+	default y
 	---help---
 	  This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds
 	  support for Fn-Fx key combinations, Bluetooth control, video

trunk/drivers/acpi/Makefile

@@ -16,7 +16,7 @@ EXTRA_CFLAGS	+= $(ACPI_CFLAGS)
 # ACPI Boot-Time Table Parsing
 #
 obj-y				+= tables.o
-obj-$(CONFIG_X86)		+= blacklist.o
+obj-y				+= blacklist.o
 
 #
 # ACPI Core Subsystem (Interpreter)

trunk/drivers/acpi/processor_core.c

@@ -543,8 +543,6 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
 	return_VALUE(0);
 }
 
-static void *processor_device_array[NR_CPUS];
-
 static int acpi_processor_start(struct acpi_device *device)
 {
 	int result = 0;
@@ -563,19 +561,6 @@ static int acpi_processor_start(struct acpi_device *device)
 
 	BUG_ON((pr->id >= NR_CPUS) || (pr->id < 0));
 
-	/*
-	 * Buggy BIOS check
-	 * ACPI id of processors can be reported wrongly by the BIOS.
-	 * Don't trust it blindly
-	 */
-	if (processor_device_array[pr->id] != NULL &&
-	    processor_device_array[pr->id] != (void *)device) {
-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "BIOS reporting wrong ACPI id"
-			"for the processor\n"));
-		return_VALUE(-ENODEV);
-	}
-	processor_device_array[pr->id] = (void *)device;
-
 	processors[pr->id] = pr;
 
 	result = acpi_processor_add_fs(device);

trunk/drivers/acpi/processor_idle.c

@@ -280,16 +280,6 @@ static void acpi_processor_idle(void)
 
 	cx->usage++;
 
-#ifdef CONFIG_HOTPLUG_CPU
-	/*
-	 * Check for P_LVL2_UP flag before entering C2 and above on
-	 * an SMP system. We do it here instead of doing it at _CST/P_LVL
-	 * detection phase, to work cleanly with logical CPU hotplug.
-	 */
-	if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) && 
-	    !pr->flags.has_cst && acpi_fadt.plvl2_up)
-		cx->type = ACPI_STATE_C1;
-#endif
 	/*
 	 * Sleep:
 	 * ------
@@ -544,15 +534,6 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
 	pr->power.states[ACPI_STATE_C0].valid = 1;
 	pr->power.states[ACPI_STATE_C1].valid = 1;
 
-#ifndef CONFIG_HOTPLUG_CPU
-	/*
-	 * Check for P_LVL2_UP flag before entering C2 and above on
-	 * an SMP system. 
-	 */
-	if ((num_online_cpus() > 1) && acpi_fadt.plvl2_up)
-		return_VALUE(-ENODEV);
-#endif
-
 	/* determine C2 and C3 address from pblk */
 	pr->power.states[ACPI_STATE_C2].address = pr->pblk + 4;
 	pr->power.states[ACPI_STATE_C3].address = pr->pblk + 5;
@@ -709,7 +690,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
 
 	/* Validate number of power states discovered */
 	if (pr->power.count < 2)
-		status = -EFAULT;
+		status = -ENODEV;
 
       end:
 	acpi_os_free(buffer.pointer);
@@ -860,11 +841,11 @@ static int acpi_processor_get_power_info(struct acpi_processor *pr)
 	 * this function */
 
 	result = acpi_processor_get_power_info_cst(pr);
-	if (result == -ENODEV)
+	if ((result) || (acpi_processor_power_verify(pr) < 2)) {
 		result = acpi_processor_get_power_info_fadt(pr);
-
-	if ((result) || (acpi_processor_power_verify(pr) < 2))
-		result = acpi_processor_get_power_info_default_c1(pr);
+		if ((result) || (acpi_processor_power_verify(pr) < 2))
+			result = acpi_processor_get_power_info_default_c1(pr);
+	}
 
 	/*
 	 * Set Default Policy

trunk/drivers/acpi/processor_thermal.c

@@ -101,7 +101,9 @@ static unsigned int acpi_thermal_cpufreq_is_init = 0;
 static int cpu_has_cpufreq(unsigned int cpu)
 {
 	struct cpufreq_policy policy;
-	if (!acpi_thermal_cpufreq_is_init || cpufreq_get_policy(&policy, cpu))
+	if (!acpi_thermal_cpufreq_is_init)
+		return -ENODEV;
+	if (!cpufreq_get_policy(&policy, cpu))
 		return -ENODEV;
 	return 0;
 }
@@ -125,13 +127,13 @@ static int acpi_thermal_cpufreq_decrease(unsigned int cpu)
 	if (!cpu_has_cpufreq(cpu))
 		return -ENODEV;
 
-	if (cpufreq_thermal_reduction_pctg[cpu] > 20)
+	if (cpufreq_thermal_reduction_pctg[cpu] >= 20) {
 		cpufreq_thermal_reduction_pctg[cpu] -= 20;
-	else
-		cpufreq_thermal_reduction_pctg[cpu] = 0;
-	cpufreq_update_policy(cpu);
-	/* We reached max freq again and can leave passive mode */
-	return !cpufreq_thermal_reduction_pctg[cpu];
+		cpufreq_update_policy(cpu);
+		return 0;
+	}
+
+	return -ERANGE;
 }
 
 static int acpi_thermal_cpufreq_notifier(struct notifier_block *nb,
@@ -198,7 +200,7 @@ int acpi_processor_set_thermal_limit(acpi_handle handle, int type)
 	int result = 0;
 	struct acpi_processor *pr = NULL;
 	struct acpi_device *device = NULL;
-	int tx = 0, max_tx_px = 0;
+	int tx = 0;
 
 	ACPI_FUNCTION_TRACE("acpi_processor_set_thermal_limit");
 
@@ -257,27 +259,19 @@ int acpi_processor_set_thermal_limit(acpi_handle handle, int type)
 		/* if going down: T-states first, P-states later */
 
 		if (pr->flags.throttling) {
-			if (tx == 0) {
-				max_tx_px = 1;
+			if (tx == 0)
 				ACPI_DEBUG_PRINT((ACPI_DB_INFO,
 						  "At minimum throttling state\n"));
-			} else {
+			else {
 				tx--;
 				goto end;
 			}
 		}
 
 		result = acpi_thermal_cpufreq_decrease(pr->id);
-		if (result) {
-			/*
-			 * We only could get -ERANGE, 1 or 0.
-			 * In the first two cases we reached max freq again.
-			 */
+		if (result == -ERANGE)
 			ACPI_DEBUG_PRINT((ACPI_DB_INFO,
 					  "At minimum performance state\n"));
-			max_tx_px = 1;
-		} else
-			max_tx_px = 0;
 
 		break;
 	}
@@ -296,10 +290,8 @@ int acpi_processor_set_thermal_limit(acpi_handle handle, int type)
 				  pr->limit.thermal.px, pr->limit.thermal.tx));
 	} else
 		result = 0;
-	if (max_tx_px)
-		return_VALUE(1);
-	else
-		return_VALUE(result);
+
+	return_VALUE(result);
 }
 
 int acpi_processor_get_limit_info(struct acpi_processor *pr)

trunk/drivers/acpi/scan.c

@@ -1110,7 +1110,7 @@ acpi_add_single_object(struct acpi_device **child,
 	 *
 	 * TBD: Assumes LDM provides driver hot-plug capability.
 	 */
-	acpi_bus_find_driver(device);
+	result = acpi_bus_find_driver(device);
 
       end:
 	if (!result)