From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 26 Feb 2009 05:31:32 +0000 (+0100)
Subject: Merge branches 'x86/apic', 'x86/defconfig', 'x86/memtest', 'x86/mm' and 'linus' into... 
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ecc25fbd6b9e07b33895c61ddf84006b00f55d99;p=linux-2.6-omap-h63xx.git

Merge branches 'x86/apic', 'x86/defconfig', 'x86/memtest', 'x86/mm' and 'linus' into x86/core
---

ecc25fbd6b9e07b33895c61ddf84006b00f55d99
diff --cc arch/x86/configs/i386_defconfig
index 5c023f6f652,5c023f6f652,c2cae417fab,5c023f6f652,096dd5359cd,edba00d98ac..235b81d0f6f
--- a/arch/x86/configs/i386_defconfig
+++ b/arch/x86/configs/i386_defconfig
@@@@@@@ -1,7 -1,7 -1,7 -1,7 -1,7 -1,7 +1,7 @@@@@@@
      #
      # Automatically generated make config: don't edit
     -# Linux kernel version: 2.6.27-rc5
     -# Wed Sep  3 17:23:09 2008
     +# Linux kernel version: 2.6.29-rc4
-- -- # Thu Feb 12 12:57:57 2009
++ +++# Tue Feb 24 15:50:58 2009
      #
      # CONFIG_64BIT is not set
      CONFIG_X86_32=y
@@@@@@@ -193,10 -193,10 -193,12 -193,10 -193,11 -186,11 +193,10 @@@@@@@ CONFIG_NO_HZ=
      CONFIG_HIGH_RES_TIMERS=y
      CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
      CONFIG_SMP=y
     +CONFIG_SPARSE_IRQ=y
      CONFIG_X86_FIND_SMP_CONFIG=y
      CONFIG_X86_MPPARSE=y
  -  -CONFIG_X86_PC=y
      # CONFIG_X86_ELAN is not set
  - --# CONFIG_X86_VOYAGER is not set
      # CONFIG_X86_GENERICARCH is not set
      # CONFIG_X86_VSMP is not set
      # CONFIG_X86_RDC321X is not set
@@@@@@@ -265,8 -265,8 -267,10 -265,8 -266,8 -250,7 +265,10 @@@@@@@ CONFIG_PREEMPT_VOLUNTARY=
      # CONFIG_PREEMPT is not set
      CONFIG_X86_LOCAL_APIC=y
      CONFIG_X86_IO_APIC=y
     -# CONFIG_X86_MCE is not set
     +CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-- -- # CONFIG_X86_MCE is not set
++ +++CONFIG_X86_MCE=y
++ +++CONFIG_X86_MCE_NONFATAL=y
++ +++CONFIG_X86_MCE_P4THERMAL=y
      CONFIG_VM86=y
      # CONFIG_TOSHIBA is not set
      # CONFIG_I8K is not set
diff --cc arch/x86/configs/x86_64_defconfig
index 4157cc4a2bd,4157cc4a2bd,9fd7d156a12,4157cc4a2bd,2efb5d5063f,322dd2748fc..9fe5d212ab4
--- a/arch/x86/configs/x86_64_defconfig
+++ b/arch/x86/configs/x86_64_defconfig
@@@@@@@ -1,7 -1,7 -1,7 -1,7 -1,7 -1,7 +1,7 @@@@@@@
      #
      # Automatically generated make config: don't edit
     -# Linux kernel version: 2.6.27-rc5
     -# Wed Sep  3 17:13:39 2008
     +# Linux kernel version: 2.6.29-rc4
-- -- # Thu Feb 12 12:57:29 2009
++ +++# Tue Feb 24 15:44:16 2009
      #
      CONFIG_64BIT=y
      # CONFIG_X86_32 is not set
@@@@@@@ -194,14 -194,14 -194,16 -194,14 -194,15 -185,13 +194,14 @@@@@@@ CONFIG_NO_HZ=
      CONFIG_HIGH_RES_TIMERS=y
      CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
      CONFIG_SMP=y
     +CONFIG_SPARSE_IRQ=y
     +# CONFIG_NUMA_MIGRATE_IRQ_DESC is not set
      CONFIG_X86_FIND_SMP_CONFIG=y
      CONFIG_X86_MPPARSE=y
  -  -CONFIG_X86_PC=y
      # CONFIG_X86_ELAN is not set
  - --# CONFIG_X86_VOYAGER is not set
      # CONFIG_X86_GENERICARCH is not set
      # CONFIG_X86_VSMP is not set
     +CONFIG_SCHED_OMIT_FRAME_POINTER=y
      # CONFIG_PARAVIRT_GUEST is not set
      # CONFIG_MEMTEST is not set
      # CONFIG_M386 is not set
@@@@@@@ -265,12 -265,12 -267,14 -265,12 -266,12 -247,9 +265,14 @@@@@@@ CONFIG_PREEMPT_VOLUNTARY=
      # CONFIG_PREEMPT is not set
      CONFIG_X86_LOCAL_APIC=y
      CONFIG_X86_IO_APIC=y
     -# CONFIG_X86_MCE is not set
     +CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-- -- # CONFIG_X86_MCE is not set
++ +++CONFIG_X86_MCE=y
++ +++CONFIG_X86_MCE_INTEL=y
++ +++CONFIG_X86_MCE_AMD=y
      # CONFIG_I8K is not set
      CONFIG_MICROCODE=y
     +CONFIG_MICROCODE_INTEL=y
     +CONFIG_MICROCODE_AMD=y
      CONFIG_MICROCODE_OLD_INTERFACE=y
      CONFIG_X86_MSR=y
      CONFIG_X86_CPUID=y
diff --cc drivers/gpu/drm/i915/i915_gem.c
index 25b337438ca,ac534c9a2f8,81857665409,25b337438ca,6b209db8370,28b726d07a0..e9882d0c247
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@@@@@@ -3139,31 -3126,27 -3107,6 -3139,31 -3107,6 -3142,31 +3142,31 @@@@@@@ i915_gem_init_hws(struct drm_device *de
      	return 0;
      }
      
  + + static void
  + + i915_gem_cleanup_hws(struct drm_device *dev)
  + + {
  + + 	drm_i915_private_t *dev_priv = dev->dev_private;
 -    	struct drm_gem_object *obj = dev_priv->hws_obj;
 -    	struct drm_i915_gem_object *obj_priv = obj->driver_private;
 ++ + 	struct drm_gem_object *obj;
 ++ + 	struct drm_i915_gem_object *obj_priv;
  + + 
  + + 	if (dev_priv->hws_obj == NULL)
  + + 		return;
  + + 
 ++ + 	obj = dev_priv->hws_obj;
 ++ + 	obj_priv = obj->driver_private;
 ++ + 
  + + 	kunmap(obj_priv->page_list[0]);
  + + 	i915_gem_object_unpin(obj);
  + + 	drm_gem_object_unreference(obj);
  + + 	dev_priv->hws_obj = NULL;
 ++ + 
  + + 	memset(&dev_priv->hws_map, 0, sizeof(dev_priv->hws_map));
  + + 	dev_priv->hw_status_page = NULL;
  + + 
  + + 	/* Write high address into HWS_PGA when disabling. */
  + + 	I915_WRITE(HWS_PGA, 0x1ffff000);
  + + }
  + + 
      int
      i915_gem_init_ringbuffer(struct drm_device *dev)
      {