4.1.4

2015-08-04 14:36:03 -04:00
parent d0439cfe99
commit 9323b80305
8 changed files with 20 additions and 367 deletions
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-vfio
-	pkgver = 4.1.3
+	pkgver = 4.1.4
 	pkgrel = 1
 	url = http://www.kernel.org/
 	arch = i686
@@ -13,29 +13,21 @@ pkgbase = linux-vfio
 	options = !strip
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.tar.xz
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.tar.sign
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.1.3.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.1.3.sign
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.1.4.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.1.4.sign
 	source = config
 	source = config.x86_64
 	source = linux.preset
-	source = 0001-block-loop-convert-to-per-device-workqueue.patch
-	source = 0002-block-loop-avoiding-too-many-pending-per-work-I-O.patch
-	source = 0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch
-	source = bitmap-enable-booting-for-dm-md-raid1.patch
 	source = change-default-console-loglevel.patch
 	source = override_for_missing_acs_capabilities.patch
 	source = i915_317.patch
 	sha256sums = caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f
 	sha256sums = SKIP
-	sha256sums = b949517b832af2fc90c57a35e475340f32c186f391cbdbfbe0aba7720dbb0b3e
+	sha256sums = 0976127a60a950acf2796f642ac647e5231573b9a0f25703a37a50b988bf3b88
 	sha256sums = SKIP
-	sha256sums = f4c6a5c2fc0ee2b792e43f4c1846b995051901a502fb97885d2296af55fa193d
-	sha256sums = 58d49d4a3f6152394d903fd09113116fa3a0939d7d7ee419b2edbbd0c30e1755
+	sha256sums = b5d6829dcb75d99fea401d9579e859a6ebb9bc09b2d6992dde171e8f05d5cbcf
+	sha256sums = ee55d469a4c00b6fb4144549f2a9c5b84d9fe7948c7cbd2637dce72227392b4f
 	sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c
-	sha256sums = 9e1d3fd95d768a46353593f6678513839cedb98ee66e83d9323233104ec3b23f
-	sha256sums = bbe3631c737ed8329a1b7a9610cc0a07330c14194da5e9afec7705e7f37eeb81
-	sha256sums = 08f69d122021e1d13c31e5987c23021916a819846c47247b3f1cee2ef99d7f82
-	sha256sums = 959c4d71b5dc50434eeecf3a8608758f57f111c6e999289c435b13fc8c6be5f0
 	sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
 	sha256sums = 975f79348119bfba8dd972a9fbfe6b38484c45bfd228f2f6d48a0c02426ba149
 	sha256sums = 65faab45248008810b0a5f27162101a34dfe298c14d3506e52236c680353d7f8
@@ -48,20 +40,20 @@ pkgname = linux-vfio
 	depends = kmod
 	depends = mkinitcpio>=0.7
 	optdepends = crda: to set the correct wireless channels of your country
-	provides = kernel26-vfio=4.1.3
+	provides = kernel26-vfio=4.1.4
 	conflicts = kernel26-vfio
 	replaces = kernel26-vfio
 	backup = etc/mkinitcpio.d/linux-vfio.preset

 pkgname = linux-vfio-headers
 	pkgdesc = Header files and scripts for building modules for Linux-vfio kernel
-	provides = kernel26-vfio-headers=4.1.3
+	provides = kernel26-vfio-headers=4.1.4
 	conflicts = kernel26-vfio-headers
 	replaces = kernel26-vfio-headers

 pkgname = linux-vfio-docs
 	pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-vfio kernel
-	provides = kernel26-vfio-docs=4.1.3
+	provides = kernel26-vfio-docs=4.1.4
 	conflicts = kernel26-vfio-docs
 	replaces = kernel26-vfio-docs

--- a/0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch
+++ b/0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch
@@ -1,48 +0,0 @@
-From 7bee8b08c428b63aa4a3765bb907602e36355378 Mon Sep 17 00:00:00 2001
-From: Chris Mason <clm@fb.com>
-Date: Tue, 14 Jul 2015 16:25:30 -0400
-Subject: [PATCH] Bluetooth: btbcm: allow btbcm_read_verbose_config to fail on
- Apple
-
-Commit 1c8ba6d013 moved around the setup code for broadcomm chips,
-and also added btbcm_read_verbose_config() to read extra information
-about the hardware.  It's returning errors on some macbooks:
-
-Bluetooth: hci0: BCM: Read verbose config info failed (-16)
-
-Which makes us error out of the setup function.  Since this
-probe isn't critical to operate the chip, this patch just changes
-things to carry on when it fails.
-
-Signed-off-by: Chris Mason <clm@fb.com>
-Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-Cc: stable@vger.kernel.org # v4.1
---
- drivers/bluetooth/btbcm.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
-index 1e1a432..9ceb8ac 100644
--- a/drivers/bluetooth/btbcm.c
-+++ b/drivers/bluetooth/btbcm.c
-@@ -472,12 +472,11 @@ int btbcm_setup_apple(struct hci_dev *hdev)
- 
- 	/* Read Verbose Config Version Info */
- 	skb = btbcm_read_verbose_config(hdev);
-	if (IS_ERR(skb))
-		return PTR_ERR(skb);
-
-	BT_INFO("%s: BCM: chip id %u build %4.4u", hdev->name, skb->data[1],
-		get_unaligned_le16(skb->data + 5));
-	kfree_skb(skb);
-+	if (!IS_ERR(skb)) {
-+		BT_INFO("%s: BCM: chip id %u build %4.4u", hdev->name, skb->data[1],
-+			get_unaligned_le16(skb->data + 5));
-+		kfree_skb(skb);
-+	}
- 
- 	set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);
- 
-- 
-2.4.5
-
--- a/0001-block-loop-convert-to-per-device-workqueue.patch
+++ b/0001-block-loop-convert-to-per-device-workqueue.patch
@@ -1,133 +0,0 @@
-From ebff6d5c91195d37e33b7bbfb36c6cc0119aa06f Mon Sep 17 00:00:00 2001
-From: Ming Lei <ming.lei@canonical.com>
-Date: Tue, 5 May 2015 19:49:54 +0800
-Subject: [PATCH 1/2] block: loop: convert to per-device workqueue
-
-Documentation/workqueue.txt:
-	If there is dependency among multiple work items used
-	during memory reclaim, they should be queued to separate
-	wq each with WQ_MEM_RECLAIM.
-
-Loop devices can be stacked, so we have to convert to per-device
-workqueue. One example is Fedora live CD.
-
-Fixes: b5dd2f6047ca108001328aac0e8588edd15f1778
-Cc: stable@vger.kernel.org (v4.0)
-Cc: Justin M. Forbes <jforbes@fedoraproject.org>
-Signed-off-by: Ming Lei <ming.lei@canonical.com>
-Acked-by: Tejun Heo <tj@kernel.org>
-Signed-off-by: Jens Axboe <axboe@fb.com>
---
- drivers/block/loop.c | 30 ++++++++++++++----------------
- drivers/block/loop.h |  1 +
- 2 files changed, 15 insertions(+), 16 deletions(-)
-
-diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index d7173cb..9786aa3 100644
--- a/drivers/block/loop.c
-+++ b/drivers/block/loop.c
-@@ -86,8 +86,6 @@ static DEFINE_MUTEX(loop_index_mutex);
- static int max_part;
- static int part_shift;
- 
-static struct workqueue_struct *loop_wq;
-
- static int transfer_xor(struct loop_device *lo, int cmd,
- 			struct page *raw_page, unsigned raw_off,
- 			struct page *loop_page, unsigned loop_off,
-@@ -725,6 +723,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
- 	size = get_loop_size(lo, file);
- 	if ((loff_t)(sector_t)size != size)
- 		goto out_putf;
-+	error = -ENOMEM;
-+	lo->wq = alloc_workqueue("kloopd%d",
-+			WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_UNBOUND, 0,
-+			lo->lo_number);
-+	if (!lo->wq)
-+		goto out_putf;
- 
- 	error = 0;
- 
-@@ -872,6 +876,8 @@ static int loop_clr_fd(struct loop_device *lo)
- 	lo->lo_flags = 0;
- 	if (!part_shift)
- 		lo->lo_disk->flags |= GENHD_FL_NO_PART_SCAN;
-+	destroy_workqueue(lo->wq);
-+	lo->wq = NULL;
- 	mutex_unlock(&lo->lo_ctl_mutex);
- 	/*
- 	 * Need not hold lo_ctl_mutex to fput backing file.
-@@ -1425,9 +1431,13 @@ static int loop_queue_rq(struct blk_mq_hw_ctx *hctx,
- 		const struct blk_mq_queue_data *bd)
- {
- 	struct loop_cmd *cmd = blk_mq_rq_to_pdu(bd->rq);
-+	struct loop_device *lo = cmd->rq->q->queuedata;
- 
- 	blk_mq_start_request(bd->rq);
- 
-+	if (lo->lo_state != Lo_bound)
-+		return -EIO;
-+
- 	if (cmd->rq->cmd_flags & REQ_WRITE) {
- 		struct loop_device *lo = cmd->rq->q->queuedata;
- 		bool need_sched = true;
-@@ -1441,9 +1451,9 @@ static int loop_queue_rq(struct blk_mq_hw_ctx *hctx,
- 		spin_unlock_irq(&lo->lo_lock);
- 
- 		if (need_sched)
-			queue_work(loop_wq, &lo->write_work);
-+			queue_work(lo->wq, &lo->write_work);
- 	} else {
-		queue_work(loop_wq, &cmd->read_work);
-+		queue_work(lo->wq, &cmd->read_work);
- 	}
- 
- 	return BLK_MQ_RQ_QUEUE_OK;
-@@ -1455,9 +1465,6 @@ static void loop_handle_cmd(struct loop_cmd *cmd)
- 	struct loop_device *lo = cmd->rq->q->queuedata;
- 	int ret = -EIO;
- 
-	if (lo->lo_state != Lo_bound)
-		goto failed;
-
- 	if (write && (lo->lo_flags & LO_FLAGS_READ_ONLY))
- 		goto failed;
- 
-@@ -1806,13 +1813,6 @@ static int __init loop_init(void)
- 		goto misc_out;
- 	}
- 
-	loop_wq = alloc_workqueue("kloopd",
-			WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_UNBOUND, 0);
-	if (!loop_wq) {
-		err = -ENOMEM;
-		goto misc_out;
-	}
-
- 	blk_register_region(MKDEV(LOOP_MAJOR, 0), range,
- 				  THIS_MODULE, loop_probe, NULL, NULL);
- 
-@@ -1850,8 +1850,6 @@ static void __exit loop_exit(void)
- 	blk_unregister_region(MKDEV(LOOP_MAJOR, 0), range);
- 	unregister_blkdev(LOOP_MAJOR, "loop");
- 
-	destroy_workqueue(loop_wq);
-
- 	misc_deregister(&loop_misc);
- }
- 
-diff --git a/drivers/block/loop.h b/drivers/block/loop.h
-index 301c27f..49564ed 100644
--- a/drivers/block/loop.h
-+++ b/drivers/block/loop.h
-@@ -54,6 +54,7 @@ struct loop_device {
- 	gfp_t		old_gfp_mask;
- 
- 	spinlock_t		lo_lock;
-+	struct workqueue_struct *wq;
- 	struct list_head	write_cmd_head;
- 	struct work_struct	write_work;
- 	bool			write_started;
-- 
-2.4.5
-
--- a/0002-block-loop-avoiding-too-many-pending-per-work-I-O.patch
+++ b/0002-block-loop-avoiding-too-many-pending-per-work-I-O.patch
@@ -1,52 +0,0 @@
-From 63eb7031005b6f22fc1dab9f0c29435f1b52a96b Mon Sep 17 00:00:00 2001
-From: Ming Lei <ming.lei@canonical.com>
-Date: Tue, 5 May 2015 19:49:55 +0800
-Subject: [PATCH 2/2] block: loop: avoiding too many pending per work I/O
-
-If there are too many pending per work I/O, too many
-high priority work thread can be generated so that
-system performance can be effected.
-
-This patch limits the max_active parameter of workqueue as 16.
-
-This patch fixes Fedora 22 live booting performance
-regression when it is booted from squashfs over dm
-based on loop, and looks the following reasons are
-related with the problem:
-
- not like other filesyststems(such as ext4), squashfs
-is a bit special, and I observed that increasing I/O jobs
-to access file in squashfs only improve I/O performance a
-little, but it can make big difference for ext4
-
- nested loop: both squashfs.img and ext3fs.img are mounted
-as loop block, and ext3fs.img is inside the squashfs
-
- during booting, lots of tasks may run concurrently
-
-Fixes: b5dd2f6047ca108001328aac0e8588edd15f1778
-Cc: stable@vger.kernel.org (v4.0)
-Cc: Justin M. Forbes <jforbes@fedoraproject.org>
-Signed-off-by: Ming Lei <ming.lei@canonical.com>
-Acked-by: Tejun Heo <tj@kernel.org>
-Signed-off-by: Jens Axboe <axboe@fb.com>
---
- drivers/block/loop.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 9786aa3..cef6fa8 100644
--- a/drivers/block/loop.c
-+++ b/drivers/block/loop.c
-@@ -725,7 +725,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
- 		goto out_putf;
- 	error = -ENOMEM;
- 	lo->wq = alloc_workqueue("kloopd%d",
-			WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_UNBOUND, 0,
-+			WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_UNBOUND, 16,
- 			lo->lo_number);
- 	if (!lo->wq)
- 		goto out_putf;
-- 
-2.4.5
-
--- a/30
+++ b/30
@@ -2,7 +2,7 @@

 pkgbase=linux-vfio
 _srcname=linux-4.1
-pkgver=4.1.3
+pkgver=4.1.4
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
@@ -17,25 +17,17 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
        'config' 'config.x86_64'
        # standard config files for mkinitcpio ramdisk
        'linux.preset'
-        '0001-block-loop-convert-to-per-device-workqueue.patch'
-        '0002-block-loop-avoiding-too-many-pending-per-work-I-O.patch'
-        '0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch'
-        'bitmap-enable-booting-for-dm-md-raid1.patch'
        'change-default-console-loglevel.patch'
        'override_for_missing_acs_capabilities.patch'
        'i915_317.patch'
        )
 sha256sums=('caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f'
            'SKIP'
-            'b949517b832af2fc90c57a35e475340f32c186f391cbdbfbe0aba7720dbb0b3e'
+            '0976127a60a950acf2796f642ac647e5231573b9a0f25703a37a50b988bf3b88'
            'SKIP'
-            'f4c6a5c2fc0ee2b792e43f4c1846b995051901a502fb97885d2296af55fa193d'
-            '58d49d4a3f6152394d903fd09113116fa3a0939d7d7ee419b2edbbd0c30e1755'
+            'b5d6829dcb75d99fea401d9579e859a6ebb9bc09b2d6992dde171e8f05d5cbcf'
+            'ee55d469a4c00b6fb4144549f2a9c5b84d9fe7948c7cbd2637dce72227392b4f'
            'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
-            '9e1d3fd95d768a46353593f6678513839cedb98ee66e83d9323233104ec3b23f'
-            'bbe3631c737ed8329a1b7a9610cc0a07330c14194da5e9afec7705e7f37eeb81'
-            '08f69d122021e1d13c31e5987c23021916a819846c47247b3f1cee2ef99d7f82'
-            '959c4d71b5dc50434eeecf3a8608758f57f111c6e999289c435b13fc8c6be5f0'
            '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
            '975f79348119bfba8dd972a9fbfe6b38484c45bfd228f2f6d48a0c02426ba149'
            '65faab45248008810b0a5f27162101a34dfe298c14d3506e52236c680353d7f8')
@@ -55,20 +47,6 @@ prepare() {
  # add latest fixes from stable queue, if needed
  # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git

-  # Fix deadlock with stacked loop devices (FS#45129)
-  # http://marc.info/?l=linux-kernel&m=143280649731902&w=2
-  patch -Np1 -i ../0001-block-loop-convert-to-per-device-workqueue.patch
-  patch -Np1 -i ../0002-block-loop-avoiding-too-many-pending-per-work-I-O.patch
-
-  # Fix bluetooth chip initialization on some macbooks (FS#45554)
-  # http://marc.info/?l=linux-bluetooth&m=143690738728402&w=2
-  # https://bugzilla.kernel.org/show_bug.cgi?id=100651
-  patch -Np1 -i ../0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch
-
-  # Fix kernel oops when booting with root on RAID1 LVM (FS#45548)
-  # https://bugzilla.kernel.org/show_bug.cgi?id=100491#c24
-  patch -Np1 -i ../bitmap-enable-booting-for-dm-md-raid1.patch
-
  # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
  # remove this when a Kconfig knob is made available by upstream
  # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
--- a/bitmap-enable-booting-for-dm-md-raid1.patch
+++ b/bitmap-enable-booting-for-dm-md-raid1.patch
@@ -1,83 +0,0 @@
-Subject: [PATCH] Enable loading of bitmaps for dm-md-raid1.
-
-This is also a temporary hack to systems with junk in the rest
-of the bitmap super (instead of zeroes) to boot. This is done by
-checking mddev->sync_super (which is exclusively set by dm-raid)
-is null.
-
-These changes also include zeroing of most bitmap pages while
-allocating so we are sure that the junk is not coming from memory.
-
-Signed-off-by: Neil Brown <neilb@suse.de>
-Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
---
-diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
-index 135a090..dfa5ef3 100644
--- a/drivers/md/bitmap.c
-+++ b/drivers/md/bitmap.c
-@@ -494,7 +494,7 @@ static int bitmap_new_disk_sb(struct bitmap *bitmap)
- 	bitmap_super_t *sb;
- 	unsigned long chunksize, daemon_sleep, write_behind;
- 
-	bitmap->storage.sb_page = alloc_page(GFP_KERNEL);
-+	bitmap->storage.sb_page = alloc_page(GFP_KERNEL | __GFP_ZERO);
- 	if (bitmap->storage.sb_page == NULL)
- 		return -ENOMEM;
- 	bitmap->storage.sb_page->index = 0;
-@@ -541,6 +541,7 @@ static int bitmap_new_disk_sb(struct bitmap *bitmap)
- 	sb->state = cpu_to_le32(bitmap->flags);
- 	bitmap->events_cleared = bitmap->mddev->events;
- 	sb->events_cleared = cpu_to_le64(bitmap->mddev->events);
-+	bitmap->mddev->bitmap_info.nodes = 0;
- 
- 	kunmap_atomic(sb);
- 
-@@ -568,7 +569,7 @@ static int bitmap_read_sb(struct bitmap *bitmap)
- 		goto out_no_sb;
- 	}
- 	/* page 0 is the superblock, read it... */
-	sb_page = alloc_page(GFP_KERNEL);
-+	sb_page = alloc_page(GFP_KERNEL | __GFP_ZERO);
- 	if (!sb_page)
- 		return -ENOMEM;
- 	bitmap->storage.sb_page = sb_page;
-@@ -611,8 +612,15 @@ re_read:
- 	daemon_sleep = le32_to_cpu(sb->daemon_sleep) * HZ;
- 	write_behind = le32_to_cpu(sb->write_behind);
- 	sectors_reserved = le32_to_cpu(sb->sectors_reserved);
-	nodes = le32_to_cpu(sb->nodes);
-	strlcpy(bitmap->mddev->bitmap_info.cluster_name, sb->cluster_name, 64);
-+	/* XXX: This is an ugly hack to ensure that we don't use clustering
-+	   in case dm-raid is in use and the nodes written in bitmap_sb
-+	   is erroneous.
-+	*/
-+	if (!bitmap->mddev->sync_super) {
-+		nodes = le32_to_cpu(sb->nodes);
-+		strlcpy(bitmap->mddev->bitmap_info.cluster_name,
-+				sb->cluster_name, 64);
-+	}
- 
- 	/* verify that the bitmap-specific fields are valid */
- 	if (sb->magic != cpu_to_le32(BITMAP_MAGIC))
-@@ -649,7 +657,7 @@ re_read:
- 			goto out;
- 		}
- 		events = le64_to_cpu(sb->events);
-		if (!nodes && (events < bitmap->mddev->events)) {
-+		if (err == 0 && !nodes && (events < bitmap->mddev->events)) {
- 			printk(KERN_INFO
- 			       "%s: bitmap file is out of date (%llu < %llu) "
- 			       "-- forcing full recovery\n",
-diff --git a/drivers/md/md.c b/drivers/md/md.c
-index 4dbed4a..6bd8bc3 100644
--- a/drivers/md/md.c
-+++ b/drivers/md/md.c
-@@ -7415,7 +7415,7 @@ int md_setup_cluster(struct mddev *mddev, int nodes)
- 	err = request_module("md-cluster");
- 	if (err) {
- 		pr_err("md-cluster module not found.\n");
-		return err;
-+		return -ENOENT;
- 	}
- 
- 	spin_lock(&pers_lock);
--- a/7
+++ b/7
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.1.1-1 Kernel Configuration
+# Linux/x86 4.1.4-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -6330,8 +6330,8 @@ CONFIG_PVPANIC=m
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_CHROMEOS_PSTORE=m
-# CONFIG_CROS_EC_CHARDEV is not set
-# CONFIG_CROS_EC_LPC is not set
+CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_LPC=m
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -6451,7 +6451,6 @@ CONFIG_KXCJK1013=m
 # CONFIG_AD7887 is not set
 # CONFIG_AD7923 is not set
 # CONFIG_AD799X is not set
-# CONFIG_CC10001_ADC is not set
 # CONFIG_MAX1027 is not set
 # CONFIG_MAX1363 is not set
 # CONFIG_MCP320X is not set
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.1.1-1 Kernel Configuration
+# Linux/x86 4.1.4-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -694,6 +694,7 @@ CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
+CONFIG_PCI_BUS_ADDR_T_64BIT=y
 CONFIG_PCI_MSI=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_REALLOC_ENABLE_AUTO=y
@@ -6070,8 +6071,8 @@ CONFIG_PVPANIC=m
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_CHROMEOS_PSTORE=m
-# CONFIG_CROS_EC_CHARDEV is not set
-# CONFIG_CROS_EC_LPC is not set
+CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_LPC=m
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -6190,7 +6191,6 @@ CONFIG_KXCJK1013=m
 # CONFIG_AD7887 is not set
 # CONFIG_AD7923 is not set
 # CONFIG_AD799X is not set
-# CONFIG_CC10001_ADC is not set
 # CONFIG_MAX1027 is not set
 # CONFIG_MAX1363 is not set
 # CONFIG_MCP320X is not set