23 Oct, 2008

15 commits


21 Oct, 2008

25 commits

  • Commit f06febc96ba8e0af80bcc3eaec0a109e88275fac ("timers: fix itimer/
    many thread hang") introduced a new task_cputime interface and
    subsequently only converted binfmt_elf over to it. This results in the
    build for binfmt_elf_fdpic blowing up given that p->signal->{u,s}time
    have disappeared from underneath us.

    Apply the same trivial fix from binfmt_elf to binfmt_elf_fdpic.

    Signed-off-by: Paul Mundt
    Signed-off-by: Linus Torvalds

    Paul Mundt
     
  • Removed duplicated #include in mm/vmalloc.c and
    "internal.h" in mm/memory.c.

    Signed-off-by: Huang Weiyi
    Signed-off-by: Linus Torvalds

    Huang Weiyi
     
  • We're trying to keep the !CONFIG_SHMEM tiny-shmem.c (using ramfs without
    swap) in synch with CONFIG_SHMEM shmem.c (and mpm is preparing patches
    to combine them). I was glad to see EXPORT_SYMBOL_GPL(shmem_file_setup)
    go into shmem.c, but why not support DRM-GEM when !CONFIG_SHMEM too?
    But caution says still depend on MMU, since !CONFIG_MMU is.. different.

    Signed-off-by: Hugh Dickins
    Acked-by: Matt Mackall
    Acked-by: Dave Airlie
    Signed-off-by: Linus Torvalds

    Hugh Dickins
     
  • __FUNCTION__ is gcc-specific, use __func__

    Signed-off-by: Harvey Harrison
    Acked-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Harvey Harrison
     
  • commit 9b7530cc329eb036cfa589930c270e85031f554c ("i915: cleanup coding
    horrors in i915_gem_gtt_pwrite()")

    broke the i386 build for CONFIG_HIGHMEM=y.

    Caught by automatic testing http://www.tglx.de/autoqa-logs/000137-0006-0001.log

    Signed-off-by: Thomas Gleixner
    [ My bad. It's the same patch I sent out earlier, nobody noticed then either.. ]
    Signed-off-by: Linus Torvalds

    Thomas Gleixner
     
  • powerpc doesn't use the generic WARN_ON infrastructure. The newly
    introduced WARN() as a result didn't print the message, this patch adds
    the printk for this specific case.

    Signed-off-by: Arjan van de Ven
    Signed-off-by: Linus Torvalds

    Arjan van de Ven
     
  • This fixes

    kernel/kexec.c: In function 'crash_save_vmcoreinfo_init':
    kernel/kexec.c:1374: error: 'vmlist' undeclared (first use in this function)
    kernel/kexec.c:1374: error: (Each undeclared identifier is reported only once
    kernel/kexec.c:1374: error: for each function it appears in.)
    kernel/kexec.c:1410: error: invalid use of undefined type 'struct vm_struct'
    make[1]: *** [kernel/kexec.o] Error 1

    Signed-off-by: Tony Luck
    Signed-off-by: Linus Torvalds

    Luck, Tony
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
    parisc: convert to generic compat_sys_ptrace
    parisc: add rtc platform driver
    parisc: initialize unwinder much earlier
    parisc: add new syscalls
    parisc: hijack jump to start_kernel
    parisc: add pdc_coproc_cfg_unlocked and set_firmware_width_unlocked
    parisc: move include/asm-parisc to arch/parisc/include/asm
    parisc: move pdc_result to real2.S
    parisc: unify CCIO_COLLECT_STATS implementation
    parisc: add arch/parisc/kernel/.gitignore
    parisc: ropes.h - fix ->
    parisc: parisc-agp - fix ->

    Resolve remove/rename conflict: include/asm-parisc/a.out.h is no longer
    relevant.

    Linus Torvalds
     
  • This gets rid of an annoying warning in ehci-hcd.c when DEBUG isn't
    enabled:

    warning: label 'err_debug' defined but not used

    by moving it inside the already-existing #ifdef DEBUG, so that it
    matches the goto. And now my regular build is warning-free again.

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • Yes, this will probably be switched over to a cleaner model anyway, but
    in the meantime I don't want to see the 'unused variable' warnings that
    come from the disgusting #ifdef code. Make the special case be a nice
    inlien function of its own, clean up the code, and make the warning go
    away.

    I wish people didn't write code that gets (valid) warnings from the
    compiler, but I'll limit my fixes to code that I actually care about (in
    this case just because I see the warning and it annoys me).

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • Use "%zd" for size_t, and make sure to have a space between the numbers
    instead of depending on the field width.

    I don't like warnings in my default targeted build.

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • * 'bkl-removal' of git://git.lwn.net/linux-2.6:
    UIO: BKL removal

    Linus Torvalds
     
  • * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (41 commits)
    PCI: fix pci_ioremap_bar() on s390
    PCI: fix AER capability check
    PCI: use pci_find_ext_capability everywhere
    PCI: remove #ifdef DEBUG around dev_dbg call
    PCI hotplug: fix get_##name return value problem
    PCI: document the pcie_aspm kernel parameter
    PCI: introduce an pci_ioremap(pdev, barnr) function
    powerpc/PCI: Add legacy PCI access via sysfs
    PCI: Add ability to mmap legacy_io on some platforms
    PCI: probing debug message uniformization
    PCI: support PCIe ARI capability
    PCI: centralize the capabilities code in probe.c
    PCI: centralize the capabilities code in pci-sysfs.c
    PCI: fix 64-vbit prefetchable memory resource BARs
    PCI: replace cfg space size (256/4096) by macros.
    PCI: use resource_size() everywhere.
    PCI: use same arg names in PCI_VDEVICE comment
    PCI hotplug: rpaphp: make debug var unique
    PCI: use %pF instead of print_fn_descriptor_symbol() in quirks.c
    PCI: fix hotplug get_##name return value problem
    ...

    Linus Torvalds
     
  • …l/git/tip/linux-2.6-tip

    * 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (131 commits)
    tracing/fastboot: improve help text
    tracing/stacktrace: improve help text
    tracing/fastboot: fix initcalls disposition in bootgraph.pl
    tracing/fastboot: fix bootgraph.pl initcall name regexp
    tracing/fastboot: fix issues and improve output of bootgraph.pl
    tracepoints: synchronize unregister static inline
    tracepoints: tracepoint_synchronize_unregister()
    ftrace: make ftrace_test_p6nop disassembler-friendly
    markers: fix synchronize marker unregister static inline
    tracing/fastboot: add better resolution to initcall debug/tracing
    trace: add build-time check to avoid overrunning hex buffer
    ftrace: fix hex output mode of ftrace
    tracing/fastboot: fix initcalls disposition in bootgraph.pl
    tracing/fastboot: fix printk format typo in boot tracer
    ftrace: return an error when setting a nonexistent tracer
    ftrace: make some tracers reentrant
    ring-buffer: make reentrant
    ring-buffer: move page indexes into page headers
    tracing/fastboot: only trace non-module initcalls
    ftrace: move pc counter in irqtrace
    ...

    Manually fix conflicts:
    - init/main.c: initcall tracing
    - kernel/module.c: verbose level vs tracepoints
    - scripts/bootgraph.pl: fallout from cherry-picking commits.

    Linus Torvalds
     
  • …git/tip/linux-2.6-tip

    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86 ACPI: fix breakage of resume on 64-bit UP systems with SMP kernel
    Introduce is_vmalloc_or_module_addr() and use with DEBUG_VIRTUAL

    Linus Torvalds
     
  • …/git/tip/linux-2.6-tip

    This merges branches irq/genirq, irq/sparseirq-v4, timers/hpet-percpu
    and x86/uv.

    The sparseirq branch is just preliminary groundwork: no sparse IRQs are
    actually implemented by this tree anymore - just the new APIs are added
    while keeping the old way intact as well (the new APIs map 1:1 to
    irq_desc[]). The 'real' sparse IRQ support will then be a relatively
    small patch ontop of this - with a v2.6.29 merge target.

    * 'genirq-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (178 commits)
    genirq: improve include files
    intr_remapping: fix typo
    io_apic: make irq_mis_count available on 64-bit too
    genirq: fix name space collisions of nr_irqs in arch/*
    genirq: fix name space collision of nr_irqs in autoprobe.c
    genirq: use iterators for irq_desc loops
    proc: fixup irq iterator
    genirq: add reverse iterator for irq_desc
    x86: move ack_bad_irq() to irq.c
    x86: unify show_interrupts() and proc helpers
    x86: cleanup show_interrupts
    genirq: cleanup the sparseirq modifications
    genirq: remove artifacts from sparseirq removal
    genirq: revert dynarray
    genirq: remove irq_to_desc_alloc
    genirq: remove sparse irq code
    genirq: use inline function for irq_to_desc
    genirq: consolidate nr_irqs and for_each_irq_desc()
    x86: remove sparse irq from Kconfig
    genirq: define nr_irqs for architectures with GENERIC_HARDIRQS=n
    ...

    Linus Torvalds
     
  • …/git/tip/linux-2.6-tip

    * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    m32r: fix build due to notify_cpu_starting() change
    powerpc: fix linux-next build failure

    Linus Torvalds
     
  • …/git/tip/linux-2.6-tip

    * 'v28-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (36 commits)
    fix documentation of sysrq-q really
    Fix documentation of sysrq-q
    timer_list: add base address to clock base
    timer_list: print cpu number of clockevents device
    timer_list: print real timer address
    NOHZ: restart tick device from irq_enter()
    NOHZ: split tick_nohz_restart_sched_tick()
    NOHZ: unify the nohz function calls in irq_enter()
    timers: fix itimer/many thread hang, fix
    timers: fix itimer/many thread hang, v3
    ntp: improve adjtimex frequency rounding
    timekeeping: fix rounding problem during clock update
    ntp: let update_persistent_clock() sleep
    hrtimer: reorder struct hrtimer to save 8 bytes on 64bit builds
    posix-timers: lock_timer: make it readable
    posix-timers: lock_timer: kill the bogus ->it_id check
    posix-timers: kill ->it_sigev_signo and ->it_sigev_value
    posix-timers: sys_timer_create: cleanup the error handling
    posix-timers: move the initialization of timer->sigq from send to create path
    posix-timers: sys_timer_create: simplify and s/tasklist/rcu/
    ...

    Fix trivial conflicts due to sysrq-q description clahes in
    Documentation/sysrq.txt and drivers/char/sysrq.c

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (36 commits)
    ide: re-add TRM290 fix lost during ide_build_dmatable() cleanup
    scc_pata: kill unused variables
    sgiioc4: kill duplicate ioremap()
    sgiioc4: kill useless address checks
    delkin_cb: add PM support
    ide: remove broken hpt34x driver
    ide-floppy: remove idefloppy_floppy_t typedef
    sgiioc4: remove maskproc() method
    hpt366: cleanup maskproc() method
    ide: mask interrupt in ide_config_drive_speed()
    hpt366: fix compile warning
    ide: remove unused macros from
    ide: remove M68K_IDE_SWAPW define from
    ide: remove dead
    ide: fix support for IDE PCI controllers using MMIO on frv
    ide-cd: remove stale comment
    ide-cd: small drive type print fix
    ide-cd: debug log enhancements
    ide: add generic ATA/ATAPI disk driver
    ide: allow device drivers to specify per-device type /proc settings
    ...

    Linus Torvalds
     
  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
    fsldma: allow Freescale Elo DMA driver to be compiled as a module
    fsldma: remove internal self-test from Freescale Elo DMA driver
    drivers/dma/dmatest.c: switch a GFP_ATOMIC to GFP_KERNEL
    dmatest: properly handle duplicate DMA channels
    drivers/dma/ioat_dma.c: drop code after return
    async_tx: make async_tx_run_dependencies() easier to read

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
    [WATCHDOG] ib700wdt.c - fix buffer_underflow bug

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
    fuse: implement nonseekable open
    fuse: add include protectors
    fuse: config description improvement
    fuse: add missing fuse_request_free
    fuse: fix SEEK_END incorrectness

    Linus Torvalds
     
  • A consolidated implementation will provide this generically through
    asm/byteorder, remove direct includes to avoid breakage when the
    changeover to the new implementation occurs.

    This hunk was lost from commit 1d8cca44b6a244b7e378546d719041819049a0f9
    ("byteorder: provide swabb.h generically in asm/byteorder.h")

    Signed-off-by: Harvey Harrison
    Signed-off-by: Linus Torvalds

    Harvey Harrison
     
  • Update assorted email addresses and related info to point
    to a single current, valid address.

    additionally
    - trivial CREDITS entry updates. (Not that this file means much any more)
    - remove arjans dead redhat.com address from powernow driver

    Signed-off-by: Dave Jones
    Signed-off-by: Linus Torvalds

    Dave Jones
     
  • Use fs/*/Kconfig more, which is good because everything related to one
    filesystem is in one place and fs/Kconfig is quite fat.

    Signed-off-by: Alexey Dobriyan
    Signed-off-by: Linus Torvalds

    Alexey Dobriyan