1. 23 5月, 2011 10 次提交
    • L
      Merge branch 'for-linus' of git://neil.brown.name/md · 4b382d06
      Linus Torvalds 提交于
      * '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
    • R
      wireless: fix fatal kernel-doc error + warning in mac80211.h · bdfbe804
      Randy Dunlap 提交于
      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: NRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      bdfbe804
    • L
      x86: setup_smep needs to be __cpuinit · 82da65da
      Linus Torvalds 提交于
      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: NParag 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: NLinus Torvalds <torvalds@linux-foundation.org>
      82da65da
    • L
      Remove prefetch() from <linux/skbuff.h> and "netlabel_addrlist.h" · a1e4891f
      Linus Torvalds 提交于
      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: NDavid Miller <davem@davemloft.net>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a1e4891f
    • P
      Add appropriate <linux/prefetch.h> include for prefetch users · 70c71606
      Paul Gortmaker 提交于
      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: NPaul <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: NLinus Torvalds <torvalds@linux-foundation.org>
      70c71606
    • L
      Give up on pushing CC_OPTIMIZE_FOR_SIZE · 281dc5c5
      Linus Torvalds 提交于
      I still happen to believe that I$ miss costs are a major thing, but
      sadly, -Os doesn't seem to be the solution.  With or without it, gcc
      will miss some obvious code size improvements, and with it enabled gcc
      will sometimes make choices that aren't good even with high I$ miss
      ratios.
      
      For example, with -Os, gcc on x86 will turn a 20-byte constant memcpy
      into a "rep movsl".  While I sincerely hope that x86 CPU's will some day
      do a good job at that, they certainly don't do it yet, and the cost is
      higher than a L1 I$ miss would be.
      
      Some day I hope we can re-enable this.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      281dc5c5
    • L
      Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 · 71a86384
      Linus Torvalds 提交于
      * 'viafb-next' of git://github.com/schandinat/linux-2.6: (24 commits)
        viafb: Automatic OLPC XO-1.5 configuration
        viafb: remove unused CEA mode
        viafb: try to map less memory in case of failure
        viafb: use write combining for video ram
        viafb: add X server compatibility mode
        viafb: reduce OLPC refresh a bit
        viafb: fix OLPC XO 1.5 device connection
        viafb: fix OLPC DCON refresh rate
        viafb: delete clock and PLL initialization
        viafb: replace custom return values
        viafb: some small cleanup for global variables
        viafb: gather common good, old VGA initialization in one place
        viafb: add engine clock support
        viafb: add VIA slapping capability
        viafb: split clock and PLL code to an extra file
        viafb: add primary/secondary clock on/off switches
        viafb: add clock source selection and PLL power management support
        viafb: prepare for PLL separation
        viafb: call viafb_get_clk_value only in viafb_set_vclock
        viafb: remove unused max_hres/vres
        ...
      71a86384
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6 · 17238005
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
        [PARISC] wire up syncfs syscall
        [PARISC] wire up the fhandle syscalls
        [PARISC] wire up clock_adjtime syscall
        [PARISC] wire up fanotify syscalls
        [PARISC] prevent speculative re-read on cache flush
        [PARISC] only make executable areas executable
        [PARISC] fix pacache .size with new binutils
      17238005
    • H
      net: add missing prefetch.h include · 34ea646c
      Heiko Carstens 提交于
      Fixes build errors on s390 and probably other archs as well:
      
        In file included from net/ipv4/ip_forward.c:32:0:
        include/net/udp.h: In function 'udp_csum_outgoing':
        include/net/udp.h:141:2: error: implicit declaration of function 'prefetch'
      Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      34ea646c
    • H
      fs: add missing prefetch.h include · 9ce6e0be
      Heiko Carstens 提交于
      Fixes this build error on s390 and probably other archs as well:
      
        fs/inode.c: In function 'new_inode':
        fs/inode.c:894:2: error: implicit declaration of function 'spin_lock_prefetch'
      Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      [ Happens on architectures that don't define their own prefetch
        functions in <asm/processor.h>, and instead rely on the default
        ones in <linux/prefetch.h>   - Linus]
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      9ce6e0be
  2. 22 5月, 2011 2 次提交
  3. 21 5月, 2011 28 次提交