1. 23 3月, 2012 12 次提交
    • L
      Merge tag 'md-3.4' of git://neil.brown.name/md · 267d7b23
      Linus Torvalds 提交于
      Pull md updates for 3.4 from Neil Brown:
       "Mostly tidying up code in preparation for some bigger changes next
        time.
      
        A few bug fixes tagged for -stable.
      
        Main functionality change is that some RAID10 arrays can now grow to
        use extra space that may have been made available on the individual
        devices."
      
      Fixed up trivial conflicts with the k[un]map_atomic() cleanups in
      drivers/md/bitmap.c.
      
      * tag 'md-3.4' of git://neil.brown.name/md: (22 commits)
        md: Add judgement bb->unacked_exist in function md_ack_all_badblocks().
        md: fix clearing of the 'changed' flags for the bad blocks list.
        md/bitmap: discard CHUNK_BLOCK_SHIFT macro
        md/bitmap: remove unnecessary indirection when allocating.
        md/bitmap: remove some pointless locking.
        md/bitmap: change a 'goto' to a normal 'if' construct.
        md/bitmap: move printing of bitmap status to bitmap.c
        md/bitmap: remove some unused noise from bitmap.h
        md/raid10 - support resizing some RAID10 arrays.
        md/raid1: handle merge_bvec_fn in member devices.
        md/raid10: handle merge_bvec_fn in member devices.
        md: add proper merge_bvec handling to RAID0 and Linear.
        md: tidy up rdev_for_each usage.
        md/raid1,raid10: avoid deadlock during resync/recovery.
        md/bitmap: ensure to load bitmap when creating via sysfs.
        md: don't set md arrays to readonly on shutdown.
        md: allow re-add to failed arrays.
        md/raid5: use atomic_dec_return() instead of atomic_dec() and atomic_read().
        md: Use existed macros instead of numbers
        md/raid5: removed unused 'added_devices' variable.
        ...
      267d7b23
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 28f23d1f
      Linus Torvalds 提交于
      Pull x86 "urgent" leftovers from Ingo Molnar:
       "Pending x86/urgent bits that were not high prio enough to warrant
        -rc-less v3.3-final inclusion."
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, efi: Fix pointer math issue in handle_ramdisks()
        x86/ioapic: Add register level checks to detect bogus io-apic entries
        x86, mce: Fix rcu splat in drain_mce_log_buffer()
        x86, memblock: Move mem_hole_size() to .init
      28f23d1f
    • L
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 23904815
      Linus Torvalds 提交于
      Pull x86 platform changes from Ingo Molnar.
      
      Removes the Moorestown platform that nobody ever used.
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/platform: Move APIC ID validity check into platform APIC code
        x86/olpc/xo15/sci: Enable lid close wakeup control
        x86/geode/net5501: Add platform driver for Soekris Engineering net5501
        x86/geode/alix2: Supplement driver to include GPIO button support
        x86/mid/powerbtn: Use MSIC read/write instead of ipc_scu
        x86/mid/thermal: Turn off thermistor
        x86/mid/thermal: Add msic_thermal alias
        x86/mid/thermal: Convert to use Intel MSIC API
        x86/mid/scu_ipc: Remove Moorestown support
        x86/mid: Kill off Moorestown
        x86/mrst: Add msic_thermal platform support
        x86/config: Select MSIC MFD driver on Intel Medfield platform
        x86/mid: Remove Intel Moorestown
        x86/mrst: Set ISA bus type for fake MP IRQs
        x86/ioapic: Use legacy_pic to set correct gsi-irq mapping
      23904815
    • L
      Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 754b9800
      Linus Torvalds 提交于
      Pull MCE changes from Ingo Molnar.
      
      * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mce: Fix return value of mce_chrdev_read() when erst is disabled
        x86/mce: Convert static array of pointers to per-cpu variables
        x86/mce: Replace hard coded hex constants with symbolic defines
        x86/mce: Recognise machine check bank signature for data path error
        x86/mce: Handle "action required" errors
        x86/mce: Add mechanism to safely save information in MCE handler
        x86/mce: Create helper function to save addr/misc when needed
        HWPOISON: Add code to handle "action required" errors.
        HWPOISON: Clean up memory_failure() vs. __memory_failure()
      754b9800
    • L
      Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 35cb8d9e
      Linus Torvalds 提交于
      Pull x86/fpu changes from Ingo Molnar.
      
      * 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        i387: Split up <asm/i387.h> into exported and internal interfaces
        i387: Uninline the generic FP helpers that we expose to kernel modules
      35cb8d9e
    • L
      Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 02c50256
      Linus Torvalds 提交于
      Pull x86/build changes from Ingo Molnar.
      
      * 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, build: Fix portability issues when cross-building
        x86, tools: Remove unneeded header files from tools/build.c
        USB: ffs-test: Don't duplicate {get,put}_unaligned*() functions
        x86, efi: Fix endian issues and unaligned accesses
        x86, boot: Restrict CFLAGS for hostprogs
        x86, mkpiggy: Don't open code put_unaligned_le32()
        x86, relocs: Don't open code put_unaligned_le32()
        tools/include: Add byteshift headers for endian access
      02c50256
    • L
      Merge branch 'x86-eficross-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f06fc0c0
      Linus Torvalds 提交于
      Pull x86/eficross (booting 32/64-bit kernel from 64/32-bit EFI) from Ingo Molnar
      
      * 'x86-eficross-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, efi: Allow basic init with mixed 32/64-bit efi/kernel
        x86, efi: Add basic error handling
        x86, efi: Cleanup config table walking
        x86, efi: Convert printk to pr_*()
        x86, efi: Refactor efi_init() a bit
      f06fc0c0
    • L
      Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4c64616b
      Linus Torvalds 提交于
      Pull x86/debug changes from Ingo Molnar.
      
      * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Fix section warnings
        x86-64: Fix CFI data for common_interrupt()
        x86: Properly _init-annotate NMI selftest code
        x86/debug: Fix/improve the show_msr=<cpus> debug print out
      4c64616b
    • L
      Merge branches 'x86-cpu-for-linus', 'x86-boot-for-linus',... · c5c7fb8f
      Linus Torvalds 提交于
      Merge branches 'x86-cpu-for-linus', 'x86-boot-for-linus', 'x86-cpufeature-for-linus', 'x86-process-for-linus' and 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
      
      Pull trivial x86 branches from Ingo Molnar: small one-liners to fix up
      details.
      
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Remove some noise from boot log when starting cpus
      
      * 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, boot: Fix port argument to inl() function
      
      * 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, cpufeature: Add CPU features from Intel document 319433-012A
      
      * 'x86-process-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86_64: Record stack pointer before task execution begins
      
      * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/UV: Lower UV rtc clocksource rating
      c5c7fb8f
    • L
      Merge branch 'x86-atomic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1b674bf1
      Linus Torvalds 提交于
      Pull x86/atomic changes from Ingo Molnar.
      
      * 'x86-atomic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: atomic64 assembly improvements
        x86: Adjust asm constraints in atomic64 wrappers
      1b674bf1
    • L
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e17fdf5c
      Linus Torvalds 提交于
      Pull x86/asm changes from Ingo Molnar
      
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Include probe_roms.h in probe_roms.c
        x86/32: Print control and debug registers for kerenel context
        x86: Tighten dependencies of CPU_SUP_*_32
        x86/numa: Improve internode cache alignment
        x86: Fix the NMI nesting comments
        x86-64: Improve insn scheduling in SAVE_ARGS_IRQ
        x86-64: Fix CFI annotations for NMI nesting code
        bitops: Add missing parentheses to new get_order macro
        bitops: Optimise get_order()
        bitops: Adjust the comment on get_order() to describe the size==0 case
        x86/spinlocks: Eliminate TICKET_MASK
        x86-64: Handle byte-wise tail copying in memcpy() without a loop
        x86-64: Fix memcpy() to support sizes of 4Gb and above
        x86-64: Fix memset() to support sizes of 4Gb and above
        x86-64: Slightly shorten copy_page()
      e17fdf5c
    • L
      Merge branch 'akpm' (Andrew's patch-bomb) · 95211279
      Linus Torvalds 提交于
      Merge first batch of patches from Andrew Morton:
       "A few misc things and all the MM queue"
      
      * emailed from Andrew Morton <akpm@linux-foundation.org>: (92 commits)
        memcg: avoid THP split in task migration
        thp: add HPAGE_PMD_* definitions for !CONFIG_TRANSPARENT_HUGEPAGE
        memcg: clean up existing move charge code
        mm/memcontrol.c: remove unnecessary 'break' in mem_cgroup_read()
        mm/memcontrol.c: remove redundant BUG_ON() in mem_cgroup_usage_unregister_event()
        mm/memcontrol.c: s/stealed/stolen/
        memcg: fix performance of mem_cgroup_begin_update_page_stat()
        memcg: remove PCG_FILE_MAPPED
        memcg: use new logic for page stat accounting
        memcg: remove PCG_MOVE_LOCK flag from page_cgroup
        memcg: simplify move_account() check
        memcg: remove EXPORT_SYMBOL(mem_cgroup_update_page_stat)
        memcg: kill dead prev_priority stubs
        memcg: remove PCG_CACHE page_cgroup flag
        memcg: let css_get_next() rely upon rcu_read_lock()
        cgroup: revert ss_id_lock to spinlock
        idr: make idr_get_next() good for rcu_read_lock()
        memcg: remove unnecessary thp check in page stat accounting
        memcg: remove redundant returns
        memcg: enum lru_list lru
        ...
      95211279
  2. 22 3月, 2012 28 次提交