Gentoo Archives: gentoo-commits

From: "Mike Pagano (mpagano)" <mpagano@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] linux-patches r2201 - genpatches-2.6/trunk/3.4
Date: Wed, 29 Aug 2012 17:33:10
Message-Id: 20120829173258.044C320B7B@flycatcher.gentoo.org
1 Author: mpagano
2 Date: 2012-08-29 17:31:53 +0000 (Wed, 29 Aug 2012)
3 New Revision: 2201
4
5 Added:
6 genpatches-2.6/trunk/3.4/2405_lpfs-build-warnings-debugfs-fix.patch
7 Modified:
8 genpatches-2.6/trunk/3.4/0000_README
9 Log:
10 Fix build warnings for lpfc when debugfs is not defined. Bug #432604
11
12 Modified: genpatches-2.6/trunk/3.4/0000_README
13 ===================================================================
14 --- genpatches-2.6/trunk/3.4/0000_README 2012-08-27 17:30:39 UTC (rev 2200)
15 +++ genpatches-2.6/trunk/3.4/0000_README 2012-08-29 17:31:53 UTC (rev 2201)
16 @@ -87,6 +87,10 @@
17 From: Alexey Shvetsov <alexxy@g.o>
18 Desc: Zero copy for infiniband psm userspace driver
19
20 +Patch: 2405_lpfs-build-warnings-debugfs-fix.patch
21 +From: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commitdiff_plain;h=0829a19a6142af09eb4f9509cd1d3666270e87bd
22 +Desc: Fix build warnings for lpfc when debugfs is not defined. Bug #432604
23 +
24 Patch: 2700_dual-channel-mode-vbios-check.patch
25 Desc: Check VBIOS value for determining LVDS dual channel mode
26
27
28 Added: genpatches-2.6/trunk/3.4/2405_lpfs-build-warnings-debugfs-fix.patch
29 ===================================================================
30 --- genpatches-2.6/trunk/3.4/2405_lpfs-build-warnings-debugfs-fix.patch (rev 0)
31 +++ genpatches-2.6/trunk/3.4/2405_lpfs-build-warnings-debugfs-fix.patch 2012-08-29 17:31:53 UTC (rev 2201)
32 @@ -0,0 +1,43 @@
33 +diff -ur linux-3.4.9-gentoo/drivers/scsi/lpfc/lpfc_scsi.c linux-3.4.9-gentoo.new/drivers/scsi/lpfc/lpfc_scsi.c
34 +--- linux-3.4.9-gentoo/drivers/scsi/lpfc/lpfc_scsi.c 2012-05-20 17:29:13.000000000 -0500
35 ++++ linux-3.4.9-gentoo.new/drivers/scsi/lpfc/lpfc_scsi.c 2012-08-29 09:14:25.789628488 -0500
36 +@@ -1897,7 +1897,9 @@
37 + dma_addr_t physaddr;
38 + int i = 0, num_bde = 0, status;
39 + int datadir = sc->sc_data_direction;
40 ++#ifdef CONFIG_SCSI_LPFC_DEBUG_FS
41 + uint32_t rc;
42 ++#endif
43 + uint32_t checking = 1;
44 + uint32_t reftag;
45 + unsigned blksize;
46 +@@ -2034,7 +2036,9 @@
47 + int datadir = sc->sc_data_direction;
48 + unsigned char pgdone = 0, alldone = 0;
49 + unsigned blksize;
50 ++#ifdef CONFIG_SCSI_LPFC_DEBUG_FS
51 + uint32_t rc;
52 ++#endif
53 + uint32_t checking = 1;
54 + uint32_t reftag;
55 + uint8_t txop, rxop;
56 +@@ -2253,7 +2257,9 @@
57 + uint32_t reftag;
58 + unsigned blksize;
59 + uint8_t txop, rxop;
60 ++#ifdef CONFIG_SCSI_LPFC_DEBUG_FS
61 + uint32_t rc;
62 ++#endif
63 + uint32_t checking = 1;
64 + uint32_t dma_len;
65 + uint32_t dma_offset = 0;
66 +@@ -2383,7 +2389,9 @@
67 + uint32_t reftag;
68 + uint8_t txop, rxop;
69 + uint32_t dma_len;
70 ++#ifdef CONFIG_SCSI_LPFC_DEBUG_FS
71 + uint32_t rc;
72 ++#endif
73 + uint32_t checking = 1;
74 + uint32_t dma_offset = 0;
75 + int num_sge = 0;