27 May, 2011

2 commits

  • By the previous style change, CONFIG_GENERIC_FIND_NEXT_BIT,
    CONFIG_GENERIC_FIND_BIT_LE, and CONFIG_GENERIC_FIND_LAST_BIT are not used
    to test for existence of find bitops anymore.

    Signed-off-by: Akinobu Mita
    Acked-by: Greg Ungerer
    Cc: Arnd Bergmann
    Cc: Russell King
    Cc: Martin Schwidefsky
    Cc: Heiko Carstens
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Akinobu Mita
     
  • The ns_cgroup is an annoying cgroup at the namespace / cgroup frontier and
    leads to some problems:

    * cgroup creation is out-of-control
    * cgroup name can conflict when pids are looping
    * it is not possible to have a single process handling a lot of
    namespaces without falling in a exponential creation time
    * we may want to create a namespace without creating a cgroup

    The ns_cgroup was replaced by a compatibility flag 'clone_children',
    where a newly created cgroup will copy the parent cgroup values.
    The userspace has to manually create a cgroup and add a task to
    the 'tasks' file.

    This patch removes the ns_cgroup as suggested in the following thread:

    https://lists.linux-foundation.org/pipermail/containers/2009-June/018616.html

    The 'cgroup_clone' function is removed because it is no longer used.

    This is a userspace-visible change. Commit 45531757b45c ("cgroup: notify
    ns_cgroup deprecated") (merged into 2.6.27) caused the kernel to emit a
    printk warning users that the feature is planned for removal. Since that
    time we have heard from XXX users who were affected by this.

    Signed-off-by: Daniel Lezcano
    Signed-off-by: Serge E. Hallyn
    Cc: Eric W. Biederman
    Cc: Jamal Hadi Salim
    Reviewed-by: Li Zefan
    Acked-by: Paul Menage
    Acked-by: Matt Helsley
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Daniel Lezcano
     

26 May, 2011

11 commits

  • This patch adds MSI support for 440SPe, 460Ex, 460Sx and 405Ex.

    Signed-off-by: Rupjyoti Sarmah
    Signed-off-by: Tirumala R Marri
    Acked-by: Josh Boyer
    Signed-off-by: Benjamin Herrenschmidt

    Rupjyoti Sarmah
     
  • Instead of looping over each irq and checking against the irq array
    bounds, adjust the bounds before looping.

    The old code will not free any irq if the irq + count is above
    irq_virq_count because the test in the loop is testing irq + count
    instead of irq + i.

    This code checks the limits to avoid unsigned integer overflows.

    Signed-off-by: Milton Miller
    Signed-off-by: Benjamin Herrenschmidt

    Milton Miller
     
  • The radix-tree code uses call_rcu when freeing internal elements.
    We must protect against the elements being freed while we traverse
    the tree, even if the returned pointer will still be valid.

    While preparing a patch to expand the context in which
    irq_radix_revmap_lookup will be called, I realized that the
    radix tree was not locked.

    When asked

    For a normal call_rcu usage, is it allowed to read the structure in
    irq_enter / irq_exit, without additional rcu_read_lock? Could an
    element freed with call_rcu advance with the cpu still between
    irq_enter/irq_exit (and irq_disabled())?

    Paul McKenney replied:

    Absolutely illegal to do so. OK for call_rcu_sched(), but a
    flaming bug for call_rcu().

    And thank you very much for finding this!!!

    Further analysis:

    In the current CONFIG_TREE_RCU implementation. CONFIG_TREE_PREEMPT_RCU
    (and CONFIG_TINY_PREEMPT_RCU) uses explicit counters.

    These counters are reflected from per-CPU to global in the
    scheduling-clock-interrupt handler, so disabling irq does prevent the
    grace period from completing. But there are real-time implementations
    (such as the one use by the Concurrent guys) where disabling irq
    does -not- prevent the grace period from completing.

    While an alternative fix would be to switch radix-tree to rcu_sched, I
    don't want to audit the other users of radix trees (nor put alternative
    freeing in the library). The normal overhead for rcu_read_lock and
    unlock are a local counter increment and decrement.

    This does not show up in the rcu lockdep because in 2.6.34 commit
    2676a58c98 (radix-tree: Disable RCU lockdep checking in radix tree)
    deemed it too hard to pass the condition of the protecting lock
    to the library.

    Signed-off-by: Milton Miller
    Reviewed-by: Paul E. McKenney
    Signed-off-by: Benjamin Herrenschmidt

    Milton Miller
     
  • Look up the descriptor and check that it is found in handle_one_irq
    before checking if we are on the irq stack, and call the handler
    directly using the descriptor if we are on the stack.

    We need check irq_to_desc finds the descriptor to avoid a NULL
    pointer dereference. It could have failed because the number from
    ppc_md.get_irq was above NR_IRQS, or various exceptional conditions
    with sparse irqs (eg race conditions while freeing an irq if its was
    not shutdown in the controller).

    fe12bc2c99 (genirq: Uninline and sanity check generic_handle_irq())
    moved generic_handle_irq out of line to allow its use by interrupt
    controllers in modules. However, handle_one_irq is core arch code.
    It already knows the details of struct irq_desc and handling irqs in
    the nested irq case. This will avoid the extra stack frame to return
    the value we don't check.

    Signed-off-by: Milton Miller
    Signed-off-by: Benjamin Herrenschmidt

    Milton Miller
     
  • Since kmem caches are allocated before init_IRQ as noted in 3af259d155
    (powerpc: Radix trees are available before init_IRQ), we now call
    kmalloc in all cases and can can always call kfree if we are asked
    to allocate a duplicate or conflicting IRQ_HOST_MAP_LEGACY host.

    Signed-off-by: Milton Miller
    Signed-off-by: Benjamin Herrenschmidt

    Milton Miller
     
  • The comment claims we will call host->ops->map() to update the flags if
    we find a previously established mapping, but we never did. We used
    to call remap, but that call was removed in da05198002 (powerpc: Remove
    irq_host_ops->remap hook).

    Signed-off-by: Milton Miller
    Signed-off-by: Benjamin Herrenschmidt

    Milton Miller
     
  • Rename functions and arguments to reflect current usage. iic_cause_ipi
    becomes iic_message_pass and iic_ipi_to_irq becomes iic_msg_to_irq,
    and iic_request_ipi now takes a message (msg) instead of an ipi number.
    Also mesg is renamed to msg.

    Commit f1072939b6 (powerpc: Remove checks for MSG_ALL and
    MSG_ALL_BUT_SELF) connected the smp_message_pass hook for cell to the
    underlying iic_cause_IPI, a platform unique name. Later 23d72bfd8f
    (powerpc: Consolidate ipi message mux and demux) added a cause_ipi
    hook to the smp_ops, also used in message passing, but for controllers
    that can not send 4 unique messages and require multiplexing. It is
    even more confusing that the both take two arguments, but one is the
    small message ordinal and the other is an opaque long data associated
    with the cpu.

    Since cell iic maps messages one to one to ipi irqs, rename the
    function and argument to translate from ipi to message. Also make it
    clear that iic_request_ipi takes a message number as the argument
    for which ipi to create and request.

    No functionional change, just renames to avoid future confusion.

    Signed-off-by: Milton Miller
    Signed-off-by: Benjamin Herrenschmidt

    Milton Miller
     
  • The cell iic interrupt controller has enough software caused interrupts
    to use a unique interrupt for each of the 4 messages powerpc uses.
    This means each interrupt gets its own irq action/data combination.

    Use the seperate, optimized, arch common ipi action functions
    registered via the helper smp_request_message_ipi instead passing the
    message as action data to a single action that then demultipexes to
    the required acton via a switch statement.

    smp_request_message_ipi will register the action as IRQF_PER_CPU
    and IRQF_DISABLED, and WARN if the allocation fails for some reason,
    so no need to print on that failure. It will return positive if
    the message will not be used by the kernel, in which case we can
    free the virq.

    In addition to elimiating inefficient code, this also corrects the
    error that a kernel built with kexec but without a debugger would
    not register the ipi for kdump to notify the other cpus of a crash.

    This also restores the debugger action to be static to kernel/smp.c.

    Signed-off-by: Milton Miller
    Signed-off-by: Benjamin Herrenschmidt

    Milton Miller
     
  • When page coalescing support was added recently, the MAX_HCALL_OPCODE
    define was not updated for the newly added H_GET_MPP_X hcall.

    Signed-off-by: Brian King
    Signed-off-by: Benjamin Herrenschmidt

    Brian King
     
  • Commit 0837e3242c73566fc1c0196b4ec61779c25ffc93 fixes a situation on POWER7
    where events can roll back if a specualtive event doesn't actually complete.
    This can raise a performance monitor exception. We need to catch this to ensure
    that we reset the PMC. In all cases the PMC will be less than 256 cycles from
    overflow.

    This patch lifts Anton's fix for the problem in perf and applies it to oprofile
    as well.

    Signed-off-by: Eric B Munson
    Cc: # as far back as it applies cleanly
    Signed-off-by: Benjamin Herrenschmidt

    Eric B Munson
     
  • This patch implements the raw syscall tracepoints on PowerPC and exports
    them for ftrace syscalls to use.

    To minimise reworking existing code, I slightly re-ordered the thread
    info flags such that the new TIF_SYSCALL_TRACEPOINT bit would still fit
    within the 16 bits of the andi. instruction's UI field. The instructions
    in question are in /arch/powerpc/kernel/entry_{32,64}.S to and the
    _TIF_SYSCALL_T_OR_A with the thread flags to see if system call tracing
    is enabled.

    In the case of 64bit PowerPC, arch_syscall_addr and
    arch_syscall_match_sym_name are overridden to allow ftrace syscalls to
    work given the unusual system call table structure and symbol names that
    start with a period.

    Signed-off-by: Ian Munsie
    Signed-off-by: Benjamin Herrenschmidt

    Ian Munsie
     

25 May, 2011

6 commits

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

    * 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    ptp: Fix dp83640 build warning when building statically
    ptp: Added a clock driver for the National Semiconductor PHYTER.
    ptp: Added a clock driver for the IXP46x.
    ptp: Added a clock that uses the eTSEC found on the MPC85xx.
    ptp: Added a brand new class driver for ptp clocks.

    Linus Torvalds
     
  • Most arches define CONFIG_DEBUG_STACK_USAGE exactly the same way. Move it
    to lib/Kconfig.debug so each arch doesn't have to define it. This
    obviously makes the option generic, but that's fine because the config is
    already used in generic code.

    It's not obvious to me that sysrq-P actually does anything caution by
    keeping the most inclusive wording.

    Signed-off-by: Stephen Boyd
    Cc: Chris Metcalf
    Acked-by: David S. Miller
    Acked-by: Richard Weinberger
    Acked-by: Mike Frysinger
    Cc: Russell King
    Cc: Hirokazu Takata
    Acked-by: Ralf Baechle
    Cc: Paul Mackerras
    Acked-by: Benjamin Herrenschmidt
    Cc: Chen Liqin
    Cc: Lennox Wu
    Cc: Ingo Molnar
    Cc: Thomas Gleixner
    Cc: "H. Peter Anvin"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Stephen Boyd
     
  • DEBUG_PER_CPU_MAPS is used in lib/cpumask.c as well as in
    inlcude/linux/cpumask.h and thus it has outgrown its use within x86 and
    powerpc alone. Any arch with SMP support may want to get some more
    debugging, so make this option generic.

    Signed-off-by: Stephen Boyd
    Cc:
    Cc: Ingo Molnar
    Cc: Thomas Gleixner
    Cc: "H. Peter Anvin"
    Acked-by: Benjamin Herrenschmidt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Stephen Boyd
     
  • In case other architectures require RCU freed page-tables to implement
    gup_fast() and software filled hashes and similar things, provide the
    means to do so by moving the logic into generic code.

    Signed-off-by: Peter Zijlstra
    Requested-by: David Miller
    Cc: Benjamin Herrenschmidt
    Cc: Martin Schwidefsky
    Cc: Russell King
    Cc: Paul Mundt
    Cc: Jeff Dike
    Cc: Richard Weinberger
    Cc: Tony Luck
    Cc: KAMEZAWA Hiroyuki
    Cc: Hugh Dickins
    Cc: Mel Gorman
    Cc: KOSAKI Motohiro
    Cc: Nick Piggin
    Cc: Namhyung Kim
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Peter Zijlstra
     
  • Fix up powerpc to the new mmu_gather stuff.

    PPC has an extra batching queue to RCU free the actual pagetable
    allocations, use the ARCH extentions for that for now.

    For the ppc64_tlb_batch, which tracks the vaddrs to unhash from the
    hardware hash-table, keep using per-cpu arrays but flush on context switch
    and use a TLF bit to track the lazy_mmu state.

    Signed-off-by: Peter Zijlstra
    Acked-by: Benjamin Herrenschmidt
    Cc: David Miller
    Cc: Martin Schwidefsky
    Cc: Russell King
    Cc: Paul Mundt
    Cc: Jeff Dike
    Cc: Richard Weinberger
    Cc: Tony Luck
    Cc: KAMEZAWA Hiroyuki
    Cc: Hugh Dickins
    Cc: Mel Gorman
    Cc: KOSAKI Motohiro
    Cc: Nick Piggin
    Cc: Namhyung Kim
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Peter Zijlstra
     
  • * 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
    percpu: Unify input section names
    percpu: Avoid extra NOP in percpu_cmpxchg16b_double
    percpu: Cast away printk format warning
    percpu: Always align percpu output section to PAGE_SIZE

    Fix up fairly trivial conflict in arch/x86/include/asm/percpu.h as per Tejun

    Linus Torvalds
     

24 May, 2011

3 commits

  • Tejun Heo
     
  • The eTSEC includes a PTP clock with quite a few features. This patch adds
    support for the basic clock adjustment functions, plus two external time
    stamps, one alarm, and the PPS callback.

    Signed-off-by: Richard Cochran
    Acked-by: David S. Miller
    Acked-by: John Stultz
    Signed-off-by: John Stultz

    Richard Cochran
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
    b43: fix comment typo reqest -> request
    Haavard Skinnemoen has left Atmel
    cris: typo in mach-fs Makefile
    Kconfig: fix copy/paste-ism for dell-wmi-aio driver
    doc: timers-howto: fix a typo ("unsgined")
    perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
    md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
    treewide: fix a few typos in comments
    regulator: change debug statement be consistent with the style of the rest
    Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
    audit: acquire creds selectively to reduce atomic op overhead
    rtlwifi: don't touch with treewide double semicolon removal
    treewide: cleanup continuations and remove logging message whitespace
    ath9k_hw: don't touch with treewide double semicolon removal
    include/linux/leds-regulator.h: fix syntax in example code
    tty: fix typo in descripton of tty_termios_encode_baud_rate
    xtensa: remove obsolete BKL kernel option from defconfig
    m68k: fix comment typo 'occcured'
    arch:Kconfig.locks Remove unused config option.
    treewide: remove extra semicolons
    ...

    Linus Torvalds
     

23 May, 2011

1 commit

  • * 'kvm-updates/2.6.40' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (131 commits)
    KVM: MMU: Use ptep_user for cmpxchg_gpte()
    KVM: Fix kvm mmu_notifier initialization order
    KVM: Add documentation for KVM_CAP_NR_VCPUS
    KVM: make guest mode entry to be rcu quiescent state
    KVM: x86 emulator: Make jmp far emulation into a separate function
    KVM: x86 emulator: Rename emulate_grpX() to em_grpX()
    KVM: x86 emulator: Remove unused arg from emulate_pop()
    KVM: x86 emulator: Remove unused arg from writeback()
    KVM: x86 emulator: Remove unused arg from read_descriptor()
    KVM: x86 emulator: Remove unused arg from seg_override()
    KVM: Validate userspace_addr of memslot when registered
    KVM: MMU: Clean up gpte reading with copy_from_user()
    KVM: PPC: booke: add sregs support
    KVM: PPC: booke: save/restore VRSAVE (a.k.a. USPRG0)
    KVM: PPC: use ticks, not usecs, for exit timing
    KVM: PPC: fix exit accounting for SPRs, tlbwe, tlbsx
    KVM: PPC: e500: emulate SVR
    KVM: VMX: Cache vmcs segment fields
    KVM: x86 emulator: consolidate segment accessors
    KVM: VMX: Avoid reading %rip unnecessarily when handling exceptions
    ...

    Linus Torvalds
     

22 May, 2011

5 commits


21 May, 2011

5 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (45 commits)
    crypto: caam - add support for sha512 variants of existing AEAD algorithms
    crypto: caam - remove unused authkeylen from caam_ctx
    crypto: caam - fix decryption shared vs. non-shared key setting
    crypto: caam - platform_bus_type migration
    crypto: aesni-intel - fix aesni build on i386
    crypto: aesni-intel - Merge with fpu.ko
    crypto: mv_cesa - make count_sgs() null-pointer proof
    crypto: mv_cesa - copy remaining bytes to SRAM only when needed
    crypto: mv_cesa - move digest state initialisation to a better place
    crypto: mv_cesa - fill inner/outer IV fields only in HMAC case
    crypto: mv_cesa - refactor copy_src_to_buf()
    crypto: mv_cesa - no need to save digest state after the last chunk
    crypto: mv_cesa - print a warning when registration of AES algos fail
    crypto: mv_cesa - drop this call to mv_hash_final from mv_hash_finup
    crypto: mv_cesa - the descriptor pointer register needs to be set just once
    crypto: mv_cesa - use ablkcipher_request_cast instead of the manual container_of
    crypto: caam - fix printk recursion for long error texts
    crypto: caam - remove unused keylen from session context
    hwrng: amd - enable AMD hw rnd driver for Maple PPC boards
    hwrng: amd - manage resource allocation
    ...

    Linus Torvalds
     
  • Commit 69e3cea8d5fd526 ("powerpc/smp: Make start_secondary_resume
    available to all CPU variants") introduced start_secondary_resume to
    misc_32.S, however it uses a 64-bit instruction which is not valid on
    32-bit platforms. Use 'stw' instead.

    Reported-by: Richard Cochran
    Tested-by: Richard Cochran
    Signed-off-by: Josh Boyer
    Signed-off-by: Benjamin Herrenschmidt
    Signed-off-by: Linus Torvalds

    Josh Boyer
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1446 commits)
    macvlan: fix panic if lowerdev in a bond
    tg3: Add braces around 5906 workaround.
    tg3: Fix NETIF_F_LOOPBACK error
    macvlan: remove one synchronize_rcu() call
    networking: NET_CLS_ROUTE4 depends on INET
    irda: Fix error propagation in ircomm_lmp_connect_response()
    irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
    irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
    rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
    be2net: Kill set but unused variable 'req' in lancer_fw_download()
    irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
    atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
    rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
    rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
    rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
    rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
    pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
    isdn: capi: Use pr_debug() instead of ifdefs.
    tg3: Update version to 3.119
    tg3: Apply rx_discards fix to 5719/5720
    ...

    Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
    as per Davem.

    Linus Torvalds
     
  • * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (152 commits)
    powerpc: Fix hard CPU IDs detection
    powerpc/pmac: Update via-pmu to new syscore_ops
    powerpc/kvm: Fix the build for 32-bit Book 3S (classic) processors
    powerpc/kvm: Fix kvmppc_core_pending_dec
    powerpc: Remove last piece of GEMINI
    powerpc: Fix for Pegasos keyboard and mouse
    powerpc: Make early memory scan more resilient to out of order nodes
    powerpc/pseries/iommu: Cleanup ddw naming
    powerpc/pseries/iommu: Find windows after kexec during boot
    powerpc/pseries/iommu: Remove ddw property when destroying window
    powerpc/pseries/iommu: Add additional checks when changing iommu mask
    powerpc/pseries/iommu: Use correct return type in dupe_ddw_if_already_created
    powerpc: Remove unused/obsolete CONFIG_XICS
    misc: Add CARMA DATA-FPGA Programmer support
    misc: Add CARMA DATA-FPGA Access Driver
    powerpc: Make IRQ_NOREQUEST last to clear, first to set
    powerpc: Integrated Flash controller device tree bindings
    powerpc/85xx: Create dts of each core in CAMP mode for P1020RDB
    powerpc/85xx: Fix PCIe IDSEL for Px020RDB
    powerpc/85xx: P2020 DTS: re-organize dts files
    ...

    Linus Torvalds
     
  • Commit e66eed651fd1 ("list: remove prefetching from regular list
    iterators") removed the include of prefetch.h from list.h, which
    uncovered several cases that had apparently relied on that rather
    obscure header file dependency.

    So this fixes things up a bit, using

    grep -L linux/prefetch.h $(git grep -l '[^a-z_]prefetchw*(' -- '*.[ch]')
    grep -L 'prefetchw*(' $(git grep -l 'linux/prefetch.h' -- '*.[ch]')

    to guide us in finding files that either need
    inclusion, or have it despite not needing it.

    There are more of them around (mostly network drivers), but this gets
    many core ones.

    Reported-by: Stephen Rothwell
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     

20 May, 2011

7 commits

  • commit 9d07bc841c9779b4d7902e417f4e509996ce805d
    "powerpc: Properly handshake CPUs going out of boot spin loop"

    Would cause a miscalculation of the hard CPU ID. It removes breaking
    out of the loop when finding a match with a processor, thus the "i"
    used as an index in the intserv array is always incorrect

    This broke interrupt on my PowerMac laptop.

    Signed-off-by: Benjamin Herrenschmidt

    Benjamin Herrenschmidt
     
  • Manual merge of arch/powerpc/kernel/smp.c and add missing scheduler_ipi()
    call to arch/powerpc/platforms/cell/interrupt.c

    Signed-off-by: Benjamin Herrenschmidt

    Benjamin Herrenschmidt
     
  • Benjamin Herrenschmidt
     
  • Commits a5d4f3ad3a ("powerpc: Base support for exceptions using
    HSRR0/1") and 673b189a2e ("powerpc: Always use SPRN_SPRG_HSCRATCH0
    when running in HV mode") cause compile and link errors for 32-bit
    classic Book 3S processors when KVM is enabled. This fixes these
    errors.

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

    Paul Mackerras
     
  • The vcpu->arch.pending_exceptions field is a bitfield indexed by
    interrupt priority number as returned by kvmppc_book3s_vec2irqprio.
    However, kvmppc_core_pending_dec was using an interrupt vector shifted
    by 7 as the bit index. Fix it to use the irqprio value for the
    decrementer interrupt instead. This problem was found by code
    inspection.

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

    Paul Mackerras
     
  • …/gregkh/driver-core-2.6

    * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (44 commits)
    debugfs: Silence DEBUG_STRICT_USER_COPY_CHECKS=y warning
    sysfs: remove "last sysfs file:" line from the oops messages
    drivers/base/memory.c: fix warning due to "memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION"
    memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION
    SYSFS: Fix erroneous comments for sysfs_update_group().
    driver core: remove the driver-model structures from the documentation
    driver core: Add the device driver-model structures to kerneldoc
    Translated Documentation/email-clients.txt
    RAW driver: Remove call to kobject_put().
    reboot: disable usermodehelper to prevent fs access
    efivars: prevent oops on unload when efi is not enabled
    Allow setting of number of raw devices as a module parameter
    Introduce CONFIG_GOOGLE_FIRMWARE
    driver: Google Memory Console
    driver: Google EFI SMI
    x86: Better comments for get_bios_ebda()
    x86: get_bios_ebda_length()
    misc: fix ti-st build issues
    params.c: Use new strtobool function to process boolean inputs
    debugfs: move to new strtobool
    ...

    Fix up trivial conflicts in fs/debugfs/file.c due to the same patch
    being applied twice, and an unrelated cleanup nearby.

    Linus Torvalds
     
  • …kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

    * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (60 commits)
    sched: Fix and optimise calculation of the weight-inverse
    sched: Avoid going ahead if ->cpus_allowed is not changed
    sched, rt: Update rq clock when unthrottling of an otherwise idle CPU
    sched: Remove unused parameters from sched_fork() and wake_up_new_task()
    sched: Shorten the construction of the span cpu mask of sched domain
    sched: Wrap the 'cfs_rq->nr_spread_over' field with CONFIG_SCHED_DEBUG
    sched: Remove unused 'this_best_prio arg' from balance_tasks()
    sched: Remove noop in alloc_rt_sched_group()
    sched: Get rid of lock_depth
    sched: Remove obsolete comment from scheduler_tick()
    sched: Fix sched_domain iterations vs. RCU
    sched: Next buddy hint on sleep and preempt path
    sched: Make set_*_buddy() work on non-task entities
    sched: Remove need_migrate_task()
    sched: Move the second half of ttwu() to the remote cpu
    sched: Restructure ttwu() some more
    sched: Rename ttwu_post_activation() to ttwu_do_wakeup()
    sched: Remove rq argument from ttwu_stat()
    sched: Remove rq->lock from the first half of ttwu()
    sched: Drop rq->lock from sched_exec()
    ...

    * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    sched: Fix rt_rq runtime leakage bug

    Linus Torvalds