[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20090215193655.GA18674@elte.hu>
Date: Sun, 15 Feb 2009 20:36:55 +0100
From: Ingo Molnar <mingo@...e.hu>
To: Jeremy Fitzhardinge <jeremy@...p.org>,
Yinghai Lu <yinghai@...nel.org>
Cc: "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: state of some x86 acpi patches
* Ingo Molnar <mingo@...e.hu> wrote:
>
> * Jeremy Fitzhardinge <jeremy@...p.org> wrote:
>
> > Yinghai Lu wrote:
> >> Ingo is too busy...
> >> It seems Len already agreed those patches can go through tip.
> >>
> >
> > OK, I have them prepared as a branch off tip/git pullable from:
> >
> > The following changes since commit 82eda818f26cbef2b0a6bf6580e52645af62e4fd:
> > Ingo Molnar (1):
> > Merge branch 'core/locking'
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git acpi/map
> >
> > Jeremy Fitzhardinge (3):
> > x86: use early_ioremap in __acpi_map_table
> > x86: always explicitly map acpi memory
> > acpi: remove final __acpi_map_table mapping before setting acpi_gbl_permanent_mmap
> >
> > Yinghai Lu (2):
> > acpi/x86: introduce __apci_map_table, v4
> > revert_fix_es7000_compiling
> >
> > arch/ia64/kernel/acpi.c | 4 ++++
> > arch/x86/include/asm/acpi.h | 3 ---
> > arch/x86/include/asm/fixmap_32.h | 4 ----
> > arch/x86/include/asm/fixmap_64.h | 4 ----
> > arch/x86/kernel/acpi/boot.c | 33 ++++++++-------------------------
> > arch/x86/kernel/es7000_32.c | 9 ++++++++-
> > drivers/acpi/acpica/tbxface.c | 17 ++++++++++++++---
> > drivers/acpi/osl.c | 11 +++++++++--
> > drivers/acpi/tables.c | 20 ++++++++++++++------
> > include/acpi/acpiosxf.h | 1 +
> > include/acpi/acpixf.h | 4 ++++
> > include/linux/acpi.h | 1 +
> > 12 files changed, 63 insertions(+), 48 deletions(-)
>
> Ok, pulled into tip:x86/acpi, thanks guys!
Note, there's a new ia64 build failure due to these patches:
/home/mingo/tip/arch/ia64/kernel/acpi.c:203: error: conflicting types for '__acpi_unmap_table'
/home/mingo/tip/include/linux/acpi.h:82: error: previous declaration of '__acpi_unmap_table' was here
/home/mingo/tip/arch/ia64/kernel/acpi.c:203: error: conflicting types for '__acpi_unmap_table'
/home/mingo/tip/include/linux/acpi.h:82: error: previous declaration of '__acpi_unmap_table' was here
make[2]: *** [arch/ia64/kernel/acpi.o] Error 1
make[2]: *** Waiting for unfinished jobs....
/home/mingo/tip/arch/ia64/kernel/ivt.S: Assembler messages:
Ingo
--
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/
Powered by blists - more mailing lists