From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 Dec 2009 16:19:16 +0000 (-0800)
Subject: Merge branch 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: v2.6.33-rc1~379
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6035ccd8e9e40bb654fbfdef325902ab531679a5;p=karo-tx-linux.git

Merge branch 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block

* 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block: (113 commits)
  cfq-iosched: Do not access cfqq after freeing it
  block: include linux/err.h to use ERR_PTR
  cfq-iosched: use call_rcu() instead of doing grace period stall on queue exit
  blkio: Allow CFQ group IO scheduling even when CFQ is a module
  blkio: Implement dynamic io controlling policy registration
  blkio: Export some symbols from blkio as its user CFQ can be a module
  block: Fix io_context leak after failure of clone with CLONE_IO
  block: Fix io_context leak after clone with CLONE_IO
  cfq-iosched: make nonrot check logic consistent
  io controller: quick fix for blk-cgroup and modular CFQ
  cfq-iosched: move IO controller declerations to a header file
  cfq-iosched: fix compile problem with !CONFIG_CGROUP
  blkio: Documentation
  blkio: Wait on sync-noidle queue even if rq_noidle = 1
  blkio: Implement group_isolation tunable
  blkio: Determine async workload length based on total number of queues
  blkio: Wait for cfq queue to get backlogged if group is empty
  blkio: Propagate cgroup weight updation to cfq groups
  blkio: Drop the reference to queue once the task changes cgroup
  blkio: Provide some isolation between groups
  ...
---

6035ccd8e9e40bb654fbfdef325902ab531679a5
diff --cc arch/arm/include/asm/cacheflush.h
index 9fd6d3ab68c0,e8d45832cfbe..73eceb87e588
--- a/arch/arm/include/asm/cacheflush.h
+++ b/arch/arm/include/asm/cacheflush.h
@@@ -418,8 -408,11 +418,9 @@@ extern void flush_ptrace_access(struct 
   * about to change to user space.  This is the same method as used on SPARC64.
   * See update_mmu_cache for the user space part.
   */
+ #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1
  extern void flush_dcache_page(struct page *);
  
 -extern void __flush_dcache_page(struct address_space *mapping, struct page *page);
 -
  static inline void __flush_icache_all(void)
  {
  #ifdef CONFIG_ARM_ERRATA_411920