From 5a9e6422246924ff0ec332c7311b664afe551fdb Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 24 Jun 2008 11:20:59 -0700 Subject: [PATCH] --- yaml --- r: 98411 b: refs/heads/master c: 3b968b7c10b3d81eb83380655484f2bb5b240dc6 h: refs/heads/master i: 98409: d78bb2bc21e21a5ac58bed4e4dbec8b28135565f 98407: 905ad685ce52bd4294468037f1b549bdb1bfa2cb v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/i915_drv.c | 1 + trunk/include/asm-alpha/percpu.h | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 344b95d9e129..e131f8a9931a 100644 --- 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 index e8f3d682e3b1..93aed1c38bd2 100644 --- 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 index 82e8a94b4b2f..3495e8e00d70 100644 --- 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)