From: Guangyu Sun <guangyu.sun@oracle.com>
Date: Tue, 3 Jul 2012 21:41:56 +0000 (-0700)
Subject: Merge tag 'v3.0.36' into uek2-2.6.39-300#14252075
X-Git-Tag: v2.6.39-400.9.0~503
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7cee5d9a4c7ed1c25e3ca56bf5a885cd9dca944b;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'v3.0.36' into uek2-2.6.39-300#14252075

This is the 3.0.36 stable release

Conflicts:
	arch/x86/xen/enlighten.c
	include/linux/pci.h

Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
---

7cee5d9a4c7ed1c25e3ca56bf5a885cd9dca944b
diff --cc arch/x86/xen/enlighten.c
index 4390dbd0b2c4,8385d1d33f31..35dcd92f4695
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@@ -236,14 -221,11 +239,19 @@@ static void xen_cpuid(unsigned int *ax
  		maskedx = cpuid_leaf1_edx_mask;
  		break;
  
 +	case CPUID_MWAIT_LEAF:
 +		/* Synthesize the values.. */
 +		*ax = 0;
 +		*bx = 0;
 +		*cx = cpuid_leaf5_ecx_val;
 +		*dx = cpuid_leaf5_edx_val;
 +		return;
 +
+ 	case CPUID_THERM_POWER_LEAF:
+ 		/* Disabling APERFMPERF for kernel usage */
+ 		maskecx = ~(1 << APERFMPERF_PRESENT);
+ 		break;
+ 
  	case 0xb:
  		/* Suppress extended topology stuff */
  		maskebx = 0;
diff --cc include/linux/pci.h
index 9a11459208f1,ff5970b7a176..92b9d08950a4
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@@ -174,8 -174,8 +174,10 @@@ enum pci_dev_flags 
  	PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG = (__force pci_dev_flags_t) 1,
  	/* Device configuration is irrevocably lost if disabled into D3 */
  	PCI_DEV_FLAGS_NO_D3 = (__force pci_dev_flags_t) 2,
 +	/* Provide indication device is assigned by a Virtual Machine Manager */
 +	PCI_DEV_FLAGS_ASSIGNED = (__force pci_dev_flags_t) 4,
+ 	/* Device causes system crash if in D3 during S3 sleep */
+ 	PCI_DEV_FLAGS_NO_D3_DURING_SLEEP = (__force pci_dev_flags_t) 8,
  };
  
  enum pci_irq_reroute_variant {