Magellan Linux

Contents of /trunk/kernel-alx/patches-3.4/0300-3.4-fix-lpfc-compilation-without-debugfs.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1853 - (show annotations) (download)
Tue Jul 24 14:30:44 2012 UTC (12 years, 3 months ago) by niro
File size: 1349 byte(s)
-3.4.6-alx-r1
1 diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
2 index 88f3a83..8817057 100644
3 --- a/drivers/scsi/lpfc/lpfc_scsi.c
4 +++ b/drivers/scsi/lpfc/lpfc_scsi.c
5 @@ -1897,7 +1897,9 @@ lpfc_bg_setup_bpl(struct lpfc_hba *phba, struct scsi_cmnd *sc,
6 dma_addr_t physaddr;
7 int i = 0, num_bde = 0, status;
8 int datadir = sc->sc_data_direction;
9 +#ifdef CONFIG_SCSI_LPFC_DEBUG_FS
10 uint32_t rc;
11 +#endif
12 uint32_t checking = 1;
13 uint32_t reftag;
14 unsigned blksize;
15 @@ -2034,7 +2036,9 @@ lpfc_bg_setup_bpl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,
16 int datadir = sc->sc_data_direction;
17 unsigned char pgdone = 0, alldone = 0;
18 unsigned blksize;
19 +#ifdef CONFIG_SCSI_LPFC_DEBUG_FS
20 uint32_t rc;
21 +#endif
22 uint32_t checking = 1;
23 uint32_t reftag;
24 uint8_t txop, rxop;
25 @@ -2253,7 +2257,9 @@ lpfc_bg_setup_sgl(struct lpfc_hba *phba, struct scsi_cmnd *sc,
26 uint32_t reftag;
27 unsigned blksize;
28 uint8_t txop, rxop;
29 +#ifdef CONFIG_SCSI_LPFC_DEBUG_FS
30 uint32_t rc;
31 +#endif
32 uint32_t checking = 1;
33 uint32_t dma_len;
34 uint32_t dma_offset = 0;
35 @@ -2383,7 +2389,9 @@ lpfc_bg_setup_sgl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,
36 uint32_t reftag;
37 uint8_t txop, rxop;
38 uint32_t dma_len;
39 +#ifdef CONFIG_SCSI_LPFC_DEBUG_FS
40 uint32_t rc;
41 +#endif
42 uint32_t checking = 1;
43 uint32_t dma_offset = 0;
44 int num_sge = 0;
45
46