summaryrefslogtreecommitdiffstats
path: root/include/asm-ia64
diff options
context:
space:
mode:
authorPrarit Bhargava <prarit@sgi.com>2005-07-06 15:30:25 -0700
committerTony Luck <tony.luck@intel.com>2005-07-06 15:30:25 -0700
commit7fe4c1b16854f0440939c62b8102cbf5c75e7cdc (patch)
tree4ec5ef085c011a582454f4a6df2705f4ce339ca3 /include/asm-ia64
parent6f354b014b51716166f13f68b29212d3c44ed2c4 (diff)
downloadlinux-7fe4c1b16854f0440939c62b8102cbf5c75e7cdc.tar.bz2
[IA64] hotplug/ia64: SN Hotplug Driver - PREEMPT/pcibus_info fix
This patch fixes an issue with the PROM and a kernel running with CONFIG_PREEMPT enabled. When CONFIG_PREEMPT is enabled, the size of a spinlock_t changes -- resulting in the PROM writing to an incorrect location. Signed-off-by: Prarit Bhargava <prarit@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include/asm-ia64')
-rw-r--r--include/asm-ia64/sn/pcibr_provider.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-ia64/sn/pcibr_provider.h b/include/asm-ia64/sn/pcibr_provider.h
index 2299c3ad2e33..f9b8d2164007 100644
--- a/include/asm-ia64/sn/pcibr_provider.h
+++ b/include/asm-ia64/sn/pcibr_provider.h
@@ -108,10 +108,11 @@ struct pcibus_info {
char pbi_hub_xid;
uint64_t pbi_devreg[8];
- spinlock_t pbi_lock;
uint32_t pbi_valid_devices;
uint32_t pbi_enabled_devices;
+
+ spinlock_t pbi_lock;
};
/*