linux-kernel - Re: linux-next: manual merge of the cpufreq tree with the acpi tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <200911120615.38067.trenn@suse.de>
Date:	Thu, 12 Nov 2009 06:15:37 -0600
From:	Thomas Renninger <trenn@...e.de>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Dave Jones <davej@...hat.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Zhao Yakui <yakui.zhao@...el.com>,
	Len Brown <lenb@...nel.org>
Subject: Re: linux-next: manual merge of the cpufreq tree with the acpi tree

On Wednesday 11 November 2009 08:45:24 pm Stephen Rothwell wrote:
> Hi Dave,
>
> Today's linux-next merge of the cpufreq tree got a conflict in
> include/acpi/processor.h between commit
> d81c45e1c9369855901420f79114852eba2ea16a ("ACPI: Notify the _PPC
> evaluation status to the platform") from the acpi tree and commit
> b02d803d0fa3a395ba32bc5e5e3e7a3385ca7237 ("[CPUFREQ] Introduce bios_limit
> per cpu cpufreq sysfs interface") from the cpufreq tree.
First, thanks everybody for picking this up.

> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.
>
> By the way, Dave, Thomas, shouldn't the second version of
> acpi_processor_get_bios_limit() in include/acpi/processor.h introduced by
> the above cpufreq tree patch be "static inline"?
Yes, good catch.
Shall I send an on top fix somewhere?

   Thomas

@@ -295,6 +295,7 @@ static inline void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx
 void acpi_processor_ppc_init(void);
 void acpi_processor_ppc_exit(void);
 int acpi_processor_ppc_has_changed(struct acpi_processor *pr);
+extern int acpi_processor_get_bios_limit(int cpu, unsigned int *limit);
 #else
 static inline void acpi_processor_ppc_init(void)
 {
@@ -316,6 +317,11 @@ static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr)
 	}
 	return 0;
 }
+int acpi_processor_get_bios_limit(int cpu, unsigned int *limit)
+{
+	return -ENODEV;
+}
+
 #endif				/* CONFIG_CPU_FREQ */
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/