11 Mar, 2010

1 commit

  • Replace the calls to read_barrier_depends() in
    ftrace_list_func() with rcu_dereference_raw() to improve
    readability. The reason that we use rcu_dereference_raw() here
    is that removed entries are never freed, instead they are simply
    leaked. This is one of a very few cases where use of
    rcu_dereference_raw() is the long-term right answer. And I
    don't yet know of any others. ;-)

    Signed-off-by: Paul E. McKenney
    Acked-by: Steven Rostedt
    Cc: Frederic Weisbecker
    Cc: laijs@cn.fujitsu.com
    Cc: dipankar@in.ibm.com
    Cc: mathieu.desnoyers@polymtl.ca
    Cc: josh@joshtriplett.org
    Cc: dvhltc@us.ibm.com
    Cc: niv@us.ibm.com
    Cc: peterz@infradead.org
    Cc: Valdis.Kletnieks@vt.edu
    Cc: dhowells@redhat.com
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Paul E. McKenney
     

04 Mar, 2010

8 commits

  • RCU is used during very early boot, before RCU and lockdep have
    been initialized. So make the underlying primitives
    (rcu_read_lock_held(), rcu_read_lock_bh_held(),
    rcu_read_lock_sched_held(), and rcu_dereference_check()) check
    for early boot via the rcu_scheduler_active flag. This will
    suppress false positives.

    Also introduce a debug_lockdep_rcu_enabled() static inline
    helper function, which tags the CONTINUE_PROVE_RCU case as
    likely(), as suggested by Ingo Molnar.

    Signed-off-by: Paul E. McKenney
    Cc: laijs@cn.fujitsu.com
    Cc: dipankar@in.ibm.com
    Cc: mathieu.desnoyers@polymtl.ca
    Cc: josh@joshtriplett.org
    Cc: dvhltc@us.ibm.com
    Cc: niv@us.ibm.com
    Cc: peterz@infradead.org
    Cc: rostedt@goodmis.org
    Cc: Valdis.Kletnieks@vt.edu
    Cc: dhowells@redhat.com
    LKML-Reference:
    [ v2: removed incomplete debug_lockdep_rcu_update() bits ]
    Signed-off-by: Ingo Molnar

    Paul E. McKenney
     
  • Change the pair of rcu_dereference() calls in
    ftrace_perf_buf_prepare() to rcu_dereference_sched().

    Signed-off-by: Paul E. McKenney
    Acked-by: Frederic Weisbecker
    Cc: Steven Rostedt
    Cc: laijs@cn.fujitsu.com
    Cc: dipankar@in.ibm.com
    Cc: mathieu.desnoyers@polymtl.ca
    Cc: josh@joshtriplett.org
    Cc: dvhltc@us.ibm.com
    Cc: niv@us.ibm.com
    Cc: peterz@infradead.org
    Cc: Valdis.Kletnieks@vt.edu
    Cc: dhowells@redhat.com
    Cc: Frederic Weisbecker
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Paul E. McKenney
     
  • Common code is used during task creation and after the task has
    started running. RCU protection is not needed during task
    creation because no other CPU has access to the
    under-construction task. Provide the RCU protection anyway to
    suppress the false positive, as there does not appear to be a
    good way for the common code to recognize that the task is only
    accessible to the CPU creating it.

    Signed-off-by: Paul E. McKenney
    Cc: Paul Menage
    Cc: laijs@cn.fujitsu.com
    Cc: dipankar@in.ibm.com
    Cc: mathieu.desnoyers@polymtl.ca
    Cc: josh@joshtriplett.org
    Cc: dvhltc@us.ibm.com
    Cc: niv@us.ibm.com
    Cc: peterz@infradead.org
    Cc: rostedt@goodmis.org
    Cc: Valdis.Kletnieks@vt.edu
    Cc: dhowells@redhat.com
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Paul E. McKenney
     
  • The rcu_read_lock_sched_held() needs to unconditionally return
    the value "1" in a !PREEMPT kernel, because under !PREEMPT,
    -all- kernel code is implicitly preempt-disabled. This patch
    makes this happen.

    Signed-off-by: Paul E. McKenney
    Cc: laijs@cn.fujitsu.com
    Cc: dipankar@in.ibm.com
    Cc: mathieu.desnoyers@polymtl.ca
    Cc: josh@joshtriplett.org
    Cc: dvhltc@us.ibm.com
    Cc: niv@us.ibm.com
    Cc: peterz@infradead.org
    Cc: rostedt@goodmis.org
    Cc: Valdis.Kletnieks@vt.edu
    Cc: dhowells@redhat.com
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Paul E. McKenney
     
  • Add the values of rcu_scheduler_active() and debug_locks() to
    the lockdep_rcu_dereference() output to help diagnose RCU
    lockdep splats that occur shortly after the scheduler starts.

    Signed-off-by: Paul E. McKenney
    Cc: laijs@cn.fujitsu.com
    Cc: dipankar@in.ibm.com
    Cc: mathieu.desnoyers@polymtl.ca
    Cc: josh@joshtriplett.org
    Cc: dvhltc@us.ibm.com
    Cc: niv@us.ibm.com
    Cc: peterz@infradead.org
    Cc: rostedt@goodmis.org
    Cc: Valdis.Kletnieks@vt.edu
    Cc: dhowells@redhat.com
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Paul E. McKenney
     
  • This patch removes the check for !rcu_scheduler_active because
    this check has been incorporated into rcu_dereference_check().

    Signed-off-by: Paul E. McKenney
    Cc: laijs@cn.fujitsu.com
    Cc: dipankar@in.ibm.com
    Cc: mathieu.desnoyers@polymtl.ca
    Cc: josh@joshtriplett.org
    Cc: dvhltc@us.ibm.com
    Cc: niv@us.ibm.com
    Cc: peterz@infradead.org
    Cc: rostedt@goodmis.org
    Cc: Valdis.Kletnieks@vt.edu
    Cc: dhowells@redhat.com
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Paul E. McKenney
     
  • Lockdep-RCU commit d11c563d exported tasklist_lock, which is not
    a good thing. This patch instead exports a function that uses
    lockdep to check whether tasklist_lock is held.

    Suggested-by: Christoph Hellwig
    Signed-off-by: Paul E. McKenney
    Cc: laijs@cn.fujitsu.com
    Cc: dipankar@in.ibm.com
    Cc: mathieu.desnoyers@polymtl.ca
    Cc: josh@joshtriplett.org
    Cc: dvhltc@us.ibm.com
    Cc: niv@us.ibm.com
    Cc: peterz@infradead.org
    Cc: rostedt@goodmis.org
    Cc: Valdis.Kletnieks@vt.edu
    Cc: dhowells@redhat.com
    Cc: Christoph Hellwig
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Paul E. McKenney
     
  • Merge reason: Switch from topical split to the stabilization track

    Signed-off-by: Ingo Molnar

    Ingo Molnar
     

01 Mar, 2010

21 commits

  • Make rcu_dereference() of runqueue data structures be
    rcu_dereference_sched().

    Located-by: Ingo Molnar
    Signed-off-by: Paul E. McKenney
    Cc: laijs@cn.fujitsu.com
    Cc: dipankar@in.ibm.com
    Cc: mathieu.desnoyers@polymtl.ca
    Cc: josh@joshtriplett.org
    Cc: dvhltc@us.ibm.com
    Cc: niv@us.ibm.com
    Cc: peterz@infradead.org
    Cc: rostedt@goodmis.org
    Cc: Valdis.Kletnieks@vt.edu
    Cc: dhowells@redhat.com
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Paul E. McKenney
     
  • Merge reason: Backmerge latest upstream to queue up dependent fix in the
    scheduler.

    Signed-off-by: Ingo Molnar

    Ingo Molnar
     
  • * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, uv: Remove recursion in uv_heartbeat_enable()
    x86, uv: uv_global_gru_mmr_address() macro fix
    x86, uv: Add serial number parameter to uv_bios_get_sn_info()

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

    * 'x86-ptrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, ptrace: Remove set_stopped_child_used_math() in [x]fpregs_set
    x86, ptrace: Simplify xstateregs_get()
    ptrace: Fix ptrace_regset() comments and diagnose errors specifically
    parisc: Disable CONFIG_HAVE_ARCH_TRACEHOOK
    ptrace: Add support for generic PTRACE_GETREGSET/PTRACE_SETREGSET
    x86, ptrace: regset extensions to support xstate

    Linus Torvalds
     
  • * 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Enable NMI on all cpus on UV
    vgaarb: Add user selectability of the number of GPUS in a system
    vgaarb: Fix VGA arbiter to accept PCI domains other than 0
    x86, uv: Update UV arch to target Legacy VGA I/O correctly.
    pci: Update pci_set_vga_state() to call arch functions

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

    * 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, setup: Don't skip mode setting for the standard VGA modes
    x86-64, setup: Inhibit decompressor output if video info is invalid
    x86, setup: When restoring the screen, update boot_params.screen_info

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

    * 'x86-rwsem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86-64, rwsem: Avoid store forwarding hazard in __downgrade_write
    x86-64, rwsem: 64-bit xadd rwsem implementation
    x86: Fix breakage of UML from the changes in the rwsem system
    x86-64: support native xadd rwsem implementation
    x86: clean up rwsem type system

    Linus Torvalds
     
  • * 'x86-numa-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, numa: Remove configurable node size support for numa emulation
    x86, numa: Add fixed node size option for numa emulation
    x86, numa: Fix numa emulation calculation of big nodes
    x86, acpi: Map hotadded cpu to correct node.

    Linus Torvalds
     
  • * 'x86-mtrr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Convert set_atomicity_lock to raw_spinlock
    x86, mtrr: Kill over the top warn
    x86, mtrr: Constify struct mtrr_ops

    Linus Torvalds
     
  • * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, mm: Unify kernel_physical_mapping_init() API
    x86, mm: Allow highmem user page tables to be disabled at boot time
    x86: Do not reserve brk for DMI if it's not going to be used
    x86: Convert tlbstate_lock to raw_spinlock
    x86: Use the generic page_is_ram()
    x86: Remove BIOS data range from e820
    Move page_is_ram() declaration to mm.h
    Generic page_is_ram: use __weak
    resources: introduce generic page_is_ram()

    Linus Torvalds
     
  • * 'x86-io-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Merge io.h
    x86: Simplify flush_write_buffers()
    x86: Clean up mem*io functions.
    x86-64: Use BUILDIO in io_64.h
    x86-64: Reorganize io_64.h
    x86-32: Remove _local variants of in/out from io_32.h
    x86-32: Move XQUAD definitions to numaq.h

    Linus Torvalds
     
  • * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, cacheinfo: Enable L3 CID only on AMD
    x86, cacheinfo: Remove NUMA dependency, fix for AMD Fam10h rev D1
    x86, cpu: Print AMD virtualization features in /proc/cpuinfo
    x86, cacheinfo: Calculate L3 indices
    x86, cacheinfo: Add cache index disable sysfs attrs only to L3 caches
    x86, cacheinfo: Fix disabling of L3 cache indices
    intel-agp: Switch to wbinvd_on_all_cpus
    x86, lib: Add wbinvd smp helpers

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

    * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Remove trailing spaces in messages
    x86, mtrr: Remove unused mtrr/state.c
    x86, trivial: Fix grammo in tsc comment about Geode TSC reliability

    Linus Torvalds
     
  • * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Mark atomic irq ops raw for 32bit legacy
    x86: Merge show_regs()
    x86: Macroise x86 cache descriptors
    x86-32: clean up rwsem inline asm statements
    x86: Merge asm/atomic_{32,64}.h
    x86: Sync asm/atomic_32.h and asm/atomic_64.h
    x86: Split atomic64_t functions into seperate headers
    x86-64: Modify memcpy()/memset() alternatives mechanism
    x86-64: Modify copy_user_generic() alternatives mechanism
    x86: Lift restriction on the location of FIX_BTMAP_*
    x86, core: Optimize hweight32()

    Linus Torvalds
     
  • …/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: (25 commits)
    sched: Fix SCHED_MC regression caused by change in sched cpu_power
    sched: Don't use possibly stale sched_class
    kthread, sched: Remove reference to kthread_create_on_cpu
    sched: cpuacct: Use bigger percpu counter batch values for stats counters
    percpu_counter: Make __percpu_counter_add an inline function on UP
    sched: Remove member rt_se from struct rt_rq
    sched: Change usage of rt_rq->rt_se to rt_rq->tg->rt_se[cpu]
    sched: Remove unused update_shares_locked()
    sched: Use for_each_bit
    sched: Queue a deboosted task to the head of the RT prio queue
    sched: Implement head queueing for sched_rt
    sched: Extend enqueue_task to allow head queueing
    sched: Remove USER_SCHED
    sched: Fix the place where group powers are updated
    sched: Assume *balance is valid
    sched: Remove load_balance_newidle()
    sched: Unify load_balance{,_newidle}()
    sched: Add a lock break for PREEMPT=y
    sched: Remove from fwd decls
    sched: Remove rq_iterator from move_one_task
    ...

    Fix up trivial conflicts in kernel/sched.c

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

    * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    sched: Fix race between ttwu() and task_rq_lock()
    sched: Fix SMT scheduler regression in find_busiest_queue()
    sched: Fix sched_mv_power_savings for !SMT
    kernel/sched.c: Suppress unused var warning

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

    * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (172 commits)
    perf_event, amd: Fix spinlock initialization
    perf_event: Fix preempt warning in perf_clock()
    perf tools: Flush maps on COMM events
    perf_events, x86: Split PMU definitions into separate files
    perf annotate: Handle samples not at objdump output addr boundaries
    perf_events, x86: Remove superflous MSR writes
    perf_events: Simplify code by removing cpu argument to hw_perf_group_sched_in()
    perf_events, x86: AMD event scheduling
    perf_events: Add new start/stop PMU callbacks
    perf_events: Report the MMAP pgoff value in bytes
    perf annotate: Defer allocating sym_priv->hist array
    perf symbols: Improve debugging information about symtab origins
    perf top: Use a macro instead of a constant variable
    perf symbols: Check the right return variable
    perf/scripts: Tag syscall_name helper as not yet available
    perf/scripts: Add perf-trace-python Documentation
    perf/scripts: Remove unnecessary PyTuple resizes
    perf/scripts: Add syscall tracing scripts
    perf/scripts: Add Python scripting engine
    perf/scripts: Remove check-perf-trace from listed scripts
    ...

    Fix trivial conflict in tools/perf/util/probe-event.c

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

    * 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (28 commits)
    ftrace: Add function names to dangling } in function graph tracer
    tracing: Simplify memory recycle of trace_define_field
    tracing: Remove unnecessary variable in print_graph_return
    tracing: Fix typo of info text in trace_kprobe.c
    tracing: Fix typo in prof_sysexit_enable()
    tracing: Remove CONFIG_TRACE_POWER from kernel config
    tracing: Fix ftrace_event_call alignment for use with gcc 4.5
    ftrace: Remove memory barriers from NMI code when not needed
    tracing/kprobes: Add short documentation for HAVE_REGS_AND_STACK_ACCESS_API
    s390: Add pt_regs register and stack access API
    tracing/kprobes: Make Kconfig dependencies generic
    tracing: Unify arch_syscall_addr() implementations
    tracing: Add notrace to TRACE_EVENT implementation functions
    ftrace: Allow to remove a single function from function graph filter
    tracing: Add correct/incorrect to sort keys for branch annotation output
    tracing: Simplify test for function_graph tracing start point
    tracing: Drop the tr check from the graph tracing path
    tracing: Add stack dump to trace_printk if stacktrace option is set
    tracing: Use appropriate perl constructs in recordmcount.pl
    tracing: optimize recordmcount.pl for offsets-handling
    ...

    Linus Torvalds
     
  • * 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    oprofile/x86: fix msr access to reserved counters
    oprofile/x86: use kzalloc() instead of kmalloc()
    oprofile/x86: fix perfctr nmi reservation for mulitplexing
    oprofile/x86: add comment to counter-in-use warning
    oprofile/x86: warn user if a counter is already active
    oprofile/x86: implement randomization for IBS periodic op counter
    oprofile/x86: implement lsfr pseudo-random number generator for IBS
    oprofile/x86: implement IBS cpuid feature detection
    oprofile/x86: remove node check in AMD IBS initialization
    oprofile/x86: remove OPROFILE_IBS config option
    oprofile: remove EXPERIMENTAL from the config option description
    oprofile: remove tracing build dependency

    Linus Torvalds
     
  • * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (44 commits)
    rcu: Fix accelerated GPs for last non-dynticked CPU
    rcu: Make non-RCU_PROVE_LOCKING rcu_read_lock_sched_held() understand boot
    rcu: Fix accelerated grace periods for last non-dynticked CPU
    rcu: Export rcu_scheduler_active
    rcu: Make rcu_read_lock_sched_held() take boot time into account
    rcu: Make lockdep_rcu_dereference() message less alarmist
    sched, cgroups: Fix module export
    rcu: Add RCU_CPU_STALL_VERBOSE to dump detailed per-task information
    rcu: Fix rcutorture mod_timer argument to delay one jiffy
    rcu: Fix deadlock in TREE_PREEMPT_RCU CPU stall detection
    rcu: Convert to raw_spinlocks
    rcu: Stop overflowing signed integers
    rcu: Use canonical URL for Mathieu's dissertation
    rcu: Accelerate grace period if last non-dynticked CPU
    rcu: Fix citation of Mathieu's dissertation
    rcu: Documentation update for CONFIG_PROVE_RCU
    security: Apply lockdep-based checking to rcu_dereference() uses
    idr: Apply lockdep-based diagnostics to rcu_dereference() uses
    radix-tree: Disable RCU lockdep checking in radix tree
    vfs: Abstract rcu_dereference_check for files-fdtable use
    ...

    Linus Torvalds
     
  • …r-linus', 'x86-debug-for-linus', 'x86-doc-for-linus', 'x86-gpu-for-linus' and 'x86-rlimit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

    * 'core-ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    generic-ipi: Optimize accesses by using DEFINE_PER_CPU_SHARED_ALIGNED for IPI data

    * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    plist: Fix grammar mistake, and c-style mistake

    * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    kprobes: Add mcount to the kprobes blacklist

    * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86_64: Print modules like i386 does

    * 'x86-doc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Put 'nopat' in kernel-parameters

    * 'x86-gpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86-64: Allow fbdev primary video code

    * 'x86-rlimit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Use helpers for rlimits

    Linus Torvalds
     

28 Feb, 2010

10 commits

  • It is apparently legal to invoke task_subsys_state() without RCU
    protection during early boot time. After all, there are no
    concurrent tasks, so there can be no grace periods completing
    concurrently.

    But this does need an Acked-by from the cgroups folks.

    Located-by: Ingo Molnar
    Signed-off-by: Paul E. McKenney
    Cc: laijs@cn.fujitsu.com
    Cc: dipankar@in.ibm.com
    Cc: mathieu.desnoyers@polymtl.ca
    Cc: josh@joshtriplett.org
    Cc: dvhltc@us.ibm.com
    Cc: niv@us.ibm.com
    Cc: peterz@infradead.org
    Cc: rostedt@goodmis.org
    Cc: Valdis.Kletnieks@vt.edu
    Cc: dhowells@redhat.com
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Paul E. McKenney
     
  • Make the holdoff only happen when the full number of attempts
    have been made.

    Signed-off-by: Paul E. McKenney
    Cc: laijs@cn.fujitsu.com
    Cc: dipankar@in.ibm.com
    Cc: mathieu.desnoyers@polymtl.ca
    Cc: josh@joshtriplett.org
    Cc: dvhltc@us.ibm.com
    Cc: niv@us.ibm.com
    Cc: peterz@infradead.org
    Cc: rostedt@goodmis.org
    Cc: Valdis.Kletnieks@vt.edu
    Cc: dhowells@redhat.com
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Paul E. McKenney
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (24 commits)
    m68k: Define sigcontext ABI of ColdFire
    m68knommu: NPTL support for uClinux
    m68k: Add NPTL support
    m68k: Eliminate unused variable in page_to_phys()
    m68k: Switch to generic siginfo layout
    macfb: fix 24-bit visual and stuff
    macfb: cleanup
    fbdev: add some missing mac modes
    mac68k: start CUDA early
    valkyriefb: various fixes
    fbdev: mac_var_to_mode() fix
    mac68k: move macsonic and macmace platform devices
    mac68k: move mac_esp platform device
    mac68k: replace mac68k SCC code with platform device
    pmac-zilog: add platform driver
    pmac-zilog: cleanup
    mac68k: rework SWIM platform device
    mac68k: cleanup
    ataflop: Killl warning about unused variable flags
    m68k: Use DIV_ROUND_CLOSEST
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (35 commits)
    [S390] time: remove unused code
    [S390] zcore: Add prefix registers to dump header
    [S390] correct vdso version string
    [S390] add support for compressed kernels
    [S390] Define new s390 ELF note sections in elf.h
    [S390] codepage conversion of kernel parameter line
    [S390] seq_file: convert drivers/s390/
    [S390] add z9-ec/z10 instruction to kernel disassembler
    [S390] dasd: correct offline processing
    [S390] dasd: fix refcounting.
    [S390] dasd: fix online/offline race
    [S390] use kprobes_built_in() in mm/fault code
    [S390] bug: use relative pointers in bug table entries
    [S390] Cleanup struct _lowcore usage and defines.
    [S390] free_initmem: reduce code duplication
    [S390] Replace ENOTSUPP usage with EOPNOTSUPP
    [S390] spinlock: check virtual cpu running status
    [S390] sysinfo: fix SYSIB 3,2,2 structure
    [S390] add MACHINE_IS_LPAR flag
    [S390] qdio: optimize cache line usage of struct qdio_irq
    ...

    Linus Torvalds
     
  • * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (141 commits)
    MIPS: Alchemy: defconfig updates
    MIPS: Alchemy: Fix Au1100 ethernet build failure
    MIPS: Alchemy: Repair db1500/bosporus builds
    MIPS: ARC: Cleanup unused definitions from sgialib.h
    MIPS: Cobalt: convert legacy port addresses to GT-64111 bus addresses
    MIPS: Alchemy: use 36bit addresses for PCMCIA resources.
    MIPS: Cobalt: Fix theoretical port aliasing issue
    MIPS: Use ALIGN(x, bytes) instead of __ALIGN_MASK(x, bytes - 1)
    MIPS: Crazy spinlock speed test.
    MIPS: Optimize spinlocks.
    MIPS: Alchemy: devboard PM needs to save CPLD registers.
    MIPS: PowerTV: Eliminate duplicate opcode definition macros
    MIPS: Lemote 2F: Move printks out of port_access_lock.
    MIPS: PNX833x: Convert IRQ controller locks to raw spinlocks.
    MIPS: Octeon: Replace spinlock with raw_spinlocks in dma-octeon.c.
    MIPS: Octeon: Replace rwlocks in irq_chip handlers with raw_spinlocks.
    MIPS: Octeon: Convert octeon_irq_msi_lock to raw spinlock.
    MIPS: Loongson: Remove pointless sample_lock from oprofile code.
    MIPS: SNI: Convert sni_rm200_i8259A_lock to raw spinlock.
    MIPS: i8259: Convert IRQ controller lock to raw spinlock.
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits)
    pcmcia: validate late-added resources
    pcmcia: allow for extension of resource interval
    pcmcia: remove useless msleep in ds.c
    pcmcia: use read_cis_mem return value
    pcmcia: handle error in serial_cs config calls
    pcmcia: add locking to pcmcia_{read,write}_cis_mem
    pcmcia: avoid prod_id memleak
    pcmcia: avoid sysfs-related lockup for cardbus
    pcmcia: use state machine for extended requery
    pcmcia: delay re-scanning and re-querying of PCMCIA bus
    pcmcia: use pccardd to handle eject, insert, suspend and resume requests
    pcmcia: use ops_mutex for rsrc_{mgr,nonstatic} locking
    pcmcia: use mutex for dynid lock
    pcmcia: assert locking to struct pcmcia_device
    pcmcia: add locking documentation
    pcmcia: simplify locking
    pcmcia: add locking to struct pcmcia_socket->pcmcia_state()
    pcmcia: protect s->device_count
    pcmcia: properly lock skt->irq, skt->irq_mask
    pcmcia: lock ops->set_socket
    ...

    Linus Torvalds
     
  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (88 commits)
    powerpc: Fix lwsync feature fixup vs. modules on 64-bit
    powerpc: Convert pmc_owner_lock to raw_spinlock
    powerpc: Convert die.lock to raw_spinlock
    powerpc: Convert tlbivax_lock to raw_spinlock
    powerpc: Convert mpic locks to raw_spinlock
    powerpc: Convert pmac_pic_lock to raw_spinlock
    powerpc: Convert big_irq_lock to raw_spinlock
    powerpc: Convert feature_lock to raw_spinlock
    powerpc: Convert i8259_lock to raw_spinlock
    powerpc: Convert beat_htab_lock to raw_spinlock
    powerpc: Convert confirm_error_lock to raw_spinlock
    powerpc: Convert ipic_lock to raw_spinlock
    powerpc: Convert native_tlbie_lock to raw_spinlock
    powerpc: Convert beatic_irq_mask_lock to raw_spinlock
    powerpc: Convert nv_lock to raw_spinlock
    powerpc: Convert context_lock to raw_spinlock
    powerpc/85xx: Add NOR, LEDs and PIB support for MPC8568E-MDS boards
    powerpc/86xx: Enable VME driver on the GE SBC610
    powerpc/86xx: Enable VME driver on the GE PPC9A
    powerpc/86xx: Add MSI section to GE PPC9A DTS
    ...

    Linus Torvalds
     
  • The following patch defines sigcontext ABI of ColdFire. Due to ISA
    restrictions ColdFire needs different rt_sigreturn trampoline.

    And due to ColdFire FP registers being 8-bytes instead of 12-bytes on
    m68k, sigcontext and fpregset structures should be updated.

    Regarding the sc_fpstate[16+6*8] field, it would've been enough 16
    bytes to store ColdFire's FP state. To accomodate GLIBC's libSegFault
    it would'be been enough 6*8 bytes (room for the 6 non-call-clobbered
    FP registers). I set it to 16+6*8 to provide some extra space for any
    future changes in the ColdFire FPU.

    Signed-off-by: Maxim Kuvyrkov
    Signed-off-by: Geert Uytterhoeven

    Maxim Kuvyrkov
     
  • Port syscalls for NPTL support to m68knommu.

    Signed-off-by: Maxim Kuvyrkov
    Acked-by: Greg Ungerer
    Signed-off-by: Geert Uytterhoeven

    Maxim Kuvyrkov
     
  • This patch adds several syscalls, that provide necessary
    functionality to support NPTL on m68k/ColdFire.
    The syscalls are get_thread_area, set_thread_area, atomic_cmpxchg_32 and
    atomic_barrier.
    The cmpxchg syscall is required for ColdFire as it doesn't support 'cas'
    instruction.

    Also a ptrace call PTRACE_GET_THREAD_AREA is added to allow debugger to
    inspect the TLS storage.

    Signed-off-by: Maxim Kuvyrkov
    Signed-off-by: Geert Uytterhoeven

    Maxim Kuvyrkov