lkml.org 
[lkml]   [2009]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: state of some x86 acpi patches

    * Yinghai Lu <yinghai@kernel.org> wrote:

    > Ingo Molnar wrote:
    > > * Ingo Molnar <mingo@elte.hu> wrote:
    > >
    > >> * Jeremy Fitzhardinge <jeremy@goop.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:
    >
    > please check
    >
    > [PATCH] ia64: fix __apci_unmap_table
    >
    > Impact: fix wrong proto with compiling
    >
    > to fix:
    > /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
    >
    > Signed-off-by: Yinghai Lu <yinghai@kenrel.org>

    Applied to tip:x86/acpi, thanks Yinghai!

    [ And fixed the typo in your signoff line ;-) Git has an auto-signoff
    feature which you might want to use: "git commit -s". ]

    Ingo


    \
     
     \ /
      Last update: 2009-02-18 12:23    [W:0.031 / U:0.204 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site