@@ -1,7 +1,8 @@

+%define LINUX_VERSION 4.4.8

 Summary:	initramfs

 Name:		initramfs

 Version:	1.0

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	Apache License

 Group:		System Environment/Base

 Source:		photon-release-1.0.2.tar.gz

@@ -9,9 +10,10 @@ Source:		photon-release-1.0.2.tar.gz

 Vendor:		VMware, Inc.

 Distribution:	Photon

 Provides:	initramfs

-BuildRequires:       linux

+BuildRequires:       linux = %{LINUX_VERSION}

 BuildRequires:       dracut

 BuildRequires:       ostree

+Requires:	     linux = %{LINUX_VERSION}

 %description

 Photon release files such as yum configs and other /etc/ release related files

@@ -23,7 +25,7 @@ echo 'add_drivers+="tmem xen-acpi-processor xen-evtchn xen-gntalloc xen-gntdev x

 echo 'add_dracutmodules+=" ostree systemd "' > /etc/dracut.conf.d/ostree.conf

 %build

-dracut --force --kver  4.2.0 initrd.img-no-kmods 

+dracut --force --kver %{LINUX_VERSION} initrd.img-no-kmods

 %install

 rm -rf $RPM_BUILD_ROOT

 install -d $RPM_BUILD_ROOT/boot

@@ -40,5 +42,7 @@ rm -rf $RPM_BUILD_ROOT

 /boot/initrd.img-no-kmods 

 %changelog

-*  		Thu Mar 24 2016 Xiaolin Li <xiaolinl@vmware.com> 1.0-1

--		Initial version.

\ No newline at end of file

+*   Thu Apr 28 2016 Alexey Makhalov <amakhalov@vmware.com> 1.0-2

+-   Update to linux-4.4.8

+*   Thu Mar 24 2016 Xiaolin Li <xiaolinl@vmware.com> 1.0-1

+-   Initial version.

@@ -1,17 +1,18 @@

 # This package depends on exact version of kernel rpm

 # since it provides kernel modules 

-%define LINUX_VERSION 4.2.0

+%define LINUX_VERSION 4.4.8

 Summary: A New Scripting Dynamic Tracing Tool For Linux

 Name:    ktap

 Version: 0.4

-Release: 1%{?dist}

+Release: 2%{?dist}

 License: GPLv2

 URL: https://github.com/ktap/ktap

 Source: %{name}-master.zip

 %define sha1 ktap=8dca9a25e8917ad8cabdf176de487949c235ec80

 Group:      Development/Tools

 Vendor:     VMware, Inc.

+Patch0:        linux-4.4-support.patch

 Distribution:  Photon

 BuildRequires: elfutils-devel

 BuildRequires: linux-dev = %{LINUX_VERSION}

@@ -25,6 +26,7 @@ ktap is a new scripting dynamic tracing tool for Linux, it uses a scripting lang

 %prep

 %setup -q -n ktap-master

+%patch0 -p1

 %build

 make ktap

@@ -50,6 +52,8 @@ make install DESTDIR=%{buildroot} KVERSION=%{LINUX_VERSION}

 /lib/modules/%{LINUX_VERSION}/extra/ktapvm.ko

 %changelog

-*	Fri Dec 04 2015 Xiaolin Li <xiaolinl@vmware.com> 0.4-1

+*   Thu Apr 28 2016 Alexey Makhalov <amakhalov@vmware.com> 0.4-2

+-   Update to linux-4.4.8

+*   Fri Dec 04 2015 Xiaolin Li <xiaolinl@vmware.com> 0.4-1

 -   Initial build.  First version

new file mode 100644

@@ -0,0 +1,12 @@

+diff -Naur ktap-master.old/runtime/kp_obj.c ktap-master/runtime/kp_obj.c

+--- ktap-master.old/runtime/kp_obj.c	2015-12-03 15:26:28.000000000 -0800

+@@ -44,7 +44,7 @@

+ 

+ /* memory allocation flag */

+ #define KTAP_ALLOC_FLAGS ((GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN) \

+-			 & ~__GFP_WAIT)

++			 & ~__GFP_RECLAIM)

+ 

+ /*

+  * TODO: It's not safe to call into facilities in the kernel at-large,

@@ -1,33 +1,35 @@

 Summary:	Linux API header files

 Name:		linux-api-headers

-Version:	4.2.0

+Version:	4.4.8

 Release:	1%{?dist}

 License:	GPLv2

 URL:		http://www.kernel.org/

 Group:		System Environment/Kernel

 Vendor:		VMware, Inc.

 Distribution: Photon

-Source0:	http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.2.tar.xz

-%define sha1 linux=5e65d0dc94298527726fcd7458b6126e60fb2a8a

+Source0:    	http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.8.tar.xz

+%define sha1 linux=78df847edacc6c01cb4dcc89a2b96822d7e8d1e1

 BuildArch:	noarch

 %description

 The Linux API Headers expose the kernel's API for use by Glibc.

 %prep

-%setup -q -n linux-4.2

+%setup -q -n linux-4.4.8

 %build

 make mrproper

 make headers_check

 %install

-cd %{_builddir}/linux-4.2

+cd %{_builddir}/linux-%{version}

 make INSTALL_HDR_PATH=%{buildroot}%{_prefix} headers_install

 find /%{buildroot}%{_includedir} \( -name .install -o -name ..install.cmd \) -delete

 %files

 %defattr(-,root,root)

 %{_includedir}/*

 %changelog

+*   Thu Apr 28 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.8-1

+-   Update to linux-4.4.8

 *   Wed Dec 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.2.0-1

 -   Upgrading kernel version to 4.2.0.

 *   Wed Aug 12 2015 Sharath George <sharathg@vmware.com> 4.0.9-1

 -   Upgrading kernel version.

-*	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 3.13.3-1

--	Initial build. First version

+*   Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 3.13.3-1

+-   Initial build. First version

deleted file mode 100644

@@ -1,209 +0,0 @@

-From 96d06cc582f7d357a74567b4ba1c5822fe8ba992 Mon Sep 17 00:00:00 2001

-From: Arjan van de Ven <arjan@linux.intel.com>

-Date: Wed, 11 Feb 2015 16:05:23 -0600

-Subject: [PATCH 01/13] msleep

-

-Author:    Arjan van de Ven <arjan@linux.intel.com>

-

-Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>

- arch/x86/kernel/alternative.c |  4 ++++

- drivers/acpi/bus.c            |  6 ++++++

- drivers/base/firmware_class.c |  1 +

- drivers/block/virtio_blk.c    |  4 ++--

- include/linux/blkdev.h        |  2 +-

- init/main.c                   |  2 +-

- kernel/kmod.c                 | 11 +++++++++++

- kernel/time/timer.c           |  5 +++++

- net/netlink/af_netlink.c      |  2 +-

- 9 files changed, 32 insertions(+), 5 deletions(-)

-

-diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c

-index aef6531..13d1579 100644

-+++ b/arch/x86/kernel/alternative.c

-@@ -607,7 +607,9 @@ void __init alternative_instructions(void)

- 	 * patching.

- 	 */

- 

-+	printk("Applying alternatives\n");

- 	apply_alternatives(__alt_instructions, __alt_instructions_end);

-+	printk("Applying alternatives done\n");

- 

- #ifdef CONFIG_SMP

- 	/* Patch to UP if other cpus not imminent. */

-@@ -618,6 +620,8 @@ void __init alternative_instructions(void)

- 					    _text, _etext);

- 	}

- 

-+	printk("Applying alternatives smp done\n");

-+

- 	if (!uniproc_patched || num_possible_cpus() == 1)

- 		free_init_pages("SMP alternatives",

- 				(unsigned long)__smp_locks,

-diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c

-index c412fdb..61bf9ae 100644

-+++ b/drivers/acpi/bus.c

-@@ -646,6 +646,8 @@ static int __init acpi_bus_init(void)

- struct kobject *acpi_kobj;

- EXPORT_SYMBOL_GPL(acpi_kobj);

- 

-+//extern int warn_on_msleep;

-+

- static int __init acpi_init(void)

- {

- 	int result;

-@@ -655,6 +657,8 @@ static int __init acpi_init(void)

- 		return -ENODEV;

- 	}

- 

-+//	warn_on_msleep = 1;

-+

- 	acpi_kobj = kobject_create_and_add("acpi", firmware_kobj);

- 	if (!acpi_kobj) {

- 		printk(KERN_WARNING "%s: kset create error\n", __func__);

-@@ -665,6 +669,7 @@ static int __init acpi_init(void)

- 	result = acpi_bus_init();

- 	if (result) {

- 		disable_acpi();

-+//		warn_on_msleep = 0;

- 		return result;

- 	}

- 

-@@ -674,6 +679,7 @@ static int __init acpi_init(void)

- 	acpi_debugfs_init();

- 	acpi_sleep_proc_init();

- 	acpi_wakeup_device_init();

-+//	warn_on_msleep = 0;

- 	return 0;

- }

- 

-diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c

-index 171841a..81aa7f4 100644

-+++ b/drivers/base/firmware_class.c

-@@ -1176,6 +1176,7 @@ request_firmware(const struct firmware **firmware_p, const char *name,

- {

- 	int ret;

- 

-+	printk("request_firmeare: %s\n", name);

- 	/* Need to pin this module until return */

- 	__module_get(THIS_MODULE);

- 	ret = _request_firmware(firmware_p, name, device,

-diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c

-index 5ea2f0b..353d496 100644

-+++ b/drivers/block/virtio_blk.c

-@@ -861,7 +861,7 @@ static struct virtio_driver virtio_blk = {

- #endif

- };

- 

--static int __init init(void)

-+static int __init virtio_blk_init(void)

- {

- 	int error;

- 

-@@ -893,7 +893,7 @@ static void __exit fini(void)

- 	unregister_blkdev(major, "virtblk");

- 	destroy_workqueue(virtblk_wq);

- }

--module_init(init);

-+module_init(virtio_blk_init);

- module_exit(fini);

- 

- MODULE_DEVICE_TABLE(virtio, id_table);

-diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h

-index 5d93a66..ad69b13 100644

-+++ b/include/linux/blkdev.h

-@@ -39,7 +39,7 @@ struct blkcg_gq;

- struct blk_flush_queue;

- 

- #define BLKDEV_MIN_RQ	4

--#define BLKDEV_MAX_RQ	128	/* Default maximum */

-+#define BLKDEV_MAX_RQ	4096	/* Default maximum */

- 

- /*

-  * Maximum number of blkcg policies allowed to be registered concurrently.

-diff --git a/init/main.c b/init/main.c

-index 2115055..5aa3393 100644

-+++ b/init/main.c

-@@ -761,7 +761,7 @@ static int __init_or_module do_one_initcall_debug(initcall_t fn)

- 	unsigned long long duration;

- 	int ret;

- 

--	printk(KERN_DEBUG "calling  %pF @ %i\n", fn, task_pid_nr(current));

-+	printk(KERN_DEBUG "calling  %pF @ %i\n", fn, raw_smp_processor_id());

- 	calltime = ktime_get();

- 	ret = fn();

- 	rettime = ktime_get();

-diff --git a/kernel/kmod.c b/kernel/kmod.c

-index 2777f40..b0b1061 100644

-+++ b/kernel/kmod.c

-@@ -78,6 +78,8 @@ static int call_modprobe(char *module_name, int wait)

- 		NULL

- 	};

- 

-+	printk("call_modprobe: %s   %i \n", module_name, wait);

-+

- 	char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);

- 	if (!argv)

- 		goto out;

-@@ -253,6 +255,15 @@ static int ____call_usermodehelper(void *data)

- 

- 	commit_creds(new);

- 

-+	if (sub_info->argv && sub_info->argv[0]) {

-+		printk("____call_usermodehelper %s\n", sub_info->argv[0]);

-+		if (sub_info->argv[1]) {

-+			printk("   arg1 : %s\n", sub_info->argv[1]);

-+			if (sub_info->argv[2])

-+				printk("   arg2 : %s\n", sub_info->argv[2]);

-+		}

-+	}

-+

- 	retval = do_execve(getname_kernel(sub_info->path),

- 			   (const char __user *const __user *)sub_info->argv,

- 			   (const char __user *const __user *)sub_info->envp);

-diff --git a/kernel/time/timer.c b/kernel/time/timer.c

-index 2ece3aa..42000e8 100644

-+++ b/kernel/time/timer.c

-@@ -1668,6 +1668,8 @@ void __init init_timers(void)

- 	open_softirq(TIMER_SOFTIRQ, run_timer_softirq);

- }

- 

-+//int warn_on_msleep;

-+//EXPORT_SYMBOL_GPL(warn_on_msleep);

- /**

-  * msleep - sleep safely even with waitqueue interruptions

-  * @msecs: Time in milliseconds to sleep for

-@@ -1676,6 +1678,9 @@ void msleep(unsigned int msecs)

- {

- 	unsigned long timeout = msecs_to_jiffies(msecs) + 1;

- 

-+//	if (warn_on_msleep)

-+//		WARN(1, "msleep(%i) called", msecs);

-+

- 	while (timeout)

- 		timeout = schedule_timeout_uninterruptible(timeout);

- }

-diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c

-index bf6e766..d83aeaf 100644

-+++ b/net/netlink/af_netlink.c

-@@ -1168,7 +1168,7 @@ static int netlink_create(struct net *net, struct socket *sock, int protocol,

- 

- 	netlink_lock_table();

- #ifdef CONFIG_MODULES

--	if (!nl_table[protocol].registered) {

-+	if (!nl_table[protocol].registered && protocol != 9) {

- 		netlink_unlock_table();

- 		request_module("net-pf-%d-proto-%d", PF_NETLINK, protocol);

- 		netlink_lock_table();

-2.4.4

-

deleted file mode 100644

@@ -1,34 +0,0 @@

-From 302feba2dd2644c6379ae279d1feb74d22a94a71 Mon Sep 17 00:00:00 2001

-From: Arjan van de Ven <arjan@linux.intel.com>

-Date: Wed, 11 Feb 2015 16:19:26 -0600

-Subject: [PATCH 02/13] Skip synchronize_rcu() on single CPU systems

-

-synchronize_rcu() is pretty expensive, and on single CPU systems we don't need

-it in this specific case, so skip it.

-

-Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>

-Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>

- drivers/cpuidle/cpuidle.c | 5 ++++-

- 1 file changed, 4 insertions(+), 1 deletion(-)

-

-diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c

-index 61c417b..973956d 100644

-+++ b/drivers/cpuidle/cpuidle.c

-@@ -278,8 +278,11 @@ void cpuidle_uninstall_idle_handler(void)

- 	/*

- 	 * Make sure external observers (such as the scheduler)

- 	 * are done looking at pointed idle states.

-+	 * This is only relevant if there is more than one cpu,

-+	 * if there is only one CPU, that is us... and we're

-+	 * coherent to ourselves.

- 	 */

--	synchronize_rcu();

-+

- }

- 

- /**

-2.4.4

-

deleted file mode 100644

@@ -1,38 +0,0 @@

-From e89743abeedda83002ceddcf6b2a3f9abe24be42 Mon Sep 17 00:00:00 2001

-From: Arjan van de Ven <arjan@linux.intel.com>

-Date: Wed, 11 Feb 2015 16:25:16 -0600

-Subject: [PATCH 03/13] sysrq: Skip synchronize_rcu() if there is no old op

-

-synchronize_rcu() is expensive. Currently it is called as part of the sysrq

-registration/unregistration, which happens during boot several times.

-Now, the reason for the synchronize_rcu() is to allow an old registered

-operation to expire properly... which is pointless if the old operation

-is NULL...

-So we can save the common case of the old operation being NULL a lot of time

-by just checking for non-NULL prior to the synchronize_rcu()

-

-Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>

-Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>

- drivers/tty/sysrq.c | 4 +++-

- 1 file changed, 3 insertions(+), 1 deletion(-)

-

-diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c

-index 843f2cd..65b8c39 100644

-+++ b/drivers/tty/sysrq.c

-@@ -1061,8 +1061,10 @@ static int __sysrq_swap_key_ops(int key, struct sysrq_key_op *insert_op_p,

- 	 * A concurrent __handle_sysrq either got the old op or the new op.

- 	 * Wait for it to go away before returning, so the code for an old

- 	 * op is not freed (eg. on module unload) while it is in use.

-+	 * This is only relevant if the old op is not NULL of course.

- 	 */

--	synchronize_rcu();

-+	if (remove_op_p)

-+		synchronize_rcu();

- 

- 	return retval;

- }

-2.4.4

-

deleted file mode 100644

@@ -1,26 +0,0 @@

-From 27112a31ef5c0d29c98b9d04f5f94b4e03fc15da Mon Sep 17 00:00:00 2001

-From: Jose Carlos Venegas Munoz <jos.c.venegas.munoz@intel.com>

-Date: Mon, 13 Apr 2015 11:26:36 -0500

-Subject: [PATCH 04/13] enable no blink by default

-

-Author:    Arjan van de Ven <arjan@linux.intel.com>

- drivers/video/console/fbcon.c | 2 +-

- 1 file changed, 1 insertion(+), 1 deletion(-)

-

-diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c

-index b972106..31c95cc 100644

-+++ b/drivers/video/console/fbcon.c

-@@ -146,7 +146,7 @@ static const struct consw fb_con;

- 

- static int fbcon_set_origin(struct vc_data *);

- 

--static int fbcon_cursor_noblink;

-+static int fbcon_cursor_noblink = 1;

- 

- #define divides(a, b)	((!(a) || (b)%(a)) ? 0 : 1)

- 

-2.4.4

-

deleted file mode 100644

@@ -1,28 +0,0 @@

-From fd638b3750749b561b1822a8aca5fbb46c6dcfc8 Mon Sep 17 00:00:00 2001

-From: Arjan van de Ven <arjan@linux.intel.com>

-Date: Wed, 11 Feb 2015 16:47:20 -0600

-Subject: [PATCH 05/13] wakeups

-

-Author:    Arjan van de Ven <arjan@linux.intel.com>

-

-Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>

- mm/vmstat.c | 2 +-

- 1 file changed, 1 insertion(+), 1 deletion(-)

-

-diff --git a/mm/vmstat.c b/mm/vmstat.c

-index 4f5cd97..c176f8b 100644

-+++ b/mm/vmstat.c

-@@ -1358,7 +1358,7 @@ static const struct file_operations proc_vmstat_file_operations = {

- 

- #ifdef CONFIG_SMP

- static DEFINE_PER_CPU(struct delayed_work, vmstat_work);

--int sysctl_stat_interval __read_mostly = HZ;

-+int sysctl_stat_interval __read_mostly = 8 * HZ;

- static cpumask_var_t cpu_stat_off;

- 

- static void vmstat_update(struct work_struct *w)

-2.4.4

-

deleted file mode 100644

@@ -1,124 +0,0 @@

-From ba2e674c2edf2644f385c2947bc64c2e559e86a7 Mon Sep 17 00:00:00 2001

-From: Arjan van de Ven <arjan@linux.intel.com>

-Date: Wed, 11 Feb 2015 16:53:08 -0600

-Subject: [PATCH 06/13] probe

-

-Author:    Arjan van de Ven <arjan@linux.intel.com>

-

-Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>

- drivers/pci/probe.c | 43 +++++++++++++++++++++++++++++++++++++++++--

- 1 file changed, 41 insertions(+), 2 deletions(-)

-

-diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c

-index 6675a7a..28663ef 100644

-+++ b/drivers/pci/probe.c

-@@ -178,6 +178,11 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,

- 

- 	mask = type ? PCI_ROM_ADDRESS_MASK : ~0;

- 

-+

-+	res->name = pci_name(dev);

-+

-+	printk("Starting probe for %s\n", res->name);

-+

- 	/* No printks while decoding is disabled! */

- 	if (!dev->mmio_always_on) {

- 		pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);

-@@ -187,7 +192,6 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,

- 		}

- 	}

- 

--	res->name = pci_name(dev);

- 

- 	pci_read_config_dword(dev, pos, &l);

- 	pci_write_config_dword(dev, pos, l | mask);

-@@ -316,6 +320,8 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)

- {

- 	unsigned int pos, reg;

- 

-+	printk("pci_read_bases start\n");

-+

- 	for (pos = 0; pos < howmany; pos++) {

- 		struct resource *res = &dev->resource[pos];

- 		reg = PCI_BASE_ADDRESS_0 + (pos << 2);

-@@ -324,12 +330,14 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)

- 

- 	if (rom) {

- 		struct resource *res = &dev->resource[PCI_ROM_RESOURCE];

-+		printk("rom path\n");

- 		dev->rom_base_reg = rom;

- 		res->flags = IORESOURCE_MEM | IORESOURCE_PREFETCH |

- 				IORESOURCE_READONLY | IORESOURCE_CACHEABLE |

- 				IORESOURCE_SIZEALIGN;

- 		__pci_read_base(dev, pci_bar_mem32, res, rom);

- 	}

-+	printk("pci_read_bases end\n");

- }

- 

- static void pci_read_bridge_io(struct pci_bus *child)

-@@ -1085,6 +1093,28 @@ int pci_cfg_space_size(struct pci_dev *dev)

- 

- #define LEGACY_IO_RESOURCE	(IORESOURCE_IO | IORESOURCE_PCI_FIXED)

- 

-+static int guess_bar_count(int class)

-+{

-+        if (class == 0x068000)

-+            return 0;

-+        if (class == 0x020000)

-+            return 2;

-+        if (class == 0x010000)

-+            return 2;

-+        if (class == 0x00ff00)

-+            return 1;

-+        return 6;

-+}

-+

-+static int has_rom(int class, int rom)

-+{

-+        if (class == 0x020000)

-+          return 0;

-+        if (class == 0x010000 || class == 0x00ff00)

-+          return 0;

-+        return rom;

-+}

-+

- /**

-  * pci_setup_device - fill in class and map information of a device

-  * @dev: the device structure to fill

-@@ -1103,6 +1133,9 @@ int pci_setup_device(struct pci_dev *dev)

- 	int pos = 0;

- 	struct pci_bus_region region;

- 	struct resource *res;

-+	int maxbar;

-+

-+	printk("pci_setup_device start\n");

- 

- 	if (pci_read_config_byte(dev, PCI_HEADER_TYPE, &hdr_type))

- 		return -EIO;

-@@ -1150,7 +1183,11 @@ int pci_setup_device(struct pci_dev *dev)

- 		if (class == PCI_CLASS_BRIDGE_PCI)

- 			goto bad;

- 		pci_read_irq(dev);

--		pci_read_bases(dev, 6, PCI_ROM_ADDRESS);

-+

-+		maxbar = guess_bar_count(dev->class);

-+

-+		if (class != PCI_CLASS_STORAGE_IDE)

-+			pci_read_bases(dev, maxbar, has_rom(dev->class, PCI_ROM_ADDRESS));

- 		pci_read_config_word(dev, PCI_SUBSYSTEM_VENDOR_ID, &dev->subsystem_vendor);

- 		pci_read_config_word(dev, PCI_SUBSYSTEM_ID, &dev->subsystem_device);

- 

-@@ -1235,6 +1272,8 @@ int pci_setup_device(struct pci_dev *dev)

- 		dev->class = PCI_CLASS_NOT_DEFINED;

- 	}

- 

-+	printk("pci_setup_device end\n");

-+

- 	/* We found a fine healthy device, go go go... */

- 	return 0;

- }

-2.4.4

-

deleted file mode 100644

@@ -1,105 +0,0 @@

-From c71ee602e3dda9f32ab58b327a8f875dbcf84f97 Mon Sep 17 00:00:00 2001

-From: Arjan van de Ven <arjan@linux.intel.com>

-Date: Wed, 11 Feb 2015 17:03:24 -0600

-Subject: [PATCH 07/13] cgroup

-

-Author:    Arjan van de Ven <arjan@linux.intel.com>

-

-Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>

- include/linux/cgroup.h |  2 +-

- kernel/cgroup.c        | 23 +++++++++++++----------

- 2 files changed, 14 insertions(+), 11 deletions(-)

-

-diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h

-index b9cb94c..43d0dea 100644

-+++ b/include/linux/cgroup.h

-@@ -90,7 +90,7 @@ struct cgroup_subsys_state {

- 

- 	/* percpu_ref killing and RCU release */

- 	struct rcu_head rcu_head;

--	struct work_struct destroy_work;

-+	struct delayed_work destroy_work;

- };

- 

- /* bits in struct cgroup_subsys_state flags field */

-diff --git a/kernel/cgroup.c b/kernel/cgroup.c

-index 469dd54..b25aa22 100644

-+++ b/kernel/cgroup.c

-@@ -66,7 +66,7 @@

-  * Expiring in the middle is a performance problem not a correctness one.

-  * 1 sec should be enough.

-  */

--#define CGROUP_PIDLIST_DESTROY_DELAY	HZ

-+#define CGROUP_PIDLIST_DESTROY_DELAY	round_jiffies_relative(HZ)

- 

- #define CGROUP_FILE_NAME_MAX		(MAX_CGROUP_TYPE_NAMELEN +	\

- 					 MAX_CFTYPE_NAME + 2)

-@@ -4370,8 +4370,9 @@ err:

-  */

- static void css_free_work_fn(struct work_struct *work)

- {

-+	struct delayed_work *dwork = to_delayed_work(work);

- 	struct cgroup_subsys_state *css =

--		container_of(work, struct cgroup_subsys_state, destroy_work);

-+		container_of(dwork, struct cgroup_subsys_state, destroy_work);

- 	struct cgroup_subsys *ss = css->ss;

- 	struct cgroup *cgrp = css->cgroup;

- 

-@@ -4419,14 +4420,15 @@ static void css_free_rcu_fn(struct rcu_head *rcu_head)

- 	struct cgroup_subsys_state *css =

- 		container_of(rcu_head, struct cgroup_subsys_state, rcu_head);

- 

--	INIT_WORK(&css->destroy_work, css_free_work_fn);

--	queue_work(cgroup_destroy_wq, &css->destroy_work);

-+	INIT_DELAYED_WORK(&css->destroy_work, css_free_work_fn);

-+	queue_delayed_work(cgroup_destroy_wq, &css->destroy_work, CGROUP_PIDLIST_DESTROY_DELAY);

- }

- 

- static void css_release_work_fn(struct work_struct *work)

- {

-+	struct delayed_work *dwork = to_delayed_work(work);

- 	struct cgroup_subsys_state *css =

--		container_of(work, struct cgroup_subsys_state, destroy_work);

-+		container_of(dwork, struct cgroup_subsys_state, destroy_work);

- 	struct cgroup_subsys *ss = css->ss;

- 	struct cgroup *cgrp = css->cgroup;

- 

-@@ -4465,8 +4467,8 @@ static void css_release(struct percpu_ref *ref)

- 	struct cgroup_subsys_state *css =

- 		container_of(ref, struct cgroup_subsys_state, refcnt);

- 

--	INIT_WORK(&css->destroy_work, css_release_work_fn);

--	queue_work(cgroup_destroy_wq, &css->destroy_work);

-+	INIT_DELAYED_WORK(&css->destroy_work, css_release_work_fn);

-+	queue_delayed_work(cgroup_destroy_wq, &css->destroy_work, CGROUP_PIDLIST_DESTROY_DELAY);

- }

- 

- static void init_and_link_css(struct cgroup_subsys_state *css,

-@@ -4737,8 +4739,9 @@ out_destroy:

-  */

- static void css_killed_work_fn(struct work_struct *work)

- {

-+	struct delayed_work *dwork = to_delayed_work(work);

- 	struct cgroup_subsys_state *css =

--		container_of(work, struct cgroup_subsys_state, destroy_work);

-+		container_of(dwork, struct cgroup_subsys_state, destroy_work);

- 

- 	mutex_lock(&cgroup_mutex);

- 	offline_css(css);

-@@ -4753,8 +4756,8 @@ static void css_killed_ref_fn(struct percpu_ref *ref)

- 	struct cgroup_subsys_state *css =

- 		container_of(ref, struct cgroup_subsys_state, refcnt);

- 

--	INIT_WORK(&css->destroy_work, css_killed_work_fn);

--	queue_work(cgroup_destroy_wq, &css->destroy_work);

-+	INIT_DELAYED_WORK(&css->destroy_work, css_killed_work_fn);

-+	queue_delayed_work(cgroup_destroy_wq, &css->destroy_work, CGROUP_PIDLIST_DESTROY_DELAY);

- }

- 

- /**

-2.4.4

-

deleted file mode 100644

@@ -1,43 +0,0 @@

-From 5da77fe01da90324ca311673caf7b75a78cf753e Mon Sep 17 00:00:00 2001

-From: Arjan van de Ven <arjan@linux.intel.com>

-Date: Wed, 11 Feb 2015 17:28:14 -0600

-Subject: [PATCH 08/13] smpboot

-

-Author:    Arjan van de Ven <arjan@linux.intel.com>

-

-Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>

- arch/x86/kernel/smpboot.c | 2 +-

- arch/x86/kernel/tsc.c     | 3 +++

- 2 files changed, 4 insertions(+), 1 deletion(-)

-

-diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c

-index 50e547e..17d9827 100644

-+++ b/arch/x86/kernel/smpboot.c

-@@ -583,7 +583,7 @@ wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip)

- 	pr_debug("Waiting for send to finish...\n");

- 	send_status = safe_apic_wait_icr_idle();

- 

--	mdelay(10);

-+	udelay(100);

- 

- 	pr_debug("Deasserting INIT\n");

- 

-diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c

-index 5054497..464ba18 100644

-+++ b/arch/x86/kernel/tsc.c

-@@ -1232,6 +1232,9 @@ unsigned long calibrate_delay_is_known(void)

- 	if (!tsc_disabled && !cpu_has(&cpu_data(cpu), X86_FEATURE_CONSTANT_TSC))

- 		return 0;

- 

-+	if (cpu != 0)

-+		return cpu_data(0).loops_per_jiffy;

-+

- 	for_each_online_cpu(i)

- 		if (cpu_data(i).phys_proc_id == cpu_data(cpu).phys_proc_id)

- 			return cpu_data(i).loops_per_jiffy;

-2.4.4

-

deleted file mode 100644

@@ -1,28 +0,0 @@

-From 98ecb3c0e5d54d0ca5c67475e965a5c1c43dc86d Mon Sep 17 00:00:00 2001

-From: Arjan van de Ven <arjan@linux.intel.com>

-Date: Wed, 11 Feb 2015 17:34:17 -0600

-Subject: [PATCH 09/13] perf

-

-Author:    Arjan van de Ven <arjan@linux.intel.com>

-

-Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>

- arch/x86/kernel/cpu/perf_event_intel.c | 2 +-

- 1 file changed, 1 insertion(+), 1 deletion(-)

-

-diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c

-index a1e35c9..85a883d 100644

-+++ b/arch/x86/kernel/cpu/perf_event_intel.c

-@@ -3353,7 +3353,7 @@ __init int intel_pmu_init(void)

- 	 */

- 	if (x86_pmu.extra_regs) {

- 		for (er = x86_pmu.extra_regs; er->msr; er++) {

--			er->extra_msr_access = check_msr(er->msr, 0x1ffUL);

-+			er->extra_msr_access = false;

- 			/* Disable LBR select mapping */

- 			if ((er->idx == EXTRA_REG_LBR) && !er->extra_msr_access)

- 				x86_pmu.lbr_sel_map = NULL;

-2.4.4

-

deleted file mode 100644

@@ -1,34 +0,0 @@

-From 7b81f869e89895de7b4c7b1573de86a258c6c782 Mon Sep 17 00:00:00 2001

-From: Arjan van de Ven <arjan@linux.intel.com>

-Date: Thu, 12 Feb 2015 10:37:43 -0600

-Subject: [PATCH 10/13] tweak the scheduler to favor CPU 0

-

-in a virtual machine world, placement only means so much,

-and the serial driver hates getting initialized from CPU != 0.

-

-in general we want to pack to cpu 0 for our VM use case, this

-allows for a more predictable workload on the host.

-

-Author:    Arjan van de Ven <arjan@linux.intel.com>

-

-Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>

- kernel/sched/fair.c | 2 ++

- 1 file changed, 2 insertions(+)

-

-diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c

-index c2980e8..cac877b 100644

-+++ b/kernel/sched/fair.c

-@@ -4834,6 +4834,8 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f

- 	int want_affine = 0;

- 	int sync = wake_flags & WF_SYNC;

- 

-+	prev_cpu = 0;

-+

- 	if (sd_flag & SD_BALANCE_WAKE)

- 		want_affine = cpumask_test_cpu(cpu, tsk_cpus_allowed(p));

- 

-2.4.4

-

deleted file mode 100644

@@ -1,190 +0,0 @@

-From e7b603f1eeeba071bab31b122f3819a0dfd1242c Mon Sep 17 00:00:00 2001

-From: Arjan van de Ven <arjan@linux.intel.com>

-Date: Sat, 14 Feb 2015 09:49:41 -0600

-Subject: [PATCH 11/13] probe2

-

-Author:    Arjan van de Ven <arjan@linux.intel.com>

-Modify-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>

-

-Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>

- drivers/pci/probe.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++

- 1 file changed, 156 insertions(+)

-

-diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c

-index 28663ef..8095678 100644

-+++ b/drivers/pci/probe.c

-@@ -159,6 +159,160 @@ static inline unsigned long decode_bar(struct pci_dev *dev, u32 bar)

- 

- #define PCI_COMMAND_DECODE_ENABLE	(PCI_COMMAND_MEMORY | PCI_COMMAND_IO)

- 

-+

-+/* shortcut version of __pci_read_base where we know the sizes already */

-+int __pci_read_base_shortcut(struct pci_dev *dev, enum pci_bar_type type,

-+		    struct resource *res, unsigned int pos, u32 sz_in, u32 sz2_in)

-+{

-+	u32 l, sz;

-+	u64 l64, sz64, mask64;

-+	struct pci_bus_region region, inverted_region;

-+

-+	res->name = pci_name(dev);

-+

-+	pci_read_config_dword(dev, pos, &l);

-+

-+	sz = sz_in;

-+

-+	/*

-+	 * All bits set in sz means the device isn't working properly.

-+	 * If the BAR isn't implemented, all bits must be 0.  If it's a

-+	 * memory BAR or a ROM, bit 0 must be clear; if it's an io BAR, bit

-+	 * 1 must be clear.

-+	 * Here we set the size and is not 0xffffffff

-+	 */

-+

-+	/*

-+	 * I don't know how l can have all bits set.  Copied from old code.

-+	 * Maybe it fixes a bug on some ancient platform.

-+	 */

-+	if (l == 0xffffffff)

-+		l = 0;

-+

-+	if (type == pci_bar_unknown) {

-+		res->flags = decode_bar(dev, l);

-+		res->flags |= IORESOURCE_SIZEALIGN;

-+		if (res->flags & IORESOURCE_IO) {

-+			l64 = l & PCI_BASE_ADDRESS_IO_MASK;

-+			sz64 = sz & PCI_BASE_ADDRESS_IO_MASK;

-+			mask64 = PCI_BASE_ADDRESS_IO_MASK & (u32)IO_SPACE_LIMIT;

-+		} else {

-+			l64 = l & PCI_BASE_ADDRESS_MEM_MASK;

-+			sz64 = sz & PCI_BASE_ADDRESS_MEM_MASK;

-+			mask64 = (u32)PCI_BASE_ADDRESS_MEM_MASK;

-+		}

-+	} else {

-+		res->flags |= (l & IORESOURCE_ROM_ENABLE);

-+		l64 = l & PCI_ROM_ADDRESS_MASK;

-+		sz64 = sz & PCI_ROM_ADDRESS_MASK;

-+		mask64 = (u32)PCI_ROM_ADDRESS_MASK;

-+	}

-+

-+	if (res->flags & IORESOURCE_MEM_64) {

-+		pci_read_config_dword(dev, pos + 4, &l);

-+		sz = sz2_in;