17 Sep, 2006

10 commits


13 Sep, 2006

30 commits

  • * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
    [POWERPC] Fix G5 DART (IOMMU) race causing occasional data corruption
    [POWERPC] Fix MMIO ops to provide expected barrier behaviour
    [POWERPC] Fix interrupt clearing in kdump shutdown sequence
    [POWERPC] update prep_defconfig
    [POWERPC] kdump: Support kernels having 64k page size.
    [POWERPC] Implement PowerPC futex_atomic_cmpxchg_inatomic().
    [POWERPC] Add new, missing argument to of_irq_map_raw() for 86xx.
    [POWERPC] Update defconfigs

    Linus Torvalds
     
  • Add support for new hardware and bumps the version to 3.6.10. It seems
    there were several changes introduced including soft_irq. I decided to
    bump the major number to reflect these changes. Since we're still
    supporting older vendor kernels I need some way differentiate between
    kernel versions =2.6.16.

    Signed-off-by: Mike Miller
    Cc: Jens Axboe
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mike Miller
     
  • MIPS asm/page.h unconditionally includes , which
    doesn't exist in userspace. Move an #endif /* __KERNEL__ */ down a few lines
    to prevent that.

    Also, remove the broken definition of PAGE_SIZE which is never going to be
    correct -- in the absence of PAGE_SIZE, non-broken userspace will fall back to
    using sysconf() or getpagesize() instead.

    Signed-off-by: David Woodhouse
    Cc: Ralf Baechle
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Woodhouse
     
  • The header file doesn't exist in userspace and probably
    shouldn't -- but it's used unconditionally in . Protect it
    with #ifdef __KERNEL__ and move setup.h from $(header-y) to $(unifdef-y) in
    Kbuild accordingly.

    Signed-off-by: David Woodhouse
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Woodhouse
     
  • Some files which don't exist in userspace were being included unconditionally
    in asm-i386/elf.h. Move the offending #includes down a few lines so that
    they're protected by #ifdef __KERNEL__

    In fact, we probably want to kill off all userspace use of asm/elf.h -- but we
    aren't there yet, so we should at least make it possible to include it for
    now.

    Signed-off-by: David Woodhouse
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Woodhouse
     
  • Because doesn't exist in userspace, it should be only
    included from within #ifdef __KERNEL__. Move the corresponding #include

    Signed-off-by: David Woodhouse
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Woodhouse
     
  • There's useful stuff in but has nothing for
    userspace. Stop exporting it, and include it only from within the existing
    #ifdef __KERNEL__ part of

    This fixes a 'make headers_check' failure on i386 because asm-i386/timex.h
    includes both asm-i386/tsc.h and asm-i386/processor.h, neither of which are
    exported to userspace. It's not entirely clear _why_ it includes either of
    these, but it does.

    Signed-off-by: David Woodhouse
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Woodhouse
     
  • We don't need any of this crap included from the user-visible part of nfs_fs.h
    -- remove it all.

    In fact, we probably don't need anything but NFS_SUPER_MAGIC to be defined; is
    there any need for anything else? And magic numbers should probably move to
    rather than being strewn across various fs-specific include
    files which exist in userspace for solely that purpose.

    With this patch, 'make header_check' works again at least on PowerPC.

    Signed-off-by: David Woodhouse
    Cc: Trond Myklebust
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Woodhouse
     
  • Signed-off-by: Alexey Dobriyan
    Cc: David Woodhouse
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexey Dobriyan
     
  • The following combinations of pp-tokens are used

    #include
    #include
    # include

    so, script'd better check for all of them.

    Signed-off-by: Alexey Dobriyan
    Cc: David Woodhouse
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexey Dobriyan
     
  • Claim an ID number for Xen in the LOADER_TYPE field.

    Also, keep the table in zero-page.txt consistent with boot.txt.

    [hpa says: 6 was skipped because I couldn't rule out that it hadn't been
    unofficially used. It seemed easier to skip it for now.]

    Signed-off-by: Jeremy Fitzhardinge
    Acked-by: "H. Peter Anvin"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeremy Fitzhardinge
     
  • rcu_do_batch() decrements rdp->qlen with irqs enabled. This is not good,
    it can also be modified by call_rcu() from interrupt.

    Decrement ->qlen once with irqs disabled, after a main loop.

    Signed-off-by: Oleg Nesterov
    Cc: Dipankar Sarma
    Cc: "Paul E. McKenney"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Oleg Nesterov
     
  • Fixup for lockdep enabled kernels: Annotate an on-stack completion.

    Signed-off-by: Stefan Richter
    Acked-by: Ingo Molnar
    Cc: James Bottomley
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Stefan Richter
     
  • Configuration bits are not set properly for DMA on some chipset revisions.
    It has already been corrected for M5229 (rev c7) but not for M5229 (rev
    c8). This leads to the bug described at
    http://bugzilla.kernel.org/show_bug.cgi?id=5786 (lost interrupt + ide bus
    hangs).

    Signed-off-by: Michael De Backer
    Acked-by: Alan Cox
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Michael De Backer
     
  • The DCO does not mean anything if we allow anonymous contributors to the
    kernel. As this is an open source project, we need to do everything in the
    open.

    Signed-off-by: Greg Kroah-Hartman
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Greg KH
     
  • Miles Lane reported the "BUG: MAX_STACK_TRACE_ENTRIES too low!" message,
    which means that during normal use his system produced enough lockdep
    events so that the 128-thousand entries stack-trace array got exhausted.
    Double the size of the array.

    Signed-off-by: Ingo Molnar
    Cc: Miles Lane
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ingo Molnar
     
  • 0x848a in ID word 0 indicates CFA device iff the ID data is obtained from
    IDENTIFY DEVICE. For ATAPI devices, 0x848a in ID work 0 indicates valid
    ATAPI device. Fix sanity check in ata_dev_read_id() such that ATAPI
    devices reporting 0x848a in ID word 0 is not handled as error.

    The problem is identified by J.A. Magallon with HL-DT-ST DVDRAM GSA-4120B.

    Signed-off-by: Tejun Helo
    Cc: J.A. Magallon
    Acked-by: Jeff Garzik
    Acked-by: Alan Cox
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Tejun Heo
     
  • It seems that the occasional data corruption observed with the tg3
    driver wasn't due to missing barriers after all, but rather seems to
    be due to the DART (= IOMMU) in the U4 northbridge reading stale
    IOMMU table entries from memory due to a race. This fixes it by
    making the CPU read the entry back from memory before using it.

    Signed-off-by: Benjamin Herrenschmidt
    Signed-off-by: Paul Mackerras

    Benjamin Herrenschmidt
     
  • This changes the writeX family of functions to have a sync instruction
    before the MMIO store rather than after, because the generally expected
    behaviour is that the device receiving the MMIO store can be guaranteed
    to see the effects of any preceding writes to normal memory.

    To preserve ordering between writeX and readX, and to preserve ordering
    between preceding stores and the readX, the readX family of functions
    have had an sync added before the load.

    Although writeX followed by spin_unlock is not officially guaranteed
    to keep the writeX inside the spin-locked region unless an mmiowb()
    is used, there are currently drivers that depend on the previous
    behaviour on powerpc, which was that the mmiowb wasn't actually required.
    Therefore we have a per-cpu flag that is set by writeX, cleared by
    __raw_spin_lock and mmiowb, and tested by __raw_spin_unlock. If it is
    set, __raw_spin_unlock does a sync and clears it.

    This changes both 32-bit and 64-bit readX/writeX. 32-bit already has a
    sync in __raw_spin_unlock (since lwsync doesn't exist on 32-bit), and thus
    doesn't need the per-cpu flag.

    Tested on G5 (PPC970) and POWER5.

    Signed-off-by: Paul Mackerras

    Paul Mackerras
     
  • Call chip->eoi(irq) to clear any pending interrupt in case of kdump
    shutdown sequence. chip->end(irq) does not serve this purpose.

    Signed-off-by: Mohan Kumar M
    Signed-off-by: Paul Mackerras

    Mohan Kumar M
     
  • Update PReP defconfig, disable some drivers for hardware that is not
    used on those systems; enable SL82C105 IDE driver for Powerstack.

    Signed-off-by: Olaf Hering
    Signed-off-by: Paul Mackerras

    Olaf Hering
     
  • This is required to generate proper core files using kdump on ppc64.

    Create a backup region of 64K size irrespective of the PAGE SIZE.
    At present 32K was used as backup size. In the case of 64K page size,
    second PT_LOAD segments starts at 32K and the first one is not page
    aligned. __ioremap() (crash_dump.c) fails if pfn = 0 which is the
    case for the second PT_LOAD segment. This is not an issue for 4K page
    size because the the first page (32K backup) is copied to second
    kernel memory and thus referencing with the second kernel pfn.

    Signed-off-by: Sachin Sant
    Signed-off-by: Paul Mackerras

    Sachin P. Sant
     
  • The sys_[gs]et_robust_list() syscalls were wired up on PowerPC but
    didn't work correctly because futex_atomic_cmpxchg_inatomic() wasn't
    implemented. Implement it, based on __cmpxchg_u32().

    Signed-off-by: David Woodhouse
    Signed-off-by: Paul Mackerras

    David Woodhouse
     
  • Ben speaks; we follow.

    Signed-off-by: Jon Loeliger
    Signed-off-by: Paul Mackerras

    Jon Loeliger
     
  • One last time..

    Linus Torvalds
     
  • * 'audit.b29' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
    [PATCH] sparc64 audit syscall classes hookup
    [PATCH] syscall class hookup for all normal targets

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
    [CIFS] Fix CIFS readdir access denied when SE Linux enabled

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
    V4L/DVB (4608c): Fix I2C dependencies for saa7146 modules
    V4L/DVB (4608b): i2c deps fix on DVB
    V4L/DVB (4605): Fixes an issue with V4L1 and make headers-install
    V4L/DVB (4520): Fix an error when loading bttv driver on PV M4900.
    V4L/DVB (4511): Restore tuner_ymec_tvf66t5_b_dff_pal_ranges[] to fix UHF switch functionality
    V4L/DVB (4494a): Fix compilation when V4L1 support is not present

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
    USB: Fix unload oops and memory leak in yealink driver
    usbserial: Reference leak

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
    sh64: Add a sane pm_power_off implementation.
    sh64: Use generic BUG_ON()/WARN_ON().
    sh64: Trivial build fixes.
    sh64: Drop deprecated ISA tuning for legacy toolchains.

    Linus Torvalds