1. 23 May, 2011 15 commits
    • Heiko Carstens's avatar
      [S390] monwriter: fix return code handling · 37fa9975
      Heiko Carstens authored
      Fix return code handling within monwrite_new_hdr(). Return code handling
      is everwhere implemented, the return code of the diagnose function was
      just not passed.
      Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      37fa9975
    • Heiko Carstens's avatar
      [S390] dasd: fix return code handling · 364c18d8
      Heiko Carstens authored
      Check return value of itcw_add_dcw() for error code and return it.
      Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      364c18d8
    • Heiko Carstens's avatar
      [S390] get rid of unused variables · 7712f83a
      Heiko Carstens authored
      Remove trivially unused variables as detected with -Wunused-but-set-variable.
      Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      7712f83a
    • Heiko Carstens's avatar
      [S390] Remove tape block device driver. · 66ceed5a
      Heiko Carstens authored
      Remove the tape block device driver. It's not of real use but has
      already created some confusion when users wanted to access tape devices
      and used the block device nodes instead of the character device nodes.
      
      Also remove the whole tape documentation since it's completely outdated
      and we have the device drivers book which is the place where everything
      is properly documented.
      Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      66ceed5a
    • Martin Schwidefsky's avatar
      [S390] Remove data execution protection · 043d0708
      Martin Schwidefsky authored
      The noexec support on s390 does not rely on a bit in the page table
      entry but utilizes the secondary space mode to distinguish between
      memory accesses for instructions vs. data. The noexec code relies
      on the assumption that the cpu will always use the secondary space
      page table for data accesses while it is running in the secondary
      space mode. Up to the z9-109 class machines this has been the case.
      Unfortunately this is not true anymore with z10 and later machines.
      The load-relative-long instructions lrl, lgrl and lgfrl access the
      memory operand using the same addressing-space mode that has been
      used to fetch the instruction.
      This breaks the noexec mode for all user space binaries compiled
      with march=z10 or later. The only option is to remove the current
      noexec support.
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      043d0708
    • Sebastian Ott's avatar
      [S390] cio: fix unreg race in set_online path · 9bf05098
      Sebastian Ott authored
      In ccw_device_set_online we basically start path verification and
      wait for the device to reach a final state. If it turns out that the
      device has no useable path we schedule the deregistration of the
      device (which is still in an non-final state) and wake up the waiting
      process. The deregistration process will set a final state, but if
      the wake up happens to be prior to this, the device will hang forever
      in ccw_device_set_online.
      
      To fix this just set the final NOT_OPER state prior to the scheduled
      deregistration of the device.
      Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      9bf05098
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 · caebc160
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
        nilfs2: use mark_buffer_dirty to mark btnode or meta data dirty
        nilfs2: always set back pointer to host inode in mapping->host
        nilfs2: get rid of NILFS_I_NILFS
        nilfs2: use list_first_entry
        nilfs2: use empty_aops for gc-inodes
        nilfs2: implement resize ioctl
        nilfs2: add truncation routine of segment usage file
        nilfs2: add routine to move secondary super block
        nilfs2: add ioctl which limits range of segment to be allocated
        nilfs2: zero fill unused portion of super root block
        nilfs2: super root size should change depending on inode size
        nilfs2: get rid of private page allocator
        nilfs2: merge list_del()/list_add_tail() to list_move_tail()
      caebc160
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 · d798f7f0
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
        ide/ide-scan-pci.c: Use for_each_pci_dev().
        ide: Use linux/mutex.h
        IDE: ide-floppy, remove unnecessary NULL check
        drivers/ide/pmac.c: Remove unnecessary casts of pci_get_drvdata
        ide: fix use after free in ide-acpi
      d798f7f0
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6 · e98bae75
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (28 commits)
        sparc32: fix build, fix missing cpu_relax declaration
        SCHED_TTWU_QUEUE is not longer needed since sparc32 now implements IPI
        sparc32,leon: Remove unnecessary page_address calls in LEON DMA API.
        sparc: convert old cpumask API into new one
        sparc32, sun4d: Implemented SMP IPIs support for SUN4D machines
        sparc32, sun4m: Implemented SMP IPIs support for SUN4M machines
        sparc32,leon: Implemented SMP IPIs for LEON CPU
        sparc32: implement SMP IPIs using the generic functions
        sparc32,leon: SMP power down implementation
        sparc32,leon: added some SMP comments
        sparc: add {read,write}*_be routines
        sparc32,leon: don't rely on bootloader to mask IRQs
        sparc32,leon: operate on boot-cpu IRQ controller registers
        sparc32: always define boot_cpu_id
        sparc32: removed unused code, implemented by generic code
        sparc32: avoid build warning at mm/percpu.c:1647
        sparc32: always register a PROM based early console
        sparc32: probe for cpu info only during startup
        sparc: consolidate show_cpuinfo in cpu.c
        sparc32,leon: implement genirq CPU affinity
        ...
      e98bae75
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://neil.brown.name/md · 4b382d06
      Linus Torvalds authored
      * 'for-linus' of git://neil.brown.name/md:
        md: allow resync_start to be set while an array is active.
        md/raid10:  reformat some loops with less indenting.
        md/raid10: remove unused variable.
        md/raid10: make more use of 'slot' in raid10d.
        md/raid10: some tidying up in fix_read_error
        md/raid1: improve handling of pages allocated for write-behind.
        md/raid1: try fix_sync_read_error before process_checks.
        md/raid1: tidy up new functions: process_checks and fix_sync_read_error.
        md/raid1: split out two sub-functions from sync_request_write
        md: make error_handler functions more uniform and correct.
        md/multipath: discard ->working_disks in favour of ->degraded
        md/raid1: clean up read_balance.
        md: simplify raid10 read_balance
        md/bitmap: fix saving of events_cleared and other state.
        md: reject a re-add request that cannot be honoured.
        md: Fix race when creating a new md device.
      4b382d06
    • Randy Dunlap's avatar
      wireless: fix fatal kernel-doc error + warning in mac80211.h · bdfbe804
      Randy Dunlap authored
      Fix new kernel-doc Error and Warning in <net/mac80211.h>:
      
        Error(linux-2.6.39-git5/include/net/mac80211.h:550): cannot understand prototype: 'struct ieee80211_sched_scan_ies '
        Warning(linux-2.6.39-git5/include/net/mac80211.h:2289): No description found for parameter 'sta'
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      bdfbe804
    • Linus Torvalds's avatar
      x86: setup_smep needs to be __cpuinit · 82da65da
      Linus Torvalds authored
      The setup_smep function gets calle at resume time too, and is thus not a
      pure __init function.  When marked as __init, it gets thrown out after
      the kernel has initialized, and when the kernel is suspended and
      resumed, the code will no longer be around, and we'll get a nice "kernel
      tried to execute NX-protected page" oops because the page is no longer
      marked executable.
      Reported-and-tested-by: default avatarParag Warudkar <parag.lkml@gmail.com>
      Cc: Fenghua Yu <fenghua.yu@intel.com>
      Cc: "H. Peter Anvin" <hpa@linux.intel.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      82da65da
    • Linus Torvalds's avatar
      Remove prefetch() from <linux/skbuff.h> and "netlabel_addrlist.h" · a1e4891f
      Linus Torvalds authored
      Commit e66eed65 ("list: remove prefetching from regular list
      iterators") removed the include of prefetch.h from list.h.  The skbuff
      list traversal still had them.
      
      Quoth David Miller:
        "Please just remove the prefetches.
      
        Those are modelled after list.h as I intend to eventually convert
        SKB list handling to "struct list_head" but we're not there yet.
      
        Therefore if we kill prefetches from list.h we should kill it from
        these things in skbuff.h too."
      Requested-by: default avatarDavid Miller <davem@davemloft.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a1e4891f
    • Paul Gortmaker's avatar
      Add appropriate <linux/prefetch.h> include for prefetch users · 70c71606
      Paul Gortmaker authored
      After discovering that wide use of prefetch on modern CPUs
      could be a net loss instead of a win, net drivers which were
      relying on the implicit inclusion of prefetch.h via the list
      headers showed up in the resulting cleanup fallout.  Give
      them an explicit include via the following $0.02 script.
      
       =========================================
       #!/bin/bash
       MANUAL=""
       for i in `git grep -l 'prefetch(.*)' .` ; do
       	grep -q '<linux/prefetch.h>' $i
       	if [ $? = 0 ] ; then
       		continue
       	fi
      
       	(	echo '?^#include <linux/?a'
       		echo '#include <linux/prefetch.h>'
       		echo .
       		echo w
       		echo q
       	) | ed -s $i > /dev/null 2>&1
       	if [ $? != 0 ]; then
       		echo $i needs manual fixup
       		MANUAL="$i $MANUAL"
       	fi
       done
       echo ------------------- 8\<----------------------
       echo vi $MANUAL
       =========================================
      Signed-off-by: default avatarPaul <paul.gortmaker@windriver.com>
      [ Fixed up some incorrect #include placements, and added some
        non-network drivers and the fib_trie.c case    - Linus ]
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      70c71606
    • Sam Ravnborg's avatar
      sparc32: fix build, fix missing cpu_relax declaration · f400bdb1
      Sam Ravnborg authored
      Fix following sparc (32 bit) build error:
      
        CC      arch/sparc/kernel/asm-offsets.s
      In file included from include/linux/seqlock.h:29:0,
                       from include/linux/time.h:8,
                       from include/linux/timex.h:56,
                       from include/linux/sched.h:57,
                       from arch/sparc/kernel/asm-offsets.c:13:
      include/linux/spinlock.h: In function 'spin_unlock_wait':
      include/linux/spinlock.h:360:2: error: implicit declaration of function 'cpu_relax'
      
      Most likely caused by commit e66eed65 ("list: remove
      prefetching from regular list iterators") due to include
      changes.
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f400bdb1
  2. 22 May, 2011 6 commits
  3. 21 May, 2011 7 commits
  4. 20 May, 2011 12 commits