Skip to content
Commits on Dec 4, 2007
  1. Linux 2.6.24-rc4

    Linus Torvalds committed Dec 3, 2007
Commits on Dec 3, 2007
  1. Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24

    * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24:
      sh: Support PCI IO access of SH7780 base boards.
      sh: Fix PCI IO space base address of SH7780.
    Linus Torvalds committed Dec 3, 2007
  2. @ralfbaechle

    [MIPS] BCM1480: Fix interrupt routing.

    The old code did did only work as long as CFE and the kernel were using
    the same interrupt numbering ...
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    ralfbaechle committed Dec 2, 2007
  3. Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

    * git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
      x86: fix x86-32 early fixmap initialization.
      x86: disable hpet legacy replacement for kdump
      x86: disable hpet on shutdown
    Linus Torvalds committed Dec 3, 2007
  4. Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…

    …/paulus/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
      [POWERPC] Remove xmon from ml300 and ml403 defconfig in arch/ppc
      Revert "[POWERPC] Fix RTAS os-term usage on kernel panic"
    Linus Torvalds committed Dec 3, 2007
  5. Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    …it/lenb/linux-acpi-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
      ACPICA: fix acpi-cpufreq boot crash due to _PSD return-by-reference
      ACPI: Delete the IRQ operation in throttling controll via PTC
    Linus Torvalds committed Dec 3, 2007
  6. Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-s…

    …ched
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
      sched: cpu accounting controller (V2)
    Linus Torvalds committed Dec 3, 2007
  7. Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixe…

    …s-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
      [SCSI] NCR5380: Fix bugs and canonicalize irq handler usage
      [SCSI] zfcp: fix cleanup of dismissed error recovery actions
      [SCSI] zfcp: fix dismissal of error recovery actions
      [SCSI] qla1280: convert to use the data buffer accessors
      [SCSI] iscsi: return data transfer residual for data-out commands
      [SCSI] iscsi_tcp: fix potential lockup with write commands
      [SCSI] aacraid: fix security weakness
      [SCSI] aacraid: fix up le32 issues in BlinkLED
      [SCSI] aacraid: fix potential panic in thread stop
      [SCSI] aacraid: don't assign cpu_to_le32(constant) to u8
    Linus Torvalds committed Dec 3, 2007
  8. @ebiederm

    x86: fix x86-32 early fixmap initialization.

    pageexec@freemail.hu writes:
    
    > i've just noticed that the chunk in i386/kernel/head.S ended up in a
    > weird place, namely, it's not going to be executed as it's just after
    > a 'jmp 3f' and before startup_32_smp, probably not what you intended.
    > on a sidenote, the whole thing can be done in a single insn, like:
    >
    > movl $(swapper_pg_pmd - __PAGE_OFFSET + 0x067), (swapper_pg_dir -
    > __PAGE_OFFSET+ 4092)
    
    Thanks for the reminder I thought we had fixed this problem a while ago.
    
    Needed to get fixed virtual address for USB debug and earlycon with mmio.
    
    Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    ebiederm committed with Ingo Molnar Dec 1, 2007
  9. @OGAWAHirofumi

    x86: disable hpet legacy replacement for kdump

    we should also add hpet_disable() for kdump.
    
    Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    OGAWAHirofumi committed with Ingo Molnar Dec 3, 2007
  10. @OGAWAHirofumi

    x86: disable hpet on shutdown

    If HPET was enabled by pci quirks, we use i8253 as initial clockevent
    because pci quirks doesn't run until pci is initialized.
    
    The above means the kernel (or something) is assuming HPET legacy
    replacement is disabled and can use i8253 at boot.
    
    If we used kexec, it isn't true. So, this patch disables HPET legacy
    replacement for kexec in machine_shutdown().
    
    Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
    Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    OGAWAHirofumi committed with Ingo Molnar Dec 3, 2007
  11. Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/net-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/net-2.6: (27 commits)
      [INET]: Fix inet_diag dead-lock regression
      [NETNS]: Fix /proc/net breakage
      [TEXTSEARCH]: Do not allow zero length patterns in the textsearch infrastructure
      [NETFILTER]: fix forgotten module release in xt_CONNMARK and xt_CONNSECMARK
      [NETFILTER]: xt_TCPMSS: remove network triggerable WARN_ON
      [DECNET]: dn_nl_deladdr() almost always returns no error
      [IPV6]: Restore IPv6 when MTU is big enough
      [RXRPC]: Add missing select on CRYPTO
      mac80211: rate limit wep decrypt failed messages
      rfkill: fix double-mutex-locking
      mac80211: drop unencrypted frames if encryption is expected
      mac80211: Fix behavior of ieee80211_open and ieee80211_close
      ieee80211: fix unaligned access in ieee80211_copy_snap
      mac80211: free ifsta->extra_ie and clear IEEE80211_STA_PRIVACY_INVOKED
      SCTP: Fix build issues with SCTP AUTH.
      SCTP: Fix chunk acceptance when no authenticated chunks were listed.
      SCTP: Fix the supported extensions paramter
      SCTP: Fix SCTP-AUTH to correctly add HMACS paramter.
      SCTP: Fix the number of HB transmissions.
      [TCP] illinois: Incorrect beta usage
      ...
    Linus Torvalds committed Dec 3, 2007
  12. Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    …ernel/git/jgarzik/netdev-2.6
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (48 commits)
      LIB82596: correct data types for hardware addresses
      via-velocity: don't oops on MTU change (resend)
      Stop phy code from returning success to unknown ioctls.
      SET_NETDEV_DEV() in fec_mpc52xx.c
      net: smc911x: only enable for mpr2 on sh.
      e1000: Fix NAPI state bug when Rx complete
      sky2: turn of dynamic Tx watermark workaround (FE+ only)
      sky2: don't use AER routines
      sky2: revert to access PCI config via device space
      cxgb - fix stats
      cxgb - fix NAPI
      cxgb - fix T2 GSO
      ucc_geth: handle passing of RX-only and TX-only internal delay PHY connection type parameters
      phylib: marvell: add support for TX-only and RX-only Internal Delay
      phylib: add PHY interface modes for internal delay for tx and rx only
      skge: MTU changing fix
      skge: serial mode register values
      skge version 1.13
      skge: increase TX threshold for Jumbo
      skge: fiber link up/down fix
      ...
    Linus Torvalds committed Dec 3, 2007
  13. Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    …ernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      sata_mv: Fix broken Marvell 7042 support.
      libata: Fix early use of port printk. (Was Re: ata4294967295: failed to start port (errno=-19))
      ata_piix: add more toshiba laptops to broken suspend list
      libata: More IVB horkage from TSST
      libata: report protocol and full CDB on error
      Several fixes for the AVR32 PATA driver
      sata_mv: fix compilation error when enabling DEBUG
      Set proper ATA UDMA mode for bf548 according to system clock.
    Linus Torvalds committed Dec 3, 2007
  14. @rhvgoyal

    Update Kdump Maintainer's details

    Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    rhvgoyal committed with Linus Torvalds Dec 1, 2007
  15. uml: work around host tcsetattr bug

    Under the conditions that UML uses it, tcgetattr is guaranteed to return
    -EINTR when the console is attached to /dev/ptmx, making generic_console_write
    hang because it loops, calling tcgetattr until it succeeds.  This is a host
    bug - see http://marc.info/?l=linux-kernel&m=119618990807182&w=2 for the
    details.
    
    This patch works around it by blocking SIGIO while the terminal attributes are
    being fiddled.
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Jeff Dike committed with Linus Torvalds Dec 1, 2007
  16. uml: after_sleep_interval should return something

    I forgot to have an int-returning function actually return something.
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Jeff Dike committed with Linus Torvalds Dec 1, 2007
  17. uml: add !UML dependencies

    The previous commit ("uml: keep UML Kconfig in sync with x86") is not
    enough, unfortunately.  If we go that way, we need to add dependencies
    on !UML for several options.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Al Viro committed with Linus Torvalds Dec 1, 2007
  18. uml: keep UML Kconfig in sync with x86

    Fix a UML build breakage introduced by commit
    1032c0b - it introduces X86_32, with many
    things which UML needs depending on it.
    
    This patch adds definitions of X86_32 and RWSEM_XCHGADD_ALGORITHM to
    the UML/i386 Kconfig.
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Jeff Dike committed with Linus Torvalds Dec 1, 2007
  19. I4L: fix isdn_ioctl memory overrun vulnerability

    Fix possible memory overrun issue in the isdn ioctl code.
    
    Found by ADLAB <adlab@venustech.com.cn>
    
    Signed-off-by: Karsten Keil <kkeil@suse.de>
    Cc: ADLAB <adlab@venustech.com.cn>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Karsten Keil committed with Linus Torvalds Dec 1, 2007
  20. @herbertx

    [INET]: Fix inet_diag dead-lock regression

    The inet_diag register fix broke inet_diag module loading because the
    loaded module had to take the same mutex that's already held by the
    loader in order to register the new handler.
    
    This patch fixes it by introducing a separate mutex to protect the
    handling of handlers.
    
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    herbertx committed Dec 3, 2007
Commits on Dec 2, 2007
  1. @glikely @paulusmack

    [POWERPC] Remove xmon from ml300 and ml403 defconfig in arch/ppc

    xmon is broken under arch/ppc so remove it from the defconfig.
    
    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    glikely committed with paulusmack Nov 20, 2007
  2. @paulusmack

    Revert "[POWERPC] Fix RTAS os-term usage on kernel panic"

    This reverts commit a2b5181.
    
    It turns out that this change caused some machines to fail to come
    back up when being rebooted, and generated an error in the hypervisor
    error log on some machines.  The platform architecture (PAPR) is a
    little unclear on exactly when the RTAS ibm,os-term function should be
    called.  Until that is clarified I'm reverting this commit.
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    paulusmack committed Dec 3, 2007
  3. @lenb
  4. @lenb

    Pull thermal into release branch

    lenb committed Dec 2, 2007
  5. @acpibob @lenb

    ACPICA: fix acpi-cpufreq boot crash due to _PSD return-by-reference

    Changed resolution of named references in packages
    
    Fixed a problem with the Package operator where all named
    references were created as object references and left otherwise
    unresolved. According to the ACPI specification, a Package can
    only contain Data Objects or references to control methods. The
    implication is that named references to Data Objects (Integer,
    Buffer, String, Package, BufferField, Field) should be resolved
    immediately upon package creation. This is the approach taken
    with this change. References to all other named objects (Methods,
    Devices, Scopes, etc.) are all now properly created as reference objects.
    
    http://bugzilla.kernel.org/show_bug.cgi?id=5328
    http://bugzilla.kernel.org/show_bug.cgi?id=9429
    
    Signed-off-by: Bob Moore <robert.moore@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
    acpibob committed with lenb Oct 17, 2007
  6. sched: cpu accounting controller (V2)

    Commit cfb5285 removed a useful feature for
    us, which provided a cpu accounting resource controller.  This feature would be
    useful if someone wants to group tasks only for accounting purpose and doesnt
    really want to exercise any control over their cpu consumption.
    
    The patch below reintroduces the feature. It is based on Paul Menage's
    original patch (Commit 62d0df6), with
    these differences:
    
            - Removed load average information. I felt it needs more thought (esp
    	  to deal with SMP and virtualized platforms) and can be added for
    	  2.6.25 after more discussions.
            - Convert group cpu usage to be nanosecond accurate (as rest of the cfs
    	  stats are) and invoke cpuacct_charge() from the respective scheduler
    	  classes
    	- Make accounting scalable on SMP systems by splitting the usage
    	  counter to be per-cpu
    	- Move the code from kernel/cpu_acct.c to kernel/sched.c (since the
    	  code is not big enough to warrant a new file and also this rightly
    	  needs to live inside the scheduler. Also things like accessing
    	  rq->lock while reading cpu usage becomes easier if the code lived in
    	  kernel/sched.c)
    
    The patch also modifies the cpu controller not to provide the same accounting
    information.
    
    Tested-by: Balbir Singh <balbir@linux.vnet.ibm.com>
    
     Tested the patches on top of 2.6.24-rc3. The patches work fine. Ran
     some simple tests like cpuspin (spin on the cpu), ran several tasks in
     the same group and timed them. Compared their time stamps with
     cpuacct.usage.
    
    Signed-off-by: Srivatsa Vaddagiri <vatsa@linux.vnet.ibm.com>
    Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Srivatsa Vaddagiri committed with Ingo Molnar Dec 2, 2007
  7. @yakuizhao @lenb

    ACPI: Delete the IRQ operation in throttling controll via PTC

    The IRQ operation(enable/disable) should be avoided when throttling is
    controlled via PTC method. It is replaced by the migration of task.
    
    This fixes an oops on T61 -- a regression due to
    f79f06a b/c FixedHW support tried to read remote MSR with interrupts disabled.
    
    Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
    yakuizhao committed with lenb Nov 29, 2007
Commits on Dec 1, 2007
  1. sata_mv: Fix broken Marvell 7042 support.

    sata_mv:  Fix broken Marvell 7042 support.
    
    The Marvell 7042 chip is more or less the same as the 6042 internally,
    but sports a PCIe bus.  Despite having identical SATA cores, the 7042
    does differ from its PCI bus counterparts in placment and layout of
    certain bus related registers.
    
    This patch fixes sata_mv to distinguish between the PCI bus registers
    of earlier chips, and the PCIe bus registers of the 7042.
    
    Specifically, move the offsets and bit patterns for the
    PCI/PCIe interrupt cause/mask registers into the struct mv_host_priv,
    as these values differ between the 6xxx and 7xxx series chips.
    
    This fixes the driver to not access reserved PCI addresses,
    and prevents the lockups reported in linux-2.6.24 with 7042 boards.
    
    Also add a new PCI ID for the Highpoint 2300 7042-based board
    that I'm using for testing this stuff here.
    
    Tested with Marvell 6081 + 7042 chips, on x86 & x86_64.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Mark Lord committed with Jeff Garzik Dec 1, 2007
  2. @Alan-Cox

    libata: Fix early use of port printk. (Was Re: ata4294967295: failed …

    …to start port (errno=-19))
    
    On Fri, 30 Nov 2007 14:34:11 +0200 (EET)
    Meelis Roos <mroos@linux.ee> wrote:
    
    > > Can you stick a stack trace in at that point ? That would help diagnose
    > > it a great deal quicker.
    >
    > Finally done - found out hard way that BUG() is too bad and
    > dump_st5ack() suits me better.
    
    Thanks. This should fix the real cause, and also allow for port start to
    fail politely with -ENODEV.
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Alan-Cox committed with Jeff Garzik Nov 30, 2007
  3. ata_piix: add more toshiba laptops to broken suspend list

    Add more toshiba laptops to broken suspend list.  This is from OSDL
    bugzilla bug 7780.
    
    tj: re-formatted patch and added description and SOB.
    
    Signed-off-by: Peter Schwenke <peter@bluetoad.com.au>
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Peter Schwenke committed with Jeff Garzik Nov 30, 2007
  4. libata: More IVB horkage from TSST

    libata: Add more TSST (Samsung/Toshiba) IDE drives with broken
    cable detection validation bits.
    
    signed-off-by: Peter Missel (peter.missel@onlinehome.de)
    Acked-by: Alan Cox <alan@redhat.com>
    
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Peter Missel committed with Jeff Garzik Nov 27, 2007
  5. @htejun

    libata: report protocol and full CDB on error

    Protocol and CDB allocation size field are important in determining
    what went wrong with ATAPI commands.  Report them on failure.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    htejun committed with Jeff Garzik Nov 28, 2007
  6. Several fixes for the AVR32 PATA driver

    Several fixes for the AVR32 PATA driver:
    
    * Updated to use new AVR32 SMC timing API. This removes the need for "magic"
    constants in signal timing.
    
    * Removed the ATA_FLAG_PIO_POLLING, the driver should use interrupts.
    
    * Removed .port_disable and .irq_ack as these are no longer needed.
    
    * Improved some comments.
    
    Signed-off-by: Kristoffer Nyborg Gregertsen <kngregertsen@norway.atmel.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Kristoffer Nyborg Gregertsen committed with Jeff Garzik Nov 29, 2007
  7. @saeedbishara

    sata_mv: fix compilation error when enabling DEBUG

    use sstatus instead status.
    
    Signed-off-by: Saeed Bishara <saeed@marvell.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    saeedbishara committed with Jeff Garzik Nov 27, 2007
Something went wrong with that request. Please try again.