diff --git a/[refs] b/[refs]
index b83b6c1f8ff9..fc65a9198d12 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f354b014b51716166f13f68b29212d3c44ed2c4
+refs/heads/master: 7fe4c1b16854f0440939c62b8102cbf5c75e7cdc
diff --git a/trunk/include/asm-ia64/sn/pcibr_provider.h b/trunk/include/asm-ia64/sn/pcibr_provider.h
index 2299c3ad2e33..f9b8d2164007 100644
--- a/trunk/include/asm-ia64/sn/pcibr_provider.h
+++ b/trunk/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;
 };
 
 /*