1. 14 Sep, 2009 3 commits
    • Linus Torvalds's avatar
      Merge branch 'x86-asm-generic-for-linus' of... · 9b74aec0
      Linus Torvalds authored
      Merge branch 'x86-asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: remove all now-duplicate header files
        x86: convert termios.h to the asm-generic version
        x86: convert almost generic headers to asm-generic version
        x86: convert trivial headers to asm-generic version
        x86: add copies of some headers to convert to asm-generic
      9b74aec0
    • Linus Torvalds's avatar
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · b581af51
      Linus Torvalds authored
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86/i386: Put aligned stack-canary in percpu shared_aligned section
        x86/i386: Make sure stack-protector segment base is cache aligned
        x86: Detect stack protector for i386 builds on x86_64
        x86: allow "=rm" in native_save_fl()
        x86: properly annotate alternatives.c
        x86: Introduce GDT_ENTRY_INIT(), initialize bad_bios_desc statically
        x86, 32-bit: Use generic sys_pipe()
        x86: Introduce GDT_ENTRY_INIT(), fix APM
        x86: Introduce GDT_ENTRY_INIT()
        x86: Introduce set_desc_base() and set_desc_limit()
        x86: Remove unused patch_espfix_desc()
        x86: Use get_desc_base()
      b581af51
    • Linus Torvalds's avatar
      Merge branch 'x86-apic-for-linus' of... · ffaf854b
      Linus Torvalds authored
      Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (24 commits)
        ACPI, x86: expose some IO-APIC routines when CONFIG_ACPI=n
        x86, apic: Slim down stack usage in early_init_lapic_mapping()
        x86, ioapic: Get rid of needless check and simplify ioapic_setup_resources()
        x86, ioapic: Define IO_APIC_DEFAULT_PHYS_BASE constant
        x86: Fix x86_model test in es7000_apic_is_cluster()
        x86, apic: Move dmar_table_init() out of enable_IR()
        x86, ioapic: Panic on irq-pin binding only if needed
        x86/apic: Enable x2APIC without interrupt remapping under KVM
        x86, apic: Drop redundant bit assignment
        x86, ioapic: Throw BUG instead of NULL dereference
        x86, ioapic: Introduce for_each_irq_pin() helper
        x86: Remove superfluous NULL pointer check in destroy_irq()
        x86/ioapic.c: unify ioapic_retrigger_irq()
        x86/ioapic.c: convert __target_IO_APIC_irq to conventional for() loop
        x86/ioapic.c: clean up replace_pin_at_irq_node logic and comments
        x86/ioapic.c: convert replace_pin_at_irq_node to conventional for() loop
        x86/ioapic.c: simplify add_pin_to_irq_node()
        x86/ioapic.c: convert io_apic_level_ack_pending loop to normal for() loop
        x86/ioapic.c: move lost comment to what seems like appropriate place
        x86/ioapic.c: remove redundant declaration of irq_pin_list
        ...
      ffaf854b
  2. 11 Sep, 2009 37 commits
    • Linus Torvalds's avatar
      Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · 86d71014
      Linus Torvalds authored
      * git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (87 commits)
        NFSv4: Disallow 'mount -t nfs4 -overs=2' and 'mount -t nfs4 -overs=3'
        NFS: Allow the "nfs" file system type to support NFSv4
        NFS: Move details of nfs4_get_sb() to a helper
        NFS: Refactor NFSv4 text-based mount option validation
        NFS: Mount option parser should detect missing "port="
        NFS: out of date comment regarding O_EXCL above nfs3_proc_create()
        NFS: Handle a zero-length auth flavor list
        SUNRPC: Ensure that sunrpc gets initialised before nfs, lockd, etc...
        nfs: fix compile error in rpc_pipefs.h
        nfs: Remove reference to generic_osync_inode from a comment
        SUNRPC: cache must take a reference to the cache detail's module on open()
        NFS: Use the DNS resolver in the mount code.
        NFS: Add a dns resolver for use with NFSv4 referrals and migration
        SUNRPC: Fix a typo in cache_pipefs_files
        nfs: nfs4xdr: optimize low level decoding
        nfs: nfs4xdr: get rid of READ_BUF
        nfs: nfs4xdr: simplify decode_exchange_id by reusing decode_opaque_inline
        nfs: nfs4xdr: get rid of COPYMEM
        nfs: nfs4xdr: introduce decode_sessionid helper
        nfs: nfs4xdr: introduce decode_verifier helper
        ...
      86d71014
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 86373435
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (25 commits)
        pata_rz1000: use printk_once
        ahci: kill @force_restart and refine CLO for ahci_kick_engine()
        pata_cs5535: add pci id for AMD based CS5535 controllers
        ahci: Add AMD SB900 SATA/IDE controller device IDs
        drivers/ata: use resource_size
        sata_fsl: Defer non-ncq commands when ncq commands active
        libata: add SATA PMP revision information for spec 1.2
        libata: fix off-by-one error in ata_tf_read_block()
        ahci: Gigabyte GA-MA69VM-S2 can't do 64bit DMA
        ahci: make ahci_asus_m2a_vm_32bit_only() quirk more generic
        dmi: extend dmi_get_year() to dmi_get_date()
        dmi: fix date handling in dmi_get_year()
        libata: unbreak TPM filtering by reorganizing ata_scsi_pass_thru()
        sata_sis: convert to slave_link
        sata_sil24: always set protocol override for non-ATAPI data commands
        libata: Export AHCI capabilities
        libata: Delegate nonrot flag setting to SCSI
        [libata] Add pata_rdc driver for RDC ATA devices
        drivers/ata: Remove unnecessary semicolons
        libata: remove spindown skipping and warning
        ...
      86373435
    • Linus Torvalds's avatar
      Merge branch 'tracing-core-for-linus' of... · 483e3cd6
      Linus Torvalds authored
      Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/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: (105 commits)
        ring-buffer: only enable ring_buffer_swap_cpu when needed
        ring-buffer: check for swapped buffers in start of committing
        tracing: report error in trace if we fail to swap latency buffer
        tracing: add trace_array_printk for internal tracers to use
        tracing: pass around ring buffer instead of tracer
        tracing: make tracing_reset safe for external use
        tracing: use timestamp to determine start of latency traces
        tracing: Remove mentioning of legacy latency_trace file from documentation
        tracing/filters: Defer pred allocation, fix memory leak
        tracing: remove users of tracing_reset
        tracing: disable buffers and synchronize_sched before resetting
        tracing: disable update max tracer while reading trace
        tracing: print out start and stop in latency traces
        ring-buffer: disable all cpu buffers when one finds a problem
        ring-buffer: do not count discarded events
        ring-buffer: remove ring_buffer_event_discard
        ring-buffer: fix ring_buffer_read crossing pages
        ring-buffer: remove unnecessary cpu_relax
        ring-buffer: do not swap buffers during a commit
        ring-buffer: do not reset while in a commit
        ...
      483e3cd6
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of... · 774a694f
      Linus Torvalds authored
      Merge branch 'sched-core-for-linus' of git://git.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: (64 commits)
        sched: Fix sched::sched_stat_wait tracepoint field
        sched: Disable NEW_FAIR_SLEEPERS for now
        sched: Keep kthreads at default priority
        sched: Re-tune the scheduler latency defaults to decrease worst-case latencies
        sched: Turn off child_runs_first
        sched: Ensure that a child can't gain time over it's parent after fork()
        sched: enable SD_WAKE_IDLE
        sched: Deal with low-load in wake_affine()
        sched: Remove short cut from select_task_rq_fair()
        sched: Turn on SD_BALANCE_NEWIDLE
        sched: Clean up topology.h
        sched: Fix dynamic power-balancing crash
        sched: Remove reciprocal for cpu_power
        sched: Try to deal with low capacity, fix update_sd_power_savings_stats()
        sched: Try to deal with low capacity
        sched: Scale down cpu_power due to RT tasks
        sched: Implement dynamic cpu_power
        sched: Add smt_gain
        sched: Update the cpu_power sum during load-balance
        sched: Add SD_PREFER_SIBLING
        ...
      774a694f
    • Linus Torvalds's avatar
      Merge branch 'perfcounters-core-for-linus' of... · 4f0ac854
      Linus Torvalds authored
      Merge branch 'perfcounters-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perfcounters-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (60 commits)
        perf tools: Avoid unnecessary work in directory lookups
        perf stat: Clean up statistics calculations a bit more
        perf stat: More advanced variance computation
        perf stat: Use stddev_mean in stead of stddev
        perf stat: Remove the limit on repeat
        perf stat: Change noise calculation to use stddev
        x86, perf_counter, bts: Do not allow kernel BTS tracing for now
        x86, perf_counter, bts: Correct pointer-to-u64 casts
        x86, perf_counter, bts: Fail if BTS is not available
        perf_counter: Fix output-sharing error path
        perf trace: Fix read_string()
        perf trace: Print out in nanoseconds
        perf tools: Seek to the end of the header area
        perf trace: Fix parsing of perf.data
        perf trace: Sample timestamps as well
        perf_counter: Introduce new (non-)paranoia level to allow raw tracepoint access
        perf trace: Sample the CPU too
        perf tools: Work around strict aliasing related warnings
        perf tools: Clean up warnings list in the Makefile
        perf tools: Complete support for dynamic strings
        ...
      4f0ac854
    • Linus Torvalds's avatar
      Merge branch 'oprofile-for-linus' of... · b9356c53
      Linus Torvalds authored
      Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (55 commits)
        arch/x86/oprofile/op_model_amd.c: fix op_amd_handle_ibs() return type
        Revert "x86: oprofile/op_model_amd.c set return values for op_amd_handle_ibs()"
        x86/oprofile: Small coding style fixes
        x86/oprofile: Add counter reservation check for virtual counters
        x86/oprofile: Implement op_x86_virt_to_phys()
        oprofile: Adding switch counter to oprofile statistic variables
        x86/oprofile: Implement mux_clone()
        x86/oprofile: Enable multiplexing only if the model supports it
        x86/oprofile: Add function has_mux() to check multiplexing support
        x86/oprofile: Modify initialization of num_virt_counters
        x86/oprofile: Remove unused num_virt_controls from struct op_x86_model_spec
        x86/oprofile: Remove const qualifier from struct op_x86_model_spec
        x86/oprofile: Moving nmi_cpu_switch() in nmi_int.c
        x86/oprofile: Moving nmi_cpu_save/restore_mpx_registers() in nmi_int.c
        x86/oprofile: Moving nmi_setup_cpu_mux() in nmi_int.c
        x86/oprofile: Implement multiplexing setup/shutdown functions
        oprofile: Grouping multiplexing code in op_model_amd.c
        oprofile: Introduce op_x86_phys_to_virt()
        oprofile: Grouping multiplexing code in oprof.c
        oprofile: Remove oprofile_multiplexing_init()
        ...
      b9356c53
    • Linus Torvalds's avatar
      Merge branch 'irq-threaded-for-linus' of... · d90a7e86
      Linus Torvalds authored
      Merge branch 'irq-threaded-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'irq-threaded-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        genirq: Do not mask oneshot edge type interrupts
        genirq: Support nested threaded irq handling
        genirq: Add buslock support
        genirq: Add oneshot support
      d90a7e86
    • Linus Torvalds's avatar
      Merge branch 'irq-core-for-linus' of... · 12a49961
      Linus Torvalds authored
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        pci/intr_remapping: Allocate irq_iommu on node
        irq: Add irq_node() primitive
        irq: Make sure irq_desc for legacy irq get correct node setting
        genirq: Add prototype for handle_nested_irq()
        irq: Remove superfluous NULL pointer check in check_irq_resend()
        irq: Clean up by removing irqfixup MODULE_PARM_DESC()
        genirq: Fix comment describing suspend_device_irqs()
        genirq: Remove obsolete defines and typedefs
      12a49961
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of... · eee2775d
      Linus Torvalds authored
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (28 commits)
        rcu: Move end of special early-boot RCU operation earlier
        rcu: Changes from reviews: avoid casts, fix/add warnings, improve comments
        rcu: Create rcutree plugins to handle hotplug CPU for multi-level trees
        rcu: Remove lockdep annotations from RCU's _notrace() API members
        rcu: Add #ifdef to suppress __rcu_offline_cpu() warning in !HOTPLUG_CPU builds
        rcu: Add CPU-offline processing for single-node configurations
        rcu: Add "notrace" to RCU function headers used by ftrace
        rcu: Remove CONFIG_PREEMPT_RCU
        rcu: Merge preemptable-RCU functionality into hierarchical RCU
        rcu: Simplify rcu_pending()/rcu_check_callbacks() API
        rcu: Use debugfs_remove_recursive() simplify code.
        rcu: Merge per-RCU-flavor initialization into pre-existing macro
        rcu: Fix online/offline indication for rcudata.csv trace file
        rcu: Consolidate sparse and lockdep declarations in include/linux/rcupdate.h
        rcu: Renamings to increase RCU clarity
        rcu: Move private definitions from include/linux/rcutree.h to kernel/rcutree.h
        rcu: Expunge lingering references to CONFIG_CLASSIC_RCU, optimize on !SMP
        rcu: Delay rcu_barrier() wait until beginning of next CPU-hotunplug operation.
        rcu: Fix typo in rcu_irq_exit() comment header
        rcu: Make rcupreempt_trace.c look at offline CPUs
        ...
      eee2775d
    • Linus Torvalds's avatar
      Merge branch 'core-printk-for-linus' of... · 53e16fbd
      Linus Torvalds authored
      Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        printk: Fix "printk: Enable the use of more than one CON_BOOT (early console)"
        printk: Restore previous console_loglevel when re-enabling logging
        printk: Ensure that "console enabled" messages are printed on the console
        printk: Enable the use of more than one CON_BOOT (early console)
      53e16fbd
    • Linus Torvalds's avatar
      Merge branch 'core-locking-for-linus' of... · 4e3408d9
      Linus Torvalds authored
      Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (32 commits)
        locking, m68k/asm-offsets: Rename signal defines
        locking: Inline spinlock code for all locking variants on s390
        locking: Simplify spinlock inlining
        locking: Allow arch-inlined spinlocks
        locking: Move spinlock function bodies to header file
        locking, m68k: Calculate thread_info offset with asm offset
        locking, m68k/asm-offsets: Rename pt_regs offset defines
        locking, sparc: Rename __spin_try_lock() and friends
        locking, powerpc: Rename __spin_try_lock() and friends
        lockdep: Remove recursion stattistics
        lockdep: Simplify lock_stat seqfile code
        lockdep: Simplify lockdep_chains seqfile code
        lockdep: Simplify lockdep seqfile code
        lockdep: Fix missing entries in /proc/lock_chains
        lockdep: Fix missing entry in /proc/lock_stat
        lockdep: Fix memory usage info of BFS
        lockdep: Reintroduce generation count to make BFS faster
        lockdep: Deal with many similar locks
        lockdep: Introduce lockdep_assert_held()
        lockdep: Fix style nits
        ...
      4e3408d9
    • Linus Torvalds's avatar
      Merge branch 'core-iommu-for-linus' of... · a66a5005
      Linus Torvalds authored
      Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (59 commits)
        x86/gart: Do not select AGP for GART_IOMMU
        x86/amd-iommu: Initialize passthrough mode when requested
        x86/amd-iommu: Don't detach device from pt domain on driver unbind
        x86/amd-iommu: Make sure a device is assigned in passthrough mode
        x86/amd-iommu: Align locking between attach_device and detach_device
        x86/amd-iommu: Fix device table write order
        x86/amd-iommu: Add passthrough mode initialization functions
        x86/amd-iommu: Add core functions for pd allocation/freeing
        x86/dma: Mark iommu_pass_through as __read_mostly
        x86/amd-iommu: Change iommu_map_page to support multiple page sizes
        x86/amd-iommu: Support higher level PTEs in iommu_page_unmap
        x86/amd-iommu: Remove old page table handling macros
        x86/amd-iommu: Use 2-level page tables for dma_ops domains
        x86/amd-iommu: Remove bus_addr check in iommu_map_page
        x86/amd-iommu: Remove last usages of IOMMU_PTE_L0_INDEX
        x86/amd-iommu: Change alloc_pte to support 64 bit address space
        x86/amd-iommu: Introduce increase_address_space function
        x86/amd-iommu: Flush domains if address space size was increased
        x86/amd-iommu: Introduce set_dte_entry function
        x86/amd-iommu: Add a gneric version of amd_iommu_flush_all_devices
        ...
      a66a5005
    • Linus Torvalds's avatar
      Merge branch 'core-futexes-for-linus' of... · 7193bea5
      Linus Torvalds authored
      Merge branch 'core-futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        futex: Detect mismatched requeue targets
        futex: Correct futex_wait_requeue_pi() commentary
      7193bea5
    • Linus Torvalds's avatar
      Merge branch 'core-debug-for-linus' of... · 989aa44a
      Linus Torvalds authored
      Merge branch 'core-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        debug lockups: Improve lockup detection, fix generic arch fallback
        debug lockups: Improve lockup detection
      989aa44a
    • Linus Torvalds's avatar
      Merge branch 'core-cleanups-for-linus' of... · 4004f02d
      Linus Torvalds authored
      Merge branch 'core-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        workqueues: Improve schedule_work() documentation
      4004f02d
    • Trond Myklebust's avatar
      Merge branch 'nfs-for-2.6.32' · ab3bbaa8
      Trond Myklebust authored
      ab3bbaa8
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 332a3392
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (102 commits)
        crypto: sha-s390 - Fix warnings in import function
        crypto: vmac - New hash algorithm for intel_txt support
        crypto: api - Do not displace newly registered algorithms
        crypto: ansi_cprng - Fix module initialization
        crypto: xcbc - Fix alignment calculation of xcbc_tfm_ctx
        crypto: fips - Depend on ansi_cprng
        crypto: blkcipher - Do not use eseqiv on stream ciphers
        crypto: ctr - Use chainiv on raw counter mode
        Revert crypto: fips - Select CPRNG
        crypto: rng - Fix typo
        crypto: talitos - add support for 36 bit addressing
        crypto: talitos - align locks on cache lines
        crypto: talitos - simplify hmac data size calculation
        crypto: mv_cesa - Add support for Orion5X crypto engine
        crypto: cryptd - Add support to access underlaying shash
        crypto: gcm - Use GHASH digest algorithm
        crypto: ghash - Add GHASH digest algorithm for GCM
        crypto: authenc - Convert to ahash
        crypto: api - Fix aligned ctx helper
        crypto: hmac - Prehash ipad/opad
        ...
      332a3392
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · a9c86d42
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (377 commits)
        ASoC: au1x: PSC-AC97 bugfixes
        ALSA: dummy - Increase MAX_PCM_SUBSTREAMS to 128
        ALSA: dummy - Add debug proc file
        ALSA: Add const prefix to proc helper functions
        ALSA: Re-export snd_pcm_format_name() function
        ALSA: hda - Use auto model for HP laptops with ALC268 codec
        ALSA: cs46xx - Fix minimum period size
        ASoC: Fix WM835x Out4 capture enumeration
        ALSA: Remove unneeded ifdef from sound/core.h
        ALSA: Remove struct snd_monitor_file from public sound/core.h
        ASoC: Remove unuused hw_read_t
        sound: oxygen: work around MCE when changing volume
        ALSA: dummy - Fake buffer allocations
        ALSA: hda/realtek: Added support for CLEVO M540R subsystem, 6 channel + digital
        ASoC: fix pxa2xx-ac97.c breakage
        ALSA: dummy - Fix the timer calculation in systimer mode
        ALSA: dummy - Add more description
        ALSA: dummy - Better jiffies handling
        ALSA: dummy - Support high-res timer mode
        ALSA: Release v1.0.21
        ...
      a9c86d42
    • Linus Torvalds's avatar
      Merge branch 'writeback' of git://git.kernel.dk/linux-2.6-block · a12e4d30
      Linus Torvalds authored
      * 'writeback' of git://git.kernel.dk/linux-2.6-block:
        writeback: check for registered bdi in flusher add and inode dirty
        writeback: add name to backing_dev_info
        writeback: add some debug inode list counters to bdi stats
        writeback: get rid of pdflush completely
        writeback: switch to per-bdi threads for flushing data
        writeback: move dirty inodes from super_block to backing_dev_info
        writeback: get rid of generic_sync_sb_inodes() export
      a12e4d30
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · 89af571c
      Linus Torvalds authored
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (54 commits)
        [S390] tape: Use pr_xxx instead of dev_xxx in shared driver code
        [S390] Wire up page fault events for software perf counters.
        [S390] Remove smp_cpu_not_running.
        [S390] Get rid of cpuid.h header file.
        [S390] Limit cpu detection to 256 physical cpus.
        [S390] tape: Fix device online messages
        [S390] Enable guest page hinting by default.
        [S390] use generic scatterlist.h
        [S390] s390dbf: Add description for usage of "%s" in sprintf events
        [S390] Initialize __LC_THREAD_INFO early.
        [S390] fix recursive locking on page_table_lock
        [S390] kvm: use console_initcall() to initialize s390 virtio console
        [S390] tape: reversed order of labels
        [S390] hypfs: Use "%u" instead of "%d" for unsigned ints in snprintf
        [S390] kernel: Print an error message if kernel NSS cannot be defined
        [S390] zcrypt: Free ap_device if dev_set_name fails.
        [S390] zcrypt: Use spin_lock_bh in suspend callback
        [S390] xpram: Remove checksum validation for suspend/resume
        [S390] vmur: Invalid allocation sequence for vmur class
        [S390] hypfs: remove useless variable qname
        ...
      89af571c
    • Linus Torvalds's avatar
      Merge branch 'kmemleak' of git://linux-arm.org/linux-2.6 · 1b195b17
      Linus Torvalds authored
      * 'kmemleak' of git://linux-arm.org/linux-2.6:
        kmemleak: Improve the "Early log buffer exceeded" error message
        kmemleak: fix sparse warning for static declarations
        kmemleak: fix sparse warning over overshadowed flags
        kmemleak: move common painting code together
        kmemleak: add clear command support
        kmemleak: use bool for true/false questions
        kmemleak: Do no create the clean-up thread during kmemleak_disable()
        kmemleak: Scan all thread stacks
        kmemleak: Don't scan uninitialized memory when kmemcheck is enabled
        kmemleak: Ignore the aperture memory hole on x86_64
        kmemleak: Printing of the objects hex dump
        kmemleak: Do not report alloc_bootmem blocks as leaks
        kmemleak: Save the stack trace for early allocations
        kmemleak: Mark the early log buffer as __initdata
        kmemleak: Dump object information on request
        kmemleak: Allow rescheduling during an object scanning
      1b195b17
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 2490138c
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (48 commits)
        RDMA/iwcm: Reject the connection when the cm_id is destroyed
        RDMA/cxgb3: Clean up properly on FW mismatch failures
        RDMA/cxgb3: Don't ignore insert_handle() failures
        MAINTAINERS: InfiniBand/RDMA mailing list transition to vger
        IB/mad: Allow tuning of QP0 and QP1 sizes
        IB/mad: Fix possible lock-lock-timer deadlock
        RDMA/nes: Map MTU to IB_MTU_* and correctly report link state
        RDMA/nes: Rework the disconn routine for terminate and flushing
        RDMA/nes: Use the flush code to fill in cqe error
        RDMA/nes: Make poll_cq return correct number of wqes during flush
        RDMA/nes: Use flush mechanism to set status for wqe in error
        RDMA/nes: Implement Terminate Packet
        RDMA/nes: Add CQ error handling
        RDMA/nes: Clean out CQ completions when QP is destroyed
        RDMA/nes: Change memory allocation for cqp request to GFP_ATOMIC
        RDMA/nes: Allocate work item for disconnect event handling
        RDMA/nes: Update refcnt during disconnect
        IB/mthca: Don't allow userspace open while recovering from catastrophic error
        IB/mthca: Distinguish multiple devices in /proc/interrupts
        IB/mthca: Annotate CQ locking
        ...
      2490138c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of... · f6f79190
      Linus Torvalds authored
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (57 commits)
        binfmt_elf: fix PT_INTERP bss handling
        TPM: Fixup boot probe timeout for tpm_tis driver
        sysfs: Add labeling support for sysfs
        LSM/SELinux: inode_{get,set,notify}secctx hooks to access LSM security context information.
        VFS: Factor out part of vfs_setxattr so it can be called from the SELinux hook for inode_setsecctx.
        KEYS: Add missing linux/tracehook.h #inclusions
        KEYS: Fix default security_session_to_parent()
        Security/SELinux: includecheck fix kernel/sysctl.c
        KEYS: security_cred_alloc_blank() should return int under all circumstances
        IMA: open new file for read
        KEYS: Add a keyctl to install a process's session keyring on its parent [try #6]
        KEYS: Extend TIF_NOTIFY_RESUME to (almost) all architectures [try #6]
        KEYS: Do some whitespace cleanups [try #6]
        KEYS: Make /proc/keys use keyid not numread as file position [try #6]
        KEYS: Add garbage collection for dead, revoked and expired keys. [try #6]
        KEYS: Flag dead keys to induce EKEYREVOKED [try #6]
        KEYS: Allow keyctl_revoke() on keys that have SETATTR but not WRITE perm [try #6]
        KEYS: Deal with dead-type keys appropriately [try #6]
        CRED: Add some configurable debugging [try #6]
        selinux: Support for the new TUN LSM hooks
        ...
      f6f79190
    • Catalin Marinas's avatar
      kmemleak: Improve the "Early log buffer exceeded" error message · addd72c1
      Catalin Marinas authored
      Based on a suggestion from Jaswinder, clarify what the user would need
      to do to avoid this error message from kmemleak.
      Reported-by: default avatarJaswinder Singh Rajput <jaswinder@kernel.org>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      addd72c1
    • Michael Holzheu's avatar
      [S390] tape: Use pr_xxx instead of dev_xxx in shared driver code · 59e36927
      Michael Holzheu authored
      For messages from the tape core that is shared between the 3590 and 34xx
      tape disciplines, we want to have the "tape" prefix instead of "tape_3590"
      or "tape_34xx". In order to fix this, we now use the pr_xxx printk macros.
      Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      59e36927
    • Heiko Carstens's avatar
    • Heiko Carstens's avatar
      [S390] Remove smp_cpu_not_running. · 5c0b912e
      Heiko Carstens authored
      smp_cpu_not_running() and cpu_stopped() are doing the same.
      Remove one and also get rid of the last hard_smp_processor_id() leftover.
      Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      5c0b912e
    • Heiko Carstens's avatar
      [S390] Get rid of cpuid.h header file. · e86a6ed6
      Heiko Carstens authored
      Merge cpuid.h header file into cpu.h.
      While at it convert from typedef to struct declaration and also
      convert cio code to use proper lowcore structure instead of casts.
      Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      e86a6ed6
    • Heiko Carstens's avatar
      [S390] Limit cpu detection to 256 physical cpus. · 4bb5e07b
      Heiko Carstens authored
      Saves us more than 65k pointless IPIs.
      Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      4bb5e07b
    • Michael Holzheu's avatar
      [S390] tape: Fix device online messages · 53f8c573
      Michael Holzheu authored
      Currently, when a tape device is set online and no cartridge is loaded, we
      get the messages "The tape cartridge has been successfully unloaded" and
      "Determining the size of the recorded area". These messages are not correct.
      To fix this, we now print the "cartridge loaded/unloaded" messages only,
      when the load/unload event really occurs. In addition to that, the message
      "Determining the size of the recorded area" is only printed, if a cartridge
      is loaded.
      Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      53f8c573
    • Heiko Carstens's avatar
      [S390] Enable guest page hinting by default. · 2ddddf3e
      Heiko Carstens authored
      Get rid of the PAGE_STATES config option and enable guest page hinting
      by default.
      It can be disabled by specifying "cmma=off" at the command line.
      Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      2ddddf3e
    • Heiko Carstens's avatar
      5dd1d2ec
    • Michael Holzheu's avatar
      [S390] s390dbf: Add description for usage of "%s" in sprintf events · f64d04c0
      Michael Holzheu authored
      Using "%s" in sprintf event functions is dangerous. This patch adds a short
      description for this issue to the s390 debug feature documentation.
      Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      f64d04c0
    • Heiko Carstens's avatar
      [S390] Initialize __LC_THREAD_INFO early. · 0c88ee5b
      Heiko Carstens authored
      "lockdep: Fix backtraces" reveales a bug in early setup code: when
      lockdep tries to save a stack backtrace before setup_arch has been
      called the lowcore pointer for the current thread info pointer isn't
      initialized yet.
      However our save stack backtrace code relies on it. If the pointer
      isn't initialized the saved backtrace will have zero entries.
      lockdep however relies (correctly) on the fact that that cannot
      happen.
      A write access to some random memory region is the result.
      
      Fix this by initializing the thread info pointer early.
      Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      0c88ee5b
    • Martin Schwidefsky's avatar
      [S390] fix recursive locking on page_table_lock · 50aa98ba
      Martin Schwidefsky authored
      Suzuki Poulose reported the following recursive locking bug on s390:
      
      Here is the stack trace : (see Appendix I for more info)
      
        [<0000000000406ed6>] _spin_lock+0x52/0x94
        [<0000000000103bde>] crst_table_free+0x14e/0x1a4
        [<00000000001ba684>] __pmd_alloc+0x114/0x1ec
        [<00000000001be8d0>] handle_mm_fault+0x2cc/0xb80
        [<0000000000407d62>] do_dat_exception+0x2b6/0x3a0
        [<0000000000114f8c>] sysc_return+0x0/0x8
        [<00000200001642b2>] 0x200001642b2
      
      The page_table_lock is already acquired in __pmd_alloc (mm/memory.c) and
      it tries to populate the pud/pgd with a new pmd allocated. If another
      thread populates it before we get a chance, we free the pmd using
      pmd_free().
      
      On s390x, pmd_free(even pud_free ) is #defined to crst_table_free(),
      which acquires the page_table_lock to protect the crst_table index updates.
      
      Hence this ends up in a recursive locking of the page_table_lock.
      
      The solution suggested by Dave Hansen is to use a new spin lock in the mmu
      context to protect the access to the crst_list and the pgtable_list.
      Reported-by: default avatarSuzuki Poulose <suzuki@in.ibm.com>
      Cc: Dave Hansen <dave@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      50aa98ba
    • Hendrik Brueckner's avatar
      [S390] kvm: use console_initcall() to initialize s390 virtio console · c4de0c1a
      Hendrik Brueckner authored
      Use a console_initcall() to initialize the s390 virtio console and
      clean up s390 console initialization in setup.c.
      Signed-off-by: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
      Tested-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      c4de0c1a
    • Roel Kluin's avatar
      [S390] tape: reversed order of labels · 68d36bdb
      Roel Kluin authored
      Fix the order of goto labels in tape_generic_online.
      Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
      68d36bdb