- acpi-dont-load-acpi_cpufreq-if-acpi=off.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     acpi: don't load acpi_cpufreq if acpi=off
has been removed from the -mm tree.  Its filename was
     acpi-dont-load-acpi_cpufreq-if-acpi=off.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: acpi: don't load acpi_cpufreq if acpi=off
From: Yinghai Lu <yhlu.kernel@xxxxxxxxx>

Signed-off-by: Yinghai Lu <yhlu.kernel@xxxxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c |    3 +++
 1 file changed, 3 insertions(+)

diff -puN arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c~acpi-dont-load-acpi_cpufreq-if-acpi=off arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
--- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c~acpi-dont-load-acpi_cpufreq-if-acpi=off
+++ a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -780,6 +780,9 @@ static int __init acpi_cpufreq_init(void
 {
 	int ret;
 
+	if (acpi_disabled)
+		return 0;
+
 	dprintk("acpi_cpufreq_init\n");
 
 	ret = acpi_cpufreq_early_init();
_

Patches currently in -mm which might be from yhlu.kernel@xxxxxxxxx are

origin.patch
git-acpi.patch
mm-print-out-meminit-for-memmap.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux