Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2015-01-16 14:53:36 +0100
committerJiri Kosina <jkosina@suse.cz>2015-01-16 14:53:36 +0100
commit0dfd22dbe5f4f7f978c13297abf8ac8d69e0162a (patch)
tree06d2cd30038b5addd3efb442cd176d498c5a40aa
parent3ea3414e3b1f4bda038d4f7cf5165ba3b3cdd29b (diff)
patches.drivers/lpfc-8.3.39-Fixed-driver-vector-mapping-to-CPU-xen-buildfix.patch: fix build
-rw-r--r--patches.drivers/lpfc-8.3.39-Fixed-driver-vector-mapping-to-CPU-xen-buildfix.patch7
1 files changed, 4 insertions, 3 deletions
diff --git a/patches.drivers/lpfc-8.3.39-Fixed-driver-vector-mapping-to-CPU-xen-buildfix.patch b/patches.drivers/lpfc-8.3.39-Fixed-driver-vector-mapping-to-CPU-xen-buildfix.patch
index a8e486dfef..23f3f171e9 100644
--- a/patches.drivers/lpfc-8.3.39-Fixed-driver-vector-mapping-to-CPU-xen-buildfix.patch
+++ b/patches.drivers/lpfc-8.3.39-Fixed-driver-vector-mapping-to-CPU-xen-buildfix.patch
@@ -10,8 +10,8 @@ Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Index: linux-3.0-SLE11-SP4/drivers/scsi/lpfc/lpfc_init.c
===================================================================
---- linux-3.0-SLE11-SP4.orig/drivers/scsi/lpfc/lpfc_init.c 2015-01-16 14:33:23.255738944 +0100
-+++ linux-3.0-SLE11-SP4/drivers/scsi/lpfc/lpfc_init.c 2015-01-16 14:35:20.021461544 +0100
+--- linux-3.0-SLE11-SP4.orig/drivers/scsi/lpfc/lpfc_init.c 2015-01-16 14:51:18.264233986 +0100
++++ linux-3.0-SLE11-SP4/drivers/scsi/lpfc/lpfc_init.c 2015-01-16 14:51:46.461606267 +0100
@@ -8407,9 +8407,6 @@
int i, idx, saved_chann, used_chann, cpu, phys_id;
int max_phys_id, num_io_channel, first_cpu;
@@ -22,12 +22,13 @@ Index: linux-3.0-SLE11-SP4/drivers/scsi/lpfc/lpfc_init.c
struct cpumask *mask;
uint8_t chann[LPFC_FCP_IO_CHAN_MAX+1];
-@@ -8430,7 +8427,7 @@
+@@ -8430,7 +8427,8 @@
/* Update CPU map with physical id and core id of each CPU */
cpup = phba->sli4_hba.cpu_map;
for (cpu = 0; cpu < phba->sli4_hba.num_present_cpu; cpu++) {
-#ifdef CONFIG_X86
+#if defined(CONFIG_X86) && !defined(CONFIG_XEN)
++ const struct cpuinfo_x86 *cpuinfo = &cpu_data(cpu);
cpuinfo = &cpu_data(cpu);
cpup->phys_id = cpuinfo->phys_proc_id;
cpup->core_id = cpuinfo->cpu_core_id;