From c26b582644772bb9e16bc855a945fa00f86afb07 Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Tue, 7 Aug 2007 13:13:18 +0400
Subject: [PATCH] --- yaml --- r: 68024 b: refs/heads/master c:
 3d034aecd8b70d34388a4e40ca50af0d014223e1 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/x86/kernel/reboot_fixups_32.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1071c7445f35..fbc8f946e58c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa24886e379d2b641c5117e178b15ce1d5d366ba
+refs/heads/master: 3d034aecd8b70d34388a4e40ca50af0d014223e1
diff --git a/trunk/arch/x86/kernel/reboot_fixups_32.c b/trunk/arch/x86/kernel/reboot_fixups_32.c
index 03e1cce58f49..139eb03490f5 100644
--- a/trunk/arch/x86/kernel/reboot_fixups_32.c
+++ b/trunk/arch/x86/kernel/reboot_fixups_32.c
@@ -11,6 +11,7 @@
 
 #include <asm/delay.h>
 #include <linux/pci.h>
+#include <linux/interrupt.h>
 #include <asm/reboot_fixups.h>
 #include <asm/msr.h>
 
@@ -56,6 +57,11 @@ void mach_reboot_fixups(void)
 	struct pci_dev *dev;
 	int i;
 
+	/* we can be called from sysrq-B code. In such a case it is
+	 * prohibited to dig PCI */
+	if (in_interrupt())
+		return;
+
 	for (i=0; i < ARRAY_SIZE(fixups_table); i++) {
 		cur = &(fixups_table[i]);
 		dev = pci_get_device(cur->vendor, cur->device, NULL);