29 Apr, 2008

40 commits

  • init/do_mounts_rd.c:215:13: warning: Using plain integer as NULL pointer
    init/do_mounts_md.c:136:45: warning: Using plain integer as NULL pointer

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

    Harvey Harrison
     
  • My recent additions to compat_ptrace_request made it mandatory
    for CONFIG_COMPAT arch's to define copy_siginfo_from_user32.
    This broke some builds, though they all really should get cleaned
    up in that way.

    Since all the arch's that actually call compat_ptrace_request have
    now been cleaned up to use the generic compat_sys_ptrace, we can
    avoid the build problems on the crufty arch's by changing the
    conditionals on the definition.

    Signed-off-by: Roland McGrath
    Signed-off-by: Linus Torvalds

    Roland McGrath
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
    slub: pack objects denser
    slub: Calculate min_objects based on number of processors.
    slub: Drop DEFAULT_MAX_ORDER / DEFAULT_MIN_OBJECTS
    slub: Simplify any_slab_object checks
    slub: Make the order configurable for each slab cache
    slub: Drop fallback to page allocator method
    slub: Fallback to minimal order during slab page allocation
    slub: Update statistics handling for variable order slabs
    slub: Add kmem_cache_order_objects struct
    slub: for_each_object must be passed the number of objects in a slab
    slub: Store max number of objects in the page struct.
    slub: Dump list of objects not freed on kmem_cache_close()
    slub: free_list() cleanup
    slub: improve kmem_cache_destroy() error message
    slob: fix bug - when slob allocates "struct kmem_cache", it does not force alignment.

    Linus Torvalds
     
  • The 64-bit vDSO image is in a special ".vdso" section for no reason
    I can determine. Furthermore, the location of the vdso_end symbol
    includes some wrongly-calculated padding space in the image, which
    is then (correctly) rounded to page size, resulting in an extra page
    of zeros in the image mapped in to user processes.

    This changes it to put the vdso.so image into normal initdata as we
    have always done for the 32-bit vDSO images. The extra padding is
    gone, so the user VMA is one page instead of two. The image that
    was already copied around at boot time is now in initdata, so we
    recover that wasted space after boot.

    Signed-off-by: Roland McGrath
    Signed-off-by: Linus Torvalds

    Roland McGrath
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
    [CPUFREQ] Make acpi-cpufreq more robust against BIOS freq changes behind our back.
    [CPUFREQ] change cpu freq tables to per_cpu variables
    [CPUFREQ] fix show_trans_table
    [CPUFREQ] Warn when cpufreq_register_notifier called before pure initcalls
    [CPUFREQ] Refactor locking in cpufreq_add_dev
    [CPUFREQ] more CodingStyle
    [CPUFREQ] CodingStyle
    [CPUFREQ] Slightly shorten the error paths of cpufreq_suspend/cpufreq_resume

    Linus Torvalds
     
  • This patch fixes the following compile error caused by commit
    04753278769f3b6c3b79a080edb52f21d83bf6e2 ("memory hotplug: register
    section/node id to free"):

    CC mm/memory_hotplug.o
    /home/bunk/linux/kernel-2.6/git/linux-2.6/mm/memory_hotplug.c: In function ‘put_page_bootmem’:
    /home/bunk/linux/kernel-2.6/git/linux-2.6/mm/memory_hotplug.c:82: error: implicit declaration of function ‘__free_pages_bootmem’
    /home/bunk/linux/kernel-2.6/git/linux-2.6/mm/memory_hotplug.c: At top level:
    /home/bunk/linux/kernel-2.6/git/linux-2.6/mm/memory_hotplug.c:87: warning: no previous prototype for ‘register_page_bootmem_info_section’
    make[2]: *** [mm/memory_hotplug.o] Error 1

    [ Andrew: "Argh. The -mm-only memory-hotplug-add-removable-to-sysfs-
    to-show-memblock-removability.patch debugging patch adds that include
    so nobody hit this before. ]

    Signed-off-by: Adrian Bunk
    Signed-off-by: Linus Torvalds

    Adrian Bunk
     
  • The scheduler hrtimer bits in 2.6.25 introduced a circular lock
    dependency in a rare code path:

    =======================================================
    [ INFO: possible circular locking dependency detected ]
    2.6.25-sched-devel.git-x86-latest.git #19
    -------------------------------------------------------
    X/2980 is trying to acquire lock:
    (&rq->rq_lock_key#2){++..}, at: [] task_rq_lock+0x56/0xa0

    but task is already holding lock:
    (&cpu_base->lock){++..}, at: [] lock_hrtimer_base+0x31/0x60

    which lock already depends on the new lock.

    The scenario which leads to this is:

    posix-timer signal is delivered
    -> posix-timer is rearmed
    timer is already expired in hrtimer_enqueue()
    -> softirq is raised

    To prevent this we need to move the raise of the softirq out of the
    base->lock protected code path.

    Signed-off-by: Thomas Gleixner
    Cc: stable@kernel.org
    Acked-by: Peter Zijlstra

    Thomas Gleixner
     
  • We checked the hardware freq with OS cached freq value in get_cur_freqon_cpu().

    Signed-off-by: Venkatesh Pallipadi
    Signed-off-by: Thomas Renninger
    Signed-off-by: Dave Jones

    Venkatesh Pallipadi
     
  • Change cpufreq tables from arrays to per_cpu variables in
    drivers/acpi/processor_thermal.c

    Based on git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

    Cc: Len Brown
    Signed-off-by: Mike Travis
    Signed-off-by: Dave Jones

    Mike Travis
     
  • Fix show_trans_table when it overflows PAGE_SIZE.

    * Not all snprintf calls were protected against being passed a negative
    length.
    * When show_trans_table overflows, len might be > PAGE_SIZE. In that case,
    returns PAGE_SIZE.

    Signed-off-by: Cesar Eduardo Barros
    Signed-off-by: Dave Jones

    Cesar Eduardo Barros
     
  • If cpufreq_register_notifier is called before pure initcalls,
    init_cpufreq_transition_notifier_list will overwrite whatever it did,
    causing notifiers to be ignored.

    Print some noise to the kernel log if that happens.

    Signed-off-by: Cesar Eduardo Barros
    Signed-off-by: Dave Jones

    Cesar Eduardo Barros
     
  • Simplify this by moving the unlocking out of the error
    paths into the exit path.

    Signed-off-by: Dave Jones

    Dave Jones
     
  • void * p -> void *p
    no space between function parameters
    removed excess whitespace

    Signed-off-by: Dave Jones

    Dave Jones
     
  • return is not a function.

    Signed-off-by: Dave Jones

    Dave Jones
     
  • Signed-off-by: Dave Jones

    Dave Jones
     
  • * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (45 commits)
    [MIPS] Pb1200/DBAu1200: move platform code to its proper place
    [MIPS] Fix handling of trap and breakpoint instructions
    [MIPS] Pb1200: do register SMC 91C111
    [MIPS] DBAu1200: fix bad SMC 91C111 resource size
    [NET] Kconfig: Rename MIKROTIK_RB500 -> MIKROTIK_RB532
    [MIPS] IP27: Fix build bug due to missing include
    [MIPS] Fix some sparse warnings on traps.c and irq-msc01.c
    [MIPS] cevt-gt641xx: Kill unnecessary include
    [MIPS] DS1287: Add clockevent driver
    [MIPS] add DECstation I/O ASIC clocksource
    [MIPS] rbtx4938: minor cleanup
    [MIPS] Alchemy: kill unused PCI_IRQ_TABLE_LOOKUP macro
    [MIPS] rbtx4938: misc cleanups
    [MIPS] jmr3927: use generic txx9 gpio
    [MIPS] rbhma4500: use generic txx9 gpio
    [MIPS] generic txx9 gpio support
    [MIPS] make fallback gpio.h gpiolib-friendly
    [MIPS] unexport null_perf_irq() and make it static
    [MIPS] unexport rtc_mips_set_time()
    [MIPS] unexport copy_from_user_page()
    ...

    Linus Torvalds
     
  • This bug was introduced in the 2.6.24 i386/x86_64 tree merge, where
    MSI-X vector allocation will eventually fail. The cause is the new
    bit array tracking used vectors is not getting cleared properly on
    IRQ destruction on the 32-bit APIC code.

    This can be seen easily using the ixgbe 10 GbE driver on multi-core
    systems by simply loading and unloading the driver a few times.
    Depending on the number of available vectors on the host system, the
    MSI-X allocation will eventually fail, and the driver will only be
    able to use legacy interrupts.

    I am generating the same patch for both stable trees for 2.6.24 and
    2.6.25.

    Signed-off-by: Peter P Waskiewicz Jr
    Signed-off-by: Linus Torvalds

    PJ Waskiewicz
     
  • bitops source file was renamed, so fix docbook for that.
    docproc: linux-2.6.25-git11/include/asm-x86/bitops_32.h: No such file or directory

    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
    SELinux: Fix a RCU free problem with the netport cache
    SELinux: Made netnode cache adds faster
    SELinux: include/security.h whitespace, syntax, and other cleanups
    SELinux: policydb.h whitespace, syntax, and other cleanups
    SELinux: mls_types.h whitespace, syntax, and other cleanups
    SELinux: mls.h whitespace, syntax, and other cleanups
    SELinux: hashtab.h whitespace, syntax, and other cleanups
    SELinux: context.h whitespace, syntax, and other cleanups
    SELinux: ss/conditional.h whitespace, syntax, and other cleanups
    SELinux: selinux/include/security.h whitespace, syntax, and other cleanups
    SELinux: objsec.h whitespace, syntax, and other cleanups
    SELinux: netlabel.h whitespace, syntax, and other cleanups
    SELinux: avc_ss.h whitespace, syntax, and other cleanups

    Fixed up conflict in include/linux/security.h manually

    Linus Torvalds
     
  • Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • * endianness annotations
    * endianness fixes
    * missing get_unaligned/put_unaligned

    It's pretty much all over the place, changes to different files are independent.

    Signed-off-by: Al Viro
    Serial-parts-Acked-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • usb_control_msg() converts arguments to little-endian itself,
    doing that in caller means breakage on big-endian boxen.

    Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • again, fallout from ide merge

    Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • it's ata_link, not ata_linke

    Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • psr is not a good name for local variable in macro body when it
    has a good chance of being the argument of said macro (actually
    is at least in one place)

    Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • * EXTRA_CFLAGS do not apply for *.S
    * don't bother with symlinks to ../lib/mem*.S, just add ../lib/mem*.o
    to object list

    Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • Signed-off-by: Al Viro
    Acked-by: David Howells
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
    sparc: video drivers: add facility level
    sparc: tcx.c make tcx_init and tcx_exit static
    sparc: ffb.c make ffb_init and ffb_exit static
    sparc: cg14.c make cg14_init and cg15_exit static
    sparc: bw2.c fix bw2_exit
    sparc64: Fix accidental syscall restart on child return from clone/fork/vfork.
    sparc64: Clean up handling of pt_regs trap type encoding.
    sparc: Remove old style signal frame support.
    sparc64: Kill bogus RT_ALIGNEDSZ macro from signal.c
    sparc: sunzilog.c remove unused argument
    sparc: fix drivers/video/tcx.c warning
    sparc64: Kill unused local ISA bus layer.
    input: Rewrite sparcspkr device probing.
    sparc64: Do not ignore 'pmu' device ranges.
    sparc64: Kill ISA_FLOPPY_WORKS code.
    sparc64: Kill CONFIG_SPARC32_COMPAT
    sparc64: Cleanups and corrections for arch/sparc64/Kconfig
    sparc64: Fix wedged irq regression.

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
    iwlwifi: Allow building iwl3945 without iwl4965.
    wireless: Fix compile error with wifi & leds
    tcp: Fix slab corruption with ipv6 and tcp6fuzz
    ipv4/ipv6 compat: Fix SSM applications on 64bit kernels.
    [IPSEC]: Use digest_null directly for auth
    sunrpc: fix missing kernel-doc
    can: Fix copy_from_user() results interpretation
    Revert "ipv6: Fix typo in net/ipv6/Kconfig"
    tipc: endianness annotations
    ipv6: result of csum_fold() is already 16bit, no need to cast
    [XFRM] AUDIT: Fix flowlabel text format ambibuity.

    Linus Torvalds
     
  • this option has been the default on a wide range of distributions
    for a long time - time to make it non-experimental.

    Signed-off-by: Ingo Molnar
    Signed-off-by: Linus Torvalds

    Ingo Molnar
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
    hrtimer: timeout too long when using HRTIMER_CB_SOFTIRQ

    Linus Torvalds
     
  • Since both the IDE interface and SMC 91C111 Ethernet chip are on-board
    devices, not SOC devices, move the platform device registration form the
    common to the board specific code.

    While at it, remove semicolon (which didn't break compilation only by
    chance) from the AU1XXX_ATA_DDMA_REQ macro and do some renaming:

    - change 'au1200_ide0_' variable name prefix to the mere 'ide_';

    - change 'smc91x_' variable name prefix to 'smc91c111_' since that's the
    name of the chip used on the boards;

    - drop 'AU1XXX_' prefix from the names of macros describing IDE and Ethernet
    on-board devices;

    - change 'SMC91111_' to 'SMC91C111_', change 'IRQ' to 'INT' in the names of
    the macros describing the Ethernet chip for consistency with the IDE
    macros;

    - change 'ATA_' to 'IDE_' and 'OFFSET' to 'SHIFT' (since this value is
    indeed a shift count) in the names of the macros describing the IDE
    interface.

    Signed-off-by: Sergei Shtylyov
    Signed-off-by: Ralf Baechle

    Sergei Shtylyov
     
  • With fixes and cleanups from Atsushi Nemoto (anemo@mba.ocn.ne.jp).

    Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • Pb1200 does have SMC 91C111 Ethernet chip on board but the platform code
    did not register it, so one couldn't mount NFS...

    Signed-off-by: Sergei Shtylyov
    Signed-off-by: Ralf Baechle

    Sergei Shtylyov
     
  • The on-board SMC 91C111 chip only decodes 16 bytes of memory (obviously, it
    can not decode a whole megabyte starting from address 0x19000300).

    Signed-off-by: Sergei Shtylyov
    Signed-off-by: Ralf Baechle

    Sergei Shtylyov
     
  • The platform is actually named routerboard 532 so let's call it this.

    Signed-off-by: Ralf Baechle
    Acked-by: Jeff Garzik

    Ralf Baechle
     
  • asm-mips/mach-ip27/topology.h must #include
    This fixes the following compile error:

    ...
    CC kernel/sched.o
    /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c: In function 'find_next_best_node':
    /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7015: error: implicit declaration of function 'node_to_cpumask_ptr'
    /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7015: error: '__tmp__' undeclared (first use in this function)
    /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7015: error: (Each undeclared identifier is reported only once
    /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7015: error: for each function it appears in.)
    /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c: In function 'sched_domain_node_span':
    /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7047: error: 'nodemask' undeclared (first use in this function)
    /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7048: warning: ISO C90 forbids mixed declarations and code
    /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7059: error: implicit declaration of function 'node_to_cpumask_ptr_next'
    /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c: In function '__build_sched_domains':
    /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7605: error: 'pnodemask' undeclared (first use in this function)
    make[2]: *** [kernel/sched.o] Error 1

    Signed-off-by: Adrian Bunk
    Signed-off-by: Ralf Baechle

    Adrian Bunk
     
  • * Declare board_bind_eic_interrupt, board_watchpoint_handler in traps.h
    * Make msc_bind_eic_interrupt static and fix its argument types.
    * Make msc_levelirq_type, msc_edgeirq_type static.

    Signed-off-by: Atsushi Nemoto
    Signed-off-by: Ralf Baechle

    Atsushi Nemoto