From 7fe4c1b16854f0440939c62b8102cbf5c75e7cdc Mon Sep 17 00:00:00 2001
From: Prarit Bhargava <prarit@sgi.com>
Date: Wed, 6 Jul 2005 15:30:25 -0700
Subject: [PATCH] [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>
---
include/asm-ia64/sn/pcibr_provider.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/asm-ia64/sn/pcibr_provider.h b/include/asm-ia64/sn/pcibr_provider.h
index 2299c3ad2e3..f9b8d216400 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;
};
/*
--
2.41.3