16 Oct, 2009

6 commits


25 Sep, 2009

3 commits

  • * 'cputime' of git://git390.marist.edu/pub/scm/linux-2.6:
    [PATCH] Fix idle time field in /proc/uptime

    Linus Torvalds
     
  • * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (24 commits)
    microblaze: Disable heartbeat/enable emaclite in defconfigs
    microblaze: Support simpleImage.dts make target
    microblaze: Fix _start symbol to physical address
    microblaze: Use LOAD_OFFSET macro to get correct LMA for all sections
    microblaze: Create the LOAD_OFFSET macro used to compute VMA vs LMA offsets
    microblaze: Copy ppc asm-compat.h for clean handling of constants in asm and C
    microblaze: Actually show KiB rather than pages in "Freeing initrd memory:"
    microblaze: Support ptrace syscall tracing.
    microblaze: Updated CPU version and FPGA family codes in PVR
    microblaze: Generate correct signal and siginfo for integer div-by-zero
    microblaze: Don't be noisy when userspace causes hardware exceptions
    microblaze: Remove ipc.h file which points to non-existing asm-generic file
    microblaze: Clear sticky FSR register after generating exception signals
    microblaze: Ensure CPU usermode is set on new userspace processes
    microblaze: Use correct kbuild variable KBUILD_CFLAGS
    microblaze: Save and restore msr in hw exception
    microblaze: Add architectural support for USB EHCI host controllers
    microblaze: Implement include/asm/syscall.h.
    microblaze: Improve checking mechanism for MSR instruction
    microblaze: Add checking mechanism for MSR instruction
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
    module: don't call percpu_modfree on NULL pointer.
    module: fix memory leak when load fails after srcversion/version allocated
    module: preferred way to use MODULE_AUTHOR
    param: allow whitespace as kernel parameter separator
    module: reduce string table for loaded modules (v2)
    module: reduce symbol table for loaded modules (v2)

    Linus Torvalds
     

24 Sep, 2009

31 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (42 commits)
    Btrfs: hash the btree inode during fill_super
    Btrfs: relocate file extents in clusters
    Btrfs: don't rename file into dummy directory
    Btrfs: check size of inode backref before adding hardlink
    Btrfs: fix releasepage to avoid unlocking extents we haven't locked
    Btrfs: Fix test_range_bit for whole file extents
    Btrfs: fix errors handling cached state in set/clear_extent_bit
    Btrfs: fix early enospc during balancing
    Btrfs: deal with NULL space info
    Btrfs: account for space used by the super mirrors
    Btrfs: fix extent entry threshold calculation
    Btrfs: remove dead code
    Btrfs: fix bitmap size tracking
    Btrfs: don't keep retrying a block group if we fail to allocate a cluster
    Btrfs: make balance code choose more wisely when relocating
    Btrfs: fix arithmetic error in clone ioctl
    Btrfs: add snapshot/subvolume destroy ioctl
    Btrfs: change how subvolumes are organized
    Btrfs: do not reuse objectid of deleted snapshot/subvol
    Btrfs: speed up snapshot dropping
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
    truncate: use new helpers
    truncate: new helpers
    fs: fix overflow in sys_mount() for in-kernel calls
    fs: Make unload_nls() NULL pointer safe
    freeze_bdev: grab active reference to frozen superblocks
    freeze_bdev: kill bd_mount_sem
    exofs: remove BKL from super operations
    fs/romfs: correct error-handling code
    vfs: seq_file: add helpers for data filling
    vfs: remove redundant position check in do_sendfile
    vfs: change sb->s_maxbytes to a loff_t
    vfs: explicitly cast s_maxbytes in fiemap_check_ranges
    libfs: return error code on failed attr set
    seq_file: return a negative error code when seq_path_root() fails.
    vfs: optimize touch_time() too
    vfs: optimization for touch_atime()
    vfs: split generic_forget_inode() so that hugetlbfs does not have to copy it
    fs/inode.c: add dev-id and inode number for debugging in init_special_inode()
    libfs: make simple_read_from_buffer conventional

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
    lsm: Use a compressed IPv6 string format in audit events
    Audit: send signal info if selinux is disabled
    Audit: rearrange audit_context to save 16 bytes per struct
    Audit: reorganize struct audit_watch to save 8 bytes

    Linus Torvalds
     
  • The general one handles NULL, the static obsolescent
    (CONFIG_HAVE_LEGACY_PER_CPU_AREA) one in module.c doesn't; Eric's
    commit 720eba31 assumed it did, and various frobbings since then kept
    that assumption.

    All other callers in module.c all protect it with an if; this effectively
    does the same as free_init is only goto if we fail percpu_modalloc().

    Reported-by: Kamalesh Babulal
    Signed-off-by: Rusty Russell
    Cc: Eric Dumazet
    Cc: Masami Hiramatsu
    Cc: Américo Wang
    Tested-by: Kamalesh Babulal

    Rusty Russell
     
  • Normally the twisty paths of sysfs will free the attributes, but not if
    we fail before we hook it into sysfs (which is the last thing we do in
    load_module).

    (This sysfs code is a turd, no doubt there are other issues lurking too).

    Reported-by: Tetsuo Handa
    Signed-off-by: Rusty Russell
    Cc: Catalin Marinas
    Tested-by: Tetsuo Handa

    Rusty Russell
     
  • For the longest time now we've been using multiple MODULE_AUTHOR()
    statements when a module has more than one author, but the comment here
    disagrees.

    Signed-off-by: Johannes Berg
    Cc: Jiri Kosina
    Cc: Luciano Coelho
    Signed-off-by: Andrew Morton
    Signed-off-by: Rusty Russell

    Johannes Berg
     
  • Some boot mechanisms require that kernel parameters are stored in a
    separate file which is loaded to memory without further processing
    (e.g. the "Load from FTP" method on s390). When such a file contains
    newline characters, the kernel parameter preceding the newline might
    not be correctly parsed (due to the newline being stuck to the end of
    the actual parameter value) which can lead to boot failures.

    This patch improves kernel command line usability in such a situation
    by allowing generic whitespace characters as separators between kernel
    parameters.

    Signed-off-by: Peter Oberparleiter
    Signed-off-by: Rusty Russell

    Peter Oberparleiter
     
  • Also remove all parts of the string table (referenced by the symbol
    table) that are not needed for kallsyms use (i.e. which were only
    referenced by symbols discarded by the previous patch, or not
    referenced at all for whatever reason).

    Signed-off-by: Jan Beulich
    Signed-off-by: Rusty Russell

    Jan Beulich
     
  • Discard all symbols not interesting for kallsyms use: absolute,
    section, and in the common case (!KALLSYMS_ALL) data ones.

    Signed-off-by: Jan Beulich
    Signed-off-by: Rusty Russell

    Jan Beulich
     
  • * 'for-linus' of git://neil.brown.name/md: (97 commits)
    md: raid-1/10: fix RW bits manipulation
    md: remove unnecessary memset from multipath.
    md: report device as congested when suspended
    md: Improve name of threads created by md_register_thread
    md: remove sparse warnings about lock context.
    md: remove sparse waring "symbol xxx shadows an earlier one"
    async_tx/raid6: add missing dma_unmap calls to the async fail case
    ioat3: fix uninitialized var warnings
    drivers/dma/ioat/dma_v2.c: fix warnings
    raid6test: fix stack overflow
    ioat2: clarify ring size limits
    md/raid6: cleanup ops_run_compute6_2
    md/raid6: eliminate BUG_ON with side effect
    dca: module load should not be an error message
    ioat: driver version 4.0
    dca: registering requesters in multiple dca domains
    async_tx: remove HIGHMEM64G restriction
    dmaengine: sh: Add Support SuperH DMA Engine driver
    dmaengine: Move all map_sg/unmap_sg for slave channel to its client
    fsldma: Add DMA_SLAVE support
    ...

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
    V4L/DVB (13039): dib0700: not building CONFIG_DVB_TUNER_DIB0070 breaks compilation
    V4L/DVB (13038): dvbdev: Remove an anoying/uneeded warning
    V4L/DVB (13037): go7007: Revert compatibility code added at the wrong place
    media: video: Fix build in saa7164

    Linus Torvalds
     
  • * 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6: (21 commits)
    HWPOISON: Enable error_remove_page on btrfs
    HWPOISON: Add simple debugfs interface to inject hwpoison on arbitary PFNs
    HWPOISON: Add madvise() based injector for hardware poisoned pages v4
    HWPOISON: Enable error_remove_page for NFS
    HWPOISON: Enable .remove_error_page for migration aware file systems
    HWPOISON: The high level memory error handler in the VM v7
    HWPOISON: Add PR_MCE_KILL prctl to control early kill behaviour per process
    HWPOISON: shmem: call set_page_dirty() with locked page
    HWPOISON: Define a new error_remove_page address space op for async truncation
    HWPOISON: Add invalidate_inode_page
    HWPOISON: Refactor truncate to allow direct truncating of page v2
    HWPOISON: check and isolate corrupted free pages v2
    HWPOISON: Handle hardware poisoned pages in try_to_unmap
    HWPOISON: Use bitmask/action code for try_to_unmap behaviour
    HWPOISON: x86: Add VM_FAULT_HWPOISON handling to x86 page fault handler v2
    HWPOISON: Add poison check to page fault handling
    HWPOISON: Add basic support for poisoned pages in fault handler v3
    HWPOISON: Add new SIGBUS error codes for hardware poison signals
    HWPOISON: Add support for poison swap entries v2
    HWPOISON: Export some rmap vma locking to outside world
    ...

    Linus Torvalds
     
  • drivers/usb/serial/sierra.c: In function 'sierra_suspend':
    drivers/usb/serial/sierra.c:936: error: 'struct usb_device' has no member named 'auto_pm'

    Repairs

    commit e6929a9020acbeb04d9a3ad9a88234c15be808fd
    Author: Oliver Neukum
    Date: Fri Sep 4 23:19:53 2009 +0200

    USB: support for autosuspend in sierra while online

    Cc: Greg KH
    Cc: Oliver Neukum
    Cc: Elina Pasheva
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • This brings Alpha AGP platforms in sync with the change to struct
    agp_memory (unsigned long *memory => struct page **pages).

    Only compile tested (I don't have titan/marvel hardware), but this change
    looks pretty straightforward, so hopefully it's ok.

    Signed-off-by: Ivan Kokshaysky
    Cc: Richard Henderson
    Cc: Dave Airlie
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ivan Kokshaysky
     
  • Because the binfmt is not different between threads in the same process,
    it can be moved from task_struct to mm_struct. And binfmt moudle is
    handled per mm_struct instead of task_struct.

    Signed-off-by: Hiroshi Shimamoto
    Acked-by: Oleg Nesterov
    Cc: Rusty Russell
    Acked-by: Roland McGrath
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Hiroshi Shimamoto
     
  • When unaligned accesses are required for uncompressing a kernel (such as
    for LZO decompression on ARM in a patch that follows), including
    causes issues as it brings in a lot of things that are
    not available in the decompression environment.

    linux/kernel.h brings at least:
    extern int console_printk[];
    extern const char hex_asc[];
    which causes errors at link-time as they are not available when
    compiling the pre-boot environement. There are also a few others:

    arch/arm/boot/compressed/misc.o: In function `valid_user_regs':
    arch/arm/include/asm/ptrace.h:158: undefined reference to `elf_hwcap'
    arch/arm/boot/compressed/misc.o: In function `console_silent':
    include/linux/kernel.h:292: undefined reference to `console_printk'
    arch/arm/boot/compressed/misc.o: In function `console_verbose':
    include/linux/kernel.h:297: undefined reference to `console_printk'
    arch/arm/boot/compressed/misc.o: In function `pack_hex_byte':
    include/linux/kernel.h:360: undefined reference to `hex_asc'
    arch/arm/boot/compressed/misc.o: In function `hweight_long':
    include/linux/bitops.h:45: undefined reference to `hweight32'
    arch/arm/boot/compressed/misc.o: In function `__cmpxchg_local_generic':
    include/asm-generic/cmpxchg-local.h:21: undefined reference to `wrong_size_cmpxchg'
    include/asm-generic/cmpxchg-local.h:42: undefined reference to `wrong_size_cmpxchg'
    arch/arm/boot/compressed/misc.o: In function `__xchg':
    arch/arm/include/asm/system.h:309: undefined reference to `__bad_xchg'

    However, those files apparently use nothing from , all
    they need is the declaration of types such as u32 or u64, so
    should be enough

    Signed-off-by: Albin Tonnerre
    Cc: Sam Ravnborg
    Cc: Russell King
    Cc: Ingo Molnar
    Cc: Thomas Gleixner
    Cc: "H. Peter Anvin"
    Cc: Phillip Lougher
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Albin Tonnerre
     
  • If the lzma/gzip decompressors are called with insufficient input data
    (len > 0 & fill = NULL), they will attempt to call the fill function to
    obtain more data, leading to a kernel oops.

    Signed-off-by: Phillip Lougher
    Cc: "H. Peter Anvin"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Phillip Lougher
     
  • In this case, the calls to request_mem_region, ioremap, and
    release_mem_region all have a consistent length argument, len, but since
    in other files (res->end - res->start) + 1, equivalent to
    resource_size(res), is used for a resource-typed structure res, one could
    consider whether the same should be done here.

    The problem was found using the following semantic patch:
    (http://www.emn.fr/x-info/coccinelle/)

    //
    @@
    struct resource *res;
    @@

    - (res->end - res->start) + 1
    + resource_size(res)

    @@
    struct resource *res;
    @@

    - res->end - res->start
    + BAD(resource_size(res))
    //

    Signed-off-by: Julia Lawall
    Acked-by: Florian Fainelli
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Julia Lawall
     
  • romfs_iget returns an ERR_PTR value in an error case instead of NULL.

    A simplified version of the semantic match that finds this problem is as
    follows: (http://coccinelle.lip6.fr/)

    //
    @match exists@
    expression x, E;
    statement S1, S2;
    @@

    x = romfs_iget(...)
    ... when != x = E
    (
    * if (x == NULL || ...) S1 else S2
    |
    * if (x == NULL && ...) S1 else S2
    )
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Julia Lawall
     
  • The allocation may fail.

    Signed-off-by: Roel Kluin
    Acked-by: Jack Steiner
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Roel Kluin
     
  • Signed-off-by: Alexey Dobriyan
    Cc: Jack Steiner
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexey Dobriyan
     
  • ->ioctx_lock and ->ioctx_list are used only under CONFIG_AIO.

    Signed-off-by: Alexey Dobriyan
    Cc: Zach Brown
    Cc: Benjamin LaHaise
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexey Dobriyan
     
  • id_reg.if_mode might be unitialized when (*mrq)->error is nonzero. move
    dev_dbg() inside the if so that we are sure we can use id_reg values.

    Signed-off-by: Jiri Slaby
    Cc: Alex Dubov
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jiri Slaby
     
  • unsigned block cannot be less than 0.

    Signed-off-by: Roel Kluin
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Roel Kluin
     
  • Module edac_core.ko uses call_rcu() callbacks in edac_device.c, edac_mc.c
    and edac_pci.c.

    They all use a wait_for_completion() scheme, but this scheme it not 100%
    safe on multiple CPUs. See the _rcu_barrier() implementation which
    explains why extra precausion is needed.

    The patch adds a comment about rcu_barrier() and as a precausion calls
    rcu_barrier(). A maintainer needs to look at removing the
    wait_for_completion code.

    [dougthompson@xmission.com: remove the wait_for_completion code]
    Signed-off-by Jesper Dangaard Brouer
    Signed-off-by: Doug Thompson
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jesper Dangaard Brouer
     
  • A driver for the Intel 3200 and 3210 memory controllers. It has only had
    light testing so far, and currently makes no attempt to decode error
    addresses at anything finer than csrow granularity.

    Signed-off-by: Jason Uhlenkott
    Signed-off-by: Doug Thompson
    Cc: Ingo Molnar
    Cc: "H. Peter Anvin"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jason Uhlenkott
     
  • Use the function resource_size, which reduces the chance of introducing
    off-by-one errors in calculating the resource size.

    The semantic patch that makes this change is as follows:
    (http://www.emn.fr/x-info/coccinelle/)

    //
    @@
    struct resource *res;
    @@

    - (res->end - res->start) + 1
    + resource_size(res)
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: Doug Thompson
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Julia Lawall
     
  • Add support for the Freescale MPC83xx memory controller to the existing
    driver for the Freescale MPC85xx memory controller. The only difference
    between the two processors are in the CS_BNDS register parsing code, which
    has been changed so it will work on both processors.

    The L2 cache controller does not exist on the MPC83xx, but the OF
    subsystem will not use the driver if the device is not present in the OF
    device tree.

    I had to change the nr_pages calculation to make the math work out. I
    checked it on my board and did the math by hand for a 64GB 85xx using 64K
    pages. In both cases, nr_pages * PAGE_SIZE comes out to the correct
    value.

    Signed-off-by: Ira W. Snyder
    Signed-off-by: Doug Thompson
    Cc: Kumar Gala
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ira W. Snyder
     
  • Based on Kumar's new compatible types patch, add P2020 into MPC85xx EDAC
    compatible lists so that EDAC can recognize P2020 meomry controller and L2
    cache controller and export the relevant fields to sysfs.

    EDAC MPC85xx DDR3 support is needed if DDR3 memory stick is installed on a
    P2020DS board so that EDAC core can recognize DDR3 memory type.

    Signed-off-by: Yang Shi
    Acked-by: Dave Jiang
    Signed-off-by: Doug Thompson
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Yang Shi
     
  • The forward decls for some kernel types are only needed by the code behind
    __KERNEL__, so don't bleed these types to userspace.

    Signed-off-by: Mike Frysinger
    Cc: Thomas Gleixner
    Cc: Ingo Molnar
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mike Frysinger
     
  • CLONE_PARENT was used to implement an older threading model. For
    consistency with the CLONE_THREAD check in copy_pid_ns(), disable
    CLONE_PARENT with CLONE_NEWPID, at least until the required semantics of
    pid namespaces are clear.

    Signed-off-by: Sukadev Bhattiprolu
    Acked-by: Roland McGrath
    Acked-by: Serge Hallyn
    Cc: Oren Laadan
    Cc: Oleg Nesterov
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Sukadev Bhattiprolu