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

rpms/kernel/FC-4 linux-2.6-acpi-backport.patch, NONE, 1.1 kernel-2.6.spec, 1.1400, 1.1401



Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv11821

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-acpi-backport.patch 
Log Message:
ACPI backport.


linux-2.6-acpi-backport.patch:
 Documentation/acpi-hotkey.txt                     |   35 
 arch/frv/mb93090-mb00/pci-irq.c                   |    2 
 arch/i386/kernel/acpi/Makefile                    |    4 
 arch/i386/kernel/acpi/cstate.c                    |  103 ++
 arch/i386/kernel/acpi/wakeup.S                    |    5 
 arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c |    2 
 arch/i386/pci/irq.c                               |   16 
 arch/i386/pci/visws.c                             |    2 
 arch/ia64/kernel/acpi.c                           |   54 +
 arch/ia64/kernel/mca.c                            |    2 
 arch/ia64/kernel/process.c                        |    1 
 arch/ia64/kernel/setup.c                          |    3 
 arch/ia64/kernel/topology.c                       |    7 
 drivers/acpi/Kconfig                              |   40 
 drivers/acpi/Makefile                             |    5 
 drivers/acpi/asus_acpi.c                          |    4 
 drivers/acpi/bus.c                                |    8 
 drivers/acpi/button.c                             |  245 ----
 drivers/acpi/dispatcher/dsfield.c                 |   58 -
 drivers/acpi/dispatcher/dsinit.c                  |   32 
 drivers/acpi/dispatcher/dsmethod.c                |   48 
 drivers/acpi/dispatcher/dsmthdat.c                |  198 ++-
 drivers/acpi/dispatcher/dsobject.c                |   82 +
 drivers/acpi/dispatcher/dsopcode.c                |  120 +-
 drivers/acpi/dispatcher/dsutils.c                 |   41 
 drivers/acpi/dispatcher/dswexec.c                 |   57 -
 drivers/acpi/dispatcher/dswload.c                 |  168 ++-
 drivers/acpi/dispatcher/dswscope.c                |   31 
 drivers/acpi/dispatcher/dswstate.c                |  462 ++++-----
 drivers/acpi/ec.c                                 |  420 +++++---
 drivers/acpi/events/evevent.c                     |   33 
 drivers/acpi/events/evgpe.c                       |   44 
 drivers/acpi/events/evgpeblk.c                    |  122 +-
 drivers/acpi/events/evmisc.c                      |  101 +-
 drivers/acpi/events/evregion.c                    |   35 
 drivers/acpi/events/evrgnini.c                    |   24 
 drivers/acpi/events/evsci.c                       |   12 
 drivers/acpi/events/evxface.c                     |   29 
 drivers/acpi/events/evxfevnt.c                    |   31 
 drivers/acpi/executer/exconfig.c                  |   60 -
 drivers/acpi/executer/exconvrt.c                  |   44 
 drivers/acpi/executer/excreate.c                  |   50 
 drivers/acpi/executer/exdump.c                    |  278 ++++-
 drivers/acpi/executer/exfield.c                   |   30 
 drivers/acpi/executer/exfldio.c                   |  133 +-
 drivers/acpi/executer/exmisc.c                    |    9 
 drivers/acpi/executer/exmutex.c                   |   45 
 drivers/acpi/executer/exnames.c                   |   77 +
 drivers/acpi/executer/exoparg1.c                  |  123 +-
 drivers/acpi/executer/exoparg2.c                  |   69 -
 drivers/acpi/executer/exoparg3.c                  |   84 +
 drivers/acpi/executer/exoparg6.c                  |   26 
 drivers/acpi/executer/exprep.c                    |  104 +-
 drivers/acpi/executer/exregion.c                  |   34 
 drivers/acpi/executer/exresnte.c                  |   24 
 drivers/acpi/executer/exresolv.c                  |   63 -
 drivers/acpi/executer/exresop.c                   |   96 +
 drivers/acpi/executer/exstore.c                   |  264 +++--
 drivers/acpi/executer/exstoren.c                  |   24 
 drivers/acpi/executer/exstorob.c                  |    9 
 drivers/acpi/executer/exsystem.c                  |   48 
 drivers/acpi/executer/exutils.c                   |   37 
 drivers/acpi/glue.c                               |  360 +++++++
 drivers/acpi/hardware/hwacpi.c                    |   19 
 drivers/acpi/hardware/hwgpe.c                     |   51 -
 drivers/acpi/hardware/hwregs.c                    |  116 +-
 drivers/acpi/hardware/hwsleep.c                   |  113 +-
 drivers/acpi/hardware/hwtimer.c                   |    4 
 drivers/acpi/hotkey.c                             | 1019 ++++++++++++++++++++
 drivers/acpi/ibm_acpi.c                           |    8 
 drivers/acpi/namespace/nsaccess.c                 |    9 
 drivers/acpi/namespace/nsalloc.c                  |  132 +-
 drivers/acpi/namespace/nsdump.c                   |  174 ++-
 drivers/acpi/namespace/nsdumpdv.c                 |   18 
 drivers/acpi/namespace/nseval.c                   |   70 -
 drivers/acpi/namespace/nsinit.c                   |   28 
 drivers/acpi/namespace/nsload.c                   |   28 
 drivers/acpi/namespace/nsnames.c                  |   12 
 drivers/acpi/namespace/nsobject.c                 |   14 
 drivers/acpi/namespace/nsparse.c                  |    4 
 drivers/acpi/namespace/nssearch.c                 |   29 
 drivers/acpi/namespace/nsutils.c                  |  167 +--
 drivers/acpi/namespace/nswalk.c                   |    2 
 drivers/acpi/namespace/nsxfeval.c                 |   16 
 drivers/acpi/namespace/nsxfname.c                 |    8 
 drivers/acpi/namespace/nsxfobj.c                  |    4 
 drivers/acpi/osl.c                                |  208 +++-
 drivers/acpi/parser/Makefile                      |    2 
 drivers/acpi/parser/psargs.c                      |   55 -
 drivers/acpi/parser/psloop.c                      |  782 +++++++++++++++
 drivers/acpi/parser/psopcode.c                    |  324 ------
 drivers/acpi/parser/psparse.c                     |  729 +-------------
 drivers/acpi/parser/psscope.c                     |   45 
 drivers/acpi/parser/pstree.c                      |  159 +--
 drivers/acpi/parser/psutils.c                     |   52 -
 drivers/acpi/parser/pswalk.c                      |   11 
 drivers/acpi/parser/psxface.c                     |   28 
 drivers/acpi/pci_link.c                           |   43 
 drivers/acpi/processor_core.c                     |   37 
 drivers/acpi/processor_idle.c                     |  138 +-
 drivers/acpi/processor_perflib.c                  |   33 
 drivers/acpi/resources/rsaddr.c                   |  480 ++++-----
 drivers/acpi/resources/rscalc.c                   |  144 +-
 drivers/acpi/resources/rscreate.c                 |   45 
 drivers/acpi/resources/rsdump.c                   |  402 ++++---
 drivers/acpi/resources/rsio.c                     |  197 +--
 drivers/acpi/resources/rsirq.c                    |  167 +--
 drivers/acpi/resources/rslist.c                   |   68 -
 drivers/acpi/resources/rsmemory.c                 |  236 +---
 drivers/acpi/resources/rsmisc.c                   |  160 +--
 drivers/acpi/resources/rsutils.c                  |   53 -
 drivers/acpi/resources/rsxface.c                  |   43 
 drivers/acpi/scan.c                               |   12 
 drivers/acpi/sleep/main.c                         |   74 -
 drivers/acpi/sleep/poweroff.c                     |   81 +
 drivers/acpi/sleep/proc.c                         |    9 
 drivers/acpi/tables/tbconvrt.c                    |  113 +-
 drivers/acpi/tables/tbget.c                       |   63 -
 drivers/acpi/tables/tbgetall.c                    |   45 
 drivers/acpi/tables/tbinstal.c                    |   39 
 drivers/acpi/tables/tbrsdt.c                      |   74 -
 drivers/acpi/tables/tbutils.c                     |   97 +
 drivers/acpi/tables/tbxface.c                     |   42 
 drivers/acpi/tables/tbxfroot.c                    |  231 ++--
 drivers/acpi/toshiba_acpi.c                       |    8 
 drivers/acpi/utilities/Makefile                   |    2 
 drivers/acpi/utilities/utalloc.c                  |  360 +++----
 drivers/acpi/utilities/utcache.c                  |  328 ++++++
 drivers/acpi/utilities/utcopy.c                   |  172 ++-
 drivers/acpi/utilities/utdebug.c                  |  265 ++---
 drivers/acpi/utilities/utdelete.c                 |  199 +--
 drivers/acpi/utilities/uteval.c                   |   36 
 drivers/acpi/utilities/utglobal.c                 |  231 +---
 drivers/acpi/utilities/utinit.c                   |   38 
 drivers/acpi/utilities/utmath.c                   |    2 
 drivers/acpi/utilities/utmisc.c                   | 1110 +++++-----------------
 drivers/acpi/utilities/utmutex.c                  |  380 +++++++
 drivers/acpi/utilities/utobject.c                 |  102 --
 drivers/acpi/utilities/utstate.c                  |  376 +++++++
 drivers/acpi/utilities/utxface.c                  |   84 -
 drivers/acpi/video.c                              |   15 
 drivers/base/sys.c                                |    1 
 drivers/net/b44.c                                 |    3 
 drivers/net/ne2k-pci.c                            |    3 
 drivers/pci/pci-acpi.c                            |  110 ++
 drivers/pci/pci.c                                 |   22 
 drivers/pci/pci.h                                 |    4 
 drivers/pcmcia/yenta_socket.c                     |    3 
 drivers/pnp/pnpacpi/rsparser.c                    |   15 
 drivers/pnp/pnpbios/rsparser.c                    |    2 
 drivers/pnp/resource.c                            |    2 
 drivers/usb/core/hcd-pci.c                        |    1 
 include/acpi/acconfig.h                           |   14 
 include/acpi/acdebug.h                            |  152 ---
 include/acpi/acdisasm.h                           |  117 --
 include/acpi/acdispat.h                           |  165 ---
 include/acpi/acevents.h                           |   86 -
 include/acpi/acexcep.h                            |   11 
 include/acpi/acglobal.h                           |   41 
 include/acpi/achware.h                            |   58 -
 include/acpi/acinterp.h                           |  243 +---
 include/acpi/aclocal.h                            |   92 -
 include/acpi/acmacros.h                           |  110 +-
 include/acpi/acnames.h                            |   84 +
 include/acpi/acnamesp.h                           |  165 ---
 include/acpi/acobject.h                           |    4 
 include/acpi/acopcode.h                           |  325 ++++++
 include/acpi/acoutput.h                           |    2 
 include/acpi/acparser.h                           |  128 +-
 include/acpi/acpi.h                               |    1 
 include/acpi/acpi_bus.h                           |   21 
 include/acpi/acpi_drivers.h                       |    5 
 include/acpi/acpiosxf.h                           |   53 -
 include/acpi/acpixf.h                             |   15 
 include/acpi/acresrc.h                            |   67 -
 include/acpi/acstruct.h                           |   13 
 include/acpi/actables.h                           |   70 -
 include/acpi/actbl.h                              |   60 -
 include/acpi/actbl1.h                             |   52 -
 include/acpi/actbl2.h                             |  109 +-
 include/acpi/actypes.h                            |   17 
 include/acpi/acutils.h                            |  359 ++-----
 include/acpi/amlcode.h                            |   14 
 include/acpi/pdc_intel.h                          |   29 
 include/acpi/platform/acenv.h                     |   39 
 include/acpi/platform/acgcc.h                     |    8 
 include/acpi/platform/aclinux.h                   |   11 
 include/acpi/processor.h                          |   34 
 include/asm-alpha/pci.h                           |    2 
 include/asm-arm/pci.h                             |    2 
 include/asm-h8300/pci.h                           |    2 
 include/asm-i386/acpi.h                           |   10 
 include/asm-i386/apicdef.h                        |    6 
 include/asm-i386/pci.h                            |    2 
 include/asm-ia64/acpi.h                           |    9 
 include/asm-ia64/pci.h                            |    2 
 include/asm-m68k/pci.h                            |    2 
 include/asm-mips/pci.h                            |    2 
 include/asm-ppc/pci.h                             |    2 
 include/asm-ppc64/pci.h                           |    2 
 include/asm-sh/pci.h                              |    2 
 include/asm-sh64/pci.h                            |    2 
 include/asm-sparc/pci.h                           |    2 
 include/asm-sparc64/pci.h                         |    2 
 include/asm-x86_64/acpi.h                         |    8 
 include/asm-x86_64/pci.h                          |    2 
 include/linux/acpi.h                              |    7 
 include/linux/device.h                            |    6 
 include/linux/pm.h                                |    2 
 kernel/power/main.c                               |   16 
 210 files changed, 11097 insertions(+), 7986 deletions(-)

--- NEW FILE linux-2.6-acpi-backport.patch ---
 Documentation/acpi-hotkey.txt                     |   35 
 arch/frv/mb93090-mb00/pci-irq.c                   |    2 
 arch/i386/kernel/acpi/Makefile                    |    4 
 arch/i386/kernel/acpi/cstate.c                    |  103 ++
 arch/i386/kernel/acpi/wakeup.S                    |    5 
 arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c |    2 
 arch/i386/pci/irq.c                               |   16 
 arch/i386/pci/visws.c                             |    2 
 arch/ia64/kernel/acpi.c                           |   54 +
 arch/ia64/kernel/mca.c                            |    2 
 arch/ia64/kernel/process.c                        |    1 
 arch/ia64/kernel/setup.c                          |    3 
 arch/ia64/kernel/topology.c                       |    7 
 drivers/acpi/Kconfig                              |   40 
 drivers/acpi/Makefile                             |    5 
 drivers/acpi/asus_acpi.c                          |    4 
 drivers/acpi/bus.c                                |    8 
 drivers/acpi/button.c                             |  245 ----
 drivers/acpi/dispatcher/dsfield.c                 |   58 -
 drivers/acpi/dispatcher/dsinit.c                  |   32 
 drivers/acpi/dispatcher/dsmethod.c                |   48 
 drivers/acpi/dispatcher/dsmthdat.c                |  198 ++-
 drivers/acpi/dispatcher/dsobject.c                |   82 +
 drivers/acpi/dispatcher/dsopcode.c                |  120 +-
 drivers/acpi/dispatcher/dsutils.c                 |   41 
 drivers/acpi/dispatcher/dswexec.c                 |   57 -
 drivers/acpi/dispatcher/dswload.c                 |  168 ++-
 drivers/acpi/dispatcher/dswscope.c                |   31 
 drivers/acpi/dispatcher/dswstate.c                |  462 ++++-----
 drivers/acpi/ec.c                                 |  420 +++++---
 drivers/acpi/events/evevent.c                     |   33 
 drivers/acpi/events/evgpe.c                       |   44 
 drivers/acpi/events/evgpeblk.c                    |  122 +-
 drivers/acpi/events/evmisc.c                      |  101 +-
 drivers/acpi/events/evregion.c                    |   35 
 drivers/acpi/events/evrgnini.c                    |   24 
 drivers/acpi/events/evsci.c                       |   12 
 drivers/acpi/events/evxface.c                     |   29 
 drivers/acpi/events/evxfevnt.c                    |   31 
 drivers/acpi/executer/exconfig.c                  |   60 -
 drivers/acpi/executer/exconvrt.c                  |   44 
 drivers/acpi/executer/excreate.c                  |   50 
 drivers/acpi/executer/exdump.c                    |  278 ++++-
 drivers/acpi/executer/exfield.c                   |   30 
 drivers/acpi/executer/exfldio.c                   |  133 +-
 drivers/acpi/executer/exmisc.c                    |    9 
 drivers/acpi/executer/exmutex.c                   |   45 
 drivers/acpi/executer/exnames.c                   |   77 +
 drivers/acpi/executer/exoparg1.c                  |  123 +-
 drivers/acpi/executer/exoparg2.c                  |   69 -
 drivers/acpi/executer/exoparg3.c                  |   84 +
 drivers/acpi/executer/exoparg6.c                  |   26 
 drivers/acpi/executer/exprep.c                    |  104 +-
 drivers/acpi/executer/exregion.c                  |   34 
 drivers/acpi/executer/exresnte.c                  |   24 
 drivers/acpi/executer/exresolv.c                  |   63 -
 drivers/acpi/executer/exresop.c                   |   96 +
 drivers/acpi/executer/exstore.c                   |  264 +++--
 drivers/acpi/executer/exstoren.c                  |   24 
 drivers/acpi/executer/exstorob.c                  |    9 
 drivers/acpi/executer/exsystem.c                  |   48 
 drivers/acpi/executer/exutils.c                   |   37 
 drivers/acpi/glue.c                               |  360 +++++++
 drivers/acpi/hardware/hwacpi.c                    |   19 
 drivers/acpi/hardware/hwgpe.c                     |   51 -
 drivers/acpi/hardware/hwregs.c                    |  116 +-
 drivers/acpi/hardware/hwsleep.c                   |  113 +-
 drivers/acpi/hardware/hwtimer.c                   |    4 
 drivers/acpi/hotkey.c                             | 1019 ++++++++++++++++++++
 drivers/acpi/ibm_acpi.c                           |    8 
 drivers/acpi/namespace/nsaccess.c                 |    9 
 drivers/acpi/namespace/nsalloc.c                  |  132 +-
 drivers/acpi/namespace/nsdump.c                   |  174 ++-
 drivers/acpi/namespace/nsdumpdv.c                 |   18 
 drivers/acpi/namespace/nseval.c                   |   70 -
 drivers/acpi/namespace/nsinit.c                   |   28 
 drivers/acpi/namespace/nsload.c                   |   28 
 drivers/acpi/namespace/nsnames.c                  |   12 
 drivers/acpi/namespace/nsobject.c                 |   14 
 drivers/acpi/namespace/nsparse.c                  |    4 
 drivers/acpi/namespace/nssearch.c                 |   29 
 drivers/acpi/namespace/nsutils.c                  |  167 +--
 drivers/acpi/namespace/nswalk.c                   |    2 
 drivers/acpi/namespace/nsxfeval.c                 |   16 
 drivers/acpi/namespace/nsxfname.c                 |    8 
 drivers/acpi/namespace/nsxfobj.c                  |    4 
 drivers/acpi/osl.c                                |  208 +++-
 drivers/acpi/parser/Makefile                      |    2 
 drivers/acpi/parser/psargs.c                      |   55 -
 drivers/acpi/parser/psloop.c                      |  782 +++++++++++++++
 drivers/acpi/parser/psopcode.c                    |  324 ------
 drivers/acpi/parser/psparse.c                     |  729 +-------------
 drivers/acpi/parser/psscope.c                     |   45 
 drivers/acpi/parser/pstree.c                      |  159 +--
 drivers/acpi/parser/psutils.c                     |   52 -
 drivers/acpi/parser/pswalk.c                      |   11 
 drivers/acpi/parser/psxface.c                     |   28 
 drivers/acpi/pci_link.c                           |   43 
 drivers/acpi/processor_core.c                     |   37 
 drivers/acpi/processor_idle.c                     |  138 +-
 drivers/acpi/processor_perflib.c                  |   33 
 drivers/acpi/resources/rsaddr.c                   |  480 ++++-----
 drivers/acpi/resources/rscalc.c                   |  144 +-
 drivers/acpi/resources/rscreate.c                 |   45 
 drivers/acpi/resources/rsdump.c                   |  402 ++++---
 drivers/acpi/resources/rsio.c                     |  197 +--
 drivers/acpi/resources/rsirq.c                    |  167 +--
 drivers/acpi/resources/rslist.c                   |   68 -
 drivers/acpi/resources/rsmemory.c                 |  236 +---
 drivers/acpi/resources/rsmisc.c                   |  160 +--
 drivers/acpi/resources/rsutils.c                  |   53 -
 drivers/acpi/resources/rsxface.c                  |   43 
 drivers/acpi/scan.c                               |   12 
 drivers/acpi/sleep/main.c                         |   74 -
 drivers/acpi/sleep/poweroff.c                     |   81 +
 drivers/acpi/sleep/proc.c                         |    9 
 drivers/acpi/tables/tbconvrt.c                    |  113 +-
 drivers/acpi/tables/tbget.c                       |   63 -
 drivers/acpi/tables/tbgetall.c                    |   45 
 drivers/acpi/tables/tbinstal.c                    |   39 
 drivers/acpi/tables/tbrsdt.c                      |   74 -
 drivers/acpi/tables/tbutils.c                     |   97 +
 drivers/acpi/tables/tbxface.c                     |   42 
 drivers/acpi/tables/tbxfroot.c                    |  231 ++--
 drivers/acpi/toshiba_acpi.c                       |    8 
 drivers/acpi/utilities/Makefile                   |    2 
 drivers/acpi/utilities/utalloc.c                  |  360 +++----
 drivers/acpi/utilities/utcache.c                  |  328 ++++++
 drivers/acpi/utilities/utcopy.c                   |  172 ++-
 drivers/acpi/utilities/utdebug.c                  |  265 ++---
 drivers/acpi/utilities/utdelete.c                 |  199 +--
 drivers/acpi/utilities/uteval.c                   |   36 
 drivers/acpi/utilities/utglobal.c                 |  231 +---
 drivers/acpi/utilities/utinit.c                   |   38 
 drivers/acpi/utilities/utmath.c                   |    2 
 drivers/acpi/utilities/utmisc.c                   | 1110 +++++-----------------
 drivers/acpi/utilities/utmutex.c                  |  380 +++++++
 drivers/acpi/utilities/utobject.c                 |  102 --
 drivers/acpi/utilities/utstate.c                  |  376 +++++++
 drivers/acpi/utilities/utxface.c                  |   84 -
 drivers/acpi/video.c                              |   15 
 drivers/base/sys.c                                |    1 
 drivers/net/b44.c                                 |    3 
 drivers/net/ne2k-pci.c                            |    3 
 drivers/pci/pci-acpi.c                            |  110 ++
 drivers/pci/pci.c                                 |   22 
 drivers/pci/pci.h                                 |    4 
 drivers/pcmcia/yenta_socket.c                     |    3 
 drivers/pnp/pnpacpi/rsparser.c                    |   15 
 drivers/pnp/pnpbios/rsparser.c                    |    2 
 drivers/pnp/resource.c                            |    2 
 drivers/usb/core/hcd-pci.c                        |    1 
 include/acpi/acconfig.h                           |   14 
 include/acpi/acdebug.h                            |  152 ---
 include/acpi/acdisasm.h                           |  117 --
 include/acpi/acdispat.h                           |  165 ---
 include/acpi/acevents.h                           |   86 -
 include/acpi/acexcep.h                            |   11 
 include/acpi/acglobal.h                           |   41 
 include/acpi/achware.h                            |   58 -
 include/acpi/acinterp.h                           |  243 +---
 include/acpi/aclocal.h                            |   92 -
 include/acpi/acmacros.h                           |  110 +-
 include/acpi/acnames.h                            |   84 +
 include/acpi/acnamesp.h                           |  165 ---
 include/acpi/acobject.h                           |    4 
 include/acpi/acopcode.h                           |  325 ++++++
 include/acpi/acoutput.h                           |    2 
 include/acpi/acparser.h                           |  128 +-
 include/acpi/acpi.h                               |    1 
 include/acpi/acpi_bus.h                           |   21 
 include/acpi/acpi_drivers.h                       |    5 
 include/acpi/acpiosxf.h                           |   53 -
 include/acpi/acpixf.h                             |   15 
 include/acpi/acresrc.h                            |   67 -
 include/acpi/acstruct.h                           |   13 
 include/acpi/actables.h                           |   70 -
 include/acpi/actbl.h                              |   60 -
 include/acpi/actbl1.h                             |   52 -
 include/acpi/actbl2.h                             |  109 +-
 include/acpi/actypes.h                            |   17 
 include/acpi/acutils.h                            |  359 ++-----
 include/acpi/amlcode.h                            |   14 
 include/acpi/pdc_intel.h                          |   29 
 include/acpi/platform/acenv.h                     |   39 
 include/acpi/platform/acgcc.h                     |    8 
 include/acpi/platform/aclinux.h                   |   11 
 include/acpi/processor.h                          |   34 
 include/asm-alpha/pci.h                           |    2 
 include/asm-arm/pci.h                             |    2 
 include/asm-h8300/pci.h                           |    2 
 include/asm-i386/acpi.h                           |   10 
 include/asm-i386/apicdef.h                        |    6 
 include/asm-i386/pci.h                            |    2 
 include/asm-ia64/acpi.h                           |    9 
 include/asm-ia64/pci.h                            |    2 
 include/asm-m68k/pci.h                            |    2 
 include/asm-mips/pci.h                            |    2 
 include/asm-ppc/pci.h                             |    2 
[...34623 lines suppressed...]
+extern inline void pcibios_penalize_isa_irq(int irq, int active)
 {
 	/* We don't do dynamic PCI IRQ allocation */
 }
diff --git a/include/asm-ppc64/pci.h b/include/asm-ppc64/pci.h
--- a/include/asm-ppc64/pci.h
+++ b/include/asm-ppc64/pci.h
@@ -37,7 +37,7 @@ static inline void pcibios_set_master(st
 	/* No special bus mastering setup handling */
 }
 
-static inline void pcibios_penalize_isa_irq(int irq)
+static inline void pcibios_penalize_isa_irq(int irq, int active)
 {
 	/* We don't do dynamic PCI IRQ allocation */
 }
diff --git a/include/asm-sh/pci.h b/include/asm-sh/pci.h
--- a/include/asm-sh/pci.h
+++ b/include/asm-sh/pci.h
@@ -36,7 +36,7 @@ struct pci_dev;
 
 extern void pcibios_set_master(struct pci_dev *dev);
 
-static inline void pcibios_penalize_isa_irq(int irq)
+static inline void pcibios_penalize_isa_irq(int irq, int active)
 {
 	/* We don't do dynamic PCI IRQ allocation */
 }
diff --git a/include/asm-sh64/pci.h b/include/asm-sh64/pci.h
--- a/include/asm-sh64/pci.h
+++ b/include/asm-sh64/pci.h
@@ -26,7 +26,7 @@ extern void pcibios_set_master(struct pc
 /*
  * Set penalize isa irq function
  */
-static inline void pcibios_penalize_isa_irq(int irq)
+static inline void pcibios_penalize_isa_irq(int irq, int active)
 {
 	/* We don't do dynamic PCI IRQ allocation */
 }
diff --git a/include/asm-sparc/pci.h b/include/asm-sparc/pci.h
--- a/include/asm-sparc/pci.h
+++ b/include/asm-sparc/pci.h
@@ -20,7 +20,7 @@ extern inline void pcibios_set_master(st
 	/* No special bus mastering setup handling */
 }
 
-extern inline void pcibios_penalize_isa_irq(int irq)
+extern inline void pcibios_penalize_isa_irq(int irq, int active)
 {
 	/* We don't do dynamic PCI IRQ allocation */
 }
diff --git a/include/asm-sparc64/pci.h b/include/asm-sparc64/pci.h
--- a/include/asm-sparc64/pci.h
+++ b/include/asm-sparc64/pci.h
@@ -23,7 +23,7 @@ static inline void pcibios_set_master(st
 	/* No special bus mastering setup handling */
 }
 
-static inline void pcibios_penalize_isa_irq(int irq)
+static inline void pcibios_penalize_isa_irq(int irq, int active)
 {
 	/* We don't do dynamic PCI IRQ allocation */
 }
diff --git a/include/asm-x86_64/acpi.h b/include/asm-x86_64/acpi.h
--- a/include/asm-x86_64/acpi.h
+++ b/include/asm-x86_64/acpi.h
@@ -28,6 +28,8 @@
 
 #ifdef __KERNEL__
 
+#include <acpi/pdc_intel.h>
+
 #define COMPILER_DEPENDENT_INT64   long long
 #define COMPILER_DEPENDENT_UINT64  unsigned long long
 
@@ -99,12 +101,6 @@ __acpi_release_global_lock (unsigned int
         :"=r"(n_hi), "=r"(n_lo)     \
         :"0"(n_hi), "1"(n_lo))
 
-/*
- * Refer Intel ACPI _PDC support document for bit definitions
- */
-#define ACPI_PDC_EST_CAPABILITY_SMP 	0xa
-#define ACPI_PDC_EST_CAPABILITY_MSR	0x1
-
 #ifdef CONFIG_ACPI_BOOT
 extern int acpi_lapic;
 extern int acpi_ioapic;
diff --git a/include/asm-x86_64/pci.h b/include/asm-x86_64/pci.h
--- a/include/asm-x86_64/pci.h
+++ b/include/asm-x86_64/pci.h
@@ -33,7 +33,7 @@ extern int (*pci_config_read)(int seg, i
 extern int (*pci_config_write)(int seg, int bus, int dev, int fn, int reg, int len, u32 value);
 
 void pcibios_set_master(struct pci_dev *dev);
-void pcibios_penalize_isa_irq(int irq);
+void pcibios_penalize_isa_irq(int irq, int active);
 struct irq_routing_table *pcibios_get_irq_routing_table(void);
 int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq);
 
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -206,7 +206,10 @@ struct acpi_table_plat_int_src {
 	u8			eid;
 	u8			iosapic_vector;
 	u32			global_irq;
-	u32			reserved;
+	struct {
+		u32			cpei_override_flag:1;
+		u32			reserved:31;
+	}			plint_flags;
 } __attribute__ ((packed));
 
 enum acpi_interrupt_id {
@@ -462,7 +465,7 @@ struct acpi_prt_list {
 struct pci_dev;
 
 int acpi_pci_irq_enable (struct pci_dev *dev);
-void acpi_penalize_isa_irq(int irq);
+void acpi_penalize_isa_irq(int irq, int active);
 
 #ifdef CONFIG_ACPI_DEALLOCATE_IRQ
 void acpi_pci_irq_disable (struct pci_dev *dev);
diff --git a/include/linux/device.h b/include/linux/device.h
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -269,8 +269,10 @@ struct device {
 	struct device_driver *driver;	/* which driver has allocated this
 					   device */
 	void		*driver_data;	/* data private to the driver */
-	void		*platform_data;	/* Platform specific data (e.g. ACPI,
-					   BIOS data relevant to device) */
+	void		*platform_data;	/* Platform specific data, device
+					   core doesn't touch it */
+	void		*firmware_data; /* Firmware specific data (e.g. ACPI,
+					   BIOS data),reserved for device core*/
 	struct dev_pm_info	power;
 
 	u64		*dma_mask;	/* dma mask (if dma'able device) */
diff --git a/include/linux/pm.h b/include/linux/pm.h
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -175,7 +175,7 @@ struct pm_ops {
 };
 
 extern void pm_set_ops(struct pm_ops *);
-
+extern struct pm_ops *pm_ops;
 extern int pm_suspend(suspend_state_t state);
 
 
diff --git a/kernel/power/main.c b/kernel/power/main.c
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -19,6 +19,9 @@
 
 #include "power.h"
 
+/*This is just an arbitrary number */
+#define FREE_PAGE_NUMBER (100)
+
 DECLARE_MUTEX(pm_sem);
 
 struct pm_ops * pm_ops = NULL;
@@ -49,6 +52,7 @@ void pm_set_ops(struct pm_ops * ops)
 static int suspend_prepare(suspend_state_t state)
 {
 	int error = 0;
+	unsigned int free_pages;
 
 	if (!pm_ops || !pm_ops->enter)
 		return -EPERM;
@@ -60,6 +64,16 @@ static int suspend_prepare(suspend_state
 		goto Thaw;
 	}
 
+	if ((free_pages = nr_free_pages()) < FREE_PAGE_NUMBER) {
+		pr_debug("PM: free some memory\n");
+		shrink_all_memory(FREE_PAGE_NUMBER - free_pages);
+		if (nr_free_pages() < FREE_PAGE_NUMBER) {
+			error = -ENOMEM;
+			printk(KERN_ERR "PM: No enough memory\n");
+			goto Thaw;
+		}
+	}
+
 	if (pm_ops->prepare) {
 		if ((error = pm_ops->prepare(state)))
 			goto Thaw;
@@ -190,7 +204,7 @@ int software_suspend(void)
 
 int pm_suspend(suspend_state_t state)
 {
-	if (state > PM_SUSPEND_ON && state < PM_SUSPEND_MAX)
+	if (state > PM_SUSPEND_ON && state <= PM_SUSPEND_MAX)
 		return enter_state(state);
 	return -EINVAL;
 }


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1400
retrieving revision 1.1401
diff -u -r1.1400 -r1.1401
--- kernel-2.6.spec	28 Jul 2005 07:30:03 -0000	1.1400
+++ kernel-2.6.spec	30 Jul 2005 03:47:09 -0000	1.1401
@@ -350,6 +350,7 @@
 Patch1910: linux-2.6.12-ns558-nodev-rmmod.patch
 Patch1920: linux-2.6.12-acpi-legacy-irq.patch
 Patch1930: linux-2.6-appletouch-update.patch
+Patch1940: linux-2.6-acpi-backport.patch
 
 Patch2000: linux-2.6.11-vm-taint.patch
 Patch2001: linux-2.6.9-vm-oomkiller-debugging.patch
@@ -810,6 +811,8 @@
 %patch1920 -p1
 # Fix Appletouch tapping.
 %patch1930 -p1
+# ACPI backport from 2.6.13rc4
+%patch1940 -p1
 
 #
 # VM related fixes.
@@ -1270,6 +1273,9 @@
 %endif
 
 %changelog
+* Fri Jul 29 2005 Dave Jones <davej redhat com>
+- Include backport of 2.6.13rc4 ACPI (acpi-20050708-2.6.12.patch)
+
 * Thu Jul 28 2005 Dave Jones <davej redhat com>
 - Fix compilation with older gcc. (#164041)
 


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