---

yaml --- r: 98411 b: refs/heads/master c: 3b968b7 h: refs/heads/master i: 98409: d78bb2b 98407: 905ad68 v: v3
git-mirror · Jun 24, 2008 · 5a9e642 · 5a9e642
1 parent de38459
commit 5a9e642
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aabdc3b8c3b3d081f1532454e344208338478e29
+refs/heads/master: 3b968b7c10b3d81eb83380655484f2bb5b240dc6
diff --git a/trunk/drivers/char/drm/i915_drv.c b/trunk/drivers/char/drm/i915_drv.c
@@ -389,6 +389,7 @@ static int i915_resume(struct drm_device *dev)
 	pci_restore_state(dev->pdev);
 	if (pci_enable_device(dev->pdev))
 		return -1;
+	pci_set_master(dev->pdev);
 
 	pci_write_config_byte(dev->pdev, LBB, dev_priv->saveLBB);
 

diff --git a/trunk/include/asm-alpha/percpu.h b/trunk/include/asm-alpha/percpu.h
@@ -69,6 +69,8 @@ extern unsigned long __per_cpu_offset[NR_CPUS];
 #define __get_cpu_var(var)		per_cpu_var(var)
 #define __raw_get_cpu_var(var)		per_cpu_var(var)
 
+#define PER_CPU_ATTRIBUTES
+
 #endif /* SMP */
 
 #define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu_var(name)