* linux-next: manual merge of the cpufreq tree with the acpi tree
@ 2009-11-12 2:45 Stephen Rothwell
2009-11-12 12:15 ` Thomas Renninger
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2009-11-12 2:45 UTC (permalink / raw)
To: Dave Jones
Cc: linux-next, linux-kernel, Thomas Renninger, Zhao Yakui, Len Brown
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.
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"?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/acpi/processor.h
index a920237,e7454b3..0000000
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@@ -294,7 -294,8 +294,8 @@@ static inline void acpi_processor_ffh_c
#ifdef CONFIG_CPU_FREQ
void acpi_processor_ppc_init(void);
void acpi_processor_ppc_exit(void);
-int acpi_processor_ppc_has_changed(struct acpi_processor *pr);
+int acpi_processor_ppc_has_changed(struct acpi_processor *pr, int event_flag);
+ extern int acpi_processor_get_bios_limit(int cpu, unsigned int *limit);
#else
static inline void acpi_processor_ppc_init(void)
{
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the cpufreq tree with the acpi tree
2009-11-12 2:45 linux-next: manual merge of the cpufreq tree with the acpi tree Stephen Rothwell
@ 2009-11-12 12:15 ` Thomas Renninger
2009-11-12 17:13 ` Dave Jones
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Renninger @ 2009-11-12 12:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Jones, linux-next, linux-kernel, Zhao Yakui, Len Brown
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 */
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the cpufreq tree with the acpi tree
2009-11-12 12:15 ` Thomas Renninger
@ 2009-11-12 17:13 ` Dave Jones
0 siblings, 0 replies; 4+ messages in thread
From: Dave Jones @ 2009-11-12 17:13 UTC (permalink / raw)
To: Thomas Renninger
Cc: Stephen Rothwell, linux-next, linux-kernel, Zhao Yakui, Len Brown
On Thu, Nov 12, 2009 at 06:15:37AM -0600, Thomas Renninger wrote:
> > 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.
np, apologies for the delay.
> > 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?
Yeah, an incremental will be fine. I'll fold it into the original.
thanks,
Dave
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the cpufreq tree with the acpi tree
@ 2010-02-24 3:34 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2010-02-24 3:34 UTC (permalink / raw)
To: Dave Jones
Cc: linux-next, linux-kernel, Naga Chumbalkar, Alex Chiang, Len Brown
Hi Dave,
Today's linux-next merge of the cpufreq tree got a conflict in
drivers/acpi/processor_core.c between commit
5f45c35d7ede1c00cbaa3b09b8a84c425af81c4b ("ACPI: processor: mv
processor_core.c processor_driver.c") from the acpi tree and commit
0f1d683fb35d6c6f49ef696c95757f3970682a0e ("[CPUFREQ] Processor Clocking
Control interface driver") from the cpufreq tree.
I applied the equivalent patch to processor_driver.c (see below) and can
carry this as necessary.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 24 Feb 2010 14:29:12 +1100
Subject: [PATCH] cpufreq: merge fixup for processor_core.c rename
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/acpi/processor_driver.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 7e8e1ba..b5658cd 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -123,6 +123,8 @@ static const struct file_operations acpi_processor_info_fops = {
#endif
DEFINE_PER_CPU(struct acpi_processor *, processors);
+EXPORT_PER_CPU_SYMBOL(processors);
+
struct acpi_processor_errata errata __read_mostly;
/* --------------------------------------------------------------------------
--
1.7.0
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-02-24 3:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-12 2:45 linux-next: manual merge of the cpufreq tree with the acpi tree Stephen Rothwell
2009-11-12 12:15 ` Thomas Renninger
2009-11-12 17:13 ` Dave Jones
2010-02-24 3:34 Stephen Rothwell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.