From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 15 Feb 2015 18:48:44 +0000 (-0800)
Subject: Merge tag 'char-misc-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk... 
X-Git-Tag: fixes-v4.0-rc1~101
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ba63072b998cc31515cc6305c25f3b808b50c01;p=pandora-kernel.git

Merge tag 'char-misc-3.20-rc1' of git://git./linux/kernel/git/gregkh/char-misc

Pull char / misc patches from Greg KH:
 "Here's the big char/misc driver update for 3.20-rc1.

  Lots of little things in here, all described in the changelog.
  Nothing major or unusual, except maybe the binder selinux stuff, which
  was all acked by the proper selinux people and they thought it best to
  come through this tree.

  All of this has been in linux-next with no reported issues for a while"

* tag 'char-misc-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (90 commits)
  coresight: fix function etm_writel_cp14() parameter order
  coresight-etm: remove check for unknown Kconfig macro
  coresight: fixing CPU hwid lookup in device tree
  coresight: remove the unnecessary function coresight_is_bit_set()
  coresight: fix the debug AMBA bus name
  coresight: remove the extra spaces
  coresight: fix the link between orphan connection and newly added device
  coresight: remove the unnecessary replicator property
  coresight: fix the replicator subtype value
  pdfdocs: Fix 'make pdfdocs' failure for 'uio-howto.tmpl'
  mcb: Fix error path of mcb_pci_probe
  virtio/console: verify device has config space
  ti-st: clean up data types (fix harmless memory corruption)
  mei: me: release hw from reset only during the reset flow
  mei: mask interrupt set bit on clean reset bit
  extcon: max77693: Constify struct regmap_config
  extcon: adc-jack: Release IIO channel on driver remove
  extcon: Remove duplicated include from extcon-class.c
  Drivers: hv: vmbus: hv_process_timer_expiration() can be static
  Drivers: hv: vmbus: serialize Offer and Rescind offer
  ...
---

4ba63072b998cc31515cc6305c25f3b808b50c01
diff --cc drivers/char/mem.c
index 9a6b63783a94,080273287c48..297110c12635
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@@ -732,25 -717,17 +728,23 @@@ static const struct file_operations __m
  	.write		= write_mem,
  	.mmap		= mmap_mem,
  	.open		= open_mem,
 +#ifndef CONFIG_MMU
  	.get_unmapped_area = get_unmapped_area_mem,
 +	.mmap_capabilities = memory_mmap_capabilities,
 +#endif
  };
  
- #ifdef CONFIG_DEVKMEM
- static const struct file_operations kmem_fops = {
+ static const struct file_operations __maybe_unused kmem_fops = {
  	.llseek		= memory_lseek,
  	.read		= read_kmem,
  	.write		= write_kmem,
  	.mmap		= mmap_kmem,
  	.open		= open_kmem,
 +#ifndef CONFIG_MMU
  	.get_unmapped_area = get_unmapped_area_mem,
 +	.mmap_capabilities = memory_mmap_capabilities,
 +#endif
  };
- #endif
  
  static const struct file_operations null_fops = {
  	.llseek		= null_lseek,
@@@ -793,22 -775,24 +785,24 @@@ static const struct memdev 
  	const char *name;
  	umode_t mode;
  	const struct file_operations *fops;
 -	struct backing_dev_info *dev_info;
 +	fmode_t fmode;
  } devlist[] = {
+ #ifdef CONFIG_DEVMEM
 -	 [1] = { "mem", 0, &mem_fops, &directly_mappable_cdev_bdi },
 +	 [1] = { "mem", 0, &mem_fops, FMODE_UNSIGNED_OFFSET },
+ #endif
  #ifdef CONFIG_DEVKMEM
 -	 [2] = { "kmem", 0, &kmem_fops, &directly_mappable_cdev_bdi },
 +	 [2] = { "kmem", 0, &kmem_fops, FMODE_UNSIGNED_OFFSET },
  #endif
 -	 [3] = { "null", 0666, &null_fops, NULL },
 +	 [3] = { "null", 0666, &null_fops, 0 },
  #ifdef CONFIG_DEVPORT
 -	 [4] = { "port", 0, &port_fops, NULL },
 +	 [4] = { "port", 0, &port_fops, 0 },
  #endif
 -	 [5] = { "zero", 0666, &zero_fops, &zero_bdi },
 -	 [7] = { "full", 0666, &full_fops, NULL },
 -	 [8] = { "random", 0666, &random_fops, NULL },
 -	 [9] = { "urandom", 0666, &urandom_fops, NULL },
 +	 [5] = { "zero", 0666, &zero_fops, 0 },
 +	 [7] = { "full", 0666, &full_fops, 0 },
 +	 [8] = { "random", 0666, &random_fops, 0 },
 +	 [9] = { "urandom", 0666, &urandom_fops, 0 },
  #ifdef CONFIG_PRINTK
 -	[11] = { "kmsg", 0644, &kmsg_fops, NULL },
 +	[11] = { "kmsg", 0644, &kmsg_fops, 0 },
  #endif
  };