From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Oct 2010 00:00:32 +0000 (-0700)
Subject: Merge branch 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e9dd2b6837e26fe202708cce5ea4bb4ee3e3482e;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

* 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block: (39 commits)
  cfq-iosched: Fix a gcc 4.5 warning and put some comments
  block: Turn bvec_k{un,}map_irq() into static inline functions
  block: fix accounting bug on cross partition merges
  block: Make the integrity mapped property a bio flag
  block: Fix double free in blk_integrity_unregister
  block: Ensure physical block size is unsigned int
  blkio-throttle: Fix possible multiplication overflow in iops calculations
  blkio-throttle: limit max iops value to UINT_MAX
  blkio-throttle: There is no need to convert jiffies to milli seconds
  blkio-throttle: Fix link failure failure on i386
  blkio: Recalculate the throttled bio dispatch time upon throttle limit change
  blkio: Add root group to td->tg_list
  blkio: deletion of a cgroup was causes oops
  blkio: Do not export throttle files if CONFIG_BLK_DEV_THROTTLING=n
  block: set the bounce_pfn to the actual DMA limit rather than to max memory
  block: revert bad fix for memory hotplug causing bounces
  Fix compile error in blk-exec.c for !CONFIG_DETECT_HUNG_TASK
  block: set the bounce_pfn to the actual DMA limit rather than to max memory
  block: Prevent hang_check firing during long I/O
  cfq: improve fsync performance for small files
  ...

Fix up trivial conflicts due to __rcu sparse annotation in include/linux/genhd.h
---

e9dd2b6837e26fe202708cce5ea4bb4ee3e3482e
diff --cc block/blk.h
index d6b911ac002c,1340cce5721a..f864012ec300
--- a/block/blk.h
+++ b/block/blk.h
@@@ -132,22 -128,13 +128,14 @@@ static inline int queue_congestion_off_
  	return q->nr_congestion_off;
  }
  
- #if defined(CONFIG_BLK_DEV_INTEGRITY)
- 
- #define rq_for_each_integrity_segment(bvl, _rq, _iter)		\
- 	__rq_for_each_bio(_iter.bio, _rq)			\
- 		bip_for_each_vec(bvl, _iter.bio->bi_integrity, _iter.i)
- 
- #endif /* BLK_DEV_INTEGRITY */
- 
  static inline int blk_cpu_to_group(int cpu)
  {
 +	int group = NR_CPUS;
  #ifdef CONFIG_SCHED_MC
  	const struct cpumask *mask = cpu_coregroup_mask(cpu);
 -	return cpumask_first(mask);
 +	group = cpumask_first(mask);
  #elif defined(CONFIG_SCHED_SMT)
 -	return cpumask_first(topology_thread_cpumask(cpu));
 +	group = cpumask_first(topology_thread_cpumask(cpu));
  #else
  	return cpu;
  #endif
diff --cc include/linux/genhd.h
index af3f06b41dc1,57647ecfc1bd..557c3927e70f
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@@ -129,8 -139,9 +139,9 @@@ struct blk_scsi_cmd_filter 
  struct disk_part_tbl {
  	struct rcu_head rcu_head;
  	int len;
 -	struct hd_struct *last_lookup;
 +	struct hd_struct __rcu *last_lookup;
+ 	struct gendisk *disk;
 -	struct hd_struct *part[];
 +	struct hd_struct __rcu *part[];
  };
  
  struct gendisk {