1. 10 5月, 2007 40 次提交
    • L
      Revert "md: improve partition detection in md array" · 44ce6294
      Linus Torvalds 提交于
      This reverts commit 5b479c91.
      
      Quoth Neil Brown:
      
        "It causes an oops when auto-detecting raid arrays, and it doesn't
         seem easy to fix.
      
         The array may not be 'open' when do_md_run is called, so
         bdev->bd_disk might be NULL, so bd_set_size can oops.
      
         This whole approach of opening an md device before it has been
         assembled just seems to get more and more painful.  I think I'm going
         to have to come up with something clever to provide both backward
         comparability with usage expectation, and sane integration into the
         rest of the kernel."
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      44ce6294
    • A
      atl1: add netconsole support · 497f050c
      Alexey Dobriyan 提交于
      Copied from b44 driver, but it works:
      
      netconsole: device eth0 not up yet, forcing it
      atl1: eth0 link is up 100 Mbps full duplex
      netconsole: network logging started
      Signed-off-by: NAlexey Dobriyan <adobriyan@gmail.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      497f050c
    • P
      Fix hang on IBM Token Ring PCMCIA card ejection · 5bebf82f
      Paul Walmsley 提交于
      Ejecting a PCMCIA IBM Token Ring card that has not had its dev->open()
      called will reliably trigger an uninitialized spinlock oops when
      spinlock debugging is enabled. The system then hangs, occasionally
      softlockup oopsing.  Apparently ibmtr.c:tok_interrupt() doesn't expect
      to be called before tok_open(), but tok_interrupt() gets called anyway
      when the card is ejected.  So, set an already-existing flag which
      causes tok_interrupt() to bail out early upon card ejection. Tested by
      inserting and removing the PCMCIA card several times.
      Signed-off-by: NPaul Walmsley <paul@booyaka.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      5bebf82f
    • S
      skge: default WOL should be magic only (rev2) · 5b982c5b
      Stephen Hemminger 提交于
      By default, the skge driver now enables wake on magic and wake on PHY.
      This is a bad default (bug), wake on PHY means machine will never shutdown
      if connected to a switch.
      
      Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>a
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      5b982c5b
    • J
      Merge branch 'upstream' of... · 2c4f365a
      Jeff Garzik 提交于
      Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
      2c4f365a
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 · 3cb7396b
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
        ide: fix PIO setup on resume for ATAPI devices
        ide: legacy PCI bus order probing fixes
        ide: add ide_proc_register_port()
        ide: add "initializing" argument to ide_register_hw()
        ide: cable detection fixes (take 2)
        ide: move IDE settings handling to ide-proc.c
        ide: split off ioctl handling from IDE settings (v2)
        ide: make /proc/ide/ optional
        ide: add ide_tune_dma() helper
        ide: rework the code for selecting the best DMA transfer mode (v3)
        ide: fix UDMA/MWDMA/SWDMA masks (v3)
      3cb7396b
    • L
      Merge git://git.linux-nfs.org/pub/linux/nfs-2.6 · d0b6e0e3
      Linus Torvalds 提交于
      * git://git.linux-nfs.org/pub/linux/nfs-2.6:
        NFS: Kill the obsolete NFS_PARANOIA
        NFS: use __set_current_state()
        sunrpc: fix crash in rpc_malloc()
        NFS: Clean up NFSv4 XDR error message
        NFS: NFS client underestimates how large an NFSv4 SETATTR reply can be
        SUNRPC: Fix pointer arithmetic bug recently introduced in rpc_malloc/free
        NFS: Remove redundant check in nfs_check_verifier()
        NFS: Fix a jiffie wraparound issue
      d0b6e0e3
    • B
      ide: fix PIO setup on resume for ATAPI devices · 317a46a2
      Bartlomiej Zolnierkiewicz 提交于
      PIO should be restored also for ATAPI devices during resume, fix it.
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      317a46a2
    • B
      ide: legacy PCI bus order probing fixes · 6d208b39
      Bartlomiej Zolnierkiewicz 提交于
      IDE PCI host drivers should register themselves with IDE core only when
      IDE driver is built-in, otherwise (IDE driver is modular and thus IDE PCI
      host drivers are also modular) the code has no effect and just complicates
      the probing.
      
      Fix it by adding new config option CONFIG_IDEPCI_PCIBUS (defined only when
      needed and invisible to the user) and covering by #ifdef/#endif the code
      in question.  It turned out that "ide=reverse" was silently accepted but did
      nothing in case when IDE driver was modular, this is fixed now.
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      6d208b39
    • B
      ide: add ide_proc_register_port() · 5cbf79cd
      Bartlomiej Zolnierkiewicz 提交于
      * create_proc_ide_interfaces() tries to add /proc entries for every probed
        and initialized IDE port, replace it by ide_proc_register_port() which does
        it only for the given port (also rename destroy_proc_ide_interface() to
        ide_proc_unregister_port() for consistency)
        
      * convert {create,destroy}_proc_ide_interface[s]() users to use new functions
      
      * pmac driver depended on proc_ide_create() to add /proc port entries, fix it
        
      * au1xxx-ide, swarm and cs5520 drivers depended indirectly on ide-generic
        driver (CONFIG_IDE_GENERIC=y) to add port /proc entries, fix them
      
      * there is now no need to add /proc entries for IDE ports in proc_ide_create()
        so don't do it
      
      * proc_ide_create() needs now to be called before drivers are probed - fix it,
        while at it make proc_ide_create() create /proc "ide" directory
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      5cbf79cd
    • B
      ide: add "initializing" argument to ide_register_hw() · 869c56ee
      Bartlomiej Zolnierkiewicz 提交于
      Add "initializing" argument to ide_register_hw() and use it instead of ide.c
      wide variable of the same name.  Update all users of ide_register_hw()
      accordingly.
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      869c56ee
    • B
      ide: cable detection fixes (take 2) · 7f8f48af
      Bartlomiej Zolnierkiewicz 提交于
      Tejun's recent eighty_ninty_three() fix has inspired me to do more thorough
      review of the cable detection code...
      
      * print user-friendly warning about limiting the maximum transfer speed
        to UDMA33 (and the reason behind it) when 80-wire cable is not detected,
        also while at it cleanup eighty_ninty_three() a bit
      
      * use eighty_ninty_three() in ide_ata66_check(), this actually fixes 3 bugs:
        - bit 14 (word 93 validity check) == 1 && bit 13 (80-wire cable test) == 1
          were used as 80-wire cable present test for CONFIG_IDEDMA_IVB=n case
          (please see FIXME comment in eighty_ninty_three() for more details)
        - CONFIG_IDEDMA_IVB=y/n cases were interchanged
        - check for SATA devices was missing
      
      * remove private cable warnings from pdc_202xx{old,new} drivers now that core
        code provides this functionality (plus, in pdc202xx_new case the test could
        give false warnings for ATAPI devices because pdc202xx_new driver doesn't
        even support ATAPI DMA)
      
      Cc: Tejun Heo <htejun@gmail.com>
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      7f8f48af
    • B
      ide: move IDE settings handling to ide-proc.c · 7662d046
      Bartlomiej Zolnierkiewicz 提交于
      * move
      	__ide_add_setting()
      	ide_add_setting()
      	__ide_remove_setting()
      	auto_remove_settings()
      	ide_find_setting_by_name()
      	ide_read_setting()
      	ide_write_setting()
      	set_xfer_rate()
      	ide_add_generic_settings()
      	ide_register_subdriver()
      	ide_unregister_subdriver()
      
        from ide.c to ide-proc.c
      
      * set_{io_32bit,pio_mode,using_dma}() cannot be marked static now, fix it
      
      * rename ide_[un]register_subdriver() to ide_proc_[un]register_driver(),
        update device drivers to use new names
      
      * add CONFIG_IDE_PROC_FS=n versions of ide_proc_[un]register_driver()
        and ide_add_generic_settings()
      
      * make ide_find_setting_by_name(), ide_{read,write}_setting()
        and ide_{add,remove}_proc_entries() static
      
      * cover IDE settings code in device drivers with CONFIG_IDE_PROC_FS #ifdef,
        also while at it cover with CONFIG_IDE_PROC_FS #ifdef ide_driver_t.proc
      
      * remove bogus comment from ide.h
      
      * cover with CONFIG_IDE_PROC_FS #ifdef .proc and .settings in ide_drive_t
      
      Besides saner code this patch results in the IDE core smaller by ~2 kB
      (on x86-32) and IDE disk driver by ~1 kB (ditto) when CONFIG_IDE_PROC_FS=n.
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      7662d046
    • B
      ide: split off ioctl handling from IDE settings (v2) · 1497943e
      Bartlomiej Zolnierkiewicz 提交于
      * do write permission and min/max checks in ide_procset_t functions
      
      * ide-disk.c: drive->id is always available so cleanup "multcount" setting
        accordingly
      
      * ide-disk.c: "address" setting was incorrectly defined as type TYPE_INTA,
        fix it by using type TYPE_BYTE and updating ide_drive_t->adressing field,
        the bug didn't trigger because this IDE setting uses custom ->set function
      
      * ide.c: add set_ksettings() for handling HDIO_SET_KEEPSETTINGS ioctl
      
      * ide.c: add set_unmaskirq() for handling HDIO_SET_UNMASKINTR ioctl
      
      * handle ioctls directly in generic_ide_ioclt() and idedisk_ioctl()
        instead of using IDE settings to deal with them
      
      * remove no longer needed ide_find_setting_by_ioctl() and {read,write}_ioctl
        fields from ide_settings_t, also remove now unused TYPE_INTA handling
      
      v2:
      * add missing EXPORT_SYMBOL_GPL(ide_setting_sem) needed now for ide-disk
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      1497943e
    • B
      ide: make /proc/ide/ optional · ecfd80e4
      Bartlomiej Zolnierkiewicz 提交于
      All important information/features should be already available through
      sysfs and ioctl interfaces.
      
      Add CONFIG_IDE_PROC_FS (CONFIG_SCSI_PROC_FS rip-off) config option,
      disabling it makes IDE driver ~5 kB smaller (on x86-32).
      
      While at it add CONFIG_PROC_FS=n versions of proc_ide_{create,destroy}()
      and remove no longer needed #ifdefs.
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      ecfd80e4
    • B
      ide: add ide_tune_dma() helper · 29e744d0
      Bartlomiej Zolnierkiewicz 提交于
      After reworking the code responsible for selecting the best DMA
      transfer mode it is now possible to add generic ide_tune_dma() helper.
      
      Convert some IDE PCI host drivers to use it (the ones left need more work).
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      29e744d0
    • B
      ide: rework the code for selecting the best DMA transfer mode (v3) · 2d5eaa6d
      Bartlomiej Zolnierkiewicz 提交于
      Depends on the "ide: fix UDMA/MWDMA/SWDMA masks" patch.
      
      * add ide_hwif_t.udma_filter hook for filtering UDMA mask
        (use it in alim15x3, hpt366, siimage and serverworks drivers)
      * add ide_max_dma_mode() for finding best DMA mode for the device
        (loosely based on some older libata-core.c code)
      * convert ide_dma_speed() users to use ide_max_dma_mode()
      * make ide_rate_filter() take "ide_drive_t *drive" as an argument instead
        of "u8 mode" and teach it to how to use UDMA mask to do filtering
      * use ide_rate_filter() in hpt366 driver
      * remove no longer needed ide_dma_speed() and *_ratemask()
      * unexport eighty_ninty_three()
      
      v2:
      * rename ->filter_udma_mask to ->udma_filter
        [ Suggested by Sergei Shtylyov <sshtylyov@ru.mvista.com>. ]
      
      v3:
      * updated for scc_pata driver (fixes XFER_UDMA_6 filtering for user-space
        originated transfer mode change requests when 100MHz clock is used)
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      2d5eaa6d
    • B
      ide: fix UDMA/MWDMA/SWDMA masks (v3) · 18137207
      Bartlomiej Zolnierkiewicz 提交于
      * use 0x00 instead of 0x80 to disable ->{ultra,mwdma,swdma}_mask
      * add udma_mask field to ide_pci_device_t and use it to initialize
        ->ultra_mask in aec62xx, cmd64x, pdc202xx_{new,old} and piix drivers
      * fix UDMA masks to match with chipset specific *_ratemask()
        (alim15x3, hpt366, serverworks and siimage drivers need UDMA mask
         filtering method - done in the next patch)
      
      v2:
      * piix: fix cable detection for 82801AA_1 and 82372FB_1
        [ Noticed by Sergei Shtylyov <sshtylyov@ru.mvista.com>. ]
      * cmd64x: use hwif->cds->udma_mask
        [ Suggested by Sergei Shtylyov <sshtylyov@ru.mvista.com>. ]
      * aec62xx: fix newly introduced bug - check DMA status not command register
        [ Noticed by Sergei Shtylyov <sshtylyov@ru.mvista.com>. ]
      
      v3:
      * piix: use hwif->cds->udma_mask
        [ Suggested by Sergei Shtylyov <sshtylyov@ru.mvista.com>. ]
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      18137207
    • J
    • M
      NFS: use __set_current_state() · fee7f23f
      Milind Arun Choudhary 提交于
      use __set_current_state(TASK_*) instead of current->state = TASK_*, in fs/nfs
      Signed-off-by: NMilind Arun Choudhary <milindchoudhary@gmail.com>
      Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
      Cc: "J. Bruce Fields" <bfields@fieldses.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>
      fee7f23f
    • P
      sunrpc: fix crash in rpc_malloc() · ddce40df
      Peter Zijlstra 提交于
      
      While the comment says:
       * To prevent rpciod from hanging, this allocator never sleeps,
       * returning NULL if the request cannot be serviced immediately.
      
      The function does not actually check for NULL pointers being returned.
      Signed-off-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
      Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>
      ddce40df
    • C
      NFS: Clean up NFSv4 XDR error message · e4cc6ee2
      Chuck Lever 提交于
      Make it more useful for debugging purposes.
      Signed-off-by: NChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>
      e4cc6ee2
    • C
      NFS: NFS client underestimates how large an NFSv4 SETATTR reply can be · 6ce7dc94
      Chuck Lever 提交于
      The maximum size of an NFSv4 SETATTR compound reply should include the
      GETATTR operation that we send.
      Signed-off-by: NChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>
      6ce7dc94
    • C
      SUNRPC: Fix pointer arithmetic bug recently introduced in rpc_malloc/free · aa3d1fae
      Chuck Lever 提交于
      Use a cleaner method to find the size of an rpc_buffer.  This actually
      works on x86-64!
      Signed-off-by: NChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>
      aa3d1fae
    • T
      NFS: Remove redundant check in nfs_check_verifier() · e70c4908
      Trond Myklebust 提交于
      The check for nfs_attribute_timeout(dir) in nfs_check_verifier is
      redundant: nfs_lookup_revalidate() will already call nfs_revalidate_inode()
      on the parent dir when necessary.
      
      The only case where this is not done is the case of a negative dentry. Fix
      this case by moving up the revalidation code.
      Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>
      e70c4908
    • T
      NFS: Fix a jiffie wraparound issue · e62c2bba
      Trond Myklebust 提交于
      dentry verifiers are always set to the parent directory's
      cache_change_attribute. There is no reason to be testing for anything other
      than equality when we're trying to find out if the dentry has been checked
      since the last time the directory was modified.
      Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>
      e62c2bba
    • A
      [IA64] sa_interrupt is deprecated · 5329571b
      akpm@linux-foundation.org 提交于
      Seems more than just deprecated, we can't build using SA_INTERUPT.
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NTony Luck <tony.luck@intel.com>
      5329571b
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · 38cb162b
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [IA64] wire up pselect, ppoll
        [IA64] Add TIF_RESTORE_SIGMASK
        [IA64] unwind did not work for processes born with CLONE_STOPPED
        [IA64] Optional method to purge the TLB on SN systems
        [IA64] SPIN_LOCK_UNLOCKED macro cleanup in arch/ia64
        [IA64-SN2][KJ] mmtimer.c-kzalloc
        [IA64] fix stack alignment for ia32 signal handlers
        [IA64] - Altix: hotplug after intr redirect can crash system
        [IA64] save and restore cpus_allowed in cpu_idle_wait
        [IA64] Removal of percpu TR cleanup in kexec code
        [IA64] Fix some section mismatch errors
      38cb162b
    • L
      Merge git://git.infradead.org/mtd-2.6 · ba7cc09c
      Linus Torvalds 提交于
      * git://git.infradead.org/mtd-2.6: (21 commits)
        [MTD] [CHIPS] Remove MTD_OBSOLETE_CHIPS (jedec, amd_flash, sharp)
        [MTD] Delete allegedly obsolete "bank_size" field of mtd_info.
        [MTD] Remove unnecessary user space check from mtd.h.
        [MTD] [MAPS] Remove flash maps for no longer supported 405LP boards
        [MTD] [MAPS] Fix missing printk() parameter in physmap_of.c MTD driver
        [MTD] [NAND] platform NAND driver: add driver
        [MTD] [NAND] platform NAND driver: update header
        [JFFS2] Simplify and clean up jffs2_add_tn_to_tree() some more.
        [JFFS2] Remove another bogus optimisation in jffs2_add_tn_to_tree()
        [JFFS2] Remove broken insert_point optimisation in jffs2_add_tn_to_tree()
        [JFFS2] Remember to calculate overlap on nodes which replace older nodes
        [JFFS2] Don't advance c->wbuf_ofs to next eraseblock after wbuf flush
        [MTD] [NAND] at91_nand.c: CMDLINE_PARTS support
        [MTD] [NAND] Tidy up handling of page number in nand_block_bad()
        [MTD] block2mtd_paramline[] mustn't be __initdata
        [MTD] [NAND] Support multiple chips in CAFÉ driver
        [MTD] [NAND] Rename cafe.c to cafe_nand.c and remove the multi-obj magic
        [MTD] [NAND] Use rslib for CAFÉ ECC
        [RSLIB] Support non-canonical GF representations
        [JFFS2] Remove dead file histo_mips.h
        ...
      ba7cc09c
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 · d84c4124
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
        sh: Fix stacktrace simplification fallout.
        sh: SH7760 DMABRG support.
        sh: clockevent/clocksource/hrtimers/nohz TMU support.
        sh: Truncate MAX_ACTIVE_REGIONS for the common case.
        rtc: rtc-sh: Fix rtc_dev pointer for rtc_update_irq().
        sh: Convert to common die chain.
        sh: Wire up utimensat syscall.
        sh: landisk mv_nr_irqs definition.
        sh: Fixup ndelay() xloops calculation for alternate HZ.
        sh: Add 32-bit opcode feature CPU flag.
        sh: Fix PC adjustments for varying opcode length.
        sh: Support for SH-2A 32-bit opcodes.
        sh: Kill off redundant __div64_32 symbol export.
        sh: Share exception vector table for SH-3/4.
        sh: Always define TRAPA_BUG_OPCODE.
        sh: __GFP_REPEAT for pte allocations, too.
        rtc: rtc-sh: Fix up dev_dbg() warnings.
        sh: generic quicklist support.
      d84c4124
    • L
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · 932c37c3
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (28 commits)
        ARM: OMAP: Fix GCC-reported compile time bug
        ARM: OMAP: restore CONFIG_GENERIC_TIME
        ARM: OMAP: partial LED fixes
        ARM: OMAP: add SoSSI clock (call propagate_rate for childrens)
        ARM: OMAP: FB sync with N800 tree (support for dynamic SRAM allocations)
        ARM: OMAP: Sync framebuffer headers with N800 tree
        ARM: OMAP: Mostly cosmetic to sync up with linux-omap tree
        ARM: OMAP: Fix gpmc header
        ARM: OMAP: Add mailbox support for IVA
        [ARM] armv7: add Makefile and Kconfig entries
        [ARM] armv7: add support for asid-tagged VIVT I-cache
        [ARM] armv7: add dedicated ARMv7 barrier instructions
        [ARM] armv7: Add ARMv7 cacheid macros
        [ARM] armv7: add support for ARMv7 cores.
        [ARM] Fix ARM branch relocation range
        [ARM] 4363/1: AT91: Remove legacy PIO definitions
        [ARM] 4361/1: AT91: Build error
        ARM: OMAP: Sync core code with linux-omap
        ARM: OMAP: Sync headers with linux-omap
        ARM: OMAP: h4 must have blinky leds!!
        ...
      932c37c3
    • D
      Fix a bad error case handling in read_cache_page_async() · c855ff37
      David Howells 提交于
      Commit 6fe6900e introduced a nasty bug
      in read_cache_page_async().
      
      It added a "mark_page_accessed(page)" at the final return path in
      read_cache_page_async().  But in error cases, 'page' holds the error
      code, and you can't mark it accessed.
      
      [ and Glauber de Oliveira Costa points out that we can use a return
        instead of adding more goto's ]
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Acked-by: NNick Piggin <npiggin@suse.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      c855ff37
    • L
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · aabded9c
      Linus Torvalds 提交于
      * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
        [POWERPC] Further fixes for the removal of 4level-fixup hack from ppc32
        [POWERPC] EEH: log all PCI-X and PCI-E AER registers
        [POWERPC] EEH: capture and log pci state on error
        [POWERPC] EEH: Split up long error msg
        [POWERPC] EEH: log error only after driver notification.
        [POWERPC] fsl_soc: Make mac_addr const in fs_enet_of_init().
        [POWERPC] Don't use SLAB/SLUB for PTE pages
        [POWERPC] Spufs support for 64K LS mappings on 4K kernels
        [POWERPC] Add ability to 4K kernel to hash in 64K pages
        [POWERPC] Introduce address space "slices"
        [POWERPC] Small fixes & cleanups in segment page size demotion
        [POWERPC] iSeries: Make HVC_ISERIES the default
        [POWERPC] iSeries: suppress build warning in lparmap.c
        [POWERPC] Mark pages that don't exist as nosave
        [POWERPC] swsusp: Introduce register_nosave_region_late
      aabded9c
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial · 9a9136e2
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits)
        sound: convert "sound" subdirectory to UTF-8
        MAINTAINERS: Add cxacru website/mailing list
        include files: convert "include" subdirectory to UTF-8
        general: convert "kernel" subdirectory to UTF-8
        documentation: convert the Documentation directory to UTF-8
        Convert the toplevel files CREDITS and MAINTAINERS to UTF-8.
        remove broken URLs from net drivers' output
        Magic number prefix consistency change to Documentation/magic-number.txt
        trivial: s/i_sem /i_mutex/
        fix file specification in comments
        drivers/base/platform.c: fix small typo in doc
        misc doc and kconfig typos
        Remove obsolete fat_cvf help text
        Fix occurrences of "the the "
        Fix minor typoes in kernel/module.c
        Kconfig: Remove reference to external mqueue library
        Kconfig: A couple of grammatical fixes in arch/i386/Kconfig
        Correct comments in genrtc.c to refer to correct /proc file.
        Fix more "deprecated" spellos.
        Fix "deprecated" typoes.
        ...
      
      Fix trivial comment conflict in kernel/relay.c.
      9a9136e2
    • L
      Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32 · 3960208f
      Linus Torvalds 提交于
      * 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32:
        [AVR32] Wire up sys_utimensat
        [AVR32] Fix section mismatch .taglist -> .init.text
        [AVR32] Implement dma_{alloc,free}_writecombine()
        AVR32: Spinlock initializer cleanup
        [AVR32] Use correct config symbol when setting cpuflags
      3960208f
    • H
      i386: msr.h: be paranoid about types and parentheses · b0b73cb4
      H. Peter Anvin 提交于
      When implementing things as macros, make sure we use typecasts and
      parentheses where needed.  The macros as defined were vulnerable to
      surreptitious promotion causing problems.
      
      Avoid macros where practical; e.g. wrmsr() can be an inline instead.
      Signed-off-by: NH. Peter Anvin <hpa@zytor.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b0b73cb4
    • H
      i386: remove unused rdtsc() macro · 29bd4433
      H. Peter Anvin 提交于
      All users to the two-part rdtsc() macro have already switched to using
      rdtscl() or rdtscll().  Remove the now-obsolete macro.
      Signed-off-by: NH. Peter Anvin <hpa@zytor.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      29bd4433
    • H
      i386: cpu/transmeta.c: fix definition of USER686 · 21c42bd8
      H. Peter Anvin 提交于
      The definition of USER686 is supposed to be a mask of feature bits,
      not an OR of feature numbers!  It happened to work anyway on the only
      processor affected, simply by pure coincidence.  Fix.
      Signed-off-by: NH. Peter Anvin <hpa@zytor.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      21c42bd8
    • N
      md: improve partition detection in md array · 5b479c91
      NeilBrown 提交于
      md currently uses ->media_changed to make sure rescan_partitions
      is call on md array after they are assembled.
      
      However that doesn't happen until the array is opened, which is later
      than some people would like.
      
      So use blkdev_ioctl to do the rescan immediately that the
      array has been assembled.
      
      This means we can remove all the ->change infrastructure as it was only used
      to trigger a partition rescan.
      Signed-off-by: NNeil Brown <neilb@suse.de>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      5b479c91
    • N
      md: allow reshape_position for md arrays to be set via sysfs · 08a02ecd
      NeilBrown 提交于
      "reshape_position" records how much progress has been made on a "reshape"
      (adding drives, changing layout or chunksize).
      
      When it is set, the number of drives, layout and chunksize can have
      two possible values, an old an a new.
      
      So allow these different values to be visible, and allow both old and new to
      be set: Set the old ones first, then the reshape_position, then the new
      values.
      Signed-off-by: NNeil Brown <neilb@suse.de>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      08a02ecd